specrails-desktop 2.55.0 → 2.55.1

package/server/dist/{queue-manager.js → modules/execution/runtime/queue-manager.js}

@@ -3,151 +3,51 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueueManager = exports.FREESTYLE_COMMAND_RE = exports.InvalidJobDependencyError = exports.JobAlreadyTerminalError = exports.JobNotFoundError = exports.CodexNotFoundError = exports.ClaudeNotFoundError = exports.DEFAULT_ZOMBIE_TIMEOUT_MS = void 0;
-exports.buildTelemetryEnv = buildTelemetryEnv;
-exports.projectSupportsProfiles = projectSupportsProfiles;
-exports.distributeIntEvenly = distributeIntEvenly;
+exports.QueueManager = exports.FREESTYLE_COMMAND_RE = exports.InvalidJobDependencyError = exports.JobAlreadyTerminalError = exports.JobNotFoundError = exports.CodexNotFoundError = exports.ClaudeNotFoundError = exports.DEFAULT_ZOMBIE_TIMEOUT_MS = exports.distributeIntEvenly = exports.projectSupportsProfiles = exports.buildTelemetryEnv = void 0;
+const budget_storage_1 = require("../adapters/budget-storage");
+const __1 = require("..");
+const usage_reader_1 = require("../adapters/usage-reader");
+const __2 = require("..");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const readline_1 = require("readline");
-const ids_1 = require("./ids");
-const win_spawn_1 = require("./util/win-spawn");
-const types_1 = require("./types");
-const command_resolver_1 = require("./command-resolver");
-const rail_isolation_1 = require("./rail-isolation");
-const repo_map_1 = require("./repo-map");
-const cli_prompt_1 = require("./util/cli-prompt");
-const stream_display_1 = require("./util/stream-display");
-const hooks_1 = require("./hooks");
-const ai_invocations_1 = require("./ai-invocations");
-const feature_flags_1 = require("./feature-flags");
-const file_provenance_1 = require("./file-provenance");
-const result_event_1 = require("./result-event");
+const ids_1 = require("../../../ids");
+const win_spawn_1 = require("../../../util/win-spawn");
+const types_1 = require("../../../types");
+const rail_isolation_1 = require("../../delivery/runtime/rail-isolation");
+const repo_map_1 = require("../../../repo-map");
+const cli_prompt_1 = require("../../../util/cli-prompt");
+const stream_display_1 = require("../../../util/stream-display");
+const hooks_1 = require("../../../hooks");
+const ai_invocations_1 = require("../../accounting/runtime/ai-invocations");
+const feature_flags_1 = require("../../../feature-flags");
+const file_provenance_1 = require("../../code/runtime/file-provenance");
+const result_event_1 = require("../../accounting/runtime/result-event");
 const crypto_1 = require("crypto");
-const codex_spawn_1 = require("./plugins/codex-spawn");
-const providers_1 = require("./providers");
-const runtime_1 = require("./providers/runtime");
-const agent_defaults_1 = require("./agent-defaults");
-const codex_otel_bridge_1 = require("./codex-otel-bridge");
-const db_1 = require("./db");
+const codex_spawn_1 = require("../../../plugins/codex-spawn");
+const providers_1 = require("../../../providers");
+const runtime_1 = require("../../../providers/runtime");
+const agent_defaults_1 = require("../../agents/runtime/agent-defaults");
+const codex_otel_bridge_1 = require("../../accounting/runtime/codex-otel-bridge");
+const db_1 = require("../../../db");
 const interactive_job_session_1 = require("./interactive-job-session");
