@xandout/libra-harness 0.1.12 → 0.1.14

package/dist/extras/extensions/code-tools/tools/todo.d.ts

@@ -0,0 +1,24 @@
+export type TodoStatus = 'pending' | 'in_progress' | 'completed';
+export interface Todo {
+    content: string;
+    status: TodoStatus;
+}
+export declare class TodoStore {
+    private todos;
+    private filePath?;
+    constructor(filePath?: string);
+    /** Load todos from disk. */
+    private load;
+    /** Save todos to disk. */
+    private save;
+    /** Replace the entire todo list. */
+    setAll(todos: Todo[]): void;
+    /** Get a snapshot of the current todos. */
+    getAll(): Todo[];
+    clear(): void;
+}
+export declare const todoWriteTool: (cfg: {
+    toolPrefix: string;
+    store: TodoStore;
+}) => any;
+//# sourceMappingURL=todo.d.ts.map

package/dist/extras/extensions/code-tools/tools/todo.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"todo.d.ts","sourceRoot":"","sources":["../../../../../src/extras/extensions/code-tools/tools/todo.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,aAAa,GAAG,WAAW,CAAC;AAEjE,MAAM,WAAW,IAAI;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,UAAU,CAAC;CACpB;AAED,qBAAa,SAAS;IACpB,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,QAAQ,CAAC,CAAS;IAE1B,YAAY,QAAQ,CAAC,EAAE,MAAM,EAK5B;IAED,4BAA4B;IAC5B,OAAO,CAAC,IAAI;IAmBZ,0BAA0B;IAC1B,OAAO,CAAC,IAAI;IAUZ,oCAAoC;IACpC,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,CAG1B;IAED,2CAA2C;IAC3C,MAAM,IAAI,IAAI,EAAE,CAEf;IAED,KAAK,IAAI,IAAI,CAGZ;CACF;AAGD,eAAO,MAAM,aAAa,EAAE,CAAC,GAAG,EAAE;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,CAAA;CAAE,KAAK,GA4E7E,CAAC"}

package/dist/extras/extensions/code-tools/tools/todo.js

@@ -0,0 +1,131 @@
+import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
+import { dirname } from 'node:path';
+import { makeToolName } from './shared.js';
+export class TodoStore {
+    todos = [];
+    filePath;
+    constructor(filePath) {
+        this.filePath = filePath;
+        if (filePath) {
+            this.load();
+        }
+    }
+    /** Load todos from disk. */
+    load() {
+        if (!this.filePath)
+            return;
+        try {
+            if (existsSync(this.filePath)) {
+                const data = JSON.parse(readFileSync(this.filePath, 'utf-8'));
+                if (Array.isArray(data)) {
+                    this.todos = data.map((t) => ({
+                        content: String(t.content ?? ''),
+                        status: (t.status === 'in_progress' || t.status === 'completed')
+                            ? t.status
+                            : 'pending',
+                    }));
+                }
+            }
+        }
+        catch {
+            // ignore corrupt file
+        }
+    }
+    /** Save todos to disk. */
+    save() {
+        if (!this.filePath)
+            return;
+        try {
+            mkdirSync(dirname(this.filePath), { recursive: true });
+            writeFileSync(this.filePath, JSON.stringify(this.todos, null, 2) + '\n', 'utf-8');
+        }
+        catch {
+            // ignore write errors
+        }
+    }
+    /** Replace the entire todo list. */
+    setAll(todos) {
+        this.todos = todos;
+        this.save();
+    }
+    /** Get a snapshot of the current todos. */
+    getAll() {
+        return [...this.todos];
+    }
+    clear() {
+        this.todos = [];
+        this.save();
+    }
+}
+// ── todo_write tool ──────────────────────────────────────────────────
+export const todoWriteTool = (cfg) => ({
+    name: makeToolName(cfg.toolPrefix, 'todo_write'),
+    description: 'Create and manage a structured task list for tracking multi-step work. ' +
+        'Use this for tasks with 3 or more distinct steps. Skip it for trivial single-step work. ' +
+        'Each todo has a status: "pending", "in_progress", or "completed". ' +
+        'Keep exactly ONE todo as "in_progress" at a time — mark it in_progress when starting, ' +
+        'and mark it "completed" immediately when done. ' +
+        'The entire list is replaced on each call (not appended). ' +
+        'Add follow-up tasks discovered during work. Remove tasks that are no longer relevant. ' +
+        'Todos persist across sessions, so you can pick up where you left off.',
+    parameters: {
+        type: 'object',
+        properties: {
+            todos: {
+                type: 'array',
+                description: 'The complete todo list. Replaces the previous list on each call.',
+                items: {
+                    type: 'object',
+                    properties: {
+                        content: {
+                            type: 'string',
+                            description: 'The task description.',
+                        },
+                        status: {
+                            type: 'string',
+                            enum: ['pending', 'in_progress', 'completed'],
+                            description: 'Current status of the todo.',
+                        },
+                    },
+                    required: ['content', 'status'],
+                },
+            },
+        },
+        required: ['todos'],
+    },
+    async execute(args) {
+        const input = args.todos;
+        if (!Array.isArray(input)) {
+            return { toolCallId: '', content: 'Error: todos must be an array' };
+        }
+        const todos = input.map((t) => ({
+            content: String(t.content ?? ''),
+            status: (t.status === 'in_progress' || t.status === 'completed')
+                ? t.status
+                : 'pending',
+        }));
+        // Validate: at most one in_progress.
+        const inProgressCount = todos.filter((t) => t.status === 'in_progress').length;
+        if (inProgressCount > 1) {
+            return {
+                toolCallId: '',
+                content: 'Error: only one todo can be "in_progress" at a time. Mark the others "pending" or "completed".',
+                isError: true,
+            };
+        }
+        cfg.store.setAll(todos);
+        // Format the response so the model sees the current state.
+        if (todos.length === 0) {
+            return { toolCallId: '', content: 'Todo list cleared.' };
+        }
+        const lines = todos.map((t, i) => {
+            const marker = t.status === 'completed' ? '[x]' : t.status === 'in_progress' ? '[~]' : '[ ]';
+            return `${i + 1}. ${marker} ${t.content}`;
+        });
+        return {
+            toolCallId: '',
+            content: `Updated todo list:\n${lines.join('\n')}`,
+        };
+    },
+});
+//# sourceMappingURL=todo.js.map

