@@ -55,6 +55,107 @@ const held = {
5555 onInterrupt : ( { sessionID } ) => [ interrupted ( sessionID ) ] ,
5656} satisfies WireOptions
5757
58+ test ( "streams every execution submitted by a still-running command" , async ( ) => {
59+ const gate = Promise . withResolvers < Response > ( )
60+ await using acp = await startSession ( {
61+ fetch : ( request ) => ( request . method === "POST" && request . path . endsWith ( "/command" ) ? gate . promise : undefined ) ,
62+ } )
63+ let responded = false
64+ const prompt = acp . prompt ( acp . sessionId , "/review now" ) . then ( ( result ) => {
65+ responded = true
66+ return result
67+ } )
68+ try {
69+ await acp . until ( ( ) => acp . server . requests . some ( ( request ) => request . path . endsWith ( "/command" ) ) )
70+ acp . server . send (
71+ delivered ( acp . sessionId , "msg_command_owned" ) ,
72+ durableEvent ( "session.execution.started" , { sessionID : acp . sessionId } ) ,
73+ textDelta ( acp . sessionId , "msg_phase1" , "phase one" ) ,
74+ )
75+ await acp . waitForUpdate (
76+ ( item ) =>
77+ item . update . sessionUpdate === "agent_message_chunk" &&
78+ item . update . content . type === "text" &&
79+ item . update . content . text === "phase one" ,
80+ )
81+ acp . server . send (
82+ succeeded ( acp . sessionId ) ,
83+ delivered ( acp . sessionId , "msg_command_next" ) ,
84+ durableEvent ( "session.execution.started" , { sessionID : acp . sessionId } ) ,
85+ textDelta ( acp . sessionId , "msg_phase2" , "phase two" ) ,
86+ succeeded ( acp . sessionId ) ,
87+ )
88+ await acp . waitForUpdate (
89+ ( item ) =>
90+ item . update . sessionUpdate === "agent_message_chunk" &&
91+ item . update . content . type === "text" &&
92+ item . update . content . text === "phase two" ,
93+ )
94+ expect ( responded ) . toBe ( false )
95+ gate . resolve ( new Response ( null , { status : 204 } ) )
96+ expect ( ( await prompt ) . stopReason ) . toBe ( "end_turn" )
97+ } finally {
98+ gate . resolve ( new Response ( null , { status : 204 } ) )
99+ }
100+ } )
101+
102+ test ( "a returned command waits for the current execution's final text and terminal event" , async ( ) => {
103+ const gate = Promise . withResolvers < Response > ( )
104+ await using acp = await startSession ( {
105+ fetch : ( request ) => ( request . method === "POST" && request . path . endsWith ( "/command" ) ? gate . promise : undefined ) ,
106+ } )
107+ let responded = false
108+ const prompt = acp . prompt ( acp . sessionId , "/review now" ) . then ( ( result ) => {
109+ responded = true
110+ return result
111+ } )
112+ await acp . until ( ( ) => acp . server . requests . some ( ( request ) => request . path . endsWith ( "/command" ) ) )
113+ acp . server . send (
114+ delivered ( acp . sessionId , "msg_owned" ) ,
115+ durableEvent ( "session.execution.started" , { sessionID : acp . sessionId } ) ,
116+ textDelta ( acp . sessionId , "msg_text" , "before return" ) ,
117+ )
118+ await acp . waitForUpdate ( ( item ) => item . update . sessionUpdate === "agent_message_chunk" )
119+ gate . resolve ( new Response ( null , { status : 204 } ) )
120+ await new Promise ( ( resolve ) => setTimeout ( resolve , 20 ) )
121+ expect ( responded ) . toBe ( false )
122+ acp . server . send ( textDelta ( acp . sessionId , "msg_text" , "final text" ) , succeeded ( acp . sessionId ) )
123+ expect ( ( await prompt ) . stopReason ) . toBe ( "end_turn" )
124+ expect (
125+ acp . updates . some (
126+ ( item ) =>
127+ item . update . sessionUpdate === "agent_message_chunk" &&
128+ item . update . content . type === "text" &&
129+ item . update . content . text === "final text" ,
130+ ) ,
131+ ) . toBe ( true )
132+ } )
133+
134+ test ( "a command that returns before its expanded prompt starts still streams" , async ( ) => {
135+ const gate = Promise . withResolvers < Response > ( )
136+ await using acp = await startSession ( {
137+ fetch : ( request ) => ( request . method === "POST" && request . path . endsWith ( "/command" ) ? gate . promise : undefined ) ,
138+ } )
139+ const prompt = acp . prompt ( acp . sessionId , "/review now" )
140+ await acp . until ( ( ) => acp . server . requests . some ( ( request ) => request . path . endsWith ( "/command" ) ) )
141+ gate . resolve ( new Response ( null , { status : 204 } ) )
142+ await new Promise ( ( resolve ) => setTimeout ( resolve , 20 ) )
143+ acp . server . send (
144+ delivered ( acp . sessionId , "msg_command_owned" ) ,
145+ durableEvent ( "session.execution.started" , { sessionID : acp . sessionId } ) ,
146+ textDelta ( acp . sessionId , "msg_expanded" , "expanded output" ) ,
147+ succeeded ( acp . sessionId ) ,
148+ )
149+ await acp . waitForUpdate (
150+ ( item ) =>
151+ item . update . sessionUpdate === "agent_message_chunk" &&
152+ item . update . content . type === "text" &&
153+ item . update . content . text === "expanded output" ,
154+ )
155+ expect ( ( await prompt ) . stopReason ) . toBe ( "end_turn" )
156+ } )
157+
158+
58159describe ( "acp prompt turns over the wire" , ( ) => {
59160 test ( "streams an admitted turn and resolves with usage after its terminal event" , async ( ) => {
60161 const releaseAdmission = Promise . withResolvers < void > ( )
0 commit comments