@cmgmyr/hive 1.9.0 → 1.10.0

package/dist/scheduler.js

@@ -1,5 +1,5 @@
 import { QUEEN_AUDIT_RETENTION, QUEEN_AUDIT_MAX_ROWS, recentQueenAudit } from "./queenAudit.js";
-import { runningBuildChange, runningBuildNotice } from "./version.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";
 import { dirname, join, sep } from "node:path";
@@ -19,12 +19,15 @@ import { describeLiveTasks, describeOneTask, liveBackgroundTasks, STALL_BOUND_SE
 import { MESSAGE_MAX_ROWS, MESSAGE_RETENTION } from "./leadMessage.js";
 import { CROSS_SESSION_CLOSE, postClaudeWake, senderAddress, SOCKET_WAKE_FOOTER } from "./claudeWake.js";
 import { readLeadTurnState } from "./leadState.js";
+import { retryQuietLeadMessages } from "./leadMessageDelivery.js";
 import { harnessFor, hasTranscriptSignal, paneClassifierFor, screenClassifiable, transcriptDirFor } from "./harnesses.js";
 import { transcriptDir, readContextFill } from "./transcript.js";
 import { ageSecondsSince, describeLastLogEvent, humanizeAge, lastLogEvent, reportsAgentStateLog, } from "./stateProvenance.js";
 import { capturePane, foreignSocket, holdsHumanInput, liveTargets, maskChoiceMarker, observationFailed, paneInCopyMode, paneReissued, rowAlive, rowAliveProbe, rowLiveProbe, rowOwnership, renderTrailerView, sanitizeTail, sendText, tailCaptureLines, sleep, tmuxSocketPath, } from "./tmux.js";
 import { appendTeardown, NOT_ATTRIBUTED, sqlNow, teardownWindow, TEARDOWN_TRIGGER, } from "./teardown.js";
 export const WATCH_SCOPE_PROJECT = "project";
+const DELIVERED_BY = `pid ${process.pid}, ${versionInfo().line}`;
+const deliveredByForFiring = (timer) => timer.repeat_every_ms == null ? DELIVERED_BY : `${DELIVERED_BY}, firing #${timer.fire_count}`;
 const isStandingWatch = (timer) => timer.watch_scope === WATCH_SCOPE_PROJECT;
 export const DELIVER_SOCKET_JOIN = `LEFT JOIN agents ON agents.id = (
   SELECT a.id FROM agents a WHERE a.actor_id = wakes.deliver_actor
@@ -466,8 +469,13 @@ export function checkConfirmations() {
         WHERE ${sentAt} IS NOT NULL AND confirmed_at IS NULL AND ${sentAt} >= datetime('now', ?) LIMIT 1`).get(LOG_RETENTION);
         if (!pending)
             return;
+        stmt(`UPDATE wakes SET confirmed_at = (${repeatingEvidenceSql("MIN(ev.created_at)")})
+       WHERE ${REPEATING_SOCKET_FIRING} AND socket_attempt_at IS NOT NULL AND confirmed_at IS NULL
+         AND socket_attempt_at >= datetime('now', ?)
+         AND EXISTS (${repeatingEvidenceSql("1")})`).run(LOG_RETENTION);
         stmt(`UPDATE wakes SET confirmed_at = (${confirmationQuery})
        WHERE ${sentAt} IS NOT NULL AND confirmed_at IS NULL AND ${sentAt} >= datetime('now', ?)
+         AND NOT (${REPEATING_SOCKET_FIRING})
          AND EXISTS (${confirmationQuery.replace("MIN(created_at)", "1")})`).run(LOG_RETENTION);
     }
     catch {
@@ -513,6 +521,7 @@ export async function tick(snapshot) {
                 await maybeFireIdle(timer, snapshot, now, choices);
         }
         await retryUnconfirmedSocketWakes(snapshot, choices);
+        await retryQuietLeadMessages(snapshot);
     }
     catch {
     }
@@ -569,11 +578,12 @@ function forgetPaneAnswers(pane, choices) {
     noDialogUntil.delete(pane);
 }
 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 = ?)
