@imdigitalashish/zpi 0.1.1

package/dist/core/bash-executor.js

@@ -0,0 +1,212 @@
+/**
+ * Bash command execution with streaming support and cancellation.
+ *
+ * This module provides a unified bash execution implementation used by:
+ * - AgentSession.executeBash() for interactive and RPC modes
+ * - Direct calls from modes that need bash execution
+ */
+import { randomBytes } from "node:crypto";
+import { createWriteStream } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { spawn } from "child_process";
+import stripAnsi from "strip-ansi";
+import { getShellConfig, getShellEnv, killProcessTree, sanitizeBinaryOutput } from "../utils/shell.js";
+import { DEFAULT_MAX_BYTES, truncateTail } from "./tools/truncate.js";
+// ============================================================================
+// Implementation
+// ============================================================================
+/**
+ * Execute a bash command with optional streaming and cancellation support.
+ *
+ * Features:
+ * - Streams sanitized output via onChunk callback
+ * - Writes large output to temp file for later retrieval
+ * - Supports cancellation via AbortSignal
+ * - Sanitizes output (strips ANSI, removes binary garbage, normalizes newlines)
+ * - Truncates output if it exceeds the default max bytes
+ *
+ * @param command - The bash command to execute
+ * @param options - Optional streaming callback and abort signal
+ * @returns Promise resolving to execution result
+ */
+export function executeBash(command, options) {
+    return new Promise((resolve, reject) => {
+        const { shell, args } = getShellConfig();
+        const child = spawn(shell, [...args, command], {
+            detached: true,
+            env: getShellEnv(),
+            stdio: ["ignore", "pipe", "pipe"],
+        });
+        // Track sanitized output for truncation
+        const outputChunks = [];
+        let outputBytes = 0;
+        const maxOutputBytes = DEFAULT_MAX_BYTES * 2;
+        // Temp file for large output
+        let tempFilePath;
+        let tempFileStream;
+        let totalBytes = 0;
+        // Handle abort signal
+        const abortHandler = () => {
+            if (child.pid) {
+                killProcessTree(child.pid);
+            }
+        };
+        if (options?.signal) {
+            if (options.signal.aborted) {
+                // Already aborted, don't even start
+                child.kill();
+                resolve({
+                    output: "",
+                    exitCode: undefined,
+                    cancelled: true,
+                    truncated: false,
+                });
+                return;
+            }
+            options.signal.addEventListener("abort", abortHandler, { once: true });
+        }
+        const decoder = new TextDecoder();
+        const handleData = (data) => {
+            totalBytes += data.length;
+            // Sanitize once at the source: strip ANSI, replace binary garbage, normalize newlines
+            const text = sanitizeBinaryOutput(stripAnsi(decoder.decode(data, { stream: true }))).replace(/\r/g, "");
+            // Start writing to temp file if exceeds threshold
+            if (totalBytes > DEFAULT_MAX_BYTES && !tempFilePath) {
+                const id = randomBytes(8).toString("hex");
+                tempFilePath = join(tmpdir(), `pi-bash-${id}.log`);
+                tempFileStream = createWriteStream(tempFilePath);
+                // Write already-buffered chunks to temp file
+                for (const chunk of outputChunks) {
+                    tempFileStream.write(chunk);
+                }
+            }
+            if (tempFileStream) {
+                tempFileStream.write(text);
+            }
+            // Keep rolling buffer of sanitized text
+            outputChunks.push(text);
+            outputBytes += text.length;
+            while (outputBytes > maxOutputBytes && outputChunks.length > 1) {
+                const removed = outputChunks.shift();
+                outputBytes -= removed.length;
+            }
+            // Stream to callback if provided
+            if (options?.onChunk) {
+                options.onChunk(text);
+            }
+        };
+        child.stdout?.on("data", handleData);
+        child.stderr?.on("data", handleData);
+        child.on("close", (code) => {
+            // Clean up abort listener
+            if (options?.signal) {
+                options.signal.removeEventListener("abort", abortHandler);
+            }
+            if (tempFileStream) {
+                tempFileStream.end();
+            }
+            // Combine buffered chunks for truncation (already sanitized)
+            const fullOutput = outputChunks.join("");
+            const truncationResult = truncateTail(fullOutput);
+            // code === null means killed (cancelled)
+            const cancelled = code === null;
+            resolve({
+                output: truncationResult.truncated ? truncationResult.content : fullOutput,
+                exitCode: cancelled ? undefined : code,
+                cancelled,
+                truncated: truncationResult.truncated,
+                fullOutputPath: tempFilePath,
+            });
+        });
+        child.on("error", (err) => {
+            // Clean up abort listener
+            if (options?.signal) {
+                options.signal.removeEventListener("abort", abortHandler);
+            }
+            if (tempFileStream) {
+                tempFileStream.end();
+            }
+            reject(err);
+        });
+    });
+}
+/**
+ * Execute a bash command using custom BashOperations.
+ * Used for remote execution (SSH, containers, etc.).
+ */
+export async function executeBashWithOperations(command, cwd, operations, options) {
+    const outputChunks = [];
+    let outputBytes = 0;
+    const maxOutputBytes = DEFAULT_MAX_BYTES * 2;
+    let tempFilePath;
+    let tempFileStream;
+    let totalBytes = 0;
+    const decoder = new TextDecoder();
+    const onData = (data) => {
+        totalBytes += data.length;
+        // Sanitize: strip ANSI, replace binary garbage, normalize newlines
+        const text = sanitizeBinaryOutput(stripAnsi(decoder.decode(data, { stream: true }))).replace(/\r/g, "");
+        // Start writing to temp file if exceeds threshold
+        if (totalBytes > DEFAULT_MAX_BYTES && !tempFilePath) {
+            const id = randomBytes(8).toString("hex");
+            tempFilePath = join(tmpdir(), `pi-bash-${id}.log`);
+            tempFileStream = createWriteStream(tempFilePath);
+            for (const chunk of outputChunks) {
+                tempFileStream.write(chunk);
+            }
+        }
+        if (tempFileStream) {
+            tempFileStream.write(text);
+        }
+        // Keep rolling buffer
+        outputChunks.push(text);
+        outputBytes += text.length;
+        while (outputBytes > maxOutputBytes && outputChunks.length > 1) {
+            const removed = outputChunks.shift();
+            outputBytes -= removed.length;
+        }
+        // Stream to callback
+        if (options?.onChunk) {
+            options.onChunk(text);
+        }
+    };
+    try {
+        const result = await operations.exec(command, cwd, {
+            onData,
+            signal: options?.signal,
+        });
+        if (tempFileStream) {
+            tempFileStream.end();
+        }
+        const fullOutput = outputChunks.join("");
+        const truncationResult = truncateTail(fullOutput);
+        const cancelled = options?.signal?.aborted ?? false;
+        return {
+            output: truncationResult.truncated ? truncationResult.content : fullOutput,
+            exitCode: cancelled ? undefined : (result.exitCode ?? undefined),
+            cancelled,
+            truncated: truncationResult.truncated,
+            fullOutputPath: tempFilePath,
+        };
+    }
+    catch (err) {
+        if (tempFileStream) {
+            tempFileStream.end();
+        }
+        // Check if it was an abort
+        if (options?.signal?.aborted) {
+            const fullOutput = outputChunks.join("");
+            const truncationResult = truncateTail(fullOutput);
+            return {
+                output: truncationResult.truncated ? truncationResult.content : fullOutput,
+                exitCode: undefined,
+                cancelled: true,
+                truncated: truncationResult.truncated,
+                fullOutputPath: tempFilePath,
+            };
+        }
+        throw err;
+    }
+}
+//# sourceMappingURL=bash-executor.js.map

