@pasko70/pibo 3.0.1 → 3.1.0

package/dist/core/session-router.js

@@ -2,10 +2,12 @@ import { randomUUID } from "node:crypto";
 import { isDeepStrictEqual } from "node:util";
 import { InitialSessionContext, } from "./profiles.js";
 import { createDefaultPiboPluginRegistry, createPiboProfileFromRegistryOrDefault, resolvePiboProfileNameFromRegistryOrDefault, selectDefaultPiboProfileName } from "../plugins/builtin.js";
-import { RuntimeRoutedSession as RoutedSession, } from "../agent-runtime/routed-session.js";
+import { RUN_REMINDER_MAX_DURATION_MS, RuntimeRoutedSession as RoutedSession, } from "../agent-runtime/routed-session.js";
 import { runtimeSessionErrorDetails } from "./session-errors.js";
+import { OutputRenderSequencer, outputRenderHighWaterStore } from "./output-render-sequence.js";
 import { normalizePiboAgentSessionName, } from "../subagents/tool.js";
-import { PIBO_AGENT_OBSERVATION_DEFAULT_EVENT_TYPES, PIBO_AGENT_OBSERVATION_DEFAULT_TOOL_EVENT_TYPES, normalizePiboAgentObservationCursor, normalizePiboAgentObservationLimit, normalizePiboAgentObservationOrder, normalizePiboAgentObservationToolDetail, parsePiboAgentObservationTimestamp, piboAgentObservationDetails, piboAgentObservationKind, piboAgentObservationRole, piboAgentObservationSourceFromEvent, piboAgentObservationText, piboAgentObservationToolSummary, } from "../subagents/observations.js";
+import { piboAgentObservationDetails, piboAgentObservationKind, piboAgentObservationRole, piboAgentObservationSourceFromEvent, piboAgentObservationText, } from "../subagents/observations.js";
+import { preparePiboAgentObservationQuery, selectPiboAgentObservationPage, } from "../subagents/observation-query.js";
 import { PiboRunRegistry } from "../runs/registry.js";
 import { PiboRunCancellationError, PiboRunCancelledError, PiboRunExecutionTimeoutError, waitForRunCancellationSettlement } from "../runs/lifecycle.js";
 import { PiboRunResourceLimitError } from "../runs/resource-isolation.js";
@@ -20,7 +22,7 @@ import { getDefaultPiboWorkspace } from "./workspace.js";
 import { loadPiboModelDefaults, selectRequestedFastMode } from "./model-defaults.js";
 import { loadPiboGatewaySettings } from "./gateway-settings.js";
 import { loadPiboUserSettings } from "./user-settings.js";
-import { resolvePiboSessionActiveModel } from "./session-model.js";
+import { PIBO_INITIAL_MODEL_FALLBACKS_METADATA_KEY, resolvePiboSessionActiveModel, resolvePiboSessionModelFallbacks, withPiboSessionModelFallbacksMetadata, } from "./session-model.js";
 import { isPiboThinkingLevel } from "./thinking.js";
 import { RuntimeSessionRegistry } from "../tools/runtime/registry.js";
 import { GatewayWorkAdmissionController } from "./gateway-resource-guard.js";
@@ -93,6 +95,7 @@ function profileForSession(baseProfile, runtimeInstanceId, nativeSessionId, pare
         parentSessionId: parentNativeSessionId,
         model: usesProfileRuntime ? baseProfile.model : undefined,
         mainModel: usesProfileRuntime ? baseProfile.mainModel : undefined,
+        mainModelFallbacks: usesProfileRuntime ? baseProfile.mainModelFallbacks : undefined,
         subagentModel: usesProfileRuntime ? baseProfile.subagentModel : undefined,
         thinkingLevel: baseProfile.thinkingLevel,
         mainThinkingLevel: baseProfile.mainThinkingLevel,
@@ -157,7 +160,11 @@ function formatRunReminderMessage(notification) {
                 toolName: run.toolName,
                 summary: run.summary,
             })),
