@cmgmyr/hive 1.11.6 → 1.11.7

package/dist/scheduler.js

@@ -1,6 +1,7 @@
 import { QUEEN_AUDIT_RETENTION, QUEEN_AUDIT_MAX_ROWS, recentQueenAudit } from "./queenAudit.js";
-import { ACTIVE_TIMER_WHERE } from "./wakeSql.js";
-export { ACTIVE_TIMER_WHERE } from "./wakeSql.js";
+import { ACTIVE_TIMER_WHERE, DELIVERY_METHOD, FIRING_DROPPED_NOTE, HELD_REASON_ACTOR_CLOSED, HELD_REASON_CONVERSATION, HELD_REASON_COPY_MODE, HELD_REASON_HANDOFF, HELD_REASON_LEAD_BOOT_INPUT_BOX, HELD_REASON_LEAD_PANE_DEAD, HELD_REASON_LEAD_ROW_CLOSED, HELD_REASON_MODAL_CHOICE, HELD_REASON_OWNERSHIP_LOST_AFTER_CLAIM, HELD_REASON_PANE_REISSUED_LEAD, HELD_REASON_PANE_REISSUED_WORKER, HELD_REASON_PANE_UNKNOWN_LEAD, HELD_REASON_PANE_UNKNOWN_WORKER, HELD_REASON_UNCLASSIFIABLE_PANE, HELD_REASON_UNSUBMITTED_INPUT, HELD_REASON_UNSUBMITTED_INPUT_OWNER_UNRESOLVED, LOG_RETENTION, activeWakeWhere, holdableWakeWhere, identityThenDead, pendingOneShotWhere, repeatingFiringPendingWhere, repeatingSocketAwaitingWhere, repeatingSocketFiringWhere, schedulerCandidateWhere, sentWakeAtSql, socketAwaitingWhere, spentUntypedNotice, wasHeldForPaneIdentity, watchWatchingWhere, } from "./wakeSql.js";
+export { ACTIVE_TIMER_WHERE, DELIVERY_METHOD, HELD_REASON_ACTOR_CLOSED, HELD_REASON_CONVERSATION, HELD_REASON_COPY_MODE, HELD_REASON_LEAD_PANE_DEAD, HELD_REASON_UNCLASSIFIABLE_PANE, HELD_REASON_UNCLASSIFIABLE_PANE_PREFIX, HELD_REASON_UNSUBMITTED_INPUT, HELD_REASON_UNSUBMITTED_INPUT_PREFIX, isLeadRowClosedHold, isUnclassifiablePaneHold, isUnsubmittedInputHold, socketAwaitingWhere, wasHeldForPaneIdentity, wasHeldForPaneReissue, } from "./wakeSql.js";
+import { parseStoreTimestamp } from "./storeClock.js";
 import { runningBuildChange, runningBuildNotice, versionInfo } from "./version.js";
 import { existsSync, lstatSync, mkdirSync, realpathSync, renameSync, statSync, unlinkSync, writeFileSync } from "node:fs";
 import { createHash } from "node:crypto";
@@ -17,13 +18,14 @@ import { QUEEN_GENERATED_MARKER, readQueenBrief, renderQueenDashboard } from "./
 import { COMMAND_KIND, stoppingMarkerLive } from "./processes.js";
 import { closeAgentRow, PaneOwnershipLost, reapCodexHomeForClosedAgent, requireStillOwned, } from "./spawn.js";
 import { isLeadActorId, LEAD_ACTOR_PREFIX, LEAD_KIND, } from "./agentKinds.js";
-import { awaitingFirstPrompt, awaitingFirstPromptSql } from "./firstPrompt.js";
+import { awaitingFirstPrompt, finishedIdle, finishedIdleSql } from "./firstPrompt.js";
 import { evaluateLeadWatch, leadSubscription } from "./leadWatch.js";
 import { describeLiveTasks, describeOneTask, liveBackgroundTasks, STALL_BOUND_SECONDS, } from "./backgroundTasks.js";
 import { MESSAGE_MAX_ROWS, MESSAGE_RETENTION } from "./leadMessage.js";
-import { CROSS_SESSION_CLOSE, postClaudeWake, senderAddress, SOCKET_WAKE_FOOTER } from "./claudeWake.js";
+import { PANE_LEASE_SETTLE_MS, releasePaneLease, tryAcquirePaneLease } from "./leaseStore.js";
+import { CROSS_SESSION_CLOSE, postClaudeWake, promptMarkerEvidenceSql, quietMessagingOn, socketGraceDue, socketSenderAddress, SOCKET_WAKE_FOOTER, } from "./claudeWake.js";
 import { driveLeadHandoff } from "./leadHandoff.js";
-import { handoffHoldsWake, HELD_REASON_HANDOFF } from "./leadHandoffState.js";
+import { handoffHoldsWake } from "./leadHandoffState.js";
 import { FIRST_MESSAGE_LOG_STATE, humanPromptSql, readLeadTurnState } from "./leadState.js";
 import { retryQuietLeadMessages } from "./leadMessageDelivery.js";
 import { harnessFor, hasTranscriptSignal, paneClassifierFor, screenClassifiable, transcriptDirFor } from "./harnesses.js";
