@pasko70/pibo 3.0.1 → 3.0.2

package/dist/gateway/web.js

@@ -1,11 +1,9 @@
 import { CHAT_WEB_APP_NAME } from "../apps/chat/web-app.js";
 import { createDefaultPiboPlugins } from "../plugins/builtin.js";
 import { createPiboBetterAuthPlugin } from "../plugins/better-auth.js";
-import { createPiboChatCustomAgentProfilesPlugin } from "../plugins/chat-custom-agents.js";
-import { createPiboChatUserSkillsPlugin } from "../plugins/chat-user-skills.js";
 import { createPiboChatWebPlugin } from "../plugins/chat-web.js";
 import { createPiboChatVscodeWebPlugin } from "../plugins/chat-vscode-web.js";
-import { createPiboContextFilesPlugin } from "../plugins/context-files.js";
+import { createPiboUserProfileResourcePlugins } from "../plugins/user-profile-resources.js";
 import { createPiboPreviewPlugin } from "../previews/plugin.js";
 import { createPiboCronPlugin } from "../cron/plugin.js";
 import { createPiboLoopPlugin } from "../loops/plugin.js";
@@ -154,13 +152,15 @@ export function createWebPiboPluginRegistry(options = {}) {
                 landingAppName: CHAT_WEB_APP_NAME,
             }),
             createPiboCronPlugin({ cronStorePath: resolvedOptions.chat?.cronStorePath, dataStorePath: resolvedOptions.chat?.dataStorePath, dataPayloadRootDir: resolvedOptions.chat?.dataPayloadRootDir }),
-            createPiboChatUserSkillsPlugin({
-                globalRoot: resolvedOptions.chat?.userSkillGlobalRoot,
-                workspaceRoot: resolvedOptions.chat?.userSkillWorkspaceRoot,
+            ...createPiboUserProfileResourcePlugins({
+                userSkills: {
+                    globalRoot: resolvedOptions.chat?.userSkillGlobalRoot,
+                    workspaceRoot: resolvedOptions.chat?.userSkillWorkspaceRoot,
+                },
+                contextFiles: resolvedOptions.contextFiles,
+                customAgents: { agentStorePath: resolvedOptions.chat?.agentStorePath },
             }),
-            createPiboChatCustomAgentProfilesPlugin({ agentStorePath: resolvedOptions.chat?.agentStorePath }),
             createPiboLoopPlugin({ loopStorePath: resolvedOptions.chat?.ralphStorePath, dataStorePath: resolvedOptions.chat?.dataStorePath, dataPayloadRootDir: resolvedOptions.chat?.dataPayloadRootDir }),
-            createPiboContextFilesPlugin(resolvedOptions.contextFiles),
             createPiboPreviewPlugin(),
             createPiboChatWebPlugin(resolvedOptions.chat),
             createPiboChatVscodeWebPlugin(),

package/dist/local/client.js

@@ -1,6 +1,7 @@
 import { randomUUID } from "node:crypto";
 import { PiboSessionRouter } from "../core/session-router.js";
-import { createDefaultPiboPluginRegistry, createPiboProfileFromRegistryOrDefault, resolvePiboProfileNameFromRegistryOrDefault } from "../plugins/builtin.js";
+import { createPiboProfileFromRegistryOrDefault, resolvePiboProfileNameFromRegistryOrDefault } from "../plugins/builtin.js";
+import { createDefaultPiboUserProfileRegistry } from "../plugins/user-profile-resources.js";
 import { getDefaultPiboWorkspace } from "../core/workspace.js";
 import { InMemoryPiboSessionStore, } from "../sessions/store.js";
 export const LOCAL_TUI_CHANNEL_NAME = "local-tui";
@@ -52,7 +53,7 @@ export class LocalRoutedTuiClient {
     }
 }
 export function createLocalRoutedTuiClient(options = {}) {
-    const registry = options.pluginRegistry ?? createDefaultPiboPluginRegistry();
+    const registry = options.pluginRegistry ?? createDefaultPiboUserProfileRegistry();
     const profileName = resolvePiboProfileNameFromRegistryOrDefault(registry, options.profile);
     const profile = createPiboProfileFromRegistryOrDefault(registry, profileName);
     const sessionName = options.sessionName ?? "default";

package/dist/plugins/context-files-store.js

@@ -101,6 +101,36 @@ function revisionRowToRecord(row) {
         ...(row.actor_id ? { actorId: row.actor_id } : {}),
     };
 }
+export function readContextFileCatalog(path) {
+    const resolvedPath = resolve(path);
+    if (!existsSync(resolvedPath))
+        return [];
+    const db = new DatabaseSync(resolvedPath, { readOnly: true });
+    try {
+        const table = db.prepare("SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'context_files'").get();
+        if (!table)
+            return [];
+        const columns = new Set(db.prepare("PRAGMA table_info(context_files)").all().map((column) => column.name));
+        const required = ["key", "label", "managed_path", "scope", "agent_profile_name"];
+        if (!required.every((column) => columns.has(column)))
+            return [];
+        const rows = db.prepare(`
+			SELECT key, label, managed_path, scope, agent_profile_name
+			FROM context_files
+			ORDER BY updated_at DESC
+		`).all();
+        return rows.map((row) => ({
+            key: row.key,
+            label: row.label,
+            managedPath: row.managed_path,
+            scope: row.scope,
+            ...(row.agent_profile_name ? { agentProfileName: row.agent_profile_name } : {}),
+        }));
+    }
+    finally {
+        db.close();
+    }
+}
 export class ContextFileMetadataStore {
     legacyStorePath;
     db;

package/dist/plugins/context-files.js

@@ -6,7 +6,7 @@ import { fileURLToPath } from "node:url";
 import { readFallbackPidFile, readPidFile } from "../gateway/pidfile.js";
 import { PiboWebHttpError, readJsonBody, responseHtml, responseJson } from "../web/http.js";
 import { definePiboPlugin } from "./registry.js";
-import { buildContextFileDiff, ContextFileMetadataStore, hashContextFileContent, } from "./context-files-store.js";
+import { buildContextFileDiff, ContextFileMetadataStore, hashContextFileContent, readContextFileCatalog, } from "./context-files-store.js";
 export const CONTEXT_FILES_APP_NAME = "pibo.context-files";
 export const CONTEXT_FILES_MOUNT_PATH = "/apps/context-files";
 export const CONTEXT_FILES_API_PREFIX = "/api/context-files";
@@ -1028,6 +1028,57 @@ function createContextFilesWebApp(service) {
         },
     };
 }