-            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.",
+            instruction: [
+                `This autonomous run-reminder turn stops after ${RUN_REMINDER_MAX_DURATION_MS / 60_000} minutes of wall-clock time.`,
+                "Handle the listed runs promptly, then finish the turn. Do not start new subagents, yielded runs, or other long-running work from this reminder; leave larger follow-up work for a separate user-initiated or Goal continuation turn.",
+                "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.",
+            ].join(" "),
         }),
         "</pibo_run_notification>",
     ].join("\n");
@@ -329,6 +336,7 @@ export class PiboSessionRouter {
     sessions = new Map();
     pendingSessions = new Map();
     listeners = new Set();
+    outputRenderSequencer;
     runRegistry;
     gatewayWorkAdmission = new GatewayWorkAdmissionController();
     signalRegistry;
@@ -374,6 +382,9 @@ export class PiboSessionRouter {
         // Preserve that composition contract during the adapter migration without branching on adapter ids.
         this.compatibilityRuntimeRegistry = options.pluginRegistry ? createDefaultPiboPluginRegistry() : undefined;
         this.sessionStore = options.sessionStore ?? new InMemoryPiboSessionStore();
+        this.outputRenderSequencer = new OutputRenderSequencer({
+            highWaterStore: outputRenderHighWaterStore(this.sessionStore),
+        });
         this.telemetryStore = options.telemetryStore ?? telemetryStoreFromSessionStore(this.sessionStore);
         this.telemetryWriter = this.telemetryStore ? new AsyncTelemetryWriter(this.telemetryStore) : undefined;
         this.telemetryRecorder = this.telemetryStore
@@ -419,9 +430,15 @@ export class PiboSessionRouter {
                 this.signalRegistry.project({ type: "session_created", session });
             this.signalRegistry.project({ type: "pibo_output", event: recovery.event });
         }
+        const recoveredRunReminderControllers = new Set();
         for (const run of this.runRegistry.listAll({ includeConsumed: true, includeDetached: true })) {
             this.signalRegistry.project({ type: "run_changed", run, reason: "recovered" });
+            if (options.recoverInterruptedRuntimeState && isTerminalRunStatus(run.status) && this.sessionStore.get(run.controllerPiboSessionId)) {
+                recoveredRunReminderControllers.add(run.controllerPiboSessionId);
+            }
         }
+        for (const piboSessionId of recoveredRunReminderControllers)
+            this.scheduleRunReminder(piboSessionId, false);
     }
     subscribe(listener) {
         this.listeners.add(listener);
@@ -700,6 +717,7 @@ export class PiboSessionRouter {
                 if (this.disposingSessions.get(id) === operation)
                     this.disposingSessions.delete(id);
                 this.quiescingSessions.delete(id);
+                this.outputRenderSequencer.disposeSession(id);
                 this.signalRegistry.project({ type: "session_disposed", piboSessionId: id, reason });
             }
             await this.telemetryWriter?.flush();
@@ -916,8 +934,12 @@ export class PiboSessionRouter {
             expectedRevision: input.expectedRevision,
             mode,
         });
-        if (switchingRuntime)
-            this.sessionStore.update(piboSessionId, { activeModel: null });
+        if (switchingRuntime) {
+            this.sessionStore.update(piboSessionId, {
+                activeModel: null,
+                metadata: withPiboSessionModelFallbacksMetadata(session.metadata, []),
+            });
+        }
         return structuredClone(persisted);
     }
     getSessionRuntimeStatus(piboSessionId) {
@@ -1123,6 +1145,7 @@ export class PiboSessionRouter {
             this.runtimeResourceSessions.clear();
             this.activeSubagentRequests.clear();
             this.subagentRequestIdsByEvent.clear();
+            this.outputRenderSequencer.disposeAll();
             this.agentObservations.length = 0;
             this.agentObservationEvictedThroughByParent.clear();
             await this.telemetryWriter?.dispose();
@@ -1229,6 +1252,9 @@ export class PiboSessionRouter {
         const activeModel = changesRuntimeModelNamespace
             ? undefined
             : this.ensureSessionActiveModel(piboSession, sessionProfile, parentModelScopeId, modelDefaults);
+        const modelFallbacks = changesRuntimeModelNamespace
+            ? []
+            : this.ensureSessionModelFallbacks(piboSession, sessionProfile, parentModelScopeId, activeModel);
         const userSettings = loadPiboUserSettings();
         const telemetryExtension = this.telemetryStore
             ? createPiboProviderTelemetryExtension({ store: this.telemetryStore, writer: this.telemetryWriter, session: piboSession, model: activeModel })
@@ -1373,6 +1399,7 @@ export class PiboSessionRouter {
                         ],
                         modelDefaults,
                         initialFastMode,
+                        providerFallbacksEnabled: modelFallbacks.length > 0,
                     },
                 },
             });
