commandmate 0.49.2 → 0.50.0

package/dist/server/src/lib/db/relay-bind-db.js

@@ -10,9 +10,9 @@
  * @module lib/db/relay-bind-db
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OPEN_STATE_PLACEHOLDERS = exports.RELAY_COLUMNS = void 0;
-exports.mapRelay = mapRelay;
+exports.releaseRelayPayloadDelivery = exports.recoverInterruptedRelayDeliveryRefs = exports.recoverInterruptedRelayDeliveries = exports.listRelaysWithDeliveryHold = exports.isCurrentRelayPayloadAttempt = exports.holdRelayPayloadDelivery = exports.endRelayPayloadAttempt = exports.completeRelayPayloadDelivery = exports.claimRelayPayloadDelivery = exports.RELAY_DELIVERY_SERVER_RESTARTED = exports.setRelayPendingReply = exports.replaceRelayPromptWithReply = exports.replaceRelayPromptWithPendingReply = exports.promoteRelayPendingReply = exports.countHeldRelays = exports.clearRelayPendingReplyUnlessHeld = exports.clearRelayPendingReply = exports.mapRelay = exports.RELAY_COLUMNS = exports.OPEN_STATE_PLACEHOLDERS = exports.KEEP_HELD_PAYLOAD_SET = void 0;
 exports.stashRelayPayload = stashRelayPayload;
+exports.listDeliverableRelayPayloads = listDeliverableRelayPayloads;
 exports.listRelaysWithPendingPayload = listRelaysWithPendingPayload;
 exports.clearRelayPending = clearRelayPending;
 exports.getRelayPendingPayload = getRelayPendingPayload;
@@ -25,22 +25,39 @@ exports.settleRelaySendState = settleRelaySendState;
 exports.setRelayHold = setRelayHold;
 exports.appendRelayHeldCandidate = appendRelayHeldCandidate;
 exports.clearRelayHeldCandidates = clearRelayHeldCandidates;
-exports.setRelayPendingReply = setRelayPendingReply;
-exports.replaceRelayPromptWithReply = replaceRelayPromptWithReply;
-exports.promoteRelayPendingReply = promoteRelayPendingReply;
-exports.replaceRelayPromptWithPendingReply = replaceRelayPromptWithPendingReply;
-exports.clearRelayPendingReply = clearRelayPendingReply;
 exports.failOrphanedRelayBind = failOrphanedRelayBind;
+exports.completeRelayPromptDelivery = completeRelayPromptDelivery;
 const crypto_1 = require("crypto");
 const types_1 = require("../../lib/relay/types");
