@pentoshi/clai 4.18.0 → 5.0.0

package/dist/app/controllers/session-changes.d.ts

@@ -10,6 +10,7 @@ export interface FileLineChanges extends LineChangeTotals {
 export interface SessionChangesReport {
     readonly totals: LineChangeTotals | undefined;
     readonly files: readonly FileLineChanges[];
+    readonly changes: readonly FileChange[];
 }
 export declare function validLineChangeTotals(value: unknown): value is LineChangeTotals;
 export declare function sumLineChanges(values: Iterable<LineChangeTotals>): LineChangeTotals | undefined;
@@ -17,8 +18,12 @@ export declare function fileLineChanges(changes: readonly FileChange[] | undefin
 export declare class SessionChanges {
     private readonly files;
     private readonly recorded;
+    private readonly diffIds;
+    private diffs;
+    private report;
     record(toolCallId: string, changes: readonly FileChange[] | undefined): void;
     restore(saved?: readonly FileLineChanges[], transcript?: readonly TranscriptItem[]): void;
     snapshot(): SessionChangesReport;
+    private recordDiffs;
     private add;
 }

package/dist/app/controllers/session-changes.js

@@ -15,16 +15,34 @@ export function sumLineChanges(values) {
     }
     return added || removed ? { added, removed } : undefined;
 }
+function countedFileChanges(changes) {
+    return (Array.isArray(changes) ? changes : []).filter((change) => change && typeof change.path === "string" && change.path && !change.binary && validLineChangeTotals(change.stats) &&
+        (change.stats.added > 0 || change.stats.removed > 0));
+}
 export function fileLineChanges(changes) {
-    return (Array.isArray(changes) ? changes : []).flatMap((change) => change && typeof change.path === "string" && change.path && !change.binary && validLineChangeTotals(change.stats) &&
-        (change.stats.added > 0 || change.stats.removed > 0)
-        ? [{ path: change.path, added: change.stats.added, removed: change.stats.removed }]
-        : []);
+    return countedFileChanges(changes).map((change) => ({ path: change.path, added: change.stats.added, removed: change.stats.removed }));
+}
+function settledToolItems(transcript) {
+    const out = [];
+    const visit = (items) => {
+        for (const item of items) {
+            if (item.kind === "compacted" && Array.isArray(item.originalItems))
+                visit(item.originalItems);
+            else if (item.kind === "tool" && item.status !== "running" && item.status !== "blocked")
+                out.push(item);
+        }
+    };
+    visit(transcript);
+    return out;
 }
 export class SessionChanges {
     files = new Map();
     recorded = new Set();
+    diffIds = new Set();
+    diffs = [];
+    report;
     record(toolCallId, changes) {
+        this.recordDiffs(toolCallId, changes);
         if (this.recorded.has(toolCallId))
             return;
         const files = fileLineChanges(changes);
@@ -37,33 +55,45 @@ export class SessionChanges {
     restore(saved, transcript = []) {
         this.files.clear();
         this.recorded.clear();
-        if (Array.isArray(saved)) {
-            for (const file of saved) {
-                const path = file?.path;
-                if (typeof path === "string" && path && validLineChangeTotals(file)) {
-                    this.add({ path, added: file.added, removed: file.removed });
-                }
-            }
+        this.diffIds.clear();
+        this.diffs = [];
+        this.report = undefined;
+        const tools = settledToolItems(transcript);
+        if (!Array.isArray(saved)) {
+            for (const item of tools)
+                this.record(item.id, item.fileChanges);
             return;
         }
-        // Older sessions can recover recorded tool statistics, including compacted turns.
-        const stack = [...transcript];
-        while (stack.length) {
-            const item = stack.pop();
-            if (item.kind === "compacted" && Array.isArray(item.originalItems))
-                stack.push(...item.originalItems);
-            else if (item.kind === "tool" && item.status !== "running" && item.status !== "blocked") {
-                this.record(item.id, item.fileChanges);
+        for (const item of tools)
+            this.recordDiffs(item.id, item.fileChanges);
+        for (const file of saved) {
+            const path = file?.path;
+            if (typeof path === "string" && path && validLineChangeTotals(file)) {
+                this.add({ path, added: file.added, removed: file.removed });
             }
         }
     }
     snapshot() {
+        if (this.report)
+            return this.report;
         const files = [...this.files.values()].map((file) => ({ ...file })).sort((a, b) => a.path.localeCompare(b.path));
-        return { files, totals: sumLineChanges(files) };
+        this.report = { files, totals: sumLineChanges(files), changes: [...this.diffs] };
+        return this.report;
+    }
+    recordDiffs(id, changes) {
+        if (this.diffIds.has(id))
+            return;
+        const recorded = countedFileChanges(changes);
+        if (!recorded.length)
+            return;
+        this.diffIds.add(id);
+        this.diffs.push(...recorded);
+        this.report = undefined;
     }
     add(file) {
         if (file.added === 0 && file.removed === 0)
             return;
+        this.report = undefined;
         const previous = this.files.get(file.path);
         this.files.set(file.path, {
             path: file.path,

package/dist/app/controllers/session-changes.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-changes.js","sourceRoot":"","sources":["../../../src/app/controllers/session-changes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session-changes.js","sourceRoot":"","sources":["../../../src/app/controllers/session-changes.ts"],"names":[],"mappings":"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"}

package/dist/app/controllers/session-compact-helper.js

@@ -1,4 +1,4 @@
-import { buildDirectCompactionPrompt, calibratedCompactionSinglePassInputBudget, COMPACTION_MAX_COMPLETION_TOKENS, COMPACTION_MAP_MAX_COMPLETION_TOKENS, } from "../../agent/compaction-summary.js";
+import { buildDirectCompactionPrompt, calibratedCompactionSinglePassInputBudget, COMPACTION_MAX_COMPLETION_TOKENS, COMPACTION_MAP_MAX_COMPLETION_TOKENS, COMPACTION_SYSTEM_PROMPT, } from "../../agent/compaction-summary.js";
 import { executeCompactionSummary, isCompactionOverLimitError, planCompactionReplay, } from "../../agent/compaction-executor.js";
 import { compactMessagesWithSummary, estimateMessagesTokens, isCompactionMemoryMessage, } from "../../agent/context-manager.js";
 import { projectToolHistory } from "../../agent/tool-history.js";
@@ -12,13 +12,10 @@ export async function summarizeForSessionCompact(prompt, opts) {
     const maxTokens = opts.stage === "map"
         ? COMPACTION_MAP_MAX_COMPLETION_TOKENS
         : COMPACTION_MAX_COMPLETION_TOKENS;
-    const systemContent = opts.purpose === "plan-implement"
-        ? "Write concise, non-redundant research memory for an agent executing an approved plan. Do not add framing: the PLAN MODE HANDOFF wrapper and active plan are injected separately. For coding target 600–1000 tokens; preserve only verified state, reusable research/artifacts, decisions, blockers, and risks. Security handoffs may be longer to preserve findings and coverage. Never invent or cut a fact mid-token. You are summarizing, not continuing: never emit tool calls or fabricate tool results, file receipts, or transcript lines."
-        : "You compress conversation history into accurate continuation memory. You are SUMMARIZING the past session, not continuing it: do not answer the user, do not perform the next task, and never emit tool calls or fabricate tool results, file-write receipts (bytes/lines/sha256), exit codes, or 'TOOL:'/'[tools: …]' transcript lines. Describe what already happened in your own words.";
     return executeCompactionSummary({
         provider: opts.provider,
         model: opts.model,
-        systemContent,
+        systemContent: COMPACTION_SYSTEM_PROMPT,
         prompt,
         maxTokens,
         signal: opts.signal,

package/dist/app/controllers/session-compact-helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-compact-helper.js","sourceRoot":"","sources":["../../../src/app/controllers/session-compact-helper.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,2BAA2B,EAC3B,yCAAyC,EACzC,gCAAgC,EAChC,oCAAoC,GACrC,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC1B,oBAAoB,GACrB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,0BAA0B,EAC1B,sBAAsB,EACtB,yBAAyB,GAE1B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAAE,gCAAgC,EAAE,MAAM,+BAA+B,CAAC;AACjF,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EACL,eAAe,EACf,8BAA8B,GAC/B,MAAM,+BAA+B,CAAC;AAOvC,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,MAAc,EACd,IAcC;IAED,MAAM,SAAS,GACb,IAAI,CAAC,KAAK,KAAK,KAAK;QAClB,CAAC,CAAC,oCAAoC;QACtC,CAAC,CAAC,gCAAgC,CAAC;IACvC,MAAM,aAAa,GACjB,IAAI,CAAC,OAAO,KAAK,gBAAgB;QAC/B,CAAC,CAAC,mhBAAmhB;QACrhB,CAAC,CAAC,4XAA4X,CAAC;IAEnY,OAAO,wBAAwB,CAAC;QAC9B,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,aAAa;QACb,MAAM;QACN,SAAS;QACT,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAClD,GAAG,CAAC,IAAI,CAAC,kBAAkB,KAAK,SAAS;YACvC,CAAC,CAAC,EAAE,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,EAAE;YACjD,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxD,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;QAC7B,kBAAkB,EAAE,KAAK;QACzB,iBAAiB,EAAE,KAAK;QACxB,4BAA4B,EAAE,KAAK;QACnC,YAAY,EAAE,KAAK;QACnB,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,OAAO,EAAE,IAAI,CAAC,OAAO;KACtB,CAAC,CAAC;AACL,CAAC;AAmCD,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,OAAoC;IAQpC,MAAM,IAAI,GAAG,CACX,IAAO,EACP,OAA4B,EACtB,EAAE;QACR,OAAO,CAAC,IAAI,CACV,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAgB,CACjE,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;IAC7D,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAC5D,MAAM,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IACpD,MAAM,aAAa,GAAG,iBAAiB;QACrC,CAAC,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,OAAO;YACtD,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,iBAAiB;QACrB,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,kBAAkB,GAAG,4BAA4B,CACrD,iBAAiB,EAAE,QAAQ,IAAI,OAAO,CAAC,QAAQ,EAC/C,iBAAiB,EAAE,KAAK,IAAI,OAAO,CAAC,KAAK,EACzC,OAAO,CAAC,kBAAkB,CAC3B,CAAC;IACF,MAAM,WAAW,GAAG,2BAA2B,CAAC;QAC9C,QAAQ,EAAE,OAAO;QACjB,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7E,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACzD,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,aAAa;QAC9B,CAAC,CAAC,oBAAoB,CAAC;YACnB,WAAW,EAAE,aAAa;YAC1B,OAAO;YACP,MAAM,EAAE,WAAW;YACnB,SAAS,EAAE,gCAAgC;YAC3C,kBAAkB;YAClB,MAAM,EAAE,IAAI;SACb,CAAC;QACJ,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,sBAAsB,GAAG,UAAU,EAAE,sBAAsB,CAAC;IAClE,MAAM,2BAA2B,GAC/B,OAAO,OAAO,CAAC,mBAAmB,KAAK,QAAQ;QAC/C,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,mBAAmB,CAAC;QAC5C,OAAO,CAAC,mBAAmB,GAAG,CAAC;QAC7B,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,mBAAmB,CAAC;QACzC,CAAC,CAAC,SAAS,CAAC;IAChB,MAAM,yBAAyB,GAC7B,2BAA2B,KAAK,SAAS;QACzC,sBAAsB,KAAK,SAAS,CAAC;IACvC,MAAM,mBAAmB,GACvB,2BAA2B,IAAI,sBAAsB,EAAE,aAAa,CAAC;IACvE,MAAM,KAAK,GACT,mBAAmB,KAAK,SAAS;QAC/B,CAAC,CAAC,iBAAiB;QACnB,CAAC,CAAC,mBAAmB,CAAC;IAC1B,MAAM,mBAAmB,GAAG,iBAAiB,EAAE,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC;IAC5E,MAAM,gBAAgB,GAAG,iBAAiB,EAAE,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC;IACnE,MAAM,UAAU,GAAG,CAAC,MAAc,EAAU,EAAE,CAC5C,uBAAuB,CAAC,mBAAmB,EAAE,gBAAgB,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACtF,MAAM,YAAY,GAAG,mBAAmB,IAAI,UAAU,CAAC,mBAAmB,CAAC,CAAC;IAC5E,MAAM,WAAW,GAAG,CAAC,MAAqB,EAAsB,EAAE;QAChE,MAAM,qBAAqB,GAAG,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC7D,MAAM,cAAc,GAAG,CAAC,eAAuB,EAAU,EAAE,CACzD,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;QACjE,MAAM,WAAW,GACf,OAAO,CAAC,8BAA8B,IAAI,WAAW,CAAC;QACxD,MAAM,WAAW,GACf,yBAAyB,IAAI,sBAAsB;YACjD,CAAC,CAAC,qBAAqB;gBACrB,cAAc,CAAC,UAAU,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,CAAC;YACrE,CAAC,CAAC,mBAAmB,KAAK,SAAS;gBACjC,CAAC,CAAC,qBAAqB;gBACvB,CAAC,CAAC,qBAAqB,GAAG,cAAc,CAAC,mBAAmB,CAAC,CAAC;QACpE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;IAC3D,CAAC,CAAC;IACF,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,IAAI,CAAC,oBAAoB,EAAE;YACzB,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,YAAY;YACZ,GAAG,CAAC,OAAO,CAAC,8BAA8B,KAAK,mBAAmB;gBAChE,CAAC,CAAC,EAAE,WAAW,EAAE,mBAA4B,EAAE;gBAC/C,CAAC,CAAC,EAAE,CAAC;SACR,CAAC,CAAC;IACL,CAAC;IAED,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,SAAS,GAAG,IAAI,eAAe,CACnC,8BAA8B,CAAC,YAAY,CAAC,CAC7C,CAAC;IACF,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,CAAC,gBAAyB,EAA0B,EAAE;YACpE,MAAM,MAAM,GACV,CAAC,gBAAgB,IAAI,UAAU,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS;gBACjE,CAAC,CAAC,aAAa;gBACf,CAAC,CAAC,SAAS,CAAC;YAChB,MAAM,eAAe,GAAG,iBAAiB,IAAI,OAAO,CAAC,eAAe,CAAC;YACrE,MAAM,eAAe,GAAG,eAAe,EAAE,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC;YACtE,MAAM,YAAY,GAAG,eAAe,EAAE,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC;YAC7D,OAAO,0BAA0B,CAC/B,OAAO,EACP,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAChB,0BAA0B,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,EAAE;gBACxD,QAAQ,EAAE,eAAe;gBACzB,KAAK,EAAE,YAAY;gBACnB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,KAAK,EAAE,KAAK,EAAE,KAAK;gBACnB,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC/C,GAAG,CAAC,MAAM;oBACR,CAAC,CAAC;wBACE,WAAW,EAAE,MAAM;wBACnB,OAAO;qBACR;oBACH,CAAC,CAAC;wBACE,GAAG,CAAC,KAAK,EAAE,cAAc;4BACvB,CAAC,CAAC,EAAE,cAAc,EAAE,KAAK,CAAC,cAAc,EAAE;4BAC1C,CAAC,CAAC,EAAE,CAAC;qBACR,CAAC;gBACN,kBAAkB;gBAClB,SAAS;gBACT,OAAO,EAAE,CAAC,UAAU,EAAE,EAAE;oBACtB,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;wBAAE,OAAO;oBACjC,KAAK,MAAM,SAAS,IAAI,0BAA0B,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;wBAC9E,IAAI,CAAC,aAAa,EAAE,EAAE,GAAG,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;oBACrH,CAAC;oBACD,IAAI,CAAC,UAAU,CAAC,KAAK;wBAAE,OAAO;oBAC9B,MAAM,OAAO,GAAG,gCAAgC,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;oBAC5E,IAAI,CAAC,aAAa,EAAE;wBAClB,GAAG,UAAU,CAAC,KAAK;wBACnB,QAAQ,EAAE,UAAU,CAAC,QAAQ;wBAC7B,KAAK,EAAE,UAAU,CAAC,KAAK;wBACvB,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wBAClD,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wBACrD,SAAS,EAAE,IAAI;qBAChB,CAAC,CAAC;gBACL,CAAC;gBACD,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,KAAK,EAAE,KAAK,KAAK,KAAK;oBAC3C,CAAC,CAAC;wBACE,OAAO,EAAE,CAAC,IAAY,EAAE,OAAiB,EAAE,EAAE;4BAC3C,IAAI,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;gCACxB,IAAI,CAAC,kBAAkB,EAAE;oCACvB,YAAY,EAAE,OAAO,CAAC,YAAY;oCAClC,IAAI;oCACJ,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iCACtC,CAAC,CAAC;4BACL,CAAC;wBACH,CAAC;qBACF;oBACH,CAAC,CAAC,EAAE,CAAC;aACR,CAAC,EACJ;gBACE,YAAY,EAAE,CAAC;gBACf,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAChF,eAAe,EAAE,IAAI;gBACrB,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAClD,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACvD,2BAA2B,EACzB,IAAI,CAAC,GAAG,CACN,CAAC,EACD,yCAAyC,CACvC,kBAAkB,EAClB,eAAe,EACf,YAAY,CACb,GAAG,qBAAqB,CAAC,EAAE,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC,oBAAoB,CAC3E;aACJ,CACF,CAAC;QACJ,CAAC,CAAC;QAEF,IAAI,MAAqB,CAAC;QAC1B,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC;gBAAE,MAAM,KAAK,CAAC;YACpD,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;YAAE,OAAO,MAAM,CAAC;QACxC,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;QACrC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACjC,IAAI,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACzC,MAAM,OAAO,GACX,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC;iBACjB,OAAO,EAAE;iBACT,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO;gBACjE,mBAAmB,CAAC;YACtB,IAAI,CAAC,sBAAsB,EAAE;gBAC3B,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,OAAO;gBACP,YAAY,EAAE,QAAQ,CAAC,YAAY;gBACnC,GAAG,CAAC,QAAQ,CAAC,WAAW,KAAK,SAAS;oBACpC,CAAC,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE;oBACvC,CAAC,CAAC,EAAE,CAAC;gBACP,GAAG,CAAC,QAAQ,CAAC,WAAW,KAAK,mBAAmB;oBAC9C,CAAC,CAAC,EAAE,WAAW,EAAE,mBAA4B,EAAE;oBAC/C,CAAC,CAAC,EAAE,CAAC;gBACP,YAAY,EAAE,QAAQ,CAAC,KAAK;aAC7B,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YAC3B,IAAI,CAAC,mBAAmB,EAAE;gBACxB,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,OAAO,EAAE,yCAAyC;gBAClD,cAAc,EAAE,YAAY;gBAC5B,GAAG,CAAC,OAAO,CAAC,8BAA8B,KAAK,mBAAmB;oBAChE,CAAC,CAAC,EAAE,WAAW,EAAE,mBAA4B,EAAE;oBAC/C,CAAC,CAAC,EAAE,CAAC;aACR,CAAC,CAAC;QACL,CAAC;QACD,IAAI,OAAO,CAAC,OAAO;YAAE,OAAO,GAAG,IAAI,CAAC;QACpC,IAAI,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACzC,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;QAC7B,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;YACvD,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvE,IAAI,CAAC,mBAAmB,EAAE;gBACxB,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC,OAAO;gBACzE,cAAc,EAAE,YAAY;gBAC5B,GAAG,CAAC,OAAO,CAAC,8BAA8B,KAAK,mBAAmB;oBAChE,CAAC,CAAC,EAAE,WAAW,EAAE,mBAA4B,EAAE;oBAC/C,CAAC,CAAC,EAAE,CAAC;aACR,CAAC,CAAC;QACL,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
+{"version":3,"file":"session-compact-helper.js","sourceRoot":"","sources":["../../../src/app/controllers/session-compact-helper.ts"],"names":[],"mappings":"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"}

package/dist/app/controllers/session-controller.d.ts

@@ -64,6 +64,8 @@ export interface SessionControllerDeps {
     readonly clock?: Clock | undefined;
     readonly mintTurnId?: (() => TurnId) | undefined;
     readonly getTranscriptSnapshot?: (() => ClassicTranscriptItem[] | undefined) | undefined;
+    readonly absorbPersistedTranscript?: ((incoming: readonly ClassicTranscriptItem[]) => readonly ClassicTranscriptItem[]) | undefined;
+    readonly lateWorkPollMs?: number | undefined;
     readonly noHistory?: boolean | undefined;
     readonly notifyResponderDelivery?: ((summary: string) => void) | undefined;
     readonly titleCompleter?: ((messages: ChatMessage[]) => Promise<string>) | undefined;
@@ -108,10 +110,13 @@ export declare class SessionController implements Disposable {
     private lastContextCompactionId;
     private readonly usageLedger;
     private readonly changeLedger;
+    private readonly lateWork;
     private lifecycleGeneration;
     private lastTurnResult;
     private restoredPreviousTurn;
     private activeTurnGeneration;
+    private closing;
+    private readonly settledWaiters;
     private readonly projectContext;
     constructor(deps: SessionControllerDeps);
     get workspace(): SessionWorkspace | undefined;
@@ -154,6 +159,7 @@ export declare class SessionController implements Disposable {
         model?: string | undefined;
         transcript?: readonly ClassicTranscriptItem[] | undefined;
         changes?: readonly FileLineChanges[] | undefined;
+        unsyncedItemIds?: readonly string[] | undefined;
     }): void;
     private applyRestoredModel;
     notice(level: NoticeLevel, text: string): void;
@@ -180,7 +186,9 @@ export declare class SessionController implements Disposable {
     private settlePersistedResponderResults;
     private continuationCheckpoint;
     canResumeFromHistory(): boolean;
+    shutdown(): Promise<void>;
     persistNow(name?: string): Promise<void>;
+    private canAbsorbLateWork;
     estimateContext(): {
         messages: number;
         tokens: number;

package/dist/app/controllers/session-controller.js

@@ -38,6 +38,7 @@ import { completeForSessionNaming, SessionNamer } from "./session-naming.js";
 import { SessionPromptStore } from "../../store/session-prompts.js";
 import { legacySessionPrompts } from "./session-prompt-history.js";
 import { SessionChanges } from "./session-changes.js";
+import { SessionLateWork } from "./session-late-work.js";
 import { isInternalChatMessage } from "../../types.js";
 export class SessionController {
     deps;
@@ -77,16 +78,30 @@ export class SessionController {
     lastContextCompactionId;
     usageLedger = new SessionUsageLedger();
     changeLedger = new SessionChanges();
+    lateWork;
     lifecycleGeneration = 0;
     lastTurnResult;
     restoredPreviousTurn;
     activeTurnGeneration;
+    closing = false;
+    settledWaiters = new Set();
     projectContext = createContextProjector((snapshot) => formatContextChip(snapshot, { compact: false }));
     constructor(deps) {
         this.deps = deps;
         this.sessionIdValue = asSessionId(deps.sessionId ?? mintSessionId());
         this.promptHistoryValue = new SessionPromptStore(this.sessionIdValue);
         this.persistence = new SessionPersistenceQueue(deps.persistence);
+        this.lateWork = new SessionLateWork({
+            persistence: this.persistence,
+            sessionId: () => this.sessionIdValue,
+            ready: () => this.canAbsorbLateWork(),
+            absorb: deps.absorbPersistedTranscript,
+            absorbed: () => {
+                this.notifyState();
+                void this.persistNow().catch(() => undefined);
+            },
+            pollMs: deps.lateWorkPollMs,
+        });
         this.provider = deps.provider;
         this.model = deps.model;
         this.mode = deps.mode ?? "agent";
@@ -111,6 +126,27 @@ export class SessionController {
             notifyState: () => this.notifyState(),
             notice: (text) => this.notice("info", text),
             runTurn: (prompt, options) => this.runTurn(prompt, options),
+            load: () => {
+                if (!this.isPromptHistoryEnabled())
+                    return [];
+                try {
+                    return deps.persistence.loadQueuedPrompts?.(this.sessionIdValue) ?? [];
+                }
+                catch (error) {
+                    this.notice("warn", `could not restore queued prompts: ${error instanceof Error ? error.message : String(error)}`);
+                    return [];
+                }
+            },
+            save: (prompts) => {
+                if (!this.isPromptHistoryEnabled())
+                    return;
+                try {
+                    deps.persistence.saveQueuedPrompts?.(this.sessionIdValue, prompts);
+                }
+                catch (error) {
+                    this.notice("warn", `could not save queued prompts: ${error instanceof Error ? error.message : String(error)}`);
+                }
+            },
             lastTurnResult: () => this.lastTurnResult,
         });
         this.loopRecovery = new SessionLoopRecovery({
@@ -166,6 +202,7 @@ export class SessionController {
         else {
             this.responder = undefined;
         }
+        this.prompts.rebind();
     }
     get workspace() {
         return getActiveSessionWorkspace();
@@ -373,7 +410,7 @@ export class SessionController {
         repairToolProtocol(healed);
         this.history = healed;
         this.restoredPreviousTurn = options.previousTurn;
-        this.prompts.clear();
+        this.prompts.detach();
         this.spool.clear();
         this.sessionTitle = options.title;
         this.lastContextCompactionId = undefined;
@@ -396,8 +433,10 @@ export class SessionController {
             this.persistence.rebind(options.persistenceRevision);
             void this.deps.interactiveSessions?.activateOwner(this.sessionIdValue).catch(() => undefined);
         }
+        this.prompts.rebind();
         this.resetPromptHistory();
         this.changeLedger.restore(options.changes, options.transcript);
+        this.lateWork.restore(options.unsyncedItemIds, options.transcript);
         if (this.isPromptHistoryEnabled()) {
             const generation = this.lifecycleGeneration;
             this.legacyPromptSource = () => legacySessionPrompts(messages, options.transcript);
@@ -468,7 +507,10 @@ export class SessionController {
         this.sequencer.rebind(this.sessionIdValue);
         this.history = [];
         this.restoredPreviousTurn = undefined;
-        this.prompts.clear();
+        if (options.mintNewId)
+            this.prompts.detach();
+        else
+            this.prompts.clear();
         this.sessionTitle = undefined;
         this.setContextSnapshot(undefined);
         this.lastContextCompactionId = undefined;
@@ -488,6 +530,7 @@ export class SessionController {
         }
         this.resetPromptHistory();
         this.changeLedger.restore();
+        this.lateWork.clear();
         this.policy = createSessionPolicy(this.sessionIdValue);
         this.replaceSubagents();
         this.notifyState();
@@ -617,6 +660,25 @@ export class SessionController {
             !getConfig().privateMode &&
             hasPersistableHistory(this.history));
     }
+    async shutdown() {
+        this.closing = true;
+        this.abort("session is closing");
+        this.prompts.detach();
+        if (this.unsettledTurns > 0) {
+            let finish = () => undefined;
+            const settled = new Promise((resolve) => { finish = resolve; });
+            this.settledWaiters.add(finish);
+            const timer = setTimeout(finish, 2_000);
+            try {
+                await settled;
+            }
+            finally {
+                clearTimeout(timer);
+                this.settledWaiters.delete(finish);
+            }
+        }
+        await this.persistNow();
+    }
     async persistNow(name) {
         if (this.deps.noHistory || getConfig().privateMode) {
             this.settlePersistedResponderResults();
@@ -636,6 +698,7 @@ export class SessionController {
         const persistedHistory = projectToolHistory(this.history).messages;
         const workspace = getActiveSessionWorkspace();
         const changes = this.changeLedger.snapshot().files;
+        const unsyncedItemIds = this.lateWork.unsyncedIds;
         const saved = this.persistence.save(persistedHistory, {
             sessionId: this.sessionIdValue,
             name: name ?? this.sessionTitle,
@@ -650,10 +713,17 @@ export class SessionController {
                 ...(workspace ? { workspaceFolder: workspace.folderName, workspaceCode: workspace.code } : {}),
             },
             ...(contextUsage ? { contextUsage } : {}),
+            ...(unsyncedItemIds.length > 0 ? { unsyncedItemIds } : {}),
         });
-        await Promise.all([saved, this.promptHistoryValue.flush().catch(() => undefined)]);
-        if (generation === this.lifecycleGeneration)
-            this.settlePersistedResponderResults();
+        const [merge] = await Promise.all([saved, this.promptHistoryValue.flush().catch(() => undefined)]);
+        if (generation !== this.lifecycleGeneration)
+            return;
+        this.settlePersistedResponderResults();
+        this.lateWork.accept(merge);
+    }
+    canAbsorbLateWork() {
+        return !this.closing && !this.turn.running && !this.compactingFlag && !this.deps.noHistory &&
+            !getConfig().privateMode && hasPersistableHistory(this.history);
     }
     estimateContext() {
         const snapshot = this.resolveContextSnapshot();
@@ -769,7 +839,14 @@ export class SessionController {
             this.notice("info", built.fallbackReason);
         for (const issue of built.imageIssues)
             this.notice("warn", issue);
-        const request = built.request;
+        const lateWorkNote = this.lateWork.takeNote();
+        const request = lateWorkNote
+            ? {
+                ...built.request,
+                prompt: `${lateWorkNote}\n\n${built.request.prompt}`,
+                displayPrompt: built.request.displayPrompt !== undefined ? built.request.displayPrompt : built.request.prompt,
+            }
+            : built.request;
         const turnGeneration = this.lifecycleGeneration;
         const userPrompt = opts?.displayPrompt ?? prompt;
         if (this.isPromptHistoryEnabled() && opts?.displayPrompt !== null && !opts?.internal &&
@@ -802,6 +879,10 @@ export class SessionController {
                     this.lastMainRequestSnapshot = snapshot;
                 },
                 onStarted: opts?.onStarted,
+                onSubmitted: () => {
+                    if (turnGeneration === this.lifecycleGeneration)
+                        opts?.onSubmitted?.();
+                },
             });
             this.notifyState();
             const result = await pending;
@@ -814,7 +895,8 @@ export class SessionController {
             if (sameGeneration) {
                 this.lastTurnResult = result;
                 this.restoredPreviousTurn = undefined;
-                this.loopRecovery.handle(result);
+                if (!this.closing)
+                    this.loopRecovery.handle(result);
             }
             if (sameGeneration &&
                 (result.status === "completed" ||
@@ -824,12 +906,17 @@ export class SessionController {
             }
             for (const listener of this.turnEndListeners)
                 listener(result);
-            if (sameGeneration)
+            if (sameGeneration && !this.closing)
                 this.prompts.settle(result);
             return result;
         }
         finally {
             this.unsettledTurns -= 1;
+            if (this.unsettledTurns === 0) {
+                for (const finish of this.settledWaiters)
+                    finish();
+                this.settledWaiters.clear();
+            }
             this.responder?.scheduleWake();
             this.subagentDelivery.scheduleWake();
         }
@@ -905,12 +992,14 @@ export class SessionController {
     }
     dispose() {
         this.beginLifecycleGeneration();
+        this.prompts.detach();
         this.namer.reset();
         this.subagentDelivery.dispose();
         this.subagentsValue.dispose();
         this.fenceInteractiveOwner(this.sessionIdValue);
         this.turnEndListeners.clear();
         this.stateListeners.clear();
+        this.lateWork.dispose();
         this.disposables.dispose();
     }
     notifyState() {