package/dist/core/bash-executor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bash-executor.js","sourceRoot":"","sources":["../../src/core/bash-executor.ts"],"names":[],"mappings":"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","sourcesContent":["/**\r\n * Bash command execution with streaming support and cancellation.\r\n *\r\n * This module provides a unified bash execution implementation used by:\r\n * - AgentSession.executeBash() for interactive and RPC modes\r\n * - Direct calls from modes that need bash execution\r\n */\r\n\r\nimport { randomBytes } from \"node:crypto\";\r\nimport { createWriteStream, type WriteStream } from \"node:fs\";\r\nimport { tmpdir } from \"node:os\";\r\nimport { join } from \"node:path\";\r\nimport { type ChildProcess, spawn } from \"child_process\";\r\nimport stripAnsi from \"strip-ansi\";\r\nimport { getShellConfig, getShellEnv, killProcessTree, sanitizeBinaryOutput } from \"../utils/shell.js\";\r\nimport type { BashOperations } from \"./tools/bash.js\";\r\nimport { DEFAULT_MAX_BYTES, truncateTail } from \"./tools/truncate.js\";\r\n\r\n// ============================================================================\r\n// Types\r\n// ============================================================================\r\n\r\nexport interface BashExecutorOptions {\r\n\t/** Callback for streaming output chunks (already sanitized) */\r\n\tonChunk?: (chunk: string) => void;\r\n\t/** AbortSignal for cancellation */\r\n\tsignal?: AbortSignal;\r\n}\r\n\r\nexport interface BashResult {\r\n\t/** Combined stdout + stderr output (sanitized, possibly truncated) */\r\n\toutput: string;\r\n\t/** Process exit code (undefined if killed/cancelled) */\r\n\texitCode: number | undefined;\r\n\t/** Whether the command was cancelled via signal */\r\n\tcancelled: boolean;\r\n\t/** Whether the output was truncated */\r\n\ttruncated: boolean;\r\n\t/** Path to temp file containing full output (if output exceeded truncation threshold) */\r\n\tfullOutputPath?: string;\r\n}\r\n\r\n// ============================================================================\r\n// Implementation\r\n// ============================================================================\r\n\r\n/**\r\n * Execute a bash command with optional streaming and cancellation support.\r\n *\r\n * Features:\r\n * - Streams sanitized output via onChunk callback\r\n * - Writes large output to temp file for later retrieval\r\n * - Supports cancellation via AbortSignal\r\n * - Sanitizes output (strips ANSI, removes binary garbage, normalizes newlines)\r\n * - Truncates output if it exceeds the default max bytes\r\n *\r\n * @param command - The bash command to execute\r\n * @param options - Optional streaming callback and abort signal\r\n * @returns Promise resolving to execution result\r\n */\r\nexport function executeBash(command: string, options?: BashExecutorOptions): Promise<BashResult> {\r\n\treturn new Promise((resolve, reject) => {\r\n\t\tconst { shell, args } = getShellConfig();\r\n\t\tconst child: ChildProcess = spawn(shell, [...args, command], {\r\n\t\t\tdetached: true,\r\n\t\t\tenv: getShellEnv(),\r\n\t\t\tstdio: [\"ignore\", \"pipe\", \"pipe\"],\r\n\t\t});\r\n\r\n\t\t// Track sanitized output for truncation\r\n\t\tconst outputChunks: string[] = [];\r\n\t\tlet outputBytes = 0;\r\n\t\tconst maxOutputBytes = DEFAULT_MAX_BYTES * 2;\r\n\r\n\t\t// Temp file for large output\r\n\t\tlet tempFilePath: string | undefined;\r\n\t\tlet tempFileStream: WriteStream | undefined;\r\n\t\tlet totalBytes = 0;\r\n\r\n\t\t// Handle abort signal\r\n\t\tconst abortHandler = () => {\r\n\t\t\tif (child.pid) {\r\n\t\t\t\tkillProcessTree(child.pid);\r\n\t\t\t}\r\n\t\t};\r\n\r\n\t\tif (options?.signal) {\r\n\t\t\tif (options.signal.aborted) {\r\n\t\t\t\t// Already aborted, don't even start\r\n\t\t\t\tchild.kill();\r\n\t\t\t\tresolve({\r\n\t\t\t\t\toutput: \"\",\r\n\t\t\t\t\texitCode: undefined,\r\n\t\t\t\t\tcancelled: true,\r\n\t\t\t\t\ttruncated: false,\r\n\t\t\t\t});\r\n\t\t\t\treturn;\r\n\t\t\t}\r\n\t\t\toptions.signal.addEventListener(\"abort\", abortHandler, { once: true });\r\n\t\t}\r\n\r\n\t\tconst decoder = new TextDecoder();\r\n\r\n\t\tconst handleData = (data: Buffer) => {\r\n\t\t\ttotalBytes += data.length;\r\n\r\n\t\t\t// Sanitize once at the source: strip ANSI, replace binary garbage, normalize newlines\r\n\t\t\tconst text = sanitizeBinaryOutput(stripAnsi(decoder.decode(data, { stream: true }))).replace(/\\r/g, \"\");\r\n\r\n\t\t\t// Start writing to temp file if exceeds threshold\r\n\t\t\tif (totalBytes > DEFAULT_MAX_BYTES && !tempFilePath) {\r\n\t\t\t\tconst id = randomBytes(8).toString(\"hex\");\r\n\t\t\t\ttempFilePath = join(tmpdir(), `pi-bash-${id}.log`);\r\n\t\t\t\ttempFileStream = createWriteStream(tempFilePath);\r\n\t\t\t\t// Write already-buffered chunks to temp file\r\n\t\t\t\tfor (const chunk of outputChunks) {\r\n\t\t\t\t\ttempFileStream.write(chunk);\r\n\t\t\t\t}\r\n\t\t\t}\r\n\r\n\t\t\tif (tempFileStream) {\r\n\t\t\t\ttempFileStream.write(text);\r\n\t\t\t}\r\n\r\n\t\t\t// Keep rolling buffer of sanitized text\r\n\t\t\toutputChunks.push(text);\r\n\t\t\toutputBytes += text.length;\r\n\t\t\twhile (outputBytes > maxOutputBytes && outputChunks.length > 1) {\r\n\t\t\t\tconst removed = outputChunks.shift()!;\r\n\t\t\t\toutputBytes -= removed.length;\r\n\t\t\t}\r\n\r\n\t\t\t// Stream to callback if provided\r\n\t\t\tif (options?.onChunk) {\r\n\t\t\t\toptions.onChunk(text);\r\n\t\t\t}\r\n\t\t};\r\n\r\n\t\tchild.stdout?.on(\"data\", handleData);\r\n\t\tchild.stderr?.on(\"data\", handleData);\r\n\r\n\t\tchild.on(\"close\", (code) => {\r\n\t\t\t// Clean up abort listener\r\n\t\t\tif (options?.signal) {\r\n\t\t\t\toptions.signal.removeEventListener(\"abort\", abortHandler);\r\n\t\t\t}\r\n\r\n\t\t\tif (tempFileStream) {\r\n\t\t\t\ttempFileStream.end();\r\n\t\t\t}\r\n\r\n\t\t\t// Combine buffered chunks for truncation (already sanitized)\r\n\t\t\tconst fullOutput = outputChunks.join(\"\");\r\n\t\t\tconst truncationResult = truncateTail(fullOutput);\r\n\r\n\t\t\t// code === null means killed (cancelled)\r\n\t\t\tconst cancelled = code === null;\r\n\r\n\t\t\tresolve({\r\n\t\t\t\toutput: truncationResult.truncated ? truncationResult.content : fullOutput,\r\n\t\t\t\texitCode: cancelled ? undefined : code,\r\n\t\t\t\tcancelled,\r\n\t\t\t\ttruncated: truncationResult.truncated,\r\n\t\t\t\tfullOutputPath: tempFilePath,\r\n\t\t\t});\r\n\t\t});\r\n\r\n\t\tchild.on(\"error\", (err) => {\r\n\t\t\t// Clean up abort listener\r\n\t\t\tif (options?.signal) {\r\n\t\t\t\toptions.signal.removeEventListener(\"abort\", abortHandler);\r\n\t\t\t}\r\n\r\n\t\t\tif (tempFileStream) {\r\n\t\t\t\ttempFileStream.end();\r\n\t\t\t}\r\n\r\n\t\t\treject(err);\r\n\t\t});\r\n\t});\r\n}\r\n\r\n/**\r\n * Execute a bash command using custom BashOperations.\r\n * Used for remote execution (SSH, containers, etc.).\r\n */\r\nexport async function executeBashWithOperations(\r\n\tcommand: string,\r\n\tcwd: string,\r\n\toperations: BashOperations,\r\n\toptions?: BashExecutorOptions,\r\n): Promise<BashResult> {\r\n\tconst outputChunks: string[] = [];\r\n\tlet outputBytes = 0;\r\n\tconst maxOutputBytes = DEFAULT_MAX_BYTES * 2;\r\n\r\n\tlet tempFilePath: string | undefined;\r\n\tlet tempFileStream: WriteStream | undefined;\r\n\tlet totalBytes = 0;\r\n\r\n\tconst decoder = new TextDecoder();\r\n\r\n\tconst onData = (data: Buffer) => {\r\n\t\ttotalBytes += data.length;\r\n\r\n\t\t// Sanitize: strip ANSI, replace binary garbage, normalize newlines\r\n\t\tconst text = sanitizeBinaryOutput(stripAnsi(decoder.decode(data, { stream: true }))).replace(/\\r/g, \"\");\r\n\r\n\t\t// Start writing to temp file if exceeds threshold\r\n\t\tif (totalBytes > DEFAULT_MAX_BYTES && !tempFilePath) {\r\n\t\t\tconst id = randomBytes(8).toString(\"hex\");\r\n\t\t\ttempFilePath = join(tmpdir(), `pi-bash-${id}.log`);\r\n\t\t\ttempFileStream = createWriteStream(tempFilePath);\r\n\t\t\tfor (const chunk of outputChunks) {\r\n\t\t\t\ttempFileStream.write(chunk);\r\n\t\t\t}\r\n\t\t}\r\n\r\n\t\tif (tempFileStream) {\r\n\t\t\ttempFileStream.write(text);\r\n\t\t}\r\n\r\n\t\t// Keep rolling buffer\r\n\t\toutputChunks.push(text);\r\n\t\toutputBytes += text.length;\r\n\t\twhile (outputBytes > maxOutputBytes && outputChunks.length > 1) {\r\n\t\t\tconst removed = outputChunks.shift()!;\r\n\t\t\toutputBytes -= removed.length;\r\n\t\t}\r\n\r\n\t\t// Stream to callback\r\n\t\tif (options?.onChunk) {\r\n\t\t\toptions.onChunk(text);\r\n\t\t}\r\n\t};\r\n\r\n\ttry {\r\n\t\tconst result = await operations.exec(command, cwd, {\r\n\t\t\tonData,\r\n\t\t\tsignal: options?.signal,\r\n\t\t});\r\n\r\n\t\tif (tempFileStream) {\r\n\t\t\ttempFileStream.end();\r\n\t\t}\r\n\r\n\t\tconst fullOutput = outputChunks.join(\"\");\r\n\t\tconst truncationResult = truncateTail(fullOutput);\r\n\t\tconst cancelled = options?.signal?.aborted ?? false;\r\n\r\n\t\treturn {\r\n\t\t\toutput: truncationResult.truncated ? truncationResult.content : fullOutput,\r\n\t\t\texitCode: cancelled ? undefined : (result.exitCode ?? undefined),\r\n\t\t\tcancelled,\r\n\t\t\ttruncated: truncationResult.truncated,\r\n\t\t\tfullOutputPath: tempFilePath,\r\n\t\t};\r\n\t} catch (err) {\r\n\t\tif (tempFileStream) {\r\n\t\t\ttempFileStream.end();\r\n\t\t}\r\n\r\n\t\t// Check if it was an abort\r\n\t\tif (options?.signal?.aborted) {\r\n\t\t\tconst fullOutput = outputChunks.join(\"\");\r\n\t\t\tconst truncationResult = truncateTail(fullOutput);\r\n\t\t\treturn {\r\n\t\t\t\toutput: truncationResult.truncated ? truncationResult.content : fullOutput,\r\n\t\t\t\texitCode: undefined,\r\n\t\t\t\tcancelled: true,\r\n\t\t\t\ttruncated: truncationResult.truncated,\r\n\t\t\t\tfullOutputPath: tempFilePath,\r\n\t\t\t};\r\n\t\t}\r\n\r\n\t\tthrow err;\r\n\t}\r\n}\r\n"]}

