@pasko70/pibo 3.4.3 → 3.5.0

package/dist/debug/storage-backup.js

@@ -0,0 +1,33 @@
+import { parseArgs } from "node:util";
+import { createStorageBackup, readStorageBackupManifest, verifyStorageBackup, restoreStorageBackup } from "../data/storage-backup.js";
+export async function runStorageBackupCli(args) {
+    const action = args[0];
+    if (!action || args.includes("--help") || args.includes("-h")) {
+        console.log(`pibo debug backup - explicit SQLite snapshot and payload backup
+Commands:
+  create   --source <sqlite> --payload-root <dir> --destination <new-dir>
+           [--resume] [--max-bytes <n>] [--max-payloads <n>] [--max-ms <n>] [--max-wal-growth <n>]
+  inspect  --archive <dir>                    Read the manifest only
+  verify   --archive <dir>                    Verify database and all payload hashes
+  restore  --archive <dir> --destination <new-dir>
+Defaults: 1 GiB data, 100000 payloads, 60000 ms and 64 MiB extra source WAL per create attempt. Resume preserves the original snapshot.
+Each archive contains one database snapshot. Product and reliability snapshots are separate cuts.
+No source deletion, vacuum, or overwrite of an existing restore destination.`);
+        return;
+    }
+    const { values } = parseArgs({ args: args.slice(1), options: { source: { type: "string" }, "payload-root": { type: "string" }, destination: { type: "string" }, archive: { type: "string" }, resume: { type: "boolean" }, "max-bytes": { type: "string" }, "max-payloads": { type: "string" }, "max-ms": { type: "string" }, "max-wal-growth": { type: "string" }, json: { type: "boolean" } } });
+    const required = (name) => { const value = values[name]; if (typeof value !== "string" || !value)
+        throw Error(`Missing --${name}`); return value; };
+    let result;
+    if (action === "create")
+        result = await createStorageBackup({ source: required("source"), payloadRoot: required("payload-root"), destination: required("destination"), resume: values.resume, maxBytes: values["max-bytes"] ? Number(values["max-bytes"]) : undefined, maxPayloads: values["max-payloads"] ? Number(values["max-payloads"]) : undefined, maxMilliseconds: values["max-ms"] ? Number(values["max-ms"]) : undefined, maxWalGrowthBytes: values["max-wal-growth"] ? Number(values["max-wal-growth"]) : undefined });
+    else if (action === "inspect")
+        result = await readStorageBackupManifest(required("archive"));
+    else if (action === "verify")
+        result = await verifyStorageBackup(required("archive"), AbortSignal.timeout(60000));
+    else if (action === "restore")
+        result = await restoreStorageBackup(required("archive"), required("destination"), AbortSignal.timeout(60000));
+    else
+        throw Error("Unknown backup action; use backup --help");
+    console.log(JSON.stringify(result, null, 2));
+}

package/dist/debug/telemetry-capture.js

@@ -0,0 +1,66 @@
+import { parseArgs } from "node:util";
+import { join, dirname } from "node:path";
+import { opendir } from "node:fs/promises";
+import { resolveDebugStore } from "./stores.js";
+import { startTelemetryCapture, inspectTelemetryCapture, finalizeTelemetryCapture, readTelemetryCapturePage } from "../data/telemetry-capture.js";
+export async function runTelemetryCaptureCli(args) {
+    const action = args[0];
+    if (!action || args.includes("--help") || args.includes("-h")) {
+        console.log(`pibo debug telemetry capture - scoped provider metadata in isolated stores
+Commands:
+  start --session <ps_...> --owner <name> --duration-ms <n> --max-bytes <n> --max-rows <n>
+  stop <capture-id>       Fence appends and finalize an independent closed archive
+  list                   List up to 100 manifests without opening databases
+  inspect <capture-id>   Read one manifest without opening its database
+  page <capture-id> [--after <sequence>] [--limit <1..100>]
+Limits: one active capture, at most one hour, 64 MiB logical data and 100000 rows per run.
+Detail is allow-listed provider metadata only. Arbitrary provider bodies, credentials and prompts are excluded.
+Stopping/finalizing is explicit; archived data is never opened by normal gateway reads.`);
+        return;
+    }
+    const { values, positionals } = parseArgs({ args: args.slice(1), allowPositionals: true, options: { session: { type: "string" }, owner: { type: "string" }, "duration-ms": { type: "string" }, "max-bytes": { type: "string" }, "max-rows": { type: "string" }, after: { type: "string" }, limit: { type: "string" }, json: { type: "boolean" } } });
+    const root = join(dirname(resolveDebugStore("pibo-data").path), "telemetry-captures");
+    let result;
+    if (action === "start")
+        result = startTelemetryCapture(root, { sessionId: values.session ?? "", owner: values.owner ?? "", durationMs: Number(values["duration-ms"]), maxBytes: Number(values["max-bytes"]), maxRows: Number(values["max-rows"]) });
+    else if (action === "list") {
+        const entries = [];
+        let scanned = 0, truncated = false;
+        try {
+            const directory = await opendir(root);
+            for await (const entry of directory) {
+                if (++scanned > 1000 || entries.length >= 100) {
+                    truncated = true;
+                    break;
+                }
+                if (!entry.isDirectory() || !entry.name.startsWith("capture_"))
+                    continue;
+                try {
+                    entries.push(inspectTelemetryCapture(root, entry.name));
+                }
+                catch {
+                    entries.push({ id: entry.name, status: "manifest_unavailable" });
+                }
+            }
+        }
+        catch (error) {
+            if (error.code !== "ENOENT")
+                throw error;
+        }
+        result = { entries, truncated };
+    }
+    else {
+        const id = positionals[0];
+        if (!id)
+            throw Error("Capture id is required");
+        if (action === "stop")
+            result = await finalizeTelemetryCapture(root, id);
+        else if (action === "inspect")
+            result = inspectTelemetryCapture(root, id);
+        else if (action === "page")
+            result = await readTelemetryCapturePage(root, id, Number(values.after ?? 0), Number(values.limit ?? 50));
+        else
+            throw Error("Unknown capture action; use capture --help");
+    }
+    console.log(JSON.stringify(result, null, 2));
+}