@@ -1472,6 +1499,7 @@ export class PiboSessionRouter {
                 this.handleInterruptedRunReminders(messages);
             },
             messagePreflight: this.options.messagePreflight,
+            modelFallbacks,
             getRuntimeAuthStatus: () => runtimeRegistry.getAgentRuntimeAuthStatus(binding.runtimeInstanceId),
             startRuntimeAuth: async (input) => {
                 const { runtimeInstanceId: _runtimeInstanceId, ...result } = await runtimeRegistry.startAgentRuntimeAuth(binding.runtimeInstanceId, input);
@@ -1612,6 +1640,20 @@ export class PiboSessionRouter {
         }
         return activeModel;
     }
+    ensureSessionModelFallbacks(piboSession, profile, parentPiSessionId, activeModel) {
+        const modelFallbacks = resolvePiboSessionModelFallbacks({
+            profile,
+            piboSession,
+            parentPiSessionId,
+            activeModel,
+        });
+        if (piboSession.metadata?.[PIBO_INITIAL_MODEL_FALLBACKS_METADATA_KEY] === undefined) {
+            this.sessionStore.update(piboSession.id, {
+                metadata: withPiboSessionModelFallbacksMetadata(piboSession.metadata, modelFallbacks),
+            });
+        }
+        return modelFallbacks;
+    }
     resolveModelDefaults() {
         if (typeof this.options.modelDefaults === "function")
             return this.options.modelDefaults();
@@ -2042,98 +2084,15 @@ export class PiboSessionRouter {
         return session;
     }
     observeManagedAgents(parentPiboSessionId, input) {
-        const order = normalizePiboAgentObservationOrder(input.order);
-        const limit = normalizePiboAgentObservationLimit(input.limit);
-        const toolDetail = normalizePiboAgentObservationToolDetail(input.toolDetail);
-        const afterSequence = normalizePiboAgentObservationCursor(input.afterSequence);
-        const since = parsePiboAgentObservationTimestamp(input.since, "since");
-        const until = parsePiboAgentObservationTimestamp(input.until, "until");
-        if (since !== undefined && until !== undefined && since > until) {
-            throw new Error("Agent observation since must not be after until.");
-        }
-        const requestIds = input.requestIds ? new Set(input.requestIds) : undefined;
-        const agentIds = input.agentIds ? new Set(input.agentIds) : undefined;
-        if (agentIds) {
-            for (const agentId of agentIds)
-                this.requireManagedAgent(parentPiboSessionId, agentId);
-        }
-        const names = input.names ? new Set(input.names) : undefined;
-        const threadKeys = input.threadKeys ? new Set(input.threadKeys) : undefined;
-        const eventTypes = input.eventTypes ? new Set(input.eventTypes) : undefined;
-        const kinds = input.kinds ? new Set(input.kinds) : undefined;
-        const roles = input.roles ? new Set(input.roles) : undefined;
-        const textContains = input.textContains?.toLowerCase();
-        const defaultMessageView = eventTypes === undefined && kinds === undefined;
-        const explicitlySelectsTools = input.eventTypes?.some((eventType) => piboAgentObservationKind(eventType) === "tool") === true
-            || input.kinds?.includes("tool") === true;
-        const includeTools = input.includeTools === true || (input.includeTools === undefined && explicitlySelectsTools);
-        const defaultEventTypes = includeTools
-            ? [...PIBO_AGENT_OBSERVATION_DEFAULT_EVENT_TYPES, ...PIBO_AGENT_OBSERVATION_DEFAULT_TOOL_EVENT_TYPES]
-            : [...PIBO_AGENT_OBSERVATION_DEFAULT_EVENT_TYPES];
-        const defaultEventTypeSet = new Set(defaultEventTypes);
-        const matches = this.agentObservations.filter((observation) => {
-            if (observation.managingParentId !== parentPiboSessionId)
-                return false;
-            if (requestIds && (!observation.requestId || !requestIds.has(observation.requestId)))
-                return false;
-            if (agentIds && !agentIds.has(observation.agentId))
-                return false;
-            if (names && !names.has(observation.name))
-                return false;
-            if (threadKeys && (!observation.threadKey || !threadKeys.has(observation.threadKey)))
-                return false;
-            if (observation.kind === "tool" && !includeTools)
-                return false;
-            if (defaultMessageView && !defaultEventTypeSet.has(observation.eventType))
-                return false;
-            if (eventTypes && !eventTypes.has(observation.eventType))
-                return false;
-            if (kinds && !kinds.has(observation.kind))
-                return false;
-            if (roles && (!observation.role || !roles.has(observation.role)))
-                return false;
-            if (afterSequence !== undefined && observation.sequence <= afterSequence)
-                return false;
-            const createdAt = Date.parse(observation.createdAt);
-            if (since !== undefined && createdAt < since)
-                return false;
-            if (until !== undefined && createdAt > until)
-                return false;
-            if (textContains && !(observation.text ?? "").toLowerCase().includes(textContains))
-                return false;
-            return true;
-        });
-        const cursorPolling = afterSequence !== undefined;
-        const ordered = cursorPolling
-            ? matches.slice(0, limit)
-            : [...matches].sort((left, right) => order === "asc" ? left.sequence - right.sequence : right.sequence - left.sequence).slice(0, limit);
-        if (cursorPolling && order === "desc")
-            ordered.reverse();
-        const selected = ordered.map((observation) => {
-            const { managingParentId: _managingParentId, details, ...visible } = observation;
-            const compact = visible.kind === "tool" && toolDetail === "summary"
-                ? { ...visible, text: piboAgentObservationToolSummary(visible.text, visible.isError, details) }
-                : visible;
-            return input.includeDetails === true && details !== undefined ? { ...compact, details } : compact;
-        });
-        const evictedThrough = this.agentObservationEvictedThroughByParent.get(parentPiboSessionId) ?? 0;
-        const retentionTruncated = afterSequence === undefined ? evictedThrough > 0 : afterSequence < evictedThrough;
-        const nextAfterSequence = selected.reduce((maximum, observation) => Math.max(maximum, observation.sequence), afterSequence === undefined ? 0 : Math.max(afterSequence, evictedThrough));
-        return {
-            filters: {
-                ...input,
-                ...(defaultMessageView ? { eventTypes: defaultEventTypes } : {}),
-                ...(afterSequence !== undefined ? { afterSequence } : {}),
-                order,
-                limit,
-                includeTools,
-                toolDetail,
-                includeDetails: input.includeDetails === true,
-            },
-            observations: selected,
-            nextAfterSequence,
-            truncated: retentionTruncated || matches.length > selected.length,
-        };
+        for (const agentId of input.agentIds ?? [])
+            this.requireManagedAgent(parentPiboSessionId, agentId);
+        const query = preparePiboAgentObservationQuery(input);
+        const ordered = query.scanOrder === "asc"
+            ? this.agentObservations
+            : [...this.agentObservations].reverse();
+        return selectPiboAgentObservationPage(ordered
+            .filter((observation) => observation.managingParentId === parentPiboSessionId)
+            .map(({ managingParentId: _managingParentId, ...observation }) => observation), query, { evictedThrough: this.agentObservationEvictedThroughByParent.get(parentPiboSessionId) ?? 0 });
     }
     async killManagedAgent(parentPiboSessionId, agentId) {
         const child = this.requireManagedAgent(parentPiboSessionId, agentId);
@@ -2346,13 +2305,13 @@ export class PiboSessionRouter {
         const parentChatRoomId = typeof parent.metadata?.chatRoomId === "string" ? parent.metadata.chatRoomId : undefined;
         if (parentChatRoomId)
             metadata.chatRoomId = parentChatRoomId;
-        const newSessionMetadata = {
+        const newSessionMetadata = withPiboSessionModelFallbacksMetadata({
             ...metadata,
             ...(subagent.thinkingLevel ? { initialThinkingLevel: subagent.thinkingLevel } : {}),
             ...(subagent.runtimeOptions && Object.keys(subagent.runtimeOptions).length > 0
                 ? { initialRuntimeOptions: structuredClone(subagent.runtimeOptions) }
                 : {}),
-        };
+        }, subagent.modelFallbacks ?? []);
         const existing = this.sessionStore.find({
             channel: "pibo.subagents",
             kind: "subagent",
@@ -2435,17 +2394,23 @@ export class PiboSessionRouter {
         }
     }
     emitOutput = (event) => {
-        const session = this.sessionStore.get(event.piboSessionId);
-        this.recordAgentObservation(event, session);
-        this.telemetryRecorder?.recordOutput(event, { session, status: this.sessions.get(event.piboSessionId)?.getStatus() });
-        this.signalRegistry.project({ type: "pibo_output", event, session });
-        this.pluginRegistry.notifyEvent(event);
+        const positionedEvent = this.outputRenderSequencer.position(event);
+        const session = this.sessionStore.get(positionedEvent.piboSessionId);
+        this.recordAgentObservation(positionedEvent, session);
+        this.telemetryRecorder?.recordOutput(positionedEvent, { session, status: this.sessions.get(positionedEvent.piboSessionId)?.getStatus() });
+        this.signalRegistry.project({ type: "pibo_output", event: positionedEvent, session });
+        this.pluginRegistry.notifyEvent(positionedEvent);
         for (const listener of this.listeners) {
-            listener(event);
+            try {
+                listener(positionedEvent);
+            }
+            catch (error) {
+                console.error("[pibo] output listener failed", error);
+            }
         }
-        this.handleRunReminderOutput(event);
-        if (event.type === "message_finished" && event.source !== "service") {
-            this.scheduleRunReminder(event.piboSessionId, true);
+        this.handleRunReminderOutput(positionedEvent);
+        if (positionedEvent.type === "message_finished" && positionedEvent.source !== "service") {
+            this.scheduleRunReminder(positionedEvent.piboSessionId, true);
         }
     };
     handleRunReminderOutput(event) {
@@ -2575,7 +2540,10 @@ export class PiboSessionRouter {
         }
     }
     projectKnownSessionSignals() {
-        for (const session of this.sessionStore.list?.() ?? []) {
+        const sessions = this.sessionStore.list?.() ?? [];
+        const depthBySessionId = new Map(sessions.map((session) => [session.id, this.getSubagentDepth(session.id)]));
+        sessions.sort((left, right) => (depthBySessionId.get(left.id) ?? 0) - (depthBySessionId.get(right.id) ?? 0));
+        for (const session of sessions) {
             this.signalRegistry.project({ type: "session_created", session });
         }
     }

package/dist/data/ingest-service.js

@@ -1,5 +1,18 @@
 import { createHash, randomUUID } from "node:crypto";
 import { rootSessionId } from "./session-store.js";
+export class PiboOutputIdentityCollisionError extends Error {
+    idempotencyKey;
+    existingFingerprint;
+    incomingFingerprint;
+    code = "pibo_output_identity_collision";
+    constructor(idempotencyKey, existingFingerprint, incomingFingerprint) {
+        super(`Pibo output identity collision for "${idempotencyKey}"`);
+        this.idempotencyKey = idempotencyKey;
+        this.existingFingerprint = existingFingerprint;
+        this.incomingFingerprint = incomingFingerprint;
+        this.name = "PiboOutputIdentityCollisionError";
+    }
+}
 const INLINE_MESSAGE_PAYLOAD_THRESHOLD_BYTES = 16 * 1024;
 const INLINE_JSON_PAYLOAD_THRESHOLD_BYTES = 16 * 1024;
 export class ChatDataIngestService {
@@ -76,9 +89,39 @@ export class ChatDataIngestService {
     ingestOutputEvent(input) {
         const event = input.event;
         const idempotencyKey = outputIdempotencyKey(event);
+        const identityFingerprint = outputEventFingerprint(event);
         if (idempotencyKey) {
             const existing = this.store.eventLog.findByIdempotencyKey(idempotencyKey);
             if (existing) {
+                const existingFingerprint = typeof existing.attributes.identityFingerprint === "string"
+                    ? existing.attributes.identityFingerprint
+                    : undefined;
+                if (existingFingerprint && existingFingerprint !== identityFingerprint) {
+                    const now = input.createdAt ?? new Date().toISOString();
+                    this.store.eventLog.appendEvent({
+                        sessionId: input.session.id,
+                        sessionSequence: this.nextEventSequence(input.session.id),
+                        roomId: input.roomId,
+                        topic: "pibo.diagnostic",
+                        type: "pibo.output.identity_collision",
+                        source: "pibo-ingest",
+                        actorType: "system",
+                        actorId: input.actorId,
+                        eventId: eventIdForOutputEvent(event),
+                        idempotencyKey: `${idempotencyKey}:collision:${identityFingerprint}`,
+                        retentionClass: "audit_event",
+                        previewText: `Output identity collision for ${event.type}`,
+                        attributes: {
+                            outputIdempotencyKey: idempotencyKey,
+                            existingFingerprint,
+                            incomingFingerprint: identityFingerprint,
+                            incomingType: event.type,
+                        },
+                        createdAt: now,
+                        indexedAt: now,
+                    });
+                    throw new PiboOutputIdentityCollisionError(idempotencyKey, existingFingerprint, identityFingerprint);
+                }
                 return {
                     streamId: existing.streamId,
                     duplicate: true,
@@ -112,6 +155,9 @@ export class ChatDataIngestService {
                 payloadRef,
                 previewText: previewTextForOutputEvent(event),
                 attributes: compactObject({
+                    identityFingerprint,
+                    eventIdentityScoped: eventIdForOutputEvent(event) !== undefined,
+                    semanticEventId: eventIdForOutputEvent(event),
                     legacyStreamId: input.legacyStreamId,
                     inlinePayload: payloadRef ? undefined : toPiboJsonValue(payload?.value),
                     ...attributesForOutputEvent(event),
@@ -222,7 +268,24 @@ function deterministicId(prefix, value) {
     return `${prefix}_${createHash("sha256").update(value).digest("hex").slice(0, 32)}`;
 }
 function hashJson(value) {
-    return createHash("sha256").update(JSON.stringify(value) ?? "null").digest("hex").slice(0, 16);
+    return createHash("sha256").update(canonicalJson(value)).digest("hex").slice(0, 16);
+}
+function outputEventFingerprint(event) {
+    const identity = { ...event };
+    delete identity.renderSequence;
+    return createHash("sha256").update(canonicalJson(identity)).digest("hex");
+}
+function canonicalJson(value) {
+    if (value === null || typeof value !== "object")
+        return JSON.stringify(value) ?? "null";
+    if (Array.isArray(value))
+        return `[${value.map((item) => canonicalJson(item)).join(",")}]`;
+    const record = value;
+    const entries = Object.keys(record)
+        .sort()
+        .filter((key) => record[key] !== undefined)
+        .map((key) => `${JSON.stringify(key)}:${canonicalJson(record[key])}`);
+    return `{${entries.join(",")}}`;
 }
 function previewText(text) {
     const normalized = text.replace(/\s+/g, " ").trim();
@@ -231,23 +294,34 @@ function previewText(text) {
 function compactObject(value) {
     return Object.fromEntries(Object.entries(value).filter(([, item]) => item !== undefined));
 }
-function outputIdempotencyKey(event) {
+export function outputIdempotencyKey(event) {
     const base = eventIdForOutputEvent(event) ?? ("toolCallId" in event ? event.toolCallId : undefined);
-    if (!base)
-        return undefined;
-    return `pibo.output:${event.piboSessionId}:${event.type}:${base}:${outputPartKey(event)}`;
+    if (base)
+        return `pibo.output:${event.piboSessionId}:${event.type}:${base}:${outputPartKey(event)}`;
+    if (Number.isSafeInteger(event.renderSequence) && (event.renderSequence ?? 0) > 0) {
+        return `pibo.output:${event.piboSessionId}:${event.type}:render:${event.renderSequence}`;
+    }
+    return undefined;
+}
+export function outputPersistenceDeliveryKey(event) {
+    return outputIdempotencyKey(event)
+        ?? `pibo.output:${event.piboSessionId}:${event.type}:render:${event.renderSequence ?? "unpositioned"}`;
 }
 function outputPartKey(event) {
     if (event.type === "tool_call")
-        return `${event.toolCallId}:${event.argsComplete ? "complete" : "partial"}:${hashJson(event.args)}`;
+        return `${event.toolCallId}:${event.toolInvocationOrdinal ?? 0}:${event.argsComplete ? "complete" : "partial"}:${hashJson(event.args)}`;
     if ("toolCallId" in event)
-        return event.toolCallId ?? "main";
+        return `${event.toolCallId ?? "main"}:${event.toolInvocationOrdinal ?? 0}`;
     if (event.type === "assistant_message")
         return String(event.assistantIndex ?? event.contentIndex ?? 0);
     if (event.type === "assistant_delta")
         return String(event.assistantIndex ?? event.contentIndex ?? 0);
+    if (event.type === "assistant_usage")
+        return String(event.usageIndex ?? hashJson({ inputTokens: event.inputTokens, outputTokens: event.outputTokens, cacheReadTokens: event.cacheReadTokens, cacheWriteTokens: event.cacheWriteTokens, reasoningTokens: event.reasoningTokens, totalTokens: event.totalTokens, costUsd: event.costUsd }));
     if (event.type === "thinking_started" || event.type === "thinking_delta" || event.type === "thinking_finished")
         return String(event.thinkingIndex ?? event.contentIndex ?? 0);
+    if (event.type === "compaction_start" || event.type === "compaction_end")
+        return String(event.compactionIndex ?? 0);
     if (event.type === "execution_result")
         return event.action;
     return "main";
@@ -318,6 +392,9 @@ function previewTextForOutputEvent(event) {
     return event.type;
 }
 function attributesForOutputEvent(event) {
+    return { renderSequence: event.renderSequence, toolInvocationOrdinal: event.toolInvocationOrdinal, ...specificAttributesForOutputEvent(event) };
+}
+function specificAttributesForOutputEvent(event) {
     if (event.type === "message_queued")
         return { inlineText: event.text, source: event.source, queuedMessages: event.queuedMessages };
     if (event.type === "message_steered")
@@ -330,11 +407,14 @@ function attributesForOutputEvent(event) {
         return { assistantIndex: event.assistantIndex, contentIndex: event.contentIndex };
     if (event.type === "assistant_usage")
         return {
+            usageIndex: event.usageIndex,
             inputTokens: event.inputTokens,
             outputTokens: event.outputTokens,
             cacheReadTokens: event.cacheReadTokens,
             cacheWriteTokens: event.cacheWriteTokens,
+            reasoningTokens: event.reasoningTokens,
             totalTokens: event.totalTokens,
+            costUsd: event.costUsd,
         };
     if (event.type === "thinking_started" || event.type === "thinking_delta" || event.type === "thinking_finished")
         return { thinkingIndex: event.thinkingIndex, contentIndex: event.contentIndex };
@@ -349,7 +429,7 @@ function attributesForOutputEvent(event) {
     if (event.type === "session_error")
         return { error: event.error, ...(event.errorDetails ? { errorDetails: event.errorDetails } : {}) };
     if (event.type === "compaction_start" || event.type === "compaction_end")
-        return { reason: event.reason, aborted: "aborted" in event ? event.aborted : undefined, errorMessage: "errorMessage" in event ? event.errorMessage : undefined };
+        return { compactionIndex: event.compactionIndex, reason: event.reason, aborted: "aborted" in event ? event.aborted : undefined, errorMessage: "errorMessage" in event ? event.errorMessage : undefined };
     return {};
 }
 function observationKindForOutputEvent(event) {
@@ -398,7 +478,9 @@ function outputSessionStatus(event) {
         return "error";
     if (event.type === "message_finished")
         return "idle";
-    return "running";
+    if (event.type === "message_queued" || event.type === "message_steered" || event.type === "message_started")
+        return "running";
+    return undefined;
 }
 function toPiboJsonValue(value) {
     if (value === undefined)

package/dist/data/navigation-store.js

@@ -14,19 +14,19 @@ export class NavigationStore {
             "origin_id = excluded.origin_id",
             "title = excluded.title",
             "profile = excluded.profile",
-            "status = excluded.status",
+            ...(input.status === undefined ? [] : ["status = excluded.status"]),
             "archived_at = excluded.archived_at",
-            "last_activity_at = excluded.last_activity_at",
+            "last_activity_at = MAX(session_navigation.last_activity_at, excluded.last_activity_at)",
             "last_message_preview = COALESCE(excluded.last_message_preview, session_navigation.last_message_preview)",
             "child_count = excluded.child_count",
-            "sort_key = excluded.sort_key",
-            "updated_at = excluded.updated_at",
+            "sort_key = MAX(session_navigation.sort_key, excluded.sort_key)",
+            "updated_at = MAX(session_navigation.updated_at, excluded.updated_at)",
         ];
         this.db.prepare(`
 			INSERT INTO session_navigation (${insertColumns.join(", ")})
 			VALUES (${insertColumns.map(() => "?").join(", ")})
 			ON CONFLICT(session_id) DO UPDATE SET ${assignments.join(", ")}
-		`).run(input.roomId ?? null, input.sessionId, input.rootSessionId ?? null, input.parentId ?? null, input.originId ?? null, input.title, input.profile, input.status, input.archivedAt ?? null, input.lastActivityAt, input.lastMessagePreview ?? null, input.childCount ?? 0, input.sortKey, input.updatedAt);
+		`).run(input.roomId ?? null, input.sessionId, input.rootSessionId ?? null, input.parentId ?? null, input.originId ?? null, input.title, input.profile, input.status ?? "running", input.archivedAt ?? null, input.lastActivityAt, input.lastMessagePreview ?? null, input.childCount ?? 0, input.sortKey, input.updatedAt);
         const stored = this.getSession(input.sessionId);
         if (!stored)
             throw new Error(`Failed to upsert session navigation \"${input.sessionId}\"`);

package/dist/data/pibo-store.js

@@ -8,7 +8,7 @@ import { MessageStore } from "./message-store.js";
 import { NavigationStore } from "./navigation-store.js";
 import { ObservationStore } from "./observation-store.js";
 import { PayloadStore } from "./payload-store.js";
-import { applyPiboDataSchema } from "./schema.js";
+import { applyPiboDataSchema, assertSupportedPiboDataSchemaVersion } from "./schema.js";
 import { TelemetryStore } from "./telemetry.js";
 import { SessionStore } from "./session-store.js";
 export class PiboDataStore {
@@ -27,6 +27,13 @@ export class PiboDataStore {
         if (this.path !== ":memory:")
             mkdirSync(dirname(this.path), { recursive: true });
         this.db = new DatabaseSync(this.path);
+        try {
+            assertSupportedPiboDataSchemaVersion(this.db);
+        }
+        catch (error) {
+            this.db.close();
+            throw error;
+        }
         if (insidePiboHome)
             protectPrivateFileSync(this.path);
         this.db.exec("PRAGMA busy_timeout = 5000");