@@ -16,11 +16,19 @@ declare global {
1616
1717type 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
0 commit comments