11import * as NodeCrypto from "@effect/platform-node/NodeCrypto" ;
22import { assert , it } from "@effect/vitest" ;
3- import { ProjectId , ThreadId } from "@t3tools/contracts" ;
3+ import { ProjectId , ThreadId , type TerminalEvent } from "@t3tools/contracts" ;
44import * as Effect from "effect/Effect" ;
55import * as Deferred from "effect/Deferred" ;
66import * as Fiber from "effect/Fiber" ;
@@ -22,6 +22,8 @@ it.effect("ReservedScript-overlappingStarts-reusesOwnerAndRetriesAfterCompletion
2222 const listeners = new Set <
2323 Parameters < TerminalManager . TerminalManager [ "Service" ] [ "subscribe" ] > [ 0 ]
2424 > ( ) ;
25+ const publish = ( event : TerminalEvent ) =>
26+ Effect . forEach ( [ ...listeners ] , ( listener ) => listener ( event ) , { discard : true } ) ;
2527 let openCount = 0 ;
2628 const openRequests : Array < Parameters < TerminalManager . TerminalManager [ "Service" ] [ "open" ] > [ 0 ] > =
2729 [ ] ;
@@ -37,7 +39,6 @@ it.effect("ReservedScript-overlappingStarts-reusesOwnerAndRetriesAfterCompletion
3739 icon : "play" as const ,
3840 runOnWorktreeCreate : true ,
3941 runOnSettle : true ,
40- reservePort : true ,
4142 previewUrl : "http://localhost:${T3CODE_PREVIEW_PORT}" ,
4243 async : false ,
4344 } ;
@@ -78,15 +79,13 @@ it.effect("ReservedScript-overlappingStarts-reusesOwnerAndRetriesAfterCompletion
7879 }
7980 terminalExited = exitBeforeSubscribe ;
8081 if ( terminalExited ) {
81- yield * Effect . forEach ( [ ...listeners ] , ( listener ) =>
82- listener ( {
83- type : "exited" ,
84- threadId : request . threadId ,
85- terminalId : request . terminalId ,
86- exitCode : 1 ,
87- exitSignal : null ,
88- } ) ,
89- ) ;
82+ yield * publish ( {
83+ type : "exited" ,
84+ threadId : request . threadId ,
85+ terminalId : request . terminalId ,
86+ exitCode : 1 ,
87+ exitSignal : null ,
88+ } ) ;
9089 }
9190 return {
9291 ...request ,
@@ -181,14 +180,12 @@ it.effect("ReservedScript-overlappingStarts-reusesOwnerAndRetriesAfterCompletion
181180 ) ;
182181
183182 const token = / _ _ T 3 _ S E T U P _ D O N E _ _ _ ( \w + ) : / . exec ( writes [ 0 ] ! ) ! [ 1 ] ;
184- yield * Effect . forEach ( [ ...listeners ] , ( listener ) =>
185- listener ( {
186- type : "output" ,
187- threadId : input . threadId ,
188- terminalId : "script-43123" ,
189- data : `\r\n__T3_SETUP_DONE___${ token } :0\r\n$ ` ,
190- } ) ,
191- ) ;
183+ yield * publish ( {
184+ type : "output" ,
185+ threadId : input . threadId ,
186+ terminalId : "script-43123" ,
187+ data : `\r\n__T3_SETUP_DONE___${ token } :0\r\n$ ` ,
188+ } ) ;
192189 assert . equal ( ( yield * lifecycle . completion ! ) . exitCode , 0 ) ;
193190 assert . equal ( listeners . size , 0 ) ;
194191 failWrite = true ;
@@ -207,26 +204,24 @@ it.effect("ReservedScript-overlappingStarts-reusesOwnerAndRetriesAfterCompletion
207204 projectId,
208205 worktreePath : input . worktreePath ,
209206 } ) ;
210- yield * Effect . forEach ( [ ...listeners ] , ( listener ) =>
211- listener ( {
212- type : "restarted" ,
207+ yield * publish ( {
208+ type : "restarted" ,
209+ threadId : input . threadId ,
210+ terminalId : "script-43123" ,
211+ snapshot : {
213212 threadId : input . threadId ,
214213 terminalId : "script-43123" ,
215- snapshot : {
216- threadId : input . threadId ,
217- terminalId : "script-43123" ,
218- cwd : input . worktreePath ,
219- worktreePath : input . worktreePath ,
220- status : "running" ,
221- pid : 456 ,
222- history : "" ,
223- exitCode : null ,
224- exitSignal : null ,
225- label : "Shell" ,
226- updatedAt : project . createdAt ,
227- } ,
228- } ) ,
229- ) ;
214+ cwd : input . worktreePath ,
215+ worktreePath : input . worktreePath ,
216+ status : "running" ,
217+ pid : 456 ,
218+ history : "" ,
219+ exitCode : null ,
220+ exitSignal : null ,
221+ label : "Shell" ,
222+ updatedAt : project . createdAt ,
223+ } ,
224+ } ) ;
230225 assert . equal ( restarted . status , "started" ) ;
231226 if ( restarted . status === "started" ) {
232227 assert . equal ( ( yield * restarted . completion ! ) . exitCode , null ) ;
@@ -248,15 +243,13 @@ it.effect("ReservedScript-overlappingStarts-reusesOwnerAndRetriesAfterCompletion
248243 projectId,
249244 worktreePath : input . worktreePath ,
250245 } ) ;
251- yield * Effect . forEach ( [ ...listeners ] , ( listener ) =>
252- listener ( {
253- type : "exited" ,
254- threadId : input . threadId ,
255- terminalId : "script-43123" ,
256- exitCode : 0 ,
257- exitSignal : null ,
258- } ) ,
259- ) ;
246+ yield * publish ( {
247+ type : "exited" ,
248+ threadId : input . threadId ,
249+ terminalId : "script-43123" ,
250+ exitCode : 0 ,
251+ exitSignal : null ,
252+ } ) ;
260253 if ( interruptedRun . status === "started" ) yield * interruptedRun . completion ! ;
261254
262255 exitBeforeSubscribe = true ;
@@ -280,7 +273,7 @@ it.effect("ReservedScript-overlappingStarts-reusesOwnerAndRetriesAfterCompletion
280273 } ,
281274 } ) ;
282275
283- script . reservePort = false ;
276+ script . previewUrl = "http://localhost:5173" ;
284277 const outputLines : string [ ] = [ ] ;
285278 const observed = yield * runner . runForThread ( {
286279 threadId : input . threadId ,
@@ -298,16 +291,14 @@ it.effect("ReservedScript-overlappingStarts-reusesOwnerAndRetriesAfterCompletion
298291 if ( observed . status !== "started" ) return ;
299292 const wrapper = writes . at ( - 1 ) ! ;
300293 const outputToken = / _ _ T 3 _ S E T U P _ D O N E _ _ _ ( \w + ) : / . exec ( wrapper ) ! [ 1 ] ;
301- yield * Effect . forEach ( [ ...listeners ] , ( listener ) =>
302- listener ( {
303- type : "output" ,
304- threadId : input . threadId ,
305- terminalId : "setup-output" ,
306- data : `${ wrapper } \r\nReady (vite)\r\nbackend\r\n__T3_SETUP_DONE___${ outputToken } :0\r\n$ ` ,
307- } ) ,
308- ) ;
294+ yield * publish ( {
295+ type : "output" ,
296+ threadId : input . threadId ,
297+ terminalId : "setup-output" ,
298+ data : `${ wrapper } \r\n% (\r\nsubsh> )\r\nReady (vite)\r\nBuild complete ( 42 files )\r\nbackend\r\n__T3_SETUP_DONE___${ outputToken } :0\r\n$ ` ,
299+ } ) ;
309300 assert . equal ( ( yield * observed . completion ! ) . exitCode , 0 ) ;
310- assert . deepEqual ( outputLines , [ "Ready (vite)" , "backend" ] ) ;
301+ assert . deepEqual ( outputLines , [ "Ready (vite)" , "Build complete ( 42 files )" , " backend"] ) ;
311302 } ) . pipe ( Effect . provide ( layer ) ) ;
312303 assert . equal ( listeners . size , 0 ) ;
313304 } ) ,
0 commit comments