@@ -122,6 +122,50 @@ describe("Task.ask queued message drain", () => {
122122 expect ( task . messageQueueService . isEmpty ( ) ) . toBe ( true )
123123 } )
124124
125+ it ( "does not auto-approve a protected command ask from a queued message" , async ( ) => {
126+ const task = await createTask ( {
127+ getState : async ( ) => ( { autoApprovalEnabled : true , alwaysAllowExecute : true } ) ,
128+ } )
129+ task . messageQueueService . addMessage ( "run it anyway" )
130+
131+ const ask = task . ask ( "command" , "rm -rf build" , false , undefined , true )
132+
133+ // The drain must not resolve the protected ask; only an explicit user
134+ // approval may.
135+ const premature = await Promise . race ( [
136+ ask ,
137+ new Promise < "pending" > ( ( resolve ) => setTimeout ( ( ) => resolve ( "pending" ) , 250 ) ) ,
138+ ] )
139+ expect ( premature ) . toBe ( "pending" )
140+ expect ( task . messageQueueService . isEmpty ( ) ) . toBe ( false )
141+
142+ task . approveAsk ( )
143+ const result = await ask
144+ expect ( result ) . toMatchObject ( { response : "yesButtonClicked" , text : undefined } )
145+ expect ( task . messageQueueService . messages [ 0 ] ?. text ) . toBe ( "run it anyway" )
146+ } )
147+
148+ it ( "does not auto-approve a protected command ask when a message is queued mid-wait" , async ( ) => {
149+ const task = await createTask ( {
150+ getState : async ( ) => ( { autoApprovalEnabled : true , alwaysAllowExecute : true } ) ,
151+ } )
152+
153+ const ask = task . ask ( "command" , "rm -rf build" , false , undefined , true )
154+ task . messageQueueService . addMessage ( "mid-wait message" )
155+
156+ const premature = await Promise . race ( [
157+ ask ,
158+ new Promise < "pending" > ( ( resolve ) => setTimeout ( ( ) => resolve ( "pending" ) , 250 ) ) ,
159+ ] )
160+ expect ( premature ) . toBe ( "pending" )
161+ expect ( task . messageQueueService . isEmpty ( ) ) . toBe ( false )
162+
163+ task . approveAsk ( )
164+ const result = await ask
165+ expect ( result ) . toMatchObject ( { response : "yesButtonClicked" , text : undefined } )
166+ expect ( task . messageQueueService . messages [ 0 ] ?. text ) . toBe ( "mid-wait message" )
167+ } )
168+
125169 it ( "claims lifecycle feedback that arrives while an ask is waiting" , async ( ) => {
126170 const task = await createTask ( )
127171 const ask = task . ask ( "tool" , JSON . stringify ( { tool : "finishTask" } ) , false )
0 commit comments