@pasko70/pibo 1.9.13 → 1.10.1

package/dist/core/routed-session.js

@@ -1,4 +1,5 @@
 import { SessionManager, shouldCompact } from "@earendil-works/pi-coding-agent";
+import { PiboSteeringUnavailableError } from "./events.js";
 import { getOpenAiCodexProviderUsageForActiveModel } from "../auth/openai-codex-usage.js";
 import { normalizeSessionErrorDetails, runtimeSessionErrorDetails } from "./session-errors.js";
 import { expandInlineSkills } from "./skill-expansion.js";
@@ -29,6 +30,31 @@ function isAssistantMessage(message) {
 function numberValue(value) {
     return typeof value === "number" && Number.isFinite(value) ? value : undefined;
 }
+export function normalizeAssistantUsageEvent(piboSessionId, message) {
+    const assistant = message;
+    if (!assistant?.usage || typeof assistant.usage !== "object")
+        return undefined;
+    const usage = assistant.usage;
+    const inputTokens = numberValue(usage.inputTokens) ?? numberValue(usage.input);
+    const outputTokens = numberValue(usage.outputTokens) ?? numberValue(usage.output);
+    const cacheReadTokens = numberValue(usage.cacheRead);
+    const cacheWriteTokens = numberValue(usage.cacheWrite);
+    const reportedTotal = numberValue(usage.totalTokens);
+    const normalizedTotal = reportedTotal ?? [inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens]
+        .filter((value) => value !== undefined)
+        .reduce((sum, value) => sum + value, 0);
+    if (normalizedTotal <= 0 && inputTokens === undefined && outputTokens === undefined && cacheReadTokens === undefined && cacheWriteTokens === undefined)
+        return undefined;
+    return {
+        type: "assistant_usage",
+        piboSessionId,
+        ...(inputTokens !== undefined ? { inputTokens } : {}),
+        ...(outputTokens !== undefined ? { outputTokens } : {}),
+        ...(cacheReadTokens !== undefined ? { cacheReadTokens } : {}),
+        ...(cacheWriteTokens !== undefined ? { cacheWriteTokens } : {}),
+        totalTokens: Math.max(0, normalizedTotal),
+    };
+}
 function stringValue(value) {
     return typeof value === "string" && value.length > 0 ? value : undefined;
 }
@@ -397,6 +423,8 @@ export class RoutedSession {
     queue = [];
     processing = false;
     disposed = false;
+    disposePromise;
+    drainPromise;
     fastMode = false;
     fastModePatchedAgents = new WeakSet();
     activeMessage;
@@ -511,6 +539,9 @@ export class RoutedSession {
             const normalized = normalizePiEvent(this.piboSessionId, event, { contextWindow: numberValue(model?.contextWindow) });
             const candidate = event && typeof event === "object" ? event : undefined;
             const assistantMessageEnded = candidate?.type === "message_end" && isAssistantMessage(candidate.message);
+            const usageEvent = assistantMessageEnded ? normalizeAssistantUsageEvent(this.piboSessionId, candidate?.message) : undefined;
+            if (usageEvent)
+                this.emit(this.withActiveMessage(usageEvent));
             // Pi gets the first chance to recover through its short retry/compaction loop.
             // Keep the final error pending so the routed turn can continue durable recovery.
             if (assistantMessageEnded && normalized?.type === "session_error") {
@@ -655,7 +686,32 @@ export class RoutedSession {
         };
         this.emit(output);
         this.onStateChange?.({ processing: this.processing, queuedMessages: this.queue.length, disposed: this.disposed });
-        void this.drain();
+        this.startDrain();
+        return output;
+    }
+    async steerMessage(event) {
+        this.assertActive();
+        const activeMessage = this.activeMessage;
+        if (!activeMessage || !this.processing || !this.runtime.session.isStreaming) {
+            throw new PiboSteeringUnavailableError();
+        }
+        const session = this.runtime.session;
+        const expandedText = expandInlineSkills(event.text, session.resourceLoader.getSkills().skills);
+        try {
+            await session.steer(expandedText);
+        }
+        catch (error) {
+            throw new PiboSteeringUnavailableError(`The active session could not accept steering: ${errorMessage(error)}`, { cause: error });
+        }
+        const output = {
+            type: "message_steered",
+            piboSessionId: this.piboSessionId,
+            eventId: event.id,
+            activeEventId: activeMessage.id,
+            text: event.text,
+            source: event.source,
+        };
+        this.emit(output);
         return output;
     }
     async executeAction(event) {
@@ -847,9 +903,26 @@ export class RoutedSession {
         return await this.runtime.session.compact(customInstructions);
     }
     async dispose() {
+        if (this.disposePromise)
+            return this.disposePromise;
+        this.disposePromise = this.disposeUnsafe();
+        return this.disposePromise;
+    }
+    async disposeUnsafe() {
         if (this.disposed)
             return;
+        const activeMessage = this.activeMessage;
         this.notifyMessagesInterrupted(this.activeAndQueuedMessages(), "session disposed");
+        if (activeMessage) {
+            const error = "Session disposed while a message was active.";
+            this.emit({
+                type: "session_error",
+                piboSessionId: this.piboSessionId,
+                eventId: activeMessage.id,
+                error,
+                errorDetails: runtimeSessionErrorDetails(error),
+            });
+        }
         this.cancelProviderRecovery();
         this.queue.length = 0;
         this.onStateChange?.({ processing: this.processing, queuedMessages: this.queue.length, disposed: true });
@@ -860,7 +933,15 @@ export class RoutedSession {
             this.recoverySession = undefined;
         }
         this.disposed = true;
-        await this.runtime.dispose();
+        const abort = this.runtime.session.abort;
+        if (abort)
+            await Promise.allSettled([abort.call(this.runtime.session)]);
+        try {
+            await this.drainPromise;
+        }
+        finally {
+            await this.runtime.dispose();
+        }
     }
     async kill() {
         this.notifyMessagesInterrupted(this.activeAndQueuedMessages(), "session killed");
@@ -890,6 +971,16 @@ export class RoutedSession {
         }
         return false;
     }
+    startDrain() {
+        if (this.drainPromise)
+            return;
+        const drain = this.drain();
+        this.drainPromise = drain;
+        void drain.finally(() => {
+            if (this.drainPromise === drain)
+                this.drainPromise = undefined;
+        });
+    }
     async drain() {
         if (this.processing || this.disposed)
             return;
@@ -946,7 +1037,7 @@ export class RoutedSession {
             }
         }
         catch (error) {
-            if (error instanceof PiboProviderRecoveryCancelledError)
+            if (error instanceof PiboProviderRecoveryCancelledError || this.disposed)
                 return;
             const message = errorMessage(error);
             this.emit({
@@ -1002,7 +1093,7 @@ export class RoutedSession {
         };
         this.emit(output);
         this.onStateChange?.({ processing: this.processing, queuedMessages: this.queue.length, disposed: this.disposed });
-        void this.drain();
+        this.startDrain();
         return output;
     }
     async runAction(event) {
@@ -1150,7 +1241,8 @@ export class RoutedSession {
             return output;
         }
         if (this.activeMessage?.id &&
-            (event.type === "tool_call" ||
+            (event.type === "assistant_usage" ||
+                event.type === "tool_call" ||
                 event.type === "tool_execution_started" ||
                 event.type === "tool_execution_updated" ||
                 event.type === "tool_execution_finished" ||

package/dist/core/runtime.js

@@ -17,6 +17,7 @@ import { createPiboCompactionPromptExtension } from "./compaction-prompt.js";
 import { cancelPiboAssistantContextGuardRecovery, createPiboAssistantContextGuardExtension, createPiboAssistantContextGuardRecovery, isPiboAssistantContextGuardRecoveryPending, registerPiboAssistantContextGuardRecovery, } from "./context-guard.js";
 import { getPiPackageRuntimeOptions } from "../pi-packages/runtime.js";
 import { getDefaultPiboWorkspace } from "./workspace.js";
+import { createPiboGoalToolDefinitions, PIBO_GOAL_TOOL_NAMES } from "../loops/tools.js";
 import { DEFAULT_USER_TIMEZONE } from "./user-settings.js";
 import { registerMiniMaxProvider } from "../providers/minimax.js";
 import { registerGlmProvider } from "../providers/glm.js";
@@ -109,6 +110,8 @@ function getEnabledToolDefinitions(profile, options, subagentRunner, runToolCont
     const profileToolDefinitions = profileTools.map((tool) => getToolDefinition(tool, options.toolContext));
     const codexCompatEnabled = profile.toolPackages.codexCompat === true;
     const runControlEnabled = profile.toolPackages.runControl === true;
+    const goalControlEnabled = profile.toolPackages.goalControl !== false;
+    const goalTools = goalControlEnabled ? createPiboGoalToolDefinitions(options.toolContext ?? {}) : [];
     const runControlBashTool = runControlEnabled && runToolController
         ? createBashToolDefinition(options.runtimeCwd, {
             commandPrefix: options.shellCommandPrefix,
@@ -137,6 +140,7 @@ function getEnabledToolDefinitions(profile, options, subagentRunner, runToolCont
         ...(runtimeTool ? [runtimeTool] : []),
         ...subagentTools,
         ...codexCompatTools,
+        ...goalTools,
         ...runTools,
     ];
 }
@@ -155,7 +159,7 @@ function isEnabledRuntimeTool(tool) {
     return tool.enabled !== false && isRuntimeTool(tool);
 }
 function isGeneratedPiboTool(name) {
-    return name === "runtime" || name.startsWith("pibo_subagent_") || name.startsWith("pibo_run_");
+    return name === "runtime" || name.startsWith("pibo_subagent_") || name.startsWith("pibo_run_") || PIBO_GOAL_TOOL_NAMES.includes(name);
 }
 function getBuiltinToolAllowlist(profile, customTools) {
     if (profile.builtinTools === "disabled")
@@ -282,6 +286,7 @@ export async function createPiboRuntime(options = {}) {
             toolContext: {
                 piboSessionId: options.sessionContext?.piboSessionId ?? profile.sessionId,
                 piboRoomId: options.sessionContext?.piboRoomId,
+                profileName: profile.profileName,
             },
         }, options.subagentRunner, options.runToolController, runtimeToolController);
         const modelDefaults = options.modelDefaults ?? loadPiboModelDefaults(runtimeCwd);

package/dist/core/session-router.js

@@ -6,6 +6,7 @@ import { RoutedSession } from "./routed-session.js";
 import { runtimeSessionErrorDetails } from "./session-errors.js";
 import { createSubagentToolName } from "../subagents/tool.js";
 import { PiboRunRegistry } from "../runs/registry.js";
+import { PiboRunExecutionTimeoutError } from "../runs/lifecycle.js";
 import { createPiboSignalRegistry } from "../signals/registry.js";
 import { createDefaultPiboReliabilityStore } from "../reliability/store.js";
 import { InMemoryPiboSessionStore, } from "../sessions/store.js";
@@ -22,13 +23,15 @@ import { createPiboProviderTelemetryExtension } from "./provider-telemetry.js";
 import { AsyncTelemetryWriter } from "../data/telemetry-writer.js";
 const DEFAULT_SUBAGENT_REPLY_TIMEOUT_MS = 10 * 60 * 1000;
 const DEFAULT_ROUTED_SESSION_IDLE_TIMEOUT_MS = 30 * 60 * 1000;
-export const RALPH_RUNTIME_RETRY_DEFAULTS = {
+export const LOOP_RUNTIME_RETRY_DEFAULTS = {
     enabled: true,
     maxRetries: 7,
     baseDelayMs: 2_000,
 };
+/** @deprecated Use LOOP_RUNTIME_RETRY_DEFAULTS. */
+export const RALPH_RUNTIME_RETRY_DEFAULTS = LOOP_RUNTIME_RETRY_DEFAULTS;
 export function resolvePiboSessionRetryDefaults(kind, configured) {
-    return configured ?? (kind === "ralph" ? RALPH_RUNTIME_RETRY_DEFAULTS : undefined);
+    return configured ?? (kind === "loop" || kind === "ralph" ? LOOP_RUNTIME_RETRY_DEFAULTS : undefined);
 }
 export function resolvePiboSessionInitialThinkingLevel(session) {
     const value = session.metadata?.initialThinkingLevel;
@@ -83,6 +86,15 @@ function formatRunReminderMessage(notification) {
                 toolName: run.toolName,
                 summary: run.summary,
             })),
+            timedOut: notification.timedOut.map((run) => ({
+                runId: run.runId,
+                kind: run.kind,
+                status: run.status,
+                toolName: run.toolName,
+                summary: run.summary,
+                timeoutMs: run.timeoutMs,
+                timeoutPhase: run.timeoutPhase,
+            })),
             cancelled: notification.cancelled.map((run) => ({
                 runId: run.runId,
                 kind: run.kind,
@@ -97,7 +109,7 @@ function formatRunReminderMessage(notification) {
                 toolName: run.toolName,
                 summary: run.summary,
             })),
-            instruction: "Use pibo_run_read for completed or failed runs. Use pibo_run_wait, pibo_run_status, pibo_run_cancel, or pibo_run_ack for runs you still need to manage.",
+            instruction: "Use pibo_run_read for completed, failed, or timed_out runs. Use pibo_run_wait, pibo_run_status, pibo_run_cancel, or pibo_run_ack for runs you still need to manage.",
         }),
         "</pibo_run_notification>",
     ].join("\n");
@@ -106,7 +118,7 @@ function isRunReminderServiceMessage(event) {
     return event.source === "service" && event.text.startsWith("<pibo_run_notification>");
 }
 function isTerminalRunStatus(status) {
-    return status === "completed" || status === "failed" || status === "cancelled";
+    return status === "completed" || status === "failed" || status === "timed_out" || status === "cancelled";
 }
 function asJsonObject(value) {
     return value ?? {};
@@ -210,7 +222,9 @@ export class PiboSessionRouter {
         this.clearIdleSessionTimer(event.piboSessionId);
         try {
             if (event.type === "message") {
-                return session.enqueueMessage(event);
+                return event.delivery === "steer"
+                    ? await session.steerMessage(event)
+                    : session.enqueueMessage(event);
             }
             if (event.action === "abort") {
                 this.signalRegistry.project({ type: "session_interrupted", piboSessionId: event.piboSessionId, reason: "abort action" });
@@ -665,7 +679,7 @@ export class PiboSessionRouter {
     }
     createRunToolController(parentPiboSessionId) {
         return {
-            startToolRun: ({ toolName, params, completionPolicy, retryable, maxAttempts, execute }) => {
+            startToolRun: ({ toolName, params, completionPolicy, retryable, maxAttempts, timeoutMs, serviceWarning, execute }) => {
                 assertGatewayResourceAvailableForWork(`yielded run ${toolName}`);
                 const run = this.runRegistry.startToolRun({
                     controllerPiboSessionId: parentPiboSessionId,
@@ -674,6 +688,8 @@ export class PiboSessionRouter {
                     completionPolicy,
                     retryable,
                     maxAttempts,
+                    timeoutMs,
+                    serviceWarning,
                 });
                 void (async () => {
                     try {
@@ -683,8 +699,11 @@ export class PiboSessionRouter {
                             this.scheduleRunReminder(parentPiboSessionId, false);
                     }
                     catch (error) {
-                        const failed = this.runRegistry.fail(run.runId, error instanceof Error ? error.message : String(error));
-                        if (failed)
+                        const message = error instanceof Error ? error.message : String(error);
+                        const terminalRun = error instanceof PiboRunExecutionTimeoutError
+                            ? this.runRegistry.timeOut(run.runId, message, error.timeoutPhase)
+                            : this.runRegistry.fail(run.runId, message);
+                        if (terminalRun)
                             this.scheduleRunReminder(parentPiboSessionId, false);
                     }
                 })();

package/dist/cron/cli.js

@@ -2,21 +2,21 @@ import { Command } from "commander";
 import { parseFriendlySchedule } from "./schedule.js";
 import { createDefaultPiboCronStore } from "./store.js";
 function printDiscovery() {
-    console.log(`pibo cron
-
-Manage scheduled Pibo agent jobs.
-
-Commands:
-  status    Show scheduler store status
-  list      List cron jobs
-  add       Create a cron job
-  edit      Update a cron job
-  pause     Disable a cron job
-  resume    Enable a cron job and recompute next run
-  remove    Delete a cron job
-  runs      List cron runs
-
-Next: pibo cron add --help
+    console.log(`pibo cron
+
+Manage scheduled Pibo agent jobs.
+
+Commands:
+  status    Show scheduler store status
+  list      List cron jobs
+  add       Create a cron job
+  edit      Update a cron job
+  pause     Disable a cron job
+  resume    Enable a cron job and recompute next run
+  remove    Delete a cron job
+  runs      List cron runs
+
+Next: pibo cron add --help
       pibo cron edit --help`);
 }
 function printJson(value) {

package/dist/cron/store.js

@@ -172,10 +172,10 @@ export class PiboCronStore {
         const result = [];
         this.db.exec("BEGIN IMMEDIATE");
         try {
-            const rows = this.db.prepare(`
-				SELECT * FROM pibo_cron_jobs
-				WHERE enabled = 1
-				ORDER BY updated_at ASC
+            const rows = this.db.prepare(`
+				SELECT * FROM pibo_cron_jobs
+				WHERE enabled = 1
+				ORDER BY updated_at ASC
 			`).all();
             for (const row of rows) {
                 if (result.length >= limit)
@@ -242,10 +242,10 @@ export class PiboCronStore {
                 lastPiboSessionId: input.piboSessionId ?? job.state.lastPiboSessionId,
                 consecutiveErrors: input.status === "error" ? (job.state.consecutiveErrors ?? 0) + 1 : 0,
             };
-            this.db.prepare(`
-				UPDATE pibo_cron_runs
-				SET status = ?, pibo_session_id = ?, reason = ?, error = ?, completed_at = ?, updated_at = ?
-				WHERE id = ?
+            this.db.prepare(`
+				UPDATE pibo_cron_runs
+				SET status = ?, pibo_session_id = ?, reason = ?, error = ?, completed_at = ?, updated_at = ?
+				WHERE id = ?
 			`).run(input.status, input.piboSessionId ?? null, input.reason ?? null, input.error ?? null, timestamp, timestamp, input.runId);
             this.db.prepare(`UPDATE pibo_cron_jobs SET enabled = ?, state_json = ?, updated_at = ? WHERE id = ?`).run(enabled ? 1 : 0, JSON.stringify(state), timestamp, job.id);
             if (job.deleteAfterRun && job.schedule.kind === "at" && input.status === "ok") {
@@ -286,50 +286,50 @@ export class PiboCronStore {
         this.createFreshSchema();
     }
     createFreshSchema() {
-        this.db.exec(`
-			CREATE TABLE IF NOT EXISTS pibo_cron_jobs (
-				id TEXT PRIMARY KEY,
-				name TEXT NOT NULL,
-				description TEXT,
-				enabled INTEGER NOT NULL,
-				target_json TEXT NOT NULL,
-				profile TEXT NOT NULL,
-				prompt TEXT NOT NULL,
-				schedule_json TEXT NOT NULL,
-				schedule_ui_json TEXT,
-				delete_after_run INTEGER NOT NULL DEFAULT 0,
-				state_json TEXT NOT NULL,
-				created_at TEXT NOT NULL,
-				updated_at TEXT NOT NULL
-			);
-			CREATE INDEX IF NOT EXISTS idx_pibo_cron_jobs_enabled ON pibo_cron_jobs(enabled, updated_at DESC);
-
-			CREATE TABLE IF NOT EXISTS pibo_cron_runs (
-				id TEXT PRIMARY KEY,
-				job_id TEXT NOT NULL,
-				pibo_session_id TEXT,
-				status TEXT NOT NULL,
-				reason TEXT,
-				error TEXT,
-				started_at TEXT,
-				completed_at TEXT,
-				created_at TEXT NOT NULL,
-				updated_at TEXT NOT NULL
-			);
-			CREATE INDEX IF NOT EXISTS idx_pibo_cron_runs_job_created ON pibo_cron_runs(job_id, created_at DESC);
+        this.db.exec(`
+			CREATE TABLE IF NOT EXISTS pibo_cron_jobs (
+				id TEXT PRIMARY KEY,
+				name TEXT NOT NULL,
+				description TEXT,
+				enabled INTEGER NOT NULL,
+				target_json TEXT NOT NULL,
+				profile TEXT NOT NULL,
+				prompt TEXT NOT NULL,
+				schedule_json TEXT NOT NULL,
+				schedule_ui_json TEXT,
+				delete_after_run INTEGER NOT NULL DEFAULT 0,
+				state_json TEXT NOT NULL,
+				created_at TEXT NOT NULL,
+				updated_at TEXT NOT NULL
+			);
+			CREATE INDEX IF NOT EXISTS idx_pibo_cron_jobs_enabled ON pibo_cron_jobs(enabled, updated_at DESC);
+
+			CREATE TABLE IF NOT EXISTS pibo_cron_runs (
+				id TEXT PRIMARY KEY,
+				job_id TEXT NOT NULL,
+				pibo_session_id TEXT,
+				status TEXT NOT NULL,
+				reason TEXT,
+				error TEXT,
+				started_at TEXT,
+				completed_at TEXT,
+				created_at TEXT NOT NULL,
+				updated_at TEXT NOT NULL
+			);
+			CREATE INDEX IF NOT EXISTS idx_pibo_cron_runs_job_created ON pibo_cron_runs(job_id, created_at DESC);
 		`);
     }
     insertJob(job) {
-        this.db.prepare(`
-			INSERT INTO pibo_cron_jobs (id, name, description, enabled, target_json, profile, prompt, schedule_json, schedule_ui_json, delete_after_run, state_json, created_at, updated_at)
-			VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        this.db.prepare(`
+			INSERT INTO pibo_cron_jobs (id, name, description, enabled, target_json, profile, prompt, schedule_json, schedule_ui_json, delete_after_run, state_json, created_at, updated_at)
+			VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
 		`).run(job.id, job.name, job.description ?? null, job.enabled ? 1 : 0, targetJson(job.target), job.profile, job.prompt, JSON.stringify(job.schedule), job.scheduleUi ? JSON.stringify(job.scheduleUi) : null, job.deleteAfterRun ? 1 : 0, JSON.stringify(job.state), job.createdAt, job.updatedAt);
     }
     writeJob(job) {
-        this.db.prepare(`
-			UPDATE pibo_cron_jobs
-			SET name = ?, description = ?, enabled = ?, target_json = ?, profile = ?, prompt = ?, schedule_json = ?, schedule_ui_json = ?, delete_after_run = ?, state_json = ?, updated_at = ?
-			WHERE id = ?
+        this.db.prepare(`
+			UPDATE pibo_cron_jobs
+			SET name = ?, description = ?, enabled = ?, target_json = ?, profile = ?, prompt = ?, schedule_json = ?, schedule_ui_json = ?, delete_after_run = ?, state_json = ?, updated_at = ?
+			WHERE id = ?
 		`).run(job.name, job.description ?? null, job.enabled ? 1 : 0, targetJson(job.target), job.profile, job.prompt, JSON.stringify(job.schedule), job.scheduleUi ? JSON.stringify(job.scheduleUi) : null, job.deleteAfterRun ? 1 : 0, JSON.stringify(job.state), job.updatedAt, job.id);
     }
     updateJobStateLocked(id, state, updatedAt) {
@@ -337,9 +337,9 @@ export class PiboCronStore {
     }
     createRunLocked(job, timestamp, status, reason) {
         const run = { id: `crun_${randomUUID()}`, jobId: job.id, status, reason, startedAt: timestamp, createdAt: timestamp, updatedAt: timestamp };
-        this.db.prepare(`
-			INSERT INTO pibo_cron_runs (id, job_id, pibo_session_id, status, reason, error, started_at, completed_at, created_at, updated_at)
-			VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        this.db.prepare(`
+			INSERT INTO pibo_cron_runs (id, job_id, pibo_session_id, status, reason, error, started_at, completed_at, created_at, updated_at)
+			VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
 		`).run(run.id, run.jobId, null, run.status, run.reason ?? null, null, run.startedAt ?? null, null, run.createdAt, run.updatedAt);
         return run;
     }

package/dist/data/cli.js

@@ -102,19 +102,19 @@ function migrateSessionsToV2(input) {
                     "channel", "kind", "profile", "active_model_json", "workspace", "title", "status",
                     "metadata_json", "created_at", "updated_at", "last_activity_at",
                 ];
-                target.db.prepare(`
-					INSERT INTO sessions (${columns.join(", ")})
-					VALUES (${columns.map(() => "?").join(", ")})
+                target.db.prepare(`
+					INSERT INTO sessions (${columns.join(", ")})
+					VALUES (${columns.map(() => "?").join(", ")})
 				`).run(row.id, row.pi_session_id, typeof metadata.chatRoomId === "string" ? metadata.chatRoomId : null, rootSessionId, row.parent_id, row.origin_id, row.channel, row.kind, row.profile, row.active_model_json, row.workspace, row.title ?? "Untitled Session", "idle", JSON.stringify(metadata), row.created_at, row.updated_at, row.updated_at);
                 report.inserted++;
             }
             else if (row.updated_at > existing.updated_at) {
-                target.db.prepare(`
-					UPDATE sessions SET
-						pi_session_id = ?, root_session_id = ?, parent_id = ?, origin_id = ?,
-						channel = ?, kind = ?, profile = ?, active_model_json = ?, workspace = ?, title = ?,
-						metadata_json = ?, updated_at = ?, last_activity_at = MAX(last_activity_at, ?)
-					WHERE id = ?
+                target.db.prepare(`
+					UPDATE sessions SET
+						pi_session_id = ?, root_session_id = ?, parent_id = ?, origin_id = ?,
+						channel = ?, kind = ?, profile = ?, active_model_json = ?, workspace = ?, title = ?,
+						metadata_json = ?, updated_at = ?, last_activity_at = MAX(last_activity_at, ?)
+					WHERE id = ?
 				`).run(row.pi_session_id, rootSessionId, row.parent_id, row.origin_id, row.channel, row.kind, row.profile, row.active_model_json, row.workspace, row.title ?? "Untitled Session", JSON.stringify(metadata), row.updated_at, row.updated_at, row.id);
                 report.updated++;
             }
@@ -166,19 +166,19 @@ function printInventory(stores) {
     }
 }
 function printDataHelp() {
-    console.log(`pibo data - inspect and maintain Pibo data stores
-
-Commands:
-  inventory           Read-only row counts, sizes, WAL sizes, and integrity checks; legacy-* rows are archived stores
-  migrate sessions-to-v2  Import an explicit legacy pibo-sessions.sqlite into pibo.sqlite idempotently
-
-Options:
-  --json              Print machine-readable JSON
-  --root DIR          Inspect a specific Pibo home directory instead of ~/.pibo
-  --to FILE           Target pibo.sqlite path for migration or repair
-
-Next:
-  pibo data inventory --json
-  pibo data migrate sessions-to-v2 --from /path/to/pibo-sessions.sqlite --json
+    console.log(`pibo data - inspect and maintain Pibo data stores
+
+Commands:
+  inventory           Read-only row counts, sizes, WAL sizes, and integrity checks; legacy-* rows are archived stores
+  migrate sessions-to-v2  Import an explicit legacy pibo-sessions.sqlite into pibo.sqlite idempotently
+
+Options:
+  --json              Print machine-readable JSON
+  --root DIR          Inspect a specific Pibo home directory instead of ~/.pibo
+  --to FILE           Target pibo.sqlite path for migration or repair
+
+Next:
+  pibo data inventory --json
+  pibo data migrate sessions-to-v2 --from /path/to/pibo-sessions.sqlite --json
 `);
 }

package/dist/data/event-log.js

@@ -12,29 +12,29 @@ export class PiboEventLogStore {
         }
         const createdAt = input.createdAt ?? new Date().toISOString();
         const eventId = input.eventId ?? `evt_${randomUUID()}`;
-        const result = this.db.prepare(`
-			INSERT OR IGNORE INTO event_log (
-				session_id,
-				session_sequence,
-				room_id,
-				topic,
-				type,
-				source,
-				actor_type,
-				actor_id,
-				turn_id,
-				event_id,
-				tool_call_id,
-				run_id,
-				workflow_run_id,
-				idempotency_key,
-				retention_class,
-				payload_ref,
-				preview_text,
-				attributes_json,
-				created_at,
-				indexed_at
-			) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        const result = this.db.prepare(`
+			INSERT OR IGNORE INTO event_log (
+				session_id,
+				session_sequence,
+				room_id,
+				topic,
+				type,
+				source,
+				actor_type,
+				actor_id,
+				turn_id,
+				event_id,
+				tool_call_id,
+				run_id,
+				workflow_run_id,
+				idempotency_key,
+				retention_class,
+				payload_ref,
+				preview_text,
+				attributes_json,
+				created_at,
+				indexed_at
+			) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
 		`).run(input.sessionId ?? null, input.sessionSequence ?? null, input.roomId ?? null, input.topic, input.type, input.source, input.actorType ?? null, input.actorId ?? null, input.turnId ?? null, eventId, input.toolCallId ?? null, input.runId ?? null, input.workflowRunId ?? null, input.idempotencyKey ?? null, input.retentionClass, input.payloadRef ?? null, input.previewText ?? null, JSON.stringify(input.attributes ?? {}), createdAt, input.indexedAt ?? null);
         if (input.idempotencyKey) {
             const existing = this.findByIdempotencyKey(input.idempotencyKey);

package/dist/data/ingest-service.js

@@ -303,7 +303,7 @@ function payloadForOutputEvent(event) {
 function previewTextForOutputEvent(event) {
     if (event.type === "assistant_message" || event.type === "assistant_delta" || event.type === "thinking_delta" || event.type === "thinking_finished")
         return previewText(event.text ?? "");
-    if (event.type === "message_queued" || event.type === "message_started")
+    if (event.type === "message_queued" || event.type === "message_steered" || event.type === "message_started")
         return previewText(event.text);
     if (event.type === "tool_call" || event.type === "tool_execution_started" || event.type === "tool_execution_updated" || event.type === "tool_execution_finished")
         return event.toolName;
@@ -320,6 +320,8 @@ function previewTextForOutputEvent(event) {
 function attributesForOutputEvent(event) {
     if (event.type === "message_queued")
         return { inlineText: event.text, source: event.source, queuedMessages: event.queuedMessages };
+    if (event.type === "message_steered")
+        return { inlineText: event.text, source: event.source, activeEventId: event.activeEventId };
     if (event.type === "assistant_message" || event.type === "assistant_delta")
         return { assistantIndex: event.assistantIndex, contentIndex: event.contentIndex };
     if (event.type === "thinking_started" || event.type === "thinking_delta" || event.type === "thinking_finished")