package/dist/extras/extensions/code-tools/tools/todo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"todo.js","sourceRoot":"","sources":["../../../../../src/extras/extensions/code-tools/tools/todo.ts"],"names":[],"mappings":"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"}

package/dist/extras/extensions/code-tools/tools/write.d.ts

@@ -0,0 +1,4 @@
+import { type ToolFactory } from './shared.js';
+export declare const writeTool: ToolFactory;
+export declare const editTool: ToolFactory;
+//# sourceMappingURL=write.d.ts.map

package/dist/extras/extensions/code-tools/tools/write.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"write.d.ts","sourceRoot":"","sources":["../../../../../src/extras/extensions/code-tools/tools/write.ts"],"names":[],"mappings":"AAEA,OAAO,EAA4B,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAGzE,eAAO,MAAM,SAAS,EAAE,WA2DtB,CAAC;AAGH,eAAO,MAAM,QAAQ,EAAE,WA2HrB,CAAC"}

package/dist/extras/extensions/code-tools/tools/write.js

@@ -0,0 +1,179 @@
+import { writeFileSync, readFileSync, existsSync, mkdirSync } from 'node:fs';
+import { dirname } from 'node:path';
+import { makeToolName, getReadSet } from './shared.js';
+// ── write ────────────────────────────────────────────────────────────
+export const writeTool = (cfg) => ({
+    name: makeToolName(cfg.toolPrefix, 'write'),
+    description: 'Write content to a file, creating it if it does not exist or overwriting it if it does. ' +
+        'You MUST read an existing file before overwriting it — this is enforced. ' +
+        'Use absolute paths. Creates parent directories as needed. ' +
+        'The content parameter is the complete file contents (not a patch).',
+    parameters: {
+        type: 'object',
+        properties: {
+            file_path: {
+                type: 'string',
+                description: 'The absolute path to the file to write.',
+            },
+            content: {
+                type: 'string',
+                description: 'The complete content to write to the file.',
+            },
+        },
+        required: ['file_path', 'content'],
+    },
+    async execute(args, ctx) {
+        const filePath = String(args.file_path ?? '');
+        if (!filePath) {
+            return { toolCallId: '', content: 'Error: file_path is required' };
+        }
+        const content = String(args.content ?? '');
+        // Enforce read-before-overwrite for existing files.
+        if (existsSync(filePath)) {
+            const readSet = getReadSet(ctx.metadata);
+            if (!readSet.has(filePath)) {
+                return {
+                    toolCallId: '',
+                    content: `Error: You must read "${filePath}" before overwriting it. Use the read tool first.`,
+                    isError: true,
+                };
+            }
+        }
+        try {
+            const dir = dirname(filePath);
+            if (!existsSync(dir)) {
+                mkdirSync(dir, { recursive: true });
+            }
+            writeFileSync(filePath, content, 'utf-8');
+            return {
+                toolCallId: '',
+                content: `Wrote ${content.length} chars to ${filePath}`,
+            };
+        }
+        catch (err) {
+            return {
+                toolCallId: '',
+                content: `Error writing file: ${err instanceof Error ? err.message : String(err)}`,
+                isError: true,
+            };
+        }
+    },
+});
+// ── edit ─────────────────────────────────────────────────────────────
+export const editTool = (cfg) => ({
+    name: makeToolName(cfg.toolPrefix, 'edit'),
+    description: 'Replace a string in a file with a new string. The old_string must be unique in the file ' +
+        'unless replace_all is true. You MUST read the file before editing it. ' +
+        'Use absolute paths. Preserve indentation exactly — match the file\'s actual content. ' +
+        'The new_string must differ from old_string.',
+    parameters: {
+        type: 'object',
+        properties: {
+            file_path: {
+                type: 'string',
+                description: 'The absolute path to the file to edit.',
+            },
+            old_string: {
+                type: 'string',
+                description: 'The exact string to find in the file. Must be unique unless replace_all is true.',
+            },
+            new_string: {
+                type: 'string',
+                description: 'The string to replace old_string with. Must differ from old_string.',
+            },
+            replace_all: {
+                type: 'boolean',
+                description: 'If true, replace all occurrences of old_string. Default: false.',
+            },
+        },
+        required: ['file_path', 'old_string', 'new_string'],
+    },
+    async execute(args, ctx) {
+        const filePath = String(args.file_path ?? '');
+        if (!filePath) {
+            return { toolCallId: '', content: 'Error: file_path is required' };
+        }
+        const oldString = String(args.old_string ?? '');
+        const newString = String(args.new_string ?? '');
+        const replaceAll = args.replace_all === true;
+        if (oldString === newString) {
+            return {
+                toolCallId: '',
+                content: 'Error: new_string must differ from old_string.',
+                isError: true,
+            };
+        }
+        if (!existsSync(filePath)) {
+            return {
+                toolCallId: '',
+                content: `File not found: ${filePath}`,
+                isError: true,
+            };
+        }
+        // Enforce read-before-edit.
+        const readSet = getReadSet(ctx.metadata);
+        if (!readSet.has(filePath)) {
+            return {
+                toolCallId: '',
+                content: `Error: You must read "${filePath}" before editing it. Use the read tool first.`,
+                isError: true,
+            };
+        }
+        let content;
+        try {
+            content = readFileSync(filePath, 'utf-8');
+        }
+        catch (err) {
+            return {
+                toolCallId: '',
+                content: `Error reading file: ${err instanceof Error ? err.message : String(err)}`,
+                isError: true,
+            };
+        }
+        // Count occurrences.
+        let count = 0;
+        let idx = 0;
+        while ((idx = content.indexOf(oldString, idx)) !== -1) {
+            count++;
+            idx += oldString.length;
+        }
+        if (count === 0) {
+            return {
+                toolCallId: '',
+                content: `Error: old_string not found in ${filePath}. Check for exact whitespace, indentation, and line endings.`,
+                isError: true,
+            };
+        }
+        if (count > 1 && !replaceAll) {
+            return {
+                toolCallId: '',
+                content: `Error: old_string appears ${count} times in ${filePath}. Provide more surrounding context to make it unique, or set replace_all to true.`,
+                isError: true,
+            };
+        }
+        // Perform the replacement.
+        let newContent;
+        if (replaceAll) {
+            newContent = content.split(oldString).join(newString);
+        }
+        else {
+            newContent = content.replace(oldString, newString);
+        }
+        try {
+            writeFileSync(filePath, newContent, 'utf-8');
+            const replaced = replaceAll ? count : 1;
+            return {
+                toolCallId: '',
+                content: `Replaced ${replaced} occurrence${replaced === 1 ? '' : 's'} in ${filePath}`,
+            };
+        }
+        catch (err) {
+            return {
+                toolCallId: '',
+                content: `Error writing file: ${err instanceof Error ? err.message : String(err)}`,
+                isError: true,
+            };
+        }
+    },
+});
+//# sourceMappingURL=write.js.map