-const attachment_manager_1 = require("./attachment-manager");
-const ticket_store_1 = require("./ticket-store");
-const spec_addenda_1 = require("./spec-addenda");
-const binary_probe_1 = require("./binary-probe");
-const workspace_manager_1 = require("./workspace-manager");
-const claude_trust_1 = require("./claude-trust");
-const workspace_resolution_1 = require("./workspace-resolution");
-const project_env_1 = require("./project-env");
-const framework_manager_1 = require("./framework-manager");
-const openspec_shim_1 = require("./openspec-shim");
-const artifact_registry_1 = require("./artifact-registry");
-// ─── Telemetry env helpers ────────────────────────────────────────────────────
-/** Build the OTLP/telemetry environment variable block for a spawned AI-CLI
- * process. Extracted as a pure function so it is unit-testable without a full
- * spawn.
- *
- * Provider-aware: claude and codex honour the standard `OTEL_*` env-var
- * convention (plus claude's `CLAUDE_CODE_ENABLE_TELEMETRY=1` master switch),
- * but the Gemini CLI does NOT — it reads its own `GEMINI_TELEMETRY_*` prefixed
- * vars (verified against google-gemini/gemini-cli docs/cli/telemetry.md) and
- * defaults to gRPC, so gemini rails need `GEMINI_TELEMETRY_OTLP_PROTOCOL=http`
- * and the OTLP endpoint pointed at our loopback receiver. Resource attributes
- * still flow via the standard `OTEL_RESOURCE_ATTRIBUTES` (read by the OTel JS
- * SDK that the Gemini CLI uses), so the receiver can route by job/project id.
- *
- * The `providerId` argument defaults to `'claude'` so existing claude/codex
- * call paths stay byte-identical. */
-function buildTelemetryEnv(jobId, projectId, desktopPort, extraResourceAttributes = {}, providerId = 'claude') {
-    const baseAttrs = [
-        ['specrails.job_id', jobId],
-        ['specrails.project_id', projectId],
-    ];
-    for (const [k, v] of Object.entries(extraResourceAttributes)) {
-        baseAttrs.push([k, String(v)]);
-    }
-    const resourceAttributes = baseAttrs.map(([k, v]) => `${k}=${v}`).join(',');
-    const endpoint = `http://127.0.0.1:${desktopPort}/otlp`;
-    if (providerId === 'gemini') {
-        // Gemini CLI uses its own env contract (not OTEL_*). Defaults to gRPC, so we
-        // must force the http transport to reach our OTLP/HTTP JSON receiver, and
-        // target the `local` backend (not gcp). OTEL_RESOURCE_ATTRIBUTES is still
-        // honoured by the underlying OTel SDK for job/project routing.
-        return {
-            GEMINI_TELEMETRY_ENABLED: 'true',
-            GEMINI_TELEMETRY_TARGET: 'local',
-            GEMINI_TELEMETRY_OTLP_ENDPOINT: endpoint,
-            GEMINI_TELEMETRY_OTLP_PROTOCOL: 'http',
-            GEMINI_TELEMETRY_TRACES_ENABLED: 'true',
-            OTEL_RESOURCE_ATTRIBUTES: resourceAttributes,
-        };
-    }
-    // claude (master switch + OTEL_*) and codex (OTEL_* only) — byte-identical to
-    // the pre-fix block for both.
-    return {
-        CLAUDE_CODE_ENABLE_TELEMETRY: '1',
-        OTEL_EXPORTER_OTLP_ENDPOINT: endpoint,
-        OTEL_EXPORTER_OTLP_PROTOCOL: 'http/json',
-        OTEL_METRICS_EXPORTER: 'otlp',
-        OTEL_LOGS_EXPORTER: 'otlp',
-        OTEL_TRACES_EXPORTER: 'otlp',
-        OTEL_RESOURCE_ATTRIBUTES: resourceAttributes,
-    };
-}
-/** Detect whether a project's installed specrails-core version supports the
- *  profile-aware pipeline (shipped in 4.1.0). Returns false when the version
- *  file is missing or unparseable so we default to legacy (safer). */
-function projectSupportsProfiles(projectPath) {
-    const candidates = [
-        path_1.default.join(projectPath, '.specrails', 'specrails-version'),
-        path_1.default.join(projectPath, '.specrails-version'),
-    ];
-    for (const p of candidates) {
-        if (!fs_1.default.existsSync(p))
-            continue;
-        try {
-            const raw = fs_1.default.readFileSync(p, 'utf8').trim();
-            const [ma, mi, pa] = raw.split('.').map((n) => parseInt(n, 10));
-            if (isNaN(ma) || isNaN(mi) || isNaN(pa))
-                return false;
-            return ma > 4 || (ma === 4 && mi > 1) || (ma === 4 && mi === 1 && pa >= 0);
-        }
-        catch {
-            return false;
-        }
-    }
-    return false;
-}
-/**
- * Distribute an integer `total` across `n` buckets via the largest-remainder
- * method so the per-bucket values sum EXACTLY back to `total` (no floor loss).
- * Mirrors smash-runner's `distributeInt` — used to split a multi-ticket job's
- * token / turn totals across one ai_invocations row per ticket
- * (COST-ACCOUNTING-AUDIT MED-7). Returns `undefined` per bucket when the input
- * is absent so the row carries NULL rather than a spurious 0.
- */
-function distributeIntEvenly(total, n) {
-    if (total === null || total === undefined)
-        return new Array(n).fill(undefined);
-    const t = Math.trunc(total);
-    const base = Math.floor(t / n);
-    let remainder = t - base * n;
-    const out = new Array(n);
-    for (let i = 0; i < n; i++) {
-        // Hand the leftover to the leading buckets; sign-safe for negative totals.
-        if (remainder > 0) {
-            out[i] = base + 1;
-            remainder -= 1;
-        }
-        else if (remainder < 0) {
-            out[i] = base - 1;
-            remainder += 1;
-        }
-        else
-            out[i] = base;
-    }
-    return out;
-}
+const attachment_manager_1 = require("../../../attachment-manager");
+const ticket_store_1 = require("../../specs/runtime/ticket-store");
+const spec_addenda_1 = require("../../specs/runtime/spec-addenda");
+const binary_probe_1 = require("../../../binary-probe");
+const workspace_manager_1 = require("../../../workspace-manager");
+const claude_trust_1 = require("../../../claude-trust");
+const workspace_resolution_1 = require("../../../workspace-resolution");
+const project_env_1 = require("../../../project-env");
+const framework_manager_1 = require("../../../framework-manager");
+const openspec_shim_1 = require("../../../openspec-shim");
+const artifact_registry_1 = require("../../../artifact-registry");
+const telemetry_env_1 = require("../../../providers/telemetry-env");
+Object.defineProperty(exports, "buildTelemetryEnv", { enumerable: true, get: function () { return telemetry_env_1.buildTelemetryEnv; } });
+const project_profile_support_1 = require("../../../project-profile-support");
+Object.defineProperty(exports, "projectSupportsProfiles", { enumerable: true, get: function () { return project_profile_support_1.projectSupportsProfiles; } });
+const distribute_int_1 = require("../../../util/distribute-int");
+Object.defineProperty(exports, "distributeIntEvenly", { enumerable: true, get: function () { return distribute_int_1.distributeIntEvenly; } });
 function maxNullable(left, right) {
     const safeLeft = typeof left === 'number' && Number.isFinite(left) && left >= 0 ? left : null;
     const safeRight = typeof right === 'number' && Number.isFinite(right) && right >= 0 ? right : null;
@@ -157,24 +57,6 @@ function maxNullable(left, right) {
         return safeLeft;
     return Math.max(safeLeft, safeRight);
 }
-function sanitizeRecoveredResult(result) {
-    const safe = { ...result };
-    const numeric = [
-        'tokens_in', 'tokens_out', 'tokens_cache_read', 'tokens_cache_create',
-        'total_cost_usd', 'num_turns', 'duration_ms', 'duration_api_ms',
-    ];
-    for (const key of numeric) {
-        const value = safe[key];
-        if (value !== undefined && (typeof value !== 'number' || !Number.isFinite(value) || value < 0)) {
-            delete safe[key];
-        }
-    }
-    if (safe.model !== undefined && typeof safe.model !== 'string')
-        delete safe.model;
-    if (safe.session_id !== undefined && typeof safe.session_id !== 'string')
-        delete safe.session_id;
-    return safe;
-}
 const LOG_BUFFER_MAX = 5000;
 const LOG_BUFFER_DROP = 1000;
 exports.DEFAULT_ZOMBIE_TIMEOUT_MS = 1_800_000; // 30 minutes
@@ -1284,13 +1166,6 @@ class QueueManager {
     phasesForCommand(command) {
         return this._phasesForCommand(command);
     }
-    /**
-     * Resolve a slash command into a full prompt with $ARGUMENTS substituted.
-     * Delegates to the shared resolveCommand utility in command-resolver.ts.
-     */
-    _resolveCommand(command) {
-        return (0, command_resolver_1.resolveCommand)(command, this._cwd ?? process.cwd());
-    }
     _phasesForCommand(command) {
         // Extract slug from command strings like "/specrails:implement #5" or "implement"
         const firstToken = command.trim().split(/\s+/)[0];
@@ -1319,67 +1194,14 @@ class QueueManager {
      * locate/replace the rows later.
      */
     _recordJobInvocations(params) {
-        const { jobId, provider, status, startedAt, finishedAt, ticketIds, estimated, result } = params;
         const db = this._db;
         const projectId = this._projectId;
         if (!db || !projectId)
             return [];
-        // Single-ticket / no-ticket: one row, plain jobId (byte-compatible).
-        if (ticketIds.length <= 1) {
-            (0, ai_invocations_1.recordInvocation)(db, {
-                id: (0, crypto_1.randomUUID)(),
-                project_id: projectId,
-                provider,
-                surface: 'job',
-                surface_ref_id: jobId,
-                ticket_id: ticketIds[0] ?? null,
-                conversation_id: params.conversationId ?? null,
-                status,
-                started_at: startedAt,
-                finished_at: finishedAt,
-                total_cost_usd_estimated: estimated,
-                ...result,
-            });
-            return [jobId];
-        }
-        // Multi-ticket: split across one row per ticket. Cost & duration split evenly
-        // as floats; token & turn totals via largest-remainder (sum exactly to total).
-        const n = ticketIds.length;
-        const evenSplit = (v) => v === undefined ? undefined : v / n;
-        const tokensIn = distributeIntEvenly(result.tokens_in, n);
-        const tokensOut = distributeIntEvenly(result.tokens_out, n);
-        const cacheRead = distributeIntEvenly(result.tokens_cache_read, n);
-        const cacheCreate = distributeIntEvenly(result.tokens_cache_create, n);
-        const numTurns = distributeIntEvenly(result.num_turns, n);
-        const refIds = [];
-        ticketIds.forEach((ticketId, i) => {
-            const refId = `${jobId}#t${ticketId}`;
-            refIds.push(refId);
-            (0, ai_invocations_1.recordInvocation)(db, {
-                id: (0, crypto_1.randomUUID)(),
-                project_id: projectId,
-                provider,
-                surface: 'job',
-                surface_ref_id: refId,
-                ticket_id: ticketId,
-                conversation_id: params.conversationId ?? null,
-                status,
-                started_at: startedAt,
-                finished_at: finishedAt,
-                total_cost_usd_estimated: estimated,
-                tokens_in: tokensIn[i],
-                tokens_out: tokensOut[i],
-                tokens_cache_read: cacheRead[i],
-                tokens_cache_create: cacheCreate[i],
-                total_cost_usd: evenSplit(result.total_cost_usd),
-                num_turns: numTurns[i],
-                model: result.model,
-                session_id: result.session_id,
-                duration_ms: evenSplit(result.duration_ms),
-                duration_api_ms: evenSplit(result.duration_api_ms),
-            });
+        return (0, __2.recordJobInvocations)(projectId, params, {
+            newId: crypto_1.randomUUID,
+            write: invocation => (0, ai_invocations_1.recordInvocation)(db, invocation),
         });
-        return refIds;
     }
     /**
      * Local calendar-day start, expressed as a UTC-ISO instant so it compares
@@ -1402,46 +1224,31 @@ class QueueManager {
         if (!db)
             return;
         try {
-            // Per-project daily budget: sum the ai_invocations ledger for the LOCAL day
-            // across ALL statuses + surfaces (failed/aborted runs cost real money).
-            const dailyBudgetRow = db.prepare(`SELECT value FROM queue_state WHERE key = 'config.daily_budget_usd'`).get();
-            if (dailyBudgetRow && this._projectId) {
-                const dailyBudget = parseFloat(dailyBudgetRow.value);
-                if (dailyBudget > 0) {
-                    const fromIso = this._localDayStartIso();
-                    const spendRow = db.prepare(`SELECT COALESCE(SUM(total_cost_usd), 0) as total FROM ai_invocations
-             WHERE project_id = ? AND total_cost_usd IS NOT NULL AND started_at >= ?`).get(this._projectId, fromIso);
-                    const dailySpend = spendRow.total;
-                    if (dailySpend >= dailyBudget) {
-                        const wasPaused = this._paused;
-                        this._paused = true;
-                        if (!wasPaused) {
-                            db.prepare(`INSERT OR REPLACE INTO queue_state (key, value) VALUES ('paused', 'true')`).run();
-                        }
-                        this._broadcast({ type: 'daily_budget_exceeded', projectId: '', dailySpend, budget: dailyBudget, queuePaused: true });
+            const storage = (0, budget_storage_1.createQueueBudgetStorage)(db);
+            (0, __1.enforceDailyBudgets)({
+                project: () => storage.project(this._projectId, () => this._localDayStartIso()),
+                desktop: this._getDesktopDailyBudget ? () => this._getDesktopDailyBudget() : undefined,
+                exceeded: (scope, { budget, totalSpend }) => {
+                    const wasPaused = this._paused;
+                    this._paused = true;
+                    if (!wasPaused)
+                        storage.pause();
+                    if (scope === 'project') {
+                        this._broadcast({ type: 'daily_budget_exceeded', projectId: '', dailySpend: totalSpend, budget, queuePaused: true });
                         try {
-                            this._onBudgetExceeded?.('daily_budget_exceeded', { dailySpend, budget: dailyBudget, queuePaused: true });
+                            this._onBudgetExceeded?.('daily_budget_exceeded', { dailySpend: totalSpend, budget, queuePaused: true });
                         }
                         catch { /* webhook delivery is best-effort */ }
                     }
-                }
-            }
-            // App-level daily budget enforcement (totalSpend computed by the caller).
-            if (this._getDesktopDailyBudget) {
-                const { budget: desktopBudget, totalSpend: desktopTotalSpend } = this._getDesktopDailyBudget();
-                if (desktopBudget != null && desktopBudget > 0 && desktopTotalSpend >= desktopBudget) {
-                    const wasPaused = this._paused;
-                    this._paused = true;
-                    if (!wasPaused) {
-                        db.prepare(`INSERT OR REPLACE INTO queue_state (key, value) VALUES ('paused', 'true')`).run();
-                    }
-                    this._broadcast({ type: 'desktop_daily_budget_exceeded', projectId: '', desktopDailySpend: desktopTotalSpend, desktopBudget, queuePaused: true });
-                    try {
-                        this._onBudgetExceeded?.('desktop_daily_budget_exceeded', { desktopDailySpend: desktopTotalSpend, desktopBudget, queuePaused: true });
+                    else {
+                        this._broadcast({ type: 'desktop_daily_budget_exceeded', projectId: '', desktopDailySpend: totalSpend, desktopBudget: budget, queuePaused: true });
+                        try {
+                            this._onBudgetExceeded?.('desktop_daily_budget_exceeded', { desktopDailySpend: totalSpend, desktopBudget: budget, queuePaused: true });
+                        }
+                        catch { /* webhook delivery is best-effort */ }
                     }
-                    catch { /* webhook delivery is best-effort */ }
-                }
-            }
+                },
+            });
         }
         catch (err) {
             console.error('[queue-manager] daily-budget enforcement failed (db unavailable?):', err);
@@ -1549,19 +1356,7 @@ class QueueManager {
         // an invalid caller: only unique, presently-queued jobs may reach start.
         // In particular, a duplicated id must not relaunch after its first run
         // becomes terminal.
-        const seen = new Set();
-        const normalizedQueue = [];
-        const removedJobIds = [];
-        for (const id of this._queue) {
-            if (seen.has(id))
-                continue;
-            seen.add(id);
-            const candidate = this._jobs.get(id);
-            if (candidate?.status === 'queued')
-                normalizedQueue.push(id);
-            else
-                removedJobIds.push(id);
-        }
+        const { normalizedQueue, removedJobIds } = (0, __2.normalizePendingQueue)(this._queue, this._jobs);
         if (normalizedQueue.length !== this._queue.length) {
             this._queue = normalizedQueue;
             this._recomputePositions();
@@ -2348,10 +2143,10 @@ class QueueManager {
                 const selection = this._jobProfileSelection.get(jobId); // undefined|null|string
                 // When relocated, core + `.specrails/profiles` live in the workspace
                 // (execution.cwd); legacy reads from the repo (execution.cwd === repo).
-                const coreSupports = projectSupportsProfiles(execution.cwd);
+                const coreSupports = (0, project_profile_support_1.projectSupportsProfiles)(execution.cwd);
                 if (selection !== null && coreSupports) {
                     // selection is string (explicit) or undefined (default resolution)
-                    const { resolveProfile, snapshotForJob, persistJobProfile, } = require('./profile-manager');
+                    const { resolveProfile, snapshotForJob, persistJobProfile, } = require('../../agents/runtime/profile-manager');
                     let resolved = resolveProfile(execution.cwd, selection ?? undefined, adapter.id);
                     // Global agent defaults: fill per-agent model gaps in the resolved
                     // profile, or synthesize a baseline profile when the project has
@@ -2438,7 +2233,7 @@ class QueueManager {
                 extra['specrails.framework_version'] = frameworkVersion;
             spawnEnv = {
                 ...spawnEnv,
-                ...buildTelemetryEnv(jobId, this._projectId, this._desktopPort, extra, adapter.id),
+                ...(0, telemetry_env_1.buildTelemetryEnv)(jobId, this._projectId, this._desktopPort, extra, adapter.id),
             };
         }
         // Inject the profile path whenever the adapter honours it (was: claude-
@@ -2465,7 +2260,7 @@ class QueueManager {
                 let resolver = this._resolvePluginsForSpawn;
                 let snapshotter = null;
                 if (!resolver) {
-                    const pluginIntegration = require('./plugins/rail-integration');
+                    const pluginIntegration = require('../../../plugins/rail-integration');
                     resolver = pluginIntegration.resolvePluginsForSpawn;
                     snapshotter = pluginIntegration.snapshotPluginsForJob;
                 }
@@ -2481,7 +2276,7 @@ class QueueManager {
                 if (pluginActive.length > 0 || pluginDegraded.length > 0) {
                     // The injected resolver normally returns an empty test fixture. Load
                     // the snapshotter lazily only if its result actually needs one.
-                    snapshotter ??= require('./plugins/rail-integration').snapshotPluginsForJob;
+                    snapshotter ??= require('../../../plugins/rail-integration').snapshotPluginsForJob;
                     pluginSnapshotPath = snapshotter(this._projectSlug, jobId, this._projectId, pluginActive, pluginDegraded);
                 }
                 for (const d of pluginDegraded) {
@@ -2534,7 +2329,7 @@ class QueueManager {
                 }
                 spawnEnv = {
                     ...spawnEnv,
-                    ...buildTelemetryEnv(jobId, this._projectId, this._desktopPort, extra),
+                    ...(0, telemetry_env_1.buildTelemetryEnv)(jobId, this._projectId, this._desktopPort, extra),
                 };
             }
         }
@@ -3388,7 +3183,7 @@ class QueueManager {
         });
         try {
             const finalised = (0, result_event_1.finaliseInvocationResult)(adapter, adapterEvents, { fallbackModel: spawnedModel });
-            const normalised = sanitizeRecoveredResult(finalised.result);
+            const normalised = (0, __2.sanitizeRecoveredResult)(finalised.result);
             const estimated = finalised.estimated;
             const hasRealSpend = (normalised.total_cost_usd ?? 0) > 0 ||
                 (normalised.tokens_in ?? 0) > 0 ||
@@ -3706,7 +3501,7 @@ class QueueManager {
         if (!job.dependsOnJobId)
             return true;
         const parentStatus = this._getDependencyStatus(job.dependsOnJobId);
-        return parentStatus === null || parentStatus === 'completed';
+        return (0, __2.isDependencySatisfied)(parentStatus);
     }
     _skipDependents(parentJobId, reason) {
         const toSkip = [];
@@ -3857,8 +3652,7 @@ class QueueManager {
      * cumulative cost/turn snapshot, so segments must be folded exactly like the
      * live session; assistant-only tail frames are one estimated in-flight turn. */
     _recoverPersistedJobUsage(jobId, providerId, fallbackModel, interactive) {
-        const db = this._db;
-        if (!db)
+        if (!this._db)
             return { result: {}, estimated: false, authoritative: false };
         let adapter;
         try {
@@ -3867,218 +3661,7 @@ class QueueManager {
         catch {
             adapter = this._adapter;
         }
-        const parse = (row) => {
-            try {
-                return (0, runtime_1.parseStreamEvents)(adapter, row.payload);
-            }
-            catch (err) {
-                console.warn(`[queue-manager] ignored malformed durable event for ${jobId}:`, err);
-                return [];
-            }
-        };
-        const makeUsageAccumulator = () => {
-            const totals = {
-                tokens_in: 0,
-                tokens_out: 0,
-                tokens_cache_read: 0,
-                tokens_cache_create: 0,
-                total_cost_usd: 0,
-                num_turns: 0,
-                duration_ms: 0,
-                duration_api_ms: 0,
-            };
-            let model = fallbackModel ?? undefined;
-            let sessionId;
-            let estimated = false;
-            const snapshots = new Map();
-            const MAX_SNAPSHOT_KEYS = 4_096;
-            const add = (event, seq) => {
-                const finalised = (0, result_event_1.finaliseInvocationResult)(adapter, [event], { fallbackModel: model });
-                const result = sanitizeRecoveredResult(finalised.result);
-                const raw = event.kind === 'other' ? event.raw : null;
-                const message = raw && typeof raw.message === 'object' && raw.message
-                    ? raw.message
-                    : null;
-                const directMessageId = event.messageId;
-                const messageId = directMessageId ?? (message && typeof message.id === 'string' ? message.id : undefined);
-                const stableId = messageId ? `message:${messageId}` : `${event.kind}:${seq}`;
-                const previous = snapshots.get(stableId) ?? {};
-                const addDelta = (key) => {
-                    const current = result[key];
-                    if (typeof current !== 'number')
-                        return;
-                    const prior = previous[key];
-                    totals[key] += Math.max(0, current - (typeof prior === 'number' ? prior : 0));
-                };
-                addDelta('tokens_in');
-                addDelta('tokens_out');
-                addDelta('tokens_cache_read');
-                addDelta('tokens_cache_create');
-                addDelta('total_cost_usd');
-                addDelta('num_turns');
-                addDelta('duration_ms');
-                addDelta('duration_api_ms');
-                model = result.model ?? model;
-                sessionId = result.session_id ?? sessionId;
-                estimated = estimated || finalised.estimated;
-                if (!snapshots.has(stableId) && snapshots.size >= MAX_SNAPSHOT_KEYS) {
-                    snapshots.delete(snapshots.keys().next().value);
-                }
-                // Frames for one provider message are contiguous; retain a bounded LRU
-                // of recent snapshots for retransmission/delta dedupe without letting a
-                // malicious transcript allocate one map entry per event forever.
-                snapshots.delete(stableId);
-                snapshots.set(stableId, { ...previous, ...result });
-            };
-            const result = () => {
-                const hasUsage = Object.values(totals).some((value) => value > 0);
-                return {
-                    result: hasUsage ? { ...totals, model, session_id: sessionId } : {},
-                    estimated,
-                };
-            };
-            return { add, result };
-        };
-        if (!interactive) {
-            const accumulator = makeUsageAccumulator();
-            let lastValidResult = null;
-            const events = db.prepare(`
-        SELECT seq, event_type, payload FROM events
-         WHERE job_id = ? AND source = 'stdout' AND event_type != 'log'
-         ORDER BY seq, id
-      `).iterate(jobId);
-            for (const row of events) {
-                for (const event of parse(row)) {
-                    if (event.kind === 'result') {
-                        const finalised = (0, result_event_1.finaliseInvocationResult)(adapter, [event], {
-                            fallbackModel: fallbackModel ?? undefined,
-                        });
-                        lastValidResult = {
-                            ...finalised,
-                            result: sanitizeRecoveredResult(finalised.result),
-                        };
-                    }
-                    else {
-                        accumulator.add(event, row.seq);
-                    }
-                }
-            }
-            const fallback = accumulator.result();
-            if (lastValidResult) {
-                const result = { ...fallback.result };
-                for (const [key, value] of Object.entries(lastValidResult.result)) {
-                    // Provider normalisers intentionally retain optional keys with an
-                    // undefined value. Only concrete terminal fields are authoritative;
-                    // an omitted field must not erase recoverable assistant evidence.
-                    if (value !== undefined) {
-                        result[key] = value;
-                    }
-                }
-                return {
-                    result,
-                    // A native terminal cost is authoritative. When the terminal frame
-                    // omits cost, preserve whether the assistant-frame backfill was an
-                    // estimate instead of silently relabelling it as exact.
-                    estimated: result.total_cost_usd === lastValidResult.result.total_cost_usd &&
-                        lastValidResult.result.total_cost_usd !== undefined
-                        ? lastValidResult.estimated
-                        : (lastValidResult.estimated || fallback.estimated),
-                    authoritative: true,
-                };
-            }
-            return { ...fallback, authoritative: false };
-        }
-        const totals = {
-            tokens_in: 0,
-            tokens_out: 0,
-            tokens_cache_read: 0,
-            tokens_cache_create: 0,
-            total_cost_usd: 0,
-            num_turns: 0,
-            duration_ms: 0,
-            duration_api_ms: 0,
-        };
-        let model = fallbackModel ?? undefined;
-        let sessionId;
-        let baselineCost = 0;
-        let baselineTurns = 0;
-        let estimated = false;
-        let lastResultSeq = -1;
-        const resultRows = db.prepare(`
-      SELECT seq, event_type, payload FROM events
-       WHERE job_id = ? AND source = 'stdout' AND event_type = 'result'
-       ORDER BY seq, id
-    `).iterate(jobId);
-        for (const row of resultRows) {
-            for (const event of parse(row)) {
-                if (event.kind !== 'result')
-                    continue;
-                const finalised = (0, result_event_1.finaliseInvocationResult)(adapter, [event], { fallbackModel: model });
-                const result = sanitizeRecoveredResult(finalised.result);
-                totals.tokens_in += result.tokens_in ?? 0;
-                totals.tokens_out += result.tokens_out ?? 0;
-                totals.tokens_cache_read += result.tokens_cache_read ?? 0;
-                totals.tokens_cache_create += result.tokens_cache_create ?? 0;
-                const cumulativeCost = result.total_cost_usd ?? baselineCost;
-                totals.total_cost_usd += Math.max(0, cumulativeCost - baselineCost);
-                baselineCost = cumulativeCost;
-                const cumulativeTurns = result.num_turns ?? (baselineTurns + 1);
-                totals.num_turns += Math.max(0, cumulativeTurns - baselineTurns);
-                baselineTurns = cumulativeTurns;
-                totals.duration_ms += result.duration_ms ?? 0;
-                totals.duration_api_ms += result.duration_api_ms ?? 0;
-                model = result.model ?? model;
-                sessionId = result.session_id ?? sessionId;
-                estimated = estimated || finalised.estimated;
-                lastResultSeq = row.seq;
-            }
-        }
-        const tail = makeUsageAccumulator();
-        const tailRows = db.prepare(`
-      SELECT seq, event_type, payload FROM events
-       WHERE job_id = ? AND source = 'stdout' AND event_type != 'log' AND seq > ?
-       ORDER BY seq, id
-    `).iterate(jobId, lastResultSeq);
-        for (const row of tailRows) {
-            for (const event of parse(row)) {
-                if (event.kind !== 'result')
-                    tail.add(event, row.seq);
-            }
-        }
-        const tailUsage = tail.result();
-        const tailResult = tailUsage.result;
-        const hasTailUsage = [
-            tailResult.tokens_in,
-            tailResult.tokens_out,
-            tailResult.tokens_cache_read,
-            tailResult.tokens_cache_create,
-            tailResult.total_cost_usd,
-        ].some((value) => typeof value === 'number' && value > 0);
-        if (hasTailUsage) {
-            totals.tokens_in += tailResult.tokens_in ?? 0;
-            totals.tokens_out += tailResult.tokens_out ?? 0;
-            totals.tokens_cache_read += tailResult.tokens_cache_read ?? 0;
-            totals.tokens_cache_create += tailResult.tokens_cache_create ?? 0;
-            totals.total_cost_usd += tailResult.total_cost_usd ?? 0;
-            totals.num_turns += tailResult.num_turns ?? 1;
-            totals.duration_ms += tailResult.duration_ms ?? 0;
-            totals.duration_api_ms += tailResult.duration_api_ms ?? 0;
-            model = tailResult.model ?? model;
-            sessionId = tailResult.session_id ?? sessionId;
-            estimated = estimated || tailUsage.estimated;
-        }
-        const hasRecoveredUsage = Object.values(totals).some((value) => value > 0);
-        return {
-            result: hasRecoveredUsage
-                ? {
-                    ...totals,
-                    model,
-                    session_id: sessionId,
-                }
-                : {},
-            estimated,
-            authoritative: false,
-        };
+        return (0, __2.recoverJobUsage)((0, usage_reader_1.createDurableUsageReader)(this._db, jobId, adapter), fallbackModel, interactive);
     }
     _decodeRecoveryPayload(jobId, encoded) {
         const payload = JSON.parse(encoded);