commandmate 0.27.1 → 0.28.0

package/dist/server/src/lib/db/agent-instances-db.js

@@ -20,6 +20,11 @@ exports.countAgentInstances = countAgentInstances;
 exports.setAgentInstances = setAgentInstances;
 exports.addAgentInstance = addAgentInstance;
 exports.removeAgentInstance = removeAgentInstance;
+exports.getOpencodeInstanceSettings = getOpencodeInstanceSettings;
+exports.getOpencodeInstanceSettingsByWorktree = getOpencodeInstanceSettingsByWorktree;
+exports.setOpencodeInstanceSettings = setOpencodeInstanceSettings;
+exports.pruneOpencodeInstanceSettings = pruneOpencodeInstanceSettings;
+const opencode_instance_settings_1 = require("../../types/opencode-instance-settings");
 const types_1 = require("../../lib/cli-tools/types");
 /**
  * Thrown when an operation would exceed MAX_AGENT_INSTANCES for a worktree.
@@ -190,6 +195,10 @@ function setAgentInstances(db, worktreeId, instances) {
     const now = Date.now();
     const replace = db.transaction(() => {
         db.prepare(`DELETE FROM agent_instances WHERE worktree_id = ?`).run(worktreeId);
+        // Issue #2048: the settings table is keyed on an instance id and this write
+        // is a full replace, so an instance dropped from the roster would otherwise
+        // leave its opencode settings behind for whoever next claimed that id.
+        pruneOpencodeInstanceSettings(db, worktreeId, instances.map((instance) => instance.id));
         const insertStmt = db.prepare(`
       INSERT INTO agent_instances
         (worktree_id, instance_id, cli_tool_id, alias, sort_order, created_at)
@@ -237,6 +246,126 @@ function addAgentInstance(db, worktreeId, instance) {
 function removeAgentInstance(db, worktreeId, instanceId) {
     const result = db.prepare(`
     DELETE FROM agent_instances WHERE worktree_id = ? AND instance_id = ?
+  `).run(worktreeId, instanceId);
+    // Issue #2048: same rule as the replace above — the instance is gone, so what
+    // it was configured to launch opencode with is gone with it.
+    db.prepare(`
+    DELETE FROM opencode_instance_settings WHERE worktree_id = ? AND instance_id = ?
   `).run(worktreeId, instanceId);
     return result.changes > 0;
 }
+/**
+ * What this instance should launch and prompt opencode with (Issue #2048).
+ *
+ * Answers the all-unset settings for an instance with no row, which is every
+ * instance until the settings pane writes one — and for an instance backed by
+ * any other CLI tool, which never gets a row at all. The stored values are
+ * re-validated on the way out rather than trusted: the row may have been written
+ * by a build with a wider pattern, and the `agent` / `provider_id` / `model_id`
+ * columns end up on a **shell command line**.
+ *
+ * @param db - Database instance
+ * @param worktreeId - Worktree ID
+ * @param instanceId - Instance ID (the primary instance uses the CLI tool id)
+ */
+function getOpencodeInstanceSettings(db, worktreeId, instanceId) {
+    const row = db.prepare(`
+    SELECT agent, provider_id, model_id, variant
+    FROM opencode_instance_settings
+    WHERE worktree_id = ? AND instance_id = ?
+  `).get(worktreeId, instanceId);
+    if (!row)
+        return { ...opencode_instance_settings_1.EMPTY_OPENCODE_INSTANCE_SETTINGS };
+    return (0, opencode_instance_settings_1.normalizeOpencodeInstanceSettings)({
+        agent: row.agent,
+        providerId: row.provider_id,
+        modelId: row.model_id,
+        variant: row.variant,
+    });
+}
+/**
+ * Every opencode setting stored for a worktree, keyed by instance id.
+ *
+ * One statement rather than one per roster entry: the settings pane asks for the
+ * whole worktree at once, and an instance with no row is simply absent from the
+ * result — callers fill it with {@link EMPTY_OPENCODE_INSTANCE_SETTINGS}.
+ */
+function getOpencodeInstanceSettingsByWorktree(db, worktreeId) {
+    const rows = db.prepare(`
+    SELECT instance_id, agent, provider_id, model_id, variant
+    FROM opencode_instance_settings
+    WHERE worktree_id = ?
+  `).all(worktreeId);
+    const settings = {};
+    for (const row of rows) {
+        settings[row.instance_id] = (0, opencode_instance_settings_1.normalizeOpencodeInstanceSettings)({
+            agent: row.agent,
+            providerId: row.provider_id,
+            modelId: row.model_id,
+            variant: row.variant,
+        });
+    }
+    return settings;
+}
+/**
+ * Write one instance's opencode settings.
+ *
+ * Validated before the write as well as after the read — a value that would not
+ * survive {@link normalizeOpencodeInstanceSettings} is stored as null rather
+ * than kept, so nothing unusable ever reaches the launcher even if a later build
+ * loosens the reader.
+ *
+ * An all-unset write **deletes the row** instead of storing four nulls. The two
+ * states are indistinguishable to every reader, and the delete keeps the table
+ * to the instances somebody actually configured.
+ *
+ * @throws InvalidAgentInstanceError when the instance id is not a valid one
+ */
+function setOpencodeInstanceSettings(db, worktreeId, instanceId, settings, at = Date.now()) {
+    if (!(0, types_1.isValidInstanceId)(instanceId)) {
+        throw new InvalidAgentInstanceError(`Invalid instance id: ${String(instanceId)}`);
+    }
+    const normalized = (0, opencode_instance_settings_1.normalizeOpencodeInstanceSettings)(settings);
+    if (!(0, opencode_instance_settings_1.hasOpencodeInstanceSettings)(normalized)) {
+        db.prepare(`
+      DELETE FROM opencode_instance_settings WHERE worktree_id = ? AND instance_id = ?
+    `).run(worktreeId, instanceId);
+        return normalized;
+    }
+    db.prepare(`
+    INSERT INTO opencode_instance_settings
+      (worktree_id, instance_id, agent, provider_id, model_id, variant, updated_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?)
+    ON CONFLICT(worktree_id, instance_id) DO UPDATE SET
+      agent = excluded.agent,
+      provider_id = excluded.provider_id,
+      model_id = excluded.model_id,
+      variant = excluded.variant,
+      updated_at = excluded.updated_at
+  `).run(worktreeId, instanceId, normalized.agent, normalized.providerId, normalized.modelId, normalized.variant, at);
+    return normalized;
+}
+/**
+ * Drop the settings of instances that are no longer in the roster.
+ *
+ * Called by {@link setAgentInstances} and {@link removeAgentInstance}, because
+ * `opencode_instance_settings` is keyed on an instance id and nothing else would
+ * ever remove a row for an instance the operator deleted. Re-adding an instance
+ * under the same id therefore starts from opencode's defaults rather than
+ * inheriting a setting from a roster entry that no longer exists.
+ *
+ * @param keepInstanceIds - The ids that survive; every other row is deleted
+ * @returns How many rows were removed
+ */
+function pruneOpencodeInstanceSettings(db, worktreeId, keepInstanceIds) {
+    if (keepInstanceIds.length === 0) {
+        return db.prepare(`
+      DELETE FROM opencode_instance_settings WHERE worktree_id = ?
+    `).run(worktreeId).changes;
+    }
+    const placeholders = keepInstanceIds.map(() => '?').join(', ');
+    return db.prepare(`
+    DELETE FROM opencode_instance_settings
+    WHERE worktree_id = ? AND instance_id NOT IN (${placeholders})
+  `).run(worktreeId, ...keepInstanceIds).changes;
+}