-         OR (${socketAwaitingWhere()}))`, reason, timer.id, timer.due_at);
+       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);
 }
 const HELD_REASON_MODAL_CHOICE = "pane is awaiting a modal choice (folder-trust or /model picker)";
 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 " +
@@ -658,6 +668,8 @@ function conversationHoldsWake(timer, snapshot) {
     }
     return (stmt(`SELECT 1 AS hit FROM agent_state_log
         WHERE actor_id = ? AND event = 'prompt' AND CASE WHEN json_valid(payload) THEN COALESCE(json_extract(payload, '$.prompt'), payload) ELSE payload END NOT LIKE '%[hive wake #%' AND CASE WHEN json_valid(payload) THEN COALESCE(json_extract(payload, '$.prompt'), payload) ELSE payload END NOT LIKE '[hive:%'
+          AND CASE WHEN json_valid(payload) THEN COALESCE(json_extract(payload, '$.prompt'), payload) ELSE payload END NOT LIKE '<task-notification>%'
+          AND CASE WHEN json_valid(payload) THEN COALESCE(json_extract(payload, '$.prompt'), payload) ELSE payload END NOT LIKE '<cross-session-message from="%" from-name="hive">' || char(10) || '[hive:worker %] [message #%,%' || char(10) || '</cross-session-message>%'
           AND created_at >= datetime('now', ?)
         ORDER BY id DESC LIMIT 1`).get(timer.deliver_actor, CONVERSATION_HOLD_TTL) !== undefined);
 }
@@ -1610,28 +1622,33 @@ async function fireDelay(timer, snapshot, choices) {
         bestEffortRun("UPDATE wakes SET cancelled_at = datetime('now') WHERE id = ? AND created_at IS ?", timer.id, timer.created_at);
         return;
     }
+    if (timer.repeat_every_ms != null && repeatingFiringPending(timer.id))
+        return;
     await withPaneClaim(timer, () => fireDelayClaimed(timer, snapshot, choices));
 }
 async function fireDelayClaimed(timer, snapshot, choices) {
     const decision = deliverable(timer, snapshot, choices);
     if (!decision.ok)
         return false;
-    let claimed;
+    let firing = timer;
     if (timer.repeat_every_ms != null) {
         const seconds = Math.max(1, Math.round(timer.repeat_every_ms / 1000));
-        claimed =
-            stmt(`UPDATE wakes SET due_at = datetime('now', printf('+%d seconds', ?)),
-           fired_at = datetime('now'), fire_count = fire_count + 1,
-           typed_at = NULL, confirmed_at = NULL, held_at = NULL, held_reason = NULL, typed_busy = NULL,
-           typed_seen = NULL, first_held_at = NULL
-         WHERE id = ? AND due_at IS ? AND body IS ? AND repeat_every_ms IS ? AND cancelled_at IS NULL`).run(seconds, timer.id, timer.due_at, timer.body, timer.repeat_every_ms).changes === 1;
-    }
-    else {
-        claimed = claimOneShot(timer);
+        const claimed = stmt(`UPDATE wakes SET due_at = datetime('now', printf('+%d seconds', ?)),
+         fired_at = datetime('now'), fire_count = fire_count + 1,
+         typed_at = NULL, confirmed_at = NULL, held_at = NULL, held_reason = NULL, typed_busy = NULL,
+         typed_seen = NULL, first_held_at = NULL,
+         socket_attempt_at = NULL, socket_delivery_note = NULL, delivery_method = NULL, delivered_by = NULL
+       WHERE id = ? AND due_at IS ? AND body IS ? AND repeat_every_ms IS ? AND cancelled_at IS NULL
+         AND fire_count = ? AND NOT COALESCE((${REPEATING_FIRING_PENDING}), 0)
+       RETURNING fire_count, fired_at`).get(seconds, timer.id, timer.due_at, timer.body, timer.repeat_every_ms, timer.fire_count);
+        if (claimed === undefined)
+            return false;
+        firing = { ...timer, fire_count: claimed.fire_count, fired_at: claimed.fired_at, socket_attempt_at: null, socket_delivery_note: null, delivery_method: null };
     }
-    if (!claimed)
+    else if (!claimOneShot(timer)) {
         return false;
-    await deliver(timer, "", choices, decision.typedSeen, decision.firstHeldAt, decision.owner);
+    }
+    await deliver(firing, "", choices, decision.typedSeen, decision.firstHeldAt, decision.owner);
     return true;
 }
 function claimOneShot(timer) {
@@ -1889,14 +1906,39 @@ export function shortRenderForLeadDelivery(timer) {
     return standingNoticeBodyShort(timer, candidates, timer.id);
 }
 // The claim already happened, so this records why and never re-arms or replays the wake.
-function recordLostAfterClaim(timer, pasted, why) {
+function recordLostAfterClaim(timer, pasted, why, firing = null) {
     bestEffortRun(`UPDATE wakes SET held_reason = ?,
        typed_at = CASE WHEN ? = 1 THEN strftime('%Y-%m-%d %H:%M:%f', 'now') ELSE typed_at END,
        cancelled_at = CASE WHEN repeat_every_ms IS NULL THEN datetime('now') ELSE cancelled_at END
