Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions packages/opencode/src/cli/cmd/tui/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { FrecencyProvider } from "./component/prompt/frecency"
import { PromptStashProvider } from "./component/prompt/stash"
import { DialogAlert } from "./ui/dialog-alert"
import { ToastProvider, useToast } from "./ui/toast"
import { ExitProvider, useExit } from "./context/exit"
import { ExitProvider, useExit, destroyRenderer } from "./context/exit"
import { Session as SessionApi } from "@/session"
import { TuiEvent } from "./event"
import { KVProvider, useKV } from "./context/kv"
Expand Down Expand Up @@ -110,7 +110,15 @@ export function tui(input: {
// promise to prevent immediate exit
return new Promise<void>(async (resolve) => {
const mode = await getTerminalBackgroundColor()

const sigintHandler = () => {
destroyRenderer()
process.exit(0)
}
process.on("SIGINT", sigintHandler)

const onExit = async () => {
process.off("SIGINT", sigintHandler)
await input.onExit?.()
resolve()
}
Expand Down Expand Up @@ -606,6 +614,15 @@ function App() {
})
})

sdk.event.on(Installation.Event.Updated.type, (evt) => {
toast.show({
variant: "success",
title: "Update Complete",
message: `OpenCode updated to v${evt.properties.version}`,
duration: 5000,
})
})

sdk.event.on(Installation.Event.UpdateAvailable.type, (evt) => {
toast.show({
variant: "info",
Expand Down Expand Up @@ -658,18 +675,9 @@ function ErrorComponent(props: {
mode?: "dark" | "light"
}) {
const term = useTerminalDimensions()
const renderer = useRenderer()

const handleExit = async () => {
renderer.setTerminalTitle("")
renderer.destroy()
props.onExit()
}

useKeyboard((evt) => {
if (evt.ctrl && evt.name === "c") {
handleExit()
}
if (evt.ctrl && evt.name === "c") props.onExit()
})
const [copied, setCopied] = createSignal(false)

Expand Down Expand Up @@ -721,7 +729,7 @@ function ErrorComponent(props: {
<box onMouseUp={props.reset} backgroundColor={colors.primary} padding={1}>
<text fg={colors.bg}>Reset TUI</text>
</box>
<box onMouseUp={handleExit} backgroundColor={colors.primary} padding={1}>
<box onMouseUp={() => props.onExit()} backgroundColor={colors.primary} padding={1}>
<text fg={colors.bg}>Exit</text>
</box>
</box>
Expand Down
35 changes: 30 additions & 5 deletions packages/opencode/src/cli/cmd/tui/context/exit.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,47 @@
import { useRenderer } from "@opentui/solid"
import { createSimpleContext } from "./helper"
import { FormatError, FormatUnknownError } from "@/cli/error"
import * as fs from "fs"

type Renderer = ReturnType<typeof useRenderer>

const state: { renderer: Renderer | null } = { renderer: null }

const DISABLE_MOUSE = "\x1b[?1000l\x1b[?1002l\x1b[?1003l\x1b[?1006l\x1b[?1015l\x1b[?25h"

function cleanupTerminal() {
fs.writeSync(1, DISABLE_MOUSE)
}

export function destroyRenderer() {
if (!state.renderer) {
cleanupTerminal()
return
}
state.renderer.setTerminalTitle("")
state.renderer.destroy()
state.renderer = null
cleanupTerminal()
}

export const { use: useExit, provider: ExitProvider } = createSimpleContext({
name: "Exit",
init: (input: { onExit?: () => Promise<void> }) => {
const renderer = useRenderer()
return async (reason?: any) => {
// Reset window title before destroying renderer
state.renderer = renderer

return async (reason?: unknown) => {
cleanupTerminal()
renderer.setTerminalTitle("")
renderer.destroy()

await input.onExit?.()

if (reason) {
const formatted = FormatError(reason) ?? FormatUnknownError(reason)
if (formatted) {
process.stderr.write(formatted + "\n")
}
if (formatted) process.stderr.write(formatted + "\n")
}

process.exit(0)
}
},
Expand Down