+export function createPiboContextFilesCatalogPlugin(options = {}) {
+    const paths = resolveContextFilesPaths(options);
+    return definePiboPlugin({
+        id: "pibo.context-files-catalog",
+        name: "Pibo Context Files Catalog",
+        register(api) {
+            const registeredPaths = new Set();
+            const registeredKeys = new Set();
+            try {
+                for (const file of readContextFileCatalog(paths.metadataPath)) {
+                    api.upsertContextFile(profileForManaged(file));
+                    registeredPaths.add(resolve(file.managedPath));
+                    registeredKeys.add(file.key);
+                }
+            }
+            catch (error) {
+                console.warn(`[pibo] Skipping managed context-file catalog registration: ${error instanceof Error ? error.message : String(error)}`);
+            }
+            let entries = [];
+            try {
+                entries = readdirSync(paths.globalDir, { withFileTypes: true });
+            }
+            catch (error) {
+                const code = error && typeof error === "object" && "code" in error ? error.code : undefined;
+                if (code !== "ENOENT") {
+                    console.warn(`[pibo] Skipping global context-file discovery: ${error instanceof Error ? error.message : String(error)}`);
+                }
+            }
+            const usedKeys = new Set(registeredKeys);
+            for (const entry of entries) {
+                if (!entry.isFile())
+                    continue;
+                const extension = extname(entry.name).toLowerCase();
+                if (extension !== ".md" && extension !== ".markdown")
+                    continue;
+                const path = resolve(paths.globalDir, entry.name);
+                if (registeredPaths.has(path))
+                    continue;
+                const key = uniqueKey(`ctx:${slugSegment(entry.name.slice(0, -extension.length) || entry.name)}`, usedKeys);
+                usedKeys.add(key);
+                api.upsertContextFile({
+                    key,
+                    label: labelFromManagedPath(entry.name),
+                    path,
+                    source: "managed",
+                    scope: "global",
+                });
+            }
+        },
+    });
+}
 export function createPiboContextFilesPlugin(options = {}) {
     const paths = resolveContextFilesPaths(options);
     return definePiboPlugin({

package/dist/plugins/registry.js

@@ -521,11 +521,13 @@ export class PiboPluginRegistry {
                 nativeTools: sessionContext.tools.filter((tool) => tool.enabled !== false).map((tool) => tool.name),
                 skills: sessionContext.skills.filter((skill) => skill.enabled !== false).map((skill) => skill.name),
                 contextFiles: sessionContext.contextFiles.filter((contextFile) => contextFile.enabled !== false).map(contextFileKey),
+                diagnostics: sessionContext.diagnostics.map((diagnostic) => ({ ...diagnostic })),
                 subagents: sessionContext.subagents.filter((subagent) => subagent.enabled !== false),
                 mcpServers: [...sessionContext.mcpServers],
                 piPackages: sessionContext.piPackages.filter((pkg) => pkg.enabled !== false).map((pkg) => pkg.id),
                 model: sessionContext.model ? { ...sessionContext.model } : undefined,
                 mainModel: sessionContext.mainModel ? { ...sessionContext.mainModel } : undefined,
+                mainModelFallbacks: sessionContext.mainModelFallbacks.map((model) => ({ ...model })),
                 subagentModel: sessionContext.subagentModel ? { ...sessionContext.subagentModel } : undefined,
                 thinkingLevel: sessionContext.thinkingLevel,
                 mainThinkingLevel: sessionContext.mainThinkingLevel,

package/dist/plugins/user-profile-resources.js

@@ -0,0 +1,22 @@
+import { createPiboChatCustomAgentProfilesPlugin, } from "./chat-custom-agents.js";
+import { createPiboChatUserSkillsPlugin } from "./chat-user-skills.js";
+import { createPiboContextFilesCatalogPlugin, createPiboContextFilesPlugin, } from "./context-files.js";
+import { createDefaultPiboPluginRegistry } from "./builtin.js";
+export function createPiboUserProfileResourcePlugins(options = {}) {
+    return [
+        createPiboChatUserSkillsPlugin(options.userSkills),
+        options.contextFilesMode === "catalog"
+            ? createPiboContextFilesCatalogPlugin(options.contextFiles)
+            : createPiboContextFilesPlugin(options.contextFiles),
+        createPiboChatCustomAgentProfilesPlugin(options.customAgents),
+    ];
+}
+export function createDefaultPiboUserProfileRegistry(options = {}) {
+    const registry = createDefaultPiboPluginRegistry();
+    registerPiboUserProfileResources(registry, { contextFilesMode: "catalog", ...options });
+    return registry;
+}
+export function registerPiboUserProfileResources(registry, options = {}) {
+    for (const plugin of createPiboUserProfileResourcePlugins(options))
+        registry.registerPlugin(plugin);
+}

package/dist/reliability/store.js

@@ -36,6 +36,11 @@ function ensurePiboRunColumn(db, name, definition) {
     if (!columns.has(name))
         db.exec(`ALTER TABLE pibo_runs ADD COLUMN ${name} ${definition}`);
 }
+function ensurePiboJobColumn(db, name, definition) {
+    const columns = sqliteTableColumns(db, "pibo_jobs");
+    if (!columns.has(name))
+        db.exec(`ALTER TABLE pibo_jobs ADD COLUMN ${name} ${definition}`);
+}
 export class PiboReliabilityStore {
     db;
     appendEventStatement;
@@ -74,6 +79,13 @@ export class PiboReliabilityStore {
 			CREATE INDEX IF NOT EXISTS idx_pibo_event_stream_topic_stream
 				ON pibo_event_stream(topic, stream_id);
 
+			CREATE TABLE IF NOT EXISTS pibo_delivery_receipts (
+				delivery_id TEXT NOT NULL,
+				projection TEXT NOT NULL,
+				delivered_at TEXT NOT NULL,
+				PRIMARY KEY(delivery_id, projection)
+			);
+
 			CREATE TABLE IF NOT EXISTS pibo_event_consumers (
 				consumer TEXT NOT NULL,
 				topic TEXT NOT NULL,
@@ -91,6 +103,7 @@ export class PiboReliabilityStore {
 				priority INTEGER NOT NULL DEFAULT 0,
 				worker_id TEXT,
 				claim_expires_at TEXT,
+				claim_token INTEGER NOT NULL DEFAULT 0,
 				attempts INTEGER NOT NULL DEFAULT 0,
 				max_attempts INTEGER NOT NULL DEFAULT 1,
 				idempotency_key TEXT,
@@ -157,6 +170,7 @@ export class PiboReliabilityStore {
 			CREATE INDEX IF NOT EXISTS idx_pibo_runs_status
 				ON pibo_runs(status);
 		`);
+        ensurePiboJobColumn(this.db, "claim_token", "INTEGER NOT NULL DEFAULT 0");
         ensurePiboRunColumn(this.db, "timeout_ms", "INTEGER");
         ensurePiboRunColumn(this.db, "timeout_at", "TEXT");
         ensurePiboRunColumn(this.db, "timeout_phase", "TEXT");
@@ -189,6 +203,21 @@ export class PiboReliabilityStore {
             throw error;
         }
     }
+    hasDeliveryReceipt(deliveryId, projection) {
+        return this.db
+            .prepare("SELECT 1 AS found FROM pibo_delivery_receipts WHERE delivery_id = ? AND projection = ?")
+            .get(deliveryId, projection) !== undefined;
+    }
+    recordDeliveryReceipt(deliveryId, projection, deliveredAt = now()) {
+        this.db.prepare(`
+			INSERT OR IGNORE INTO pibo_delivery_receipts (delivery_id, projection, delivered_at)
+			VALUES (?, ?, ?)
+		`).run(deliveryId, projection, deliveredAt);
+        const row = this.db
+            .prepare("SELECT delivery_id, projection, delivered_at FROM pibo_delivery_receipts WHERE delivery_id = ? AND projection = ?")
+            .get(deliveryId, projection);
+        return { deliveryId: row.delivery_id, projection: row.projection, deliveredAt: row.delivered_at };
+    }
     list(input = {}) {
         const clauses = [];
         const values = [];
@@ -339,6 +368,7 @@ export class PiboReliabilityStore {
 				SET state = 'running',
 					worker_id = ?,
 					claim_expires_at = ?,
+					claim_token = claim_token + 1,
 					attempts = attempts + 1,
 					updated_at = ?
 				WHERE job_id IN (
@@ -361,6 +391,7 @@ export class PiboReliabilityStore {
 				SET state = 'running',
 					worker_id = ?,
 					claim_expires_at = ?,
+					claim_token = claim_token + 1,
 					attempts = attempts + 1,
 					updated_at = ?
 				WHERE job_id = ?
@@ -372,7 +403,50 @@ export class PiboReliabilityStore {
             .get(workerId, claimExpiresAt, timestamp, jobId, timestamp, timestamp);
         return row ? jobFromRow(row) : undefined;
     }
-    ack(jobId, workerId) {
+    claimRecoverableJob(jobId, workerId, visibilityTimeoutMs = 30000, forcePending = false) {
+        const timestamp = now();
+        const claimExpiresAt = new Date(Date.now() + visibilityTimeoutMs).toISOString();
+        const row = this.db.prepare(`
+			UPDATE pibo_jobs
+			SET state = 'running',
+				worker_id = ?,
+				claim_expires_at = ?,
+				claim_token = claim_token + 1,
+				attempts = attempts + 1,
+				updated_at = ?
+			WHERE job_id = ?
+				AND (
+					(state = 'pending' AND (? = 1 OR run_at <= ?))
+					OR (state = 'running' AND claim_expires_at IS NOT NULL AND claim_expires_at <= ?)
+				)
+				AND (expires_at IS NULL OR expires_at > ?)
+			RETURNING *
+		`).get(workerId, claimExpiresAt, timestamp, jobId, forcePending ? 1 : 0, timestamp, timestamp, timestamp);
+        return row ? jobFromRow(row) : undefined;
+    }
+    updateJobPayload(jobId, workerId, payload, claimToken) {
+        const result = this.db.prepare(`
+			UPDATE pibo_jobs
+			SET payload_json = ?, updated_at = ?
+			WHERE job_id = ? AND state = 'running' AND worker_id = ?
+				AND (? IS NULL OR claim_token = ?)
+				AND claim_expires_at IS NOT NULL AND claim_expires_at > ?
+		`).run(json(payload), now(), jobId, workerId, claimToken ?? null, claimToken ?? null, now());
+        return Number(result.changes ?? 0) > 0;
+    }
+    releaseJob(jobId, workerId, delayMs = 0, claimToken) {
+        const timestamp = now();
+        const runAt = new Date(Date.parse(timestamp) + Math.max(0, delayMs)).toISOString();
+        const result = this.db.prepare(`
+			UPDATE pibo_jobs
+			SET state = 'pending', worker_id = NULL, claim_expires_at = NULL, run_at = ?, updated_at = ?
+			WHERE job_id = ? AND state = 'running' AND worker_id = ?
+				AND (? IS NULL OR claim_token = ?)
+				AND claim_expires_at IS NOT NULL AND claim_expires_at > ?
+		`).run(runAt, timestamp, jobId, workerId, claimToken ?? null, claimToken ?? null, timestamp);
+        return Number(result.changes ?? 0) > 0;
+    }
+    ack(jobId, workerId, claimToken) {
         const timestamp = now();
         const result = this.db
             .prepare(`
@@ -380,47 +454,53 @@ export class PiboReliabilityStore {
 				WHERE job_id = ?
 					AND state = 'running'
 					AND worker_id = ?
+					AND (? IS NULL OR claim_token = ?)
 					AND claim_expires_at IS NOT NULL
 					AND claim_expires_at > ?
 			`)
-            .run(jobId, workerId, timestamp);
+            .run(jobId, workerId, claimToken ?? null, claimToken ?? null, timestamp);
         return Number(result.changes ?? 0) > 0;
     }
     retry(jobId, workerId, input = {}) {
         const timestamp = now();
-        const row = this.getLiveWorkerJob(jobId, workerId, timestamp);
-        if (!row)
-            return false;
-        const job = jobFromRow(row);
-        if (job.attempts >= job.maxAttempts) {
-            this.moveJobToDead(row, input.error ?? "Job exhausted retry attempts.", "max_attempts", timestamp);
-            return true;
-        }
-        const delayMs = input.delayMs ?? retryDelayMs(job.attempts, input);
-        const runAt = new Date(asDate(input.now).getTime() + delayMs).toISOString();
-        this.db
-            .prepare(`
-				UPDATE pibo_jobs
-				SET state = 'pending',
-					worker_id = NULL,
-					claim_expires_at = NULL,
-					run_at = ?,
-					updated_at = ?,
-					last_error = ?
-				WHERE job_id = ?
-			`)
-            .run(runAt, timestamp, input.error ?? null, jobId);
-        return true;
+        return this.inImmediateTransaction(() => {
+            const row = this.getLiveWorkerJob(jobId, workerId, timestamp, input.claimToken);
+            if (!row)
+                return false;
+            const job = jobFromRow(row);
+            if (job.attempts >= job.maxAttempts) {
+                this.moveJobToDead(row, input.error ?? "Job exhausted retry attempts.", "max_attempts", timestamp);
+                return true;
+            }
+            const delayMs = input.delayMs ?? retryDelayMs(job.attempts, input);
+            const runAt = new Date(asDate(input.now).getTime() + delayMs).toISOString();
+            const result = this.db
+                .prepare(`
+					UPDATE pibo_jobs
+					SET state = 'pending',
+						worker_id = NULL,
+						claim_expires_at = NULL,
+						run_at = ?,
+						updated_at = ?,
+						last_error = ?
+					WHERE job_id = ? AND state = 'running' AND worker_id = ?
+						AND (? IS NULL OR claim_token = ?)
+				`)
+                .run(runAt, timestamp, input.error ?? null, jobId, workerId, input.claimToken ?? null, input.claimToken ?? null);
+            return Number(result.changes ?? 0) > 0;
+        });
     }
-    fail(jobId, workerId, error) {
+    fail(jobId, workerId, error, claimToken) {
         const timestamp = now();
-        const row = this.getLiveWorkerJob(jobId, workerId, timestamp);
-        if (!row)
-            return false;
-        this.moveJobToDead(row, error, "failed", timestamp);
-        return true;
+        return this.inImmediateTransaction(() => {
+            const row = this.getLiveWorkerJob(jobId, workerId, timestamp, claimToken);
+            if (!row)
+                return false;
+            this.moveJobToDead(row, error, "failed", timestamp);
+            return true;
+        });
     }
-    heartbeat(jobId, workerId, extendMs) {
+    heartbeat(jobId, workerId, extendMs, claimToken) {
         const timestamp = now();
         const claimExpiresAt = new Date(Date.now() + Math.max(1, extendMs)).toISOString();
         const result = this.db
@@ -430,10 +510,11 @@ export class PiboReliabilityStore {
 				WHERE job_id = ?
 					AND state = 'running'
 					AND worker_id = ?
+					AND (? IS NULL OR claim_token = ?)
 					AND claim_expires_at IS NOT NULL
 					AND claim_expires_at > ?
 			`)
-            .run(claimExpiresAt, timestamp, jobId, workerId, timestamp);
+            .run(claimExpiresAt, timestamp, jobId, workerId, claimToken ?? null, claimToken ?? null, timestamp);
         return Number(result.changes ?? 0) > 0;
     }
     listJobs(input = {}) {
@@ -447,11 +528,56 @@ export class PiboReliabilityStore {
             clauses.push("state = ?");
             values.push(input.state);
         }
+        if (input.excludeJobIds?.length) {
+            clauses.push(`job_id NOT IN (${input.excludeJobIds.map(() => "?").join(", ")})`);
+            values.push(...input.excludeJobIds);
+        }
         const where = clauses.length ? `WHERE ${clauses.join(" AND ")}` : "";
         const rows = this.db
             .prepare(`SELECT * FROM pibo_jobs ${where} ORDER BY priority DESC, run_at ASC, created_at ASC LIMIT ?`)
             .all(...values, clampLimit(input.limit, 100));
-        return rows.map(jobFromRow);
+        const jobs = [];
+        for (const row of rows) {
+            try {
+                jobs.push(jobFromRow(row));
+            }
+            catch {
+                this.quarantineJobRow(row, "payload_malformed");
+            }
+        }
+        return jobs;
+    }
+    listRecoverableJobs(input = {}) {
+        const timestamp = now();
+        const clauses = [
+            "((state = 'pending' AND (? = 1 OR run_at <= ?)) OR (state = 'running' AND claim_expires_at IS NOT NULL AND claim_expires_at <= ?))",
+            "(expires_at IS NULL OR expires_at > ?)",
+        ];
+        const values = [input.includeDeferredPending ? 1 : 0, timestamp, timestamp, timestamp];
+        if (input.queue) {
+            clauses.push("queue = ?");
+            values.push(input.queue);
+        }
+        if (input.excludeJobIds?.length) {
+            clauses.push(`job_id NOT IN (${input.excludeJobIds.map(() => "?").join(", ")})`);
+            values.push(...input.excludeJobIds);
+        }
+        const rows = this.db.prepare(`
+			SELECT * FROM pibo_jobs
+			WHERE ${clauses.join(" AND ")}
+			ORDER BY priority DESC, run_at ASC, created_at ASC
+			LIMIT ?
+		`).all(...values, clampLimit(input.limit, 100));
+        const jobs = [];
+        for (const row of rows) {
+            try {
+                jobs.push(jobFromRow(row));
+            }
+            catch {
+                this.quarantineJobRow(row, "payload_malformed");
+            }
+        }
+        return jobs;
     }
     listDead(input = {}) {
         const clauses = [];
@@ -466,6 +592,46 @@ export class PiboReliabilityStore {
             .all(...values, clampLimit(input.limit, 100));
         return rows.map(deadJobFromRow);
     }
+    hasLiveJob(jobId) {
+        return this.db.prepare("SELECT 1 AS found FROM pibo_jobs WHERE job_id = ?").get(jobId) !== undefined;
+    }
+    hasJobs(queue) {
+        return queue
+            ? this.db.prepare("SELECT 1 AS found FROM pibo_jobs WHERE queue = ? LIMIT 1").get(queue) !== undefined
+            : this.db.prepare("SELECT 1 AS found FROM pibo_jobs LIMIT 1").get() !== undefined;
+    }
+    hasRecoverableJobs(queue, includeDeferredPending = false) {
+        const timestamp = now();
+        return this.db.prepare(`
+			SELECT 1 AS found FROM pibo_jobs
+			WHERE queue = ?
+				AND (
+					(state = 'pending' AND (? = 1 OR run_at <= ?))
+					OR (state = 'running' AND claim_expires_at IS NOT NULL AND claim_expires_at <= ?)
+				)
+				AND (expires_at IS NULL OR expires_at > ?)
+			LIMIT 1
+		`).get(queue, includeDeferredPending ? 1 : 0, timestamp, timestamp, timestamp) !== undefined;
+    }
+    quarantineJob(jobId, reason, correlation = {}) {
+        const row = this.db.prepare("SELECT * FROM pibo_jobs WHERE job_id = ?").get(jobId);
+        if (!row)
+            return false;
+        this.quarantineJobRow(row, reason, correlation);
+        return true;
+    }
+    deadLetter(input) {
+        const timestamp = now();
+        const jobId = input.jobId ?? `job_${randomUUID()}`;
+        this.db.prepare(`
+			INSERT OR REPLACE INTO pibo_dead_jobs (
+				job_id, queue, payload_json, attempts, max_attempts, idempotency_key, created_at,
+				updated_at, expires_at, last_error, dead_at, dead_reason
+			) VALUES (?, ?, ?, ?, ?, ?, ?, ?, NULL, ?, ?, ?)
+		`).run(jobId, input.queue, json(input.payload ?? null), Math.max(0, input.attempts ?? 0), Math.max(1, input.maxAttempts ?? 1), input.idempotencyKey ?? null, timestamp, timestamp, input.error ?? input.reason, timestamp, input.reason);
+        const row = this.db.prepare("SELECT * FROM pibo_dead_jobs WHERE job_id = ?").get(jobId);
+        return deadJobFromRow(row);
+    }
     requeueDead(jobId, input = {}) {
         const dead = this.db.prepare("SELECT * FROM pibo_dead_jobs WHERE job_id = ?").get(jobId);
         if (!dead)
@@ -659,17 +825,18 @@ export class PiboReliabilityStore {
             .get(queue, idempotencyKey);
         return row ? jobFromRow(row) : undefined;
     }
-    getLiveWorkerJob(jobId, workerId, timestamp) {
+    getLiveWorkerJob(jobId, workerId, timestamp, claimToken) {
         return this.db
             .prepare(`
 				SELECT * FROM pibo_jobs
 				WHERE job_id = ?
 					AND state = 'running'
 					AND worker_id = ?
+					AND (? IS NULL OR claim_token = ?)
 					AND claim_expires_at IS NOT NULL
 					AND claim_expires_at > ?
 			`)
-            .get(jobId, workerId, timestamp);
+            .get(jobId, workerId, claimToken ?? null, claimToken ?? null, timestamp);
     }
     moveExpiredJobs(timestamp) {
         const expired = this.db.prepare("SELECT * FROM pibo_jobs WHERE expires_at IS NOT NULL AND expires_at <= ?").all(timestamp);
@@ -718,6 +885,39 @@ export class PiboReliabilityStore {
             .run(row.job_id, row.queue, row.payload_json, row.attempts, row.max_attempts, row.idempotency_key, row.created_at, timestamp, row.expires_at, error, timestamp, reason);
         this.db.prepare("DELETE FROM pibo_jobs WHERE job_id = ?").run(row.job_id);
     }
+    quarantineJobRow(row, reason, correlation = {}) {
+        this.inImmediateTransaction(() => {
+            const current = this.db.prepare("SELECT * FROM pibo_jobs WHERE job_id = ?").get(row.job_id);
+            if (!current)
+                return;
+            const payload = {
+                version: 1,
+                key: correlation.key ?? current.job_id,
+                ...(correlation.piboSessionId ? { piboSessionId: correlation.piboSessionId } : {}),
+                ...(correlation.eventId ? { eventId: correlation.eventId } : {}),
+                state: { phase: "quarantined", reasonCode: reason },
+            };
+            const sanitized = {
+                ...current,
+                payload_json: json(payload),
+                idempotency_key: correlation.key ?? null,
+                last_error: reason,
+            };
+            this.moveJobToDead(sanitized, reason, reason, now());
+        });
+    }
+    inImmediateTransaction(operation) {
+        this.db.exec("BEGIN IMMEDIATE");
+        try {
+            const result = operation();
+            this.db.exec("COMMIT");
+            return result;
+        }
+        catch (error) {
+            this.db.exec("ROLLBACK");
+            throw error;
+        }
+    }
     requireRun(runId) {
         const run = this.getRun(runId);
         if (!run)
@@ -750,6 +950,7 @@ function jobFromRow(row) {
         priority: row.priority,
         workerId: row.worker_id ?? undefined,
         claimExpiresAt: row.claim_expires_at ?? undefined,
+        claimToken: row.claim_token,
         attempts: row.attempts,
         maxAttempts: row.max_attempts,
         idempotencyKey: row.idempotency_key ?? undefined,
@@ -763,7 +964,7 @@ function deadJobFromRow(row) {
     return {
         jobId: row.job_id,
         queue: row.queue,
-        payload: parseJson(row.payload_json),
+        payload: safeDeadPayload(row.payload_json, row.dead_reason, row.job_id),
         attempts: row.attempts,
         maxAttempts: row.max_attempts,
         idempotencyKey: row.idempotency_key ?? undefined,
@@ -775,6 +976,14 @@ function deadJobFromRow(row) {
         deadReason: row.dead_reason,
     };
 }
+function safeDeadPayload(value, reason, jobId) {
+    try {
+        return parseJson(value);
+    }
+    catch {
+        return { version: 1, key: jobId, state: { phase: "quarantined", reasonCode: reason } };
+    }
+}
 function runFromRow(row) {
     const output = {
         runId: row.run_id,

package/dist/session-ui/terminalRows.js

@@ -1,4 +1,5 @@
 import { compareTraceNodes } from "../shared/trace-nodes.js";
+import { parseTraceToolNodeIdentity } from "../shared/trace-tool-identity.js";
 import { terminalTextValue } from "./terminalValue.js";
 export const MAX_COMPACT_TERMINAL_IMAGE_PREVIEWS = 20;
 export const COMPACT_TERMINAL_OUTPUT_PREVIEW_LINES = 5;
@@ -168,9 +169,11 @@ function createRowCandidate(node, turnId) {
 }
 export function compactTerminalRowIdentity(node) {
     if (node.type === "tool.call" || node.type === "tool.result" || node.type === "agent.delegation") {
-        const toolCallId = node.toolCallId ?? stableKeySuffix(node.stableKey, "tool:");
-        if (toolCallId)
-            return `terminal:tool:${toolCallId}`;
+        if (node.toolCallId) {
+            return parseTraceToolNodeIdentity(node.id)?.qualifier
+                ? `terminal:${node.id}`
+                : `terminal:tool:${node.toolCallId}`;
+        }
         if (node.type === "agent.delegation" && node.linkedPiboSessionId) {
             return `terminal:delegation:${node.linkedPiboSessionId}`;
         }