@@ -50,6 +50,44 @@ function userMessage(text, seq) {
5050 return event ;
5151}
5252
53+ function toolResultEvent ( text , isError , seq ) {
54+ return {
55+ seq,
56+ type : "tool/result" ,
57+ data : {
58+ message : {
59+ source : { kind : "tool" , callId : `call-${ seq } ` } ,
60+ content : [ {
61+ type : "tool-result" ,
62+ toolCallId : `call-${ seq } ` ,
63+ isError,
64+ content : [ { type : "text" , text } ]
65+ } ]
66+ }
67+ }
68+ } ;
69+ }
70+
71+ function codeDispatchEvent ( text , isError , seq ) {
72+ return {
73+ seq,
74+ type : "tool/code-dispatch" ,
75+ data : {
76+ isError,
77+ content : [ { type : "text" , text } ]
78+ }
79+ } ;
80+ }
81+
82+ function inboxMessage ( id , kind , text ) {
83+ return {
84+ id,
85+ role : "user" ,
86+ source : { kind } ,
87+ content : [ { type : "text" , text } ]
88+ } ;
89+ }
90+
5391test ( "parseSummaryJson extracts valid entries and skips malformed ones" , ( ) => {
5492 const parsed = parseSummaryJson ( `前导文字 {"a":1}
5593 [
@@ -293,6 +331,48 @@ test("invalid summary JSON leaves the seq window retryable", async () => {
293331 assert . equal ( store . count ( ) , 0 , "the valid empty retry remains a no-op" ) ;
294332} ) ;
295333
334+ test ( "an all-invalid summary leaves the same window retryable until valid memories are saved" , async ( t ) => {
335+ for ( const invalid of [
336+ [ { } ] ,
337+ [ { type : "unknown" , title : "无效类型" , content : "不能消费窗口" } ] ,
338+ [ { type : "history" , title : " " , content : "不能消费窗口" } , null , "garbage" ]
339+ ] ) {
340+ await t . test ( JSON . stringify ( invalid ) , async ( t ) => {
341+ let attempt = 0 ;
342+ const valid = { type : "history" , title : "重试成功" , content : "全无效摘要后仍保留原窗口" , importance : 3 } ;
343+ const { events, service, store, calls, summarizer } = setup ( { distillRateLimitIntervalMs : 0 } , {
344+ stream ( ) {
345+ return streamOf ( attempt ++ === 0 ? invalid : [ valid ] ) ( ) ;
346+ }
347+ } ) ;
348+ t . after ( ( ) => { summarizer . dispose ( ) ; store . close ( ) ; } ) ;
349+ const handler = events . find ( ( e ) => e . name === "session/event" ) . fn ;
350+ const session = {
351+ id : "s-all-invalid" ,
352+ requestHeader : ( ) => ( { config : { provider : "deepseek" , model : "deepseek-chat" } } ) ,
353+ events : [ userMessage ( "保留原窗口" , 1 ) , { seq : 2 , type : "turn/end" } ]
354+ } ;
355+
356+ await handler ( session , { seq : 2 , type : "turn/end" } ) ;
357+ assert . equal ( service . count ( ) , 0 ) ;
358+ await handler ( session , { seq : 2 , type : "turn/end" } ) ;
359+ assert . equal ( calls . length , 2 , "all-invalid entries must not consume the window" ) ;
360+ const firstTranscript = calls [ 0 ] . messages . find ( ( message ) => message . role === "user" ) . content [ 0 ] . text ;
361+ const retryTranscript = calls [ 1 ] . messages . find ( ( message ) => message . role === "user" ) . content [ 0 ] . text ;
362+ assert . equal ( retryTranscript , firstTranscript , "retry receives the original transcript" ) ;
363+ assert . equal ( service . count ( ) , 1 ) ;
364+ assert . equal ( service . list ( ) [ 0 ] . content , valid . content ) ;
365+ assert . ok ( service . listLlmAudits ( { source : "autoSummarize" } ) . some (
366+ ( audit ) => audit . status === "error" && audit . error_message === "invalid summary JSON"
367+ ) , "an all-invalid summary must be audited as an error" ) ;
368+
369+ await handler ( session , { seq : 2 , type : "turn/end" } ) ;
370+ assert . equal ( calls . length , 2 , "the successfully retried window is consumed once" ) ;
371+ assert . equal ( service . count ( ) , 1 ) ;
372+ } ) ;
373+ }
374+ } ) ;
375+
296376test ( "rolls back partial memory writes so retrying a failed window does not duplicate entries" , async ( ) => {
297377 const { events, store, service, calls } = setup (
298378 { distillRateLimitIntervalMs : 0 } ,
@@ -442,8 +522,8 @@ test("distills full transcript (tool calls, results, code output) with atomic-me
442522 events : [
443523 userMessage ( "帮我修这个 bug" ) ,
444524 { seq : 2 , type : "tool/call" , data : { name : "Bash" , arguments : "node test.js" } } ,
445- { seq : 3 , type : "tool/result" , data : { ok : false , output : " TypeError: x is not a function" } } ,
446- { seq : 4 , type : "tool/code-dispatch ", data : { ok : true , output : "fixed" } } ,
525+ toolResultEvent ( " TypeError: x is not a function", true , 3 ) ,
526+ codeDispatchEvent ( "fixed ", false , 4 ) ,
447527 { seq : 5 , type : "turn/end" }
448528 ]
449529 } ;
@@ -456,6 +536,50 @@ test("distills full transcript (tool calls, results, code output) with atomic-me
456536 assert . ok ( calls [ 0 ] . messages [ 0 ] . content [ 0 ] . text . includes ( "原子记忆" ) ) ;
457537} ) ;
458538
539+ test ( "collects real tool result and code dispatch payloads with failure status" , async ( ) => {
540+ const { events, calls } = setup ( { distillRateLimitIntervalMs : 0 } ) ;
541+ const handler = events . find ( ( e ) => e . name === "session/event" ) . fn ;
542+ const session = {
543+ id : "s-real-payloads" ,
544+ requestHeader : ( ) => ( { config : { provider : "deepseek" , model : "deepseek-chat" } } ) ,
545+ events : [
546+ userMessage ( "检查真实事件形状" , 1 ) ,
547+ toolResultEvent ( "TypeError: tool failed" , true , 2 ) ,
548+ codeDispatchEvent ( "代码执行结果" , false , 3 ) ,
549+ { seq : 4 , type : "turn/end" }
550+ ]
551+ } ;
552+
553+ await handler ( session , { seq : 4 , type : "turn/end" } ) ;
554+ const transcript = calls [ 0 ] . messages . find ( ( message ) => message . role === "user" ) . content [ 0 ] . text ;
555+ assert . match ( transcript , / 工 具 结 果 ( 失 败 ) : T y p e E r r o r : t o o l f a i l e d / ) ;
556+ assert . match ( transcript , / 代 码 执 行 ( 成 功 ) : 代 码 执 行 结 果 / ) ;
557+ } ) ;
558+
559+ test ( "collects subagent delivery once across inbox and user-message views" , async ( ) => {
560+ const { events, calls } = setup ( { distillRateLimitIntervalMs : 0 } ) ;
561+ const handler = events . find ( ( e ) => e . name === "session/event" ) . fn ;
562+ const delivery = inboxMessage ( "delivery-1" , "subagent-settled" , "子会话 closing message" ) ;
563+ const agentMessage = inboxMessage ( "delivery-2" , "agent-message" , "子代理补充报告" ) ;
564+ const injectedInstruction = inboxMessage ( "instruction-1" , "agent-instructions" , "不要把这条注入指令沉淀为记忆" ) ;
565+ const session = {
566+ id : "s-agent-delivery" ,
567+ requestHeader : ( ) => ( { config : { provider : "deepseek" , model : "deepseek-chat" } } ) ,
568+ events : [
569+ userMessage ( "检查子会话交付" , 1 ) ,
570+ { seq : 2 , type : "agent/inbox/spliced" , data : { inserted : [ delivery , agentMessage , injectedInstruction ] } } ,
571+ { seq : 3 , type : "user/message" , data : delivery } ,
572+ { seq : 4 , type : "turn/end" }
573+ ]
574+ } ;
575+
576+ await handler ( session , { seq : 4 , type : "turn/end" } ) ;
577+ const transcript = calls [ 0 ] . messages . find ( ( message ) => message . role === "user" ) . content [ 0 ] . text ;
578+ assert . equal ( transcript . match ( / 子 会 话 c l o s i n g m e s s a g e / g) ?. length , 1 ) ;
579+ assert . equal ( transcript . match ( / 子 代 理 补 充 报 告 / g) ?. length , 1 ) ;
580+ assert . ok ( ! transcript . includes ( "不要把这条注入指令沉淀为记忆" ) ) ;
581+ } ) ;
582+
459583test ( "keeps prefix trimming for tool arguments and tool results" , async ( ) => {
460584 const { events, calls } = setup ( { distillRateLimitIntervalMs : 0 } ) ;
461585 const handler = events . find ( ( e ) => e . name === "session/event" ) . fn ;
@@ -465,7 +589,7 @@ test("keeps prefix trimming for tool arguments and tool results", async () => {
465589 events : [
466590 userMessage ( "检查截断" , 1 ) ,
467591 { seq : 2 , type : "tool/call" , data : { name : "Bash" , arguments : `ARG_START ${ "a" . repeat ( 350 ) } ARG_END` } } ,
468- { seq : 3 , type : "tool/result" , data : { ok : true , output : `OUT_START ${ "b" . repeat ( 550 ) } OUT_END` } } ,
592+ toolResultEvent ( `OUT_START ${ "b" . repeat ( 550 ) } OUT_END` , false , 3 ) ,
469593 { seq : 4 , type : "turn/end" }
470594 ]
471595 } ;
0 commit comments