@@ -248,9 +248,24 @@ const advanceIdleClock = Effect.gen(function* () {
248248} ) ;
249249
250250it . layer ( layerOpenCodeTextGenerationTest ) ( "OpenCodeTextGeneration" , ( it ) => {
251- it . effect ( "cancels an in-flight session creation before prompting" , ( ) =>
251+ it . effect ( "cancels or times out an in-flight session creation before prompting" , ( ) =>
252252 withOpenCodeTextGeneration ( EXISTING_SERVER_OPENCODE_SETTINGS , ( textGeneration ) =>
253253 Effect . gen ( function * ( ) {
254+ const timedOut = yield * Deferred . make < AbortSignal | undefined > ( ) ;
255+ runtimeMock . state . onSessionCreate = ( signal ) => {
256+ Deferred . doneUnsafe ( timedOut , Effect . succeed ( signal ) ) ;
257+ return new Promise < never > ( ( ) => { } ) ;
258+ } ;
259+ const timedOutFiber = yield * textGeneration
260+ . generateCommitMessage ( DEFAULT_COMMIT_MESSAGE_INPUT )
261+ . pipe ( Effect . forkChild ) ;
262+ const timedOutSignal = yield * Deferred . await ( timedOut ) ;
263+ yield * TestClock . adjust ( Duration . minutes ( 3 ) ) ;
264+ const timeoutError = yield * Fiber . join ( timedOutFiber ) . pipe ( Effect . flip ) ;
265+ expect ( timeoutError ) . toBeInstanceOf ( TextGenerationError ) ;
266+ expect ( timeoutError . detail ) . toBe ( "OpenCode did not finish generating in time." ) ;
267+ expect ( timedOutSignal ?. aborted ) . toBe ( true ) ;
268+
254269 const started = yield * Deferred . make < AbortSignal | undefined > ( ) ;
255270 runtimeMock . state . onSessionCreate = ( signal ) => {
256271 Deferred . doneUnsafe ( started , Effect . succeed ( signal ) ) ;
@@ -368,6 +383,34 @@ it.layer(layerOpenCodeTextGenerationTest)("OpenCodeTextGeneration", (it) => {
368383 ) ,
369384 ) ;
370385
386+ it . effect ( "gives up and aborts the session when a prompt never settles" , ( ) =>
387+ withOpenCodeTextGeneration ( DEFAULT_OPENCODE_SETTINGS , ( textGeneration ) =>
388+ Effect . gen ( function * ( ) {
389+ const started = yield * Deferred . make < AbortSignal | undefined > ( ) ;
390+ let sessionAborts = 0 ;
391+ runtimeMock . state . onPrompt = ( signal ) => {
392+ Deferred . doneUnsafe ( started , Effect . succeed ( signal ) ) ;
393+ return new Promise < never > ( ( ) => { } ) ;
394+ } ;
395+ runtimeMock . state . onAbort = ( ) => {
396+ sessionAborts += 1 ;
397+ return Promise . reject ( new Error ( "abort observed" ) ) ;
398+ } ;
399+ const fiber = yield * textGeneration
400+ . generateCommitMessage ( DEFAULT_COMMIT_MESSAGE_INPUT )
401+ . pipe ( Effect . forkChild ) ;
402+ const signal = yield * Deferred . await ( started ) ;
403+ yield * TestClock . adjust ( Duration . minutes ( 3 ) ) ;
404+
405+ const error = yield * Fiber . join ( fiber ) . pipe ( Effect . flip ) ;
406+ expect ( error ) . toBeInstanceOf ( TextGenerationError ) ;
407+ expect ( error . detail ) . toBe ( "OpenCode did not finish generating in time." ) ;
408+ expect ( signal ?. aborted ) . toBe ( true ) ;
409+ expect ( sessionAborts ) . toBe ( 1 ) ;
410+ } ) ,
411+ ) ,
412+ ) ;
413+
371414 it . effect ( "uses an environment-only password for a locally spawned server" , ( ) =>
372415 withOpenCodeTextGeneration (
373416 DEFAULT_OPENCODE_SETTINGS ,
0 commit comments