package/dist/server/src/lib/db/agent-session-cost-db.js

@@ -0,0 +1,204 @@
+"use strict";
+/**
+ * Agent session cost ledger (Issue #2044)
+ *
+ * CRUD for `agent_session_costs` — the durable half of what
+ * `lib/hooks/agent-session-telemetry` keeps in memory. See migration v58 for
+ * why the table exists, why `session_id` is the key and why writes overwrite
+ * rather than accumulate.
+ *
+ * Everything here is a pure function of `(db, args)`; the thing that decides
+ * *when* to write lives in `./agent-session-cost-sampler`.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.recordAgentSessionCost = recordAgentSessionCost;
+exports.getAgentSessionCostsByDate = getAgentSessionCostsByDate;
+exports.getDailyAgentCostSummary = getDailyAgentCostSummary;
+exports.deleteAgentSessionCostsByDate = deleteAgentSessionCostsByDate;
+// =============================================================================
+// Row Mapping
+// =============================================================================
+function mapRow(row) {
+    return {
+        sessionId: row.session_id,
+        worktreeId: row.worktree_id,
+        cliToolId: row.cli_tool_id,
+        instanceId: row.instance_id,
+        date: row.date,
+        title: row.title,
+        agent: row.agent,
+        model: row.model,
+        provider: row.provider,
+        cost: row.cost,
+        tokensInput: row.tokens_input,
+        tokensOutput: row.tokens_output,
+        tokensReasoning: row.tokens_reasoning,
+        tokensCacheRead: row.tokens_cache_read,
+        tokensCacheWrite: row.tokens_cache_write,
+        firstSeenAt: row.first_seen_at,
+        observedAt: row.observed_at,
+    };
+}
+const COST_COLUMNS = 'session_id, worktree_id, cli_tool_id, instance_id, date, title, agent, model, provider, ' +
+    'cost, tokens_input, tokens_output, tokens_reasoning, tokens_cache_read, tokens_cache_write, ' +
+    'first_seen_at, observed_at';
+/**
+ * Insert or refresh one session's ledger row.
+ *
+ * `ON CONFLICT(session_id)` updates the spend columns and `observed_at`, and
+ * leaves `date` and `first_seen_at` alone. That asymmetry is the whole point:
+ * the numbers are cumulative and must be *replaced* (see migration v58), while
+ * the day the session opened must not move when a long conversation is sampled
+ * again after midnight.
+ *
+ * `worktree_id` is refreshed too, because an instance can be re-registered
+ * against a renamed worktree id between samples and the ledger should follow
+ * the live one rather than keep a dead reference.
+ *
+ * @param db - Database instance
+ * @param input - The sample
+ * @returns Whether a row was inserted or updated (false when the write was a
+ *   no-op because the worktree row is gone — the FK refuses it)
+ */
+function recordAgentSessionCost(db, input) {
+    const stmt = db.prepare(`
+    INSERT INTO agent_session_costs (
+      session_id, worktree_id, cli_tool_id, instance_id, date, title, agent, model, provider,
+      cost, tokens_input, tokens_output, tokens_reasoning, tokens_cache_read, tokens_cache_write,
+      first_seen_at, observed_at
+    ) VALUES (
+      @sessionId, @worktreeId, @cliToolId, @instanceId, @date, @title, @agent, @model, @provider,
+      @cost, @tokensInput, @tokensOutput, @tokensReasoning, @tokensCacheRead, @tokensCacheWrite,
+      @observedAt, @observedAt
+    )
+    ON CONFLICT(session_id) DO UPDATE SET
+      worktree_id = excluded.worktree_id,
+      cli_tool_id = excluded.cli_tool_id,
+      instance_id = excluded.instance_id,
+      title = excluded.title,
+      agent = excluded.agent,
+      model = excluded.model,
+      provider = excluded.provider,
+      cost = excluded.cost,
+      tokens_input = excluded.tokens_input,
+      tokens_output = excluded.tokens_output,
+      tokens_reasoning = excluded.tokens_reasoning,
+      tokens_cache_read = excluded.tokens_cache_read,
+      tokens_cache_write = excluded.tokens_cache_write,
+      observed_at = excluded.observed_at
+  `);
+    const result = stmt.run({
+        sessionId: input.sessionId,
+        worktreeId: input.worktreeId,
+        cliToolId: input.cliToolId,
+        instanceId: input.instanceId,
+        date: input.date,
+        title: input.title,
+        agent: input.agent,
+        model: input.model,
+        provider: input.provider,
+        cost: input.cost,
+        tokensInput: input.tokensInput,
+        tokensOutput: input.tokensOutput,
+        tokensReasoning: input.tokensReasoning,
+        tokensCacheRead: input.tokensCacheRead,
+        tokensCacheWrite: input.tokensCacheWrite,
+        observedAt: input.observedAt,
+    });
+    return result.changes > 0;
+}
+// =============================================================================
+// Read
+// =============================================================================
+/**
+ * Every session recorded for a day, newest sample first.
+ *
+ * @param db - Database instance
+ * @param date - `YYYY-MM-DD`
+ */
+function getAgentSessionCostsByDate(db, date) {
+    const rows = db
+        .prepare(`SELECT ${COST_COLUMNS} FROM agent_session_costs WHERE date = ? ORDER BY observed_at DESC, session_id`)
+        .all(date);
+    return rows.map(mapRow);
+}
+/**
+ * A day's spend, per worktree and in total.
+ *
+ * The per-worktree rows are what `opencode stats --project <path>` reports for
+ * that project, and the total is what `opencode stats` reports across all of
+ * them — provided the ledger saw every session, which is the sampler's job and
+ * not this query's. Sorted by cost descending with NULLs last, so "which
+ * worktree is expensive" is the first line rather than a scan.
+ *
+ * @param db - Database instance
+ * @param date - `YYYY-MM-DD`
+ * @param cliToolId - Optional filter; omit for every tool that reported
+ */
+function getDailyAgentCostSummary(db, date, cliToolId) {
+    const where = cliToolId ? 'WHERE date = ? AND cli_tool_id = ?' : 'WHERE date = ?';
+    const params = cliToolId ? [date, cliToolId] : [date];
+    const rows = db
+        .prepare(`SELECT
+         worktree_id,
+         COUNT(*) AS sessions,
+         SUM(cost) AS cost,
+         SUM(tokens_input) AS tokens_input,
+         SUM(tokens_output) AS tokens_output,
+         SUM(tokens_reasoning) AS tokens_reasoning,
+         SUM(tokens_cache_read) AS tokens_cache_read,
+         SUM(tokens_cache_write) AS tokens_cache_write
+       FROM agent_session_costs
+       ${where}
+       GROUP BY worktree_id
+       ORDER BY cost IS NULL, cost DESC, worktree_id`)
+        .all(...params);
+    const worktrees = rows.map((row) => ({
+        worktreeId: row.worktree_id,
+        sessions: row.sessions,
+        cost: row.cost,
+        tokensInput: row.tokens_input,
+        tokensOutput: row.tokens_output,
+        tokensReasoning: row.tokens_reasoning,
+        tokensCacheRead: row.tokens_cache_read,
+        tokensCacheWrite: row.tokens_cache_write,
+    }));
+    return { date, worktrees, total: sumWorktreeCosts(worktrees) };
+}
+/**
+ * Add the per-worktree rows up, preserving "nobody said" as null.
+ *
+ * Done in TypeScript rather than a second `SUM()` query so the total is
+ * arithmetically the same numbers the caller is about to print — a rollup query
+ * could disagree with the rows above it if the two ever drifted on filtering,
+ * and a report whose total does not match its own lines is worse than no total.
+ */
+function sumWorktreeCosts(worktrees) {
+    const add = (pick) => {
+        let sum = null;
+        for (const row of worktrees) {
+            const value = pick(row);
+            if (value === null)
+                continue;
+            sum = (sum ?? 0) + value;
+        }
+        return sum;
+    };
+    return {
+        sessions: worktrees.reduce((acc, row) => acc + row.sessions, 0),
+        cost: add((row) => row.cost),
+        tokensInput: add((row) => row.tokensInput),
+        tokensOutput: add((row) => row.tokensOutput),
+        tokensReasoning: add((row) => row.tokensReasoning),
+        tokensCacheRead: add((row) => row.tokensCacheRead),
+        tokensCacheWrite: add((row) => row.tokensCacheWrite),
+    };
+}
+/**
+ * Delete the ledger rows for a day. Test seam and manual-reset affordance.
+ *
+ * @returns Number of rows removed
+ */
+function deleteAgentSessionCostsByDate(db, date) {
+    return db.prepare('DELETE FROM agent_session_costs WHERE date = ?').run(date).changes;
+}