package/dist/gateway/cli.js

@@ -1,5 +1,6 @@
 import { spawn, execFile } from "node:child_process";
-import { existsSync, mkdirSync, openSync, readFileSync, readdirSync } from "node:fs";
+import { createHash } from "node:crypto";
+import { appendFileSync, existsSync, mkdirSync, openSync, readFileSync, readdirSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { promisify } from "node:util";
@@ -205,11 +206,14 @@ function runtimeTelemetryHint(value) {
 }
 function runtimeStatus(value) {
     const obj = objectValue(value);
-    if (!obj)
+    if (!obj || !stringValue(obj.piboSessionId) || typeof obj.processing !== "boolean" || typeof obj.streaming !== "boolean"
+        || !Number.isInteger(obj.queuedMessages) || Number(obj.queuedMessages) < 0)
         return undefined;
     return {
         piboSessionId: stringValue(obj.piboSessionId),
         queuedMessages: numberValue(obj.queuedMessages),
+        activeEventId: stringValue(obj.activeEventId),
+        queuedEventIds: Array.isArray(obj.queuedEventIds) && obj.queuedEventIds.every((id) => typeof id === "string") ? obj.queuedEventIds : undefined,
         processing: booleanValue(obj.processing),
         streaming: booleanValue(obj.streaming),
         activeTelemetry: runtimeTelemetryHint(obj.activeTelemetry),
@@ -217,13 +221,14 @@ function runtimeStatus(value) {
 }
 function activeRun(value) {
     const obj = objectValue(value);
-    if (!obj)
+    if (!obj || !stringValue(obj.runId) || !stringValue(obj.status)
+        || !(stringValue(obj.controllerPiboSessionId) || stringValue(obj.piboSessionId)))
         return undefined;
     return {
         runId: stringValue(obj.runId),
         status: stringValue(obj.status),
         toolName: stringValue(obj.toolName),
-        piboSessionId: stringValue(obj.piboSessionId),
+        piboSessionId: stringValue(obj.controllerPiboSessionId) ?? stringValue(obj.piboSessionId),
     };
 }
 function parseGatewaySafetyPayload(payload, reachable) {
@@ -231,7 +236,9 @@ function parseGatewaySafetyPayload(payload, reachable) {
     const mode = obj && (obj.mode === "dev" || obj.mode === "prod" || obj.mode === "fallback") ? obj.mode : "unknown";
     const runtimeStatuses = Array.isArray(obj?.runtimeStatuses) ? obj.runtimeStatuses.map(runtimeStatus).filter((item) => Boolean(item)) : [];
     const activeRuns = Array.isArray(obj?.activeRuns) ? obj.activeRuns.map(activeRun).filter((item) => Boolean(item)) : [];
-    return { reachable, mode, health: obj?.health, runtimeStatuses, activeRuns, ambiguous: booleanValue(obj?.ambiguous) };
+    const incomplete = !Array.isArray(obj?.runtimeStatuses) || !Array.isArray(obj?.activeRuns)
+        || runtimeStatuses.length !== obj.runtimeStatuses.length || activeRuns.length !== obj.activeRuns.length;
+    return { reachable, mode, generation: stringValue(obj?.generation), health: obj?.health, runtimeStatuses, activeRuns, ambiguous: incomplete || booleanValue(obj?.ambiguous) };
 }
 export function checkActiveWork(status, target = "web") {
     const reasons = [];
@@ -249,7 +256,7 @@ export function checkActiveWork(status, target = "web") {
             reasons.push(`${id} is processing`);
         if (session.streaming === true)
             reasons.push(`${id} is streaming`);
-        if ((session.queuedMessages ?? 0) > 0)
+        if ((session.queuedMessages ?? 0) > 0 || (session.activeTelemetry?.queueDepth ?? 0) > 0)
             reasons.push(`${id} has queued messages`);
         if (session.activeTelemetry?.isStale === true) {
             const phase = session.activeTelemetry.activePhase ? ` in ${session.activeTelemetry.activePhase}` : "";
@@ -260,6 +267,58 @@ export function checkActiveWork(status, target = "web") {
         reasons.push(`${run.runId ?? "yielded run"} is ${run.status ?? "active"}`);
     return { unsafe: reasons.length > 0, reasons };
 }
+function blockingSessions(status) {
+    return status.runtimeStatuses.filter((session) => session.processing || session.streaming
+        || (session.queuedMessages ?? 0) > 0 || (session.activeTelemetry?.queueDepth ?? 0) > 0 || session.activeTelemetry?.isStale);
+}
+export function restartConfirmationToken(status) {
+    if (!status.reachable || status.error || status.ambiguous || status.mode !== "prod" || !status.generation)
+        return undefined;
+    const sessions = blockingSessions(status);
+    if (status.runtimeStatuses.some((session) => !session.piboSessionId || typeof session.processing !== "boolean"
+        || typeof session.streaming !== "boolean" || !Number.isInteger(session.queuedMessages) || session.queuedMessages < 0))
+        return undefined;
+    if (sessions.some((session) => ((session.processing || session.streaming || session.activeTelemetry?.isStale)
+        && !(session.activeEventId || session.activeTelemetry?.activeTurnId))
+        || (session.queuedMessages > 0 && (session.queuedEventIds?.length !== session.queuedMessages || session.queuedEventIds?.some((id) => !id)))
+        || (session.activeTelemetry?.queueDepth ?? 0) > (session.queuedMessages ?? 0)))
+        return undefined;
+    if (status.activeRuns.some((run) => !run.runId || !run.piboSessionId || !run.status))
+        return undefined;
+    // Exclude clock/progress counters: approval describes work identities, not polling time.
+    const snapshot = {
+        generation: status.generation,
+        target: "web", port: targetPort("web"), service: gatewayServiceName("web"), home: managedGatewayHome("web"),
+        sessions: sessions.map((session) => ({
+            id: session.piboSessionId, activeEventId: session.activeEventId,
+            processing: session.processing, streaming: session.streaming,
+            queuedEventIds: [...(session.queuedEventIds ?? [])], queuedMessages: session.queuedMessages,
+            telemetryTurnId: session.activeTelemetry?.activeTurnId,
+            stale: session.activeTelemetry?.isStale === true,
+        })).sort((a, b) => a.id.localeCompare(b.id)),
+        runs: [...status.activeRuns].sort((a, b) => a.runId.localeCompare(b.runId)),
+    };
+    return `${RESTART_CONFIRMATION_TOKEN}:${createHash("sha256").update(JSON.stringify(snapshot)).digest("hex")}`;
+}
+function printRestartApproval(status) {
+    const token = restartConfirmationToken(status);
+    if (token) {
+        console.log("Review the listed work and obtain user approval before running:");
+        console.log(`  pibo gateway web restart --force --confirm ${token}`);
+    }
+    else
+        console.log("Snapshot approval unavailable: status must identify the gateway generation and all active work. Inspect: pibo gateway web doctor");
+}
+function auditRestart(status, decision, force, reason) {
+    const home = managedGatewayHome("web");
+    mkdirSync(home, { recursive: true });
+    appendFileSync(join(home, "gateway-restart-audit.jsonl"), `${JSON.stringify({
+        at: new Date().toISOString(), decision, force, reason, snapshot: restartConfirmationToken(status),
+        generation: status.generation,
+        sessionIds: [...new Set([...blockingSessions(status).map((session) => session.piboSessionId), ...status.activeRuns.map((run) => run.piboSessionId)].filter(Boolean))],
+        runIds: status.activeRuns.map((run) => run.runId), reasons: checkActiveWork(status).reasons,
+    })}\n`, { mode: 0o600 });
+}
 async function readGatewaySafetyStatus(target) {
     const port = targetPort(target);
     const reachable = await isPortReachable("127.0.0.1", port, 1500);
@@ -281,6 +340,10 @@ function printSafetyStatus(target, status) {
     console.log(`  runtime sessions: ${status.runtimeStatuses.length}`);
     for (const session of status.runtimeStatuses) {
         console.log(`    ${session.piboSessionId ?? "unknown"}: processing=${session.processing === true} streaming=${session.streaming === true} queued=${session.queuedMessages ?? 0}`);
+        if (session.activeEventId)
+            console.log(`      active event: ${session.activeEventId}`);
+        if (session.queuedEventIds?.length)
+            console.log(`      queued events: ${session.queuedEventIds.join(", ")}`);
         if (session.activeTelemetry) {
             const parts = [
                 session.activeTelemetry.activePhase ? `phase=${session.activeTelemetry.activePhase}` : undefined,
@@ -295,7 +358,7 @@ function printSafetyStatus(target, status) {
     }
     console.log(`  active yielded runs: ${status.activeRuns.length}`);
     for (const run of status.activeRuns)
-        console.log(`    ${run.runId ?? "unknown"}: ${run.status ?? "active"}${run.toolName ? ` (${run.toolName})` : ""}`);
+        console.log(`    ${run.runId ?? "unknown"}: ${run.status ?? "active"}${run.toolName ? ` (${run.toolName})` : ""} session=${run.piboSessionId ?? "unknown"}`);
 }
 function managerRequiresShell(command) {
     return process.platform === "win32" && /\.(?:cmd|bat)$/i.test(command);
@@ -332,6 +395,7 @@ async function runManagedGatewayCommand(target, command, args, argv = process.ar
             }
             else
                 console.log("  restart safety: idle");
+            printRestartApproval(status);
         }
         if (command === "doctor")
             process.exitCode = status.reachable && !status.error && status.mode === expectedMode(target) ? 0 : 1;
@@ -380,19 +444,43 @@ async function runManagedGatewayCommand(target, command, args, argv = process.ar
         const force = args.includes("--force");
         const confirmIndex = args.indexOf("--confirm");
         const confirmation = confirmIndex >= 0 ? args[confirmIndex + 1] : undefined;
-        if (force && confirmation !== RESTART_CONFIRMATION_TOKEN) {
+        if (target === "dev" && force && confirmation !== RESTART_CONFIRMATION_TOKEN) {
             console.error(`Force restart requires: --confirm ${RESTART_CONFIRMATION_TOKEN}`);
             process.exitCode = 1;
             return true;
         }
-        if (target === "web" && !force) {
-            const active = checkActiveWork(await readGatewaySafetyStatus(target), target);
-            if (active.unsafe) {
-                console.error("Restart blocked: active agent work is running.");
-                console.error("Do not restart the gateway now.");
-                console.error("Ask the user before interrupting active sessions.");
+        if (target === "web") {
+            // Both normal and delayed/forced commands inspect again at execution time.
+            let current = await readGatewaySafetyStatus(target);
+            for (let inspection = 0; inspection < 2; inspection += 1) {
+                const active = checkActiveWork(current, target);
+                const token = restartConfirmationToken(current);
+                printSafetyStatus(target, current);
                 for (const reason of active.reasons)
                     console.error(`- ${reason}`);
+                const blocked = force ? !token || confirmation !== token : active.unsafe;
+                if (blocked) {
+                    const reason = force ? "Snapshot approval is missing, unavailable, or changed." : "Active work or unavailable gateway status.";
+                    console.error(`Restart blocked: ${reason}`);
+                    console.error("Ask the user before interrupting active sessions. Obtain fresh approval with: pibo gateway web status");
+                    printRestartApproval(current);
+                    try {
+                        auditRestart(current, "blocked", force, reason);
+                    }
+                    catch (error) {
+                        console.error(`Restart audit failed: ${error instanceof Error ? error.message : String(error)}`);
+                    }
+                    process.exitCode = 1;
+                    return true;
+                }
+                if (inspection === 0)
+                    current = await readGatewaySafetyStatus(target);
+            }
+            try {
+                auditRestart(current, "approved", force, force ? "Unchanged snapshot explicitly approved" : "Gateway idle");
+            }
+            catch (error) {
+                console.error(`Restart blocked: cannot record restart audit: ${error instanceof Error ? error.message : String(error)}`);
                 process.exitCode = 1;
                 return true;
             }
@@ -642,8 +730,8 @@ Commands:
   dev doctor       Check dev gateway health
 
 Options:
-  --force --confirm ${RESTART_CONFIRMATION_TOKEN}
-                 Force a production restart after explicit confirmation
+  --force --confirm <snapshot-token>
+                 Restart only the work explicitly approved from web status
 
 Next:
   pibo gateway web status

package/dist/gateway/server.js

@@ -360,6 +360,7 @@ export class PiboGatewayServer {
             },
             findSessions: (input) => this.requireSessionStore().find(input),
             listSessions: () => this.requireSessionStore().list?.() ?? [],
+            getSessionStructureRevision: () => this.requireSessionStore().getStructureRevision?.(),
             getSessionRuntimeBinding: (piboSessionId) => this.requireRouter().getSessionRuntimeBinding(piboSessionId),
             getSessionRuntimeProfile: (piboSessionId) => this.requireRouter().getSessionRuntimeProfile(piboSessionId),
             inspectSessionRuntimeHistory: async (piboSessionId) => {
@@ -424,6 +425,7 @@ export class PiboGatewayServer {
             getSessionStatusSnapshot: (piboSessionId, options) => this.requireRouter().getSessionStatusSnapshot(piboSessionId, options),
             getSessionForkCandidates: (piboSessionId) => this.requireRouter().getSessionForkCandidates(piboSessionId),
             listSessionRuntimeStatuses: () => this.requireRouter().listSessionRuntimeStatuses(),
+            getRuntimeCapacityStatus: () => this.requireRouter().getRuntimeCapacityStatus(),
             listRuns: (options) => this.requireRouter().listRuns(options),
             snapshotSignalSession: (piboSessionId) => this.requireRouter().snapshotSignalSession(piboSessionId),
             snapshotSignalTree: (rootPiboSessionId) => this.requireRouter().snapshotSignalTree(rootPiboSessionId),

package/dist/providers/openai-gpt56.js

@@ -38,6 +38,9 @@ export const OPENAI_CODEX_GPT_6_ASTRA_MODEL = {
     name: "GPT-6-Astra",
     cost: { input: 10, output: 50, cacheRead: 1, cacheWrite: 12.5 },
 };
+// Codex serves the Reserve quota alias from the Luna-class model, so Reserve borrows Luna's metadata.
+export const OPENAI_CODEX_RESERVE_MODEL = { id: "gpt-reserve", name: "Luna Reserve" };
+const OPENAI_CODEX_RESERVE_BASE_MODEL_ID = "gpt-5.6-luna";
 const OPENAI_GPT_56_MODEL_IDS = new Set(OPENAI_GPT_56_MODELS.map((model) => model.id));
 export function getBuiltInOpenAiModels() {
     return getBuiltInProviderModels(OPENAI_PROVIDER_ID);
@@ -69,6 +72,10 @@ export function buildOpenAiCodexGpt56Models(baseModels = getBuiltInOpenAiCodexMo
 }
 export function buildOpenAiCodexSupplementalModels(baseModels = getBuiltInOpenAiCodexModels()) {
     const models = buildOpenAiCodexGpt56Models(baseModels);
+    const reserveBase = models.find((model) => model.id === OPENAI_CODEX_RESERVE_BASE_MODEL_ID);
+    if (reserveBase && !models.some((model) => model.id === OPENAI_CODEX_RESERVE_MODEL.id)) {
+        models.push({ ...cloneModel(reserveBase), ...OPENAI_CODEX_RESERVE_MODEL });
+    }
     if (models.some((model) => model.id === OPENAI_CODEX_GPT_6_ASTRA_MODEL.id))
         return models;
     return [...models, openAiCodexAstraModelToRegistryModel()];
@@ -76,7 +83,7 @@ export function buildOpenAiCodexSupplementalModels(baseModels = getBuiltInOpenAi
 export function registerOpenAiSupplementalModels(modelRegistry, options = {}) {
     const baseOpenAiModels = options.baseOpenAiModels ?? getBuiltInOpenAiModels();
     const openAiModels = buildOpenAiGpt56Models(baseOpenAiModels);
-    const openAiAdded = countMissingGpt56Models(baseOpenAiModels, OPENAI_PROVIDER_ID);
+    const openAiAdded = countAddedModels(baseOpenAiModels, OPENAI_PROVIDER_ID, openAiModels);
     modelRegistry.registerProvider(OPENAI_PROVIDER_ID, {
         baseUrl: OPENAI_BASE_URL,
         api: OPENAI_RESPONSES_API,
@@ -85,9 +92,7 @@ export function registerOpenAiSupplementalModels(modelRegistry, options = {}) {
     });
     const baseOpenAiCodexModels = options.baseOpenAiCodexModels ?? getBuiltInOpenAiCodexModels();
     const openAiCodexModels = buildOpenAiCodexSupplementalModels(baseOpenAiCodexModels);
-    const hasBuiltInAstra = baseOpenAiCodexModels.some((model) => model.provider === OPENAI_CODEX_PROVIDER_ID && model.id === OPENAI_CODEX_GPT_6_ASTRA_MODEL.id);
-    const openAiCodexAdded = countMissingGpt56Models(baseOpenAiCodexModels, OPENAI_CODEX_PROVIDER_ID)
-        + (hasBuiltInAstra ? 0 : 1);
+    const openAiCodexAdded = countAddedModels(baseOpenAiCodexModels, OPENAI_CODEX_PROVIDER_ID, openAiCodexModels);
     modelRegistry.registerProvider(OPENAI_CODEX_PROVIDER_ID, {
         baseUrl: OPENAI_CODEX_BASE_URL,
         api: OPENAI_CODEX_RESPONSES_API,
@@ -128,9 +133,9 @@ function buildProviderGpt56Models(options) {
         .map((model) => openAiGpt56ModelToRegistryModel(model, options));
     return [...providerBaseModels, ...additions];
 }
-function countMissingGpt56Models(baseModels, providerId) {
+function countAddedModels(baseModels, providerId, registeredModels) {
     const existingIds = new Set(baseModels.filter((model) => model.provider === providerId).map((model) => model.id));
-    return OPENAI_GPT_56_MODELS.filter((model) => !existingIds.has(model.id)).length;
+    return registeredModels.filter((model) => !existingIds.has(model.id)).length;
 }
 function cloneModel(model) {
     return {

package/dist/session-ui/terminalRows.js

@@ -16,13 +16,14 @@ export function buildCompactTerminalRows(traceView, options) {
     if (!traceView)
         return [];
     const turnById = mapTurnNodes(traceView.nodes);
+    const showToolDebugMetrics = Boolean(options.debugMode && (options.debugFeatures?.toolMetrics ?? true));
     const flatNodes = flattenTraceNodes(traceView.nodes)
         .sort((left, right) => compareTraceNodes(left.node, right.node))
         .filter((item) => item.node.type !== "agent.turn" && (options.showThinking || item.node.type !== "model.reasoning"));
     const candidates = syncThinkingToolRows(flatNodes.map((item) => createRowCandidate(item.node, item.turnId)));
     applyCompletedTurnTiming(candidates, turnById);
     const reconciled = reconcileConceptualRowCandidates(candidates);
-    const rows = !options.debugMode && (options.toolDisplayMode ?? "default") === "default"
+    const rows = !showToolDebugMetrics && (options.toolDisplayMode ?? "default") === "default"
         ? groupRelatedToolCandidates(reconciled).map((candidate) => candidate.row)
         : reconciled.map((candidate) => candidate.row);
     return applyToolDisplayMode(rows, options.toolDisplayMode ?? "default");
@@ -41,14 +42,7 @@ function applyToolDisplayMode(rows, mode) {
         const slimRow = {
             ...row,
             lines: row.lines.slice(0, 1),
-            input: undefined,
-            output: undefined,
-            error: undefined,
-            markdown: undefined,
-            expandable: false,
             singleLine: true,
-            previewOmission: undefined,
-            detailItems: undefined,
         };
         if (mode !== "intent")
             return [slimRow];
@@ -60,6 +54,13 @@ function applyToolDisplayMode(rows, mode) {
                         prefix: "bullet",
                         tokens: [token(intent, row.status === "error" ? "red" : row.status === "done" ? "green" : "cyan", "semibold")],
                     }],
+                input: undefined,
+                output: undefined,
+                error: undefined,
+                markdown: undefined,
+                expandable: false,
+                previewOmission: undefined,
+                detailItems: undefined,
             }];
     });
 }
@@ -159,18 +160,34 @@ function createRowCandidate(node, turnId) {
             };
             break;
     }
+    const isToolCall = node.type === "tool.call" || node.type === "tool.result" || (node.type === "agent.delegation" && Boolean(node.toolCallId));
+    const reference = isToolCall ? toolCallReference(node) : undefined;
     return {
         ...candidate,
         row: {
             ...candidate.row,
             id: compactTerminalRowIdentity(node),
             intent: node.intent,
-            isToolCall: node.type === "tool.call" || node.type === "tool.result" || (node.type === "agent.delegation" && Boolean(node.toolCallId)),
+            isToolCall,
+            toolCallReference: reference,
+            expandable: reference || Object.values(node.payloadRefs ?? {}).some(Boolean) ? true : candidate.row.expandable,
             toolMetrics: node.toolMetrics,
+            modelInferences: node.modelInferences,
             ...debugFields(node),
         },
     };
 }
+function toolCallReference(node) {
+    if (!node.toolCallId)
+        return undefined;
+    const parsed = parseTraceToolNodeIdentity(node.id);
+    return {
+        traceNodeId: node.id,
+        toolCallId: node.toolCallId,
+        eventId: node.eventId ?? parsed?.qualifier?.eventId,
+        invocationOrdinal: node.toolInvocationOrdinal ?? parsed?.qualifier?.invocationOrdinal,
+    };
+}
 export function compactTerminalRowIdentity(node) {
     if (node.type === "tool.call" || node.type === "tool.result" || node.type === "agent.delegation") {
         if (node.toolCallId) {
@@ -226,6 +243,7 @@ function reconcileConceptualRowCandidates(candidates) {
                 output: candidate.row.output ?? existing.row.output,
                 error: candidate.row.error ?? existing.row.error,
                 payloadRefs: { ...existing.row.payloadRefs, ...candidate.row.payloadRefs },
+                modelInferences: mergeModelInferences(existing.row.modelInferences, candidate.row.modelInferences),
                 imagePreviews: mergeImagePreviews(existing.row.imagePreviews, candidate.row.imagePreviews),
             },
         };
@@ -310,6 +328,16 @@ function assistantPartIndex(rowId) {
     const index = Number(match[1]);
     return Number.isSafeInteger(index) ? index : undefined;
 }
+function mergeModelInferences(existing, candidate) {
+    if (!existing?.length)
+        return candidate;
+    if (!candidate?.length)
+        return existing;
+    const merged = new Map(existing.map((record) => [record.id, record]));
+    for (const record of candidate)
+        merged.set(record.id, record);
+    return [...merged.values()];
+}
 function mergeImagePreviews(existing, candidate) {
     if (!existing?.length)
         return candidate?.slice(0, MAX_COMPACT_TERMINAL_IMAGE_PREVIEWS);
@@ -329,6 +357,9 @@ function applyCompletedTurnTiming(candidates, turnById) {
             continue;
         const turnCandidates = candidates.filter((candidate) => candidate.turnId === turn.id);
         const finalCandidate = turnCandidates.at(-1);
+        if (finalCandidate && turn.modelInferences?.length) {
+            finalCandidate.row.modelInferences = mergeModelInferences(finalCandidate.row.modelInferences, turn.modelInferences);
+        }
         if (finalCandidate?.row.kind !== "message.assistant" || finalCandidate.row.status === "running")
             continue;
         finalCandidate.row.startedAt = turn.startedAt;
@@ -362,7 +393,8 @@ function createUserMessageRow(node) {
         lines: [{ prefix: "prompt", tokens: [token(text)] }],
         sourceNodeIds: [node.id],
         forkEntryId: node.entryId,
-        pendingMessageDelivery: pendingUserMessageDelivery(node),
+        pendingMessageDelivery: pendingUserMessageDelivery(node) ?? (node.status === "running" && node.messageDeliveryState ? "queue" : undefined),
+        messageDeliveryState: node.messageDeliveryState,
         startedAt: node.startedAt,
         output: text,
         payloadRefs: node.payloadRefs,
@@ -657,9 +689,16 @@ function createCompactionRow(node) {
         input: node.input,
         output: node.output,
         error: node.error,
-        expandable: node.input !== undefined || node.output !== undefined || Boolean(node.error),
+        compactionStats: node.compactionStats,
+        compactionMarkdown: compactionMarkdown(node.output),
+        expandable: node.status === "error" && (node.input !== undefined || node.output !== undefined || Boolean(node.error)),
     };
 }
+function compactionMarkdown(value) {
+    if (!isRecord(value))
+        return undefined;
+    return stringValue(value.summary);
+}
 function createExecutionCommandRow(node) {
     if (node.title === "status") {
         return createStatusToolRow(node);
@@ -966,13 +1005,14 @@ function createExploringGroup(candidates) {
                 }] : []),
         ],
         sourceNodeIds: candidates.flatMap((candidate) => candidate.row.sourceNodeIds),
+        modelInferences: candidates.reduce((records, candidate) => mergeModelInferences(records, candidate.row.modelInferences), undefined),
         eventId: firstRow?.eventId,
         runId: firstRow?.runId,
         orderSource: firstRow?.orderSource,
         orderStreamId: firstRow?.orderStreamId,
         orderStreamFrameIndex: firstRow?.orderStreamFrameIndex,
         detailItems,
-        expandable: detailItems.some((item) => item.input !== undefined || item.output !== undefined || Boolean(item.error)),
+        expandable: detailItems.some((item) => item.toolCallReference || item.input !== undefined || item.output !== undefined || Boolean(item.error)),
         previewOmission: omittedDetailCount > 0 ? {
             source: "details",
             visibleLineCount: visibleDetailItems.length,
@@ -1014,13 +1054,14 @@ function createImageGroup(candidates) {
                 }] : []),
         ],
         sourceNodeIds: candidates.flatMap((candidate) => candidate.row.sourceNodeIds),
+        modelInferences: candidates.reduce((records, candidate) => mergeModelInferences(records, candidate.row.modelInferences), undefined),
         eventId: firstRow?.eventId,
         runId: firstRow?.runId,
         orderSource: firstRow?.orderSource,
         orderStreamId: firstRow?.orderStreamId,
         orderStreamFrameIndex: firstRow?.orderStreamFrameIndex,
         detailItems,
-        expandable: detailItems.some((item) => item.input !== undefined || item.output !== undefined || Boolean(item.error)),
+        expandable: detailItems.some((item) => item.toolCallReference || item.input !== undefined || item.output !== undefined || Boolean(item.error)),
         imagePreviews: detailItems.flatMap((item) => item.imagePreviews ?? []).slice(0, MAX_COMPACT_TERMINAL_IMAGE_PREVIEWS),
         previewOmission: omittedDetailCount > 0 ? {
             source: "details",
@@ -1043,6 +1084,7 @@ function detailItemsForGroup(candidates, kind) {
             error: candidate.row.error,
             payloadRefs: candidate.row.payloadRefs,
             linkedPiboSessionId: candidate.row.linkedPiboSessionId,
+            toolCallReference: candidate.row.toolCallReference,
             previewOmission: candidate.row.previewOmission,
             imagePreviews: candidate.row.imagePreviews,
         };

package/dist/sessions/pibo-data-store.js

@@ -1,4 +1,4 @@
-import { ChatDataIngestService } from "../data/ingest-service.js";
+import { ChatDataIngestService, outputIdempotencyKey } from "../data/ingest-service.js";
 import { PiboDataStore } from "../data/pibo-store.js";
 import { PIBO_AGENT_OBSERVATION_AUTO_CURSOR_MAX_SCOPES, createPiboSession, matchesFindInput, } from "./store.js";
 import { createLegacyPiRuntimeSessionBinding, nextRuntimeSessionBinding, RuntimeSessionBindingConflictError, } from "./runtime-binding.js";
@@ -49,6 +49,7 @@ export class PiboDataSessionStore {
         const row = this.db.prepare(`${SESSION_SELECT} WHERE s.id = ? AND s.deleted_at IS NULL`).get(id);
         return row ? sessionFromRow(row) : undefined;
     }
+    getStructureRevision() { return this.db.prepare("SELECT revision FROM chat_navigation_clock WHERE id=1").get().revision; }
     list() {
         return this.db.prepare(`${SESSION_SELECT} WHERE s.deleted_at IS NULL ORDER BY s.updated_at DESC`).all().map(sessionFromRow);
     }
@@ -469,9 +470,26 @@ export class PiboDataSessionStore {
         const at = input.at ?? new Date().toISOString();
         const runsBySession = groupRunsByController(input.recoveredRuns ?? []);
         return this.dataStore.transaction(() => {
+            // Durable terminal output wins over stale telemetry. Do not send a different
+            // recovery payload through the same output identity during startup.
+            const terminalErrors = new Map();
             const recoveredTurns = this.dataStore.telemetry.recoverInterruptedTurns({
                 at,
-                resolveOutcome: (turn) => recoveryOutcomeForTurn(turn, runsBySession.get(turn.piboSessionId) ?? []),
+                resolveOutcome: (turn) => {
+                    const identity = { type: "session_error", piboSessionId: turn.piboSessionId, eventId: recoveryEventId(turn), error: "" };
+                    const existing = this.dataStore.eventLog.findByIdempotencyKey(outputIdempotencyKey(identity));
+                    if (existing) {
+                        const event = {
+                            ...identity,
+                            error: typeof existing.attributes.error === "string" ? existing.attributes.error : existing.previewText ?? "Runtime error",
+                            errorDetails: existing.attributes.errorDetails,
+                        };
+                        terminalErrors.set(turn.turnId, event);
+                        const details = event.errorDetails;
+                        return { status: details?.code === "timeout" ? "timeout" : details?.errorClass === "runtime_abort" ? "aborted" : "error", summary: event.error };
+                    }
+                    return recoveryOutcomeForTurn(turn, runsBySession.get(turn.piboSessionId) ?? []);
+                },
             });
             if (recoveredTurns.length === 0)
                 return [];
@@ -482,7 +500,8 @@ export class PiboDataSessionStore {
                 if (!session)
                     continue;
                 const row = this.db.prepare("SELECT room_id FROM sessions WHERE id = ?").get(session.id);
-                const event = {
+                const existingError = terminalErrors.get(recovered.turn.turnId);
+                const event = existingError ?? {
                     type: "session_error",
                     piboSessionId: session.id,
                     eventId: recoveryEventId(recovered.turn),
@@ -512,13 +531,14 @@ export class PiboDataSessionStore {
 						updated_at = ?
 					WHERE session_id = ?
 				`).run(at, at, at, session.id);
-                ingest.ingestOutputEvent({
-                    session,
-                    roomId: row?.room_id ?? undefined,
-                    actorId: session.id,
-                    event,
-                    createdAt: at,
-                });
+                if (!existingError)
+                    ingest.ingestOutputEvent({
+                        session,
+                        roomId: row?.room_id ?? undefined,
+                        actorId: session.id,
+                        event,
+                        createdAt: at,
+                    });
                 results.push({
                     turnId: recovered.turn.turnId,
                     piboSessionId: session.id,

package/dist/shared/debug-features.js

@@ -0,0 +1,4 @@
+export const DEFAULT_DEBUG_FEATURE_SETTINGS = {
+    toolMetrics: true,
+    modelInferenceMetrics: true,
+};