package/dist/extras/extensions/code-tools/tools/write.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"write.js","sourceRoot":"","sources":["../../../../../src/extras/extensions/code-tools/tools/write.ts"],"names":[],"mappings":"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"}

package/dist/extras/extensions/disk-session/extension.d.ts

@@ -107,6 +107,11 @@ export interface DiskSessionConfig {
     recentChannelMessages?: number;
     /** Load existing JSONL files into memory on startup. Default: true. */
     loadOnStartup?: boolean;
+    /**
+     * Print a summary line when sessions are loaded from disk.
+     * Default: true.
+     */
+    verbose?: boolean;
     /**
      * Resolve a {@link SessionIdentity} from turn metadata. Default:
      * reads `metadata.session` as a `SessionIdentity`, falls back to

package/dist/extras/extensions/disk-session/extension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extension.d.ts","sourceRoot":"","sources":["../../../../src/extras/extensions/disk-session/extension.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"extension.d.ts","sourceRoot":"","sources":["../../../../src/extras/extensions/disk-session/extension.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAW,cAAc,EAAQ,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEtF;;;;;;;;GAQG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,MAAM,GAAG,SAAS,GAAG,QAAQ,CAAC;IAC3D,OAAO,EAAE,cAAc,CAAC;IACxB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qFAAqF;IACrF,EAAE,EAAE,MAAM,CAAC;IACX,uEAAuE;IACvE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,2CAA2C;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;;OAOG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,yEAAyE;IACzE,KAAK,CAAC,EAAE;QACN,YAAY,EAAE,MAAM,CAAC;QACrB,gBAAgB,EAAE,MAAM,CAAC;QACzB,UAAU,EAAE,MAAM,CAAC;QACnB,8DAA8D;QAC9D,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,+CAA+C;QAC/C,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,CAAC;IACF;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC;AAED;;;;;GAKG;AACH,MAAM,WAAW,eAAe;IAC9B;4NACwN;IACxN,GAAG,EAAE,MAAM,CAAC;IACZ,0EAA0E;IAC1E,SAAS,EAAE,MAAM,CAAC;IAClB,iKAAiK;IACjK,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,8FAA8F;IAC9F,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,eAAe,GAAG,SAAS,CAAC;CACzE;AAED,MAAM,WAAW,iBAAiB;IAChC,6DAA6D;IAC7D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;;;;OAKG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;;;;;;OAMG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,uEAAuE;IACvE,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC5B;AAgBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,MAAM,CAAC,OAAO,UAAU,0BAA0B,CAChD,MAAM,CAAC,EAAE,iBAAiB,GACzB,SAAS,GAAG;IACb,UAAU,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,aAAa,EAAE,CAAC;IACjD,WAAW,IAAI,MAAM,EAAE,CAAC;IACxB,KAAK,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,IAAI,IAAI,CAAC;IACjB,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzF,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QACxD,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAChC,GAAG,IAAI,CAAC;CACV,CAkpBA"}

package/dist/extras/extensions/disk-session/extension.js

@@ -83,7 +83,7 @@ export default function createDiskSessionExtension(config) {
                     // Skip corrupt files.
                 }
             }
-            if (store.size > 0) {
+            if (store.size > 0 && config?.verbose !== false) {
                 console.log(`[disk-session] loaded ${store.size} session(s), ${totalRecords} record(s) from ${dir}`);
             }
         }
@@ -150,6 +150,17 @@ export default function createDiskSessionExtension(config) {
             return false;
         return true; // user, system, assistant (without tool calls)
     };
+    // Drop trailing user messages that don't have a following assistant
+    // response. This happens when a turn was interrupted (crash, halt,
+    // kill -9). Including an unanswered user request from a prior session
+    // confuses the agent — it sees a request it never responded to.
+    function dropIncompleteTrailingTurn(records) {
+        const result = [...records];
+        while (result.length > 0 && result[result.length - 1].role === 'user') {
+            result.pop();
+        }
+        return result;
+    }
     // ── Build context (the "fork") from a snapshot ────────────────
     // The snapshot is a read-only copy of the session records at the
     // moment the turn started. This function builds the messages array
@@ -163,8 +174,13 @@ export default function createDiskSessionExtension(config) {
         // DM or top-level message: last N messages, but filter out
         // tool-call intermediates that might get split by the slice.
         if (isDirect || !threadTs) {
-            return snapshot
-                .filter(isConversationMessage)
+            const filtered = snapshot.filter(isConversationMessage);
+            // Drop incomplete turns: a user message at the end without a
+            // following assistant response means the turn was interrupted
+            // (crash, halt, etc). Including it would confuse the agent with
+            // an unanswered request from a previous session.
+            const complete = dropIncompleteTrailingTurn(filtered);
+            return complete
                 .slice(-maxContextMessages)
                 .map(toMessage);
         }
@@ -268,26 +284,91 @@ export default function createDiskSessionExtension(config) {
                     ctx.turn.messages = [...history, ...ctx.turn.messages];
                 }
             });
-            // ── afterLLM: accumulate token usage across iterations ─────
+            // ── afterLLM: accumulate token usage + append assistant msg ──
             // Each LLM call returns usage (prompt/completion tokens). We
             // accumulate them across all iterations in the turn so the final
             // assistant record has the total cost.
+            //
+            // We also append the assistant message (including tool calls) to
+            // the session log immediately, so the JSONL file is updated
+            // iteration by iteration rather than only at afterTurn. Tool
+            // results are appended in the afterTool hook below.
             agent.hook('afterLLM', 'disk-session', async (ctx) => {
+                const identity = identityFromCtx(ctx);
+                if (!identity)
+                    return;
+                const { key, messageTs, threadTs } = identity;
                 const usage = ctx.modelResponse?.usage;
-                if (!usage)
+                if (usage) {
+                    const prev = ctx.turn.metadata['_diskSessionUsage'] ?? { promptTokens: 0, completionTokens: 0, iterations: 0 };
+                    ctx.turn.metadata['_diskSessionUsage'] = {
+                        promptTokens: prev.promptTokens + usage.promptTokens,
+                        completionTokens: prev.completionTokens + usage.completionTokens,
+                        iterations: prev.iterations + 1,
+                        ...(usage.cachedPromptTokens && {
+                            cachedPromptTokens: (prev.cachedPromptTokens ?? 0) + usage.cachedPromptTokens,
+                        }),
+                        ...(usage.reasoningTokens && {
+                            reasoningTokens: (prev.reasoningTokens ?? 0) + usage.reasoningTokens,
+                        }),
+                    };
+                }
+                // ── Incremental append: write the assistant message now ──
+                // The agent core pushes the assistant message to turn.messages
+                // AFTER afterLLM fires, so we can't read it from there yet.
+                // Instead, we build the record from modelResponse.message.
+                const modelResponse = ctx.modelResponse;
+                if (modelResponse?.message) {
+                    const sessionMeta = ctx.turn.metadata.sessionMeta;
+                    const record = {
+                        ...toRecord(modelResponse.message, messageTs, threadTs),
+                        ...(sessionMeta ? { meta: sessionMeta } : {}),
+                    };
+                    const records = store.get(key) ?? [];
+                    records.push(record);
+                    if (records.length > maxRecords) {
+                        records.splice(0, records.length - maxRecords);
+                    }
+                    store.set(key, records);
+                    appendToFile(key, [record]);
+                    // Track how many records we've already written so afterTurn
+                    // doesn't duplicate them.
+                    const written = ctx.turn.metadata['_diskSessionWritten'] ?? 0;
+                    ctx.turn.metadata['_diskSessionWritten'] = written + 1;
+                }
+            });
+            // ── afterTool: append tool results incrementally ──────────────
+            // Each tool result is written to disk as soon as it completes,
+            // so the JSONL file reflects progress in real time.
+            agent.hook('afterTool', 'disk-session', async (ctx) => {
+                const identity = identityFromCtx(ctx);
+                if (!identity)
+                    return;
+                const { key, messageTs, threadTs } = identity;
+                const toolResult = ctx.toolResult;
+                const toolCall = ctx.toolCall;
+                if (!toolResult || !toolCall)
                     return;
-                const prev = ctx.turn.metadata['_diskSessionUsage'] ?? { promptTokens: 0, completionTokens: 0, iterations: 0 };
-                ctx.turn.metadata['_diskSessionUsage'] = {
-                    promptTokens: prev.promptTokens + usage.promptTokens,
-                    completionTokens: prev.completionTokens + usage.completionTokens,
-                    iterations: prev.iterations + 1,
-                    ...(usage.cachedPromptTokens && {
-                        cachedPromptTokens: (prev.cachedPromptTokens ?? 0) + usage.cachedPromptTokens,
-                    }),
-                    ...(usage.reasoningTokens && {
-                        reasoningTokens: (prev.reasoningTokens ?? 0) + usage.reasoningTokens,
-                    }),
+                const sessionMeta = ctx.turn.metadata.sessionMeta;
+                const record = {
+                    role: 'tool',
+                    content: toolResult.content,
+                    toolCallId: toolResult.toolCallId,
+                    name: toolCall.name,
+                    ts: messageTs,
+                    ...(threadTs ? { threadTs } : {}),
+                    recordedAt: new Date().toISOString(),
+                    ...(sessionMeta ? { meta: sessionMeta } : {}),
                 };
+                const records = store.get(key) ?? [];
+                records.push(record);
+                if (records.length > maxRecords) {
+                    records.splice(0, records.length - maxRecords);
+                }
+                store.set(key, records);
+                appendToFile(key, [record]);
+                const written = ctx.turn.metadata['_diskSessionWritten'] ?? 0;
+                ctx.turn.metadata['_diskSessionWritten'] = written + 1;
             });
             // ── afterTurn: append assistant response + tool calls ─────
             // The user message was already persisted in beforeTurn.
@@ -339,11 +420,58 @@ export default function createDiskSessionExtension(config) {
                 const systemMsgCount = ctx.turn.messages[historyLen]?.role === 'system' ? 1 : 0;
                 const newStart = historyLen + systemMsgCount;
                 const newMessages = ctx.turn.messages.slice(newStart);
-                // Only persist non-user, non-system messages here.
-                // The user message was already written in beforeTurn.
-                const filteredMessages = newMessages.filter((m) => m.role !== 'system' && m.role !== 'user');
-                if (filteredMessages.length === 0)
+                // Persist non-user, non-system messages here. The initial user
+                // message was already written in beforeTurn. EXCEPTION: steering
+                // messages are injected mid-turn as user messages with a
+                // [steering] prefix — those are new and must be persisted.
+                let filteredMessages = newMessages.filter((m) => {
+                    if (m.role === 'system')
+                        return false;
+                    if (m.role === 'user') {
+                        const text = typeof m.content === 'string'
+                            ? m.content
+                            : Array.isArray(m.content)
+                                ? m.content.filter((p) => p.type === 'text').map((p) => p.text).join('')
+                                : '';
+                        return text.startsWith('[steering]');
+                    }
+                    return true;
+                });
+                // ── Skip records already written incrementally ───────────
+                // afterLLM and afterTool hooks append assistant messages and
+                // tool results as they happen. Skip those here to avoid
+                // duplicates. Only the final assistant response (with no tool
+                // calls) may not have been written yet — it's the one that
+                // ends the turn without triggering afterTool.
+                const alreadyWritten = ctx.turn.metadata['_diskSessionWritten'] ?? 0;
+                delete ctx.turn.metadata['_diskSessionWritten'];
+                if (alreadyWritten > 0) {
+                    filteredMessages = filteredMessages.slice(alreadyWritten);
+                }
+                if (filteredMessages.length === 0) {
+                    // All records were already written incrementally by afterLLM
+                    // and afterTool. Still need to backfill the system prompt on
+                    // the user record and clean up usage metadata.
+                    delete ctx.turn.metadata['_diskSessionUsage'];
+                    // ── Backfill system prompt on the last user record ───────
+                    const finalSystemPrompt = ctx.turn.systemPrompt;
+                    if (finalSystemPrompt) {
+                        const records = store.get(key) ?? [];
+                        for (let i = records.length - 1; i >= 0; i--) {
+                            if (records[i].role === 'user') {
+                                records[i].systemPrompt = finalSystemPrompt;
+                                break;
+                            }
+                        }
+                        appendToFile(key, [{
+                                role: 'control',
+                                content: '',
+                                recordedAt: new Date().toISOString(),
+                                systemPrompt: finalSystemPrompt,
+                            }]);
+                    }
                     return;
+                }
                 // Pull accumulated usage for this turn (set by afterLLM hook).
                 const usage = ctx.turn.metadata['_diskSessionUsage'];
                 delete ctx.turn.metadata['_diskSessionUsage'];