@@ -1986,9 +1986,10 @@ pub async fn run_prompt_task(
19861986 } else {
19871987 None
19881988 } ;
1989- let triggering_ids : HashSet < String > = b
1989+ let rendered_batch_ids : HashSet < String > = b
19901990 . events
19911991 . iter ( )
1992+ . chain ( b. cancelled_events . iter ( ) )
19921993 . map ( |event| event. event . id . to_hex ( ) )
19931994 . collect ( ) ;
19941995 let delivered_ids = agent
@@ -2005,8 +2006,8 @@ pub async fn run_prompt_task(
20052006 . any ( |event_id| delivered_ids. contains ( event_id) )
20062007 } ) ;
20072008 let conversation_context =
2008- conversation_context_delta ( conversation_context, & delivered_ids, & triggering_ids ) ;
2009- pending_delivered_event_ids. extend ( triggering_ids ) ;
2009+ conversation_context_delta ( conversation_context, & delivered_ids, & rendered_batch_ids ) ;
2010+ pending_delivered_event_ids. extend ( rendered_batch_ids ) ;
20102011 pending_delivered_event_ids. extend ( conversation_context_event_ids (
20112012 conversation_context. as_ref ( ) ,
20122013 ) ) ;
@@ -5696,6 +5697,175 @@ done"#
56965697 ) ;
56975698 }
56985699
5700+ #[ tokio:: test]
5701+ async fn merged_cancel_prompt_commits_and_deduplicates_all_rendered_event_ids ( ) {
5702+ use tokio:: io:: { AsyncReadExt , AsyncWriteExt } ;
5703+
5704+ let channel_id = Uuid :: new_v4 ( ) ;
5705+ let keys = Keys :: generate ( ) ;
5706+ let carry_over = EventBuilder :: new ( Kind :: Custom ( 9 ) , "merged carry-over sentinel" )
5707+ . sign_with_keys ( & keys)
5708+ . unwrap ( ) ;
5709+ let carry_over_id = carry_over. id . to_hex ( ) ;
5710+ let new_event = EventBuilder :: new ( Kind :: Custom ( 9 ) , "merged new-event sentinel" )
5711+ . sign_with_keys ( & keys)
5712+ . unwrap ( ) ;
5713+ let new_event_id = new_event. id . to_hex ( ) ;
5714+ let next_event = EventBuilder :: new ( Kind :: Custom ( 9 ) , "ordinary next-turn sentinel" )
5715+ . sign_with_keys ( & keys)
5716+ . unwrap ( ) ;
5717+ let merged_batch = FlushBatch {
5718+ channel_id,
5719+ events : vec ! [ crate :: queue:: BatchEvent {
5720+ event: new_event. clone( ) ,
5721+ prompt_tag: "test" . into( ) ,
5722+ received_at: std:: time:: Instant :: now( ) ,
5723+ } ] ,
5724+ cancelled_events : vec ! [ crate :: queue:: BatchEvent {
5725+ event: carry_over. clone( ) ,
5726+ prompt_tag: "test" . into( ) ,
5727+ received_at: std:: time:: Instant :: now( ) ,
5728+ } ] ,
5729+ cancel_reason : Some ( crate :: queue:: CancelReason :: Steer ) ,
5730+ } ;
5731+ let next_batch = FlushBatch {
5732+ channel_id,
5733+ events : vec ! [ crate :: queue:: BatchEvent {
5734+ event: next_event,
5735+ prompt_tag: "test" . into( ) ,
5736+ received_at: std:: time:: Instant :: now( ) ,
5737+ } ] ,
5738+ cancelled_events : vec ! [ ] ,
5739+ cancel_reason : None ,
5740+ } ;
5741+
5742+ // Return both merged events as DM history. They must be excluded from
5743+ // the merged prompt's context and, after success, from the next turn.
5744+ let listener = tokio:: net:: TcpListener :: bind ( "127.0.0.1:0" )
5745+ . await
5746+ . expect ( "bind context server" ) ;
5747+ let base_url = format ! ( "http://{}" , listener. local_addr( ) . unwrap( ) ) ;
5748+ let response_body = serde_json:: to_string ( & vec ! [ carry_over, new_event] ) . unwrap ( ) ;
5749+ let server = tokio:: spawn ( async move {
5750+ while let Ok ( ( mut socket, _) ) = listener. accept ( ) . await {
5751+ let mut request = vec ! [ 0 ; 16 * 1024 ] ;
5752+ let _ = socket. read ( & mut request) . await ;
5753+ let response = format ! (
5754+ "HTTP/1.1 200 OK\r \n Content-Type: application/json\r \n Content-Length: {}\r \n Connection: close\r \n \r \n {}" ,
5755+ response_body. len( ) , response_body
5756+ ) ;
5757+ let _ = socket. write_all ( response. as_bytes ( ) ) . await ;
5758+ }
5759+ } ) ;
5760+
5761+ let capture = std:: env:: temp_dir ( ) . join ( format ! (
5762+ "buzz-acp-merged-delivery-wire-{}.ndjson" ,
5763+ Uuid :: new_v4( )
5764+ ) ) ;
5765+ let quoted_capture = capture. to_string_lossy ( ) . replace ( '\'' , "'\\ ''" ) ;
5766+ let script = format ! (
5767+ r#"count=0
5768+ while IFS= read -r line; do
5769+ printf '%s\n' "$line" >> '{quoted_capture}'
5770+ printf '%s\n' "{{\"jsonrpc\":\"2.0\",\"id\":$count,\"result\":{{\"stopReason\":\"end_turn\"}}}}"
5771+ count=$((count + 1))
5772+ done"#
5773+ ) ;
5774+ let acp = AcpClient :: spawn ( "bash" , & [ "-c" . into ( ) , script] , & [ ] , false )
5775+ . await
5776+ . expect ( "spawn wire-capture ACP" ) ;
5777+ let mut agent = OwnedAgent {
5778+ index : 0 ,
5779+ acp,
5780+ state : SessionState :: default ( ) ,
5781+ model_capabilities : None ,
5782+ desired_model : None ,
5783+ model_overridden : false ,
5784+ agent_name : "legacy-test-agent" . into ( ) ,
5785+ goose_system_prompt_supported : None ,
5786+ protocol_version : 1 ,
5787+ } ;
5788+ agent
5789+ . state
5790+ . sessions
5791+ . insert ( channel_id, "live-session" . into ( ) ) ;
5792+ agent
5793+ . state
5794+ . deliveries
5795+ . insert ( channel_id, ChannelDeliveryState :: default ( ) ) ;
5796+
5797+ let mut ctx = make_prompt_context_no_owner ( ) ;
5798+ ctx. context_message_limit = 10 ;
5799+ ctx. rest_client . base_url = base_url. clone ( ) ;
5800+ ctx. channel_info = ChannelInfoResolver :: new (
5801+ HashMap :: from ( [ (
5802+ channel_id,
5803+ crate :: relay:: ChannelInfo {
5804+ name : "test-dm" . into ( ) ,
5805+ channel_type : "dm" . into ( ) ,
5806+ } ,
5807+ ) ] ) ,
5808+ RestClient {
5809+ http : reqwest:: Client :: new ( ) ,
5810+ base_url,
5811+ keys : ctx. agent_keys . clone ( ) ,
5812+ auth_tag_json : None ,
5813+ } ,
5814+ ) ;
5815+ let ctx = Arc :: new ( ctx) ;
5816+ let ( result_tx, mut result_rx) = mpsc:: unbounded_channel ( ) ;
5817+
5818+ for ( turn_id, batch) in [ ( "merged-turn" , merged_batch) , ( "next-turn" , next_batch) ] {
5819+ run_prompt_task (
5820+ agent,
5821+ Some ( batch) ,
5822+ None ,
5823+ Arc :: clone ( & ctx) ,
5824+ result_tx. clone ( ) ,
5825+ None ,
5826+ turn_id. into ( ) ,
5827+ )
5828+ . await ;
5829+ let result = result_rx. recv ( ) . await . expect ( "prompt result" ) ;
5830+ assert ! ( matches!(
5831+ result. outcome,
5832+ PromptOutcome :: Ok ( StopReason :: EndTurn )
5833+ ) ) ;
5834+ agent = result. agent ;
5835+ }
5836+ let delivery = & agent. state . deliveries [ & channel_id] ;
5837+ assert ! ( delivery. delivered_event_ids. contains( & carry_over_id) ) ;
5838+ assert ! ( delivery. delivered_event_ids. contains( & new_event_id) ) ;
5839+ agent. acp . shutdown ( ) . await ;
5840+ server. abort ( ) ;
5841+
5842+ let requests: Vec < serde_json:: Value > = std:: fs:: read_to_string ( & capture)
5843+ . expect ( "read captured prompts" )
5844+ . lines ( )
5845+ . map ( |line| serde_json:: from_str ( line) . expect ( "captured prompt JSON" ) )
5846+ . collect ( ) ;
5847+ std:: fs:: remove_file ( & capture) . expect ( "remove prompt capture" ) ;
5848+ assert_eq ! ( requests. len( ) , 2 ) ;
5849+ let wire = |index : usize | {
5850+ requests[ index] [ "params" ] [ "prompt" ]
5851+ . as_array ( )
5852+ . expect ( "prompt blocks" )
5853+ . iter ( )
5854+ . filter_map ( |block| block[ "text" ] . as_str ( ) )
5855+ . collect :: < Vec < _ > > ( )
5856+ . join ( "\n " )
5857+ } ;
5858+ let merged_wire = wire ( 0 ) ;
5859+ assert_eq ! ( merged_wire. matches( "merged carry-over sentinel" ) . count( ) , 1 ) ;
5860+ assert_eq ! ( merged_wire. matches( "merged new-event sentinel" ) . count( ) , 1 ) ;
5861+ let next_wire = wire ( 1 ) ;
5862+ assert ! ( next_wire. contains( "ordinary next-turn sentinel" ) ) ;
5863+ assert ! ( !next_wire. contains( "merged carry-over sentinel" ) ) ;
5864+ assert ! ( !next_wire. contains( "merged new-event sentinel" ) ) ;
5865+ assert ! ( !next_wire. contains( & carry_over_id) ) ;
5866+ assert ! ( !next_wire. contains( & new_event_id) ) ;
5867+ }
5868+
56995869 #[ tokio:: test]
57005870 async fn late_successful_steer_ack_excludes_event_from_next_channel_wire_prompt ( ) {
57015871 use tokio:: io:: { AsyncReadExt , AsyncWriteExt } ;
0 commit comments