@@ -282,7 +284,7 @@ function cancelTimer(timerId) {
 function cancelWithReason(timerId, reason) {
     bestEffortRun("UPDATE wakes SET cancelled_at = datetime('now'), held_reason = ? WHERE id = ? AND cancelled_at IS NULL", reason, timerId);
 }
-export const LOG_RETENTION = "-7 days";
+export { LOG_RETENTION } from "./wakeSql.js";
 const LOG_MAX_ROWS = 20_000;
 function pruneStateLog() {
     try {
@@ -470,7 +472,7 @@ function maybeGenerateDashboards() {
     }
 }
 export function checkConfirmations() {
-    const sentAt = "COALESCE(wakes.socket_attempt_at, wakes.typed_at)";
+    const sentAt = sentWakeAtSql("wakes.");
     const confirmationQuery = promptEvidenceSql(sentAt);
     try {
         const pending = stmt(`SELECT 1 AS hit FROM wakes
@@ -542,11 +544,7 @@ export async function tick(snapshot) {
         const now = stmt("SELECT datetime('now') AS now").get().now;
         const candidates = stmt(`SELECT wakes.*, ${DELIVER_ROW_COLUMNS}
          FROM wakes ${DELIVER_SOCKET_JOIN}
-        WHERE wakes.cancelled_at IS NULL AND (
-         (wakes.kind = 'delay' AND wakes.due_at <= datetime('now')
-           AND (wakes.fired_at IS NULL OR wakes.repeat_every_ms IS NOT NULL))
-         OR (wakes.kind != 'delay' AND wakes.fired_at IS NULL)
-       )`).all();
+        WHERE ${schedulerCandidateWhere("wakes.")}`).all();
         const choices = new Map();
         for (const timer of candidates) {
             await isolated(`timer ${timer.id}`, async () => {
@@ -622,82 +620,14 @@ function holdTimer(timer, reason) {
     const count = timer.fire_count ?? null;
     bestEffortRun(`UPDATE wakes SET held_at = datetime('now'), held_reason = ?,
        first_held_at = COALESCE(CASE WHEN held_at IS NULL THEN NULL ELSE first_held_at END, datetime('now'))
-     WHERE id = ? AND cancelled_at IS NULL
-       AND (fired_at IS NULL OR (repeat_every_ms IS NOT NULL AND due_at = ? AND (? IS NULL OR fire_count = ?))
-         OR (${socketAwaitingWhere()}))`, reason, timer.id, timer.due_at, count, count);
+     WHERE id = ? AND ${holdableWakeWhere()}`, reason, timer.id, timer.due_at, count, count);
 }
-const HELD_REASON_MODAL_CHOICE = "pane is awaiting a modal choice (folder-trust or /model picker)";
 const LEAD_BOOT_BOX_WAIT_MS = 60_000;
-const HELD_REASON_LEAD_BOOT_INPUT_BOX = "the lead's input box is not on screen yet; holding while its session starts";
-export const HELD_REASON_LEAD_PANE_DEAD = "the lead's pane is not live right now (likely mid-restart); lead-owned wakes are exempt from " +
-    "cancellation for this alone, so it is held rather than lost";
-const HELD_REASON_PANE_REISSUED_PREFIX = "the pane id recorded for this wake now belongs to a different pane than the one it was set " +
-    "against (its pid no longer matches, most likely a tmux server restart reissuing the id); held " +
-    "rather than typed into the wrong pane - ";
-const HELD_REASON_PANE_REISSUED_LEAD = `${HELD_REASON_PANE_REISSUED_PREFIX}run \`hive lead\` to re-point it at the live one`;
-const HELD_REASON_PANE_REISSUED_WORKER = `${HELD_REASON_PANE_REISSUED_PREFIX}nothing re-points a worker's wake automatically, so cancel ` +
-    "it with wake_cancel and set a fresh one once the worker's pane is confirmed live, or leave it: " +
-    "it will keep holding rather than deliver wrongly";
-const HELD_REASON_PANE_REISSUED_THEN_DEAD = `${HELD_REASON_PANE_REISSUED_PREFIX}the pane it was reissued to has since gone dead too; nothing ` +
-    "re-points a worker's wake automatically, so cancel it with wake_cancel (any running lead may do " +
-    "this even though the wake is not theirs) if it is no longer needed";
-export function wasHeldForPaneReissue(heldReason) {
-    return heldReason != null && heldReason.startsWith(HELD_REASON_PANE_REISSUED_PREFIX);
-}
-const HELD_REASON_PANE_UNKNOWN_PREFIX = "pane ownership for this wake's row cannot be verified (no pane pid was recorded for it, its row now " +
-    "records a different pane, or the pane is on another tmux socket); held rather than typed into a pane " +
-    "that may not be its own - ";
-const HELD_REASON_PANE_UNKNOWN_LEAD = `${HELD_REASON_PANE_UNKNOWN_PREFIX}run \`hive lead\` to start or adopt a lead with a recorded pane and re-point it`;
-const HELD_REASON_PANE_UNKNOWN_WORKER = `${HELD_REASON_PANE_UNKNOWN_PREFIX}nothing re-points a worker's wake automatically, so cancel it with ` +
-    "wake_cancel (any running lead may, even though the wake is not theirs), or leave it: it keeps holding " +
-    "rather than deliver wrongly";
-const HELD_REASON_PANE_UNKNOWN_THEN_DEAD = `${HELD_REASON_PANE_UNKNOWN_PREFIX}that pane has since gone dead too; nothing re-points a worker's wake ` +
-    "automatically, so cancel it with wake_cancel (any running lead may) if it is no longer needed";
-// One family for both identity holds, so a later dead pane re-holds them instead of cancelling.
-export function wasHeldForPaneIdentity(heldReason) {
-    return wasHeldForPaneReissue(heldReason) || (heldReason?.startsWith(HELD_REASON_PANE_UNKNOWN_PREFIX) ?? false);
-}
-const identityThenDead = (heldReason) => wasHeldForPaneReissue(heldReason) ? HELD_REASON_PANE_REISSUED_THEN_DEAD : HELD_REASON_PANE_UNKNOWN_THEN_DEAD;
-export const HELD_REASON_ACTOR_CLOSED = "delivery actor closed: the row this wake was bound to is closed, so nothing was typed and the wake was " +
-    "cancelled rather than delivered into a pane that row no longer owns";
-const HELD_REASON_LEAD_ROW_CLOSED = "the lead's row is closed, so no pane is this wake's to type into; held until `hive lead` starts or adopts a " +
-    "lead and re-points it";
-export function isLeadRowClosedHold(heldReason) {
-    return heldReason === HELD_REASON_LEAD_ROW_CLOSED;
-}
-const HELD_REASON_OWNERSHIP_LOST_AFTER_CLAIM = "delivery stopped after claim: ";
-export const HELD_REASON_UNCLASSIFIABLE_PANE_PREFIX = "the pane's harness is not one hive can classify; ";
-export const HELD_REASON_UNCLASSIFIABLE_PANE = `${HELD_REASON_UNCLASSIFIABLE_PANE_PREFIX}neither the dialog guard nor the unsubmitted-text ` +
-    "guard can read this screen and delivery would type blind. wake_set and wake_when_idle refuse such a " +
-    "target outright now, so this wake predates that or its pane's command changed underneath it. Nothing " +
-    "hive does on its own clears this: it lifts only when that pane is replaced by one hive starts itself " +
-    "(`hive lead` after the pane exits). Cancel it with wake_cancel (any running lead may, even though the " +
-    "wake is not theirs) and drive that pane with agent_send(keys: [...])";
-export function isUnclassifiablePaneHold(heldReason) {
-    return heldReason != null && heldReason.startsWith(HELD_REASON_UNCLASSIFIABLE_PANE_PREFIX);
-}
-export const HELD_REASON_COPY_MODE = "the pane is in tmux copy mode; tmux clears its bracketed-paste flag there, so the body would arrive " +
-    "with no paste markers (losing everything before the last 1022-byte write) and the Enter would be " +
-    "eaten by the mode instead of submitting - both silently, with tmux reporting success. It delivers " +
-    "once whoever is reading that pane leaves copy mode";
-export const HELD_REASON_UNSUBMITTED_INPUT_PREFIX = "the pane's input box has unsubmitted human text; ";
-export const HELD_REASON_UNSUBMITTED_INPUT = `${HELD_REASON_UNSUBMITTED_INPUT_PREFIX}delivering now would paste the wake body onto it and submit ` +
-    "both as one message";
-// Distinct from HELD_REASON_UNSUBMITTED_INPUT so the claim's debounce doesn't latch a transient
-// pane-resolution failure shut forever - the next tick retries instead of giving up permanently.
-const HELD_REASON_UNSUBMITTED_INPUT_OWNER_UNRESOLVED = `${HELD_REASON_UNSUBMITTED_INPUT_PREFIX}hive could not resolve a live pane for the wake's owner on ` +
-    "this tick - retrying, since that may be transient rather than permanent";
-export function isUnsubmittedInputHold(heldReason) {
-    return heldReason != null && heldReason.startsWith(HELD_REASON_UNSUBMITTED_INPUT_PREFIX);
-}
-export const HELD_REASON_CONVERSATION = "a human talked to this lead more recently than the conversation-hold window; holding so a wake " +
-    "does not split an in-progress discussion - it delivers once the window passes or the hold's own " +
-    "ceiling is reached, whichever comes first";
 function leadBootSessionIsFresh(agentId, panePid) {
     const row = stmt("SELECT pane_started_at FROM agents WHERE id = ? AND pane_pid = ?").get(agentId, panePid);
     if (!row?.pane_started_at)
         return false;
-    const timestamp = Date.parse(`${row.pane_started_at.replace(" ", "T")}Z`);
+    const timestamp = parseStoreTimestamp(row.pane_started_at);
     return Number.isFinite(timestamp) && Date.now() - timestamp < LEAD_BOOT_BOX_WAIT_MS;
 }
 function leadInputBoxObservation(pane, command, cache) {
@@ -828,7 +758,7 @@ function insertNotice(timer, deliverActor, pane, body, parentTimerId) {
 function pendingNoticeFor(parentTimerId, conditions) {
     const placeholders = conditions.map(() => "?").join(", ");
     return stmt(`SELECT t.id FROM wakes t
-      WHERE t.parent_wake_id = ? AND t.fired_at IS NULL AND t.cancelled_at IS NULL
+      WHERE t.parent_wake_id = ? AND ${pendingOneShotWhere("t.")}
         AND EXISTS (
           SELECT 1 FROM wake_idle_notices n WHERE n.notice_wake_id = t.id AND n.condition IN (${placeholders})
         )
@@ -836,7 +766,7 @@ function pendingNoticeFor(parentTimerId, conditions) {
 }
 function updateNoticeInPlace(noticeId, body) {
     return (stmt(`UPDATE wakes SET body = ?, created_at = datetime('now')
-        WHERE id = ? AND fired_at IS NULL AND cancelled_at IS NULL`).run(body, noticeId).changes === 1);
+        WHERE id = ? AND ${pendingOneShotWhere()}`).run(body, noticeId).changes === 1);
 }
 function claimBlockNotice(timerId, agentId, blockedSince) {
     return (stmt(`INSERT OR IGNORE INTO wake_block_notices (wake_id, agent_id, blocked_since)
@@ -845,9 +775,8 @@ function claimBlockNotice(timerId, agentId, blockedSince) {
 const claimModalHoldWithNotice = db.transaction((timer, pane, body, target) => {
     const claimed = stmt(`UPDATE wakes SET held_at = datetime('now'), held_reason = ?,
            first_held_at = COALESCE(CASE WHEN held_at IS NULL THEN NULL ELSE first_held_at END, datetime('now'))
-          WHERE id = ? AND cancelled_at IS NULL
+          WHERE id = ? AND (${activeWakeWhere()})
             AND due_at IS ? AND body IS ? AND repeat_every_ms IS ?
-            AND (fired_at IS NULL OR repeat_every_ms IS NOT NULL)
             AND held_reason IS NOT ?`).run(HELD_REASON_MODAL_CHOICE, timer.id, timer.due_at, timer.body, timer.repeat_every_ms, HELD_REASON_MODAL_CHOICE).changes === 1;
     if (!claimed)
         return false;
@@ -878,9 +807,8 @@ function noteModalHold(timer, snapshot) {
 const claimUnsubmittedInputHoldWithNotice = db.transaction((timer, pane, body) => {
     const claimed = stmt(`UPDATE wakes SET held_at = datetime('now'), held_reason = ?,
            first_held_at = COALESCE(CASE WHEN held_at IS NULL THEN NULL ELSE first_held_at END, datetime('now'))
-          WHERE id = ? AND cancelled_at IS NULL
+          WHERE id = ? AND (${activeWakeWhere()})
             AND due_at IS ? AND body IS ? AND repeat_every_ms IS ?
-            AND (fired_at IS NULL OR repeat_every_ms IS NOT NULL)
             AND held_reason IS NOT ?`).run(HELD_REASON_UNSUBMITTED_INPUT, timer.id, timer.due_at, timer.body, timer.repeat_every_ms, HELD_REASON_UNSUBMITTED_INPUT).changes === 1;
     if (!claimed)
         return false;
@@ -942,7 +870,7 @@ function blockedWatchedAgents(timer, snapshot, tellActor) {
         blockedSince: r.episode,
     }));
 }
-const stillPending = (timerId) => stmt(`SELECT 1 AS hit FROM wakes WHERE id = ? AND cancelled_at IS NULL AND fired_at IS NULL`).get(timerId) !== undefined;
+const stillPending = (timerId) => stmt(`SELECT 1 AS hit FROM wakes WHERE id = ? AND ${pendingOneShotWhere()}`).get(timerId) !== undefined;
 const claimBlockNoticeWithNotice = db.transaction((timer, agentId, blockedSince, tell, body) => {
     if (!stillPending(timer.id))
         return false;
@@ -998,9 +926,6 @@ function alreadyToldAbout(timerId, agentId, blockedSince) {
 }
 const CONDITION_IDLE = "idle";
 const CONDITION_GONE = "gone";
-const NOTICE_RETRY_AFTER = "-60 seconds";
-const spentUntypedNotice = (alias) => `${alias}.fired_at IS NOT NULL AND COALESCE(${alias}.typed_at, ${alias}.socket_attempt_at) IS NULL ` +
-    `AND ${alias}.cancelled_at IS NULL AND ${alias}.fired_at < datetime('now', '${NOTICE_RETRY_AFTER}')`;
 const NOTICE_MAX_AGE = "-1 hours";
 const ROSTER_STILL_GOING = 8;
 const FINISHED_SHOWN_CAP = ROSTER_STILL_GOING;
@@ -1023,13 +948,13 @@ function standingIdleRows(timer) {
           AND a.agent_state = 'idle' AND a.state_changed_at IS NOT NULL
           ${OWNED_BY_WATCH}
           AND ${unreported(CONDITION_IDLE, "a.state_changed_at")}
-        ORDER BY a.id`).all(timer.project_id, timer.deliver_actor, timer.owner, timer.id).filter((row) => !awaitingFirstPrompt(row));
+        ORDER BY a.id`).all(timer.project_id, timer.deliver_actor, timer.owner, timer.id).filter(finishedIdle);
 }
 function standingGoneRows(timer) {
     return stmt(`SELECT ${CREW_COLUMNS}, a.closed_at AS episode
        FROM agents a
       WHERE a.project_id = ? AND a.kind = 'agent' AND a.status = 'closed' AND a.actor_id != ?
-        AND (a.agent_state != 'idle' OR ${awaitingFirstPromptSql("a")})
+        AND NOT (${finishedIdleSql("a")})
         AND a.parked_at = ''
         AND a.closed_at IS NOT NULL
         ${OWNED_BY_WATCH}
@@ -1042,7 +967,7 @@ export function markGoneReported(agentId, projectId) {
          FROM wakes t
          JOIN agents a ON a.id = ?
         WHERE t.project_id = ? AND t.kind = 'idle_any' AND t.watch_scope IS NOT NULL
-          AND t.cancelled_at IS NULL AND t.fired_at IS NULL
+          AND ${pendingOneShotWhere("t.")}
           AND a.closed_at IS NOT NULL`).run(agentId, projectId);
 }
 export function seedGoneCursor(timerId, projectId) {
@@ -1077,7 +1002,7 @@ function stillGoingRows(timer) {
         return stmt(`SELECT a.name, a.actor_id, a.agent_state, a.state_changed_at, a.status, a.command, a.kind, a.resumed_at
          FROM agents a
         WHERE a.project_id = ? AND a.kind = 'agent' AND a.status = 'running'
-          AND (a.agent_state != 'idle' OR ${awaitingFirstPromptSql("a")}) AND a.actor_id != ?
+          AND NOT (${finishedIdleSql("a")}) AND a.actor_id != ?
           ${OWNED_BY_WATCH}
         ORDER BY a.id`).all(timer.project_id, timer.deliver_actor, timer.owner);
     }
@@ -1226,7 +1151,7 @@ function standingNoticeBody(timer, finished, totalFinished, carriedTotal, span)
         more = Math.max(0, rows.length - ROSTER_STILL_GOING);
         shown = rows
             .slice(0, ROSTER_STILL_GOING)
-            .map((r) => awaitingFirstPrompt(r) && r.agent_state === "idle"
+            .map((r) => r.agent_state === "idle" && !finishedIdle(r)
             ? `${r.name} (awaiting first assignment)`
             : `${r.name} (${stateNowClause(r)})`);
     }
@@ -1511,8 +1436,7 @@ function agedOutBody(timer) {
 // Telling a lead it need not re-arm, in hive's own generated prose, when it must, is how a lane ends
 // up sitting finished and unnoticed - which this project has paid for twice.
 export function watchStillWatchingClause(timer) {
-    const parent = stmt(`SELECT (cancelled_at IS NULL AND fired_at IS NULL
-             AND (max_wait_at IS NULL OR max_wait_at > datetime('now'))) AS watching,
+    const parent = stmt(`SELECT (${watchWatchingWhere()}) AS watching,
             (watch_scope IS NOT NULL) AS standing
        FROM wakes WHERE id = ?`).get(timer.parent_wake_id);
     // The parent is not always a standing watch: a modal-hold or one-shot block notice's parent is
@@ -1660,39 +1584,28 @@ function deliverable(timer, snapshot, choices) {
         owner,
     };
 }
-const PANE_CLAIM_TTL_SECONDS = 6;
-const PANE_CLAIM_SETTLE_MS = 500;
 const PANE_CLAIM_OWNER = "hive:scheduler";
-function acquirePaneClaim(projectId, key) {
-    try {
-        stmt("INSERT OR IGNORE INTO actors (id, name, kind) VALUES (?, 'hive scheduler', 'scheduler')").run(PANE_CLAIM_OWNER);
-        stmt("DELETE FROM leases WHERE project_id = ? AND lock_key = ? AND expires_at < datetime('now')").run(projectId, key);
-        const row = stmt(`INSERT INTO leases (project_id, lock_key, owner, expires_at)
-       VALUES (?, ?, ?, datetime('now', printf('+%d seconds', ?)))
-       ON CONFLICT(project_id, lock_key) DO NOTHING
-       RETURNING expires_at`).get(projectId, key, PANE_CLAIM_OWNER, PANE_CLAIM_TTL_SECONDS);
-        return row?.expires_at ?? null;
-    }
-    catch {
-        return null;
-    }
-}
 // Serializes check-then-type per pane ACROSS scheduler instances: the per-wake claim is atomic but two
 // instances claiming different wakes for one pane would otherwise both paste before either submits.
 // A loser skips this tick and its wake stays unclaimed.
 async function withPaneClaim(timer, fn) {
-    const key = `wake-pane:${timer.deliver_socket}:${timer.deliver_pane}`;
-    const held = timer.deliver_pane ? acquirePaneClaim(timer.project_id, key) : null;
+    const held = timer.deliver_pane
+        ? tryAcquirePaneLease(timer.project_id, timer.deliver_socket, timer.deliver_pane, {
+            id: PANE_CLAIM_OWNER,
+            name: "hive scheduler",
+            kind: "scheduler",
+        })
+        : null;
     if (held === null)
         return;
     try {
         // Settle: a slow TUI still showing the pasted text would make the next instance hold instead of type.
         if (await fn())
-            await sleep(PANE_CLAIM_SETTLE_MS);
+            await sleep(PANE_LEASE_SETTLE_MS);
     }
     finally {
         // Match this acquire's expires_at: after a TTL takeover the owner is shared, so owner alone would delete the taker's row.
-        bestEffortRun("DELETE FROM leases WHERE project_id = ? AND lock_key = ? AND expires_at = ?", timer.project_id, key, held);
+        releasePaneLease(timer.project_id, timer.deliver_socket, timer.deliver_pane, held);
     }
 }
 async function fireDelay(timer, snapshot, choices) {
@@ -1745,7 +1658,7 @@ async function fireDelayClaimed(timer, snapshot, choices) {
 function claimOneShot(timer) {
     return (stmt(`UPDATE wakes SET fired_at = datetime('now'), fire_count = fire_count + 1
        WHERE id = ? AND due_at IS ? AND body IS ? AND repeat_every_ms IS ?
-         AND fired_at IS NULL AND cancelled_at IS NULL`).run(timer.id, timer.due_at, timer.body, timer.repeat_every_ms).changes === 1);
+         AND ${pendingOneShotWhere()}`).run(timer.id, timer.due_at, timer.body, timer.repeat_every_ms).changes === 1);
 }
 const GONE = { idle: true, gone: true, since: null };
 const UNKNOWN = { idle: false, gone: false, since: null };
@@ -1764,7 +1677,7 @@ function watchedStates(timer, snapshot) {
             return GONE;
         }
         return {
-            idle: !awaitingFirstPrompt(agent) && agent.agent_state === "idle",
+            idle: finishedIdle(agent),
             gone: false,
             since: agent.state_changed_at,
         };
@@ -2003,24 +1916,8 @@ function recordLostAfterClaim(timer, pasted, why, firing = null) {
        cancelled_at = CASE WHEN repeat_every_ms IS NULL THEN datetime('now') ELSE cancelled_at END
      WHERE id = ? AND (? IS NULL OR fire_count = ?)`, HELD_REASON_OWNERSHIP_LOST_AFTER_CLAIM + why + (pasted ? " The body was pasted; no Enter was sent." : ""), pasted ? 1 : 0, timer.id, firing, firing);
 }
-export const DELIVERY_METHOD = {
-    socket: "socket",
-    socketRepeating: "socket-repeating",
-    pty: "pty",
-    ptyAfterSocketTimeout: "pty-after-socket-timeout",
-};
-export const socketAwaitingWhere = (prefix = "") => `${prefix}delivery_method = '${DELIVERY_METHOD.socket}' AND ${prefix}confirmed_at IS NULL AND ${prefix}typed_at IS NULL AND ${prefix}cancelled_at IS NULL`;
-// An attempt older than the row's latest claim belongs to an earlier firing (an old-build claim leaves it behind).
-const currentAttempt = (p) => `${p}socket_attempt_at IS NOT NULL AND ${p}confirmed_at IS NULL AND ${p}typed_at IS NULL AND ${p}cancelled_at IS NULL
-   AND ${p}fired_at IS NOT NULL AND ${p}socket_attempt_at >= ${p}fired_at`;
-const repeatingSocketAwaitingWhere = (prefix = "") => `${prefix}delivery_method = '${DELIVERY_METHOD.socketRepeating}' AND ${currentAttempt(prefix)}`;
-const FIRING_DROPPED_NOTE = "dropped";
-const repeatingFallbackClaimedWhere = (prefix = "") => `${prefix}repeat_every_ms IS NOT NULL AND ${prefix}delivery_method = '${DELIVERY_METHOD.ptyAfterSocketTimeout}' AND ${currentAttempt(prefix)}
-   AND ${prefix}socket_delivery_note IS NOT '${FIRING_DROPPED_NOTE}'`;
-// Bounded like retry and confirmation: past retention neither can settle it, so it must stop deferring.
-const REPEATING_FIRING_PENDING = `((${repeatingSocketAwaitingWhere()}) OR (${repeatingFallbackClaimedWhere()}))
-  AND socket_attempt_at >= datetime('now', '${LOG_RETENTION}')`;
-const REPEATING_SOCKET_FIRING = `repeat_every_ms IS NOT NULL AND COALESCE(delivery_method, '') IN ('${DELIVERY_METHOD.socketRepeating}', '${DELIVERY_METHOD.ptyAfterSocketTimeout}')`;
+const REPEATING_FIRING_PENDING = repeatingFiringPendingWhere();
+const REPEATING_SOCKET_FIRING = repeatingSocketFiringWhere();
 function repeatingFiringPending(id) {
     try {
         return stmt(`SELECT 1 AS hit FROM wakes WHERE id = ? AND (${REPEATING_FIRING_PENDING})`).get(id) !== undefined;
@@ -2030,34 +1927,19 @@ function repeatingFiringPending(id) {
     }
 }
 const firingMarker = (timer) => `[hive wake #${timer.id} firing #${timer.fire_count}`;
-const SOCKET_CONFIRM_GRACE_SECONDS = 60;
 const withReDelivered = (note) => (note ? `${note}, re-delivered` : "re-delivered");
 const promptEvidenceSql = (lowerBound) => `
        SELECT MIN(created_at) FROM agent_state_log
         WHERE actor_id = wakes.deliver_actor AND event = 'prompt' AND created_at >= ${lowerBound}
           AND (payload LIKE '%[hive wake #' || wakes.id || ']%'
                OR payload LIKE '%[hive wake #' || wakes.id || ',%')`;
-const ENVELOPE_OPEN = '<cross-session-message from="';
-const ENVELOPE_SENDER_CLOSE = '" from-name="hive">';
-const EV_PROMPT = "(CASE WHEN json_valid(ev.payload) THEN COALESCE(json_extract(ev.payload, '$.prompt'), '') ELSE ev.payload END)";
 const EV_MARKER = "('[hive wake #' || wakes.id || ' firing #' || wakes.fire_count)";
-const markerAt = (start) => `substr(${EV_PROMPT}, ${start}, length(${EV_MARKER}) + 1) IN (${EV_MARKER} || ']', ${EV_MARKER} || ',')`;
-const EV_HEADER_END = `instr(${EV_PROMPT}, char(10))`;
+const markerAt = (promptSql, startSql) => `substr(${promptSql}, ${startSql}, length(${EV_MARKER}) + 1) IN (${EV_MARKER} || ']', ${EV_MARKER} || ',')`;
 // The current firing's exact marker, at prompt offset 0 (typed) or opening hive's envelope body (socket).
 const repeatingEvidenceSql = (select) => `
        SELECT ${select} FROM agent_state_log ev
         WHERE ev.actor_id = wakes.deliver_actor AND ev.event = 'prompt' AND ev.created_at >= wakes.socket_attempt_at
-          AND (${markerAt("1")}
-               OR (${EV_HEADER_END} > ${ENVELOPE_OPEN.length + ENVELOPE_SENDER_CLOSE.length}
-                   AND substr(${EV_PROMPT}, 1, ${ENVELOPE_OPEN.length}) = '${ENVELOPE_OPEN}'
-                   AND substr(${EV_PROMPT}, ${EV_HEADER_END} - ${ENVELOPE_SENDER_CLOSE.length}, ${ENVELOPE_SENDER_CLOSE.length}) = '${ENVELOPE_SENDER_CLOSE}'
-                   AND instr(substr(${EV_PROMPT}, ${ENVELOPE_OPEN.length + 1}, ${EV_HEADER_END} - ${ENVELOPE_OPEN.length + ENVELOPE_SENDER_CLOSE.length + 1}), '"') = 0
-                   AND ${markerAt(`${EV_HEADER_END} + 1`)}
-                   AND instr(${EV_PROMPT}, char(10) || '${CROSS_SESSION_CLOSE}') > ${EV_HEADER_END}))`;
-function quietMessagingOn(projectId) {
-    const project = stmt("SELECT path FROM projects WHERE id = ?").get(projectId);
-    return project !== undefined && loadProjectYml(project.path).config?.quiet_messaging === true;
-}
+          AND ${promptMarkerEvidenceSql(markerAt)}`;
 // Only a wake to a live, row-owned Claude lead whose socket was registered by this pane epoch.
 function socketRoute(timer, owner) {
     return (owner !== null &&
@@ -2141,7 +2023,7 @@ async function deliver(timer, note, choices, typedSeen, firstHeldAt, owner, fall
             }
             const posted = await postClaudeWake({
                 socketPath: timer.deliver_messaging_socket,
-                senderAddress: senderAddress(join(dataDir, "wake-sender.sock")),
+                senderAddress: socketSenderAddress(dataDir),
                 text,
                 beforeWrite: () => socketStillRegistered(timer, owner),
             });
@@ -2220,15 +2102,7 @@ async function deliver(timer, note, choices, typedSeen, firstHeldAt, owner, fall
 }
 // Measured from the lead's first turn end after the post, because a busy lead reads the post only then.
 function socketFallbackDue(timer) {
-    const firstStop = stmt("SELECT MIN(created_at) AS t FROM agent_state_log WHERE actor_id = ? AND event = 'stop' AND created_at >= ?").get(timer.deliver_actor, timer.socket_attempt_at).t;
-    let from = firstStop;
-    if (from === null) {
-        const turn = timer.deliver_row_id === null ? null : readLeadTurnState(timer.deliver_row_id);
-        if (turn !== null && turn.state === "working" && turn.pane_pid === timer.deliver_pane_pid)
-            return false;
-        from = timer.socket_attempt_at;
-    }
-    return stmt("SELECT (julianday('now') - julianday(?)) * 86400 >= ? AS due").get(from, SOCKET_CONFIRM_GRACE_SECONDS).due === 1;
+    return socketGraceDue(timer.deliver_actor, timer.socket_attempt_at, timer.deliver_pane_pid, () => timer.deliver_row_id === null ? null : readLeadTurnState(timer.deliver_row_id));
 }
 async function fallbackClaimed(timer, snapshot, choices) {
     const decision = deliverable(timer, snapshot, choices);

package/dist/staleServers.js

@@ -3,6 +3,8 @@ import { realpathSync } from "node:fs";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { DEFAULT_DATA_DIR } from "./dataDir.js";
+import { parseEtimeSeconds } from "./etime.js";
+import { parseStoreTimestamp } from "./storeClock.js";
 export const STALE_SERVER_BOUNDARY_SLACK_MS = 3000;
 export function readProcessEnvironment(pid) {
     try {
@@ -18,37 +20,11 @@ export function readProcessEnvironment(pid) {
     }
 }
 const serverEntrypoint = resolve(dirname(fileURLToPath(import.meta.url)), "index.js");
-export function elapsedSeconds(value) {
-    const dayForm = /^(\d+)-(\d{1,2}):(\d{2}):(\d{2})$/.exec(value);
-    const fields = dayForm ? dayForm.slice(2).map(Number) : value.split(":").map(Number);
-    if ((!dayForm && fields.length !== 2 && fields.length !== 3) || fields.some((field) => !Number.isSafeInteger(field) || field < 0)) {
-        return null;
-    }
-    let total;
-    if (dayForm) {
-        const [hours, minutes, seconds] = fields;
-        if (hours > 23 || minutes > 59 || seconds > 59)
-            return null;
-        total = (Number(dayForm[1]) * 24 + hours) * 3600 + minutes * 60 + seconds;
-    }
-    else if (fields.length === 2) {
-        const [minutes, seconds] = fields;
-        if (seconds > 59)
-            return null;
-        total = minutes * 60 + seconds;
-    }
-    else {
-        const [hours, minutes, seconds] = fields;
-        if (minutes > 59 || seconds > 59)
-            return null;
-        total = hours * 3600 + minutes * 60 + seconds;
-    }
-    return Number.isSafeInteger(total) ? total : null;
-}
+export const elapsedSeconds = parseEtimeSeconds;
 function appliedAtInstant(appliedAt) {
     if (!/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(appliedAt))
         return null;
-    const instant = Date.parse(`${appliedAt.replace(" ", "T")}Z`);
+    const instant = parseStoreTimestamp(appliedAt);
     return Number.isFinite(instant) ? instant : null;
 }
 function runsThisServer(command) {

package/dist/stateProvenance.js

@@ -2,6 +2,7 @@ import { db } from "./db.js";
 import { awaitingFirstPrompt } from "./firstPrompt.js";
 import { harnessFor } from "./harnesses.js";
 import { sanitizeEventForDisplay } from "./tmux.js";
+import { parseStoreTimestamp } from "./storeClock.js";
 const prepared = new Map();
 function stmt(sql) {
     let s = prepared.get(sql);
@@ -11,9 +12,6 @@ function stmt(sql) {
     }
     return s;
 }
-function parseStoreTimestamp(ts) {
-    return new Date(`${ts.replace(" ", "T")}Z`).getTime();
-}
 export function ageSecondsSince(storeTimestamp, now = Date.now()) {
     return Math.max(0, Math.round((now - parseStoreTimestamp(storeTimestamp)) / 1000));
 }

package/dist/storeClock.js

@@ -0,0 +1,4 @@
+export function parseStoreTimestamp(value) {
+    const normalized = /(Z|[+-]\d\d:?\d\d)$/.test(value) ? value : `${value.replace(" ", "T")}Z`;
+    return new Date(normalized).getTime();
+}

package/dist/teardown.js

@@ -1,5 +1,6 @@
 import { appendFileSync, existsSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
+import { parseStoreTimestamp } from "./storeClock.js";
 export const TEARDOWN_LOG = "teardowns.jsonl";
 // A backstop against a runaway writer, not a retention policy.
 export const TEARDOWN_MAX_RECORDS = 200;
@@ -11,7 +12,7 @@ export function teardownLogPath(dataDir) {
 export function sqlNow(now = new Date()) {
     return now.toISOString().replace("T", " ").slice(0, 23);
 }
-const sqlToDate = (ts) => new Date(`${ts.replace(" ", "T")}Z`);
+const sqlToDate = (ts) => new Date(parseStoreTimestamp(ts));
 export function teardownWindow(from, to, basis) {
     const seconds = (sqlToDate(to).getTime() - sqlToDate(from).getTime()) / 1000;
     return { from, to, basis, width_seconds: Number.isFinite(seconds) ? Math.max(0, seconds) : 0 };

package/dist/tools/leases.js

@@ -1,21 +1,8 @@
 import { z } from "zod";
-import { db } from "../db.js";
 import { currentActor, effectiveProjectId } from "../context.js";
+import { extendOwnedLease, insertLease, purgeExpiredLeases, readLease, releaseOwnedLease } from "../leaseStore.js";
 import { run } from "../result.js";
 import { idParam, projectIdParam } from "./params.js";
-function purgeExpired(projectId) {
-    db.prepare("DELETE FROM leases WHERE project_id = ? AND expires_at < datetime('now')").run(projectId);
-}
-export function readLease(projectId, key) {
-    return db.prepare("SELECT * FROM leases WHERE project_id = ? AND lock_key = ?").get(projectId, key);
-}
-export function extendOwnedLease(projectId, key, actor, ttlSeconds) {
-    const info = db
-        .prepare(`UPDATE leases SET expires_at = datetime('now', printf('+%d seconds', ?))
-       WHERE project_id = ? AND lock_key = ? AND owner = ?`)
-        .run(ttlSeconds, projectId, key, actor);
-    return info.changes > 0;
-}
 export function registerLeases(server) {
     server.registerTool("lease_acquire", {
         description: "Try to take a named lease on state another session could also change, such as a shared checkout, a dev database or a port (non-blocking). Re-taking your own lease extends it. Leases expire on their own.",
@@ -40,14 +27,9 @@ export function registerLeases(server) {
         },
     }, (args) => run(() => {
         const projectId = effectiveProjectId(args.project_id);
-        purgeExpired(projectId);
+        purgeExpiredLeases(projectId);
         const actor = currentActor();
-        const inserted = db
-            .prepare(`INSERT INTO leases (project_id, lock_key, owner, expires_at)
-             VALUES (?, ?, ?, datetime('now', printf('+%d seconds', ?)))
-             ON CONFLICT(project_id, lock_key) DO NOTHING
-             RETURNING expires_at`)
-            .get(projectId, args.key, actor, args.ttl_seconds);
+        const inserted = insertLease(projectId, args.key, actor, args.ttl_seconds);
         if (inserted) {
             return { project_id: projectId, key: args.key, acquired: true, expires_at: inserted.expires_at };
         }
@@ -91,9 +73,7 @@ export function registerLeases(server) {
         outputSchema: { project_id: idParam, key: z.string(), released: z.boolean() },
     }, (args) => run(() => {
         const projectId = effectiveProjectId(args.project_id);
-        const info = db
-            .prepare("DELETE FROM leases WHERE project_id = ? AND lock_key = ? AND owner = ?")
-            .run(projectId, args.key, currentActor());
-        return { project_id: projectId, key: args.key, released: info.changes > 0 };
+        const released = releaseOwnedLease(projectId, args.key, currentActor());
+        return { project_id: projectId, key: args.key, released };
     }));
 }

package/dist/tools/wakes.js

@@ -6,8 +6,8 @@ import { commitQueenStateWrite } from "../queenAudit.js";
 import { currentActor, effectiveProjectId, getProject, isQueenLead, } from "../context.js";
 import { run } from "../result.js";
 import { summaryLiveness } from "../agentRecords.js";
-import { LOG_RETENTION, OWNED_BY_WATCH, WATCH_SCOPE_PROJECT, seedGoneCursor, } from "../scheduler.js";
-import { ACTIVE_TIMER_WHERE } from "../wakeSql.js";
+import { OWNED_BY_WATCH, WATCH_SCOPE_PROJECT, seedGoneCursor, } from "../scheduler.js";
+import { ACTIVE_TIMER_WHERE, LOG_RETENTION, firedOneShotWhere, pendingOneShotWhere, wakeConfirmation, } from "../wakeSql.js";
 import { idParam, projectIdParam } from "./params.js";
 import { cutToUnitBudget } from "../slug.js";
 import { awaitingFirstPrompt } from "../firstPrompt.js";
@@ -29,7 +29,7 @@ const RECENTLY_FIRED_LIMIT = 10;
 function recentlyFiredWakes(projectId) {
     return db
         .prepare(`SELECT * FROM wakes
-       WHERE project_id = ? AND cancelled_at IS NULL AND fired_at IS NOT NULL AND repeat_every_ms IS NULL
+       WHERE project_id = ? AND ${firedOneShotWhere()}
          AND fired_at >= datetime('now', ?)
        ORDER BY fired_at DESC, id DESC LIMIT ${RECENTLY_FIRED_LIMIT}`)
         .all(projectId, LOG_RETENTION);
@@ -52,15 +52,7 @@ function deliveryState(t, hasChannel) {
         held_at: t.held_at,
         held_reason: t.held_reason,
         confirmed_at: t.confirmed_at,
-        confirmation: t.typed_at == null && t.socket_attempt_at == null
-            ? null
-            : t.confirmed_at != null
-                ? "confirmed"
-                : !hasChannel(t.deliver_actor)
-                    ? "no_confirmation_channel"
-                    : t.typed_busy === 1
-                        ? "unconfirmed_busy"
-                        : "unconfirmed",
+        confirmation: wakeConfirmation(t, (t.typed_at == null && t.socket_attempt_at == null) || t.confirmed_at != null || hasChannel(t.deliver_actor)),
         delivery_method: t.delivery_method,
         delivered_by: t.delivered_by,
         socket_attempt_at: t.socket_attempt_at,
@@ -408,13 +400,13 @@ export function registerWakes(server) {
                 .prepare(`SELECT id, watch FROM wakes
                   WHERE project_id = ? AND owner = ? AND kind = ?
                     AND watch_scope IS NULL AND deliver_actor = ? AND deliver_pane = ?
-                    AND fired_at IS NULL AND cancelled_at IS NULL
+                    AND ${pendingOneShotWhere()}
                     AND id NOT IN (SELECT wake_id FROM lead_idle_subscriptions)`)
                 .all(projectId, currentActor(), `idle_${mode}`, delivery.actor, delivery.pane)
                 .filter((w) => sameSet(w.watch))
                 .map((w) => w.id);
             const superseded = candidates.filter((id) => db
-                .prepare("UPDATE wakes SET cancelled_at = datetime('now') WHERE id = ? AND cancelled_at IS NULL AND fired_at IS NULL")
+                .prepare(`UPDATE wakes SET cancelled_at = datetime('now') WHERE id = ? AND ${pendingOneShotWhere()}`)
                 .run(id).changes === 1);
             const info = db
                 .prepare(`INSERT INTO wakes (project_id, owner, body, kind, watch, deliver_actor, deliver_pane,
@@ -577,7 +569,7 @@ export function registerWakes(server) {
             const notices = info.changes > 0
                 ? db
                     .prepare(`UPDATE wakes SET cancelled_at = datetime('now')
-                     WHERE parent_wake_id = ? AND cancelled_at IS NULL AND fired_at IS NULL`)
+                     WHERE parent_wake_id = ? AND ${pendingOneShotWhere()}`)
                     .run(args.wake_id).changes
                 : 0;
             return { wake_id: args.wake_id, cancelled: info.changes > 0, cancelled_notices: notices };