package/dist/core/compaction/branch-summarization.d.ts

@@ -0,0 +1,86 @@
+/**
+ * Branch summarization for tree navigation.
+ *
+ * When navigating to a different point in the session tree, this generates
+ * a summary of the branch being left so context isn't lost.
+ */
+import type { AgentMessage } from "@mariozechner/pi-agent-core";
+import type { Model } from "@mariozechner/pi-ai";
+import type { ReadonlySessionManager, SessionEntry } from "../session-manager.js";
+import { type FileOperations } from "./utils.js";
+export interface BranchSummaryResult {
+    summary?: string;
+    readFiles?: string[];
+    modifiedFiles?: string[];
+    aborted?: boolean;
+    error?: string;
+}
+/** Details stored in BranchSummaryEntry.details for file tracking */
+export interface BranchSummaryDetails {
+    readFiles: string[];
+    modifiedFiles: string[];
+}
+export type { FileOperations } from "./utils.js";
+export interface BranchPreparation {
+    /** Messages extracted for summarization, in chronological order */
+    messages: AgentMessage[];
+    /** File operations extracted from tool calls */
+    fileOps: FileOperations;
+    /** Total estimated tokens in messages */
+    totalTokens: number;
+}
+export interface CollectEntriesResult {
+    /** Entries to summarize, in chronological order */
+    entries: SessionEntry[];
+    /** Common ancestor between old and new position, if any */
+    commonAncestorId: string | null;
+}
+export interface GenerateBranchSummaryOptions {
+    /** Model to use for summarization */
+    model: Model<any>;
+    /** API key for the model */
+    apiKey: string;
+    /** Abort signal for cancellation */
+    signal: AbortSignal;
+    /** Optional custom instructions for summarization */
+    customInstructions?: string;
+    /** If true, customInstructions replaces the default prompt instead of being appended */
+    replaceInstructions?: boolean;
+    /** Tokens reserved for prompt + LLM response (default 16384) */
+    reserveTokens?: number;
+}
+/**
+ * Collect entries that should be summarized when navigating from one position to another.
+ *
+ * Walks from oldLeafId back to the common ancestor with targetId, collecting entries
+ * along the way. Does NOT stop at compaction boundaries - those are included and their
+ * summaries become context.
+ *
+ * @param session - Session manager (read-only access)
+ * @param oldLeafId - Current position (where we're navigating from)
+ * @param targetId - Target position (where we're navigating to)
+ * @returns Entries to summarize and the common ancestor
+ */
+export declare function collectEntriesForBranchSummary(session: ReadonlySessionManager, oldLeafId: string | null, targetId: string): CollectEntriesResult;
+/**
+ * Prepare entries for summarization with token budget.
+ *
+ * Walks entries from NEWEST to OLDEST, adding messages until we hit the token budget.
+ * This ensures we keep the most recent context when the branch is too long.
+ *
+ * Also collects file operations from:
+ * - Tool calls in assistant messages
+ * - Existing branch_summary entries' details (for cumulative tracking)
+ *
+ * @param entries - Entries in chronological order
+ * @param tokenBudget - Maximum tokens to include (0 = no limit)
+ */
+export declare function prepareBranchEntries(entries: SessionEntry[], tokenBudget?: number): BranchPreparation;
+/**
+ * Generate a summary of abandoned branch entries.
+ *
+ * @param entries - Session entries to summarize (chronological order)
+ * @param options - Generation options
+ */
+export declare function generateBranchSummary(entries: SessionEntry[], options: GenerateBranchSummaryOptions): Promise<BranchSummaryResult>;
+//# sourceMappingURL=branch-summarization.d.ts.map

