Skip to content

Commit 1408fad

Browse files
committed
fix(summarize): 补齐工具结果与子会话交付蒸馏
1 parent 5bd2dab commit 1408fad

5 files changed

Lines changed: 197 additions & 17 deletions

File tree

‎dsh-mneme/lib/lang.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dsh-mneme/lib/summarize.js‎

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ function parseSummaryJsonResult(raw) {
3333
content: item.content.trim(),
3434
importance: Number.isInteger(item.importance) ? Math.min(5, Math.max(1, item.importance)) : 3
3535
}));
36-
return { ok: true, entries };
36+
// 空数组表示模型明确判断本轮没有可沉淀内容;非空数组若全部无效,
37+
// 则不能消费窗口,否则无效输出会永久推进 seq 游标。
38+
return { ok: arr.length === 0 || entries.length > 0, entries };
3739
}
3840

3941
/** Extract a JSON array from LLM output that may contain prose around it. */
@@ -98,6 +100,8 @@ function eventSeq(event) {
98100
return Number.isSafeInteger(event?.seq) ? event.seq : undefined;
99101
}
100102

103+
const SUBAGENT_MESSAGE_KINDS = new Set(["agent-message", "subagent-settled"]);
104+
101105
// DSH 0.1.2-rc.1 起 Session 改用 snapshotEvents(),兼容旧版 .events。
102106
// snapshotEvents 的范围参数按 seq 传入;再做一次事件级过滤,是为了兼容
103107
// 旧实现忽略参数、或把边界解释为闭区间的情况,同时避免用数组下标充当游标。
@@ -125,6 +129,7 @@ function snapshotSessionEvents(session, afterSeq, throughSeq) {
125129
function collectMessages(session, maxChars = 8000, language = "zh", afterSeq, throughSeq) {
126130
const events = snapshotSessionEvents(session, afterSeq, throughSeq);
127131
const lines = [];
132+
const seenSubagentMessages = new Set();
128133
// 兼容严格形状 [{type:"text",text}] 与宽松形状 ["字符串", ...](lib-smoke 用例
129134
// 直接传字符串数组)。只取公开文本块;reasoning 私有推理块不进蒸馏上下文。
130135
const textOf = (content) => {
@@ -141,14 +146,33 @@ function collectMessages(session, maxChars = 8000, language = "zh", afterSeq, th
141146
if (n <= 1) return "…".slice(0, n);
142147
return `…${s.slice(-(n - 1))}`;
143148
};
149+
const appendSubagentMessage = (message) => {
150+
const kind = message?.source?.kind;
151+
if (!SUBAGENT_MESSAGE_KINDS.has(kind)) return;
152+
const text = textOf(message?.content);
153+
if (!text.trim()) return;
154+
const key = typeof message?.id === "string" && message.id
155+
? `id:${message.id}`
156+
: `content:${kind}:${text}`;
157+
if (seenSubagentMessages.has(key)) return;
158+
seenSubagentMessages.add(key);
159+
lines.push(STR.transcriptAgent[language](text));
160+
};
144161
for (const event of events) {
145162
const data = event?.data ?? {};
146163
const kind = data?.source?.kind;
147164
switch (event.type) {
148165
case "user/message": {
149-
if (kind !== undefined && kind !== "user") break;
166+
if (kind !== undefined && kind !== "user" && !SUBAGENT_MESSAGE_KINDS.has(kind)) break;
150167
const text = textOf(data?.content);
151-
if (text.trim()) lines.push(STR.transcriptUser[language](text));
168+
if (!text.trim()) break;
169+
if (SUBAGENT_MESSAGE_KINDS.has(kind)) appendSubagentMessage(data);
170+
else lines.push(STR.transcriptUser[language](text));
171+
break;
172+
}
173+
case "agent/inbox/spliced": {
174+
const inserted = Array.isArray(data?.inserted) ? data.inserted : [];
175+
for (const message of inserted) appendSubagentMessage(message);
152176
break;
153177
}
154178
case "assistant/message": {
@@ -167,14 +191,17 @@ function collectMessages(session, maxChars = 8000, language = "zh", afterSeq, th
167191
break;
168192
}
169193
case "tool/result": {
170-
const out = typeof data.output === "string" ? data.output : data.output ? JSON.stringify(data.output) : "";
171-
const status = data.ok === false ? STR.statusFail[language] : STR.statusOk[language];
194+
const result = Array.isArray(data?.message?.content)
195+
? data.message.content.find((block) => block?.type === "tool-result")
196+
: undefined;
197+
const out = textOf(result?.content);
198+
const status = result?.isError === true ? STR.statusFail[language] : STR.statusOk[language];
172199
lines.push(STR.transcriptToolResult[language](status, trim(out, 500)));
173200
break;
174201
}
175202
case "tool/code-dispatch": {
176-
const out = typeof data.output === "string" ? data.output : data.output ? JSON.stringify(data.output) : "";
177-
const status = data.ok === false ? STR.statusFail[language] : STR.statusOk[language];
203+
const out = textOf(data.content);
204+
const status = data.isError === true ? STR.statusFail[language] : STR.statusOk[language];
178205
lines.push(STR.transcriptCode[language](status, trim(out, 500)));
179206
break;
180207
}

‎dsh-mneme/src/lang.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dsh-mneme/src/summarize.js‎

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ function parseSummaryJsonResult(raw) {
3333
content: item.content.trim(),
3434
importance: Number.isInteger(item.importance) ? Math.min(5, Math.max(1, item.importance)) : 3
3535
}));
36-
return { ok: true, entries };
36+
// 空数组表示模型明确判断本轮没有可沉淀内容;非空数组若全部无效,
37+
// 则不能消费窗口,否则无效输出会永久推进 seq 游标。
38+
return { ok: arr.length === 0 || entries.length > 0, entries };
3739
}
3840

3941
/** Extract a JSON array from LLM output that may contain prose around it. */
@@ -98,6 +100,8 @@ function eventSeq(event) {
98100
return Number.isSafeInteger(event?.seq) ? event.seq : undefined;
99101
}
100102

103+
const SUBAGENT_MESSAGE_KINDS = new Set(["agent-message", "subagent-settled"]);
104+
101105
// DSH 0.1.2-rc.1 起 Session 改用 snapshotEvents(),兼容旧版 .events。
102106
// snapshotEvents 的范围参数按 seq 传入;再做一次事件级过滤,是为了兼容
103107
// 旧实现忽略参数、或把边界解释为闭区间的情况,同时避免用数组下标充当游标。
@@ -125,6 +129,7 @@ function snapshotSessionEvents(session, afterSeq, throughSeq) {
125129
function collectMessages(session, maxChars = 8000, language = "zh", afterSeq, throughSeq) {
126130
const events = snapshotSessionEvents(session, afterSeq, throughSeq);
127131
const lines = [];
132+
const seenSubagentMessages = new Set();
128133
// 兼容严格形状 [{type:"text",text}] 与宽松形状 ["字符串", ...](lib-smoke 用例
129134
// 直接传字符串数组)。只取公开文本块;reasoning 私有推理块不进蒸馏上下文。
130135
const textOf = (content) => {
@@ -141,14 +146,33 @@ function collectMessages(session, maxChars = 8000, language = "zh", afterSeq, th
141146
if (n <= 1) return "…".slice(0, n);
142147
return `…${s.slice(-(n - 1))}`;
143148
};
149+
const appendSubagentMessage = (message) => {
150+
const kind = message?.source?.kind;
151+
if (!SUBAGENT_MESSAGE_KINDS.has(kind)) return;
152+
const text = textOf(message?.content);
153+
if (!text.trim()) return;
154+
const key = typeof message?.id === "string" && message.id
155+
? `id:${message.id}`
156+
: `content:${kind}:${text}`;
157+
if (seenSubagentMessages.has(key)) return;
158+
seenSubagentMessages.add(key);
159+
lines.push(STR.transcriptAgent[language](text));
160+
};
144161
for (const event of events) {
145162
const data = event?.data ?? {};
146163
const kind = data?.source?.kind;
147164
switch (event.type) {
148165
case "user/message": {
149-
if (kind !== undefined && kind !== "user") break;
166+
if (kind !== undefined && kind !== "user" && !SUBAGENT_MESSAGE_KINDS.has(kind)) break;
150167
const text = textOf(data?.content);
151-
if (text.trim()) lines.push(STR.transcriptUser[language](text));
168+
if (!text.trim()) break;
169+
if (SUBAGENT_MESSAGE_KINDS.has(kind)) appendSubagentMessage(data);
170+
else lines.push(STR.transcriptUser[language](text));
171+
break;
172+
}
173+
case "agent/inbox/spliced": {
174+
const inserted = Array.isArray(data?.inserted) ? data.inserted : [];
175+
for (const message of inserted) appendSubagentMessage(message);
152176
break;
153177
}
154178
case "assistant/message": {
@@ -167,14 +191,17 @@ function collectMessages(session, maxChars = 8000, language = "zh", afterSeq, th
167191
break;
168192
}
169193
case "tool/result": {
170-
const out = typeof data.output === "string" ? data.output : data.output ? JSON.stringify(data.output) : "";
171-
const status = data.ok === false ? STR.statusFail[language] : STR.statusOk[language];
194+
const result = Array.isArray(data?.message?.content)
195+
? data.message.content.find((block) => block?.type === "tool-result")
196+
: undefined;
197+
const out = textOf(result?.content);
198+
const status = result?.isError === true ? STR.statusFail[language] : STR.statusOk[language];
172199
lines.push(STR.transcriptToolResult[language](status, trim(out, 500)));
173200
break;
174201
}
175202
case "tool/code-dispatch": {
176-
const out = typeof data.output === "string" ? data.output : data.output ? JSON.stringify(data.output) : "";
177-
const status = data.ok === false ? STR.statusFail[language] : STR.statusOk[language];
203+
const out = textOf(data.content);
204+
const status = data.isError === true ? STR.statusFail[language] : STR.statusOk[language];
178205
lines.push(STR.transcriptCode[language](status, trim(out, 500)));
179206
break;
180207
}

‎dsh-mneme/test/summarize.test.js‎

Lines changed: 127 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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+
5391
test("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+
296376
test("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, /工具结果(失败):TypeError: tool failed/);
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(/子会话 closing message/g)?.length, 1);
579+
assert.equal(transcript.match(/子代理补充报告/g)?.length, 1);
580+
assert.ok(!transcript.includes("不要把这条注入指令沉淀为记忆"));
581+
});
582+
459583
test("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

Comments
 (0)