-     WHERE id = ?`, HELD_REASON_OWNERSHIP_LOST_AFTER_CLAIM + why + (pasted ? " The body was pasted; no Enter was sent." : ""), pasted ? 1 : 0, timer.id);
+     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", pty: "pty", ptyAfterSocketTimeout: "pty-after-socket-timeout" };
+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}')`;
+function repeatingFiringPending(id) {
+    try {
+        return stmt(`SELECT 1 AS hit FROM wakes WHERE id = ? AND (${REPEATING_FIRING_PENDING})`).get(id) !== undefined;
+    }
+    catch {
+        return true;
+    }
+}
+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) => `
@@ -1904,14 +1946,30 @@ const promptEvidenceSql = (lowerBound) => `
         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))`;
+// 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;
 }
-// Only a one-shot wake to a live, row-owned Claude lead whose socket was registered by this pane epoch.
+// 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 &&
-        timer.repeat_every_ms == null &&
         isLeadActorId(timer.deliver_actor) &&
         harnessFor(timer.deliver_command).name === "claude" &&
         timer.deliver_messaging_socket !== "" &&
@@ -1924,23 +1982,72 @@ function socketStillRegistered(timer, owner) {
     requireStillOwned(owner.rowId, owner.identity, `wake #${timer.id} socket delivery`);
     const row = stmt(`SELECT claude_messaging_socket AS socket, claude_messaging_pane_pid AS pid, pane_pid FROM agents
       WHERE id = ? AND status = 'running' AND kind = 'lead'`).get(owner.rowId);
-    const wake = stmt("SELECT 1 AS live FROM wakes WHERE id = ? AND cancelled_at IS NULL").get(timer.id);
+    const wake = timer.repeat_every_ms == null
+        ? stmt("SELECT 1 AS live FROM wakes WHERE id = ? AND cancelled_at IS NULL").get(timer.id)
+        : stmt("SELECT 1 AS live FROM wakes WHERE id = ? AND cancelled_at IS NULL AND fire_count = ?").get(timer.id, timer.fire_count);
     return (wake !== undefined &&
         row !== undefined &&
         row.socket === timer.deliver_messaging_socket &&
         row.pid === timer.deliver_messaging_pane_pid &&
         row.pid === row.pane_pid);
 }
