@pasko70/pibo 3.0.0 → 3.0.2

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}`;
         }

package/dist/sessions/pibo-data-store.js

@@ -100,6 +100,151 @@ export class PiboDataSessionStore {
 		`).run(updated.piSessionId || null, rootSessionId(updated), updated.parentId ?? null, updated.originId ?? null, updated.profile, updated.activeModel ? JSON.stringify(updated.activeModel) : null, updated.workspace ?? null, updated.title ?? "Untitled Session", JSON.stringify(updated.metadata ?? {}), updated.updatedAt, updated.updatedAt, id);
         return this.get(id);
     }
+    claimOutputRenderSequence(piboSessionId, minimum) {
+        return this.dataStore.transaction(() => {
+            const session = this.db.prepare("SELECT 1 AS present FROM sessions WHERE id = ? AND deleted_at IS NULL").get(piboSessionId);
+            if (!session)
+                return minimum;
+            const row = this.db.prepare("SELECT high_water FROM session_output_render_high_water WHERE pibo_session_id = ?").get(piboSessionId);
+            const current = Math.max(row?.high_water ?? 0, this.durableOutputRenderSequenceHighWater(piboSessionId));
+            const next = Math.max(minimum, current + 1);
+            this.db.prepare(`
+				INSERT INTO session_output_render_high_water (pibo_session_id, high_water, updated_at)
+				VALUES (?, ?, ?)
+				ON CONFLICT(pibo_session_id) DO UPDATE SET
+					high_water = MAX(session_output_render_high_water.high_water, excluded.high_water),
+					updated_at = CASE
+						WHEN excluded.high_water > session_output_render_high_water.high_water THEN excluded.updated_at
+						ELSE session_output_render_high_water.updated_at
+					END
+			`).run(piboSessionId, next, new Date().toISOString());
+            return next;
+        });
+    }
+    durableOutputRenderSequenceHighWater(piboSessionId) {
+        const row = this.db.prepare(`
+			SELECT MAX(MAX(
+				COALESCE(CAST(json_extract(attributes_json, '$.renderSequence') AS INTEGER), 0),
+				COALESCE(session_sequence, 0)
+			)) AS high_water
+			FROM event_log
+			WHERE session_id = ?
+		`).get(piboSessionId);
+        const value = row?.high_water;
+        return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : 0;
+    }
+    observeOutputRenderSequence(piboSessionId, sequence) {
+        this.dataStore.transaction(() => {
+            this.db.prepare(`
+				INSERT INTO session_output_render_high_water (pibo_session_id, high_water, updated_at)
+				SELECT id, ?, ? FROM sessions WHERE id = ? AND deleted_at IS NULL
+				ON CONFLICT(pibo_session_id) DO UPDATE SET
+					high_water = MAX(session_output_render_high_water.high_water, excluded.high_water),
+					updated_at = CASE
+						WHEN excluded.high_water > session_output_render_high_water.high_water THEN excluded.updated_at
+						ELSE session_output_render_high_water.updated_at
+					END
+			`).run(sequence, new Date().toISOString(), piboSessionId);
+        });
+    }
+    claimOutputToolInvocationOrdinal(piboSessionId, eventId, toolCallId) {
+        return this.dataStore.transaction(() => {
+            const durable = this.db.prepare(`
+				SELECT MAX(COALESCE(CAST(json_extract(attributes_json, '$.toolInvocationOrdinal') AS INTEGER), 0)) AS maximum
+				FROM event_log
+				WHERE session_id = ? AND event_id = ? AND tool_call_id = ?
+			`).get(piboSessionId, eventId, toolCallId);
+            const minimumNextOrdinal = typeof durable.maximum === "number" && Number.isSafeInteger(durable.maximum)
+                ? durable.maximum + 1
+                : 0;
+            const row = this.db.prepare(`
+				INSERT INTO session_tool_invocation_counters (
+					pibo_session_id, event_id, tool_call_id, next_ordinal, updated_at
+				) VALUES (?, ?, ?, ? + 1, ?)
+				ON CONFLICT(pibo_session_id, event_id, tool_call_id) DO UPDATE SET
+					next_ordinal = MAX(session_tool_invocation_counters.next_ordinal, ? ) + 1,
+					updated_at = excluded.updated_at
+				RETURNING next_ordinal - 1 AS ordinal
+			`).get(piboSessionId, eventId, toolCallId, minimumNextOrdinal, new Date().toISOString(), minimumNextOrdinal);
+            return row.ordinal;
+        });
+    }
+    observeOutputToolInvocationOrdinal(piboSessionId, eventId, toolCallId, ordinal) {
+        this.dataStore.transaction(() => {
+            this.db.prepare(`
+				INSERT INTO session_tool_invocation_counters (
+					pibo_session_id, event_id, tool_call_id, next_ordinal, updated_at
+				) VALUES (?, ?, ?, ?, ?)
+				ON CONFLICT(pibo_session_id, event_id, tool_call_id) DO UPDATE SET
+					next_ordinal = MAX(session_tool_invocation_counters.next_ordinal, excluded.next_ordinal),
+					updated_at = CASE
+						WHEN excluded.next_ordinal > session_tool_invocation_counters.next_ordinal THEN excluded.updated_at
+						ELSE session_tool_invocation_counters.updated_at
+					END
+			`).run(piboSessionId, eventId, toolCallId, ordinal + 1, new Date().toISOString());
+        });
+    }
+    claimOrAttachOutputToolInvocation(input) {
+        return this.dataStore.transaction(() => {
+            const rows = this.db.prepare(`
+				SELECT invocation_ordinal, call_fingerprint, status, seen_call
+				FROM session_tool_invocations
+				WHERE pibo_session_id = ? AND event_id = ? AND tool_call_id = ?
+				ORDER BY invocation_ordinal DESC
+			`).all(input.piboSessionId, input.eventId, input.toolCallId);
+            const latestOpen = rows.find((row) => row.status === "open");
+            let ordinal;
+            if (input.eventType === "tool_call"
+                && latestOpen
+                && (latestOpen.seen_call === 0 || latestOpen.call_fingerprint === input.callFingerprint)) {
+                ordinal = latestOpen.invocation_ordinal;
+            }
+            else if (input.eventType !== "tool_call" && latestOpen) {
+                ordinal = latestOpen.invocation_ordinal;
+            }
+            else if (input.eventType !== "tool_call" && rows[0]) {
+                // A lifecycle replay after completion belongs to the last proven
+                // invocation. Only a new tool_call may cross a closed boundary.
+                ordinal = rows[0].invocation_ordinal;
+            }
+            else {
+                ordinal = this.claimOutputToolInvocationOrdinal(input.piboSessionId, input.eventId, input.toolCallId);
+            }
+            this.persistToolInvocationTransition(input, ordinal);
+            return ordinal;
+        });
+    }
+    observeOutputToolInvocation(input) {
+        this.dataStore.transaction(() => {
+            this.observeOutputToolInvocationOrdinal(input.piboSessionId, input.eventId, input.toolCallId, input.ordinal);
+            this.persistToolInvocationTransition(input, input.ordinal);
+        });
+    }
+    persistToolInvocationTransition(input, ordinal) {
+        const timestamp = new Date().toISOString();
+        const seenCall = input.eventType === "tool_call" ? 1 : 0;
+        const seenStarted = input.eventType === "tool_execution_started" ? 1 : 0;
+        const seenUpdated = input.eventType === "tool_execution_updated" ? 1 : 0;
+        const seenFinished = input.eventType === "tool_execution_finished" ? 1 : 0;
+        this.db.prepare(`
+			INSERT INTO session_tool_invocations (
+				pibo_session_id, event_id, tool_call_id, invocation_ordinal,
+				call_fingerprint, status, seen_call, seen_started, seen_updated, seen_finished,
+				created_at, updated_at
+			) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+			ON CONFLICT(pibo_session_id, event_id, tool_call_id, invocation_ordinal) DO UPDATE SET
+				call_fingerprint = COALESCE(session_tool_invocations.call_fingerprint, excluded.call_fingerprint),
+				status = CASE
+					WHEN session_tool_invocations.status = 'closed' OR excluded.status = 'closed' THEN 'closed'
+					ELSE 'open'
+				END,
+				seen_call = MAX(session_tool_invocations.seen_call, excluded.seen_call),
+				seen_started = MAX(session_tool_invocations.seen_started, excluded.seen_started),
+				seen_updated = MAX(session_tool_invocations.seen_updated, excluded.seen_updated),
+				seen_finished = MAX(session_tool_invocations.seen_finished, excluded.seen_finished),
+				updated_at = excluded.updated_at
+		`).run(input.piboSessionId, input.eventId, input.toolCallId, ordinal, input.callFingerprint ?? null, seenFinished ? "closed" : "open", seenCall, seenStarted, seenUpdated, seenFinished, timestamp, timestamp);
+    }
     delete(id) {
         const result = this.db.prepare("DELETE FROM sessions WHERE id = ?").run(id);
         return Number(result.changes ?? 0) > 0;

package/dist/sessions/store.js

@@ -48,6 +48,8 @@ export class InMemoryPiboSessionStore {
     byId = new Map();
     byPiSessionId = new Map();
     byNativeSession = new Map();
+    outputRenderHighWater = new Map();
+    outputToolInvocationNextOrdinal = new Map();
     get(id) {
         return this.byId.get(id);
     }
@@ -101,6 +103,33 @@ export class InMemoryPiboSessionStore {
         this.set(updated, existing.piSessionId, existing.runtimeBinding);
         return updated;
     }
+    claimOutputRenderSequence(piboSessionId, minimum) {
+        const session = this.byId.get(piboSessionId);
+        if (!session)
+            return minimum;
+        const current = Math.max(this.outputRenderHighWater.get(piboSessionId) ?? 0, outputRenderSequenceHighWater(session.metadata));
+        const next = Math.max(minimum, current + 1);
+        this.outputRenderHighWater.set(piboSessionId, next);
+        return next;
+    }
+    observeOutputRenderSequence(piboSessionId, sequence) {
+        const session = this.byId.get(piboSessionId);
+        if (!session)
+            return;
+        const current = Math.max(this.outputRenderHighWater.get(piboSessionId) ?? 0, outputRenderSequenceHighWater(session.metadata));
+        if (sequence > current)
+            this.outputRenderHighWater.set(piboSessionId, sequence);
+    }
+    claimOutputToolInvocationOrdinal(piboSessionId, eventId, toolCallId) {
+        const key = outputToolInvocationCounterKey(piboSessionId, eventId, toolCallId);
+        const ordinal = this.outputToolInvocationNextOrdinal.get(key) ?? 0;
+        this.outputToolInvocationNextOrdinal.set(key, ordinal + 1);
+        return ordinal;
+    }
+    observeOutputToolInvocationOrdinal(piboSessionId, eventId, toolCallId, ordinal) {
+        const key = outputToolInvocationCounterKey(piboSessionId, eventId, toolCallId);
+        this.outputToolInvocationNextOrdinal.set(key, Math.max(this.outputToolInvocationNextOrdinal.get(key) ?? 0, ordinal + 1));
+    }
     getRuntimeBinding(id) {
         const session = this.byId.get(id);
         if (!session)
@@ -133,6 +162,12 @@ export class InMemoryPiboSessionStore {
         const nativeKey = runtimeBindingNativeKey(existing.runtimeBinding);
         if (nativeKey)
             this.byNativeSession.delete(nativeKey);
+        this.outputRenderHighWater.delete(id);
+        const counterPrefix = `${JSON.stringify([id]).slice(0, -1)},`;
+        for (const key of this.outputToolInvocationNextOrdinal.keys()) {
+            if (key.startsWith(counterPrefix))
+                this.outputToolInvocationNextOrdinal.delete(key);
+        }
         return true;
     }
     find(input) {
@@ -165,6 +200,13 @@ export class InMemoryPiboSessionStore {
         return sessions.sort((left, right) => right.updatedAt.localeCompare(left.updatedAt));
     }
 }
+function outputRenderSequenceHighWater(metadata) {
+    const value = metadata?.outputRenderSequenceHighWater;
+    return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : 0;
+}
+function outputToolInvocationCounterKey(piboSessionId, eventId, toolCallId) {
+    return JSON.stringify([piboSessionId, eventId, toolCallId]);
+}
 export function matchesFindInput(session, input) {
     if (input.ids && !input.ids.includes(session.id))
         return false;