@pasko70/pibo 3.0.1 → 3.0.2

package/dist/agent-runtimes/pi/runtime.js

@@ -332,6 +332,10 @@ export async function createPiboRuntime(options = {}) {
         }
         const resourceLoader = services.resourceLoader;
         const diagnostics = [
+            ...profile.diagnostics.map((diagnostic) => ({
+                type: diagnostic.severity,
+                message: `[${diagnostic.code}] ${diagnostic.message}`,
+            })),
             ...piPackageOptions.diagnostics,
             ...services.diagnostics,
             ...collectResourceDiagnostics(resourceLoader.getSkills().diagnostics),
@@ -416,6 +420,7 @@ export async function inspectPiboProfile(options = {}) {
         mcpServers: profile.mcpServers,
         piPackages: profile.piPackages,
         contextFiles: profile.contextFiles,
+        diagnostics: profile.diagnostics,
         builtinTools: profile.builtinTools,
         builtinToolNames: profile.builtinToolNames,
         autoContextFiles: profile.autoContextFiles,
@@ -456,6 +461,7 @@ export async function inspectPiboProfile(options = {}) {
             runtimeOptions: structuredClone(profile.runtimeOptions),
             ...(profile.model ? { model: { ...profile.model } } : {}),
             ...(profile.mainModel ? { mainModel: { ...profile.mainModel } } : {}),
+            mainModelFallbacks: profile.mainModelFallbacks.map((model) => ({ ...model })),
             ...(profile.subagentModel ? { subagentModel: { ...profile.subagentModel } } : {}),
             ...(profile.thinkingLevel ? { thinkingLevel: profile.thinkingLevel } : {}),
             ...(profile.mainThinkingLevel ? { mainThinkingLevel: profile.mainThinkingLevel } : {}),

package/dist/apps/chat/agent-profiles.js

@@ -14,6 +14,14 @@ export function createCustomAgentProfileDefinition(agent, options = {}) {
                 catch (error) {
                     if (!isUnknownSkillError(error, skillName))
                         throw error;
+                    const message = `Unknown skill "${skillName}" referenced by custom agent "${agent.profileName}"`;
+                    builder.addDiagnostic({
+                        severity: "warning",
+                        code: "custom_agent_unknown_skill",
+                        message,
+                        resourceKind: "skill",
+                        resourceName: skillName,
+                    });
                     if (shouldWarnMissingReferences)
                         console.warn(`Skipping unknown skill "${skillName}" for custom agent "${agent.profileName}"`);
                 }
@@ -25,12 +33,29 @@ export function createCustomAgentProfileDefinition(agent, options = {}) {
                 catch (error) {
                     if (!isUnknownContextFileError(error, contextFileKey))
                         throw error;
+                    const message = `Unknown context file "${contextFileKey}" referenced by custom agent "${agent.profileName}"`;
+                    builder.addDiagnostic({
+                        severity: "warning",
+                        code: "custom_agent_unknown_context_file",
+                        message,
+                        resourceKind: "context-file",
+                        resourceName: contextFileKey,
+                    });
                     if (shouldWarnMissingReferences)
                         console.warn(`Skipping unknown context file "${contextFileKey}" for custom agent "${agent.profileName}"`);
                 }
             }
-            for (const toolName of agent.nativeTools)
-                builder.addTool(context.getTool(toolName));
+            for (const toolName of agent.nativeTools) {
+                try {
+                    builder.addTool(context.getTool(toolName));
+                }
+                catch (error) {
+                    if (!isUnknownToolError(error, toolName))
+                        throw error;
+                    if (shouldWarnMissingReferences)
+                        console.warn(`Skipping unknown tool "${toolName}" for custom agent "${agent.profileName}"`);
+                }
+            }
             for (const subagent of agent.subagents)
                 builder.addSubagent(subagent);
             return builder.createSession();
@@ -61,6 +86,7 @@ function createCustomAgentBuilder(agent) {
         .withToolPackages({ runControl: agent.runControl, goalControl: agent.goalControl ?? true });
     if (agent.mainModel)
         builder.withMainModel(agent.mainModel);
+    builder.withMainModelFallbacks(agent.mainModelFallbacks ?? []);
     if (agent.subagentModel)
         builder.withSubagentModel(agent.subagentModel);
     if (agent.thinkingLevel)
@@ -80,6 +106,9 @@ function createCustomAgentBuilder(agent) {
 function uniqueAliases(aliases, profileName) {
     return [...new Set(aliases.filter((alias) => alias && alias !== profileName))];
 }
+function isUnknownToolError(error, toolName) {
+    return error instanceof Error && error.message === `Unknown tool "${toolName}"`;
+}
 function isUnknownContextFileError(error, contextFileKey) {
     return error instanceof Error && error.message === `Unknown context file "${contextFileKey}"`;
 }

package/dist/apps/chat/agent-store.js

@@ -27,6 +27,7 @@ export function previewCustomAgentCreate(input, options = {}) {
         mcpServers: uniqueStrings(input.mcpServers ?? []),
         piPackages: sanitizePiPackages(input.piPackages ?? []),
         mainModel: sanitizeModelProfile(input.mainModel),
+        mainModelFallbacks: sanitizeModelFallbacks(input.mainModelFallbacks ?? [], input.mainModel),
         subagentModel: sanitizeModelProfile(input.subagentModel),
         thinkingLevel: sanitizeThinkingLevel(input.thinkingLevel),
         mainThinkingLevel: sanitizeThinkingLevel(input.mainThinkingLevel),
@@ -61,6 +62,7 @@ export function previewCustomAgentUpdate(existing, input, options = {}) {
         mcpServers: input.mcpServers ? uniqueStrings(input.mcpServers) : existing.mcpServers,
         piPackages: input.piPackages ? sanitizePiPackages(input.piPackages) : existing.piPackages,
         mainModel: input.mainModel === undefined ? existing.mainModel : sanitizeModelProfile(input.mainModel),
+        mainModelFallbacks: sanitizeModelFallbacks(input.mainModelFallbacks ?? existing.mainModelFallbacks, input.mainModel === undefined ? existing.mainModel : input.mainModel),
         subagentModel: input.subagentModel === undefined ? existing.subagentModel : sanitizeModelProfile(input.subagentModel),
         thinkingLevel: input.thinkingLevel === undefined ? existing.thinkingLevel : sanitizeThinkingLevel(input.thinkingLevel),
         mainThinkingLevel: input.mainThinkingLevel === undefined ? existing.mainThinkingLevel : sanitizeThinkingLevel(input.mainThinkingLevel),
@@ -113,6 +115,7 @@ export class CustomAgentStore {
 				mcp_servers_json TEXT NOT NULL DEFAULT '[]',
 				pi_packages_json TEXT NOT NULL DEFAULT '[]',
 				main_model_json TEXT,
+				main_model_fallbacks_json TEXT NOT NULL DEFAULT '[]',
 				subagent_model_json TEXT,
 				thinking_level TEXT,
 				main_thinking_level TEXT,
@@ -140,6 +143,7 @@ export class CustomAgentStore {
         this.migrateRuntimeColumns();
         this.migratePiPackagesColumn();
         this.migrateModelColumns();
+        this.migrateModelFallbackColumns();
         this.migrateThinkingLevelColumn();
         this.migrateThinkingOptionColumns();
         this.migrateBuiltinToolNamesColumn();
@@ -230,6 +234,7 @@ export class CustomAgentStore {
 					mcp_servers_json = ?,
 					pi_packages_json = ?,
 					main_model_json = ?,
+					main_model_fallbacks_json = ?,
 					subagent_model_json = ?,
 					thinking_level = ?,
 					main_thinking_level = ?,
@@ -245,7 +250,7 @@ export class CustomAgentStore {
 					updated_at = ?
 				WHERE id = ?
 			`)
-            .run(updated.profileName, updated.displayName, updated.description ?? null, updated.folderId ?? null, updated.runtimeInstanceId, JSON.stringify(updated.runtimeOptions), serializeBoolean(updated.nativeSubagents), JSON.stringify(updated.nativeTools), JSON.stringify(updated.skills), JSON.stringify(updated.contextFiles), JSON.stringify(sanitizeSubagents(updated.subagents)), JSON.stringify(updated.mcpServers), JSON.stringify(updated.piPackages), updated.mainModel ? JSON.stringify(updated.mainModel) : null, updated.subagentModel ? JSON.stringify(updated.subagentModel) : null, updated.thinkingLevel ?? null, updated.mainThinkingLevel ?? null, updated.subagentThinkingLevel ?? null, serializeBoolean(updated.fast), serializeBoolean(updated.mainFast), serializeBoolean(updated.subagentFast), updated.builtinTools, JSON.stringify(updated.builtinToolNames), updated.autoContextFiles ? 1 : 0, updated.runControl ? 1 : 0, updated.goalControl ? 1 : 0, updated.updatedAt, id);
+            .run(updated.profileName, updated.displayName, updated.description ?? null, updated.folderId ?? null, updated.runtimeInstanceId, JSON.stringify(updated.runtimeOptions), serializeBoolean(updated.nativeSubagents), JSON.stringify(updated.nativeTools), JSON.stringify(updated.skills), JSON.stringify(updated.contextFiles), JSON.stringify(sanitizeSubagents(updated.subagents)), JSON.stringify(updated.mcpServers), JSON.stringify(updated.piPackages), updated.mainModel ? JSON.stringify(updated.mainModel) : null, JSON.stringify(updated.mainModelFallbacks), updated.subagentModel ? JSON.stringify(updated.subagentModel) : null, updated.thinkingLevel ?? null, updated.mainThinkingLevel ?? null, updated.subagentThinkingLevel ?? null, serializeBoolean(updated.fast), serializeBoolean(updated.mainFast), serializeBoolean(updated.subagentFast), updated.builtinTools, JSON.stringify(updated.builtinToolNames), updated.autoContextFiles ? 1 : 0, updated.runControl ? 1 : 0, updated.goalControl ? 1 : 0, updated.updatedAt, id);
         return this.get(id);
     }
     setArchived(id, archived) {
@@ -286,6 +291,7 @@ export class CustomAgentStore {
 					mcp_servers_json,
 					pi_packages_json,
 					main_model_json,
+					main_model_fallbacks_json,
 					subagent_model_json,
 					thinking_level,
 					main_thinking_level,
@@ -301,9 +307,9 @@ export class CustomAgentStore {
 					created_at,
 					updated_at,
 					archived_at
-				) VALUES (${Array.from({ length: 30 }, () => "?").join(", ")})
+				) VALUES (${Array.from({ length: 31 }, () => "?").join(", ")})
 			`)
-            .run(agent.id, agent.profileName, agent.displayName, agent.description ?? null, agent.folderId ?? null, agent.runtimeInstanceId, JSON.stringify(agent.runtimeOptions), serializeBoolean(agent.nativeSubagents), JSON.stringify(agent.nativeTools), JSON.stringify(agent.skills), JSON.stringify(agent.contextFiles), JSON.stringify(sanitizeSubagents(agent.subagents)), JSON.stringify(agent.mcpServers), JSON.stringify(agent.piPackages), agent.mainModel ? JSON.stringify(agent.mainModel) : null, agent.subagentModel ? JSON.stringify(agent.subagentModel) : null, agent.thinkingLevel ?? null, agent.mainThinkingLevel ?? null, agent.subagentThinkingLevel ?? null, serializeBoolean(agent.fast), serializeBoolean(agent.mainFast), serializeBoolean(agent.subagentFast), agent.builtinTools, JSON.stringify(agent.builtinToolNames), agent.autoContextFiles ? 1 : 0, agent.runControl ? 1 : 0, agent.goalControl ? 1 : 0, agent.createdAt, agent.updatedAt, agent.archivedAt ?? null);
+            .run(agent.id, agent.profileName, agent.displayName, agent.description ?? null, agent.folderId ?? null, agent.runtimeInstanceId, JSON.stringify(agent.runtimeOptions), serializeBoolean(agent.nativeSubagents), JSON.stringify(agent.nativeTools), JSON.stringify(agent.skills), JSON.stringify(agent.contextFiles), JSON.stringify(sanitizeSubagents(agent.subagents)), JSON.stringify(agent.mcpServers), JSON.stringify(agent.piPackages), agent.mainModel ? JSON.stringify(agent.mainModel) : null, JSON.stringify(agent.mainModelFallbacks), agent.subagentModel ? JSON.stringify(agent.subagentModel) : null, agent.thinkingLevel ?? null, agent.mainThinkingLevel ?? null, agent.subagentThinkingLevel ?? null, serializeBoolean(agent.fast), serializeBoolean(agent.mainFast), serializeBoolean(agent.subagentFast), agent.builtinTools, JSON.stringify(agent.builtinToolNames), agent.autoContextFiles ? 1 : 0, agent.runControl ? 1 : 0, agent.goalControl ? 1 : 0, agent.createdAt, agent.updatedAt, agent.archivedAt ?? null);
     }
     requireFolderExists(folderId) {
         if (folderId === undefined || folderId === null)
@@ -458,6 +464,12 @@ export class CustomAgentStore {
             this.db.prepare("ALTER TABLE chat_agents ADD COLUMN subagent_model_json TEXT").run();
         }
     }
+    migrateModelFallbackColumns() {
+        const columns = new Set(this.db.prepare("PRAGMA table_info(chat_agents)").all().map((column) => column.name));
+        if (!columns.has("main_model_fallbacks_json")) {
+            this.db.prepare("ALTER TABLE chat_agents ADD COLUMN main_model_fallbacks_json TEXT NOT NULL DEFAULT '[]'").run();
+        }
+    }
     migrateThinkingLevelColumn() {
         const columns = new Set(this.db.prepare("PRAGMA table_info(chat_agents)").all().map((column) => column.name));
         if (!columns.has("thinking_level")) {
@@ -649,6 +661,7 @@ function agentFromRow(row, profileAliases) {
         mcpServers: parseStringArray(row.mcp_servers_json),
         piPackages: parseStringArray(row.pi_packages_json),
         mainModel: parseModelProfile(row.main_model_json),
+        mainModelFallbacks: parseModelFallbacks(row.main_model_fallbacks_json, row.main_model_json),
         subagentModel: parseModelProfile(row.subagent_model_json),
         thinkingLevel: sanitizeThinkingLevel(row.thinking_level),
         mainThinkingLevel: sanitizeThinkingLevel(row.main_thinking_level),
@@ -774,6 +787,30 @@ function sanitizeModelProfile(value) {
         return undefined;
     return { provider, id };
 }
+function parseModelFallbacks(value, primaryValue) {
+    try {
+        return sanitizeModelFallbacks(JSON.parse(value), parseModelProfile(primaryValue));
+    }
+    catch {
+        return [];
+    }
+}
+function sanitizeModelFallbacks(value, primary) {
+    if (!Array.isArray(value))
+        return [];
+    const primaryModel = sanitizeModelProfile(primary);
+    const seen = new Set(primaryModel ? [`${primaryModel.provider}\u0000${primaryModel.id}`] : []);
+    return value.flatMap((item) => {
+        const model = sanitizeModelProfile(item);
+        if (!model)
+            return [];
+        const key = `${model.provider}\u0000${model.id}`;
+        if (seen.has(key))
+            return [];
+        seen.add(key);
+        return [model];
+    });
+}
 function sanitizeSubagents(value) {
     return value.flatMap((item) => {
         if (!item || typeof item !== "object" || Array.isArray(item))
@@ -790,6 +827,9 @@ function sanitizeSubagents(value) {
         const model = sanitizeModelProfile(candidate.model);
         if (model)
             subagent.model = model;
+        const modelFallbacks = sanitizeModelFallbacks(candidate.modelFallbacks, model);
+        if (modelFallbacks.length > 0)
+            subagent.modelFallbacks = modelFallbacks;
         const thinkingLevel = sanitizeThinkingLevel(candidate.thinkingLevel);
         if (thinkingLevel)
             subagent.thinkingLevel = thinkingLevel;

package/dist/apps/chat/chat-request-normalizers.js

@@ -304,6 +304,23 @@ export function normalizeModelProfile(value, fieldName) {
     }
     return { provider, id };
 }
+export function normalizeModelFallbacks(value, fieldName, primary) {
+    if (value === undefined || value === null)
+        return [];
+    if (!Array.isArray(value))
+        throw new PiboWebHttpError(`${fieldName} must be an array`, 400);
+    const seen = new Set(primary ? [`${primary.provider}\u0000${primary.id}`] : []);
+    return value.flatMap((item, index) => {
+        const model = normalizeModelProfile(item, `${fieldName}[${index}]`);
+        if (!model)
+            throw new PiboWebHttpError(`${fieldName}[${index}] must define a provider and model`, 400);
+        const key = `${model.provider}\u0000${model.id}`;
+        if (seen.has(key))
+            return [];
+        seen.add(key);
+        return [model];
+    });
+}
 export function normalizeMcpServerDescriptionBody(value) {
     if (typeof value !== "string")
         throw new PiboWebHttpError("MCP server description must be a string", 400);
@@ -404,6 +421,9 @@ export function normalizeAgentSubagents(value) {
         const model = normalizeModelProfile(raw.model, "subagent model");
         if (model)
             subagent.model = model;
+        const modelFallbacks = normalizeModelFallbacks(raw.modelFallbacks, "subagent modelFallbacks", model);
+        if (modelFallbacks.length > 0)
+            subagent.modelFallbacks = modelFallbacks;
         const thinkingLevel = normalizeThinkingLevel(raw.thinkingLevel, "subagent thinkingLevel");
         if (thinkingLevel)
             subagent.thinkingLevel = thinkingLevel;
@@ -529,6 +549,13 @@ export function normalizeStreamingFixtureTraceSnapshots(value) {
         return value;
     throw new PiboWebHttpError("traceSnapshots must be a boolean", 400);
 }
+export function normalizeStreamingFixtureToolInterleaving(value) {
+    if (value === undefined)
+        return false;
+    if (typeof value === "boolean")
+        return value;
+    throw new PiboWebHttpError("toolInterleaving must be a boolean", 400);
+}
 export function normalizeStreamingFixtureSuppressLiveDeltas(value) {
     if (value === undefined)
         return false;
@@ -702,6 +729,7 @@ export function createAgentInput(body) {
         mcpServers: normalizeNameArray(body.mcpServers, "mcpServers"),
         piPackages: normalizeRegisteredPiPackages(body.piPackages),
         mainModel: normalizeModelProfile(body.mainModel, "mainModel"),
+        mainModelFallbacks: normalizeModelFallbacks(body.mainModelFallbacks, "mainModelFallbacks", normalizeModelProfile(body.mainModel, "mainModel")),
         subagentModel: normalizeModelProfile(body.subagentModel, "subagentModel"),
         thinkingLevel: normalizeThinkingLevel(body.thinkingLevel, "thinkingLevel"),
         mainThinkingLevel: normalizeThinkingLevel(body.mainThinkingLevel, "mainThinkingLevel"),
@@ -748,6 +776,9 @@ export function createAgentUpdate(body) {
     if (body.mainModel !== undefined) {
         update.mainModel = body.mainModel === null ? null : normalizeModelProfile(body.mainModel, "mainModel");
     }
+    if (body.mainModelFallbacks !== undefined) {
+        update.mainModelFallbacks = normalizeModelFallbacks(body.mainModelFallbacks, "mainModelFallbacks", update.mainModel ?? undefined);
+    }
     if (body.subagentModel !== undefined) {
         update.subagentModel = body.subagentModel === null ? null : normalizeModelProfile(body.subagentModel, "subagentModel");
     }

package/dist/apps/chat/data/chat-data-mappers.js

@@ -1,6 +1,7 @@
 import { normalizeSessionErrorDetails } from "../../../core/session-errors.js";
 import { roomWorkspaceFromMetadata } from "../types/rooms.js";
 import { tracePayloadRefForStoredPayload } from "../trace-v2.js";
+import { qualifiedToolNodeId } from "../../../shared/trace-tool-identity.js";
 const MAX_TRACE_EVENT_HYDRATION_BYTES = 1024 * 1024;
 export function storedPiboEventFromV2Row(row, payloadStore) {
     const attributes = parseJsonObject(row.attributes_json);
@@ -16,7 +17,8 @@ export function storedPiboEventFromV2Row(row, payloadStore) {
             ...payloadIdentity,
         })
         : undefined;
-    return { id: String(row.stream_id), piboSessionId: row.session_id ?? undefined, eventSequence: row.session_sequence ?? undefined, eventId: row.event_id ?? undefined, streamId: row.stream_id, storedPayloadRef, type: row.type, createdAt: row.created_at, payload };
+    const renderSequence = numberAttribute(attributes, "renderSequence") ?? payload.renderSequence;
+    return { id: String(row.stream_id), piboSessionId: row.session_id ?? undefined, eventSequence: row.session_sequence ?? undefined, renderSequence, eventId: row.event_id ?? undefined, streamId: row.stream_id, storedPayloadRef, type: row.type, createdAt: row.created_at, payload };
 }
 export function storedChatEventFromV2Row(row, payloadStore) {
     const attributes = parseJsonObject(row.attributes_json);
@@ -24,12 +26,22 @@ export function storedChatEventFromV2Row(row, payloadStore) {
 }
 function outputPayloadFromV2Row(row, attributes, persistedPayload) {
     const inlinePayload = attributes.inlinePayload ?? persistedPayload;
-    if (inlinePayload && typeof inlinePayload === "object" && !Array.isArray(inlinePayload) && typeof inlinePayload.type === "string")
-        return inlinePayload;
+    if (inlinePayload && typeof inlinePayload === "object" && !Array.isArray(inlinePayload) && typeof inlinePayload.type === "string") {
+        return compactObject({
+            ...inlinePayload,
+            renderSequence: numberAttribute(attributes, "renderSequence") ?? inlinePayload.renderSequence,
+        });
+    }
     const piboSessionId = row.session_id;
     if (!piboSessionId)
         return undefined;
-    const base = compactObject({ piboSessionId, eventId: row.event_id ?? undefined });
+    const eventIdentityScoped = typeof attributes.eventIdentityScoped === "boolean"
+        ? attributes.eventIdentityScoped
+        : undefined;
+    const eventId = eventIdentityScoped === false
+        ? undefined
+        : stringAttribute(attributes, "semanticEventId") ?? row.event_id ?? undefined;
+    const base = compactObject({ piboSessionId, eventId, renderSequence: numberAttribute(attributes, "renderSequence"), toolInvocationOrdinal: numberAttribute(attributes, "toolInvocationOrdinal") });
     if (row.type === "assistant_message" || row.type === "assistant_delta") {
         return compactObject({
             ...base,
@@ -44,9 +56,32 @@ function outputPayloadFromV2Row(row, attributes, persistedPayload) {
     if (row.type === "message_steered")
         return { ...base, type: "message_steered", text: stringAttribute(attributes, "inlineText") ?? row.preview_text ?? "", source: stringAttribute(attributes, "source") ?? "user", activeEventId: stringAttribute(attributes, "activeEventId") };
     if (row.type === "message_started")
-        return { ...base, type: "message_started", text: row.preview_text ?? "" };
+        return compactObject({
+            ...base,
+            type: "message_started",
+            text: stringAttribute(attributes, "inlineText") ?? row.preview_text ?? "",
+            source: stringAttribute(attributes, "source"),
+        });
     if (row.type === "message_finished")
-        return { ...base, type: "message_finished" };
+        return compactObject({
+            ...base,
+            type: "message_finished",
+            source: stringAttribute(attributes, "source"),
+        });
+    if (row.type === "assistant_usage") {
+        return compactObject({
+            ...base,
+            type: "assistant_usage",
+            usageIndex: numberAttribute(attributes, "usageIndex"),
+            inputTokens: numberAttribute(attributes, "inputTokens"),
+            outputTokens: numberAttribute(attributes, "outputTokens"),
+            cacheReadTokens: numberAttribute(attributes, "cacheReadTokens"),
+            cacheWriteTokens: numberAttribute(attributes, "cacheWriteTokens"),
+            reasoningTokens: numberAttribute(attributes, "reasoningTokens"),
+            totalTokens: numberAttribute(attributes, "totalTokens") ?? 0,
+            costUsd: numberAttribute(attributes, "costUsd"),
+        });
+    }
     if (row.type === "thinking_started" || row.type === "thinking_delta" || row.type === "thinking_finished") {
         return compactObject({
             ...base,
@@ -74,6 +109,10 @@ function outputPayloadFromV2Row(row, attributes, persistedPayload) {
     }
     if (row.type === "execution_result")
         return { ...base, type: "execution_result", action: row.preview_text ?? stringAttribute(attributes, "action") ?? "execution", result: inlinePayload ?? null };
+    if (row.type === "compaction_start")
+        return { ...base, type: "compaction_start", compactionIndex: numberAttribute(attributes, "compactionIndex"), reason: stringAttribute(attributes, "reason") ?? row.preview_text ?? "unknown" };
+    if (row.type === "compaction_end")
+        return { ...base, type: "compaction_end", compactionIndex: numberAttribute(attributes, "compactionIndex"), reason: stringAttribute(attributes, "reason") ?? row.preview_text ?? "unknown", result: inlinePayload, aborted: booleanAttribute(attributes, "aborted") ?? false, errorMessage: stringAttribute(attributes, "errorMessage") };
     if (row.type === "session_error") {
         const error = stringAttribute(attributes, "error") ?? row.preview_text ?? "Error";
         return { ...base, type: "session_error", error, errorDetails: normalizeSessionErrorDetails(error, isRecord(attributes.errorDetails) ? attributes.errorDetails : undefined) };
@@ -100,10 +139,15 @@ function tracePayloadIdentityForEvent(row, attributes) {
     const toolCallId = stringAttribute(attributes, "toolCallId");
     if (!toolCallId)
         return undefined;
+    const eventId = stringAttribute(attributes, "semanticEventId") ?? row.event_id;
+    if (!eventId)
+        return undefined;
+    const ordinal = numberAttribute(attributes, "toolInvocationOrdinal") ?? 0;
+    const nodeId = qualifiedToolNodeId(toolCallId, eventId, ordinal);
     if (row.type === "tool_call" || row.type === "tool_execution_started")
-        return { nodeId: `tool:${toolCallId}`, payloadKind: "input" };
+        return { nodeId, payloadKind: "input" };
     if (row.type === "tool_execution_updated" || row.type === "tool_execution_finished")
-        return { nodeId: `tool:${toolCallId}`, payloadKind: "output" };
+        return { nodeId, payloadKind: "output" };
     return undefined;
 }
 export function sessionFromRow(row) { return { piboSessionId: row.id, piSessionId: row.pi_session_id ?? "", runtimeInstanceId: row.runtime_instance_id ?? undefined, runtimeAdapterId: row.runtime_adapter_id ?? undefined, runtimeBindingState: isRuntimeBindingState(row.binding_state) ? row.binding_state : undefined, nativeSessionId: row.native_session_id ?? undefined, parentId: row.parent_id ?? undefined, profile: row.profile, channel: row.channel, kind: row.kind, createdAt: row.created_at, updatedAt: row.updated_at, lastActivityAt: row.last_activity_at, status: row.status === "running" || row.status === "error" ? row.status : "idle" }; }
@@ -124,9 +168,15 @@ export function compactObject(value) { return Object.fromEntries(Object.entries(
 export function previewForPayload(payload) { if (typeof payload === "object" && payload && "text" in payload && typeof payload.text === "string")
     return payload.text.slice(0, 512); if (typeof payload === "string")
     return payload.slice(0, 512); return undefined; }
-export function statusFromOutputEvent(event) { if (event.type === "session_error")
-    return "error"; if (event.type === "message_finished")
-    return "idle"; return "running"; }
+export function statusFromOutputEvent(event) {
+    if (event.type === "session_error")
+        return "error";
+    if (event.type === "message_finished")
+        return "idle";
+    if (event.type === "message_queued" || event.type === "message_steered" || event.type === "message_started")
+        return "running";
+    return undefined;
+}
 function isRuntimeBindingState(value) { return value === "unbound" || value === "bound" || value === "missing" || value === "error"; }
 function actorTypeValue(value) { return value === "user" || value === "assistant" || value === "system" || value === "agent" ? value : undefined; }
 function retentionClassValue(value) { return value === "live_delta" || value === "chat_message" || value === "audit_event" ? value : "trace_event"; }

package/dist/apps/chat/data/session-query-service.js

@@ -6,10 +6,10 @@ export class ChatSessionQueryService {
     constructor(store) {
         this.store = store;
     }
-    upsertSession(session, status = "idle") {
+    upsertSession(session, status = "idle", lastActivityAt = session.updatedAt) {
         const roomId = chatRoomIdFromMetadata(session.metadata) ?? "room_default";
-        this.store.sessions.upsertSession({ session, roomId, status, lastActivityAt: session.updatedAt });
-        this.upsertNavigation(session, roomId, status, session.updatedAt);
+        this.store.sessions.upsertSession({ session, roomId, status, lastActivityAt });
+        this.upsertNavigation(session, roomId, status, lastActivityAt);
     }
     upsertSessionsIfChanged(sessions) {
         let written = 0;
@@ -24,11 +24,32 @@ export class ChatSessionQueryService {
         }
         return { checked: sessions.length, written, skipped };
     }
-    recordEvent(event, session) {
-        if (session)
-            this.upsertSession(session, statusFromOutputEvent(event));
+    recordEvent(event, session, _streamId, createdAt = new Date().toISOString()) {
+        if (session) {
+            const status = statusFromOutputEvent(event);
+            if (status)
+                this.upsertSession(session, status, createdAt);
+            else
+                this.touchSession(session, createdAt);
+        }
         return undefined;
     }
+    touchSession(session, lastActivityAt) {
+        const roomId = chatRoomIdFromMetadata(session.metadata) ?? "room_default";
+        this.store.sessions.upsertSession({ session, roomId, lastActivityAt });
+        this.store.navigation.upsertSession({
+            roomId,
+            sessionId: session.id,
+            rootSessionId: rootSessionId(session),
+            parentId: session.parentId,
+            originId: session.originId,
+            title: session.title || "Untitled Session",
+            profile: session.profile,
+            lastActivityAt,
+            sortKey: lastActivityAt,
+            updatedAt: lastActivityAt,
+        });
+    }
     listSessions() {
         const rows = this.store.db.prepare(`
 			SELECT s.*, b.runtime_instance_id, b.runtime_adapter_id, b.native_session_id, b.binding_state
@@ -121,12 +142,14 @@ export class ChatSessionQueryService {
             && row.status === status
             && row.metadata_json === metadataJson
             && row.created_at === session.createdAt
-            && row.updated_at === session.updatedAt
-            && row.last_activity_at === session.updatedAt
+            && row.updated_at >= session.updatedAt
+            && row.last_activity_at >= session.updatedAt
             && row.navigation_status === status
             && row.navigation_title === title
-            && row.navigation_sort_key === session.updatedAt
-            && row.navigation_updated_at === session.updatedAt;
+            && row.navigation_sort_key !== null
+            && row.navigation_sort_key >= session.updatedAt
+            && row.navigation_updated_at !== null
+            && row.navigation_updated_at >= session.updatedAt;
     }
     upsertNavigation(session, roomId, status, now) {
         this.store.navigation.upsertSession({

package/dist/apps/chat/data/timeline-query-service.js

@@ -99,43 +99,40 @@ export class ChatTimelineQueryService {
 		`).all(...values, TRACE_RECONCILIATION_ENTRY_CAP + 1);
         if (rows.length > TRACE_RECONCILIATION_ENTRY_CAP)
             return false;
-        const lifecycles = new Map();
-        const invocations = [];
-        for (const row of rows) {
-            const lifecycle = lifecycles.get(row.event_id) ?? { nextOrdinal: 0 };
-            lifecycles.set(row.event_id, lifecycle);
-            if (row.type === "tool_execution_started") {
-                if (lifecycle.active)
+        if (nodeIdentity.qualifier) {
+            let hasPersistedOrdinal = false;
+            const explicitlyAttached = rows.some((row) => {
+                let attributes;
+                try {
+                    const parsed = JSON.parse(row.attributes_json);
+                    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
+                        return false;
+                    attributes = parsed;
+                }
+                catch {
                     return false;
-                lifecycle.active = {
-                    eventId: row.event_id,
-                    invocationOrdinal: lifecycle.nextOrdinal,
-                    payloadMatches: false,
-                };
-                lifecycle.nextOrdinal += 1;
-                invocations.push(lifecycle.active);
-            }
-            else if (!lifecycle.active) {
-                lifecycle.active = {
-                    eventId: row.event_id,
-                    invocationOrdinal: lifecycle.nextOrdinal,
-                    payloadMatches: false,
-                };
-                lifecycle.nextOrdinal += 1;
-                invocations.push(lifecycle.active);
-            }
-            if (row.type !== "tool_execution_started"
-                && payloadMatchesEventRow(this.store, payload.sha256, input.payloadId, row))
-                lifecycle.active.payloadMatches = true;
-            if (row.type === "tool_execution_finished")
-                lifecycle.active = undefined;
-        }
-        if (!nodeIdentity.qualifier) {
-            return invocations.length === 1 && invocations[0].payloadMatches;
+                }
+                const ordinal = attributes.toolInvocationOrdinal;
+                if (Number.isSafeInteger(ordinal))
+                    hasPersistedOrdinal = true;
+                return Number.isSafeInteger(ordinal)
+                    && Number(ordinal) === nodeIdentity.qualifier.invocationOrdinal
+                    && row.event_id === nodeIdentity.qualifier.eventId
+                    && row.type !== "tool_execution_started"
+                    && payloadMatchesEventRow(this.store, payload.sha256, input.payloadId, row);
+            });
+            if (explicitlyAttached || hasPersistedOrdinal)
+                return explicitlyAttached;
+            if (nodeIdentity.qualifier.invocationOrdinal !== 0)
+                return false;
+            const inferred = inferLegacyToolInvocations(this.store, rows, payload.sha256, input.payloadId);
+            return !inferred.ambiguous
+                && inferred.invocations.length === 1
+                && inferred.invocations[0].eventId === nodeIdentity.qualifier.eventId
+                && inferred.invocations[0].payloadMatches;
         }
-        const exact = invocations.filter((invocation) => invocation.eventId === nodeIdentity.qualifier.eventId
-            && invocation.invocationOrdinal === nodeIdentity.qualifier.invocationOrdinal);
-        return exact.length === 1 && exact[0].payloadMatches;
+        const inferred = inferLegacyToolInvocations(this.store, rows, payload.sha256, input.payloadId);
+        return !inferred.ambiguous && inferred.invocations.length === 1 && inferred.invocations[0].payloadMatches;
     }
     countEventsByType(input = {}) {
         const clauses = [];
@@ -199,3 +196,31 @@ function payloadMatchesEventRow(store, payloadSha256, payloadId, row) {
         return false;
     return store.payloads.findBySha256(inlineSha256)?.id === payloadId;
 }
+function inferLegacyToolInvocations(store, rows, payloadSha256, payloadId) {
+    const activeByEvent = new Map();
+    const invocations = [];
+    let ambiguous = false;
+    for (const row of rows) {
+        let active = activeByEvent.get(row.event_id);
+        if (row.type === "tool_execution_started") {
+            if (active) {
+                ambiguous = true;
+                continue;
+            }
+            active = { eventId: row.event_id, payloadMatches: false };
+            activeByEvent.set(row.event_id, active);
+            invocations.push(active);
+        }
+        else if (!active) {
+            active = { eventId: row.event_id, payloadMatches: false };
+            activeByEvent.set(row.event_id, active);
+            invocations.push(active);
+        }
+        if (row.type !== "tool_execution_started" && payloadMatchesEventRow(store, payloadSha256, payloadId, row)) {
+            active.payloadMatches = true;
+        }
+        if (row.type === "tool_execution_finished")
+            activeByEvent.delete(row.event_id);
+    }
+    return { ambiguous, invocations };
+}