package/dist/core/compaction/branch-summarization.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"branch-summarization.d.ts","sourceRoot":"","sources":["../../../src/core/compaction/branch-summarization.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAQjD,OAAO,KAAK,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAElF,OAAO,EAIN,KAAK,cAAc,EAInB,MAAM,YAAY,CAAC;AAMpB,MAAM,WAAW,mBAAmB;IACnC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AAED,qEAAqE;AACrE,MAAM,WAAW,oBAAoB;IACpC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,aAAa,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,YAAY,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,MAAM,WAAW,iBAAiB;IACjC,mEAAmE;IACnE,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,gDAAgD;IAChD,OAAO,EAAE,cAAc,CAAC;IACxB,yCAAyC;IACzC,WAAW,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB;IACpC,mDAAmD;IACnD,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,2DAA2D;IAC3D,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED,MAAM,WAAW,4BAA4B;IAC5C,qCAAqC;IACrC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAClB,4BAA4B;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,oCAAoC;IACpC,MAAM,EAAE,WAAW,CAAC;IACpB,qDAAqD;IACrD,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,wFAAwF;IACxF,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,gEAAgE;IAChE,aAAa,CAAC,EAAE,MAAM,CAAC;CACvB;AAMD;;;;;;;;;;;GAWG;AACH,wBAAgB,8BAA8B,CAC7C,OAAO,EAAE,sBAAsB,EAC/B,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,QAAQ,EAAE,MAAM,GACd,oBAAoB,CAkCtB;AAmCD;;;;;;;;;;;;GAYG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,WAAW,GAAE,MAAU,GAAG,iBAAiB,CAoDxG;AAwCD;;;;;GAKG;AACH,wBAAsB,qBAAqB,CAC1C,OAAO,EAAE,YAAY,EAAE,EACvB,OAAO,EAAE,4BAA4B,GACnC,OAAO,CAAC,mBAAmB,CAAC,CAqE9B","sourcesContent":["/**\r\n * Branch summarization for tree navigation.\r\n *\r\n * When navigating to a different point in the session tree, this generates\r\n * a summary of the branch being left so context isn't lost.\r\n */\r\n\r\nimport type { AgentMessage } from \"@mariozechner/pi-agent-core\";\r\nimport type { Model } from \"@mariozechner/pi-ai\";\r\nimport { completeSimple } from \"@mariozechner/pi-ai\";\r\nimport {\r\n\tconvertToLlm,\r\n\tcreateBranchSummaryMessage,\r\n\tcreateCompactionSummaryMessage,\r\n\tcreateCustomMessage,\r\n} from \"../messages.js\";\r\nimport type { ReadonlySessionManager, SessionEntry } from \"../session-manager.js\";\r\nimport { estimateTokens } from \"./compaction.js\";\r\nimport {\r\n\tcomputeFileLists,\r\n\tcreateFileOps,\r\n\textractFileOpsFromMessage,\r\n\ttype FileOperations,\r\n\tformatFileOperations,\r\n\tSUMMARIZATION_SYSTEM_PROMPT,\r\n\tserializeConversation,\r\n} from \"./utils.js\";\r\n\r\n// ============================================================================\r\n// Types\r\n// ============================================================================\r\n\r\nexport interface BranchSummaryResult {\r\n\tsummary?: string;\r\n\treadFiles?: string[];\r\n\tmodifiedFiles?: string[];\r\n\taborted?: boolean;\r\n\terror?: string;\r\n}\r\n\r\n/** Details stored in BranchSummaryEntry.details for file tracking */\r\nexport interface BranchSummaryDetails {\r\n\treadFiles: string[];\r\n\tmodifiedFiles: string[];\r\n}\r\n\r\nexport type { FileOperations } from \"./utils.js\";\r\n\r\nexport interface BranchPreparation {\r\n\t/** Messages extracted for summarization, in chronological order */\r\n\tmessages: AgentMessage[];\r\n\t/** File operations extracted from tool calls */\r\n\tfileOps: FileOperations;\r\n\t/** Total estimated tokens in messages */\r\n\ttotalTokens: number;\r\n}\r\n\r\nexport interface CollectEntriesResult {\r\n\t/** Entries to summarize, in chronological order */\r\n\tentries: SessionEntry[];\r\n\t/** Common ancestor between old and new position, if any */\r\n\tcommonAncestorId: string | null;\r\n}\r\n\r\nexport interface GenerateBranchSummaryOptions {\r\n\t/** Model to use for summarization */\r\n\tmodel: Model<any>;\r\n\t/** API key for the model */\r\n\tapiKey: string;\r\n\t/** Abort signal for cancellation */\r\n\tsignal: AbortSignal;\r\n\t/** Optional custom instructions for summarization */\r\n\tcustomInstructions?: string;\r\n\t/** If true, customInstructions replaces the default prompt instead of being appended */\r\n\treplaceInstructions?: boolean;\r\n\t/** Tokens reserved for prompt + LLM response (default 16384) */\r\n\treserveTokens?: number;\r\n}\r\n\r\n// ============================================================================\r\n// Entry Collection\r\n// ============================================================================\r\n\r\n/**\r\n * Collect entries that should be summarized when navigating from one position to another.\r\n *\r\n * Walks from oldLeafId back to the common ancestor with targetId, collecting entries\r\n * along the way. Does NOT stop at compaction boundaries - those are included and their\r\n * summaries become context.\r\n *\r\n * @param session - Session manager (read-only access)\r\n * @param oldLeafId - Current position (where we're navigating from)\r\n * @param targetId - Target position (where we're navigating to)\r\n * @returns Entries to summarize and the common ancestor\r\n */\r\nexport function collectEntriesForBranchSummary(\r\n\tsession: ReadonlySessionManager,\r\n\toldLeafId: string | null,\r\n\ttargetId: string,\r\n): CollectEntriesResult {\r\n\t// If no old position, nothing to summarize\r\n\tif (!oldLeafId) {\r\n\t\treturn { entries: [], commonAncestorId: null };\r\n\t}\r\n\r\n\t// Find common ancestor (deepest node that's on both paths)\r\n\tconst oldPath = new Set(session.getBranch(oldLeafId).map((e) => e.id));\r\n\tconst targetPath = session.getBranch(targetId);\r\n\r\n\t// targetPath is root-first, so iterate backwards to find deepest common ancestor\r\n\tlet commonAncestorId: string | null = null;\r\n\tfor (let i = targetPath.length - 1; i >= 0; i--) {\r\n\t\tif (oldPath.has(targetPath[i].id)) {\r\n\t\t\tcommonAncestorId = targetPath[i].id;\r\n\t\t\tbreak;\r\n\t\t}\r\n\t}\r\n\r\n\t// Collect entries from old leaf back to common ancestor\r\n\tconst entries: SessionEntry[] = [];\r\n\tlet current: string | null = oldLeafId;\r\n\r\n\twhile (current && current !== commonAncestorId) {\r\n\t\tconst entry = session.getEntry(current);\r\n\t\tif (!entry) break;\r\n\t\tentries.push(entry);\r\n\t\tcurrent = entry.parentId;\r\n\t}\r\n\r\n\t// Reverse to get chronological order\r\n\tentries.reverse();\r\n\r\n\treturn { entries, commonAncestorId };\r\n}\r\n\r\n// ============================================================================\r\n// Entry to Message Conversion\r\n// ============================================================================\r\n\r\n/**\r\n * Extract AgentMessage from a session entry.\r\n * Similar to getMessageFromEntry in compaction.ts but also handles compaction entries.\r\n */\r\nfunction getMessageFromEntry(entry: SessionEntry): AgentMessage | undefined {\r\n\tswitch (entry.type) {\r\n\t\tcase \"message\":\r\n\t\t\t// Skip tool results - context is in assistant's tool call\r\n\t\t\tif (entry.message.role === \"toolResult\") return undefined;\r\n\t\t\treturn entry.message;\r\n\r\n\t\tcase \"custom_message\":\r\n\t\t\treturn createCustomMessage(entry.customType, entry.content, entry.display, entry.details, entry.timestamp);\r\n\r\n\t\tcase \"branch_summary\":\r\n\t\t\treturn createBranchSummaryMessage(entry.summary, entry.fromId, entry.timestamp);\r\n\r\n\t\tcase \"compaction\":\r\n\t\t\treturn createCompactionSummaryMessage(entry.summary, entry.tokensBefore, entry.timestamp);\r\n\r\n\t\t// These don't contribute to conversation content\r\n\t\tcase \"thinking_level_change\":\r\n\t\tcase \"model_change\":\r\n\t\tcase \"custom\":\r\n\t\tcase \"label\":\r\n\t\t\treturn undefined;\r\n\t}\r\n}\r\n\r\n/**\r\n * Prepare entries for summarization with token budget.\r\n *\r\n * Walks entries from NEWEST to OLDEST, adding messages until we hit the token budget.\r\n * This ensures we keep the most recent context when the branch is too long.\r\n *\r\n * Also collects file operations from:\r\n * - Tool calls in assistant messages\r\n * - Existing branch_summary entries' details (for cumulative tracking)\r\n *\r\n * @param entries - Entries in chronological order\r\n * @param tokenBudget - Maximum tokens to include (0 = no limit)\r\n */\r\nexport function prepareBranchEntries(entries: SessionEntry[], tokenBudget: number = 0): BranchPreparation {\r\n\tconst messages: AgentMessage[] = [];\r\n\tconst fileOps = createFileOps();\r\n\tlet totalTokens = 0;\r\n\r\n\t// First pass: collect file ops from ALL entries (even if they don't fit in token budget)\r\n\t// This ensures we capture cumulative file tracking from nested branch summaries\r\n\t// Only extract from pi-generated summaries (fromHook !== true), not extension-generated ones\r\n\tfor (const entry of entries) {\r\n\t\tif (entry.type === \"branch_summary\" && !entry.fromHook && entry.details) {\r\n\t\t\tconst details = entry.details as BranchSummaryDetails;\r\n\t\t\tif (Array.isArray(details.readFiles)) {\r\n\t\t\t\tfor (const f of details.readFiles) fileOps.read.add(f);\r\n\t\t\t}\r\n\t\t\tif (Array.isArray(details.modifiedFiles)) {\r\n\t\t\t\t// Modified files go into both edited and written for proper deduplication\r\n\t\t\t\tfor (const f of details.modifiedFiles) {\r\n\t\t\t\t\tfileOps.edited.add(f);\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n\r\n\t// Second pass: walk from newest to oldest, adding messages until token budget\r\n\tfor (let i = entries.length - 1; i >= 0; i--) {\r\n\t\tconst entry = entries[i];\r\n\t\tconst message = getMessageFromEntry(entry);\r\n\t\tif (!message) continue;\r\n\r\n\t\t// Extract file ops from assistant messages (tool calls)\r\n\t\textractFileOpsFromMessage(message, fileOps);\r\n\r\n\t\tconst tokens = estimateTokens(message);\r\n\r\n\t\t// Check budget before adding\r\n\t\tif (tokenBudget > 0 && totalTokens + tokens > tokenBudget) {\r\n\t\t\t// If this is a summary entry, try to fit it anyway as it's important context\r\n\t\t\tif (entry.type === \"compaction\" || entry.type === \"branch_summary\") {\r\n\t\t\t\tif (totalTokens < tokenBudget * 0.9) {\r\n\t\t\t\t\tmessages.unshift(message);\r\n\t\t\t\t\ttotalTokens += tokens;\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\t// Stop - we've hit the budget\r\n\t\t\tbreak;\r\n\t\t}\r\n\r\n\t\tmessages.unshift(message);\r\n\t\ttotalTokens += tokens;\r\n\t}\r\n\r\n\treturn { messages, fileOps, totalTokens };\r\n}\r\n\r\n// ============================================================================\r\n// Summary Generation\r\n// ============================================================================\r\n\r\nconst BRANCH_SUMMARY_PREAMBLE = `The user explored a different conversation branch before returning here.\r\nSummary of that exploration:\r\n\r\n`;\r\n\r\nconst BRANCH_SUMMARY_PROMPT = `Create a structured summary of this conversation branch for context when returning later.\r\n\r\nUse this EXACT format:\r\n\r\n## Goal\r\n[What was the user trying to accomplish in this branch?]\r\n\r\n## Constraints & Preferences\r\n- [Any constraints, preferences, or requirements mentioned]\r\n- [Or \"(none)\" if none were mentioned]\r\n\r\n## Progress\r\n### Done\r\n- [x] [Completed tasks/changes]\r\n\r\n### In Progress\r\n- [ ] [Work that was started but not finished]\r\n\r\n### Blocked\r\n- [Issues preventing progress, if any]\r\n\r\n## Key Decisions\r\n- **[Decision]**: [Brief rationale]\r\n\r\n## Next Steps\r\n1. [What should happen next to continue this work]\r\n\r\nKeep each section concise. Preserve exact file paths, function names, and error messages.`;\r\n\r\n/**\r\n * Generate a summary of abandoned branch entries.\r\n *\r\n * @param entries - Session entries to summarize (chronological order)\r\n * @param options - Generation options\r\n */\r\nexport async function generateBranchSummary(\r\n\tentries: SessionEntry[],\r\n\toptions: GenerateBranchSummaryOptions,\r\n): Promise<BranchSummaryResult> {\r\n\tconst { model, apiKey, signal, customInstructions, replaceInstructions, reserveTokens = 16384 } = options;\r\n\r\n\t// Token budget = context window minus reserved space for prompt + response\r\n\tconst contextWindow = model.contextWindow || 128000;\r\n\tconst tokenBudget = contextWindow - reserveTokens;\r\n\r\n\tconst { messages, fileOps } = prepareBranchEntries(entries, tokenBudget);\r\n\r\n\tif (messages.length === 0) {\r\n\t\treturn { summary: \"No content to summarize\" };\r\n\t}\r\n\r\n\t// Transform to LLM-compatible messages, then serialize to text\r\n\t// Serialization prevents the model from treating it as a conversation to continue\r\n\tconst llmMessages = convertToLlm(messages);\r\n\tconst conversationText = serializeConversation(llmMessages);\r\n\r\n\t// Build prompt\r\n\tlet instructions: string;\r\n\tif (replaceInstructions && customInstructions) {\r\n\t\tinstructions = customInstructions;\r\n\t} else if (customInstructions) {\r\n\t\tinstructions = `${BRANCH_SUMMARY_PROMPT}\\n\\nAdditional focus: ${customInstructions}`;\r\n\t} else {\r\n\t\tinstructions = BRANCH_SUMMARY_PROMPT;\r\n\t}\r\n\tconst promptText = `<conversation>\\n${conversationText}\\n</conversation>\\n\\n${instructions}`;\r\n\r\n\tconst summarizationMessages = [\r\n\t\t{\r\n\t\t\trole: \"user\" as const,\r\n\t\t\tcontent: [{ type: \"text\" as const, text: promptText }],\r\n\t\t\ttimestamp: Date.now(),\r\n\t\t},\r\n\t];\r\n\r\n\t// Call LLM for summarization\r\n\tconst response = await completeSimple(\r\n\t\tmodel,\r\n\t\t{ systemPrompt: SUMMARIZATION_SYSTEM_PROMPT, messages: summarizationMessages },\r\n\t\t{ apiKey, signal, maxTokens: 2048 },\r\n\t);\r\n\r\n\t// Check if aborted or errored\r\n\tif (response.stopReason === \"aborted\") {\r\n\t\treturn { aborted: true };\r\n\t}\r\n\tif (response.stopReason === \"error\") {\r\n\t\treturn { error: response.errorMessage || \"Summarization failed\" };\r\n\t}\r\n\r\n\tlet summary = response.content\r\n\t\t.filter((c): c is { type: \"text\"; text: string } => c.type === \"text\")\r\n\t\t.map((c) => c.text)\r\n\t\t.join(\"\\n\");\r\n\r\n\t// Prepend preamble to provide context about the branch summary\r\n\tsummary = BRANCH_SUMMARY_PREAMBLE + summary;\r\n\r\n\t// Compute file lists and append to summary\r\n\tconst { readFiles, modifiedFiles } = computeFileLists(fileOps);\r\n\tsummary += formatFileOperations(readFiles, modifiedFiles);\r\n\r\n\treturn {\r\n\t\tsummary: summary || \"No summary generated\",\r\n\t\treadFiles,\r\n\t\tmodifiedFiles,\r\n\t};\r\n}\r\n"]}

