Skip to content

Commit 59580b6

Browse files
committed
tui: add /restart command
Add a /restart command that restarts the worker process and returns to the home screen, allowing users to reload configuration without manually exiting and restarting the application. - Add prepareRestart RPC method to worker.ts for clean shutdown - Refactor thread.ts with mutable WorkerState for worker lifecycle - Create RestartProvider context for restart callback handling - Register app.restart command in command palette and autocomplete - Implement event handler re-subscription after worker restart Closes anomalyco#9113
1 parent f3513ba commit 59580b6

5 files changed

Lines changed: 119 additions & 19 deletions

File tree

‎packages/opencode/src/cli/cmd/tui/app.tsx‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import { PromptStashProvider } from "./component/prompt/stash"
2828
import { DialogAlert } from "./ui/dialog-alert"
2929
import { ToastProvider, useToast } from "./ui/toast"
3030
import { ExitProvider, useExit } from "./context/exit"
31+
import { RestartProvider, useRestart } from "./context/restart"
3132
import { Session as SessionApi } from "@/session"
3233
import { TuiEvent } from "./event"
3334
import { KVProvider, useKV } from "./context/kv"
@@ -106,6 +107,7 @@ export function tui(input: {
106107
fetch?: typeof fetch
107108
events?: EventSource
108109
onExit?: () => Promise<void>
110+
onRestart?: () => Promise<void>
109111
}) {
110112
// promise to prevent immediate exit
111113
return new Promise<void>(async (resolve) => {
@@ -123,7 +125,8 @@ export function tui(input: {
123125
>
124126
<ArgsProvider {...input.args}>
125127
<ExitProvider onExit={onExit}>
126-
<KVProvider>
128+
<RestartProvider onRestart={input.onRestart}>
129+
<KVProvider>
127130
<ToastProvider>
128131
<RouteProvider>
129132
<SDKProvider
@@ -157,6 +160,7 @@ export function tui(input: {
157160
</RouteProvider>
158161
</ToastProvider>
159162
</KVProvider>
163+
</RestartProvider>
160164
</ExitProvider>
161165
</ArgsProvider>
162166
</ErrorBoundary>
@@ -194,6 +198,7 @@ function App() {
194198
const { theme, mode, setMode } = useTheme()
195199
const sync = useSync()
196200
const exit = useExit()
201+
const restart = useRestart()
197202
const promptRef = usePromptRef()
198203

199204
// Wire up console copy-to-clipboard via opentui's onCopySelection callback
@@ -471,6 +476,17 @@ function App() {
471476
onSelect: () => exit(),
472477
category: "System",
473478
},
479+
{
480+
title: "Restart the app",
481+
value: "app.restart",
482+
onSelect: async () => {
483+
toast.show({ message: "Restarting...", variant: "info", duration: 2000 })
484+
await restart()
485+
sync.bootstrap()
486+
route.navigate({ type: "home" })
487+
},
488+
category: "System",
489+
},
474490
{
475491
title: "Toggle debug panel",
476492
category: "System",

‎packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,11 @@ export function Autocomplete(props: {
480480
description: "exit the app",
481481
onSelect: () => command.trigger("app.exit"),
482482
},
483+
{
484+
display: "/restart",
485+
description: "restart the app",
486+
onSelect: () => command.trigger("app.restart"),
487+
},
483488
)
484489
const max = firstBy(results, [(x) => x.display.length, "desc"])?.display.length
485490
if (!max) return results
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { createSimpleContext } from "./helper"
2+
3+
export const { use: useRestart, provider: RestartProvider } = createSimpleContext({
4+
name: "Restart",
5+
init: (input: { onRestart?: () => Promise<void> }) => {
6+
return async () => {
7+
await input.onRestart?.()
8+
}
9+
},
10+
})

‎packages/opencode/src/cli/cmd/tui/thread.ts‎

Lines changed: 80 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,19 @@ declare global {
1616

1717
type RpcClient = ReturnType<typeof Rpc.client<typeof rpc>>
1818

19-
function createWorkerFetch(client: RpcClient): typeof fetch {
19+
interface WorkerState {
20+
worker: Worker | null
21+
client: RpcClient | null
22+
eventHandlers: Set<(event: Event) => void>
23+
eventUnsubs: Map<(event: Event) => void, () => void>
24+
}
25+
26+
function createWorkerFetch(state: WorkerState): typeof fetch {
2027
const fn = async (input: RequestInfo | URL, init?: RequestInit): Promise<Response> => {
28+
if (!state.client) throw new Error("Worker not initialized")
2129
const request = new Request(input, init)
2230
const body = request.body ? await request.text() : undefined
23-
const result = await client.call("fetch", {
31+
const result = await state.client.call("fetch", {
2432
url: request.url,
2533
method: request.method,
2634
headers: Object.fromEntries(request.headers.entries()),
@@ -34,9 +42,36 @@ function createWorkerFetch(client: RpcClient): typeof fetch {
3442
return fn as typeof fetch
3543
}
3644

37-
function createEventSource(client: RpcClient): EventSource {
45+
function createEventSource(state: WorkerState): EventSource {
3846
return {
39-
on: (handler) => client.on<Event>("event", handler),
47+
on: (handler) => {
48+
state.eventHandlers.add(handler)
49+
if (state.client) {
50+
const unsub = state.client.on<Event>("event", handler)
51+
state.eventUnsubs.set(handler, unsub)
52+
}
53+
return () => {
54+
state.eventHandlers.delete(handler)
55+
const unsub = state.eventUnsubs.get(handler)
56+
if (unsub) {
57+
unsub()
58+
state.eventUnsubs.delete(handler)
59+
}
60+
}
61+
},
62+
}
63+
}
64+
65+
function resubscribeEventHandlers(state: WorkerState) {
66+
for (const [handler, unsub] of state.eventUnsubs) {
67+
unsub()
68+
}
69+
state.eventUnsubs.clear()
70+
if (state.client) {
71+
for (const handler of state.eventHandlers) {
72+
const unsub = state.client.on<Event>("event", handler)
73+
state.eventUnsubs.set(handler, unsub)
74+
}
4075
}
4176
}
4277

@@ -90,23 +125,47 @@ export const TuiThreadCommand = cmd({
90125
return
91126
}
92127

93-
const worker = new Worker(workerPath, {
94-
env: Object.fromEntries(
95-
Object.entries(process.env).filter((entry): entry is [string, string] => entry[1] !== undefined),
96-
),
97-
})
98-
worker.onerror = (e) => {
99-
Log.Default.error(e)
128+
// Mutable state for worker lifecycle management
129+
const state: WorkerState = {
130+
worker: null,
131+
client: null,
132+
eventHandlers: new Set(),
133+
eventUnsubs: new Map(),
100134
}
101-
const client = Rpc.client<typeof rpc>(worker)
135+
136+
function createWorkerInstance() {
137+
state.worker = new Worker(workerPath, {
138+
env: Object.fromEntries(
139+
Object.entries(process.env).filter((entry): entry is [string, string] => entry[1] !== undefined),
140+
),
141+
})
142+
state.worker.onerror = (e) => {
143+
Log.Default.error(e)
144+
}
145+
state.client = Rpc.client<typeof rpc>(state.worker)
146+
resubscribeEventHandlers(state)
147+
}
148+
149+
async function restartWorker() {
150+
if (state.client) {
151+
await state.client.call("prepareRestart", undefined).catch(() => {})
152+
}
153+
if (state.worker) {
154+
state.worker.terminate()
155+
}
156+
createWorkerInstance()
157+
}
158+
159+
createWorkerInstance()
160+
102161
process.on("uncaughtException", (e) => {
103162
Log.Default.error(e)
104163
})
105164
process.on("unhandledRejection", (e) => {
106165
Log.Default.error(e)
107166
})
108167
process.on("SIGUSR2", async () => {
109-
await client.call("reload", undefined)
168+
await state.client?.call("reload", undefined)
110169
})
111170

112171
const prompt = await iife(async () => {
@@ -131,13 +190,13 @@ export const TuiThreadCommand = cmd({
131190

132191
if (shouldStartServer) {
133192
// Start HTTP server for external access
134-
const server = await client.call("server", networkOpts)
193+
const server = await state.client!.call("server", networkOpts)
135194
url = server.url
136195
} else {
137196
// Use direct RPC communication (no HTTP)
138197
url = "http://opencode.internal"
139-
customFetch = createWorkerFetch(client)
140-
events = createEventSource(client)
198+
customFetch = createWorkerFetch(state)
199+
events = createEventSource(state)
141200
}
142201

143202
const tuiPromise = tui({
@@ -152,12 +211,15 @@ export const TuiThreadCommand = cmd({
152211
prompt,
153212
},
154213
onExit: async () => {
155-
await client.call("shutdown", undefined)
214+
await state.client?.call("shutdown", undefined)
215+
},
216+
onRestart: async () => {
217+
await restartWorker()
156218
},
157219
})
158220

159221
setTimeout(() => {
160-
client.call("checkUpgrade", { directory: cwd }).catch(() => {})
222+
state.client?.call("checkUpgrade", { directory: cwd }).catch(() => {})
161223
}, 1000)
162224

163225
await tuiPromise

‎packages/opencode/src/cli/cmd/tui/worker.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,13 @@ export const rpc = {
140140
await Instance.disposeAll()
141141
if (server) server.stop(true)
142142
},
143+
async prepareRestart() {
144+
Log.Default.info("worker preparing for restart")
145+
Config.global.reset()
146+
if (eventStream.abort) eventStream.abort.abort()
147+
await Instance.disposeAll()
148+
if (server) server.stop(true)
149+
},
143150
}
144151

145152
Rpc.listen(rpc)

0 commit comments

Comments
 (0)