dsh-desktop-enhance 0.10.0 → 0.10.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/lib/index.d.ts +8 -18
- package/lib/index.js +380 -203
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -87,7 +87,7 @@ Web 版(浏览器里打开的那种)**不提供插件查找的默认快捷
|
|
|
87
87
|
|
|
88
88
|
### 压缩后恢复近期原文
|
|
89
89
|
|
|
90
|
-
|
|
90
|
+
在摘要旁补一份可读的近期对话备忘录:从宿主保留尾部之前往前取最近 10 个有效轮,只保留人类对话与助手最终回复,并将历史回复中的 `dsh-ui` 组件提取为干净的纯文本/Markdown。预算上限为 32,768 估算 tokens;上下文占用弹窗可按会话调整轮数和预算,轮数设为 0 后停止未来恢复。超预算先丢最老整轮;只有最新单轮也放不下时,才对助手答复做明确标记的头尾摘录,人类输入与审批答案不截断。图片仅恢复名称和附件定位,不重发像素。弹窗可查看上次实际恢复的总轮数、部分轮与原文。
|
|
91
91
|
|
|
92
92
|
原文提取不额外调用模型,不把历史命令当成新的授权;预算维护仍可能调用原生摘要。Fork 沿用现有规则,不复制会话设置覆盖。Host 变更需重启 App,范围与限制见[近期原文恢复](docs/features/recent-conversation.md)。
|
|
93
93
|
|
package/lib/index.d.ts
CHANGED
|
@@ -82,29 +82,20 @@ interface RecoveryTextBlock {
|
|
|
82
82
|
interface RecentConversationEntry {
|
|
83
83
|
readonly seq: number;
|
|
84
84
|
readonly turn: number;
|
|
85
|
-
readonly
|
|
86
|
-
readonly role: 'user' | 'assistant' | 'human-answer' | 'agent-report';
|
|
87
|
-
readonly source: Record<string, unknown>;
|
|
85
|
+
readonly role: 'user' | 'assistant' | 'human-answer';
|
|
88
86
|
readonly status: string;
|
|
89
87
|
readonly text: string;
|
|
90
|
-
readonly originalLength: number;
|
|
91
88
|
readonly ranges: readonly (readonly [number, number])[];
|
|
92
89
|
}
|
|
93
|
-
interface
|
|
94
|
-
readonly schemaVersion: 1;
|
|
95
|
-
readonly sessionId: string;
|
|
96
|
-
readonly throughSeq: number;
|
|
97
|
-
readonly entries: readonly RecentConversationEntry[];
|
|
98
|
-
readonly omitted: readonly {
|
|
99
|
-
readonly seq: number;
|
|
100
|
-
readonly turn: number;
|
|
101
|
-
readonly reason: string;
|
|
102
|
-
}[];
|
|
103
|
-
readonly estimatedTokens: number;
|
|
90
|
+
interface RecentConversationSummary {
|
|
104
91
|
readonly turns: {
|
|
105
92
|
readonly complete: readonly number[];
|
|
106
93
|
readonly partial: readonly number[];
|
|
107
94
|
};
|
|
95
|
+
readonly estimatedTokens: number;
|
|
96
|
+
}
|
|
97
|
+
interface RecentConversationRecord extends RecentConversationSummary {
|
|
98
|
+
readonly entries: readonly RecentConversationEntry[];
|
|
108
99
|
}
|
|
109
100
|
type RecentConversationPlan = {
|
|
110
101
|
readonly status: 'prepared';
|
|
@@ -120,12 +111,11 @@ interface Input {
|
|
|
120
111
|
readonly events: readonly RecentConversationEvent[];
|
|
121
112
|
readonly surfaceNodes: readonly number[];
|
|
122
113
|
readonly compactedSeqs: readonly number[];
|
|
123
|
-
readonly sessionId: string;
|
|
124
114
|
readonly policy: RecentConversationPolicy;
|
|
125
115
|
readonly budgetTokens: number;
|
|
126
116
|
}
|
|
127
117
|
declare function recoveryTextCost(value: string | readonly RecoveryTextBlock[]): number;
|
|
128
|
-
declare function
|
|
118
|
+
declare function readRecentConversationSummary(value: unknown): RecentConversationSummary | null;
|
|
129
119
|
declare function planRecentConversation(input: Input): RecentConversationPlan;
|
|
130
120
|
//#endregion
|
|
131
121
|
//#region src/shared/suggest.d.ts
|
|
@@ -909,7 +899,7 @@ export declare const __test: {
|
|
|
909
899
|
recentConversationTokenAdjustment: typeof recentConversationTokenAdjustment;
|
|
910
900
|
withoutRecentConversationRecovery: typeof withoutRecentConversationRecovery;
|
|
911
901
|
planRecentConversation: typeof planRecentConversation;
|
|
912
|
-
|
|
902
|
+
readRecentConversationSummary: typeof readRecentConversationSummary;
|
|
913
903
|
recoveryTextCost: typeof recoveryTextCost;
|
|
914
904
|
imageTokensForModel: typeof imageTokensForModel;
|
|
915
905
|
installImagePricing: typeof installImagePricing;
|
package/lib/index.js
CHANGED
|
@@ -199,46 +199,273 @@ function clampCap(cap) {
|
|
|
199
199
|
return rounded;
|
|
200
200
|
}
|
|
201
201
|
//#endregion
|
|
202
|
+
//#region src/shared/recent-conversation-text.ts
|
|
203
|
+
const OMITTED = "[结构化内容未展开]";
|
|
204
|
+
function object$2(value) {
|
|
205
|
+
return value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
|
|
206
|
+
}
|
|
207
|
+
function text(value) {
|
|
208
|
+
if (typeof value === "string") return value;
|
|
209
|
+
if (typeof value === "number" || typeof value === "boolean") return String(value);
|
|
210
|
+
const item = object$2(value);
|
|
211
|
+
if (typeof item.$computed === "string") return `{{${item.$computed}}}`;
|
|
212
|
+
return value == null ? "" : OMITTED;
|
|
213
|
+
}
|
|
214
|
+
function codeFence(code, lang = "") {
|
|
215
|
+
const size = Math.max(2, ...[...code.matchAll(/`+/g)].map((match) => match[0].length)) + 1;
|
|
216
|
+
const fence = "`".repeat(size);
|
|
217
|
+
return `${fence}${lang}\n${code}\n${fence}`;
|
|
218
|
+
}
|
|
219
|
+
function named(title, desc) {
|
|
220
|
+
const head = text(title), body = text(desc);
|
|
221
|
+
return head && body ? `**${head}**${/[??!!。::]$/.test(head) ? " " : ":"}${body}` : head || body;
|
|
222
|
+
}
|
|
223
|
+
function limited(value, budget, max = 200) {
|
|
224
|
+
if (!Array.isArray(value)) return [];
|
|
225
|
+
if (value.length > max) budget.truncated = true;
|
|
226
|
+
return value.slice(0, max);
|
|
227
|
+
}
|
|
228
|
+
function nodes(value, budget, depth) {
|
|
229
|
+
return limited(value, budget).map((item) => node(item, budget, depth)).filter(Boolean).join("\n\n");
|
|
230
|
+
}
|
|
231
|
+
function node(raw, budget, depth) {
|
|
232
|
+
if (depth > 8 || budget.nodes >= 200) {
|
|
233
|
+
budget.truncated = true;
|
|
234
|
+
return "";
|
|
235
|
+
}
|
|
236
|
+
budget.nodes++;
|
|
237
|
+
if (typeof raw === "string") return raw;
|
|
238
|
+
const n = object$2(raw), type = n.type;
|
|
239
|
+
const title = text(n.title), caption = text(n.caption);
|
|
240
|
+
let body = "";
|
|
241
|
+
switch (type) {
|
|
242
|
+
case "spacer":
|
|
243
|
+
case "icon": return text(n.label);
|
|
244
|
+
case "divider":
|
|
245
|
+
case "arrow": return text(n.label);
|
|
246
|
+
case "text":
|
|
247
|
+
case "callout":
|
|
248
|
+
body = text(n.content ?? n.text);
|
|
249
|
+
break;
|
|
250
|
+
case "badge":
|
|
251
|
+
body = `[${text(n.label)}]`;
|
|
252
|
+
break;
|
|
253
|
+
case "avatar":
|
|
254
|
+
body = text(n.name);
|
|
255
|
+
break;
|
|
256
|
+
case "hero":
|
|
257
|
+
case "stat":
|
|
258
|
+
body = `- ${named(n.label, n.value)}${n.delta ? ` (${text(n.delta)})` : ""}`;
|
|
259
|
+
break;
|
|
260
|
+
case "progress":
|
|
261
|
+
body = `- ${named(n.label ?? "进度", n.valueLabel ?? `${text(n.value)}%`)}`;
|
|
262
|
+
break;
|
|
263
|
+
case "keyvalue":
|
|
264
|
+
body = limited(n.pairs, budget).map((p) => `- ${named(p.key, p.value)}`).join("\n");
|
|
265
|
+
break;
|
|
266
|
+
case "list":
|
|
267
|
+
body = limited(n.items, budget).map((item) => {
|
|
268
|
+
if (typeof item === "string") return `- ${item}`;
|
|
269
|
+
if (item?.type) return node(item, budget, depth + 1);
|
|
270
|
+
const p = object$2(item);
|
|
271
|
+
return `- ${named(p.title ?? p.label ?? p.name, p.desc ?? p.description ?? p.content ?? p.text ?? p.body ?? p.detail)}`;
|
|
272
|
+
}).join("\n");
|
|
273
|
+
break;
|
|
274
|
+
case "steps":
|
|
275
|
+
case "timeline":
|
|
276
|
+
body = limited(type === "steps" ? n.steps : n.items, budget).map((p, i) => `${i + 1}. ${named(p.title, p.desc)}${p.time ? ` (${text(p.time)})` : ""}`).join("\n");
|
|
277
|
+
break;
|
|
278
|
+
case "table": {
|
|
279
|
+
if (!Array.isArray(n.columns) || !Array.isArray(n.rows)) return "[组件 table 内容不完整,已省略]";
|
|
280
|
+
const cell = (value) => text(value).replaceAll("|", "\\|").replaceAll("\n", " ");
|
|
281
|
+
const columns = limited(n.columns, budget, 12);
|
|
282
|
+
const rows = limited(n.rows, budget, 50);
|
|
283
|
+
body = [
|
|
284
|
+
`| ${columns.map(cell).join(" | ")} |`,
|
|
285
|
+
`| ${columns.map(() => "---").join(" | ")} |`,
|
|
286
|
+
...rows.map((row) => `| ${limited(row, budget, 12).map(cell).join(" | ")} |`)
|
|
287
|
+
].join("\n");
|
|
288
|
+
for (const [i, detail] of limited(n.details, budget, 50).entries()) if (detail) body += `\n\n**${cell(rows[i]?.[0])} 明细**\n${nodes(detail, budget, depth + 1)}`;
|
|
289
|
+
break;
|
|
290
|
+
}
|
|
291
|
+
case "blocks":
|
|
292
|
+
body = limited(n.rows, budget).map((row) => {
|
|
293
|
+
const cells = limited(row.cells, budget).map((c) => typeof c === "object" && c !== null ? `${text(c.text)}${c.sub ? ` (${text(c.sub)})` : ""}` : text(c)).join(" | ");
|
|
294
|
+
return `- ${named(row.label, cells)}`;
|
|
295
|
+
}).join("\n");
|
|
296
|
+
break;
|
|
297
|
+
case "code":
|
|
298
|
+
case "mermaid":
|
|
299
|
+
body = codeFence(text(n.code), type === "mermaid" ? "mermaid" : text(n.lang));
|
|
300
|
+
break;
|
|
301
|
+
case "json":
|
|
302
|
+
body = codeFence(JSON.stringify(n.value, null, 2) ?? "", "json");
|
|
303
|
+
break;
|
|
304
|
+
case "copy":
|
|
305
|
+
body = [text(n.label), text(n.text)].filter(Boolean).join("\n");
|
|
306
|
+
break;
|
|
307
|
+
case "diff":
|
|
308
|
+
body = limited(n.diffs, budget).map((d) => `**${text(d.path)}**\n${codeFence([...typeof d.oldText === "string" ? d.oldText.split("\n").map((line) => `- ${line}`) : [], ...typeof d.newText === "string" ? d.newText.split("\n").map((line) => `+ ${line}`) : []].join("\n"), "diff")}`).join("\n\n");
|
|
309
|
+
break;
|
|
310
|
+
case "link":
|
|
311
|
+
body = n.href ? `[${text(n.label)}](${text(n.href)})` : text(n.label);
|
|
312
|
+
break;
|
|
313
|
+
case "image":
|
|
314
|
+
case "audio":
|
|
315
|
+
case "video":
|
|
316
|
+
body = n.src ? `[${type}: ${text(n.alt)}](${text(n.src)})` : text(n.alt);
|
|
317
|
+
break;
|
|
318
|
+
case "image-group":
|
|
319
|
+
body = nodes(limited(n.items, budget).map((item) => ({
|
|
320
|
+
...item,
|
|
321
|
+
type: "image"
|
|
322
|
+
})), budget, depth + 1);
|
|
323
|
+
break;
|
|
324
|
+
case "chart":
|
|
325
|
+
case "echart": {
|
|
326
|
+
const points = (data) => limited(data, budget).map((p) => `${text(p.label)}: ${text(p.value)}`).join(",");
|
|
327
|
+
body = [
|
|
328
|
+
points(n.data),
|
|
329
|
+
...limited(n.series, budget).map((s) => named(s.label, points(s.data))),
|
|
330
|
+
...limited(n.links, budget).map((l) => `- ${text(l.from)} -> ${text(l.to)}: ${text(l.value)}`)
|
|
331
|
+
].filter(Boolean).join("\n") || "[图形内容未展开]";
|
|
332
|
+
break;
|
|
333
|
+
}
|
|
334
|
+
case "plot":
|
|
335
|
+
body = limited(n.series, budget).map((s) => `${named(s.label, `\`${text(s.expr)}\``)}(参数:${limited(s.params, budget).map((p) => `${text(p.name)}=${text(p.value)}`).join(", ")})`).join("\n");
|
|
336
|
+
break;
|
|
337
|
+
case "diagram": {
|
|
338
|
+
const all = limited(n.nodes, budget);
|
|
339
|
+
const label = (id) => text(all.find((p) => p.id === id)?.label ?? id);
|
|
340
|
+
body = [
|
|
341
|
+
...limited(n.zones, budget).map((z) => text(z.label)),
|
|
342
|
+
...all.map((p) => `${text(p.label)}${p.sub ? `(${text(p.sub)})` : ""}${p.tag ? ` [${text(p.tag)}]` : ""}`),
|
|
343
|
+
...limited(n.edges, budget).map((e) => `${label(e.from)} -> ${label(e.to)}${e.label ? `(${text(e.label)})` : ""}`)
|
|
344
|
+
].join("\n");
|
|
345
|
+
break;
|
|
346
|
+
}
|
|
347
|
+
case "map":
|
|
348
|
+
body = [...limited(n.locations, budget).map((p) => `- **${text(p.label)}** (${limited(p.coordinates, budget).join(", ")}):${text(p.description)}${n.selected === p.id ? " [预设选择]" : ""}`), ...limited(n.routes, budget).map((r) => text(r.label))].join("\n");
|
|
349
|
+
break;
|
|
350
|
+
case "svg":
|
|
351
|
+
case "scene3d":
|
|
352
|
+
body = "[图形内容未展开]";
|
|
353
|
+
break;
|
|
354
|
+
case "file-tree": {
|
|
355
|
+
const tree = (items, level) => {
|
|
356
|
+
if (level > 8) {
|
|
357
|
+
budget.truncated = true;
|
|
358
|
+
return "";
|
|
359
|
+
}
|
|
360
|
+
return limited(items, budget).map((p) => `${" ".repeat(level)}- ${text(p.name)}${p.type === "dir" ? "/" : ""}${p.children ? `\n${tree(p.children, level + 1)}` : ""}`).join("\n");
|
|
361
|
+
};
|
|
362
|
+
body = tree(n.items, 0);
|
|
363
|
+
break;
|
|
364
|
+
}
|
|
365
|
+
case "breadcrumb":
|
|
366
|
+
body = limited(n.items, budget).map(text).join(" > ");
|
|
367
|
+
break;
|
|
368
|
+
case "quiz":
|
|
369
|
+
body = [
|
|
370
|
+
text(n.question),
|
|
371
|
+
...limited(n.options, budget).map((p) => `- ${named(p.label, p.feedback)}${p.correct ? " [参考答案]" : ""}`),
|
|
372
|
+
text(n.explanation)
|
|
373
|
+
].filter(Boolean).join("\n");
|
|
374
|
+
break;
|
|
375
|
+
case "radio":
|
|
376
|
+
case "select":
|
|
377
|
+
body = [
|
|
378
|
+
text(n.label),
|
|
379
|
+
...limited(n.options, budget).map((p, i) => `- ${text(p)}${n.selected === i ? " [预设选择]" : ""}${n.answer === i || n.answer === p ? " [参考答案]" : ""}`),
|
|
380
|
+
text(n.explanation)
|
|
381
|
+
].filter(Boolean).join("\n");
|
|
382
|
+
break;
|
|
383
|
+
case "checkbox":
|
|
384
|
+
case "switch":
|
|
385
|
+
body = `${text(n.label)} [预设${n.checked ? "选中" : "未选中"}]`;
|
|
386
|
+
break;
|
|
387
|
+
case "input":
|
|
388
|
+
case "textarea":
|
|
389
|
+
case "slider":
|
|
390
|
+
body = `${named(n.label, n.value)}${n.placeholder ? `(占位:${text(n.placeholder)})` : ""}`;
|
|
391
|
+
break;
|
|
392
|
+
case "button":
|
|
393
|
+
case "submit":
|
|
394
|
+
body = `[按钮: ${text(n.label)}]`;
|
|
395
|
+
break;
|
|
396
|
+
case "tabs":
|
|
397
|
+
body = nodes(limited(n.tabs, budget).map((t) => ({
|
|
398
|
+
type: "card",
|
|
399
|
+
title: t.label,
|
|
400
|
+
items: t.items
|
|
401
|
+
})), budget, depth + 1);
|
|
402
|
+
break;
|
|
403
|
+
case "accordion":
|
|
404
|
+
body = nodes(limited(n.items, budget).map((t) => ({
|
|
405
|
+
...t,
|
|
406
|
+
type: "card"
|
|
407
|
+
})), budget, depth + 1);
|
|
408
|
+
break;
|
|
409
|
+
case "row":
|
|
410
|
+
case "col":
|
|
411
|
+
case "grid":
|
|
412
|
+
case "card":
|
|
413
|
+
case "carousel":
|
|
414
|
+
case "stack":
|
|
415
|
+
body = nodes(n.items ?? n.children, budget, depth + 1);
|
|
416
|
+
break;
|
|
417
|
+
default: body = `${text(n.content ?? n.label)}\n[未识别组件 ${text(type)},部分内容已省略]`;
|
|
418
|
+
}
|
|
419
|
+
return [
|
|
420
|
+
title ? `**${title}**` : "",
|
|
421
|
+
text(n.subtitle),
|
|
422
|
+
body,
|
|
423
|
+
caption ? `> ${caption}` : ""
|
|
424
|
+
].filter(Boolean).join("\n");
|
|
425
|
+
}
|
|
426
|
+
function formatSpec(raw) {
|
|
427
|
+
try {
|
|
428
|
+
const spec = object$2(JSON.parse(raw));
|
|
429
|
+
const budget = {
|
|
430
|
+
nodes: 0,
|
|
431
|
+
truncated: false
|
|
432
|
+
};
|
|
433
|
+
const body = Array.isArray(spec.items) ? [spec.title ? `**${text(spec.title)}**` : "", nodes(spec.items, budget, 1)].filter(Boolean).join("\n") : node(spec, budget, 1);
|
|
434
|
+
const formulas = limited(spec.computed, budget).map((c) => `${text(c.id)} = ${text(c.expr)}`).join("; ");
|
|
435
|
+
return [
|
|
436
|
+
body,
|
|
437
|
+
formulas ? `[动态计算未重新执行:${formulas}]` : "",
|
|
438
|
+
budget.truncated ? "[超出组件数量或嵌套上限,其余内容已省略]" : ""
|
|
439
|
+
].filter(Boolean).join("\n\n");
|
|
440
|
+
} catch {
|
|
441
|
+
return "[dsh-ui 内容无法完整解析,已省略原始 JSON]";
|
|
442
|
+
}
|
|
443
|
+
}
|
|
444
|
+
function formatRecoveryAssistantText(input) {
|
|
445
|
+
const lines = input.split("\n"), output = [];
|
|
446
|
+
for (let i = 0; i < lines.length; i++) {
|
|
447
|
+
const opening = /^ {0,3}(`{3,}|~{3,})([^\n]*)$/.exec(lines[i]);
|
|
448
|
+
if (!opening || opening[1][0] === "`" && opening[2].includes("`")) {
|
|
449
|
+
output.push(lines[i]);
|
|
450
|
+
continue;
|
|
451
|
+
}
|
|
452
|
+
const marker = opening[1], language = opening[2].trim().replace(/[>.,;:"'\])】」』]+$/, "").toLowerCase();
|
|
453
|
+
let end = i + 1;
|
|
454
|
+
for (; end < lines.length; end++) {
|
|
455
|
+
const close = /^ {0,3}(`{3,}|~{3,})\s*$/.exec(lines[end]);
|
|
456
|
+
if (close && close[1][0] === marker[0] && close[1].length >= marker.length) break;
|
|
457
|
+
}
|
|
458
|
+
if (language === "dsh-ui") output.push(formatSpec(lines.slice(i + 1, end).join("\n")));
|
|
459
|
+
else output.push(...lines.slice(i, end < lines.length ? end + 1 : end));
|
|
460
|
+
i = end;
|
|
461
|
+
}
|
|
462
|
+
return output.join("\n");
|
|
463
|
+
}
|
|
464
|
+
//#endregion
|
|
202
465
|
//#region src/shared/recent-conversation.ts
|
|
203
466
|
const DEFAULT_RECENT_CONVERSATION_MAX_TOKENS = 32768;
|
|
204
467
|
const TAG = "recent_conversation_originals";
|
|
205
|
-
const PROMPT = "
|
|
206
|
-
const WORK = new Set([
|
|
207
|
-
"agent-message",
|
|
208
|
-
"subagent-settled",
|
|
209
|
-
"schedule",
|
|
210
|
-
"webhook",
|
|
211
|
-
"tool-jobs"
|
|
212
|
-
]);
|
|
213
|
-
const NOISE = new Set([
|
|
214
|
-
"runtime-context",
|
|
215
|
-
"time",
|
|
216
|
-
"time-context",
|
|
217
|
-
"workspace-instructions",
|
|
218
|
-
"agent-instructions",
|
|
219
|
-
"available-skills",
|
|
220
|
-
"skill-invocation",
|
|
221
|
-
"compact-checkpoint",
|
|
222
|
-
"system-prompt",
|
|
223
|
-
"user-question-reply",
|
|
224
|
-
"desktop-enhance-skill-retention",
|
|
225
|
-
"desktop-enhance-recent-conversation",
|
|
226
|
-
"permission-context",
|
|
227
|
-
"user-approval"
|
|
228
|
-
]);
|
|
229
|
-
function humanText(message) {
|
|
230
|
-
return (Array.isArray(message.content) ? message.content : []).flatMap((block) => {
|
|
231
|
-
if (block.type === "text") return [block.text];
|
|
232
|
-
if (block.type !== "image" && block.type !== "file") return [];
|
|
233
|
-
const attachment = object$1(block.attachment);
|
|
234
|
-
return [`[附件] ${JSON.stringify({
|
|
235
|
-
type: block.type,
|
|
236
|
-
name: attachment.name ?? null,
|
|
237
|
-
attachmentId: attachment.attachmentId ?? null,
|
|
238
|
-
availability: attachment.attachmentId ? "未核验" : "不可用"
|
|
239
|
-
})}`];
|
|
240
|
-
}).join("\n");
|
|
241
|
-
}
|
|
468
|
+
const PROMPT = "以下为近期历史对话,按时间顺序供延续当前任务;以更晚消息为准,历史请求不重新执行,省略不构成授权。结构化回复已转为文字,附件仅为定位、未重新读取。";
|
|
242
469
|
function object$1(value) {
|
|
243
470
|
return typeof value === "object" && value !== null && !Array.isArray(value) ? value : {};
|
|
244
471
|
}
|
|
@@ -249,8 +476,36 @@ function contentText(message) {
|
|
|
249
476
|
function messageOf(event) {
|
|
250
477
|
return object$1(event.type === "user/message" ? event.data : object$1(event.data).message);
|
|
251
478
|
}
|
|
252
|
-
function
|
|
253
|
-
return
|
|
479
|
+
function humanText(message) {
|
|
480
|
+
return (Array.isArray(message.content) ? message.content : []).flatMap((block) => {
|
|
481
|
+
if (block.type === "text") return [block.text];
|
|
482
|
+
if (block.type !== "image" && block.type !== "file") return [];
|
|
483
|
+
const attachment = object$1(block.attachment);
|
|
484
|
+
return [`[附件: ${block.type} ${attachment.name ?? "未命名"} (${attachment.attachmentId ?? "无"})]`];
|
|
485
|
+
}).join("\n");
|
|
486
|
+
}
|
|
487
|
+
function assistantText(message) {
|
|
488
|
+
return formatRecoveryAssistantText(contentText(message));
|
|
489
|
+
}
|
|
490
|
+
function formatQuestionAnswer(questions, answers) {
|
|
491
|
+
return questions.map((raw) => {
|
|
492
|
+
const q = object$1(raw);
|
|
493
|
+
const a = answers.find((item) => item?.id === q.id);
|
|
494
|
+
const options = Array.isArray(q.options) ? q.options.map((opt) => {
|
|
495
|
+
const o = object$1(opt);
|
|
496
|
+
return `${o.label ?? ""}${o.description ? `(${o.description})` : ""}`;
|
|
497
|
+
}).filter(Boolean).join(" / ") : "";
|
|
498
|
+
const selected = Array.isArray(a?.selected) && a.selected.length ? a.selected.join("、") : "(未选择)";
|
|
499
|
+
const custom = typeof a?.custom === "string" && a.custom ? `;补充:${a.custom}` : "";
|
|
500
|
+
return [
|
|
501
|
+
`- 问题:${q.header ? `[${q.header}] ` : ""}${q.question ?? ""}`,
|
|
502
|
+
...options ? [` 选项:${options}`] : [],
|
|
503
|
+
` 回答:${selected}${custom}`
|
|
504
|
+
].join("\n");
|
|
505
|
+
}).join("\n");
|
|
506
|
+
}
|
|
507
|
+
function escapeBody(text) {
|
|
508
|
+
return text.replace(/<(\/?(?:recent_conversation_originals|compacted-summary)\b)/gi, "&lt;$1").replace(/<(\/?(?:recent_conversation_originals|compacted-summary)\b)/gi, "<$1").replace(/^(\\*)(### #)/gm, "\\$1$2");
|
|
254
509
|
}
|
|
255
510
|
function recoveryTextCost(value) {
|
|
256
511
|
const blocks = typeof value === "string" ? [{
|
|
@@ -264,83 +519,96 @@ function recoveryTextCost(value) {
|
|
|
264
519
|
return sum + 4 + Math.max(Math.ceil(block.text.length / 4), Math.ceil(new TextEncoder().encode(block.text).length / 4), Math.ceil(weighted));
|
|
265
520
|
}, 0);
|
|
266
521
|
}
|
|
522
|
+
function formatEntryHeader(entry, isPartialTurn) {
|
|
523
|
+
const role = entry.role === "user" ? "用户" : entry.role === "assistant" ? "助手" : "问询回答";
|
|
524
|
+
const notes = [];
|
|
525
|
+
if (isPartialTurn) notes.push("部分轮");
|
|
526
|
+
if (entry.role === "assistant" && entry.status !== "completed") notes.push(entry.status);
|
|
527
|
+
return `### #${entry.turn} ${role}${notes.length ? `(${notes.join(",")})` : ""}`;
|
|
528
|
+
}
|
|
267
529
|
function render(record) {
|
|
530
|
+
const partialSet = new Set(record.turns.partial);
|
|
531
|
+
const body = record.entries.map((entry) => `${formatEntryHeader(entry, partialSet.has(entry.turn))}\n${escapeBody(entry.text)}`).join("\n\n");
|
|
268
532
|
return [{
|
|
269
533
|
type: "text",
|
|
270
|
-
text: `<${TAG} version="
|
|
271
|
-
prompt: PROMPT,
|
|
272
|
-
manifest: record
|
|
273
|
-
})}\n</${TAG}>`
|
|
534
|
+
text: `<${TAG} version="2">\n${PROMPT}\n\n${body}\n</${TAG}>`
|
|
274
535
|
}];
|
|
275
536
|
}
|
|
276
537
|
function priced(record) {
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
blocks
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
538
|
+
const blocks = render(record);
|
|
539
|
+
return {
|
|
540
|
+
blocks,
|
|
541
|
+
record: {
|
|
542
|
+
...record,
|
|
543
|
+
estimatedTokens: recoveryTextCost(blocks)
|
|
544
|
+
}
|
|
545
|
+
};
|
|
546
|
+
}
|
|
547
|
+
function natural$1(value) {
|
|
548
|
+
return typeof value === "number" && Number.isSafeInteger(value) && value >= 0;
|
|
549
|
+
}
|
|
550
|
+
const END_STATES = new Set([
|
|
551
|
+
"aborted",
|
|
552
|
+
"blocked",
|
|
553
|
+
"error",
|
|
554
|
+
"max-tokens",
|
|
555
|
+
"interrupted",
|
|
556
|
+
"forked"
|
|
557
|
+
]);
|
|
558
|
+
function readMarkdownTurns(body) {
|
|
559
|
+
const turns = new Map();
|
|
560
|
+
for (const section of body.split(/\n\n(?=### #)/)) {
|
|
561
|
+
const item = /^### #(\d+) (用户|助手|问询回答)(?:(([^)\n]+)))?\n([\s\S]+)$/.exec(section);
|
|
562
|
+
if (!item || !natural$1(Number(item[1]))) return null;
|
|
563
|
+
const notes = item[3]?.split(",") ?? [];
|
|
564
|
+
const partial = notes[0] === "部分轮";
|
|
565
|
+
const status = notes[partial ? 1 : 0];
|
|
566
|
+
if (notes.length > Number(partial) + Number(status !== void 0) || status !== void 0 && (item[2] !== "助手" || !END_STATES.has(status))) return null;
|
|
567
|
+
const turn = Number(item[1]), previous = turns.get(turn);
|
|
568
|
+
if (previous !== void 0 && previous !== partial) return null;
|
|
569
|
+
turns.set(turn, partial);
|
|
570
|
+
}
|
|
571
|
+
const complete = [], partial = [];
|
|
572
|
+
for (const [turn, isPartial] of turns) (isPartial ? partial : complete).push(turn);
|
|
573
|
+
return {
|
|
574
|
+
complete,
|
|
575
|
+
partial
|
|
576
|
+
};
|
|
577
|
+
}
|
|
578
|
+
function readLegacyTurns(body, cost) {
|
|
579
|
+
try {
|
|
580
|
+
const record = object$1(JSON.parse(body).manifest);
|
|
581
|
+
const turns = object$1(record.turns);
|
|
582
|
+
if (record.schemaVersion !== 1 || record.estimatedTokens !== cost || !Array.isArray(record.entries) || !record.entries.length || !Array.isArray(turns.complete) || !Array.isArray(turns.partial)) return null;
|
|
583
|
+
const all = [...turns.complete, ...turns.partial];
|
|
584
|
+
if (!all.every(natural$1) || new Set(all).size !== all.length) return null;
|
|
585
|
+
const actual = new Set(record.entries.map((entry) => object$1(entry).turn));
|
|
586
|
+
if (actual.size !== all.length || all.some((turn) => !actual.has(turn))) return null;
|
|
587
|
+
return {
|
|
588
|
+
complete: turns.complete,
|
|
589
|
+
partial: turns.partial
|
|
288
590
|
};
|
|
591
|
+
} catch {
|
|
592
|
+
return null;
|
|
289
593
|
}
|
|
290
594
|
}
|
|
291
|
-
function
|
|
595
|
+
function readRecentConversationSummary(value) {
|
|
292
596
|
const blocks = Array.isArray(value) ? value : object$1(value).content;
|
|
293
597
|
if (!Array.isArray(blocks)) return null;
|
|
294
598
|
for (const block of blocks) {
|
|
295
599
|
if (block?.type !== "text" || typeof block.text !== "string") continue;
|
|
296
|
-
const match = /^<recent_conversation_originals version="
|
|
600
|
+
const match = /^<recent_conversation_originals version="([12])">\n([\s\S]*)\n<\/recent_conversation_originals>$/.exec(block.text);
|
|
297
601
|
if (!match) continue;
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
602
|
+
const body = match[2];
|
|
603
|
+
const cost = recoveryTextCost([block]);
|
|
604
|
+
const turns = match[1] === "1" ? readLegacyTurns(body, cost) : body.startsWith(`${PROMPT}\n\n`) ? readMarkdownTurns(body.slice(75)) : null;
|
|
605
|
+
if (turns) return {
|
|
606
|
+
turns,
|
|
607
|
+
estimatedTokens: cost
|
|
608
|
+
};
|
|
302
609
|
}
|
|
303
610
|
return null;
|
|
304
611
|
}
|
|
305
|
-
function natural$1(value) {
|
|
306
|
-
return typeof value === "number" && Number.isSafeInteger(value) && value >= 0;
|
|
307
|
-
}
|
|
308
|
-
function validRecord$1(value) {
|
|
309
|
-
const record = object$1(value);
|
|
310
|
-
if (record.schemaVersion !== 1 || typeof record.sessionId !== "string" || !record.sessionId || !natural$1(record.throughSeq) || !natural$1(record.estimatedTokens) || !Array.isArray(record.entries) || !Array.isArray(record.omitted)) return false;
|
|
311
|
-
const seqs = new Set();
|
|
312
|
-
for (const item of record.entries) {
|
|
313
|
-
const entry = object$1(item);
|
|
314
|
-
if (!natural$1(entry.seq) || seqs.has(entry.seq) || entry.seq > record.throughSeq || !natural$1(entry.turn) || !Number.isFinite(entry.time) || typeof entry.role !== "string" || ![
|
|
315
|
-
"user",
|
|
316
|
-
"assistant",
|
|
317
|
-
"human-answer",
|
|
318
|
-
"agent-report"
|
|
319
|
-
].includes(entry.role) || typeof entry.status !== "string" || typeof entry.text !== "string" || !natural$1(entry.originalLength) || !Array.isArray(entry.ranges) || entry.ranges.length !== 1 && entry.ranges.length !== 2 || typeof entry.source !== "object" || entry.source === null || Array.isArray(entry.source)) return false;
|
|
320
|
-
seqs.add(entry.seq);
|
|
321
|
-
let end = 0, length = 0;
|
|
322
|
-
for (const range of entry.ranges) {
|
|
323
|
-
if (!Array.isArray(range) || range.length !== 2 || !natural$1(range[0]) || !natural$1(range[1]) || range[0] < end || range[0] >= range[1] || range[1] > entry.originalLength) return false;
|
|
324
|
-
end = range[1];
|
|
325
|
-
length += range[1] - range[0];
|
|
326
|
-
}
|
|
327
|
-
if (entry.ranges.length === 1 && (entry.ranges[0][0] !== 0 || end !== entry.originalLength || length !== entry.text.length)) return false;
|
|
328
|
-
if (entry.ranges.length === 2 && (entry.role === "user" || entry.role === "human-answer" || length + 8 !== entry.text.length)) return false;
|
|
329
|
-
}
|
|
330
|
-
const throughSeq = record.throughSeq;
|
|
331
|
-
if (!record.omitted.every((e) => natural$1(e?.seq) && e.seq <= throughSeq && natural$1(e.turn) && [
|
|
332
|
-
"unknown-source",
|
|
333
|
-
"budget",
|
|
334
|
-
"excerpt"
|
|
335
|
-
].includes(e.reason))) return false;
|
|
336
|
-
const stats = object$1(record.turns);
|
|
337
|
-
if (!Array.isArray(stats.complete) || !Array.isArray(stats.partial) || ![...stats.complete, ...stats.partial].every(natural$1) || new Set([...stats.complete, ...stats.partial]).size !== stats.complete.length + stats.partial.length) return false;
|
|
338
|
-
const turns = new Set(record.entries.map((entry) => entry.turn));
|
|
339
|
-
if (turns.size !== stats.complete.length + stats.partial.length || [...stats.complete, ...stats.partial].some((turn) => !turns.has(turn))) return false;
|
|
340
|
-
const complete = stats.complete;
|
|
341
|
-
if (record.entries.some((entry) => entry.ranges.length > 1 && complete.includes(entry.turn))) return false;
|
|
342
|
-
return true;
|
|
343
|
-
}
|
|
344
612
|
function recoveryBoundary(input) {
|
|
345
613
|
const selected = new Set(input.compactedSeqs);
|
|
346
614
|
const last = input.surfaceNodes.map((seq, index) => selected.has(seq) ? index : -1).reduce((a, b) => Math.max(a, b), -1);
|
|
@@ -383,7 +651,7 @@ function planRecentConversation(input) {
|
|
|
383
651
|
if (input.policy.turns === 0) return skipped("disabled");
|
|
384
652
|
const compacted = new Set(input.compactedSeqs);
|
|
385
653
|
const retained = new Set(input.surfaceNodes.filter((seq) => !compacted.has(seq)));
|
|
386
|
-
if (input.events.some((event) => retained.has(event.seq) && object$1(messageOf(event).source).kind === "compact-checkpoint" &&
|
|
654
|
+
if (input.events.some((event) => retained.has(event.seq) && object$1(messageOf(event).source).kind === "compact-checkpoint" && readRecentConversationSummary(messageOf(event)) !== null)) return skipped("retained");
|
|
387
655
|
const boundary = recoveryBoundary(input);
|
|
388
656
|
if (boundary === null) return skipped("empty");
|
|
389
657
|
const entries = [];
|
|
@@ -392,21 +660,14 @@ function planRecentConversation(input) {
|
|
|
392
660
|
const lastAssistant = new Map();
|
|
393
661
|
const questions = new Map();
|
|
394
662
|
const answersSeen = new Map();
|
|
395
|
-
const goalsSeen = new Set();
|
|
396
|
-
const relayByChild = new Map();
|
|
397
|
-
const settlementsSeen = new Map();
|
|
398
|
-
const omitted = [];
|
|
399
663
|
let turn = 0;
|
|
400
|
-
const add = (event, role, text,
|
|
664
|
+
const add = (event, role, text, status = "historical") => {
|
|
401
665
|
if (text.length) entries.push({
|
|
402
666
|
seq: event.seq,
|
|
403
667
|
turn,
|
|
404
|
-
time: event.time,
|
|
405
668
|
role,
|
|
406
|
-
source,
|
|
407
669
|
status,
|
|
408
670
|
text,
|
|
409
|
-
originalLength: text.length,
|
|
410
671
|
ranges: [[0, text.length]]
|
|
411
672
|
});
|
|
412
673
|
};
|
|
@@ -418,25 +679,13 @@ function planRecentConversation(input) {
|
|
|
418
679
|
if (event.type === "tool/call" && data.name === "ask_user_question") try {
|
|
419
680
|
const args = JSON.parse(data.arguments);
|
|
420
681
|
if (Array.isArray(args.questions)) questions.set(data.callId, {
|
|
421
|
-
seq: event.seq,
|
|
422
682
|
turn: data.turn,
|
|
423
683
|
questions: args.questions
|
|
424
684
|
});
|
|
425
685
|
} catch {}
|
|
426
|
-
if (event.type === "goal/change" && data.kind === "goal/change" && data.version === 1) {
|
|
427
|
-
const goal = object$1(data.operation === "clear" ? data.cleared : data.goal);
|
|
428
|
-
goalsSeen.add(JSON.stringify([goal.id, goal.revision]));
|
|
429
|
-
add(event, "agent-report", JSON.stringify(data), {
|
|
430
|
-
kind: "goal/change",
|
|
431
|
-
goalId: goal.id,
|
|
432
|
-
revision: goal.revision,
|
|
433
|
-
operation: data.operation
|
|
434
|
-
});
|
|
435
|
-
}
|
|
436
686
|
if (event.surfaceOp !== "append") continue;
|
|
437
687
|
const message = messageOf(event);
|
|
438
688
|
const source = object$1(message.source);
|
|
439
|
-
const sourceKind = typeof source.kind === "string" ? source.kind : "";
|
|
440
689
|
const late = event.type === "user/message" && source.kind === "user-question-reply" && source.outcome === "answered";
|
|
441
690
|
const callId = late ? source.callId : message.toolCallId;
|
|
442
691
|
const question = questions.get(callId);
|
|
@@ -450,72 +699,13 @@ function planRecentConversation(input) {
|
|
|
450
699
|
answersSeen.set(key, event.seq);
|
|
451
700
|
const current = turn;
|
|
452
701
|
if (!late) turn = question.turn;
|
|
453
|
-
add(event, "human-answer",
|
|
454
|
-
questions: question.questions,
|
|
455
|
-
answers: payload.answers
|
|
456
|
-
}), {
|
|
457
|
-
...source,
|
|
458
|
-
callId,
|
|
459
|
-
questionSeq: question.seq
|
|
460
|
-
});
|
|
702
|
+
add(event, "human-answer", formatQuestionAnswer(question.questions, payload.answers));
|
|
461
703
|
turn = current;
|
|
462
704
|
}
|
|
463
705
|
}
|
|
464
706
|
} catch {}
|
|
465
707
|
if (event.type === "assistant/message") lastAssistant.set(data.turn, event);
|
|
466
|
-
if (event.type
|
|
467
|
-
if (source.kind === "user") add(event, "user", humanText(message), source);
|
|
468
|
-
else if (WORK.has(sourceKind)) {
|
|
469
|
-
const child = typeof source.senderSessionId === "string" ? source.senderSessionId : "";
|
|
470
|
-
const relayIndex = relayByChild.get(child);
|
|
471
|
-
const relay = relayIndex === void 0 ? void 0 : entries[relayIndex];
|
|
472
|
-
const notice = child && sourceKind === "subagent-settled" && source.form === "notice" && Array.isArray(message.content) && message.content.length === 2 && message.content[0]?.type === "text" && typeof message.content[0].text === "string" && message.content[0].text.startsWith(`Background subagent ${child} `) && message.content[1]?.type === "text" && message.content[1].text === "It sent you a message just before finishing, so its closing message is omitted.";
|
|
473
|
-
if (notice) {
|
|
474
|
-
const key = JSON.stringify([
|
|
475
|
-
child,
|
|
476
|
-
relay?.seq ?? null,
|
|
477
|
-
contentText(message)
|
|
478
|
-
]);
|
|
479
|
-
const prior = settlementsSeen.get(key);
|
|
480
|
-
if (prior !== void 0) {
|
|
481
|
-
if (retained.has(event.seq)) retained.add(prior);
|
|
482
|
-
continue;
|
|
483
|
-
}
|
|
484
|
-
settlementsSeen.set(key, event.seq);
|
|
485
|
-
}
|
|
486
|
-
if (notice && relay && relayIndex !== void 0) {
|
|
487
|
-
const previous = object$1(relay.source.settlement);
|
|
488
|
-
const text = contentText(message);
|
|
489
|
-
if (previous.text === void 0) {
|
|
490
|
-
if (event.seq >= boundary || retained.has(event.seq)) continue;
|
|
491
|
-
entries[relayIndex] = {
|
|
492
|
-
...relay,
|
|
493
|
-
source: {
|
|
494
|
-
...relay.source,
|
|
495
|
-
settlement: {
|
|
496
|
-
seq: event.seq,
|
|
497
|
-
time: event.time,
|
|
498
|
-
text
|
|
499
|
-
}
|
|
500
|
-
}
|
|
501
|
-
};
|
|
502
|
-
continue;
|
|
503
|
-
}
|
|
504
|
-
}
|
|
505
|
-
const before = entries.length;
|
|
506
|
-
add(event, "agent-report", contentText(message), source);
|
|
507
|
-
if (child && sourceKind === "agent-message" && source.form === "relay" && entries.length > before) relayByChild.set(child, before);
|
|
508
|
-
} else if (source.kind === "goal") {
|
|
509
|
-
const key = JSON.stringify([source.goalId, source.revision]);
|
|
510
|
-
if (!goalsSeen.has(key)) {
|
|
511
|
-
goalsSeen.add(key);
|
|
512
|
-
add(event, "agent-report", contentText(message), source);
|
|
513
|
-
}
|
|
514
|
-
} else if (!NOISE.has(sourceKind)) omitted.push({
|
|
515
|
-
seq: event.seq,
|
|
516
|
-
turn,
|
|
517
|
-
reason: "unknown-source"
|
|
518
|
-
});
|
|
708
|
+
if (event.type === "user/message" && source.kind === "user") add(event, "user", humanText(message));
|
|
519
709
|
}
|
|
520
710
|
for (const [number, event] of lastAssistant) {
|
|
521
711
|
const status = ended.get(number);
|
|
@@ -523,14 +713,13 @@ function planRecentConversation(input) {
|
|
|
523
713
|
const data = object$1(event.data);
|
|
524
714
|
if (status === "completed" && (data.step !== lastStep.get(number) || data.interrupted || messageOf(event).content.some((b) => b.type === "tool-call"))) continue;
|
|
525
715
|
turn = number;
|
|
526
|
-
add(event, "assistant",
|
|
716
|
+
add(event, "assistant", assistantText(messageOf(event)), status);
|
|
527
717
|
}
|
|
528
718
|
const eligible = entries.filter((entry) => entry.seq < boundary && !retained.has(entry.seq));
|
|
529
719
|
const turns = new Set([...new Set(eligible.map((entry) => entry.turn))].sort((a, b) => b - a).slice(0, input.policy.turns));
|
|
530
720
|
const selected = eligible.filter((entry) => turns.has(entry.turn)).sort((a, b) => a.seq - b.seq);
|
|
531
721
|
if (!selected.length) return skipped("empty");
|
|
532
|
-
|
|
533
|
-
return budgetPlan(input, selected, omitted.filter((entry) => entry.seq < boundary && !retained.has(entry.seq) && turns.has(entry.turn)), partial);
|
|
722
|
+
return budgetPlan(input, selected, new Set([...entries.filter((entry) => turns.has(entry.turn) && (entry.seq >= boundary || retained.has(entry.seq))).map((entry) => entry.turn), ...[...lastAssistant].filter(([turn, event]) => turns.has(turn) && (event.seq >= boundary || retained.has(event.seq))).map(([turn]) => turn)]));
|
|
534
723
|
}
|
|
535
724
|
function excerpt(entry, characters) {
|
|
536
725
|
let head = Math.ceil(characters / 2);
|
|
@@ -543,7 +732,7 @@ function excerpt(entry, characters) {
|
|
|
543
732
|
ranges: [[0, head], [tail, entry.text.length]]
|
|
544
733
|
};
|
|
545
734
|
}
|
|
546
|
-
function budgetPlan(input, candidates,
|
|
735
|
+
function budgetPlan(input, candidates, boundaryPartial) {
|
|
547
736
|
const budget = Math.max(0, Math.min(input.policy.maxTokens, input.budgetTokens));
|
|
548
737
|
if (!Number.isFinite(budget)) return skipped("budget");
|
|
549
738
|
const chosen = new Map();
|
|
@@ -556,22 +745,11 @@ function budgetPlan(input, candidates, unknown, boundaryPartial) {
|
|
|
556
745
|
(boundaryPartial.has(turn) || !all.every((entry) => entries.get(entry.seq)?.ranges.length === 1) ? partial : complete).push(turn);
|
|
557
746
|
}
|
|
558
747
|
return priced({
|
|
559
|
-
schemaVersion: 1,
|
|
560
|
-
sessionId: input.sessionId,
|
|
561
|
-
throughSeq: input.events.reduce((n, e) => Math.max(n, e.seq), 0),
|
|
562
748
|
turns: {
|
|
563
749
|
complete,
|
|
564
750
|
partial
|
|
565
751
|
},
|
|
566
752
|
entries: [...entries.values()].sort((a, b) => a.seq - b.seq),
|
|
567
|
-
omitted: [...unknown, ...candidates.flatMap((entry) => {
|
|
568
|
-
const selected = entries.get(entry.seq);
|
|
569
|
-
return selected && selected.ranges.length === 1 ? [] : [{
|
|
570
|
-
seq: entry.seq,
|
|
571
|
-
turn: entry.turn,
|
|
572
|
-
reason: selected ? "excerpt" : "budget"
|
|
573
|
-
}];
|
|
574
|
-
})],
|
|
575
753
|
estimatedTokens: 0
|
|
576
754
|
});
|
|
577
755
|
};
|
|
@@ -645,8 +823,8 @@ function recentConversationTokenAdjustment(messages) {
|
|
|
645
823
|
let adjustment = 0;
|
|
646
824
|
for (const message of messages) {
|
|
647
825
|
if (message.source?.kind !== "compact-checkpoint") continue;
|
|
648
|
-
if (
|
|
649
|
-
const blocks = (message.content ?? []).filter((block) => block.type === "text" && typeof block.text === "string" &&
|
|
826
|
+
if (readRecentConversationSummary(message) === null) continue;
|
|
827
|
+
const blocks = (message.content ?? []).filter((block) => block.type === "text" && typeof block.text === "string" && readRecentConversationSummary([block]) !== null);
|
|
650
828
|
const native = 4 + blocks.reduce((sum, block) => sum + Math.ceil(block.text.length / 4) + 4, 0);
|
|
651
829
|
adjustment += Math.max(0, recoveryTextCost(blocks) - native);
|
|
652
830
|
}
|
|
@@ -691,7 +869,7 @@ function recentConversationSnapshot(session, policy, customized) {
|
|
|
691
869
|
}
|
|
692
870
|
if (event.type !== "compaction/summary") continue;
|
|
693
871
|
const data = event.data;
|
|
694
|
-
const record =
|
|
872
|
+
const record = readRecentConversationSummary(data.summary);
|
|
695
873
|
if (record === null) {
|
|
696
874
|
const status = readRecoveryStatus(data.summary);
|
|
697
875
|
last = {
|
|
@@ -709,7 +887,7 @@ function recentConversationSnapshot(session, policy, customized) {
|
|
|
709
887
|
restoredTurns: record.turns.complete.length + record.turns.partial.length,
|
|
710
888
|
partialTurns: record.turns.partial.length,
|
|
711
889
|
estimatedTokens: record.estimatedTokens,
|
|
712
|
-
details: data.summary.filter((block) =>
|
|
890
|
+
details: data.summary.filter((block) => readRecentConversationSummary([block]) !== null).map((block) => block.text).join("\n")
|
|
713
891
|
};
|
|
714
892
|
}
|
|
715
893
|
return {
|
|
@@ -842,7 +1020,6 @@ function installRecentConversationRecovery(ctx, options) {
|
|
|
842
1020
|
events,
|
|
843
1021
|
surfaceNodes: nodes,
|
|
844
1022
|
compactedSeqs,
|
|
845
|
-
sessionId: session.id,
|
|
846
1023
|
policy: latestPolicy,
|
|
847
1024
|
budgetTokens: budget
|
|
848
1025
|
});
|
|
@@ -5863,7 +6040,7 @@ function installContextHooks(ctx, control, options) {
|
|
|
5863
6040
|
turn: state.turn,
|
|
5864
6041
|
step: state.step
|
|
5865
6042
|
}, { attempt: state.attempts });
|
|
5866
|
-
const hadRecovery = request.messages.some((message) => message.source?.kind === "compact-checkpoint" &&
|
|
6043
|
+
const hadRecovery = request.messages.some((message) => message.source?.kind === "compact-checkpoint" && readRecentConversationSummary(message) !== null);
|
|
5867
6044
|
const work = maintain(agent, input.retainTokens, signal);
|
|
5868
6045
|
active.add(work);
|
|
5869
6046
|
try {
|
|
@@ -6864,7 +7041,7 @@ const __test = {
|
|
|
6864
7041
|
recentConversationTokenAdjustment,
|
|
6865
7042
|
withoutRecentConversationRecovery,
|
|
6866
7043
|
planRecentConversation,
|
|
6867
|
-
|
|
7044
|
+
readRecentConversationSummary,
|
|
6868
7045
|
recoveryTextCost,
|
|
6869
7046
|
imageTokensForModel,
|
|
6870
7047
|
installImagePricing,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dsh-desktop-enhance",
|
|
3
|
-
"version": "0.10.
|
|
3
|
+
"version": "0.10.1",
|
|
4
4
|
"description": "DSH Desktop 界面增强:页内查找(Cmd+F)、轮次编号、上下文压缩行常显、建议、每步耗时、折叠文件夹状态计数、会话信息(含上下文注入 C1 视图)、工具管理、Skill 管理、独立远程接入与手机体验,以及智能建议、会话能力和远程接入的持久诊断日志。",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"icon": "./icon.svg",
|