package/dist/core/compaction/branch-summarization.js

@@ -0,0 +1,242 @@
+/**
+ * Branch summarization for tree navigation.
+ *
+ * When navigating to a different point in the session tree, this generates
+ * a summary of the branch being left so context isn't lost.
+ */
+import { completeSimple } from "@mariozechner/pi-ai";
+import { convertToLlm, createBranchSummaryMessage, createCompactionSummaryMessage, createCustomMessage, } from "../messages.js";
+import { estimateTokens } from "./compaction.js";
+import { computeFileLists, createFileOps, extractFileOpsFromMessage, formatFileOperations, SUMMARIZATION_SYSTEM_PROMPT, serializeConversation, } from "./utils.js";
+// ============================================================================
+// Entry Collection
+// ============================================================================
+/**
+ * Collect entries that should be summarized when navigating from one position to another.
+ *
+ * Walks from oldLeafId back to the common ancestor with targetId, collecting entries
+ * along the way. Does NOT stop at compaction boundaries - those are included and their
+ * summaries become context.
+ *
+ * @param session - Session manager (read-only access)
+ * @param oldLeafId - Current position (where we're navigating from)
+ * @param targetId - Target position (where we're navigating to)
+ * @returns Entries to summarize and the common ancestor
+ */
+export function collectEntriesForBranchSummary(session, oldLeafId, targetId) {
+    // If no old position, nothing to summarize
+    if (!oldLeafId) {
+        return { entries: [], commonAncestorId: null };
+    }
+    // Find common ancestor (deepest node that's on both paths)
+    const oldPath = new Set(session.getBranch(oldLeafId).map((e) => e.id));
+    const targetPath = session.getBranch(targetId);
+    // targetPath is root-first, so iterate backwards to find deepest common ancestor
+    let commonAncestorId = null;
+    for (let i = targetPath.length - 1; i >= 0; i--) {
+        if (oldPath.has(targetPath[i].id)) {
+            commonAncestorId = targetPath[i].id;
+            break;
+        }
+    }
+    // Collect entries from old leaf back to common ancestor
+    const entries = [];
+    let current = oldLeafId;
+    while (current && current !== commonAncestorId) {
+        const entry = session.getEntry(current);
+        if (!entry)
+            break;
+        entries.push(entry);
+        current = entry.parentId;
+    }
+    // Reverse to get chronological order
+    entries.reverse();
+    return { entries, commonAncestorId };
+}
+// ============================================================================
+// Entry to Message Conversion
+// ============================================================================
+/**
+ * Extract AgentMessage from a session entry.
+ * Similar to getMessageFromEntry in compaction.ts but also handles compaction entries.
+ */
+function getMessageFromEntry(entry) {
+    switch (entry.type) {
+        case "message":
+            // Skip tool results - context is in assistant's tool call
+            if (entry.message.role === "toolResult")
+                return undefined;
+            return entry.message;
+        case "custom_message":
+            return createCustomMessage(entry.customType, entry.content, entry.display, entry.details, entry.timestamp);
+        case "branch_summary":
+            return createBranchSummaryMessage(entry.summary, entry.fromId, entry.timestamp);
+        case "compaction":
+            return createCompactionSummaryMessage(entry.summary, entry.tokensBefore, entry.timestamp);
+        // These don't contribute to conversation content
+        case "thinking_level_change":
+        case "model_change":
+        case "custom":
+        case "label":
+            return undefined;
+    }
+}
+/**
+ * Prepare entries for summarization with token budget.
+ *
+ * Walks entries from NEWEST to OLDEST, adding messages until we hit the token budget.
+ * This ensures we keep the most recent context when the branch is too long.
+ *
+ * Also collects file operations from:
+ * - Tool calls in assistant messages
+ * - Existing branch_summary entries' details (for cumulative tracking)
+ *
+ * @param entries - Entries in chronological order
+ * @param tokenBudget - Maximum tokens to include (0 = no limit)
+ */
+export function prepareBranchEntries(entries, tokenBudget = 0) {
+    const messages = [];
+    const fileOps = createFileOps();
+    let totalTokens = 0;
+    // First pass: collect file ops from ALL entries (even if they don't fit in token budget)
+    // This ensures we capture cumulative file tracking from nested branch summaries
+    // Only extract from pi-generated summaries (fromHook !== true), not extension-generated ones
+    for (const entry of entries) {
+        if (entry.type === "branch_summary" && !entry.fromHook && entry.details) {
+            const details = entry.details;
+            if (Array.isArray(details.readFiles)) {
+                for (const f of details.readFiles)
+                    fileOps.read.add(f);
+            }
+            if (Array.isArray(details.modifiedFiles)) {
+                // Modified files go into both edited and written for proper deduplication
+                for (const f of details.modifiedFiles) {
+                    fileOps.edited.add(f);
+                }
+            }
+        }
+    }
+    // Second pass: walk from newest to oldest, adding messages until token budget
+    for (let i = entries.length - 1; i >= 0; i--) {
+        const entry = entries[i];
+        const message = getMessageFromEntry(entry);
+        if (!message)
+            continue;
+        // Extract file ops from assistant messages (tool calls)
+        extractFileOpsFromMessage(message, fileOps);
+        const tokens = estimateTokens(message);
+        // Check budget before adding
+        if (tokenBudget > 0 && totalTokens + tokens > tokenBudget) {
+            // If this is a summary entry, try to fit it anyway as it's important context
+            if (entry.type === "compaction" || entry.type === "branch_summary") {
+                if (totalTokens < tokenBudget * 0.9) {
+                    messages.unshift(message);
+                    totalTokens += tokens;
+                }
+            }
+            // Stop - we've hit the budget
+            break;
+        }
+        messages.unshift(message);
+        totalTokens += tokens;
+    }
+    return { messages, fileOps, totalTokens };
+}
+// ============================================================================
+// Summary Generation
+// ============================================================================
+const BRANCH_SUMMARY_PREAMBLE = `The user explored a different conversation branch before returning here.
+Summary of that exploration:
+
+`;
+const BRANCH_SUMMARY_PROMPT = `Create a structured summary of this conversation branch for context when returning later.
+
+Use this EXACT format:
+
+## Goal
+[What was the user trying to accomplish in this branch?]
+
+## Constraints & Preferences
+- [Any constraints, preferences, or requirements mentioned]
+- [Or "(none)" if none were mentioned]
+
+## Progress
+### Done
+- [x] [Completed tasks/changes]
+
+### In Progress
+- [ ] [Work that was started but not finished]
+
+### Blocked
+- [Issues preventing progress, if any]
+
+## Key Decisions
+- **[Decision]**: [Brief rationale]
+
+## Next Steps
+1. [What should happen next to continue this work]
+
+Keep each section concise. Preserve exact file paths, function names, and error messages.`;
+/**
+ * Generate a summary of abandoned branch entries.
+ *
+ * @param entries - Session entries to summarize (chronological order)
+ * @param options - Generation options
+ */
+export async function generateBranchSummary(entries, options) {
+    const { model, apiKey, signal, customInstructions, replaceInstructions, reserveTokens = 16384 } = options;
+    // Token budget = context window minus reserved space for prompt + response
+    const contextWindow = model.contextWindow || 128000;
+    const tokenBudget = contextWindow - reserveTokens;
+    const { messages, fileOps } = prepareBranchEntries(entries, tokenBudget);
+    if (messages.length === 0) {
+        return { summary: "No content to summarize" };
+    }
+    // Transform to LLM-compatible messages, then serialize to text
+    // Serialization prevents the model from treating it as a conversation to continue
+    const llmMessages = convertToLlm(messages);
+    const conversationText = serializeConversation(llmMessages);
+    // Build prompt
+    let instructions;
+    if (replaceInstructions && customInstructions) {
+        instructions = customInstructions;
+    }
+    else if (customInstructions) {
+        instructions = `${BRANCH_SUMMARY_PROMPT}\n\nAdditional focus: ${customInstructions}`;
+    }
+    else {
+        instructions = BRANCH_SUMMARY_PROMPT;
+    }
+    const promptText = `<conversation>\n${conversationText}\n</conversation>\n\n${instructions}`;
+    const summarizationMessages = [
+        {
+            role: "user",
+            content: [{ type: "text", text: promptText }],
+            timestamp: Date.now(),
+        },
+    ];
+    // Call LLM for summarization
+    const response = await completeSimple(model, { systemPrompt: SUMMARIZATION_SYSTEM_PROMPT, messages: summarizationMessages }, { apiKey, signal, maxTokens: 2048 });
+    // Check if aborted or errored
+    if (response.stopReason === "aborted") {
+        return { aborted: true };
+    }
+    if (response.stopReason === "error") {
+        return { error: response.errorMessage || "Summarization failed" };
+    }
+    let summary = response.content
+        .filter((c) => c.type === "text")
+        .map((c) => c.text)
+        .join("\n");
+    // Prepend preamble to provide context about the branch summary
+    summary = BRANCH_SUMMARY_PREAMBLE + summary;
+    // Compute file lists and append to summary
+    const { readFiles, modifiedFiles } = computeFileLists(fileOps);
+    summary += formatFileOperations(readFiles, modifiedFiles);
+    return {
+        summary: summary || "No summary generated",
+        readFiles,
+        modifiedFiles,
+    };
+}
+//# sourceMappingURL=branch-summarization.js.map

