@pasko70/pibo 1.16.6 → 2.0.0

package/dist/data/cli.js

@@ -4,9 +4,9 @@ import { DatabaseSync } from "node:sqlite";
 import { piboHomePath } from "../core/pibo-home.js";
 import { PiboDataStore } from "./pibo-store.js";
 const INVENTORY_STORES = [
-    { name: "v2", file: "pibo.sqlite", tables: ["sessions", "rooms", "chat_messages", "event_log", "observations", "payloads", "session_navigation"] },
-    { name: "v2-shadow", file: "pibo-chat-v2.sqlite", tables: ["sessions", "rooms", "chat_messages", "event_log", "observations", "payloads", "session_navigation"] },
-    { name: "legacy-sessions", file: "pibo-sessions.sqlite", tables: ["pibo_sessions"] },
+    { name: "v2", file: "pibo.sqlite", tables: ["sessions", "session_runtime_bindings", "rooms", "chat_messages", "event_log", "observations", "payloads", "session_navigation"] },
+    { name: "v2-shadow", file: "pibo-chat-v2.sqlite", tables: ["sessions", "session_runtime_bindings", "rooms", "chat_messages", "event_log", "observations", "payloads", "session_navigation"] },
+    { name: "legacy-sessions", file: "pibo-sessions.sqlite", tables: ["pibo_sessions", "pibo_session_runtime_bindings"] },
     { name: "legacy-chat", file: "web-chat.sqlite", tables: ["chat_events", "web_chat_events", "web_chat_sessions", "pibo_rooms", "chat_session_reads"] },
     { name: "reliability", file: "pibo-events.sqlite", tables: ["pibo_event_stream", "pibo_jobs", "pibo_runs"] },
     { name: "auth", file: "auth.sqlite", tables: [] },
@@ -121,6 +121,23 @@ function migrateSessionsToV2(input) {
             else {
                 report.skipped++;
             }
+            target.db.prepare(`
+				INSERT INTO session_runtime_bindings (
+					pibo_session_id, runtime_instance_id, runtime_adapter_id, native_session_id,
+					binding_state, protocol, metadata_json, revision, created_at, updated_at
+				) VALUES (?, 'pi', 'pi', ?, 'bound', 'pi-sdk', '{"migrationSource":"legacy-session-import","nativePresenceExpected":false}', 1, ?, ?)
+				ON CONFLICT(pibo_session_id) DO UPDATE SET
+					native_session_id = excluded.native_session_id,
+					binding_state = 'bound',
+					protocol = COALESCE(session_runtime_bindings.protocol, excluded.protocol),
+					revision = session_runtime_bindings.revision + 1,
+					updated_at = excluded.updated_at
+				WHERE session_runtime_bindings.runtime_adapter_id = 'pi'
+					AND (
+						session_runtime_bindings.native_session_id IS NOT excluded.native_session_id
+						OR session_runtime_bindings.binding_state <> 'bound'
+					)
+			`).run(row.id, row.pi_session_id, row.created_at, row.updated_at);
         }
     }
     finally {

package/dist/data/schema.js

@@ -1,5 +1,9 @@
-export const PIBO_DATA_SCHEMA_VERSION = 3;
+export const PIBO_DATA_SCHEMA_VERSION = 5;
 export function applyPiboDataSchema(db) {
+    const previousVersion = Number(db.prepare("PRAGMA user_version").get()?.user_version ?? 0);
+    const existingSessionCount = db.prepare("SELECT COUNT(*) AS count FROM sqlite_schema WHERE type = 'table' AND name = 'sessions'").get();
+    const hadSessionsBeforeMigration = existingSessionCount.count > 0
+        && Number(db.prepare("SELECT COUNT(*) AS count FROM sessions").get().count) > 0;
     db.exec(`
 		CREATE TABLE IF NOT EXISTS sessions (
 			id TEXT PRIMARY KEY,
@@ -24,6 +28,63 @@ export function applyPiboDataSchema(db) {
 			last_activity_at TEXT NOT NULL
 		);
 
+		CREATE TABLE IF NOT EXISTS session_runtime_bindings (
+			pibo_session_id TEXT PRIMARY KEY,
+			runtime_instance_id TEXT NOT NULL,
+			runtime_adapter_id TEXT NOT NULL,
+			native_session_id TEXT,
+			binding_state TEXT NOT NULL CHECK(binding_state IN ('unbound', 'bound', 'missing', 'error'))
+				CHECK(binding_state NOT IN ('bound', 'missing') OR native_session_id IS NOT NULL),
+			protocol TEXT,
+			protocol_version TEXT,
+			adapter_version TEXT,
+			locator_json TEXT,
+			metadata_json TEXT NOT NULL DEFAULT '{}',
+			revision INTEGER NOT NULL DEFAULT 1 CHECK(revision > 0),
+			created_at TEXT NOT NULL,
+			updated_at TEXT NOT NULL,
+			FOREIGN KEY (pibo_session_id) REFERENCES sessions(id) ON DELETE CASCADE
+		);
+
+		CREATE UNIQUE INDEX IF NOT EXISTS idx_session_runtime_bindings_native
+			ON session_runtime_bindings(runtime_adapter_id, native_session_id)
+			WHERE native_session_id IS NOT NULL;
+		CREATE INDEX IF NOT EXISTS idx_session_runtime_bindings_instance_state
+			ON session_runtime_bindings(runtime_instance_id, binding_state, updated_at DESC);
+
+		CREATE TRIGGER IF NOT EXISTS trg_sessions_runtime_binding_insert
+		AFTER INSERT ON sessions
+		WHEN NOT EXISTS (
+			SELECT 1 FROM session_runtime_bindings WHERE pibo_session_id = NEW.id
+		)
+		BEGIN
+			INSERT INTO session_runtime_bindings (
+				pibo_session_id, runtime_instance_id, runtime_adapter_id, native_session_id,
+				binding_state, protocol, metadata_json, revision, created_at, updated_at
+			) VALUES (
+				NEW.id, 'pi', 'pi', NULLIF(NEW.pi_session_id, ''),
+				'unbound',
+				'pi-sdk', '{}', 1, NEW.created_at, NEW.updated_at
+			);
+		END;
+
+		CREATE TRIGGER IF NOT EXISTS trg_sessions_runtime_binding_pi_update
+		AFTER UPDATE OF pi_session_id ON sessions
+		WHEN EXISTS (
+			SELECT 1 FROM session_runtime_bindings
+			WHERE pibo_session_id = NEW.id
+				AND runtime_adapter_id = 'pi'
+				AND COALESCE(native_session_id, '') <> COALESCE(NEW.pi_session_id, '')
+		)
+		BEGIN
+			UPDATE session_runtime_bindings SET
+				native_session_id = NULLIF(NEW.pi_session_id, ''),
+				binding_state = CASE WHEN NEW.pi_session_id IS NULL OR NEW.pi_session_id = '' THEN 'unbound' ELSE 'bound' END,
+				revision = revision + 1,
+				updated_at = NEW.updated_at
+			WHERE pibo_session_id = NEW.id AND runtime_adapter_id = 'pi';
+		END;
+
 		CREATE TABLE IF NOT EXISTS rooms (
 			id TEXT PRIMARY KEY,
 			name TEXT NOT NULL,
@@ -438,5 +499,47 @@ export function applyPiboDataSchema(db) {
 		CREATE INDEX IF NOT EXISTS idx_telemetry_tool_calls_retention_updated
 			ON telemetry_tool_calls(retention_class, updated_at);
 	`);
+    db.exec(`
+		INSERT OR IGNORE INTO session_runtime_bindings (
+			pibo_session_id, runtime_instance_id, runtime_adapter_id, native_session_id,
+			binding_state, protocol, metadata_json, revision, created_at, updated_at
+		)
+		SELECT
+			id, 'pi', 'pi', NULLIF(pi_session_id, ''),
+			CASE WHEN pi_session_id IS NULL OR pi_session_id = '' THEN 'unbound' ELSE 'bound' END,
+			'pi-sdk',
+			CASE WHEN EXISTS (SELECT 1 FROM event_log WHERE event_log.session_id = sessions.id LIMIT 1)
+				THEN '{"migrationSource":"schema-v4","nativePresenceExpected":true}'
+				ELSE '{"migrationSource":"schema-v4","nativePresenceExpected":false}'
+			END,
+			1, created_at, updated_at
+		FROM sessions
+		WHERE NOT EXISTS (
+			SELECT 1 FROM session_runtime_bindings existing
+			WHERE existing.pibo_session_id = sessions.id
+		);
+	`);
+    if (previousVersion < PIBO_DATA_SCHEMA_VERSION && hadSessionsBeforeMigration) {
+        const rows = db.prepare("SELECT pibo_session_id, metadata_json FROM session_runtime_bindings").all();
+        const update = db.prepare("UPDATE session_runtime_bindings SET metadata_json = ? WHERE pibo_session_id = ?");
+        for (const row of rows) {
+            let metadata = {};
+            try {
+                const parsed = JSON.parse(row.metadata_json);
+                if (parsed && typeof parsed === "object" && !Array.isArray(parsed))
+                    metadata = parsed;
+            }
+            catch {
+                // Preserve a valid object even if legacy metadata was malformed.
+            }
+            if (metadata.nativeHistoryFallback === true)
+                continue;
+            update.run(JSON.stringify({
+                ...metadata,
+                nativeHistoryFallback: true,
+                historyMigrationSource: "schema-v5",
+            }), row.pibo_session_id);
+        }
+    }
     db.exec(`PRAGMA user_version = ${PIBO_DATA_SCHEMA_VERSION}`);
 }

package/dist/data/session-store.js

@@ -1,3 +1,4 @@
+import { createLegacyPiRuntimeSessionBinding } from "../sessions/runtime-binding.js";
 export class SessionStore {
     db;
     constructor(db) {
@@ -11,7 +12,7 @@ export class SessionStore {
         ];
         const values = [
             input.session.id,
-            input.session.piSessionId,
+            input.session.piSessionId || null,
             input.roomId,
             rootSessionId(input.session),
             input.session.parentId ?? null,
@@ -52,6 +53,28 @@ export class SessionStore {
 			VALUES (${baseColumns.map(() => "?").join(", ")})
 			ON CONFLICT(id) DO UPDATE SET ${assignments.join(", ")}
 		`).run(...values);
+        const binding = input.session.runtimeBinding
+            ?? createLegacyPiRuntimeSessionBinding(input.session.id, input.session.piSessionId, input.session.createdAt);
+        this.db.prepare(`
+			INSERT INTO session_runtime_bindings (
+				pibo_session_id, runtime_instance_id, runtime_adapter_id, native_session_id,
+				binding_state, protocol, protocol_version, adapter_version, locator_json,
+				metadata_json, revision, created_at, updated_at
+			) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+			ON CONFLICT(pibo_session_id) DO UPDATE SET
+				runtime_instance_id = excluded.runtime_instance_id,
+				runtime_adapter_id = excluded.runtime_adapter_id,
+				native_session_id = excluded.native_session_id,
+				binding_state = excluded.binding_state,
+				protocol = excluded.protocol,
+				protocol_version = excluded.protocol_version,
+				adapter_version = excluded.adapter_version,
+				locator_json = excluded.locator_json,
+				metadata_json = excluded.metadata_json,
+				revision = excluded.revision,
+				created_at = excluded.created_at,
+				updated_at = excluded.updated_at
+		`).run(binding.piboSessionId, binding.runtimeInstanceId, binding.adapterId, binding.nativeSessionId ?? null, binding.state, binding.protocol ?? null, binding.protocolVersion ?? null, binding.adapterVersion ?? null, binding.locator ? JSON.stringify(binding.locator) : null, JSON.stringify(binding.metadata ?? {}), binding.revision ?? 1, binding.createdAt ?? input.session.createdAt, binding.updatedAt ?? now);
     }
 }
 export function rootSessionId(session) {

package/dist/debug/events.js

@@ -2,6 +2,8 @@ import { formatTruncationFooter, sliceTextByBytes } from "./detail-format.js";
 import { formatNextCommands } from "./next-commands.js";
 import { compactOneLine, eventPayload, rawEventObject, resolveEventField, sourceRef, stringifyPayloadValue } from "./payloads.js";
 import { normalizeLimit, openReadOnlyDebugDatabase, withStorePath } from "./sql.js";
+import { createDebugPayloadStore, hydrateDebugEventRow } from "./persisted-payloads.js";
+import { readDebugRuntimeIdentity } from "./runtime-binding.js";
 export function inspectDebugEvents(piboSessionId, store, options = {}) {
     if (!store.exists)
         throw new Error(`Debug store "chat" not found at ${store.path}`);
@@ -16,22 +18,25 @@ export function inspectDebugEvents(piboSessionId, store, options = {}) {
             clauses.push("type = ?");
             values.push(options.type);
         }
+        const payloadStore = createDebugPayloadStore(db, store);
         const rows = db
             .prepare(`
-					SELECT stream_id, session_id, session_sequence, event_id, type, created_at, preview_text, attributes_json
+					SELECT stream_id, session_id, session_sequence, event_id, type, created_at, payload_ref, preview_text, attributes_json
 					FROM event_log
 					WHERE ${clauses.join(" AND ")}
 					ORDER BY stream_id DESC
 					LIMIT ?
 				`)
             .all(...values, limit + 1);
-        const limited = rows.length > limit;
-        const events = rows.slice(0, limit).map((row) => formatEventRow(row, options.fields ?? []));
+        const hydratedRows = rows.map((row) => hydrateDebugEventRow(row, payloadStore));
+        const limited = hydratedRows.length > limit;
+        const events = hydratedRows.slice(0, limit).map((row) => formatEventRow(row, options.fields ?? []));
         return {
             piboSessionId,
+            ...readDebugRuntimeIdentity(db, piboSessionId),
             events,
             limited,
-            nextCommands: buildListNextCommands(piboSessionId, rows.slice(0, limit)),
+            nextCommands: buildListNextCommands(piboSessionId, hydratedRows.slice(0, limit)),
         };
     }
     catch (error) {
@@ -48,15 +53,17 @@ export function inspectDebugEventShow(piboSessionId, store, selector, options =
     try {
         if (!tableExists(db, "event_log"))
             return { piboSessionId, resultType: "debug.events.show", selector, nextCommands: [] };
-        const row = findEventRow(db, piboSessionId, selector);
-        if (!row)
+        const found = findEventRow(db, piboSessionId, selector);
+        if (!found)
             return { piboSessionId, resultType: "debug.events.show", selector, nextCommands: [`pibo debug events ${piboSessionId} list`] };
+        const row = hydrateDebugEventRow(found, createDebugPayloadStore(db, store));
         const payload = eventPayload(row);
         const raw = rawEventObject(row);
         const shown = options.raw ? raw : payload;
         const source = sourceRef(row, options.field, options.raw ? "raw" : "event");
         const result = {
             piboSessionId,
+            ...readDebugRuntimeIdentity(db, piboSessionId),
             resultType: "debug.events.show",
             selector,
             event: formatEventRow(row, []),
@@ -95,10 +102,11 @@ export function inspectDebugEventShow(piboSessionId, store, selector, options =
     }
 }
 export function formatDebugEvents(result) {
+    const runtimeLines = formatRuntimeIdentity(result);
     if (result.events.length === 0)
-        return ["events: 0", ...formatNextCommands(result.nextCommands ?? [])].join("\n");
+        return [...runtimeLines, "events: 0", ...formatNextCommands(result.nextCommands ?? [])].join("\n");
     const columns = Object.keys(result.events[0] ?? {});
-    const lines = [columns.join("\t")];
+    const lines = [...runtimeLines, columns.join("\t")];
     for (const event of result.events) {
         lines.push(columns.map((column) => formatValue(event[column])).join("\t"));
     }
@@ -168,14 +176,14 @@ function findEventRow(db, piboSessionId, selector) {
     const numeric = Number(selector);
     if (Number.isInteger(numeric)) {
         const row = db.prepare(`
-			SELECT stream_id, session_id, session_sequence, event_id, type, created_at, preview_text, attributes_json
+			SELECT stream_id, session_id, session_sequence, event_id, type, created_at, payload_ref, preview_text, attributes_json
 			FROM event_log WHERE session_id = ? AND stream_id = ?
 		`).get(piboSessionId, numeric);
         if (row)
             return row;
     }
     return db.prepare(`
-		SELECT stream_id, session_id, session_sequence, event_id, type, created_at, preview_text, attributes_json
+		SELECT stream_id, session_id, session_sequence, event_id, type, created_at, payload_ref, preview_text, attributes_json
 		FROM event_log WHERE session_id = ? AND event_id = ? ORDER BY stream_id DESC LIMIT 1
 	`).get(piboSessionId, selector);
 }
@@ -203,6 +211,13 @@ function tableExists(db, table) {
     const row = db.prepare("SELECT name FROM sqlite_schema WHERE type = 'table' AND name = ?").get(table);
     return row !== undefined;
 }
+function formatRuntimeIdentity(result) {
+    return [
+        result.runtimeInstanceId ? `runtimeInstanceId: ${result.runtimeInstanceId}` : undefined,
+        result.runtimeAdapterId ? `runtimeAdapterId: ${result.runtimeAdapterId}` : undefined,
+        result.runtimeBindingState ? `runtimeBindingState: ${result.runtimeBindingState}` : undefined,
+    ].filter((value) => Boolean(value));
+}
 function formatValue(value) {
     if (value === null || value === undefined)
         return "";

package/dist/debug/failures.js

@@ -2,6 +2,8 @@ import { formatNextCommands } from "./next-commands.js";
 import { compactOneLine, eventPayload } from "./payloads.js";
 import { normalizeLimit, openReadOnlyDebugDatabase, withStorePath } from "./sql.js";
 import { inspectDebugTrace } from "./trace.js";
+import { createDebugPayloadStore, hydrateDebugEventRow } from "./persisted-payloads.js";
+import { readDebugRuntimeIdentity } from "./runtime-binding.js";
 export async function inspectDebugFailures(piboSessionId, stores, options = {}) {
     const limit = normalizeLimit(options.limit);
     const failures = [];
@@ -19,6 +21,7 @@ export async function inspectDebugFailures(piboSessionId, stores, options = {})
     const visible = failures.slice(0, limit);
     return {
         piboSessionId,
+        ...readRuntimeIdentityFromStore(piboSessionId, stores.chat),
         resultType: "debug.failures",
         failures: visible,
         limited,
@@ -30,7 +33,12 @@ export async function inspectDebugFailures(piboSessionId, stores, options = {})
     };
 }
 export function formatDebugFailures(result) {
-    const lines = [`failures: ${result.failures.length}${result.limited ? " (limited)" : ""}`];
+    const lines = [
+        ...(result.runtimeInstanceId ? [`runtimeInstanceId: ${result.runtimeInstanceId}`] : []),
+        ...(result.runtimeAdapterId ? [`runtimeAdapterId: ${result.runtimeAdapterId}`] : []),
+        ...(result.runtimeBindingState ? [`runtimeBindingState: ${result.runtimeBindingState}`] : []),
+        `failures: ${result.failures.length}${result.limited ? " (limited)" : ""}`,
+    ];
     result.failures.forEach((failure, index) => {
         lines.push("");
         if (failure.kind === "tool") {
@@ -57,6 +65,17 @@ export function formatDebugFailures(result) {
     lines.push(...formatNextCommands(result.nextCommands));
     return lines.join("\n");
 }
+function readRuntimeIdentityFromStore(piboSessionId, store) {
+    if (!store.exists)
+        return {};
+    const db = openReadOnlyDebugDatabase(store);
+    try {
+        return readDebugRuntimeIdentity(db, piboSessionId);
+    }
+    finally {
+        db.close();
+    }
+}
 function readToolFailures(piboSessionId, store, limit) {
     if (!store.exists)
         return [];
@@ -64,13 +83,14 @@ function readToolFailures(piboSessionId, store, limit) {
     try {
         if (!tableExists(db, "event_log"))
             return [];
+        const payloadStore = createDebugPayloadStore(db, store);
         const rows = db.prepare(`
-			SELECT stream_id, session_id, session_sequence, event_id, type, created_at, preview_text, attributes_json
+			SELECT stream_id, session_id, session_sequence, event_id, type, created_at, payload_ref, preview_text, attributes_json
 			FROM event_log
 			WHERE session_id = ? AND type = 'tool_execution_finished'
 			ORDER BY stream_id DESC
 			LIMIT ?
-		`).all(piboSessionId, limit + 1);
+		`).all(piboSessionId, limit + 1).map((row) => hydrateDebugEventRow(row, payloadStore));
         return rows.flatMap((row) => {
             const payload = eventPayload(row);
             const status = statusFromPayload(payload);

package/dist/debug/index.js

@@ -155,11 +155,20 @@ async function runDebugSession(args) {
     if (!input)
         throw new Error("pibo debug session requires <url-or-pibo-session-id>");
     const { formatJson } = await import("./sql.js");
-    const { formatDebugSessionSummary, inspectDebugSession } = await import("./session.js");
-    const summary = inspectDebugSession(input, {
+    const stores = {
         sessions: resolveDebugStore("sessions"),
         chat: resolveDebugStore("chat"),
-    }, {
+    };
+    const { formatDebugSessionRuntime, formatDebugSessionSummary, inspectDebugSession, inspectDebugSessionRuntime } = await import("./session.js");
+    if (options.positionals[1] === "runtime") {
+        const result = inspectDebugSessionRuntime(input, stores);
+        if (options.json)
+            console.log(formatJson(result));
+        else
+            console.log(formatDebugSessionRuntime(result));
+        return;
+    }
+    const summary = inspectDebugSession(input, stores, {
         events: options.events,
         limit: options.limit,
     });
@@ -441,6 +450,7 @@ async function runDebugTrace(args) {
     const result = await inspectDebugTrace(piboSessionId, stores, {
         runningOnly: options.runningOnly,
         check: options.check,
+        nativeHistory: options.nativeHistory,
     });
     if (options.json)
         console.log(formatJson(result));
@@ -717,7 +727,7 @@ function readCookieHeaderFile(path) {
     return cookies.join("; ");
 }
 function parseOptions(args) {
-    const parsed = { positionals: [], json: false, events: false, runningOnly: false, check: false, medium: false, destructive: false, apply: false, dryRun: false, full: false, noTruncate: false, plain: false, raw: false, payload: false, args: false, output: false, error: false, active: false, stale: false };
+    const parsed = { positionals: [], json: false, events: false, runningOnly: false, nativeHistory: false, check: false, medium: false, destructive: false, apply: false, dryRun: false, full: false, noTruncate: false, plain: false, raw: false, payload: false, args: false, output: false, error: false, active: false, stale: false };
     for (let index = 0; index < args.length; index += 1) {
         const arg = args[index];
         if (arg === "--json") {
@@ -732,6 +742,10 @@ function parseOptions(args) {
             parsed.runningOnly = true;
             continue;
         }
+        if (arg === "--native-history") {
+            parsed.nativeHistory = true;
+            continue;
+        }
         if (arg === "--check") {
             parsed.check = true;
             continue;
@@ -1161,6 +1175,7 @@ function printDebugSessionDiscovery() {
 
 Usage:
   pibo debug session <url-or-pibo-session-id> [--events] [--limit n] [--json]
+  pibo debug session <url-or-pibo-session-id> runtime [--json]
 
 Inputs:
   ps_...
@@ -1169,6 +1184,7 @@ Inputs:
 
 Next:
   pibo debug session ps_...
+  pibo debug session ps_... runtime
 `);
 }
 function printDebugSummaryDiscovery() {
@@ -1238,15 +1254,17 @@ function printDebugTraceDiscovery() {
     console.log(`pibo debug trace - rebuild one Chat Web trace view
 
 Usage:
-  pibo debug trace <pibo-session-id> [--running-only] [--check] [--medium] [--json]
+  pibo debug trace <pibo-session-id> [--running-only] [--check] [--medium] [--native-history] [--json]
   pibo debug trace <pibo-session-id> show <node-id> [--json]
 
 Output:
-  Compact trace nodes from the same buildTraceView logic used by /api/chat/trace.
+  Compact trace nodes from Pibo product history and normalized events.
+  --native-history explicitly asks the selected adapter for harness-native history.
   --check adds consistency diagnostics for ids, parents, ordering, and links.
 
 Next:
   pibo debug trace ps_... --check
+  pibo debug trace ps_... --native-history --check
   pibo debug trace ps_... --medium
   pibo debug trace ps_... show <node-id>
 `);

package/dist/debug/messages.js

@@ -2,12 +2,15 @@ import { byteLength, formatTruncationFooter, sliceTextByBytes } from "./detail-f
 import { formatNextCommands } from "./next-commands.js";
 import { compactOneLine, messageRole, rawEventObject, resolveMessageContent, sourceRef } from "./payloads.js";
 import { normalizeLimit, openReadOnlyDebugDatabase, withStorePath } from "./sql.js";
+import { createDebugPayloadStore, hydrateDebugEventRow } from "./persisted-payloads.js";
+import { readDebugRuntimeIdentity } from "./runtime-binding.js";
 export function inspectDebugMessagesList(piboSessionId, store, options = {}) {
     const messages = readMessages(piboSessionId, store, normalizeLimit(options.limit));
     const limited = messages.limited;
     const rows = messages.rows.map(({ content: _content, ...row }) => row);
     return {
         piboSessionId,
+        ...messages.runtime,
         messages: rows,
         limited,
         nextCommands: [
@@ -18,11 +21,13 @@ export function inspectDebugMessagesList(piboSessionId, store, options = {}) {
     };
 }
 export function inspectDebugMessageShow(piboSessionId, store, selector, options = {}) {
-    const messages = readMessages(piboSessionId, store, 1000).rows;
+    const read = readMessages(piboSessionId, store, 1000);
+    const messages = read.rows;
     const message = selectMessage(messages, selector);
     if (!message) {
         return {
             piboSessionId,
+            ...read.runtime,
             resultType: options.final ? "debug.final" : "debug.messages.show",
             selector,
             nextCommands: [`pibo debug messages ${piboSessionId} list`],
@@ -35,6 +40,7 @@ export function inspectDebugMessageShow(piboSessionId, store, selector, options
     const { rawEvent: _rawEvent, ...messageForResult } = message;
     return {
         piboSessionId,
+        ...read.runtime,
         resultType: options.final ? "debug.final" : "debug.messages.show",
         selector,
         message: { ...messageForResult, content: slice.text },
@@ -44,9 +50,10 @@ export function inspectDebugMessageShow(piboSessionId, store, selector, options
     };
 }
 export function formatDebugMessagesList(result) {
+    const runtimeLines = formatRuntimeIdentity(result);
     if (result.messages.length === 0)
-        return [`messages: 0`, ...formatNextCommands(result.nextCommands)].join("\n");
-    const lines = ["idx\trole\tstream_id\tevent_id\tbytes\ttruncated\tpreview"];
+        return [...runtimeLines, `messages: 0`, ...formatNextCommands(result.nextCommands)].join("\n");
+    const lines = [...runtimeLines, "idx\trole\tstream_id\tevent_id\tbytes\ttruncated\tpreview"];
     for (const message of result.messages) {
         lines.push([
             message.idx,
@@ -70,6 +77,7 @@ export function formatDebugMessageShow(result, options = {}) {
         return result.message.content;
     const lines = [];
     lines.push(`piboSessionId: ${result.piboSessionId}`);
+    lines.push(...formatRuntimeIdentity(result));
     lines.push(`selector: ${result.selector}`);
     lines.push(`role: ${result.message.role}`);
     lines.push(`stream_id: ${result.message.streamId}`);
@@ -101,17 +109,23 @@ function readMessages(piboSessionId, store, limit) {
         throw new Error(`Debug store "chat" not found at ${store.path}`);
     const db = openReadOnlyDebugDatabase(store);
     try {
+        const runtime = readDebugRuntimeIdentity(db, piboSessionId);
+        const persistedMessages = readPersistedMessages(db, store, piboSessionId, limit);
+        if (persistedMessages.rows.length > 0)
+            return { ...persistedMessages, runtime };
         if (!tableExists(db, "event_log"))
-            return { rows: [], limited: false };
+            return { rows: [], limited: false, runtime };
+        const payloadStore = createDebugPayloadStore(db, store);
         const rows = db.prepare(`
-			SELECT stream_id, session_id, session_sequence, event_id, type, created_at, preview_text, attributes_json
+			SELECT stream_id, session_id, session_sequence, event_id, type, created_at, payload_ref, preview_text, attributes_json
 			FROM event_log
 			WHERE session_id = ?
 			ORDER BY stream_id ASC
 			LIMIT ?
 		`).all(piboSessionId, limit + 1);
         const messages = [];
-        for (const row of rows) {
+        for (const rawRow of rows) {
+            const row = hydrateDebugEventRow(rawRow, payloadStore);
             const role = messageRole(row);
             if (!role)
                 continue;
@@ -133,7 +147,7 @@ function readMessages(piboSessionId, store, limit) {
                 rawEvent: rawEventObject(row),
             });
         }
-        return { rows: messages.slice(0, limit), limited: rows.length > limit };
+        return { rows: messages.slice(0, limit), limited: rows.length > limit, runtime };
     }
     catch (error) {
         throw withStorePath(error, store);
@@ -142,6 +156,72 @@ function readMessages(piboSessionId, store, limit) {
         db.close();
     }
 }
+function readPersistedMessages(db, store, piboSessionId, limit) {
+    if (!tableExists(db, "chat_messages"))
+        return { rows: [], limited: false };
+    const sourceRows = db.prepare(`
+		SELECT id, sequence, turn_id, role, created_at, content_preview, content_payload_ref, source_stream_id, attributes_json
+		FROM chat_messages
+		WHERE session_id = ? AND role IN ('user', 'assistant', 'system')
+		ORDER BY sequence ASC
+		LIMIT ?
+	`).all(piboSessionId, limit + 1);
+    if (sourceRows.length === 0)
+        return { rows: [], limited: false };
+    const payloadStore = createDebugPayloadStore(db, store);
+    const rows = sourceRows.slice(0, limit).map((row, index) => {
+        const attributes = parseAttributes(row.attributes_json);
+        let content = typeof attributes.inlineText === "string" ? attributes.inlineText : row.content_preview ?? "";
+        let previewOnly = typeof attributes.inlineText !== "string";
+        if (row.content_payload_ref && payloadStore) {
+            try {
+                content = payloadStore.readPayloadText(row.content_payload_ref);
+                previewOnly = false;
+            }
+            catch {
+                // Keep the stored preview.
+            }
+        }
+        const preview = sliceTextByBytes(content, { maxBytes: 200 }, 200).text;
+        return {
+            idx: index + 1,
+            role: row.role,
+            streamId: row.source_stream_id ?? row.sequence,
+            eventId: row.turn_id ?? undefined,
+            createdAt: row.created_at,
+            contentBytes: byteLength(content),
+            preview,
+            previewOnly,
+            source: {
+                store: "chat",
+                table: "chat_messages",
+                rowSelector: { id: row.id },
+                path: row.content_payload_ref ? "content_payload_ref" : typeof attributes.inlineText === "string" ? "attributes_json.inlineText" : "content_preview",
+                kind: "message",
+                byteLength: byteLength(content),
+            },
+            content,
+            rawEvent: { ...row, attributes_json: attributes },
+        };
+    });
+    return { rows, limited: sourceRows.length > limit };
+}
+function parseAttributes(value) {
+    try {
+        const parsed = JSON.parse(value);
+        return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
+    }
+    catch {
+        return {};
+    }
+}
+function formatRuntimeIdentity(result) {
+    return [
+        result.runtimeInstanceId ? `runtimeInstanceId: ${result.runtimeInstanceId}` : undefined,
+        result.runtimeAdapterId ? `runtimeAdapterId: ${result.runtimeAdapterId}` : undefined,
+        result.runtimeBindingState ? `runtimeBindingState: ${result.runtimeBindingState}` : undefined,
+    ].filter((value) => Boolean(value));
+}
 function selectMessage(messages, selector) {
     if (selector === "last")
         return messages[messages.length - 1];

package/dist/debug/persisted-payloads.js

@@ -0,0 +1,31 @@
+import { dirname, join } from "node:path";
+import { PayloadStore } from "../data/payload-store.js";
+import { eventAttributes } from "./payloads.js";
+export function createDebugPayloadStore(db, store) {
+    const table = db.prepare("SELECT name FROM sqlite_schema WHERE type = 'table' AND name = 'payloads'").get();
+    if (!table)
+        return undefined;
+    return new PayloadStore(db, join(dirname(store.path), "payloads"));
+}
+export function hydrateDebugEventRow(row, payloadStore) {
+    if (!row.payload_ref || !payloadStore)
+        return row;
+    const attributes = eventAttributes(row);
+    if (attributes.inlinePayload !== undefined)
+        return row;
+    try {
+        const metadata = payloadStore.getPayload(row.payload_ref);
+        if (!metadata)
+            return row;
+        const inlinePayload = metadata.contentType.includes("json")
+            ? payloadStore.readPayloadJson(row.payload_ref)
+            : payloadStore.readPayloadText(row.payload_ref);
+        return {
+            ...row,
+            attributes_json: JSON.stringify({ ...attributes, inlinePayload }),
+        };
+    }
+    catch {
+        return row;
+    }
+}