pi-agent-flow 2.2.14 → 2.2.16

package/dist/config/settings-resolver.d.ts

@@ -27,12 +27,6 @@ export interface ResolvedSettings {
     traceEnabled: boolean;
     batchReadEnabled: boolean;
 }
-/**
- * Resolve all flow settings from env vars, CLI flags, and settings files.
- *
- * Called from the session_start handler. Returns the resolved settings
- * plus discovered flows and model configs.
- */
 export declare function resolveSettings(pi: ExtensionAPI, cwd: string): ResolvedSettings & {
     projectFlowsDir: string | null;
 };

package/dist/config/settings-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings-resolver.d.ts","sourceRoot":"","sources":["../../src/config/settings-resolver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,KAAK,UAAU,EAAiB,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAQN,KAAK,sBAAsB,EAC3B,MAAM,aAAa,CAAC;AAIrB,OAAO,EAGN,KAAK,UAAU,EACf,MAAM,uBAAuB,CAAC;AAc/B,MAAM,WAAW,gBAAgB;IAChC,YAAY,EAAE,OAAO,CAAC;IACtB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,UAAU,CAAC;IAC9B,eAAe,EAAE,OAAO,CAAC;IACzB,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,UAAU,EAAE,CAAC;IAC9B,sBAAsB,EAAE,sBAAsB,CAAC;IAC/C,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,gBAAgB,EAAE,OAAO,CAAC;CAC1B;AAMD;;;;;GAKG;AACH,wBAAgB,eAAe,CAC9B,EAAE,EAAE,YAAY,EAChB,GAAG,EAAE,MAAM,GACT,gBAAgB,GAAG;IAAE,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAoUvD"}
+{"version":3,"file":"settings-resolver.d.ts","sourceRoot":"","sources":["../../src/config/settings-resolver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,KAAK,UAAU,EAAiB,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAQN,KAAK,sBAAsB,EAC3B,MAAM,aAAa,CAAC;AAErB,OAAO,EAAmB,KAAK,UAAU,EAAsB,MAAM,uBAAuB,CAAC;AAY7F,MAAM,WAAW,gBAAgB;IAChC,YAAY,EAAE,OAAO,CAAC;IAAC,gBAAgB,EAAE,OAAO,CAAC;IAAC,cAAc,EAAE,MAAM,CAAC;IACzE,iBAAiB,EAAE,UAAU,CAAC;IAAC,eAAe,EAAE,OAAO,CAAC;IACxD,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,qBAAqB,EAAE,OAAO,CAAC;IACzE,gBAAgB,EAAE,OAAO,CAAC;IAAC,eAAe,EAAE,OAAO,CAAC;IACpD,cAAc,EAAE,OAAO,CAAC;IAAC,cAAc,EAAE,MAAM,CAAC;IAChD,eAAe,EAAE,UAAU,EAAE,CAAC;IAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAC9E,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1E,SAAS,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,OAAO,CAAC;IAAC,gBAAgB,EAAE,OAAO,CAAC;CACrE;AAED,wBAAgB,eAAe,CAC9B,EAAE,EAAE,YAAY,EAChB,GAAG,EAAE,MAAM,GACT,gBAAgB,GAAG;IAAE,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CA6GvD"}

package/dist/config/settings-resolver.js

@@ -8,45 +8,18 @@ import * as fs from "node:fs";
 import { discoverFlows } from "../flow/agents.js";
 import { loadFlowModelConfigs, loadFlowSettings, loadProjectFlowModelConfigName, normalizeFlowModeName, selectFlowModelStrategy, writeGlobalFlowMode, formatFlowModelStrategy, } from "./config.js";
 import { getInheritedCliArgs } from "../snapshot/cli-args.js";
-import { parseBoolean, FLOW_TOOL_OPTIMIZE_ENV } from "../flow/depth.js";
+import { parseComplexity, DEFAULT_COMPLEXITY } from "../flow/complexity.js";
 import { logWarn } from "./log.js";
-import { DEFAULT_COMPLEXITY, parseComplexity, } from "../flow/complexity.js";
-// Environment variables for steering and animation
+import { resolveBoolean, resolveString, resolveNumber } from "./resolver-helpers.js";
 const PI_FLOW_NO_STEERING_ENV = "PI_FLOW_NO_STEERING";
 const PI_FLOW_NO_STRATEGIC_HINT_ENV = "PI_FLOW_NO_STRATEGIC_HINT";
 const PI_FLOW_NO_ANIMATION_ENV = "PI_FLOW_NO_ANIMATION";
 const PI_FLOW_NO_GLITCH_ENV = "PI_FLOW_NO_GLITCH";
 const PI_FLOW_TOOLS_TRACE_ENV = "PI_FLOW_TOOLS_TRACE";
 const PI_FLOW_TOOLS_BATCH_READ_ENV = "PI_FLOW_TOOLS_BATCH_READ";
-// ---------------------------------------------------------------------------
-// Resolution
-// ---------------------------------------------------------------------------
-/**
- * Resolve all flow settings from env vars, CLI flags, and settings files.
- *
- * Called from the session_start handler. Returns the resolved settings
- * plus discovered flows and model configs.
- */
+const PI_FLOW_TOOL_OPTIMIZE_ENV = "PI_FLOW_TOOL_OPTIMIZE";
 export function resolveSettings(pi, cwd) {
     const inheritedCliArgs = getInheritedCliArgs();
-    let toolOptimize = true;
-    let structuredOutput = true;
-    let maxConcurrency = 4;
-    let defaultComplexity = DEFAULT_COMPLEXITY;
-    let steeringEnabled = true;
-    let steeringCustomPrompt = undefined;
-    let steeringStrategicHint = true;
-    let animationEnabled = true;
-    let animationGlitch = true;
-    let askUserEnabled = false;
-    let askUserTimeout = 300000; // 5 minutes in ms
-    const envToolOptimize = process.env[FLOW_TOOL_OPTIMIZE_ENV];
-    if (envToolOptimize !== undefined) {
-        const parsed = parseBoolean(envToolOptimize);
-        if (parsed !== null)
-            toolOptimize = parsed;
-    }
-    // Auto-discover flows
     const discovery = discoverFlows(cwd, "all");
     const discoveredFlows = discovery.flows;
     let loadedFlowModelConfigs = loadFlowModelConfigs(cwd);
@@ -77,51 +50,10 @@ export function resolveSettings(pi, cwd) {
             loadedFlowModelConfigs = selectFlowModelStrategy(loadedFlowModelConfigs.configs, requestedFlowMode);
         }
     }
-    // Resolve settings from .pi/settings.json
     const flowSettings = loadFlowSettings(cwd);
-    if (typeof flowSettings.structuredOutput === "boolean") {
-        structuredOutput = flowSettings.structuredOutput;
-    }
-    if (typeof flowSettings.maxConcurrency === "number") {
-        maxConcurrency = flowSettings.maxConcurrency;
-    }
-    // steering defaults from settings.json
-    if (typeof flowSettings.steering?.enabled === "boolean") {
-        steeringEnabled = flowSettings.steering.enabled;
-    }
-    if (typeof flowSettings.steering?.customPrompt === "string") {
-        steeringCustomPrompt = flowSettings.steering.customPrompt;
-    }
-    if (typeof flowSettings.steering?.strategicHint === "boolean") {
-        steeringStrategicHint = flowSettings.steering.strategicHint;
-    }
-    // animation defaults from settings.json
-    if (typeof flowSettings.animation?.enabled === "boolean") {
-        animationEnabled = flowSettings.animation.enabled;
-    }
-    if (typeof flowSettings.animation?.glitch === "boolean") {
-        animationGlitch = flowSettings.animation.glitch;
-    }
-    // Resolve toolOptimize: CLI flag > env var > settings.json > default
-    const cliFlag = pi.getFlag("tool-optimize");
-    if (typeof flowSettings.toolOptimize === "boolean") {
-        toolOptimize = flowSettings.toolOptimize;
-    }
-    if (envToolOptimize !== undefined) {
-        const parsed = parseBoolean(envToolOptimize);
-        if (parsed !== null)
-            toolOptimize = parsed;
-    }
-    if (typeof cliFlag === "boolean") {
-        toolOptimize = cliFlag;
-    }
-    else if (typeof cliFlag === "string") {
-        const parsed = parseBoolean(cliFlag);
-        if (parsed !== null)
-            toolOptimize = parsed;
-    }
+    const ctx = { pi, settings: flowSettings };
     // Resolve complexity: CLI flag > env var > settings.json > default
-    defaultComplexity = flowSettings.complexity ?? DEFAULT_COMPLEXITY;
+    let defaultComplexity = flowSettings.complexity ?? DEFAULT_COMPLEXITY;
     const envComplexityRaw = process.env.PI_FLOW_COMPLEXITY;
     if (envComplexityRaw !== undefined) {
         const envComplexity = parseComplexity(envComplexityRaw);
@@ -145,107 +77,27 @@ export function resolveSettings(pi, cwd) {
     else if (inheritedCliArgs.flowComplexity !== undefined) {
         defaultComplexity = inheritedCliArgs.flowComplexity;
     }
-    // Resolve maxConcurrency: CLI flag > env var > settings.json > default
-    const cliConcurrency = pi.getFlag("flow-max-concurrency");
-    if (typeof cliConcurrency === "string") {
-        const parsed = Number(cliConcurrency);
-        if (Number.isSafeInteger(parsed) && parsed >= 1)
-            maxConcurrency = parsed;
-    }
-    else if (typeof cliConcurrency === "number" && Number.isSafeInteger(cliConcurrency) && cliConcurrency >= 1) {
-        maxConcurrency = cliConcurrency;
-    }
-    const envConcurrency = process.env["PI_FLOW_MAX_CONCURRENCY"];
-    if (envConcurrency !== undefined && typeof cliConcurrency === "undefined") {
-        const parsed = Number(envConcurrency);
-        if (Number.isSafeInteger(parsed) && parsed >= 1)
-            maxConcurrency = parsed;
-    }
-    // Cap concurrency to the number of available CPUs
+    const toolOptimize = resolveBoolean(ctx, { cliFlag: "tool-optimize", envVar: PI_FLOW_TOOL_OPTIMIZE_ENV, settingsPath: ["toolOptimize"], defaultValue: true });
+    const structuredOutput = resolveBoolean(ctx, { envVar: "PI_FLOW_STRUCTURED_OUTPUT", settingsPath: ["structuredOutput"], defaultValue: true });
+    let maxConcurrency = resolveNumber(ctx, { cliFlag: "flow-max-concurrency", envVar: "PI_FLOW_MAX_CONCURRENCY", settingsPath: ["maxConcurrency"], defaultValue: 4, min: 1 });
     if (typeof os.availableParallelism === "function") {
         const hwConcurrency = os.availableParallelism();
         if (hwConcurrency > 0)
             maxConcurrency = Math.min(maxConcurrency, hwConcurrency);
     }
-    // Resolve steering: CLI flag > env var > settings.json > default
-    const envNoSteering = process.env[PI_FLOW_NO_STEERING_ENV];
-    if (envNoSteering !== undefined) {
-        const parsed = parseBoolean(envNoSteering);
-        if (parsed !== null)
-            steeringEnabled = !parsed; // env is "NO" steering, so invert
-    }
-    const cliNoSteering = pi.getFlag("no-steering");
-    if (typeof cliNoSteering === "boolean") {
-        steeringEnabled = !cliNoSteering;
-    }
-    else if (typeof cliNoSteering === "string") {
-        const parsed = parseBoolean(cliNoSteering);
-        if (parsed !== null)
-            steeringEnabled = !parsed;
-    }
-    // Resolve strategic hint: CLI flag > env var > settings.json > default
-    const envNoStrategicHint = process.env[PI_FLOW_NO_STRATEGIC_HINT_ENV];
-    if (envNoStrategicHint !== undefined) {
-        const parsed = parseBoolean(envNoStrategicHint);
-        if (parsed !== null)
-            steeringStrategicHint = !parsed;
-    }
-    const cliNoStrategicHint = pi.getFlag("no-strategic-hint");
-    if (typeof cliNoStrategicHint === "boolean") {
-        steeringStrategicHint = !cliNoStrategicHint;
-    }
-    else if (typeof cliNoStrategicHint === "string") {
-        const parsed = parseBoolean(cliNoStrategicHint);
-        if (parsed !== null)
-            steeringStrategicHint = !parsed;
-    }
-    // Resolve animation: CLI flag > env var > settings.json > default
-    const envNoAnimation = process.env[PI_FLOW_NO_ANIMATION_ENV];
-    if (envNoAnimation !== undefined) {
-        const parsed = parseBoolean(envNoAnimation);
-        if (parsed !== null)
-            animationEnabled = !parsed;
-    }
-    const cliNoAnimation = pi.getFlag("no-animation");
-    if (typeof cliNoAnimation === "boolean") {
-        animationEnabled = !cliNoAnimation;
-    }
-    else if (typeof cliNoAnimation === "string") {
-        const parsed = parseBoolean(cliNoAnimation);
-        if (parsed !== null)
-            animationEnabled = !parsed;
-    }
-    // Resolve glitch: CLI flag > env var > settings.json > default
-    const envNoGlitch = process.env[PI_FLOW_NO_GLITCH_ENV];
-    if (envNoGlitch !== undefined) {
-        const parsed = parseBoolean(envNoGlitch);
-        if (parsed !== null)
-            animationGlitch = !parsed;
-    }
-    const cliNoGlitch = pi.getFlag("no-glitch");
-    if (typeof cliNoGlitch === "boolean") {
-        animationGlitch = !cliNoGlitch;
-    }
-    else if (typeof cliNoGlitch === "string") {
-        const parsed = parseBoolean(cliNoGlitch);
-        if (parsed !== null)
-            animationGlitch = !parsed;
-    }
-    // Resolve askUser: settings.json > env var > default
-    if (typeof flowSettings.askUser?.enabled === "boolean") {
-        askUserEnabled = flowSettings.askUser.enabled;
-    }
-    if (typeof flowSettings.askUser?.timeout === "number") {
-        askUserTimeout = flowSettings.askUser.timeout * 1000;
-    }
+    const steeringEnabled = resolveBoolean(ctx, { cliFlag: "no-steering", envVar: PI_FLOW_NO_STEERING_ENV, settingsPath: ["steering", "enabled"], defaultValue: true, invert: true });
+    const steeringStrategicHint = resolveBoolean(ctx, { cliFlag: "no-strategic-hint", envVar: PI_FLOW_NO_STRATEGIC_HINT_ENV, settingsPath: ["steering", "strategicHint"], defaultValue: true, invert: true });
+    const animationEnabled = resolveBoolean(ctx, { cliFlag: "no-animation", envVar: PI_FLOW_NO_ANIMATION_ENV, settingsPath: ["animation", "enabled"], defaultValue: true, invert: true });
+    const animationGlitch = resolveBoolean(ctx, { cliFlag: "no-glitch", envVar: PI_FLOW_NO_GLITCH_ENV, settingsPath: ["animation", "glitch"], defaultValue: true, invert: true });
+    const askUserEnabled = typeof flowSettings.askUser?.enabled === "boolean" ? flowSettings.askUser.enabled : false;
+    let askUserTimeout = typeof flowSettings.askUser?.timeout === "number" ? flowSettings.askUser.timeout * 1000 : 300000;
     const envAskUserTimeout = process.env["PI_ASK_USER_TIMEOUT"];
     if (envAskUserTimeout !== undefined) {
         const parsed = Number(envAskUserTimeout);
-        if (Number.isSafeInteger(parsed) && parsed >= 1) {
+        if (Number.isSafeInteger(parsed) && parsed >= 1)
             askUserTimeout = parsed * 1000;
-        }
     }
-    // Resolve custom steering prompt: CLI flag only (path to file)
+    let steeringCustomPrompt = undefined;
     const cliSteeringPrompt = pi.getFlag("steering-prompt");
     if (typeof cliSteeringPrompt === "string" && cliSteeringPrompt.trim()) {
         try {
@@ -256,24 +108,13 @@ export function resolveSettings(pi, cwd) {
             logWarn(`[pi-agent-flow] Could not read steering-prompt file: ${msg}`);
         }
     }
-    // Resolve bodyVerbosity: CLI flag > env var > settings.json > default
-    let bodyVerbosity = "lite";
-    if (typeof flowSettings.bodyVerbosity === "string") {
-        bodyVerbosity = flowSettings.bodyVerbosity;
-    }
-    const envBodyVerbosity = process.env["PI_FLOW_BODY_VERBOSITY"];
-    if (envBodyVerbosity === "full" || envBodyVerbosity === "lite") {
-        bodyVerbosity = envBodyVerbosity;
-    }
-    // Resolve bodyVerbosity: CLI flag > env var > settings.json > default
+    let bodyVerbosity = resolveString(ctx, { envVar: "PI_FLOW_BODY_VERBOSITY", settingsPath: ["bodyVerbosity"], defaultValue: "lite", validator: (v) => v === "lite" || v === "full" });
     const cliBodyFull = pi.getFlag("body-full");
     const cliBodyLite = pi.getFlag("body-lite");
-    if (cliBodyFull === true) {
+    if (cliBodyFull === true)
         bodyVerbosity = "full";
-    }
-    else if (cliBodyLite === true) {
+    else if (cliBodyLite === true)
         bodyVerbosity = "lite";
-    }
     else if (typeof cliBodyFull === "string") {
         const parsed = cliBodyFull.trim();
         if (parsed === "full" || parsed === "lite")
@@ -284,85 +125,15 @@ export function resolveSettings(pi, cwd) {
         if (parsed === "full" || parsed === "lite")
             bodyVerbosity = parsed;
     }
-    // Resolve debugMode: CLI flag > env var > settings.json > default
-    let debugMode = false;
-    if (typeof flowSettings.debugMode === "boolean") {
-        debugMode = flowSettings.debugMode;
-    }
-    const envDebug = process.env["PI_FLOW_DEBUG"];
-    if (envDebug !== undefined) {
-        const parsed = parseBoolean(envDebug);
-        if (parsed !== null)
-            debugMode = parsed;
-    }
-    const cliDebug = pi.getFlag("flow-debug");
-    if (typeof cliDebug === "boolean") {
-        debugMode = cliDebug;
-    }
-    else if (typeof cliDebug === "string") {
-        const parsed = parseBoolean(cliDebug);
-        if (parsed !== null)
-            debugMode = parsed;
-    }
-    // Resolve traceEnabled: CLI flag > env var > settings.json > default (default: true)
-    let traceEnabled = true;
-    if (typeof flowSettings.tools?.trace === "boolean") {
-        traceEnabled = flowSettings.tools.trace;
-    }
-    const envTrace = process.env[PI_FLOW_TOOLS_TRACE_ENV];
-    if (envTrace !== undefined) {
-        const parsed = parseBoolean(envTrace);
-        if (parsed !== null)
-            traceEnabled = parsed;
-    }
-    const cliTrace = pi.getFlag("tools-trace");
-    if (typeof cliTrace === "boolean") {
-        traceEnabled = cliTrace;
-    }
-    else if (typeof cliTrace === "string") {
-        const parsed = parseBoolean(cliTrace);
-        if (parsed !== null)
-            traceEnabled = parsed;
-    }
-    // Resolve batchReadEnabled: CLI flag > env var > settings.json > default (default: follows toolOptimize)
-    let batchReadEnabled = toolOptimize;
-    if (typeof flowSettings.tools?.batchRead === "boolean") {
-        batchReadEnabled = flowSettings.tools.batchRead;
-    }
-    const envBatchRead = process.env[PI_FLOW_TOOLS_BATCH_READ_ENV];
-    if (envBatchRead !== undefined) {
-        const parsed = parseBoolean(envBatchRead);
-        if (parsed !== null)
-            batchReadEnabled = parsed;
-    }
-    const cliBatchRead = pi.getFlag("tools-batch-read");
-    if (typeof cliBatchRead === "boolean") {
-        batchReadEnabled = cliBatchRead;
-    }
-    else if (typeof cliBatchRead === "string") {
-        const parsed = parseBoolean(cliBatchRead);
-        if (parsed !== null)
-            batchReadEnabled = parsed;
-    }
+    const debugMode = resolveBoolean(ctx, { cliFlag: "flow-debug", envVar: "PI_FLOW_DEBUG", settingsPath: ["debugMode"], defaultValue: false });
+    const traceEnabled = resolveBoolean(ctx, { cliFlag: "tools-trace", envVar: PI_FLOW_TOOLS_TRACE_ENV, settingsPath: ["tools", "trace"], defaultValue: true });
+    const batchReadEnabled = resolveBoolean(ctx, { cliFlag: "tools-batch-read", envVar: PI_FLOW_TOOLS_BATCH_READ_ENV, settingsPath: ["tools", "batchRead"], defaultValue: toolOptimize });
     return {
-        toolOptimize,
-        structuredOutput,
-        maxConcurrency,
-        defaultComplexity,
-        steeringEnabled,
-        steeringCustomPrompt,
-        steeringStrategicHint,
-        animationEnabled,
-        animationGlitch,
-        askUserEnabled,
-        askUserTimeout,
-        discoveredFlows,
-        loadedFlowModelConfigs,
-        activeRuntimeFlowMode,
-        bodyVerbosity,
-        debugMode,
-        traceEnabled,
-        batchReadEnabled,
+        toolOptimize, structuredOutput, maxConcurrency, defaultComplexity,
+        steeringEnabled, steeringCustomPrompt, steeringStrategicHint,
+        animationEnabled, animationGlitch, askUserEnabled, askUserTimeout,
+        discoveredFlows, loadedFlowModelConfigs, activeRuntimeFlowMode,
+        bodyVerbosity, debugMode, traceEnabled, batchReadEnabled,
         projectFlowsDir: discovery.projectFlowsDir,
     };
 }

package/dist/config/settings-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings-resolver.js","sourceRoot":"","sources":["../../src/config/settings-resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"settings-resolver.js","sourceRoot":"","sources":["../../src/config/settings-resolver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAmB,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EACN,oBAAoB,EACpB,gBAAgB,EAChB,8BAA8B,EAC9B,qBAAqB,EACrB,uBAAuB,EACvB,mBAAmB,EACnB,uBAAuB,GAEvB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAmB,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC7F,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa,EAAuB,MAAM,uBAAuB,CAAC;AAE1G,MAAM,uBAAuB,GAAG,qBAAqB,CAAC;AACtD,MAAM,6BAA6B,GAAG,2BAA2B,CAAC;AAClE,MAAM,wBAAwB,GAAG,sBAAsB,CAAC;AACxD,MAAM,qBAAqB,GAAG,mBAAmB,CAAC;AAClD,MAAM,uBAAuB,GAAG,qBAAqB,CAAC;AACtD,MAAM,4BAA4B,GAAG,0BAA0B,CAAC;AAChE,MAAM,yBAAyB,GAAG,uBAAuB,CAAC;AAa1D,MAAM,UAAU,eAAe,CAC9B,EAAgB,EAChB,GAAW;IAEX,MAAM,gBAAgB,GAAG,mBAAmB,EAAE,CAAC;IAC/C,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC5C,MAAM,eAAe,GAAG,SAAS,CAAC,KAAK,CAAC;IACxC,IAAI,sBAAsB,GAA2B,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAC/E,IAAI,qBAAqB,GAAuB,SAAS,CAAC;IAE1D,wCAAwC;IACxC,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;IACzE,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;QACrC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,iBAAiB,CAAC,EAAE,CAAC;YAC9F,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC;YACjG,OAAO,CACN,+CAA+C,iBAAiB,0BAA0B,iBAAiB,yCAAyC,cAAc,GAAG,CACrK,CAAC;QACH,CAAC;aAAM,CAAC;YACP,IAAI,CAAC;gBACJ,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;gBACvC,MAAM,QAAQ,GAAG,sBAAsB,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;gBACzE,MAAM,mBAAmB,GAAG,uBAAuB,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;gBACjF,OAAO,CAAC,mBAAmB,CAAC,CAAC;YAC9B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACvE,OAAO,CAAC,mBAAmB,OAAO,EAAE,CAAC,CAAC;YACvC,CAAC;YACD,MAAM,sBAAsB,GAAG,8BAA8B,CAAC,GAAG,CAAC,CAAC;YACnE,IAAI,sBAAsB,KAAK,SAAS,IAAI,sBAAsB,KAAK,iBAAiB,EAAE,CAAC;gBAC1F,OAAO,CACN,iDAAiD,iBAAiB,4BAA4B,sBAAsB,yEAAyE,sBAAsB,wCAAwC,CAC3P,CAAC;YACH,CAAC;YACD,qBAAqB,GAAG,iBAAiB,CAAC;YAC1C,sBAAsB,GAAG,uBAAuB,CAAC,sBAAsB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;QACrG,CAAC;IACF,CAAC;IAED,MAAM,YAAY,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,GAAG,GAAmB,EAAE,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC;IAE3D,mEAAmE;IACnE,IAAI,iBAAiB,GAAe,YAAY,CAAC,UAAU,IAAI,kBAAkB,CAAC;IAClF,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;IACxD,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;QACpC,MAAM,aAAa,GAAG,eAAe,CAAC,gBAAgB,CAAC,CAAC;QACxD,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YACjC,iBAAiB,GAAG,aAAa,CAAC;QACnC,CAAC;aAAM,CAAC;YACP,OAAO,CAAC,wDAAwD,gBAAgB,4DAA4D,CAAC,CAAC;QAC/I,CAAC;IACF,CAAC;IACD,MAAM,gBAAgB,GAAG,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACvD,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE,CAAC;QAC1C,MAAM,aAAa,GAAG,eAAe,CAAC,gBAAgB,CAAC,CAAC;QACxD,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YACjC,iBAAiB,GAAG,aAAa,CAAC;QACnC,CAAC;aAAM,CAAC;YACP,OAAO,CAAC,6DAA6D,gBAAgB,4DAA4D,CAAC,CAAC;QACpJ,CAAC;IACF,CAAC;SAAM,IAAI,gBAAgB,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;QAC1D,iBAAiB,GAAG,gBAAgB,CAAC,cAAc,CAAC;IACrD,CAAC;IAED,MAAM,YAAY,GAAG,cAAc,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,yBAAyB,EAAE,YAAY,EAAE,CAAC,cAAc,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9J,MAAM,gBAAgB,GAAG,cAAc,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,2BAA2B,EAAE,YAAY,EAAE,CAAC,kBAAkB,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9I,IAAI,cAAc,GAAG,aAAa,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,sBAAsB,EAAE,MAAM,EAAE,yBAAyB,EAAE,YAAY,EAAE,CAAC,gBAAgB,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IAC3K,IAAI,OAAO,EAAE,CAAC,oBAAoB,KAAK,UAAU,EAAE,CAAC;QACnD,MAAM,aAAa,GAAG,EAAE,CAAC,oBAAoB,EAAE,CAAC;QAChD,IAAI,aAAa,GAAG,CAAC;YAAE,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;IACjF,CAAC;IACD,MAAM,eAAe,GAAG,cAAc,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,uBAAuB,EAAE,YAAY,EAAE,CAAC,UAAU,EAAE,SAAS,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAClL,MAAM,qBAAqB,GAAG,cAAc,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,EAAE,6BAA6B,EAAE,YAAY,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1M,MAAM,gBAAgB,GAAG,cAAc,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,wBAAwB,EAAE,YAAY,EAAE,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IACtL,MAAM,eAAe,GAAG,cAAc,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,qBAAqB,EAAE,YAAY,EAAE,CAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9K,MAAM,cAAc,GAAG,OAAO,YAAY,CAAC,OAAO,EAAE,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;IACjH,IAAI,cAAc,GAAG,OAAO,YAAY,CAAC,OAAO,EAAE,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;IACtH,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;IAC7D,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;QACrC,MAAM,MAAM,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;QACzC,IAAI,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,MAAM,IAAI,CAAC;YAAE,cAAc,GAAG,MAAM,GAAG,IAAI,CAAC;IACjF,CAAC;IACD,IAAI,oBAAoB,GAAuB,SAAS,CAAC;IACzD,MAAM,iBAAiB,GAAG,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACxD,IAAI,OAAO,iBAAiB,KAAK,QAAQ,IAAI,iBAAiB,CAAC,IAAI,EAAE,EAAE,CAAC;QACvE,IAAI,CAAC;YACJ,oBAAoB,GAAG,EAAE,CAAC,YAAY,CAAC,iBAAiB,CAAC,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;QAClF,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC7D,OAAO,CAAC,wDAAwD,GAAG,EAAE,CAAC,CAAC;QACxE,CAAC;IACF,CAAC;IACD,IAAI,aAAa,GAAG,aAAa,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,wBAAwB,EAAE,YAAY,EAAE,CAAC,eAAe,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,IAAI,CAAC,KAAK,MAAM,EAAE,CAAoB,CAAC;IACvM,MAAM,WAAW,GAAG,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC5C,MAAM,WAAW,GAAG,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC5C,IAAI,WAAW,KAAK,IAAI;QAAE,aAAa,GAAG,MAAM,CAAC;SAC5C,IAAI,WAAW,KAAK,IAAI;QAAE,aAAa,GAAG,MAAM,CAAC;SACjD,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;QAAC,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC;QAAC,IAAI,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,MAAM;YAAE,aAAa,GAAG,MAAyB,CAAC;IAAC,CAAC;SAClK,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;QAAC,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC;QAAC,IAAI,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,MAAM;YAAE,aAAa,GAAG,MAAyB,CAAC;IAAC,CAAC;IACvK,MAAM,SAAS,GAAG,cAAc,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,CAAC,WAAW,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC;IAC5I,MAAM,YAAY,GAAG,cAAc,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,uBAAuB,EAAE,YAAY,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5J,MAAM,gBAAgB,GAAG,cAAc,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,4BAA4B,EAAE,YAAY,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC,CAAC;IAEtL,OAAO;QACN,YAAY,EAAE,gBAAgB,EAAE,cAAc,EAAE,iBAAiB;QACjE,eAAe,EAAE,oBAAoB,EAAE,qBAAqB;QAC5D,gBAAgB,EAAE,eAAe,EAAE,cAAc,EAAE,cAAc;QACjE,eAAe,EAAE,sBAAsB,EAAE,qBAAqB;QAC9D,aAAa,EAAE,SAAS,EAAE,YAAY,EAAE,gBAAgB;QACxD,eAAe,EAAE,SAAS,CAAC,eAAe;KAC1C,CAAC;AACH,CAAC"}

package/dist/core2/snapshot.d.ts

@@ -19,8 +19,6 @@ export interface BuildCore2SnapshotOptions {
     tier?: FlowTier;
 }
 export declare function buildCore2Snapshot(sessionManager: SessionSnapshotSource, options?: BuildCore2SnapshotOptions): string | null;
-/** Replace batch section bodies with first 3 + last 3 lines as orientation. */
-export declare function stripBatchBodies(text: string): string;
 export interface SharedContext {
     messageCount: number;
     userMessageCount: number;

package/dist/core2/snapshot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"snapshot.d.ts","sourceRoot":"","sources":["../../src/core2/snapshot.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAElD,MAAM,WAAW,qBAAqB;IACrC,SAAS,EAAE,MAAM,OAAO,CAAC;IACzB,SAAS,EAAE,MAAM,OAAO,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,yBAAyB;IACzC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,IAAI,CAAC,EAAE,QAAQ,CAAC;CAChB;AA0BD,wBAAgB,kBAAkB,CACjC,cAAc,EAAE,qBAAqB,EACrC,OAAO,CAAC,EAAE,yBAAyB,GACjC,MAAM,GAAG,IAAI,CAgFf;AAucD,+EAA+E;AAC/E,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA0CrD;AAkID,MAAM,WAAW,aAAa;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CAChB;AAED,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,GAAG,aAAa,GAAG,SAAS,CAqD1F"}
+{"version":3,"file":"snapshot.d.ts","sourceRoot":"","sources":["../../src/core2/snapshot.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAGlD,MAAM,WAAW,qBAAqB;IACrC,SAAS,EAAE,MAAM,OAAO,CAAC;IACzB,SAAS,EAAE,MAAM,OAAO,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,yBAAyB;IACzC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,IAAI,CAAC,EAAE,QAAQ,CAAC;CAChB;AA6CD,wBAAgB,kBAAkB,CACjC,cAAc,EAAE,qBAAqB,EACrC,OAAO,CAAC,EAAE,yBAAyB,GACjC,MAAM,GAAG,IAAI,CAgFf;AAqnBD,MAAM,WAAW,aAAa;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CAChB;AAED,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,GAAG,aAAa,GAAG,SAAS,CAsG1F"}

package/dist/core2/snapshot.js

@@ -6,6 +6,26 @@
  * chronological order.
  */
 import { stripDirectives } from "../steering/tool-utils.js";
+import { logWarn } from "../config/log.js";
+/** Normalize toolCalls field from various input shapes. */
+function normalizeToolCalls(msg) {
+    if (!msg || typeof msg !== "object")
+        return [];
+    const m = msg;
+    const tcs = m.toolCalls ?? m.tool_calls;
+    if (Array.isArray(tcs))
+        return tcs;
+    return [];
+}
+// Fallback for external APIs that use snake_case
+const SNAKE_TOOL_CALL_ID = "tool_call_id";
+/** Normalize tool call id from various input shapes. */
+function normalizeToolCallId(tc) {
+    if (!tc || typeof tc !== "object")
+        return undefined;
+    const t = tc;
+    return t.id || t.toolCallId || t[SNAKE_TOOL_CALL_ID];
+}
 /** Synthetic system message providing the context architecture map. */
 const CONTEXT_MAP_ENTRY = {
     type: "message",
@@ -110,13 +130,13 @@ function slimAssistantUsage(usage) {
     if (!usage || typeof usage !== "object")
         return undefined;
     const u = usage;
-    const input = typeof u.input === "number" ? u.input : 0;
-    const output = typeof u.output === "number" ? u.output : 0;
-    const cacheRead = typeof u.cacheRead === "number" ? u.cacheRead : 0;
-    const cacheWrite = typeof u.cacheWrite === "number" ? u.cacheWrite : 0;
+    const input = typeof u.input === "number" ? u.input : (typeof u.prompt_tokens === "number" ? u.prompt_tokens : 0);
+    const output = typeof u.output === "number" ? u.output : (typeof u.completion_tokens === "number" ? u.completion_tokens : 0);
+    const cacheRead = typeof u.cacheRead === "number" ? u.cacheRead : (typeof u.cache_read === "number" ? u.cache_read : 0);
+    const cacheWrite = typeof u.cacheWrite === "number" ? u.cacheWrite : (typeof u.cache_write === "number" ? u.cache_write : 0);
     const totalTokens = typeof u.totalTokens === "number"
         ? u.totalTokens
-        : input + output + cacheRead + cacheWrite;
+        : (typeof u.total_tokens === "number" ? u.total_tokens : input + output + cacheRead + cacheWrite);
     if (totalTokens <= 0 && input <= 0 && output <= 0)
         return undefined;
     return { input, output, cacheRead, cacheWrite, totalTokens };
@@ -199,7 +219,7 @@ function sanitizeSnapshotEntry(entry) {
                 }
                 return true;
             });
-            const hasToolCalls = msg.toolCalls || msg.tool_calls || filteredContent.some(b => b && b.type === "toolCall");
+            const hasToolCalls = normalizeToolCalls(msg).length > 0 || filteredContent.some(b => b && b.type === "toolCall");
             if (filteredContent.length === 0 || !hasSubstance) {
                 // If assistant message has no substance and no tool calls, drop it
                 if (msg.role === "assistant" && !hasToolCalls) {
@@ -209,7 +229,7 @@ function sanitizeSnapshotEntry(entry) {
             msg.content = filteredContent;
         }
         else if (typeof msg.content === "string" && msg.content.trim() === "") {
-            const hasToolCalls = msg.toolCalls || msg.tool_calls;
+            const hasToolCalls = normalizeToolCalls(msg).length > 0;
             if (msg.role === "assistant" && !hasToolCalls) {
                 return null;
             }
@@ -239,7 +259,7 @@ function maybeStripCompaction(entry) {
             type: "message",
             message: {
                 role: "system",
-                content: `[Context Compacted] ${summary}${tokensSaved ? ` (${tokensSaved} tokens summarized)` : ""}`,
+                content: [{ type: "text", text: `[Context Compacted] ${summary}${tokensSaved ? ` (${tokensSaved} tokens summarized)` : ""}` }],
             },
         };
     }
@@ -259,11 +279,11 @@ function optimizeSharedContext(branchEntries) {
         if (e.type === "message" && e.message && typeof e.message === "object") {
             const msg = e.message;
             // Gather tool calls from content array and toolCalls/tool_calls field
-            const tcs = (msg.toolCalls || msg.tool_calls || []);
+            const tcs = normalizeToolCalls(msg);
             const contentBlocks = Array.isArray(msg.content) ? msg.content : [];
             const allCalls = [...tcs, ...contentBlocks.filter((b) => b && b.type === "toolCall")];
             for (const tc of allCalls) {
-                const id = tc.id || tc.toolCallId || tc.tool_call_id;
+                const id = normalizeToolCallId(tc);
                 const name = tc.name || tc.toolCall?.name;
                 if (!id || !name)
                     continue;
@@ -307,7 +327,7 @@ function optimizeSharedContext(branchEntries) {
         const msg = { ...e.message };
         if (msg.role !== "tool" && msg.role !== "toolResult")
             return entry;
-        const toolCallId = msg.toolCallId || msg.tool_call_id;
+        const toolCallId = normalizeToolCallId(msg);
         if (typeof toolCallId !== "string")
             return entry;
         const info = toolCallMap.get(toolCallId);
@@ -435,7 +455,7 @@ function compressSnapshotEntry(entry, tier) {
     }
     const toolName = typeof msg.toolName === "string" ? msg.toolName : typeof msg.name === "string" ? msg.name : undefined;
     const placeholder = toolName ? `[${role}: ${toolName}]` : `[${role} result omitted]`;
-    msg.content = placeholder;
+    msg.content = [{ type: "text", text: placeholder }];
     return { ...e, message: msg };
 }
 /**
@@ -523,7 +543,7 @@ function isBatchSectionHeader(line) {
         /^--- \[.+\] still running ---$/.test(line));
 }
 /** Replace batch section bodies with first 3 + last 3 lines as orientation. */
-export function stripBatchBodies(text) {
+function stripBatchBodies(text) {
     const lines = text.replace(/\r\n/g, "\n").split("\n");
     const out = [];
     let i = 0;
@@ -578,7 +598,8 @@ function maybeStripBatchBodies(line) {
     try {
         entry = JSON.parse(line);
     }
-    catch {
+    catch (e) {
+        logWarn(`[pi-agent-flow] Failed to parse JSONL line in snapshot: ${e}`);
         return line;
     }
     if (entry.type !== "message" || !entry.message) {
@@ -651,7 +672,7 @@ function stripActiveToolCall(entry, activeToolCallId) {
     }
     const newContent = message.content.filter((block) => {
         if (block && block.type === "toolCall") {
-            const id = block.id || block.toolCallId || block.tool_call_id;
+            const id = normalizeToolCallId(block);
             if (id === activeToolCallId) {
                 return false;
             }
@@ -699,21 +720,67 @@ export function parseSharedContext(snapshotJsonl) {
                 messageCount++;
                 if (msg.role === "user") {
                     userMessageCount++;
-                    if (!preview && typeof msg.content === "string") {
-                        preview = msg.content;
+                    if (!preview) {
+                        if (typeof msg.content === "string") {
+                            preview = msg.content;
+                        }
+                        else if (Array.isArray(msg.content)) {
+                            for (const part of msg.content) {
+                                if (part && part.type === "text" && typeof part.text === "string") {
+                                    preview = part.text;
+                                    break;
+                                }
+                            }
+                        }
                     }
                 }
                 else if (msg.role === "assistant") {
                     assistantMessageCount++;
-                    if (msg.usage && typeof msg.usage.totalTokens === "number") {
-                        totalTokens = msg.usage.totalTokens;
+                    const usage = entry.usage || msg.usage;
+                    if (usage && typeof usage === "object") {
+                        const u = usage;
+                        const explicit = typeof u.totalTokens === "number"
+                            ? u.totalTokens
+                            : typeof u.total_tokens === "number"
+                                ? u.total_tokens
+                                : undefined;
+                        if (typeof explicit === "number" && explicit > 0) {
+                            totalTokens = explicit;
+                        }
+                        else {
+                            const input = typeof u.input === "number"
+                                ? u.input
+                                : typeof u.prompt_tokens === "number"
+                                    ? u.prompt_tokens
+                                    : 0;
+                            const output = typeof u.output === "number"
+                                ? u.output
+                                : typeof u.completion_tokens === "number"
+                                    ? u.completion_tokens
+                                    : 0;
+                            const cacheRead = typeof u.cacheRead === "number"
+                                ? u.cacheRead
+                                : typeof u.cache_read === "number"
+                                    ? u.cache_read
+                                    : 0;
+                            const cacheWrite = typeof u.cacheWrite === "number"
+                                ? u.cacheWrite
+                                : typeof u.cache_write === "number"
+                                    ? u.cache_write
+                                    : 0;
+                            const computed = input + output + cacheRead + cacheWrite;
+                            if (computed > 0) {
+                                totalTokens = computed;
+                            }
+                        }
                     }
                 }
                 // Aggregate tool calls from any message
-                const tcs = msg.toolCalls || msg.tool_calls;
-                if (Array.isArray(tcs)) {
+                const tcs = normalizeToolCalls(msg);
+                if (tcs.length > 0) {
                     for (const tc of tcs) {
-                        const name = tc?.name || tc?.function?.name;
+                        const t = tc;
+                        const name = t.name || t.function?.name;
                         if (typeof name === "string") {
                             toolCalls[name] = (toolCalls[name] || 0) + 1;
                         }
@@ -731,8 +798,8 @@ export function parseSharedContext(snapshotJsonl) {
                 }
             }
         }
-        catch {
-            // skip invalid lines
+        catch (e) {
+            logWarn(`[pi-agent-flow] Skipping invalid JSONL line in snapshot: ${e}`);
         }
     }
     if (messageCount === 0)