@pasko70/pibo 3.0.1 → 3.1.0

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

@@ -6,6 +6,17 @@ import { DatabaseSync } from "node:sqlite";
 import { DEFAULT_AGENT_RUNTIME_INSTANCE_ID, DEFAULT_BUILTIN_TOOL_NAMES } from "../../core/profiles.js";
 import { isPiboThinkingLevel } from "../../core/thinking.js";
 import { findPiPackage } from "../../pi-packages/store.js";
+export class CustomAgentTargetReferenceError extends Error {
+    targetProfileName;
+    dependentProfileNames;
+    constructor(targetProfileName, dependentProfileNames) {
+        const sortedNames = [...dependentProfileNames].sort((left, right) => left.localeCompare(right));
+        super(`Custom agent "${targetProfileName}" is targeted by custom agents: ${sortedNames.join(", ")}`);
+        this.name = "CustomAgentTargetReferenceError";
+        this.targetProfileName = targetProfileName;
+        this.dependentProfileNames = sortedNames;
+    }
+}
 const CUSTOM_AGENT_NAME_PATTERN = /^[a-z][a-z0-9]*(?:-[a-z0-9]+)*$/;
 export function previewCustomAgentCreate(input, options = {}) {
     const now = options.now ?? new Date().toISOString();
@@ -27,6 +38,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 +73,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 +126,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 +154,7 @@ export class CustomAgentStore {
         this.migrateRuntimeColumns();
         this.migratePiPackagesColumn();
         this.migrateModelColumns();
+        this.migrateModelFallbackColumns();
         this.migrateThinkingLevelColumn();
         this.migrateThinkingOptionColumns();
         this.migrateBuiltinToolNamesColumn();
@@ -230,6 +245,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 +261,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) {
@@ -259,10 +275,42 @@ export class CustomAgentStore {
             .run(archivedAt, new Date().toISOString(), id);
         return this.get(id);
     }
+    listReferencingAgents(id) {
+        this.migrateLegacyProfileNames();
+        const target = this.get(id);
+        if (!target)
+            return [];
+        const targetNames = new Set([
+            target.profileName,
+            target.id,
+            `custom-agent:${target.id}`,
+            ...target.profileAliases,
+        ]);
+        return this.list({ includeArchived: true })
+            .filter((agent) => agent.id !== id && agent.subagents.some((subagent) => targetNames.has(subagent.targetProfile)))
+            .sort((left, right) => left.profileName.localeCompare(right.profileName));
+    }
     delete(id) {
-        this.db.prepare("DELETE FROM chat_agent_profile_aliases WHERE agent_id = ?").run(id);
-        const result = this.db.prepare("DELETE FROM chat_agents WHERE id = ?").run(id);
-        return Number(result.changes ?? 0) > 0;
+        this.db.exec("BEGIN IMMEDIATE");
+        try {
+            const target = this.get(id);
+            if (!target) {
+                this.db.exec("COMMIT");
+                return false;
+            }
+            const dependents = this.listReferencingAgents(id);
+            if (dependents.length > 0) {
+                throw new CustomAgentTargetReferenceError(target.profileName, dependents.map((agent) => agent.profileName));
+            }
+            this.db.prepare("DELETE FROM chat_agent_profile_aliases WHERE agent_id = ?").run(id);
+            const result = this.db.prepare("DELETE FROM chat_agents WHERE id = ?").run(id);
+            this.db.exec("COMMIT");
+            return Number(result.changes ?? 0) > 0;
+        }
+        catch (error) {
+            this.db.exec("ROLLBACK");
+            throw error;
+        }
     }
     close() {
         this.db.close();
@@ -286,6 +334,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 +350,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)
@@ -363,6 +412,15 @@ export class CustomAgentStore {
                 .prepare("UPDATE chat_agents SET profile_name = ?, display_name = ? WHERE id = ?")
                 .run(nextName, nextName, row.id);
         }
+        this.db.prepare(`
+			DELETE FROM chat_agent_profile_aliases
+			WHERE EXISTS (
+				SELECT 1
+				FROM chat_agents
+				WHERE chat_agents.profile_name = chat_agent_profile_aliases.old_profile_name
+					AND chat_agents.id != chat_agent_profile_aliases.agent_id
+			)
+		`).run();
     }
     migrateAgentFolderColumn() {
         if (!this.tableColumns().has("folder_id")) {
@@ -458,6 +516,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 +713,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 +839,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 +879,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/project-service.js

@@ -1,6 +1,6 @@
 import { randomUUID } from "node:crypto";
-import { mkdirSync, rmSync, statSync } from "node:fs";
-import { dirname, isAbsolute, resolve } from "node:path";
+import { mkdirSync, realpathSync, rmSync, statSync } from "node:fs";
+import { basename, dirname, isAbsolute, relative, resolve, sep } from "node:path";
 import { DatabaseSync } from "node:sqlite";
 import { piboHomePath } from "../../../core/pibo-home.js";
 export class ChatProjectService {
@@ -72,7 +72,7 @@ export class ChatProjectService {
         const projectFolder = resolve(normalizeProjectFolder(input.projectFolder));
         this.assertNameAvailable(name);
         this.assertFolderAvailable(projectFolder);
-        this.ensureProjectFolderUsable(projectFolder);
+        this.ensureProjectFolderUsable(projectFolder, input.createFolder === true);
         const now = new Date().toISOString();
         const id = `prj_${randomUUID()}`;
         this.db.prepare(`INSERT INTO projects (id, name, description, project_folder, configuration_status, metadata_json, created_at, updated_at)
@@ -93,16 +93,26 @@ export class ChatProjectService {
         return this.getProject(id, { includeArchived: true });
     }
     deleteProject(id, options) {
-        const project = this.requireProject(id, { includeArchived: true });
-        if (!project.archivedAt)
-            throw new Error("Archive the project before permanently deleting it.");
-        if (options.confirmName !== project.name)
-            throw new Error(`Type \"${project.name}\" to permanently delete this project.`);
-        this.db.prepare("DELETE FROM project_sessions WHERE project_id = ?").run(id);
-        this.db.prepare("DELETE FROM projects WHERE id = ?").run(id);
-        if (options.deleteFiles)
-            rmSync(project.projectFolder, { recursive: true, force: true });
-        return { deletedProjectId: id };
+        this.db.exec("BEGIN IMMEDIATE");
+        try {
+            const project = this.requireProject(id, { includeArchived: true });
+            if (!project.archivedAt)
+                throw new Error("Archive the project before permanently deleting it.");
+            if (options.confirmName !== project.name)
+                throw new Error(`Type \"${project.name}\" to permanently delete this project.`);
+            if (options.deleteFiles)
+                this.assertFolderDoesNotOverlapAnotherProject(project);
+            this.db.prepare("DELETE FROM project_sessions WHERE project_id = ?").run(id);
+            this.db.prepare("DELETE FROM projects WHERE id = ?").run(id);
+            if (options.deleteFiles)
+                rmSync(project.projectFolder, { recursive: true, force: true });
+            this.db.exec("COMMIT");
+            return { deletedProjectId: id };
+        }
+        catch (error) {
+            this.db.exec("ROLLBACK");
+            throw error;
+        }
     }
     listProjectSessions(projectId, options = {}) {
         const rows = this.db.prepare(`SELECT * FROM project_sessions WHERE project_id = ? ${options.includeArchived ? "" : "AND archived = 0"} ORDER BY created_at`).all(projectId);
@@ -112,6 +122,60 @@ export class ChatProjectService {
         const row = this.db.prepare("SELECT * FROM project_sessions WHERE pibo_session_id = ?").get(piboSessionId);
         return row ? projectSessionFromRow(row) : undefined;
     }
+    deleteProjectSessions(piboSessionIds) {
+        const ids = [...new Set(piboSessionIds.filter(Boolean))];
+        if (ids.length === 0)
+            return 0;
+        this.db.exec("BEGIN IMMEDIATE");
+        try {
+            const deleted = this.deleteProjectSessionsLocked(ids, new Date().toISOString());
+            this.db.exec("COMMIT");
+            return deleted;
+        }
+        catch (error) {
+            this.db.exec("ROLLBACK");
+            throw error;
+        }
+    }
+    async deleteProjectSessionWithCanonicalDelete(piboSessionId, deleteCanonicalSession) {
+        this.db.exec("BEGIN IMMEDIATE");
+        try {
+            this.deleteProjectSessionsLocked([piboSessionId], new Date().toISOString());
+            const result = await deleteCanonicalSession();
+            this.db.exec("COMMIT");
+            return result;
+        }
+        catch (error) {
+            this.db.exec("ROLLBACK");
+            throw error;
+        }
+    }
+    deleteProjectSessionsLocked(ids, now) {
+        const placeholders = ids.map(() => "?").join(", ");
+        const affectedProjects = this.db.prepare(`SELECT DISTINCT id FROM projects
+			WHERE current_main_session_id IN (${placeholders})
+			UNION
+			SELECT DISTINCT project_id AS id FROM project_sessions WHERE pibo_session_id IN (${placeholders})`)
+            .all(...ids, ...ids);
+        const deleted = this.db.prepare(`DELETE FROM project_sessions WHERE pibo_session_id IN (${placeholders})`).run(...ids);
+        for (const project of affectedProjects) {
+            const current = this.db.prepare("SELECT current_main_session_id FROM projects WHERE id = ?")
+                .get(project.id);
+            if (!current?.current_main_session_id)
+                continue;
+            const currentLink = this.db.prepare("SELECT 1 FROM project_sessions WHERE project_id = ? AND pibo_session_id = ?")
+                .get(project.id, current.current_main_session_id);
+            if (currentLink)
+                continue;
+            const replacement = this.db.prepare(`SELECT pibo_session_id FROM project_sessions
+				WHERE project_id = ? AND kind = 'main' AND archived = 0
+				ORDER BY updated_at DESC, created_at DESC, pibo_session_id DESC
+				LIMIT 1`).get(project.id);
+            this.db.prepare("UPDATE projects SET current_main_session_id = ?, updated_at = ? WHERE id = ?")
+                .run(replacement?.pibo_session_id ?? null, now, project.id);
+        }
+        return Number(deleted.changes ?? 0);
+    }
     addProjectSession(input) {
         const existing = this.getProjectSession(input.piboSessionId);
         const now = new Date().toISOString();
@@ -599,9 +663,17 @@ export class ChatProjectService {
         if (existing)
             throw new Error("Project folder already exists");
     }
-    ensureProjectFolderUsable(folder) {
+    assertFolderDoesNotOverlapAnotherProject(project) {
+        const projects = this.db.prepare("SELECT name, project_folder FROM projects WHERE id != ? ORDER BY lower(name), created_at").all(project.id);
+        const overlapping = projects.find((other) => pathsOverlap(project.projectFolder, other.project_folder));
+        if (overlapping) {
+            throw new Error(`Cannot delete project files because its folder overlaps Project \"${overlapping.name}\". Delete without deleting files or choose a non-overlapping folder.`);
+        }
+    }
+    ensureProjectFolderUsable(folder, createFolder) {
         try {
-            mkdirSync(folder, { recursive: true });
+            if (createFolder)
+                mkdirSync(folder, { recursive: true });
             if (!statSync(folder).isDirectory())
                 throw new Error("Project folder is not a directory");
         }
@@ -770,6 +842,38 @@ function normalizeProjectFolder(value) {
         throw new Error("Project folder must be an absolute path, e.g. ~/code/my-project or /home/me/code/my-project");
     return folder;
 }
+function pathsOverlap(left, right) {
+    if (pathContains(left, right) || pathContains(right, left))
+        return true;
+    const canonicalLeft = canonicalProjectPath(left);
+    const canonicalRight = canonicalProjectPath(right);
+    if (!canonicalLeft || !canonicalRight)
+        return true;
+    return pathContains(canonicalLeft, canonicalRight) || pathContains(canonicalRight, canonicalLeft);
+}
+function canonicalProjectPath(path) {
+    let current = resolve(path);
+    const missingSegments = [];
+    while (true) {
+        try {
+            return resolve(realpathSync(current), ...missingSegments);
+        }
+        catch (error) {
+            const code = error && typeof error === "object" && "code" in error ? error.code : undefined;
+            if (code !== "ENOENT" && code !== "ENOTDIR")
+                return undefined;
+            const parent = dirname(current);
+            if (parent === current)
+                return undefined;
+            missingSegments.unshift(basename(current));
+            current = parent;
+        }
+    }
+}
+function pathContains(parent, candidate) {
+    const pathFromParent = relative(resolve(parent), resolve(candidate));
+    return pathFromParent === "" || (pathFromParent !== ".." && !pathFromParent.startsWith(`..${sep}`) && !isAbsolute(pathFromParent));
+}
 const PROJECT_SESSION_STATES = new Set([
     "simple_chat",
     "workflow",

package/dist/apps/chat/data/room-service.js

@@ -1,6 +1,12 @@
 import { randomUUID } from "node:crypto";
 import { roomWorkspaceFromMetadata } from "../types/rooms.js";
 import { roomFromRow } from "./chat-data-mappers.js";
+export class PiboRoomHierarchyCycleError extends Error {
+    constructor() {
+        super("Room parent assignment would create a cycle.");
+        this.name = "PiboRoomHierarchyCycleError";
+    }
+}
 export class ChatRoomService {
     store;
     constructor(store) {
@@ -17,6 +23,9 @@ export class ChatRoomService {
         const existing = this.getRoom(id);
         if (!existing)
             return undefined;
+        if (input.parentRoomId && this.parentAssignmentCreatesCycle(id, input.parentRoomId)) {
+            throw new PiboRoomHierarchyCycleError();
+        }
         const metadata = input.metadata ?? existing.metadata;
         const updated = { ...existing, name: input.name ?? existing.name, topic: input.topic === null ? undefined : input.topic ?? existing.topic, parentRoomId: input.parentRoomId === null ? undefined : input.parentRoomId ?? existing.parentRoomId, retentionPolicyId: input.retentionPolicyId === null ? undefined : input.retentionPolicyId ?? existing.retentionPolicyId, metadata, workspace: roomWorkspaceFromMetadata(metadata), updatedAt: new Date().toISOString() };
         this.store.db.prepare("UPDATE rooms SET name = ?, topic = ?, parent_room_id = ?, workspace = ?, retention_policy_id = ?, metadata_json = ?, updated_at = ? WHERE id = ?").run(updated.name, updated.topic ?? null, updated.parentRoomId ?? null, updated.workspace ?? null, updated.retentionPolicyId ?? null, JSON.stringify(updated.metadata), updated.updatedAt, id);
@@ -49,4 +58,16 @@ export class ChatRoomService {
     requireRoom(roomId) { const room = this.getRoom(roomId); if (!room)
         throw new Error("Room not found"); return room; }
     close() { }
+    parentAssignmentCreatesCycle(roomId, parentRoomId) {
+        const roomsById = new Map(this.listRooms().map((room) => [room.id, room]));
+        const visited = new Set();
+        let currentId = parentRoomId;
+        while (currentId && !visited.has(currentId)) {
+            if (currentId === roomId)
+                return true;
+            visited.add(currentId);
+            currentId = roomsById.get(currentId)?.parentRoomId;
+        }
+        return false;
+    }
 }