@pasko70/pibo 3.0.0 → 3.0.2

package/dist/core/session-router.js

@@ -4,6 +4,7 @@ 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 { 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 { PiboRunRegistry } from "../runs/registry.js";
@@ -20,7 +21,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 +94,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,
@@ -329,6 +331,7 @@ export class PiboSessionRouter {
     sessions = new Map();
     pendingSessions = new Map();
     listeners = new Set();
+    outputRenderSequencer;
     runRegistry;
     gatewayWorkAdmission = new GatewayWorkAdmissionController();
     signalRegistry;
@@ -374,6 +377,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
@@ -700,6 +706,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();
@@ -1123,6 +1130,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 +1237,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 +1384,7 @@ export class PiboSessionRouter {
                         ],
                         modelDefaults,
                         initialFastMode,
+                        providerFallbacksEnabled: modelFallbacks.length > 0,
                     },
                 },
             });
@@ -1472,6 +1484,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 +1625,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();
@@ -2052,6 +2079,10 @@ export class PiboSessionRouter {
             throw new Error("Agent observation since must not be after until.");
         }
         const requestIds = input.requestIds ? new Set(input.requestIds) : undefined;
+        if (input.toolCallIds && input.toolCallIds.length > 50) {
+            throw new Error("Agent observation toolCallIds must contain at most 50 entries.");
+        }
+        const toolCallIds = input.toolCallIds ? new Set(input.toolCallIds) : undefined;
         const agentIds = input.agentIds ? new Set(input.agentIds) : undefined;
         if (agentIds) {
             for (const agentId of agentIds)
@@ -2065,7 +2096,8 @@ export class PiboSessionRouter {
         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;
+            || input.kinds?.includes("tool") === true
+            || toolCallIds !== undefined;
         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]
@@ -2076,6 +2108,8 @@ export class PiboSessionRouter {
                 return false;
             if (requestIds && (!observation.requestId || !requestIds.has(observation.requestId)))
                 return false;
+            if (toolCallIds && (!observation.toolCallId || !toolCallIds.has(observation.toolCallId)))
+                return false;
             if (agentIds && !agentIds.has(observation.agentId))
                 return false;
             if (names && !names.has(observation.name))
@@ -2346,13 +2380,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 +2469,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) {
@@ -2467,6 +2507,10 @@ export class PiboSessionRouter {
             if (!delivery)
                 return;
             this.runReminderDeliveries.delete(eventId);
+            if (event.errorDetails?.code === "loop_continuation_invalidated") {
+                this.suppressRunReminderDelivery(delivery);
+                return;
+            }
             if (!isRunReminderContextPressureError(event)
                 || this.closing
                 || this.quiescingSessions.has(delivery.piboSessionId)
@@ -2475,13 +2519,7 @@ export class PiboSessionRouter {
                 return;
             }
             if (this.hasRunReminderRecovery(delivery)) {
-                const released = this.runRegistry.releaseNotification(delivery.piboSessionId, delivery.notification);
-                for (const run of released)
-                    this.runRegistry.suppressNotification(delivery.piboSessionId, run.runId);
-                this.clearRunReminderRecovery(delivery);
-                this.deferredRunReminders.delete(delivery.piboSessionId);
-                this.sessions.get(delivery.piboSessionId)?.removeQueuedMessages(isRunReminderServiceMessage);
-                this.scheduleRunReminder(delivery.piboSessionId, false, delivery.generation);
+                this.suppressRunReminderDelivery(delivery);
                 return;
             }
             this.runRegistry.releaseNotification(delivery.piboSessionId, delivery.notification);
@@ -2507,6 +2545,15 @@ export class PiboSessionRouter {
             return;
         this.scheduleRunReminder(event.piboSessionId, true, generation);
     }
+    suppressRunReminderDelivery(delivery) {
+        const released = this.runRegistry.releaseNotification(delivery.piboSessionId, delivery.notification);
+        for (const run of released)
+            this.runRegistry.suppressNotification(delivery.piboSessionId, run.runId);
+        this.clearRunReminderRecovery(delivery);
+        this.deferredRunReminders.delete(delivery.piboSessionId);
+        this.sessions.get(delivery.piboSessionId)?.removeQueuedMessages(isRunReminderServiceMessage);
+        this.scheduleRunReminder(delivery.piboSessionId, false, delivery.generation);
+    }
     hasRunReminderRecovery(delivery) {
         const recovery = this.runReminderRecoveries.get(delivery.piboSessionId);
         return recovery?.generation === delivery.generation

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/schema.js

@@ -1,5 +1,31 @@
-export const PIBO_DATA_SCHEMA_VERSION = 6;
-export function applyPiboDataSchema(db) {
+export const PIBO_DATA_SCHEMA_VERSION = 7;
+export const PIBO_DATA_SCHEMA_MIGRATION_STEPS = [
+    "schema",
+    "runtime-bindings",
+    "render-high-water",
+    "sequence-repair-selection",
+    "sequence-repair-temporary",
+    "sequence-repair-backfill",
+    "sequence-repair-cleanup",
+    "runtime-binding-metadata",
+    "user-version",
+];
+export function applyPiboDataSchema(db, hooks = {}) {
+    const ownsTransaction = !db.isTransaction;
+    if (ownsTransaction)
+        db.exec("BEGIN IMMEDIATE");
+    try {
+        applyPiboDataSchemaInTransaction(db, hooks);
+        if (ownsTransaction)
+            db.exec("COMMIT");
+    }
+    catch (error) {
+        if (ownsTransaction && db.isTransaction)
+            db.exec("ROLLBACK");
+        throw error;
+    }
+}
+function applyPiboDataSchemaInTransaction(db, hooks) {
     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
@@ -46,6 +72,42 @@ export function applyPiboDataSchema(db) {
 			FOREIGN KEY (pibo_session_id) REFERENCES sessions(id) ON DELETE CASCADE
 		);
 
+		CREATE TABLE IF NOT EXISTS session_output_render_high_water (
+			pibo_session_id TEXT PRIMARY KEY,
+			high_water INTEGER NOT NULL CHECK(high_water >= 0),
+			updated_at TEXT NOT NULL,
+			FOREIGN KEY (pibo_session_id) REFERENCES sessions(id) ON DELETE CASCADE
+		);
+
+		CREATE TABLE IF NOT EXISTS session_tool_invocation_counters (
+			pibo_session_id TEXT NOT NULL,
+			event_id TEXT NOT NULL,
+			tool_call_id TEXT NOT NULL,
+			next_ordinal INTEGER NOT NULL CHECK(next_ordinal >= 0),
+			updated_at TEXT NOT NULL,
+			PRIMARY KEY (pibo_session_id, event_id, tool_call_id),
+			FOREIGN KEY (pibo_session_id) REFERENCES sessions(id) ON DELETE CASCADE
+		);
+
+		CREATE TABLE IF NOT EXISTS session_tool_invocations (
+			pibo_session_id TEXT NOT NULL,
+			event_id TEXT NOT NULL,
+			tool_call_id TEXT NOT NULL,
+			invocation_ordinal INTEGER NOT NULL CHECK(invocation_ordinal >= 0),
+			call_fingerprint TEXT,
+			status TEXT NOT NULL CHECK(status IN ('open', 'closed')),
+			seen_call INTEGER NOT NULL DEFAULT 0 CHECK(seen_call IN (0, 1)),
+			seen_started INTEGER NOT NULL DEFAULT 0 CHECK(seen_started IN (0, 1)),
+			seen_updated INTEGER NOT NULL DEFAULT 0 CHECK(seen_updated IN (0, 1)),
+			seen_finished INTEGER NOT NULL DEFAULT 0 CHECK(seen_finished IN (0, 1)),
+			created_at TEXT NOT NULL,
+			updated_at TEXT NOT NULL,
+			PRIMARY KEY (pibo_session_id, event_id, tool_call_id, invocation_ordinal),
+			FOREIGN KEY (pibo_session_id) REFERENCES sessions(id) ON DELETE CASCADE
+		);
+		CREATE INDEX IF NOT EXISTS idx_session_tool_invocations_open
+			ON session_tool_invocations(pibo_session_id, event_id, tool_call_id, status, invocation_ordinal DESC);
+
 		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;
@@ -516,6 +578,7 @@ export function applyPiboDataSchema(db) {
 		CREATE INDEX IF NOT EXISTS idx_telemetry_tool_calls_retention_updated
 			ON telemetry_tool_calls(retention_class, updated_at);
 	`);
+    hooks.afterStep?.("schema");
     db.exec(`
 		INSERT OR IGNORE INTO session_runtime_bindings (
 			pibo_session_id, runtime_instance_id, runtime_adapter_id, native_session_id,
@@ -536,6 +599,61 @@ export function applyPiboDataSchema(db) {
 			WHERE existing.pibo_session_id = sessions.id
 		);
 	`);
+    hooks.afterStep?.("runtime-bindings");
+    db.exec(`
+		INSERT INTO session_output_render_high_water (pibo_session_id, high_water, updated_at)
+		SELECT
+			id,
+			CAST(json_extract(metadata_json, '$.outputRenderSequenceHighWater') AS INTEGER),
+			updated_at
+		FROM sessions
+		WHERE json_type(metadata_json, '$.outputRenderSequenceHighWater') IN ('integer', 'real')
+			AND CAST(json_extract(metadata_json, '$.outputRenderSequenceHighWater') AS INTEGER) >= 0
+		ON CONFLICT(pibo_session_id) DO UPDATE SET
+			high_water = MAX(session_output_render_high_water.high_water, excluded.high_water),
+			updated_at = CASE
+				WHEN excluded.high_water > session_output_render_high_water.high_water THEN excluded.updated_at
+				ELSE session_output_render_high_water.updated_at
+			END;
+	`);
+    hooks.afterStep?.("render-high-water");
+    // Always inspect for interrupted pre-atomic v7 repairs. A previous process
+    // may have written negative temporary values before setting user_version.
+    db.exec(`
+		DROP TABLE IF EXISTS temp.pibo_v7_sequence_repair_sessions;
+		CREATE TEMP TABLE pibo_v7_sequence_repair_sessions (
+			session_id TEXT PRIMARY KEY
+		);
+		INSERT INTO pibo_v7_sequence_repair_sessions (session_id)
+		SELECT DISTINCT session_id
+		FROM event_log
+		WHERE session_id IS NOT NULL
+			AND (session_sequence IS NULL OR session_sequence <= 0);
+	`);
+    hooks.afterStep?.("sequence-repair-selection");
+    db.exec(`
+		UPDATE event_log
+		SET session_sequence = -stream_id
+		WHERE session_id IN (SELECT session_id FROM pibo_v7_sequence_repair_sessions);
+	`);
+    hooks.afterStep?.("sequence-repair-temporary");
+    db.exec(`
+		WITH ranked AS (
+			SELECT
+				stream_id,
+				ROW_NUMBER() OVER (PARTITION BY session_id ORDER BY stream_id ASC) AS repaired_sequence
+			FROM event_log
+			WHERE session_id IN (SELECT session_id FROM pibo_v7_sequence_repair_sessions)
+		)
+		UPDATE event_log
+		SET session_sequence = (
+			SELECT repaired_sequence FROM ranked WHERE ranked.stream_id = event_log.stream_id
+		)
+		WHERE stream_id IN (SELECT stream_id FROM ranked);
+	`);
+    hooks.afterStep?.("sequence-repair-backfill");
+    db.exec("DROP TABLE pibo_v7_sequence_repair_sessions");
+    hooks.afterStep?.("sequence-repair-cleanup");
     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 = ?");
@@ -558,5 +676,7 @@ export function applyPiboDataSchema(db) {
             }), row.pibo_session_id);
         }
     }
+    hooks.afterStep?.("runtime-binding-metadata");
     db.exec(`PRAGMA user_version = ${PIBO_DATA_SCHEMA_VERSION}`);
+    hooks.afterStep?.("user-version");
 }

package/dist/data/session-store.js

@@ -43,10 +43,10 @@ export class SessionStore {
             "workspace = excluded.workspace",
             "title = excluded.title",
             "first_message_preview = COALESCE(sessions.first_message_preview, excluded.first_message_preview)",
-            "status = excluded.status",
+            ...(input.status === undefined ? [] : ["status = excluded.status"]),
             "metadata_json = excluded.metadata_json",
-            "updated_at = excluded.updated_at",
-            "last_activity_at = excluded.last_activity_at",
+            "updated_at = MAX(sessions.updated_at, excluded.updated_at)",
+            "last_activity_at = MAX(sessions.last_activity_at, excluded.last_activity_at)",
         ];
         this.db.prepare(`
 			INSERT INTO sessions (${baseColumns.join(", ")})