package/dist/server/src/lib/db/agent-session-cost-sampler.js

@@ -0,0 +1,194 @@
+"use strict";
+/**
+ * Copy the live agent-session telemetry into the durable ledger (Issue #2044).
+ *
+ * ## What this is, and what it deliberately is not
+ *
+ * It is **not** a second reader of `session.updated`. #2040's record is the one
+ * and only mapping of that frame, and adding another would give CommandMate two
+ * opinions about one number — the failure #2040's own module comment is written
+ * to prevent. This module reads that finished record, through its public getter,
+ * and writes it to `agent_session_costs`.
+ *
+ * It is a **sampler** because the record it copies is cumulative-per-session
+ * (measured; see migration v58) and dies when the pane is killed. Cumulative
+ * means "any sample after the last update is sufficient and no sample is
+ * double-counted"; dying means "a sample has to happen before the pane closes".
+ * Together those give the design: look periodically, overwrite by session id,
+ * and never add.
+ *
+ * ## Why the key enumeration reaches into `globalThis`
+ *
+ * `lib/hooks/agent-session-telemetry` exports a getter keyed by
+ * `(worktreeId, cliToolId, instanceId)` and no iterator, and that module is
+ * owned by a different Issue (#2041) for the duration of this work. The keys are
+ * `buildCompositeKey()` output — `worktreeId:cliToolId[:instanceId]`, with the
+ * separator forbidden inside either id by that function's own guards — so they
+ * parse unambiguously. Only the *keys* are taken that way; every **value** comes
+ * back through `getAgentSessionTelemetry()`, so the record's shape stays that
+ * module's business. Adding an iterator there and deleting
+ * {@link listTelemetryTargets} is the tidier end state and costs one export.
+ *
+ * @module lib/db/agent-session-cost-sampler
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AGENT_SESSION_COST_SAMPLE_INTERVAL_MS = void 0;
+exports.localDateKey = localDateKey;
+exports.listTelemetryTargets = listTelemetryTargets;
+exports.sampleAgentSessionCosts = sampleAgentSessionCosts;
+exports.startAgentSessionCostSampler = startAgentSessionCostSampler;
+exports.stopAgentSessionCostSampler = stopAgentSessionCostSampler;
+const agent_session_telemetry_1 = require("../../lib/hooks/agent-session-telemetry");
+const types_1 = require("../../lib/cli-tools/types");
+const logger_1 = require("../../lib/logger");
+const agent_session_cost_db_1 = require("./agent-session-cost-db");
+const logger = (0, logger_1.createLogger)('agent-session-cost-sampler');
+/**
+ * How often the background sampler looks.
+ *
+ * A minute is short next to how long a session lives and long next to how
+ * cheaply a Map is walked; the value is not load-bearing for correctness, only
+ * for how much of a session's tail is lost if the pane is killed between
+ * samples. Cumulative numbers are what make that true — see the module comment.
+ */
+exports.AGENT_SESSION_COST_SAMPLE_INTERVAL_MS = 60_000;
+/**
+ * The local calendar day of an instant, as `YYYY-MM-DD`.
+ *
+ * Local rather than UTC, and hand-formatted rather than `toISOString()`, because
+ * this string is compared against `daily_reports.date`, which
+ * `daily-summary-generator` builds from `new Date(date + 'T00:00:00')` — a local
+ * midnight. Using UTC here would file the evening's sessions under tomorrow for
+ * anyone east of Greenwich.
+ */
+function localDateKey(at) {
+    const d = new Date(at);
+    const year = d.getFullYear();
+    const month = String(d.getMonth() + 1).padStart(2, '0');
+    const day = String(d.getDate()).padStart(2, '0');
+    return `${year}-${month}-${day}`;
+}
+/**
+ * Every instance the telemetry map currently holds a record for.
+ *
+ * Keys that do not parse — an unknown CLI tool id, a shape
+ * `buildCompositeKey()` would not produce — are skipped rather than guessed at.
+ * A malformed key means somebody wrote to the map by hand, and inventing a
+ * worktree id for it would put a real cost against a worktree that never
+ * incurred it.
+ */
+function listTelemetryTargets() {
+    const records = globalThis.__agentSessionTelemetry;
+    if (!records)
+        return [];
+    const targets = [];
+    for (const key of records.keys()) {
+        const parts = key.split(':');
+        if (parts.length < 2 || parts.length > 3)
+            continue;
+        const [worktreeId, cliToolId, instanceId] = parts;
+        if (!worktreeId || !(0, types_1.isCliToolType)(cliToolId))
+            continue;
+        targets.push({ worktreeId, cliToolId, instanceId: instanceId || undefined });
+    }
+    return targets;
+}
+/**
+ * Copy every live telemetry record into the ledger.
+ *
+ * A record with no session id is skipped: the ledger is keyed by the agent's own
+ * id, and a synthetic key would let one conversation appear twice under two
+ * invented names, which is precisely the double-count last-write-wins exists to
+ * avoid.
+ *
+ * Individual write failures are logged and stepped over rather than aborting the
+ * sweep — the common one is the FK refusing a worktree that was deleted between
+ * the map write and this call, which is not a reason to stop sampling the
+ * others.
+ *
+ * @param db - Database instance
+ * @param now - Epoch ms to stamp the samples with (injected for tests)
+ * @returns How many rows were written
+ */
+function sampleAgentSessionCosts(db, now = Date.now()) {
+    let written = 0;
+    for (const target of listTelemetryTargets()) {
+        const record = (0, agent_session_telemetry_1.getAgentSessionTelemetry)(target.worktreeId, target.cliToolId, target.instanceId);
+        if (!record || !record.id)
+            continue;
+        try {
+            const inserted = (0, agent_session_cost_db_1.recordAgentSessionCost)(db, {
+                sessionId: record.id,
+                worktreeId: target.worktreeId,
+                cliToolId: target.cliToolId,
+                instanceId: target.instanceId ?? null,
+                // `record.at` is when the agent last spoke, which is the honest date for
+                // the spend it reported; `now` only stamps the sample.
+                date: localDateKey(record.at || now),
+                title: record.title,
+                agent: record.agent,
+                model: record.model,
+                provider: record.provider,
+                cost: record.cost,
+                tokensInput: record.tokens.input,
+                tokensOutput: record.tokens.output,
+                tokensReasoning: record.tokens.reasoning,
+                tokensCacheRead: record.tokens.cacheRead,
+                tokensCacheWrite: record.tokens.cacheWrite,
+                observedAt: now,
+            });
+            if (inserted)
+                written++;
+        }
+        catch (error) {
+            logger.warn('sample-failed', {
+                worktreeId: target.worktreeId,
+                cliToolId: target.cliToolId,
+                error: error instanceof Error ? error.message : String(error),
+            });
+        }
+    }
+    return written;
+}
+/**
+ * Start the periodic sampler, once per process.
+ *
+ * Called from `getDbInstance()` — the one place in the server that runs exactly
+ * once, after the schema is known good, and that every process holding a
+ * database also holds. A `commandmate` CLI process reaches it too and samples an
+ * empty map, which costs a `Map.keys()` per minute and keeps the wiring from
+ * needing to know which kind of process it is in.
+ *
+ * The timer is `unref()`d so it never keeps Node alive, and skipped outright
+ * under Vitest: a suite that opens a database should not acquire a background
+ * writer to a file it is about to delete.
+ *
+ * @param db - Database instance to write into
+ * @returns Whether a timer was started by this call
+ */
+function startAgentSessionCostSampler(db) {
+    if (globalThis.__agentSessionCostSampler)
+        return false;
+    if (process.env.VITEST || process.env.NODE_ENV === 'test')
+        return false;
+    const timer = setInterval(() => {
+        try {
+            sampleAgentSessionCosts(db);
+        }
+        catch (error) {
+            logger.warn('sweep-failed', {
+                error: error instanceof Error ? error.message : String(error),
+            });
+        }
+    }, exports.AGENT_SESSION_COST_SAMPLE_INTERVAL_MS);
+    timer.unref?.();
+    globalThis.__agentSessionCostSampler = timer;
+    return true;
+}
+/** Stop the periodic sampler. Test seam and shutdown hook. */
+function stopAgentSessionCostSampler() {
+    if (!globalThis.__agentSessionCostSampler)
+        return;
+    clearInterval(globalThis.__agentSessionCostSampler);
+    globalThis.__agentSessionCostSampler = undefined;
+}