+// A failed stamp means the firing was cancelled or superseded, so nothing is posted.
+function stampRepeatingAttempt(timer, note, firstHeldAt) {
+    try {
+        return (stmt(`UPDATE wakes SET socket_attempt_at = strftime('%Y-%m-%d %H:%M:%f', 'now'), socket_delivery_note = ?,
+           delivery_method = ?, delivered_by = ?, first_held_at = ?, held_at = NULL, held_reason = NULL, confirmed_at = NULL
+         WHERE id = ? AND fire_count = ? AND cancelled_at IS NULL AND typed_at IS NULL AND socket_attempt_at IS NULL`).run(note, DELIVERY_METHOD.socketRepeating, deliveredByForFiring(timer), firstHeldAt, timer.id, timer.fire_count).changes === 1);
+    }
+    catch {
+        return false;
+    }
+}
+// At most one fallback per (id, firing): the method leaves socket-repeating here and never returns to it.
+function claimRepeatingFallback(timer) {
+    try {
+        return (stmt(`UPDATE wakes SET delivery_method = ?, delivered_by = ?
+          WHERE id = ? AND fire_count = ? AND ${repeatingSocketAwaitingWhere()}
+            AND NOT EXISTS (${repeatingEvidenceSql("1")})`).run(DELIVERY_METHOD.ptyAfterSocketTimeout, deliveredByForFiring(timer), timer.id, timer.fire_count).changes === 1);
+    }
+    catch {
+        return false;
+    }
+}
+class FiringSuperseded extends Error {
+}
+// Nothing reached the pane, so this firing is settled as dropped: the next one delivers, nothing replays it.
+// The marker lives in socket_delivery_note because hive lead's re-point clears held_reason.
+function dropRepeatingFiring(timer, firing, err) {
+    const why = err instanceof Error ? err.message : String(err);
+    bestEffortRun(`UPDATE wakes SET socket_delivery_note = ?, held_reason = ?
+      WHERE id = ? AND fire_count = ? AND delivery_method = ? AND typed_at IS NULL`, FIRING_DROPPED_NOTE, `${HELD_REASON_OWNERSHIP_LOST_AFTER_CLAIM}${why} Firing #${firing} was not delivered; the next firing goes out on schedule.`, timer.id, firing, DELIVERY_METHOD.ptyAfterSocketTimeout);
+}
+function requireCurrentFiring(id, firing) {
+    const row = stmt("SELECT 1 AS hit FROM wakes WHERE id = ? AND fire_count = ? AND cancelled_at IS NULL").get(id, firing);
+    if (row === undefined)
+        throw new FiringSuperseded(`wake #${id} firing #${firing} was superseded`);
+}
 async function deliver(timer, note, choices, typedSeen, firstHeldAt, owner, fallback = false) {
     const tail = watchedTail(timer);
     const body = (isLeadActorId(timer.deliver_actor) ? shortRenderForLeadDelivery(timer) : null) ?? timer.body;
     const staleness = noticeStalenessNote(timer);
+    // A repeating wake that took the socket keeps its firing number in every marker and every write.
+    let firing = fallback && timer.delivery_method === DELIVERY_METHOD.socketRepeating ? timer.fire_count : null;
     if (!fallback && socketRoute(timer, owner)) {
-        const text = `[hive wake #${timer.id}${note ? `, ${note}` : ""}] ${body + staleness + tail}\n\n${SOCKET_WAKE_FOOTER}`;
+        const repeating = timer.repeat_every_ms != null;
+        const head = repeating ? firingMarker(timer) : `[hive wake #${timer.id}`;
+        const text = `${head}${note ? `, ${note}` : ""}] ${body + staleness + tail}\n\n${SOCKET_WAKE_FOOTER}`;
         if (!text.includes(CROSS_SESSION_CLOSE)) {
-            bestEffortRun(`UPDATE wakes SET socket_attempt_at = strftime('%Y-%m-%d %H:%M:%f', 'now'), socket_delivery_note = ?,
-           delivery_method = ?, first_held_at = ?, held_at = NULL, held_reason = NULL, confirmed_at = NULL
-         WHERE id = ?`, note, DELIVERY_METHOD.socket, firstHeldAt, timer.id);
+            if (repeating) {
+                if (!stampRepeatingAttempt(timer, note, firstHeldAt))
+                    return;
+                firing = timer.fire_count;
+            }
+            else {
+                bestEffortRun(`UPDATE wakes SET socket_attempt_at = strftime('%Y-%m-%d %H:%M:%f', 'now'), socket_delivery_note = ?,
+             delivery_method = ?, delivered_by = ?, first_held_at = ?, held_at = NULL, held_reason = NULL, confirmed_at = NULL
+           WHERE id = ?`, note, DELIVERY_METHOD.socket, deliveredByForFiring(timer), firstHeldAt, timer.id);
+            }
             const posted = await postClaudeWake({
                 socketPath: timer.deliver_messaging_socket,
                 senderAddress: senderAddress(join(dataDir, "wake-sender.sock")),
@@ -1951,12 +2058,14 @@ async function deliver(timer, note, choices, typedSeen, firstHeldAt, owner, fall
                 forgetPaneAnswers(timer.deliver_pane, choices);
                 return;
             }
+            if (firing !== null && !claimRepeatingFallback(timer))
+                return;
             note = withReDelivered(note);
             fallback = true;
         }
     }
-    const prefix = `[hive wake #${timer.id}${note ? `, ${note}` : ""}] ` +
-        (fallback ? `If you already handled wake #${timer.id}, ignore this.\n` : "");
+    const named = firing === null ? `wake #${timer.id}` : `wake #${timer.id} firing #${firing}`;
+    const prefix = `[hive ${named}${note ? `, ${note}` : ""}] ` + (fallback ? `If you already handled ${named}, ignore this.\n` : "");
     const method = fallback ? DELIVERY_METHOD.ptyAfterSocketTimeout : DELIVERY_METHOD.pty;
     let typedBusy;
     try {
@@ -1967,9 +2076,9 @@ async function deliver(timer, note, choices, typedSeen, firstHeldAt, owner, fall
         typedBusy = null;
     }
     const recordTyped = () => bestEffortRun(`UPDATE wakes SET typed_at = strftime('%Y-%m-%d %H:%M:%f', 'now'), typed_busy = ?,
-         typed_seen = ?, first_held_at = ?, held_at = NULL, held_reason = NULL, delivery_method = ?,
+         typed_seen = ?, first_held_at = ?, held_at = NULL, held_reason = NULL, delivery_method = ?, delivered_by = ?,
          confirmed_at = CASE WHEN socket_attempt_at IS NULL THEN NULL ELSE confirmed_at END
-       WHERE id = ?`, typedBusy, typedSeen, firstHeldAt, method, timer.id);
+       WHERE id = ? AND (? IS NULL OR fire_count = ?)`, typedBusy, typedSeen, firstHeldAt, method, deliveredByForFiring(timer), timer.id, firing, firing);
     const box = cacheEntry(timer.deliver_pane, choices).box;
     const strandedTextWouldHold = box !== undefined && box !== null && box.state !== "unknown";
     let pasted = false;
@@ -1978,15 +2087,27 @@ async function deliver(timer, note, choices, typedSeen, firstHeldAt, owner, fall
             pasted = true;
             if (strandedTextWouldHold)
                 recordTyped();
-        }, undefined, owner ? () => requireStillOwned(owner.rowId, owner.identity, `wake #${timer.id} delivery`) : undefined);
+        }, undefined, owner || firing !== null
+            ? () => {
+                if (owner)
+                    requireStillOwned(owner.rowId, owner.identity, `wake #${timer.id} delivery`);
+                if (firing !== null)
+                    requireCurrentFiring(timer.id, firing);
+            }
+            : undefined);
     }
     catch (err) {
-        if (fallback && !pasted) {
-            bestEffortRun("UPDATE wakes SET delivery_method = ? WHERE id = ? AND typed_at IS NULL", DELIVERY_METHOD.socket, timer.id);
+        if (fallback && !pasted && firing === null) {
+            bestEffortRun("UPDATE wakes SET delivery_method = ?, delivered_by = ? WHERE id = ? AND typed_at IS NULL", DELIVERY_METHOD.socket, deliveredByForFiring(timer), timer.id);
         }
+        if (err instanceof FiringSuperseded)
+            return;
+        if (firing !== null && !pasted)
+            dropRepeatingFiring(timer, firing, err);
         if (!(err instanceof PaneOwnershipLost))
             throw err;
-        recordLostAfterClaim(timer, pasted, err.message);
+        if (firing === null || pasted)
+            recordLostAfterClaim(timer, pasted, err.message, firing);
         return;
     }
     finally {
@@ -2011,9 +2132,11 @@ async function fallbackClaimed(timer, snapshot, choices) {
     const decision = deliverable(timer, snapshot, choices);
     if (!decision.ok)
         return false;
-    const claimed = stmt(`UPDATE wakes SET delivery_method = ?
-        WHERE id = ? AND ${socketAwaitingWhere()}
-          AND NOT EXISTS (${promptEvidenceSql("wakes.socket_attempt_at").replace("MIN(created_at)", "1")})`).run(DELIVERY_METHOD.ptyAfterSocketTimeout, timer.id).changes === 1;
+    const claimed = timer.delivery_method === DELIVERY_METHOD.socketRepeating
+        ? claimRepeatingFallback(timer)
+        : stmt(`UPDATE wakes SET delivery_method = ?, delivered_by = ?
+            WHERE id = ? AND ${socketAwaitingWhere()}
+              AND NOT EXISTS (${promptEvidenceSql("wakes.socket_attempt_at").replace("MIN(created_at)", "1")})`).run(DELIVERY_METHOD.ptyAfterSocketTimeout, deliveredByForFiring(timer), timer.id).changes === 1;
     if (!claimed)
         return false;
     await deliver(timer, withReDelivered(timer.socket_delivery_note), choices, decision.typedSeen, decision.firstHeldAt, decision.owner, true);
@@ -2022,7 +2145,7 @@ async function fallbackClaimed(timer, snapshot, choices) {
 async function retryUnconfirmedSocketWakes(snapshot, choices) {
     const awaiting = stmt(`SELECT wakes.*, ${DELIVER_ROW_COLUMNS}
        FROM wakes ${DELIVER_SOCKET_JOIN}
-      WHERE ${socketAwaitingWhere("wakes.")}
+      WHERE ((${socketAwaitingWhere("wakes.")}) OR (${repeatingSocketAwaitingWhere("wakes.")}))
         AND wakes.socket_attempt_at >= datetime('now', ?)`).all(LOG_RETENTION);
     for (const timer of awaiting) {
         if (!socketFallbackDue(timer))

package/dist/spawn.js

@@ -171,11 +171,11 @@ export function launchAgent(spec) {
     let info;
     try {
         info = db
-            .prepare("INSERT INTO agents (project_id, name, command, cwd, kind, parent_actor_id, tmux_socket, session_id, codex_home, model, extra_args) " +
-            "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
+            .prepare("INSERT INTO agents (project_id, name, command, cwd, kind, parent_actor_id, tmux_socket, session_id, codex_home, model, extra_args, todo_id) " +
+            "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
             .run(spec.projectId, spec.name, typeof spec.commandString === "string" ? spec.commandString : "", spec.cwd, spec.kind, spec.parentActor, socket, spec.sessionId ?? "", spec.codexHome ?? "", spec.model ?? null, spec.readOnly
             ? JSON.stringify({ args: spec.extraArgs ?? [], read_only: true })
-            : spec.extraArgs ? JSON.stringify(spec.extraArgs) : null);
+            : spec.extraArgs ? JSON.stringify(spec.extraArgs) : null, spec.todoId ?? null);
     }
     catch (e) {
         throw asNameClash(e, spec.name);

package/dist/tmux.js

@@ -123,7 +123,11 @@ function tmuxWithin(timeoutMs, ...args) {
         throw new TmuxError(`tmux ${args[0]} failed${detail ? `: ${detail}` : ""}`, detail ?? "");
     }
 }
-const NOTHING_THERE = /no server running|error connecting to|no current target|can't find (pane|window|session)/;
+const NOTHING_THERE = /no server running|no current target|can't find (pane|window|session)/;
+// A connect failure is an empty server only when the errno proves nothing listens; EACCES/EPERM
+// (a sandboxed caller) and any unreadable reason mean nobody answered.
+const CONNECT_FAILED = /error connecting to .*\(([^)]*)\)\s*$/;
+const NO_LISTENER = /^(No such file or directory|Connection refused)$/;
 // "no server running" is tmux ANSWERING that the socket is empty. A missing binary is nobody
 // answering at all, and the two must never read the same to anything that reports a death.
 export function tmuxNotInstalled(e) {
@@ -136,6 +140,9 @@ export function tmuxSaysNothingThere(e) {
         return false;
     if (e.notInstalled)
         return true;
+    const reason = CONNECT_FAILED.exec(e.stderr)?.[1];
+    if (reason !== undefined)
+        return NO_LISTENER.test(reason);
     return NOTHING_THERE.test(e.stderr);
 }
 function quietTmux(...args) {
@@ -854,7 +861,12 @@ function leadingRunIsFaint(s) {
             faint = false;
             continue;
         }
-        for (const p of params) {
+        for (let i = 0; i < params.length; i++) {
+            const p = params[i];
+            if (p === "38" || p === "48" || p === "58") {
+                i += params[i + 1] === "5" ? 2 : params[i + 1] === "2" ? 4 : 0;
+                continue;
+            }
             if (p === "0")
                 faint = false;
             else if (p === "2")
@@ -922,19 +934,42 @@ function classifyInputBox(rows, promptRowIndex, boxBottom) {
         .slice(0, TAIL_LINE_CHARS);
     return { state: text === "" ? "empty" : dim ? "ghost" : "pending", text };
 }
-export function inputBoxState(target) {
+const SNAPSHOT_ROWS = 10;
+const SNAPSHOT_ROW_CHARS = 120;
+const snapshotRow = (row) => stripControlBytes(stripSgr(row))
+    .trimEnd()
+    .replace(/─{4,}/g, (run) => `─×${run.length}`)
+    .slice(0, SNAPSHOT_ROW_CHARS);
+function snapshotRows(rows, anchor) {
+    if (anchor === null) {
+        return rows.map(snapshotRow).filter((row) => row !== "").slice(-SNAPSHOT_ROWS);
+    }
+    return rows.slice(anchor.top, anchor.bottom + 1).map(snapshotRow).slice(0, SNAPSHOT_ROWS);
+}
+function promptSgrOf(rows, anchor) {
+    if (anchor === null || anchor.prompt === null)
+        return "";
+    const row = rows[anchor.prompt];
+    const after = row.slice(row.indexOf(PROMPT_GLYPH_NBSP) + PROMPT_GLYPH_NBSP.length);
+    return (/^(?:\x1b\[[0-9;]*m)*/.exec(after)?.[0] ?? "").replace(/\x1b/g, "").slice(0, 60);
+}
+export function inputBoxSnapshot(target) {
     try {
         const raw = tmux("capture-pane", "-p", "-e", "-t", target, "-S", `-${tailCaptureLines()}`);
         const rows = raw.split("\n");
-        const box = findInputBox(rows);
-        if (box === null)
-            return null;
-        return box.prompt === null ? { state: "unknown", text: "" } : classifyInputBox(rows, box.prompt, box.bottom);
+        const anchor = findInputBox(rows);
+        const box = anchor === null
+            ? null
+            : anchor.prompt === null
+                ? { state: "unknown", text: "" }
+                : classifyInputBox(rows, anchor.prompt, anchor.bottom);
+        return { box, rows: snapshotRows(rows, anchor), promptSgr: promptSgrOf(rows, anchor) };
     }
     catch {
         return null;
     }
 }
+export const inputBoxState = (target) => inputBoxSnapshot(target)?.box ?? null;
 const NOISE_ROW = /^[\s\u2500-\u257F\u2580-\u259F\u2800-\u28FF]*$/;
 const FOOTER_KEEP = /esc to interrupt|\d+ (?:shell|background|task|monitor|local agent|team)s?\b|remote dynamic workflow|cloud session|ultraplan needs your input/i;
 const OSC_SEQUENCE = /\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)/g;