@@ -1163,10 +1163,16 @@ export class AcpSessionRuntime extends Context.Service<
11631163 providerId : string ,
11641164 ) => Effect . Effect < EffectAcpSchema . DisableProviderResponse , EffectAcpErrors . AcpError > ;
11651165 readonly logout : Effect . Effect < EffectAcpSchema . LogoutResponse , EffectAcpErrors . AcpError > ;
1166- /** options.dispatched settles when cancel can target this prompt. */
1166+ /**
1167+ * options.dispatched settles when cancel can target this prompt. options.released lets the
1168+ * next prompt go out while this one's response is still held; it still resolves this call.
1169+ */
11671170 readonly prompt : (
11681171 payload : Omit < EffectAcpSchema . PromptRequest , "sessionId" > ,
1169- options ?: { readonly dispatched ?: Deferred . Deferred < void > } ,
1172+ options ?: {
1173+ readonly dispatched ?: Deferred . Deferred < void > ;
1174+ readonly released ?: Deferred . Deferred < void > ;
1175+ } ,
11701176 ) => Effect . Effect < EffectAcpSchema . PromptResponse , EffectAcpErrors . AcpError > ;
11711177 readonly cancel : Effect . Effect < void , EffectAcpErrors . AcpError > ;
11721178 readonly terminateProcessGroup ?: Effect . Effect < void , AcpProcessGroupTerminationError > ;
@@ -2376,6 +2382,17 @@ export const make = Effect.fn("AcpSessionRuntime.make")(function* (
23762382 yield * child . kill ( { forceKillAfter : "1 second" } ) . pipe ( Effect . ignore ) ;
23772383 } ) ;
23782384
2385+ const joinPrompt = (
2386+ fiber : Fiber . Fiber < EffectAcpSchema . PromptResponse , EffectAcpErrors . AcpError > ,
2387+ ) =>
2388+ Fiber . join ( fiber ) . pipe (
2389+ Effect . catchCauseIf (
2390+ ( cause ) => options . cancelBehavior !== "wait-for-prompt" && Cause . hasInterruptsOnly ( cause ) ,
2391+ ( _cause ) =>
2392+ Effect . succeed ( { stopReason : "cancelled" } satisfies EffectAcpSchema . PromptResponse ) ,
2393+ ) ,
2394+ ) ;
2395+
23792396 const cancel = Effect . gen ( function * ( ) {
23802397 const started = yield * getStartedState ;
23812398 const activePrompt = yield * Ref . get ( activePromptRef ) ;
@@ -2616,66 +2633,81 @@ export const make = Effect.fn("AcpSessionRuntime.make")(function* (
26162633 Effect . andThen ( runLoggedRequest ( "logout" , { } , acp . agent . logout ( { } ) ) ) ,
26172634 ) ,
26182635 prompt : ( payload , promptOptions ?) =>
2619- promptSerializationSemaphore . withPermit (
2620- Effect . acquireUseRelease (
2621- promptDispatchSemaphore . withPermit (
2622- Effect . gen ( function * ( ) {
2623- const started = yield * getStartedState ;
2624- yield * closeActiveAssistantSegment ( { queue : eventQueue , assistantSegmentRef } ) ;
2625- yield * Ref . set ( assistantUpdatesOpenRef , true ) ;
2626- const requestPayload = {
2627- sessionId : started . sessionId ,
2628- ...payload ,
2629- } satisfies EffectAcpSchema . PromptRequest ;
2630- const completed = yield * Deferred . make < void > ( ) ;
2631- const fiber = yield * runLoggedRequest (
2632- "session/prompt" ,
2633- requestPayload ,
2634- acp . agent . prompt ( requestPayload ) ,
2635- ) . pipe ( Effect . forkIn ( runtimeScope ) ) ;
2636- const active = { fiber, completed } satisfies AcpActivePrompt ;
2637- yield * Ref . set ( activePromptRef , Option . some ( active ) ) ;
2638- if ( promptOptions ?. dispatched ) {
2639- yield * Deferred . succeed ( promptOptions . dispatched , undefined ) ;
2640- }
2641- return active ;
2642- } ) . pipe ( notificationSemaphore . withPermit ) ,
2643- ) ,
2644- ( activePrompt ) =>
2645- Fiber . join ( activePrompt . fiber ) . pipe (
2646- Effect . catchCauseIf (
2647- ( cause ) =>
2648- options . cancelBehavior !== "wait-for-prompt" && Cause . hasInterruptsOnly ( cause ) ,
2649- ( _cause ) =>
2650- Effect . succeed ( {
2651- stopReason : "cancelled" ,
2652- } satisfies EffectAcpSchema . PromptResponse ) ,
2653- ) ,
2654- Effect . tap ( ( ) =>
2655- closeActiveAssistantSegment ( { queue : eventQueue , assistantSegmentRef } ) ,
2656- ) ,
2636+ promptSerializationSemaphore
2637+ . withPermit (
2638+ Effect . acquireUseRelease (
2639+ promptDispatchSemaphore . withPermit (
2640+ Effect . gen ( function * ( ) {
2641+ const started = yield * getStartedState ;
2642+ yield * closeActiveAssistantSegment ( { queue : eventQueue , assistantSegmentRef } ) ;
2643+ yield * Ref . set ( assistantUpdatesOpenRef , true ) ;
2644+ const requestPayload = {
2645+ sessionId : started . sessionId ,
2646+ ...payload ,
2647+ } satisfies EffectAcpSchema . PromptRequest ;
2648+ const completed = yield * Deferred . make < void > ( ) ;
2649+ const fiber = yield * runLoggedRequest (
2650+ "session/prompt" ,
2651+ requestPayload ,
2652+ acp . agent . prompt ( requestPayload ) ,
2653+ ) . pipe ( Effect . forkIn ( runtimeScope ) ) ;
2654+ const active = { fiber, completed } satisfies AcpActivePrompt ;
2655+ yield * Ref . set ( activePromptRef , Option . some ( active ) ) ;
2656+ if ( promptOptions ?. dispatched ) {
2657+ yield * Deferred . succeed ( promptOptions . dispatched , undefined ) ;
2658+ }
2659+ return active ;
2660+ } ) . pipe ( notificationSemaphore . withPermit ) ,
26572661 ) ,
2658- ( activePrompt , result ) =>
2659- Effect . gen ( function * ( ) {
2660- if (
2661- options . cancelBehavior === "wait-for-prompt" &&
2662- Exit . isFailure ( result ) &&
2663- Cause . hasInterrupts ( result . cause )
2664- ) {
2665- yield * retireRuntime (
2666- new EffectAcpErrors . AcpTransportError ( {
2667- method : "session/prompt" ,
2668- detail : "The ACP prompt stopped before the agent confirmed completion." ,
2669- cause : undefined ,
2670- } ) ,
2671- ) ;
2672- }
2673- yield * Fiber . interrupt ( activePrompt . fiber ) . pipe ( Effect . ignore ) ;
2674- yield * Ref . set ( activePromptRef , Option . none ( ) ) ;
2675- yield * Deferred . succeed ( activePrompt . completed , undefined ) ;
2676- } ) ,
2662+ ( activePrompt ) => {
2663+ const settled = joinPrompt ( activePrompt . fiber ) . pipe (
2664+ Effect . tap ( ( ) =>
2665+ closeActiveAssistantSegment ( { queue : eventQueue , assistantSegmentRef } ) ,
2666+ ) ,
2667+ Effect . map ( ( response ) => ( { _tag : "Settled" as const , response } ) ) ,
2668+ ) ;
2669+ return promptOptions ?. released === undefined
2670+ ? settled
2671+ : Effect . raceFirst (
2672+ settled ,
2673+ Deferred . await ( promptOptions . released ) . pipe (
2674+ Effect . as ( { _tag : "Released" as const , fiber : activePrompt . fiber } ) ,
2675+ ) ,
2676+ ) ;
2677+ } ,
2678+ ( activePrompt , result ) =>
2679+ Effect . gen ( function * ( ) {
2680+ if ( Exit . isSuccess ( result ) && result . value . _tag === "Released" ) {
2681+ yield * Ref . set ( activePromptRef , Option . none ( ) ) ;
2682+ yield * Deferred . succeed ( activePrompt . completed , undefined ) ;
2683+ return ;
2684+ }
2685+ if (
2686+ options . cancelBehavior === "wait-for-prompt" &&
2687+ Exit . isFailure ( result ) &&
2688+ Cause . hasInterrupts ( result . cause )
2689+ ) {
2690+ yield * retireRuntime (
2691+ new EffectAcpErrors . AcpTransportError ( {
2692+ method : "session/prompt" ,
2693+ detail : "The ACP prompt stopped before the agent confirmed completion." ,
2694+ cause : undefined ,
2695+ } ) ,
2696+ ) ;
2697+ }
2698+ yield * Fiber . interrupt ( activePrompt . fiber ) . pipe ( Effect . ignore ) ;
2699+ yield * Ref . set ( activePromptRef , Option . none ( ) ) ;
2700+ yield * Deferred . succeed ( activePrompt . completed , undefined ) ;
2701+ } ) ,
2702+ ) ,
2703+ )
2704+ . pipe (
2705+ Effect . flatMap ( ( outcome ) =>
2706+ outcome . _tag === "Settled"
2707+ ? Effect . succeed ( outcome . response )
2708+ : joinPrompt ( outcome . fiber ) ,
2709+ ) ,
26772710 ) ,
2678- ) ,
26792711 cancel :
26802712 options . cancelBehavior === "wait-for-prompt"
26812713 ? promptDispatchSemaphore . withPermit ( cancel )
0 commit comments