package/dist/server/src/lib/db/chat-db.js

@@ -12,6 +12,7 @@ exports.createMessage = createMessage;
 exports.updateMessageContent = updateMessageContent;
 exports.getMessages = getMessages;
 exports.getLastUserMessage = getLastUserMessage;
+exports.findMessageByRequestId = findMessageByRequestId;
 exports.getLastMessage = getLastMessage;
 exports.deleteAllMessages = deleteAllMessages;
 exports.deleteMessageById = deleteMessageById;
@@ -196,6 +197,38 @@ function getLastUserMessage(db, worktreeId) {
     const row = stmt.get(worktreeId);
     return row ? mapChatMessage(row) : null;
 }
+/**
+ * Fetch the message a producer wrote under this `request_id`, if any.
+ *
+ * Issue #2041: the idempotency probe for a history writer that can be asked to
+ * save the same turn twice — once from the event stream and once from the
+ * `GET /session/:id/message` backfill that runs on every reconnect. Both derive
+ * the id from the agent's own message id, so "already there" is the whole test.
+ *
+ * `ACTIVE_FILTER` is deliberately **not** applied. An archived row is still a
+ * row that was written, and skipping it here would make "kill the session"
+ * (which archives) into "re-save every turn on the next attach", which is the
+ * duplication this is for.
+ *
+ * Scoped by worktree because `request_id` is unique per producer, not globally:
+ * two worktrees talking to the same `opencode.db` see the same session, and a
+ * global lookup would let the first one to save a turn suppress it for the
+ * second.
+ *
+ * @param requestId - The producer's own id for this row
+ * @returns The row, or null when nothing has been written under it
+ */
+function findMessageByRequestId(db, worktreeId, requestId) {
+    const stmt = db.prepare(`
+    SELECT id, worktree_id, role, content, summary, timestamp, log_file_name, request_id, message_type, prompt_data, cli_tool_id, instance_id, archived
+    FROM chat_messages
+    WHERE worktree_id = ? AND request_id = ?
+    ORDER BY timestamp DESC
+    LIMIT 1
+  `);
+    const row = stmt.get(worktreeId, requestId);
+    return row ? mapChatMessage(row) : null;
+}
 /**
  * Fetch the most recent message for a worktree (any role).
  * Used to determine if waiting for Claude's response.

package/dist/server/src/lib/db/db-instance.js

@@ -15,6 +15,7 @@ exports.closeDbInstance = closeDbInstance;
 const path_1 = __importDefault(require("path"));
 const db_migrations_1 = require("./db-migrations");
 const abi_recovery_1 = require("./abi-recovery");
+const agent_session_cost_sampler_1 = require("./agent-session-cost-sampler");
 const env_1 = require("../../lib/env");
 let dbInstance = null;
 /**
@@ -69,6 +70,13 @@ function getDbInstance() {
             throw error;
         }
         dbInstance = db;
+        // Issue #2044: the agent cost ledger needs somebody to copy the in-memory
+        // telemetry in before the pane that holds it is killed. This is the one
+        // place that runs once per process, after the schema is verified, in every
+        // process that has a database — and the sampler is a no-op wherever the
+        // telemetry map is empty. It refuses to start under Vitest and unrefs its
+        // timer, so nothing here holds a test or the CLI open.
+        (0, agent_session_cost_sampler_1.startAgentSessionCostSampler)(db);
     }
     return dbInstance;
 }
@@ -78,6 +86,9 @@ function getDbInstance() {
  */
 function closeDbInstance() {
     if (dbInstance) {
+        // Issue #2044: stop the sampler before the handle it writes through goes
+        // away, or the next tick throws `The database connection is not open`.
+        (0, agent_session_cost_sampler_1.stopAgentSessionCostSampler)();
         dbInstance.close();
         dbInstance = null;
     }

package/dist/server/src/lib/db/db.js

@@ -10,9 +10,9 @@
  * @internal functions from being unintentionally exposed.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setInProgressMessageId = exports.updateSessionState = exports.getSessionState = exports.getMessagesByDateRange = exports.ACTIVE_FILTER = exports.recordAnsweredPrompt = exports.markPendingPromptsAsAnswered = exports.updatePromptData = exports.getMessageById = exports.recomputeLastUserMessage = exports.clearLastUserMessage = exports.updateLastUserMessage = exports.deleteMessagesByInstance = exports.deleteMessagesByCliTool = exports.deleteMessageById = exports.deleteAllMessages = exports.getLastMessage = exports.getLastUserMessage = exports.getMessages = exports.updateMessageContent = exports.createMessage = exports.getLastAssistantMessageAt = exports.getAliasedWorktreeIds = exports.getAllWorktreeAliases = exports.getWorktreeAliases = exports.resolveWorktreeIdWithAlias = exports.recordWorktreeAlias = exports.deleteWorktreesByIds = exports.deleteRepositoryWorktrees = exports.migrateWorktreeIdPreservingChildren = exports.getAllWorktreePathIds = exports.getAllWorktreeIds = exports.getWorktreesByRepository = exports.getWorktreeIdsByRepository = exports.getInitialBranch = exports.saveInitialBranch = exports.updateVibeLocalContextWindow = exports.updateVibeLocalModel = exports.updateSelectedAgents = exports.updateCliToolId = exports.updateStatus = exports.updateFavorite = exports.updateLastViewedAt = exports.updateWorktreeLink = exports.updateWorktreeDescription = exports.upsertWorktree = exports.getWorktreeById = exports.getRepositories = exports.getWorktrees = exports.initDatabase = void 0;
-exports.createAssistantMessage = exports.updateAssistantConversation = exports.createAssistantConversation = exports.getAssistantConversationByRepositoryAndCliTool = exports.getAssistantConversationById = exports.updateDailyReportContent = exports.saveDailyReport = exports.getDailyReport = exports.recoverStuckSendingTimers = exports.clearTimerHistory = exports.cleanupOldTimers = exports.getPendingTimerCountByWorktree = exports.cancelTimersByWorktree = exports.cancelTimer = exports.updateTimerStatus = exports.getPendingTimers = exports.getTimerById = exports.getTimersByWorktree = exports.createTimer = exports.WORKTREE_TODO_STATUSES = exports.isWorktreeTodoStatus = exports.reorderWorktreeTodos = exports.deleteWorktreeTodo = exports.updateWorktreeTodo = exports.createWorktreeTodo = exports.getWorktreeTodoById = exports.getTodosByWorktreeId = exports.deleteTodo = exports.updateTodo = exports.createTodo = exports.getTodoById = exports.getAllTodos = exports.getTodosByRepositoryId = exports.MemoDbError = exports.reorderMemos = exports.deleteMemo = exports.updateMemo = exports.createMemo = exports.getMemoById = exports.getMemosByWorktreeId = exports.InvalidAgentInstanceError = exports.AgentInstanceLimitError = exports.removeAgentInstance = exports.addAgentInstance = exports.setAgentInstances = exports.countAgentInstances = exports.getAgentInstance = exports.getAgentInstances = exports.deleteSessionState = exports.clearInProgressMessageId = void 0;
-exports.listTaskEvents = exports.ACTIVE_TASK_STATUSES = exports.TERMINAL_TASK_STATUSES = exports.TASK_STATUSES = exports.isTerminalTaskStatus = exports.getActiveTaskForInstance = exports.getActiveTask = exports.listTasks = exports.getTask = exports.createTask = exports.VERIFICATION_GATE_SOURCES = exports.VERIFICATION_TRIGGERS = exports.MAX_RUN_HISTORY_DAYS = exports.MAX_RUN_HISTORY_LIMIT = exports.DEFAULT_RUN_HISTORY_LIMIT = exports.listVerificationRunsForPeriod = exports.listRunningVerificationRuns = exports.getRunningVerificationRun = exports.listVerificationRuns = exports.getVerificationRun = exports.finishGateResult = exports.createGateResult = exports.finishVerificationRun = exports.createVerificationRun = exports.NEW_SUBSCRIPTION_DEFAULTS = exports.deletePushSubscriptionByEndpoint = exports.updatePushSubscriptionPreferences = exports.countPushSubscriptionsForKind = exports.getPushSubscriptionsForKind = exports.getAllPushSubscriptions = exports.getPushSubscriptionByEndpoint = exports.upsertPushSubscription = exports.deleteAssistantSessionState = exports.updateAssistantSessionState = exports.getAssistantSessionState = exports.listRunningAssistantExecutions = exports.getRunningAssistantExecutionByConversation = exports.getLatestAssistantExecutionByConversation = exports.getAssistantExecutionById = exports.updateAssistantExecution = exports.createAssistantExecution = exports.archiveAssistantMessagesFrom = exports.archiveAllAssistantMessages = exports.getAssistantMessageById = exports.getAssistantMessages = exports.updateAssistantMessageStatus = void 0;
+exports.updateSessionState = exports.getSessionState = exports.getMessagesByDateRange = exports.ACTIVE_FILTER = exports.recordAnsweredPrompt = exports.markPendingPromptsAsAnswered = exports.updatePromptData = exports.getMessageById = exports.recomputeLastUserMessage = exports.clearLastUserMessage = exports.updateLastUserMessage = exports.deleteMessagesByInstance = exports.deleteMessagesByCliTool = exports.deleteMessageById = exports.deleteAllMessages = exports.findMessageByRequestId = exports.getLastMessage = exports.getLastUserMessage = exports.getMessages = exports.updateMessageContent = exports.createMessage = exports.getLastAssistantMessageAt = exports.getAliasedWorktreeIds = exports.getAllWorktreeAliases = exports.getWorktreeAliases = exports.resolveWorktreeIdWithAlias = exports.recordWorktreeAlias = exports.deleteWorktreesByIds = exports.deleteRepositoryWorktrees = exports.migrateWorktreeIdPreservingChildren = exports.getAllWorktreePathIds = exports.getAllWorktreeIds = exports.getWorktreesByRepository = exports.getWorktreeIdsByRepository = exports.getInitialBranch = exports.saveInitialBranch = exports.updateVibeLocalContextWindow = exports.updateVibeLocalModel = exports.updateSelectedAgents = exports.updateCliToolId = exports.updateStatus = exports.updateFavorite = exports.updateLastViewedAt = exports.updateWorktreeLink = exports.updateWorktreeDescription = exports.upsertWorktree = exports.getWorktreeById = exports.getRepositories = exports.getWorktrees = exports.initDatabase = void 0;
+exports.updateAssistantConversation = exports.createAssistantConversation = exports.getAssistantConversationByRepositoryAndCliTool = exports.getAssistantConversationById = exports.updateDailyReportContent = exports.saveDailyReport = exports.getDailyReport = exports.recoverStuckSendingTimers = exports.clearTimerHistory = exports.cleanupOldTimers = exports.getPendingTimerCountByWorktree = exports.cancelTimersByWorktree = exports.cancelTimer = exports.updateTimerStatus = exports.getPendingTimers = exports.getTimerById = exports.getTimersByWorktree = exports.createTimer = exports.WORKTREE_TODO_STATUSES = exports.isWorktreeTodoStatus = exports.reorderWorktreeTodos = exports.deleteWorktreeTodo = exports.updateWorktreeTodo = exports.createWorktreeTodo = exports.getWorktreeTodoById = exports.getTodosByWorktreeId = exports.deleteTodo = exports.updateTodo = exports.createTodo = exports.getTodoById = exports.getAllTodos = exports.getTodosByRepositoryId = exports.MemoDbError = exports.reorderMemos = exports.deleteMemo = exports.updateMemo = exports.createMemo = exports.getMemoById = exports.getMemosByWorktreeId = exports.InvalidAgentInstanceError = exports.AgentInstanceLimitError = exports.removeAgentInstance = exports.addAgentInstance = exports.setAgentInstances = exports.countAgentInstances = exports.getAgentInstance = exports.getAgentInstances = exports.deleteSessionState = exports.clearInProgressMessageId = exports.setInProgressMessageId = void 0;
+exports.listTaskEvents = exports.ACTIVE_TASK_STATUSES = exports.TERMINAL_TASK_STATUSES = exports.TASK_STATUSES = exports.isTerminalTaskStatus = exports.getActiveTaskForInstance = exports.getActiveTask = exports.listTasks = exports.getTask = exports.createTask = exports.VERIFICATION_GATE_SOURCES = exports.VERIFICATION_TRIGGERS = exports.MAX_RUN_HISTORY_DAYS = exports.MAX_RUN_HISTORY_LIMIT = exports.DEFAULT_RUN_HISTORY_LIMIT = exports.listVerificationRunsForPeriod = exports.listRunningVerificationRuns = exports.getRunningVerificationRun = exports.listVerificationRuns = exports.getVerificationRun = exports.finishGateResult = exports.createGateResult = exports.finishVerificationRun = exports.createVerificationRun = exports.pushSubscriptionNeedsDefaultsNotice = exports.PUSH_DEFAULTS_VERSION = exports.NEW_SUBSCRIPTION_DEFAULTS = exports.deletePushSubscriptionByEndpoint = exports.updatePushSubscriptionPreferences = exports.countPushSubscriptionsForKind = exports.getPushSubscriptionsForKind = exports.getAllPushSubscriptions = exports.getPushSubscriptionByEndpoint = exports.upsertPushSubscription = exports.deleteAssistantSessionState = exports.updateAssistantSessionState = exports.getAssistantSessionState = exports.listRunningAssistantExecutions = exports.getRunningAssistantExecutionByConversation = exports.getLatestAssistantExecutionByConversation = exports.getAssistantExecutionById = exports.updateAssistantExecution = exports.createAssistantExecution = exports.archiveAssistantMessagesFrom = exports.archiveAllAssistantMessages = exports.getAssistantMessageById = exports.getAssistantMessages = exports.updateAssistantMessageStatus = exports.createAssistantMessage = void 0;
 // init-db
 var init_db_1 = require("./init-db");
 Object.defineProperty(exports, "initDatabase", { enumerable: true, get: function () { return init_db_1.initDatabase; } });
@@ -55,6 +55,7 @@ Object.defineProperty(exports, "updateMessageContent", { enumerable: true, get:
 Object.defineProperty(exports, "getMessages", { enumerable: true, get: function () { return chat_db_1.getMessages; } });
 Object.defineProperty(exports, "getLastUserMessage", { enumerable: true, get: function () { return chat_db_1.getLastUserMessage; } });
 Object.defineProperty(exports, "getLastMessage", { enumerable: true, get: function () { return chat_db_1.getLastMessage; } });
+Object.defineProperty(exports, "findMessageByRequestId", { enumerable: true, get: function () { return chat_db_1.findMessageByRequestId; } });
 Object.defineProperty(exports, "deleteAllMessages", { enumerable: true, get: function () { return chat_db_1.deleteAllMessages; } });
 Object.defineProperty(exports, "deleteMessageById", { enumerable: true, get: function () { return chat_db_1.deleteMessageById; } });
 Object.defineProperty(exports, "deleteMessagesByCliTool", { enumerable: true, get: function () { return chat_db_1.deleteMessagesByCliTool; } });
@@ -164,6 +165,10 @@ Object.defineProperty(exports, "updatePushSubscriptionPreferences", { enumerable
 Object.defineProperty(exports, "deletePushSubscriptionByEndpoint", { enumerable: true, get: function () { return push_subscriptions_db_1.deletePushSubscriptionByEndpoint; } });
 // Issue #2000: the per-kind state a *new* subscription is created with.
 Object.defineProperty(exports, "NEW_SUBSCRIPTION_DEFAULTS", { enumerable: true, get: function () { return push_subscriptions_db_1.NEW_SUBSCRIPTION_DEFAULTS; } });
+// Issue #2056: which defaults generation a row knows about, and whether it is
+// still owed the one-off notice about the change.
+Object.defineProperty(exports, "PUSH_DEFAULTS_VERSION", { enumerable: true, get: function () { return push_subscriptions_db_1.PUSH_DEFAULTS_VERSION; } });
+Object.defineProperty(exports, "pushSubscriptionNeedsDefaultsNotice", { enumerable: true, get: function () { return push_subscriptions_db_1.pushSubscriptionNeedsDefaultsNotice; } });
 // verification-db (verification gate runs, Issue #1542)
 var verification_db_1 = require("./verification-db");
 Object.defineProperty(exports, "createVerificationRun", { enumerable: true, get: function () { return verification_db_1.createVerificationRun; } });