package/dist/core/compaction/branch-summarization.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"branch-summarization.js","sourceRoot":"","sources":["../../../src/core/compaction/branch-summarization.ts"],"names":[],"mappings":"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","sourcesContent":["/**\r\n * Branch summarization for tree navigation.\r\n *\r\n * When navigating to a different point in the session tree, this generates\r\n * a summary of the branch being left so context isn't lost.\r\n */\r\n\r\nimport type { AgentMessage } from \"@mariozechner/pi-agent-core\";\r\nimport type { Model } from \"@mariozechner/pi-ai\";\r\nimport { completeSimple } from \"@mariozechner/pi-ai\";\r\nimport {\r\n\tconvertToLlm,\r\n\tcreateBranchSummaryMessage,\r\n\tcreateCompactionSummaryMessage,\r\n\tcreateCustomMessage,\r\n} from \"../messages.js\";\r\nimport type { ReadonlySessionManager, SessionEntry } from \"../session-manager.js\";\r\nimport { estimateTokens } from \"./compaction.js\";\r\nimport {\r\n\tcomputeFileLists,\r\n\tcreateFileOps,\r\n\textractFileOpsFromMessage,\r\n\ttype FileOperations,\r\n\tformatFileOperations,\r\n\tSUMMARIZATION_SYSTEM_PROMPT,\r\n\tserializeConversation,\r\n} from \"./utils.js\";\r\n\r\n// ============================================================================\r\n// Types\r\n// ============================================================================\r\n\r\nexport interface BranchSummaryResult {\r\n\tsummary?: string;\r\n\treadFiles?: string[];\r\n\tmodifiedFiles?: string[];\r\n\taborted?: boolean;\r\n\terror?: string;\r\n}\r\n\r\n/** Details stored in BranchSummaryEntry.details for file tracking */\r\nexport interface BranchSummaryDetails {\r\n\treadFiles: string[];\r\n\tmodifiedFiles: string[];\r\n}\r\n\r\nexport type { FileOperations } from \"./utils.js\";\r\n\r\nexport interface BranchPreparation {\r\n\t/** Messages extracted for summarization, in chronological order */\r\n\tmessages: AgentMessage[];\r\n\t/** File operations extracted from tool calls */\r\n\tfileOps: FileOperations;\r\n\t/** Total estimated tokens in messages */\r\n\ttotalTokens: number;\r\n}\r\n\r\nexport interface CollectEntriesResult {\r\n\t/** Entries to summarize, in chronological order */\r\n\tentries: SessionEntry[];\r\n\t/** Common ancestor between old and new position, if any */\r\n\tcommonAncestorId: string | null;\r\n}\r\n\r\nexport interface GenerateBranchSummaryOptions {\r\n\t/** Model to use for summarization */\r\n\tmodel: Model<any>;\r\n\t/** API key for the model */\r\n\tapiKey: string;\r\n\t/** Abort signal for cancellation */\r\n\tsignal: AbortSignal;\r\n\t/** Optional custom instructions for summarization */\r\n\tcustomInstructions?: string;\r\n\t/** If true, customInstructions replaces the default prompt instead of being appended */\r\n\treplaceInstructions?: boolean;\r\n\t/** Tokens reserved for prompt + LLM response (default 16384) */\r\n\treserveTokens?: number;\r\n}\r\n\r\n// ============================================================================\r\n// Entry Collection\r\n// ============================================================================\r\n\r\n/**\r\n * Collect entries that should be summarized when navigating from one position to another.\r\n *\r\n * Walks from oldLeafId back to the common ancestor with targetId, collecting entries\r\n * along the way. Does NOT stop at compaction boundaries - those are included and their\r\n * summaries become context.\r\n *\r\n * @param session - Session manager (read-only access)\r\n * @param oldLeafId - Current position (where we're navigating from)\r\n * @param targetId - Target position (where we're navigating to)\r\n * @returns Entries to summarize and the common ancestor\r\n */\r\nexport function collectEntriesForBranchSummary(\r\n\tsession: ReadonlySessionManager,\r\n\toldLeafId: string | null,\r\n\ttargetId: string,\r\n): CollectEntriesResult {\r\n\t// If no old position, nothing to summarize\r\n\tif (!oldLeafId) {\r\n\t\treturn { entries: [], commonAncestorId: null };\r\n\t}\r\n\r\n\t// Find common ancestor (deepest node that's on both paths)\r\n\tconst oldPath = new Set(session.getBranch(oldLeafId).map((e) => e.id));\r\n\tconst targetPath = session.getBranch(targetId);\r\n\r\n\t// targetPath is root-first, so iterate backwards to find deepest common ancestor\r\n\tlet commonAncestorId: string | null = null;\r\n\tfor (let i = targetPath.length - 1; i >= 0; i--) {\r\n\t\tif (oldPath.has(targetPath[i].id)) {\r\n\t\t\tcommonAncestorId = targetPath[i].id;\r\n\t\t\tbreak;\r\n\t\t}\r\n\t}\r\n\r\n\t// Collect entries from old leaf back to common ancestor\r\n\tconst entries: SessionEntry[] = [];\r\n\tlet current: string | null = oldLeafId;\r\n\r\n\twhile (current && current !== commonAncestorId) {\r\n\t\tconst entry = session.getEntry(current);\r\n\t\tif (!entry) break;\r\n\t\tentries.push(entry);\r\n\t\tcurrent = entry.parentId;\r\n\t}\r\n\r\n\t// Reverse to get chronological order\r\n\tentries.reverse();\r\n\r\n\treturn { entries, commonAncestorId };\r\n}\r\n\r\n// ============================================================================\r\n// Entry to Message Conversion\r\n// ============================================================================\r\n\r\n/**\r\n * Extract AgentMessage from a session entry.\r\n * Similar to getMessageFromEntry in compaction.ts but also handles compaction entries.\r\n */\r\nfunction getMessageFromEntry(entry: SessionEntry): AgentMessage | undefined {\r\n\tswitch (entry.type) {\r\n\t\tcase \"message\":\r\n\t\t\t// Skip tool results - context is in assistant's tool call\r\n\t\t\tif (entry.message.role === \"toolResult\") return undefined;\r\n\t\t\treturn entry.message;\r\n\r\n\t\tcase \"custom_message\":\r\n\t\t\treturn createCustomMessage(entry.customType, entry.content, entry.display, entry.details, entry.timestamp);\r\n\r\n\t\tcase \"branch_summary\":\r\n\t\t\treturn createBranchSummaryMessage(entry.summary, entry.fromId, entry.timestamp);\r\n\r\n\t\tcase \"compaction\":\r\n\t\t\treturn createCompactionSummaryMessage(entry.summary, entry.tokensBefore, entry.timestamp);\r\n\r\n\t\t// These don't contribute to conversation content\r\n\t\tcase \"thinking_level_change\":\r\n\t\tcase \"model_change\":\r\n\t\tcase \"custom\":\r\n\t\tcase \"label\":\r\n\t\t\treturn undefined;\r\n\t}\r\n}\r\n\r\n/**\r\n * Prepare entries for summarization with token budget.\r\n *\r\n * Walks entries from NEWEST to OLDEST, adding messages until we hit the token budget.\r\n * This ensures we keep the most recent context when the branch is too long.\r\n *\r\n * Also collects file operations from:\r\n * - Tool calls in assistant messages\r\n * - Existing branch_summary entries' details (for cumulative tracking)\r\n *\r\n * @param entries - Entries in chronological order\r\n * @param tokenBudget - Maximum tokens to include (0 = no limit)\r\n */\r\nexport function prepareBranchEntries(entries: SessionEntry[], tokenBudget: number = 0): BranchPreparation {\r\n\tconst messages: AgentMessage[] = [];\r\n\tconst fileOps = createFileOps();\r\n\tlet totalTokens = 0;\r\n\r\n\t// First pass: collect file ops from ALL entries (even if they don't fit in token budget)\r\n\t// This ensures we capture cumulative file tracking from nested branch summaries\r\n\t// Only extract from pi-generated summaries (fromHook !== true), not extension-generated ones\r\n\tfor (const entry of entries) {\r\n\t\tif (entry.type === \"branch_summary\" && !entry.fromHook && entry.details) {\r\n\t\t\tconst details = entry.details as BranchSummaryDetails;\r\n\t\t\tif (Array.isArray(details.readFiles)) {\r\n\t\t\t\tfor (const f of details.readFiles) fileOps.read.add(f);\r\n\t\t\t}\r\n\t\t\tif (Array.isArray(details.modifiedFiles)) {\r\n\t\t\t\t// Modified files go into both edited and written for proper deduplication\r\n\t\t\t\tfor (const f of details.modifiedFiles) {\r\n\t\t\t\t\tfileOps.edited.add(f);\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n\r\n\t// Second pass: walk from newest to oldest, adding messages until token budget\r\n\tfor (let i = entries.length - 1; i >= 0; i--) {\r\n\t\tconst entry = entries[i];\r\n\t\tconst message = getMessageFromEntry(entry);\r\n\t\tif (!message) continue;\r\n\r\n\t\t// Extract file ops from assistant messages (tool calls)\r\n\t\textractFileOpsFromMessage(message, fileOps);\r\n\r\n\t\tconst tokens = estimateTokens(message);\r\n\r\n\t\t// Check budget before adding\r\n\t\tif (tokenBudget > 0 && totalTokens + tokens > tokenBudget) {\r\n\t\t\t// If this is a summary entry, try to fit it anyway as it's important context\r\n\t\t\tif (entry.type === \"compaction\" || entry.type === \"branch_summary\") {\r\n\t\t\t\tif (totalTokens < tokenBudget * 0.9) {\r\n\t\t\t\t\tmessages.unshift(message);\r\n\t\t\t\t\ttotalTokens += tokens;\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\t// Stop - we've hit the budget\r\n\t\t\tbreak;\r\n\t\t}\r\n\r\n\t\tmessages.unshift(message);\r\n\t\ttotalTokens += tokens;\r\n\t}\r\n\r\n\treturn { messages, fileOps, totalTokens };\r\n}\r\n\r\n// ============================================================================\r\n// Summary Generation\r\n// ============================================================================\r\n\r\nconst BRANCH_SUMMARY_PREAMBLE = `The user explored a different conversation branch before returning here.\r\nSummary of that exploration:\r\n\r\n`;\r\n\r\nconst BRANCH_SUMMARY_PROMPT = `Create a structured summary of this conversation branch for context when returning later.\r\n\r\nUse this EXACT format:\r\n\r\n## Goal\r\n[What was the user trying to accomplish in this branch?]\r\n\r\n## Constraints & Preferences\r\n- [Any constraints, preferences, or requirements mentioned]\r\n- [Or \"(none)\" if none were mentioned]\r\n\r\n## Progress\r\n### Done\r\n- [x] [Completed tasks/changes]\r\n\r\n### In Progress\r\n- [ ] [Work that was started but not finished]\r\n\r\n### Blocked\r\n- [Issues preventing progress, if any]\r\n\r\n## Key Decisions\r\n- **[Decision]**: [Brief rationale]\r\n\r\n## Next Steps\r\n1. [What should happen next to continue this work]\r\n\r\nKeep each section concise. Preserve exact file paths, function names, and error messages.`;\r\n\r\n/**\r\n * Generate a summary of abandoned branch entries.\r\n *\r\n * @param entries - Session entries to summarize (chronological order)\r\n * @param options - Generation options\r\n */\r\nexport async function generateBranchSummary(\r\n\tentries: SessionEntry[],\r\n\toptions: GenerateBranchSummaryOptions,\r\n): Promise<BranchSummaryResult> {\r\n\tconst { model, apiKey, signal, customInstructions, replaceInstructions, reserveTokens = 16384 } = options;\r\n\r\n\t// Token budget = context window minus reserved space for prompt + response\r\n\tconst contextWindow = model.contextWindow || 128000;\r\n\tconst tokenBudget = contextWindow - reserveTokens;\r\n\r\n\tconst { messages, fileOps } = prepareBranchEntries(entries, tokenBudget);\r\n\r\n\tif (messages.length === 0) {\r\n\t\treturn { summary: \"No content to summarize\" };\r\n\t}\r\n\r\n\t// Transform to LLM-compatible messages, then serialize to text\r\n\t// Serialization prevents the model from treating it as a conversation to continue\r\n\tconst llmMessages = convertToLlm(messages);\r\n\tconst conversationText = serializeConversation(llmMessages);\r\n\r\n\t// Build prompt\r\n\tlet instructions: string;\r\n\tif (replaceInstructions && customInstructions) {\r\n\t\tinstructions = customInstructions;\r\n\t} else if (customInstructions) {\r\n\t\tinstructions = `${BRANCH_SUMMARY_PROMPT}\\n\\nAdditional focus: ${customInstructions}`;\r\n\t} else {\r\n\t\tinstructions = BRANCH_SUMMARY_PROMPT;\r\n\t}\r\n\tconst promptText = `<conversation>\\n${conversationText}\\n</conversation>\\n\\n${instructions}`;\r\n\r\n\tconst summarizationMessages = [\r\n\t\t{\r\n\t\t\trole: \"user\" as const,\r\n\t\t\tcontent: [{ type: \"text\" as const, text: promptText }],\r\n\t\t\ttimestamp: Date.now(),\r\n\t\t},\r\n\t];\r\n\r\n\t// Call LLM for summarization\r\n\tconst response = await completeSimple(\r\n\t\tmodel,\r\n\t\t{ systemPrompt: SUMMARIZATION_SYSTEM_PROMPT, messages: summarizationMessages },\r\n\t\t{ apiKey, signal, maxTokens: 2048 },\r\n\t);\r\n\r\n\t// Check if aborted or errored\r\n\tif (response.stopReason === \"aborted\") {\r\n\t\treturn { aborted: true };\r\n\t}\r\n\tif (response.stopReason === \"error\") {\r\n\t\treturn { error: response.errorMessage || \"Summarization failed\" };\r\n\t}\r\n\r\n\tlet summary = response.content\r\n\t\t.filter((c): c is { type: \"text\"; text: string } => c.type === \"text\")\r\n\t\t.map((c) => c.text)\r\n\t\t.join(\"\\n\");\r\n\r\n\t// Prepend preamble to provide context about the branch summary\r\n\tsummary = BRANCH_SUMMARY_PREAMBLE + summary;\r\n\r\n\t// Compute file lists and append to summary\r\n\tconst { readFiles, modifiedFiles } = computeFileLists(fileOps);\r\n\tsummary += formatFileOperations(readFiles, modifiedFiles);\r\n\r\n\treturn {\r\n\t\tsummary: summary || \"No summary generated\",\r\n\t\treadFiles,\r\n\t\tmodifiedFiles,\r\n\t};\r\n}\r\n"]}