-/** Every column, in one place, so the readers cannot drift from each other. */
-exports.RELAY_COLUMNS = `
-  id, from_worktree_id, from_instance_id, to_worktree_id, to_instance_id,
-  state, hops, sent_request_id, pending_kind, pending_body, prompt_signature,
-  created_at, updated_at, expires_at, delivered_at,
-  bind_mode, send_state, input_boundary_at, boundary_kind, turn_open_at_send,
-  obs_state, hold_reason, overlap
-`;
+const relay_bind_db_base_1 = require("./relay-bind-db-base");
+const relay_bind_db_pending_1 = require("./relay-bind-db-pending");
+const relay_bind_db_delivery_1 = require("./relay-bind-db-delivery");
+// Issue #4095: the shared row shape, the second slot and the delivery attempts
+// live in their own modules; every public name stays importable from here.
+var relay_bind_db_base_2 = require("./relay-bind-db-base");
+Object.defineProperty(exports, "KEEP_HELD_PAYLOAD_SET", { enumerable: true, get: function () { return relay_bind_db_base_2.KEEP_HELD_PAYLOAD_SET; } });
+Object.defineProperty(exports, "OPEN_STATE_PLACEHOLDERS", { enumerable: true, get: function () { return relay_bind_db_base_2.OPEN_STATE_PLACEHOLDERS; } });
+Object.defineProperty(exports, "RELAY_COLUMNS", { enumerable: true, get: function () { return relay_bind_db_base_2.RELAY_COLUMNS; } });
+Object.defineProperty(exports, "mapRelay", { enumerable: true, get: function () { return relay_bind_db_base_2.mapRelay; } });
+var relay_bind_db_pending_2 = require("./relay-bind-db-pending");
+Object.defineProperty(exports, "clearRelayPendingReply", { enumerable: true, get: function () { return relay_bind_db_pending_2.clearRelayPendingReply; } });
+Object.defineProperty(exports, "clearRelayPendingReplyUnlessHeld", { enumerable: true, get: function () { return relay_bind_db_pending_2.clearRelayPendingReplyUnlessHeld; } });
+Object.defineProperty(exports, "countHeldRelays", { enumerable: true, get: function () { return relay_bind_db_pending_2.countHeldRelays; } });
+Object.defineProperty(exports, "promoteRelayPendingReply", { enumerable: true, get: function () { return relay_bind_db_pending_2.promoteRelayPendingReply; } });
+Object.defineProperty(exports, "replaceRelayPromptWithPendingReply", { enumerable: true, get: function () { return relay_bind_db_pending_2.replaceRelayPromptWithPendingReply; } });
+Object.defineProperty(exports, "replaceRelayPromptWithReply", { enumerable: true, get: function () { return relay_bind_db_pending_2.replaceRelayPromptWithReply; } });
+Object.defineProperty(exports, "setRelayPendingReply", { enumerable: true, get: function () { return relay_bind_db_pending_2.setRelayPendingReply; } });
+var relay_bind_db_delivery_2 = require("./relay-bind-db-delivery");
+Object.defineProperty(exports, "RELAY_DELIVERY_SERVER_RESTARTED", { enumerable: true, get: function () { return relay_bind_db_delivery_2.RELAY_DELIVERY_SERVER_RESTARTED; } });
+Object.defineProperty(exports, "claimRelayPayloadDelivery", { enumerable: true, get: function () { return relay_bind_db_delivery_2.claimRelayPayloadDelivery; } });
+Object.defineProperty(exports, "completeRelayPayloadDelivery", { enumerable: true, get: function () { return relay_bind_db_delivery_2.completeRelayPayloadDelivery; } });
+Object.defineProperty(exports, "endRelayPayloadAttempt", { enumerable: true, get: function () { return relay_bind_db_delivery_2.endRelayPayloadAttempt; } });
+Object.defineProperty(exports, "holdRelayPayloadDelivery", { enumerable: true, get: function () { return relay_bind_db_delivery_2.holdRelayPayloadDelivery; } });
+Object.defineProperty(exports, "isCurrentRelayPayloadAttempt", { enumerable: true, get: function () { return relay_bind_db_delivery_2.isCurrentRelayPayloadAttempt; } });
+Object.defineProperty(exports, "listRelaysWithDeliveryHold", { enumerable: true, get: function () { return relay_bind_db_delivery_2.listRelaysWithDeliveryHold; } });
+Object.defineProperty(exports, "recoverInterruptedRelayDeliveries", { enumerable: true, get: function () { return relay_bind_db_delivery_2.recoverInterruptedRelayDeliveries; } });
+Object.defineProperty(exports, "recoverInterruptedRelayDeliveryRefs", { enumerable: true, get: function () { return relay_bind_db_delivery_2.recoverInterruptedRelayDeliveryRefs; } });
+Object.defineProperty(exports, "releaseRelayPayloadDelivery", { enumerable: true, get: function () { return relay_bind_db_delivery_2.releaseRelayPayloadDelivery; } });
 /**
  * The v62 columns no public reader sees (Issue #3957): the reservation token
  * and its owner, the observation's source, the send's own user row, and the
@@ -50,31 +67,6 @@ const RELAY_BINDING_COLUMNS = `
   bind_attempt_id, bind_owner, obs_source, input_message_id,
   held_candidates, pending_reply, payload_id
 `;
-function mapRelay(row) {
-    return {
-        id: row.id,
-        from: { worktreeId: row.from_worktree_id, instanceId: row.from_instance_id },
-        to: { worktreeId: row.to_worktree_id, instanceId: row.to_instance_id },
-        state: row.state,
-        hops: row.hops,
-        sentRequestId: row.sent_request_id,
-        pendingKind: row.pending_kind ?? null,
-        createdAt: row.created_at,
-        updatedAt: row.updated_at,
-        expiresAt: row.expires_at,
-        deliveredAt: row.delivered_at,
-        bindMode: row.bind_mode ?? 'legacy',
-        sendState: row.send_state ?? null,
-        inputBoundaryAt: row.input_boundary_at,
-        boundaryKind: row.boundary_kind ?? null,
-        turnOpenAtSend: row.turn_open_at_send === null ? null : row.turn_open_at_send === 1,
-        obsState: row.obs_state ?? null,
-        holdReason: row.hold_reason,
-        overlap: row.overlap ?? null,
-    };
-}
-/** Placeholders for an `IN (…)` over the open states. */
-exports.OPEN_STATE_PLACEHOLDERS = types_1.OPEN_RELAY_STATES.map(() => '?').join(', ');
 /**
  * Record a payload that has been decided and not yet delivered.
  *
@@ -96,28 +88,44 @@ function stashRelayPayload(db, id, kind, body, now = Date.now(), options = {}) {
       SET pending_kind = ?, pending_body = ?, payload_id = ?,
           overlap = COALESCE(?, overlap), updated_at = ?
       WHERE id = ? AND pending_kind IS NULL
-        AND state IN (${exports.OPEN_STATE_PLACEHOLDERS})
+        AND state IN (${relay_bind_db_base_1.OPEN_STATE_PLACEHOLDERS})
     `)
         .run(kind, body, payloadId, options.overlap ?? null, now, id, ...types_1.OPEN_RELAY_STATES);
     return result.changes === 1;
 }
-/** Every relay carrying an undelivered payload, oldest first. */
-function listRelaysWithPendingPayload(db) {
+/**
+ * Every relay carrying an undelivered payload the pump may send, oldest first,
+ * with the payload's id (Issue #4064).
+ *
+ * A payload under a delivery hold (`delivery_state` set — being sent, or its
+ * outcome not known) is not listed: it is never sent again automatically.
+ */
+function listDeliverableRelayPayloads(db) {
     const rows = db
         .prepare(`
-      SELECT ${exports.RELAY_COLUMNS} FROM session_relays
-      WHERE pending_kind IS NOT NULL
+      SELECT ${relay_bind_db_base_1.RELAY_COLUMNS}, payload_id FROM session_relays
+      WHERE pending_kind IS NOT NULL AND delivery_state IS NULL
       ORDER BY updated_at ASC
     `)
         .all();
     return rows
         .filter((row) => row.pending_body !== null && row.pending_kind !== null)
         .map((row) => ({
-        relay: mapRelay(row),
+        relay: (0, relay_bind_db_base_1.mapRelay)(row),
         kind: row.pending_kind,
         body: row.pending_body,
+        payloadId: row.payload_id,
     }));
 }
+/**
+ * Every relay carrying an undelivered payload, oldest first.
+ *
+ * Issue #4064: a payload under a delivery hold is not "undelivered" in the
+ * sense the pump acts on, and is left out (see {@link listDeliverableRelayPayloads}).
+ */
+function listRelaysWithPendingPayload(db) {
+    return listDeliverableRelayPayloads(db).map(({ relay, kind, body }) => ({ relay, kind, body }));
+}
 /**
  * Drop an undelivered payload (it went out, or it was superseded).
  *
@@ -125,6 +133,10 @@ function listRelaysWithPendingPayload(db) {
  * delivery passes the id it sent, so a reply stashed over a prompt notice while
  * that notice was being typed survives the notice's cleanup.
  *
+ * Issue #4064: never a payload under a delivery hold — its delivery may have
+ * reached A, and its body, id and reason stay readable. The delivery records
+ * its own end with {@link completeRelayPayloadDelivery}.
+ *
  * @returns Whether a payload was cleared
  */
 function clearRelayPending(db, id, now = Date.now(), payloadId) {
@@ -133,14 +145,14 @@ function clearRelayPending(db, id, now = Date.now(), payloadId) {
             .prepare(`
             UPDATE session_relays
             SET pending_kind = NULL, pending_body = NULL, payload_id = NULL, updated_at = ?
-            WHERE id = ?
+            WHERE id = ? AND delivery_state IS NULL
           `)
             .run(now, id)
         : db
             .prepare(`
             UPDATE session_relays
             SET pending_kind = NULL, pending_body = NULL, payload_id = NULL, updated_at = ?
-            WHERE id = ? AND payload_id IS ?
+            WHERE id = ? AND payload_id IS ? AND delivery_state IS NULL
           `)
             .run(now, id, payloadId);
     return result.changes === 1;
@@ -148,36 +160,26 @@ function clearRelayPending(db, id, now = Date.now(), payloadId) {
 /** The payload a relay carries now, with its id, or null (Issue #3957). */
 function getRelayPendingPayload(db, id) {
     const row = db
-        .prepare(`SELECT ${exports.RELAY_COLUMNS}, payload_id FROM session_relays WHERE id = ?`)
+        .prepare(`SELECT ${relay_bind_db_base_1.RELAY_COLUMNS}, payload_id FROM session_relays WHERE id = ?`)
         .get(id);
     if (!row || row.pending_kind === null || row.pending_body === null)
         return null;
     return {
-        relay: mapRelay(row),
+        relay: (0, relay_bind_db_base_1.mapRelay)(row),
         kind: row.pending_kind,
         body: row.pending_body,
         payloadId: row.payload_id,
     };
 }
-function parseJson(text, fallback) {
-    if (text === null)
-        return fallback;
-    try {
-        return JSON.parse(text);
-    }
-    catch {
-        return fallback;
-    }
-}
 function mapBinding(row) {
     return {
-        relay: mapRelay(row),
+        relay: (0, relay_bind_db_base_1.mapRelay)(row),
         bindAttemptId: row.bind_attempt_id,
         bindOwner: row.bind_owner,
         obsSource: row.obs_source,
         inputMessageId: row.input_message_id,
-        heldCandidates: parseJson(row.held_candidates, []),
-        pendingReply: parseJson(row.pending_reply, null),
+        heldCandidates: (0, relay_bind_db_base_1.parseJson)(row.held_candidates, []),
+        pendingReply: (0, relay_bind_db_base_1.parseJson)(row.pending_reply, null),
         payloadId: row.payload_id,
         pendingKind: row.pending_kind ?? null,
     };
@@ -185,7 +187,7 @@ function mapBinding(row) {
 /** One relay with its binding columns, or null. */
 function getRelayBinding(db, id) {
     const row = db
-        .prepare(`SELECT ${exports.RELAY_COLUMNS}, ${RELAY_BINDING_COLUMNS} FROM session_relays WHERE id = ?`)
+        .prepare(`SELECT ${relay_bind_db_base_1.RELAY_COLUMNS}, ${RELAY_BINDING_COLUMNS} FROM session_relays WHERE id = ?`)
         .get(id);
     return row ? mapBinding(row) : null;
 }
@@ -193,8 +195,8 @@ function getRelayBinding(db, id) {
 function listOpenBoundRelays(db) {
     const rows = db
         .prepare(`
-      SELECT ${exports.RELAY_COLUMNS}, ${RELAY_BINDING_COLUMNS} FROM session_relays
-      WHERE bind_mode = 'bound' AND state IN (${exports.OPEN_STATE_PLACEHOLDERS})
+      SELECT ${relay_bind_db_base_1.RELAY_COLUMNS}, ${RELAY_BINDING_COLUMNS} FROM session_relays
+      WHERE bind_mode = 'bound' AND state IN (${relay_bind_db_base_1.OPEN_STATE_PLACEHOLDERS})
       ORDER BY created_at ASC
     `)
         .all(...types_1.OPEN_RELAY_STATES);
@@ -279,7 +281,7 @@ function settleRelaySendState(db, input) {
           obs_state = CASE WHEN ? = 1 THEN 'invalid' ELSE obs_state END,
           updated_at = ?
       WHERE id = ? AND bind_attempt_id = ? AND send_state IN (${fromPlaceholders})
-        AND state IN (${exports.OPEN_STATE_PLACEHOLDERS})
+        AND state IN (${relay_bind_db_base_1.OPEN_STATE_PLACEHOLDERS})
     `)
         .run(input.to, input.clearHoldReason ? 1 : 0, input.holdReason ?? null, input.inputMessageId ?? null, input.invalidateObservation ? 1 : 0, now, input.relayId, input.attemptId, ...input.from, ...types_1.OPEN_RELAY_STATES);
     return result.changes === 1;
@@ -307,12 +309,12 @@ function appendRelayHeldCandidate(db, id, candidate, now = Date.now()) {
             .prepare(`
         SELECT held_candidates FROM session_relays
         WHERE id = ? AND bind_mode = 'bound' AND send_state IN ('awaiting','input_started')
-          AND state IN (${exports.OPEN_STATE_PLACEHOLDERS})
+          AND state IN (${relay_bind_db_base_1.OPEN_STATE_PLACEHOLDERS})
       `)
             .get(id, ...types_1.OPEN_RELAY_STATES);
         if (!row)
             return false;
-        const held = parseJson(row.held_candidates, []);
+        const held = (0, relay_bind_db_base_1.parseJson)(row.held_candidates, []);
         if (held.some((item) => item.messageId === candidate.messageId))
             return false;
         held.push(candidate);
@@ -324,114 +326,33 @@ function appendRelayHeldCandidate(db, id, candidate, now = Date.now()) {
 function clearRelayHeldCandidates(db, id) {
     db.prepare('UPDATE session_relays SET held_candidates = NULL WHERE id = ?').run(id);
 }
-/**
- * Put a reply in the second slot while a prompt notice holds the first.
- *
- * Only one: the first reply to finish is the one kept.
- */
-function setRelayPendingReply(db, id, reply, now = Date.now()) {
-    const result = db
-        .prepare(`
-      UPDATE session_relays SET pending_reply = ?, updated_at = ?
-      WHERE id = ? AND pending_kind = 'prompt' AND pending_reply IS NULL
-        AND state IN (${exports.OPEN_STATE_PLACEHOLDERS})
-    `)
-        .run(JSON.stringify(reply), now, id, ...types_1.OPEN_RELAY_STATES);
-    return result.changes === 1;
-}
-/**
- * Replace an unclaimed prompt notice with the reply that made it moot.
- *
- * Conditional on the notice's own payload id, so a notice that was replaced or
- * delivered meanwhile is not overwritten.
- */
-function replaceRelayPromptWithReply(db, id, promptPayloadId, reply, now = Date.now()) {
+/** Cancel a relay as part of the restart recovery, recording why. */
+function failOrphanedRelayBind(db, id, attemptId, reason, now = Date.now()) {
     const result = db
         .prepare(`
       UPDATE session_relays
-      SET pending_kind = 'reply', pending_body = ?, payload_id = ?, overlap = ?, updated_at = ?
-      WHERE id = ? AND pending_kind = 'prompt' AND payload_id IS ?
-        AND state IN (${exports.OPEN_STATE_PLACEHOLDERS})
+      SET send_state = 'failed', state = 'cancelled', hold_reason = ?,
+          ${relay_bind_db_base_1.KEEP_HELD_PAYLOAD_SET}, pending_reply = NULL,
+          updated_at = ?
+      WHERE id = ? AND bind_attempt_id = ? AND send_state = 'awaiting'
+        AND state IN (${relay_bind_db_base_1.OPEN_STATE_PLACEHOLDERS})
     `)
-        .run(reply.body, reply.payloadId, reply.overlap, now, id, promptPayloadId, ...types_1.OPEN_RELAY_STATES);
+        .run(reason, now, id, attemptId, ...types_1.OPEN_RELAY_STATES);
     return result.changes === 1;
 }
 /**
- * Move the second slot into the first once the prompt notice is gone.
+ * A prompt notice went out: end its attempt and, in the same transaction,
+ * move a reply waiting in the second slot into the first (Issue #4082).
  *
- * Atomic: the reply becomes the pending payload and leaves `pending_reply` in
- * one write, so the pump finds it and nothing finds it twice.
- */
-function promoteRelayPendingReply(db, id, now = Date.now()) {
-    return db.transaction(() => {
-        const row = db
-            .prepare(`
-        SELECT pending_reply FROM session_relays
-        WHERE id = ? AND pending_kind IS NULL AND pending_reply IS NOT NULL
-          AND state IN (${exports.OPEN_STATE_PLACEHOLDERS})
-      `)
-            .get(id, ...types_1.OPEN_RELAY_STATES);
-        if (!row)
-            return false;
-        const reply = parseJson(row.pending_reply, null);
-        if (!reply) {
-            db.prepare('UPDATE session_relays SET pending_reply = NULL WHERE id = ?').run(id);
-            return false;
-        }
-        db.prepare(`
-      UPDATE session_relays
-      SET pending_kind = 'reply', pending_body = ?, payload_id = ?, overlap = ?,
-          pending_reply = NULL, updated_at = ?
-      WHERE id = ?
-    `).run(reply.body, reply.payloadId, reply.overlap, now, id);
-        return true;
-    })();
-}
-/**
- * A prompt notice whose delivery did not go out, while a reply waits in the
- * second slot: the reply takes the first slot in its place (Issue #3957).
+ * A stale attempt ({@link isCurrentRelayPayloadAttempt} false) does neither.
  *
- * Conditional on the notice's own payload id, in one transaction, so a notice
- * replaced meanwhile is left alone and the reply is not moved twice.
+ * @returns Whether the attempt was ended, and whether a reply was promoted
  */
-function replaceRelayPromptWithPendingReply(db, id, promptPayloadId, now = Date.now()) {
+function completeRelayPromptDelivery(db, ref) {
+    const now = ref.now ?? Date.now();
     return db.transaction(() => {
-        const row = db
-            .prepare(`
-        SELECT pending_reply FROM session_relays
-        WHERE id = ? AND pending_kind = 'prompt' AND payload_id IS ? AND pending_reply IS NOT NULL
-          AND state IN (${exports.OPEN_STATE_PLACEHOLDERS})
-      `)
-            .get(id, promptPayloadId, ...types_1.OPEN_RELAY_STATES);
-        if (!row)
-            return false;
-        const reply = parseJson(row.pending_reply, null);
-        if (!reply)
-            return false;
-        db.prepare(`
-      UPDATE session_relays
-      SET pending_kind = 'reply', pending_body = ?, payload_id = ?, overlap = ?,
-          pending_reply = NULL, updated_at = ?
-      WHERE id = ?
-    `).run(reply.body, reply.payloadId, reply.overlap, now, id);
-        return true;
+        if (!(0, relay_bind_db_delivery_1.completeRelayPayloadDelivery)(db, { ...ref, now }))
+            return { completed: false, promoted: false };
+        return { completed: true, promoted: (0, relay_bind_db_pending_1.promoteRelayPendingReply)(db, ref.relayId, now) };
     })();
 }
-/** Empty the second slot (an expiry or a cancel supersedes it). */
-function clearRelayPendingReply(db, id, now = Date.now()) {
-    db.prepare('UPDATE session_relays SET pending_reply = NULL, updated_at = ? WHERE id = ?').run(now, id);
-}
-/** Cancel a relay as part of the restart recovery, recording why. */
-function failOrphanedRelayBind(db, id, attemptId, reason, now = Date.now()) {
-    const result = db
-        .prepare(`
-      UPDATE session_relays
-      SET send_state = 'failed', state = 'cancelled', hold_reason = ?,
-          pending_kind = NULL, pending_body = NULL, payload_id = NULL, pending_reply = NULL,
-          updated_at = ?
-      WHERE id = ? AND bind_attempt_id = ? AND send_state = 'awaiting'
-        AND state IN (${exports.OPEN_STATE_PLACEHOLDERS})
-    `)
-        .run(reason, now, id, attemptId, ...types_1.OPEN_RELAY_STATES);
-    return result.changes === 1;
-}

package/dist/server/src/lib/db/relay-db-base.js

@@ -0,0 +1,20 @@
+"use strict";
+/**
+ * Reads of the relay ledger shared by `relay-db` and its split-out modules.
+ *
+ * Split out of `relay-db` (Issue #4096); `relay-db` re-exports every name here,
+ * so callers (and every `vi.mock`) keep importing from `@/lib/db/relay-db`.
+ * This module must not import `relay-db` (no cycle).
+ *
+ * @module lib/db/relay-db-base
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRelayById = getRelayById;
+const relay_bind_db_1 = require("../../lib/db/relay-bind-db");
+/** One relay by id, or null. */
+function getRelayById(db, id) {
+    const row = db
+        .prepare(`SELECT ${relay_bind_db_1.RELAY_COLUMNS} FROM session_relays WHERE id = ?`)
+        .get(id);
+    return row ? (0, relay_bind_db_1.mapRelay)(row) : null;
+}

package/dist/server/src/lib/db/relay-db-count.js

@@ -0,0 +1,49 @@
+"use strict";
+/**
+ * Counting relays per state.
+ *
+ * Split out of `relay-db` (Issue #4096); `relay-db` re-exports every name here,
+ * so callers (and every `vi.mock`) keep importing from `@/lib/db/relay-db`.
+ * This module must not import `relay-db` (no cycle).
+ *
+ * @module lib/db/relay-db-count
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.countRelays = countRelays;
+const types_1 = require("../../lib/relay/types");
+/**
+ * Count relays per state.
+ *
+ * The shape `commandmate task show` and `report metrics` print. Counting in SQL
+ * rather than reading rows because a long-lived server accumulates thousands
+ * and both callers want five integers.
+ */
+function countRelays(db, filter = {}) {
+    const clauses = [];
+    const params = [];
+    if (filter.worktreeId) {
+        if (filter.instanceId) {
+            clauses.push('((from_worktree_id = ? AND from_instance_id = ?) OR (to_worktree_id = ? AND to_instance_id = ?))');
+            params.push(filter.worktreeId, filter.instanceId, filter.worktreeId, filter.instanceId);
+        }
+        else {
+            clauses.push('(from_worktree_id = ? OR to_worktree_id = ?)');
+            params.push(filter.worktreeId, filter.worktreeId);
+        }
+    }
+    if (filter.since !== undefined) {
+        clauses.push('created_at >= ?');
+        params.push(filter.since);
+    }
+    const where = clauses.length > 0 ? `WHERE ${clauses.join(' AND ')}` : '';
+    const rows = db
+        .prepare(`SELECT state, COUNT(*) AS n FROM session_relays ${where} GROUP BY state`)
+        .all(...params);
+    const counts = (0, types_1.emptyRelayCounts)();
+    for (const row of rows) {
+        if (row.state in counts) {
+            counts[row.state] = row.n;
+        }
+    }
+    return counts;
+}

package/dist/server/src/lib/db/relay-db-delivery.js

@@ -0,0 +1,104 @@
+"use strict";
+/**
+ * Closing a relay as delivered, and completing a reply's delivery (Issue #4064).
+ *
+ * Split out of `relay-db` (Issue #4096); `relay-db` re-exports every name here,
+ * so callers (and every `vi.mock`) keep importing from `@/lib/db/relay-db`.
+ * This module must not import `relay-db` (no cycle).
+ *
+ * @module lib/db/relay-db-delivery
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.markRelayDelivered = markRelayDelivered;
+exports.completeRelayReplyDelivery = completeRelayReplyDelivery;
+const types_1 = require("../../lib/relay/types");
+const logger_1 = require("../../lib/logger");
+const relay_bind_db_1 = require("../../lib/db/relay-bind-db");
+const logger = (0, logger_1.createLogger)('relay-db');
+/**
+ * The UPDATE behind {@link markRelayDelivered}, without its catch: a write the
+ * database refuses (the UNIQUE index included) throws. `false` means only that
+ * the relay was no longer open, or already carried a delivery id.
+ */
+function closeRelayDelivered(db, id, sentRequestId, now) {
+    const result = db
+        .prepare(`
+      UPDATE session_relays
+      SET state = 'delivered', sent_request_id = ?, delivered_at = ?,
+          pending_kind = NULL, pending_body = NULL, payload_id = NULL, updated_at = ?
+      WHERE id = ? AND sent_request_id IS NULL
+        AND state IN (${relay_bind_db_1.OPEN_STATE_PLACEHOLDERS})
+    `)
+        .run(sentRequestId, now, now, id, ...types_1.OPEN_RELAY_STATES);
+    return result.changes === 1;
+}
+/**
+ * Close the relay as delivered, exactly once.
+ *
+ * Two clauses, and they guard different things — worth separating, because a
+ * later reader who notices that the second is redundant *for one relay id* will
+ * otherwise delete the one that is not.
+ *
+ *  - `state IN (open)` is what makes a SECOND call for the same relay answer
+ *    false: the first call left it `delivered`, which is not an open state.
+ *  - `sent_request_id IS NULL`, together with the column's UNIQUE index, is what
+ *    makes the delivery id itself unrepeatable ACROSS relays and across
+ *    processes. It is the idempotency key the Issue names, and it is why this
+ *    function catches: the index refusing a write is the answer "somebody else
+ *    got there first", and that answer must not arrive as an exception inside a
+ *    delivery path.
+ *
+ * @returns Whether this call is the one that closed it
+ */
+function markRelayDelivered(db, id, sentRequestId, now = Date.now()) {
+    try {
+        return closeRelayDelivered(db, id, sentRequestId, now);
+    }
+    catch (error) {
+        // The UNIQUE index refusing the write IS the answer "somebody else got
+        // there first", and it must not become an exception in a delivery path.
+        logger.warn('relay-deliver-conflict', {
+            relayId: id,
+            error: error instanceof Error ? error.message : String(error),
+        });
+        return false;
+    }
+}
+/**
+ * A reply's send went out: close the relay as delivered AND end the delivery
+ * attempt, in one transaction (Issue #4064).
+ *
+ * Closing the relay empties the payload (body, kind, payload id). Committed
+ * on its own, a failure or a stop before the attempt is ended left an
+ * `attempting` row with no payload, which the next boot held as an
+ * `uncertain` delivery nobody can identify. Here either both writes land or
+ * neither does: a throw rolls the payload back with the attempt, so the row
+ * stays `attempting` with its body and payload id — held, never re-sent, and
+ * labelled by the next boot.
+ *
+ * @throws When the database refuses a write; nothing is committed then
+ */
+function completeRelayReplyDelivery(db, input) {
+    const now = input.now ?? Date.now();
+    return db.transaction(() => {
+        // Issue #4082: the attempt is checked FIRST. A stale one — held meanwhile,
+        // resolved, or replaced by a retry's new attempt — must not close the
+        // relay or empty its payload: the close below is keyed on the relay only.
+        if (!(0, relay_bind_db_1.isCurrentRelayPayloadAttempt)(db, input))
+            return { closed: false, completed: false };
+        // Not `markRelayDelivered`: its catch turns a refused write into `false`,
+        // and ending the attempt after that would commit an open relay with its
+        // payload and hold gone — the next completion could capture the same reply
+        // again. A refused close throws here, and nothing is committed.
+        const closed = closeRelayDelivered(db, input.relayId, input.sentRequestId, now);
+        // The attempt was checked above; the close emptied `payload_id`, so the
+        // check is not asked again here.
+        const completed = (0, relay_bind_db_1.endRelayPayloadAttempt)(db, {
+            relayId: input.relayId,
+            payloadId: input.payloadId,
+            attemptId: input.attemptId,
+            now,
+        });
+        return { closed, completed };
+    })();
+}