@cmgmyr/hive 1.11.5 → 1.11.7

package/dist/kickoff.js

@@ -17,9 +17,9 @@ export function truncate(text, limit) {
 async function digest(projectPath, profile, warnings) {
     const { migrate, db } = await import("./db.js");
     const { findProjectForCwd } = await import("./context.js");
-    const { ACTIVE_TIMER_WHERE } = await import("./scheduler.js");
-    const { getActivePadByName } = await import("./tools/pads.js");
     const { ACTIVE_TODO_SQL, OPEN_BLOCKERS_SQL } = await import("./todoScope.js");
+    const { ACTIVE_TIMER_WHERE } = await import("./wakeSql.js");
+    const { getActivePadByName } = await import("./pads.js");
     migrate();
     const project = findProjectForCwd();
     if (!project || project.path !== projectPath)

package/dist/leadHandoff.js

@@ -1,7 +1,9 @@
 import { createHash } from "node:crypto";
 import { db } from "./db.js";
+import { MESSAGE_RETENTION, MESSAGE_STATUS } from "./leadMessage.js";
+import { HELD_REASON_HANDOFF, LOG_RETENTION, handoffSocketInFlightWhere, pendingOneShotWhere, } from "./wakeSql.js";
 import { harnessFor, paneClassifierFor } from "./harnesses.js";
-import { casHandoff, HELD_REASON_HANDOFF, handoffHoldsAutomation, nowSql, olderThan, PASS_TIMEOUT_SECONDS, PRE_RESPAWN_STATES, passPolicy, quotedPolicy, readActiveHandoff, readHandoff, STOP_HOLD_CAP_SECONDS, SUCCESSOR_NOT_READY, } from "./leadHandoffState.js";
+import { casHandoff, handoffHoldsAutomation, nowSql, olderThan, PASS_TIMEOUT_SECONDS, PRE_RESPAWN_STATES, passPolicy, quotedPolicy, readActiveHandoff, readHandoff, STOP_HOLD_CAP_SECONDS, SUCCESSOR_NOT_READY, } from "./leadHandoffState.js";
 import { holdsHumanInput, paneInCopyMode, rowOwnership, tmuxSocketPath } from "./tmux.js";
 import { readLeadSafetySnapshot } from "./leadState.js";
 import { readTurnCount } from "./turnCount.js";
@@ -94,7 +96,7 @@ const failTransaction = db.transaction((id, failure, from, where) => {
     if (!casHandoff(id, from, { state: "failed", failure, owner_token: null, owner_pid: null }, where))
         return false;
     db.prepare(`UPDATE wakes SET cancelled_at = datetime('now'), held_reason = ?
-      WHERE id = (SELECT request_wake_id FROM lead_handoffs WHERE id = ?) AND fired_at IS NULL AND cancelled_at IS NULL`).run(`lead handoff #${id} failed: ${failure}`, id);
+      WHERE id = (SELECT request_wake_id FROM lead_handoffs WHERE id = ?) AND ${pendingOneShotWhere()}`).run(`lead handoff #${id} failed: ${failure}`, id);
     return true;
 });
 export function failHandoff(id, failure, from = PRE_RESPAWN_STATES, where = {}) {
@@ -158,13 +160,12 @@ export function requestBody(row, turns) {
 // Automated deliveries to the lead other than the handoff's own request wakes.
 export function automationBlocker(lead, seconds) {
     const inFlight = db
-        .prepare(`SELECT 1 AS hit FROM agent_messages WHERE to_agent_id = ? AND delivery_status IN ('socket-pending', 'fallback-claimed')
-        AND created_at >= datetime('now', '-7 days')
+        .prepare(`SELECT 1 AS hit FROM agent_messages WHERE to_agent_id = ? AND delivery_status IN (?, ?)
+        AND created_at >= datetime('now', ?)
        UNION ALL
-       SELECT 1 FROM wakes WHERE deliver_actor = ? AND body NOT LIKE ? AND fired_at IS NOT NULL AND cancelled_at IS NULL
-        AND delivery_method LIKE 'socket%' AND confirmed_at IS NULL AND socket_attempt_at >= datetime('now', '-7 days')
+       SELECT 1 FROM wakes WHERE deliver_actor = ? AND body NOT LIKE ? AND ${handoffSocketInFlightWhere()}
        LIMIT 1`)
-        .get(lead.id, lead.actor_id, `${REQUEST_BODY_PREFIX}%`);
+        .get(lead.id, MESSAGE_STATUS.socketPending, MESSAGE_STATUS.fallbackClaimed, MESSAGE_RETENTION, lead.actor_id, `${REQUEST_BODY_PREFIX}%`, LOG_RETENTION);
     if (inFlight !== undefined)
         return "a delivery to the lead is still in flight";
     if (seconds === null)
@@ -204,7 +205,7 @@ const requestTransaction = db.transaction((row, lead, turns) => {
     const waiting = current.request_wake_id === null
         ? undefined
         : db
-            .prepare("SELECT id FROM wakes WHERE id = ? AND due_at IS NULL AND fired_at IS NULL AND cancelled_at IS NULL")
+            .prepare(`SELECT id FROM wakes WHERE id = ? AND due_at IS NULL AND ${pendingOneShotWhere()}`)
             .get(current.request_wake_id);
     let wakeId;
     if (waiting !== undefined) {
@@ -435,12 +436,12 @@ export function handoffInjection(leadActor) {
         .prepare("SELECT name, agent_state FROM agents WHERE project_id = ? AND kind = 'agent' AND status = 'running' ORDER BY id")
         .all(lead.project_id);
     const pending = db
-        .prepare("SELECT COUNT(*) AS n FROM wakes WHERE deliver_actor = ? AND fired_at IS NULL AND cancelled_at IS NULL")
+        .prepare(`SELECT COUNT(*) AS n FROM wakes WHERE deliver_actor = ? AND ${pendingOneShotWhere()}`)
         .get(lead.actor_id).n;
     const heldWakes = db.prepare("SELECT COUNT(*) AS n FROM wakes WHERE deliver_actor = ? AND held_reason = ? AND cancelled_at IS NULL").get(lead.actor_id, HELD_REASON_HANDOFF).n;
     const heldMessages = db
-        .prepare("SELECT COUNT(*) AS n FROM agent_messages WHERE to_agent_id = ? AND delivery_status = 'fallback-pending' AND created_at >= datetime('now', '-7 days')")
-        .get(lead.id).n;
+        .prepare("SELECT COUNT(*) AS n FROM agent_messages WHERE to_agent_id = ? AND delivery_status = ? AND created_at >= datetime('now', ?)")
+        .get(lead.id, MESSAGE_STATUS.fallbackPending, MESSAGE_RETENTION).n;
     const lines = [`[hive] LEAD HANDOFF: pad "${HANDOFF_PAD_NAME}" #${pad.id} revision ${pad.revision}, written ${pad.updated_at} UTC.`];
     {
         lines.push(`Handed off by session ${row.predecessor_session_id} at turn ${row.predecessor_turns ?? "?"} (${row.reason}, pass ${row.pass})` +

package/dist/leadHandoffCli.js

@@ -21,13 +21,28 @@ function flags(argv, names) {
     const out = {};
     for (let i = 0; i < argv.length; i++) {
         const name = argv[i].replace(/^--/, "");
-        if (!argv[i].startsWith("--") || !names.includes(name) || argv[i + 1] === undefined)
+        if (!argv[i].startsWith("--") || !names.includes(name) || argv[i + 1] === undefined) {
             return `unexpected argument "${argv[i]}"`;
+        }
         out[name] = argv[++i];
     }
     const absent = names.filter((n) => out[n] === undefined);
     return absent.length > 0 ? `missing --${absent.join(", --")}` : out;
 }
+function rejectUnknownFlag(argv, command, names, flagsText) {
+    const known = new Set(names.map((name) => `--${name}`));
+    for (let i = 0; i < argv.length; i++) {
+        if (known.has(argv[i])) {
+            i++;
+            continue;
+        }
+        if (argv[i].startsWith("-")) {
+            console.error(`hive ${command}: unknown argument "${argv[i]}". Flags are ${flagsText}.`);
+            return true;
+        }
+    }
+    return false;
+}
 const intFlag = (value) => (/^\d+$/.test(value) ? Number(value) : null);
 function runningLeadById(id) {
     return db
@@ -36,6 +51,8 @@ function runningLeadById(id) {
         .get(id);
 }
 export async function cmdLeadHandoff(argv) {
+    if (rejectUnknownFlag(argv, "lead-handoff", ["request", "pad", "revision"], "--request <id>, --pad <id>, --revision <n>"))
+        return 1;
     const refuse = (why) => {
         console.error(`hive lead-handoff: ${why}. This session stays as it is.`);
         return 1;
@@ -152,6 +169,8 @@ const sleepMs = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 // `hive lead-handoff-grace`: the one detached owner of an attempt. It never outlives a changed
 // attempt or token, and after it claims the respawn it never repeats the kill.
 export async function runHandoffGrace(argv) {
+    if (rejectUnknownFlag(argv, "lead-handoff-grace", ["request", "attempt", "token"], "--request <id>, --attempt <n>, --token <token>"))
+        return 1;
     try {
         return await graceLoop(argv);
     }
@@ -245,6 +264,8 @@ async function graceLoop(argv) {
 // `hive lead-handoff-start`: runs in the respawned pane before Claude. It publishes the successor's
 // pid on the same lead row by CAS against the predecessor, and only then lets the shell exec Claude.
 export async function runHandoffStart(argv) {
+    if (rejectUnknownFlag(argv, "lead-handoff-start", ["request", "attempt", "token"], "--request <id>, --attempt <n>, --token <token>"))
+        return 1;
     const parsed = flags(argv, ["request", "attempt", "token"]);
     const refuse = (why, id) => {
         if (id !== undefined) {

package/dist/leadHandoffState.js

@@ -1,4 +1,5 @@
 import { db } from "./db.js";
+export { HELD_REASON_HANDOFF } from "./wakeSql.js";
 export const PRE_RESPAWN_STATES = ["pending", "wind_down", "requested", "grace", "postponed"];
 export const PASS_TIMEOUT_SECONDS = 10 * 60;
 export const STOP_HOLD_CAP_SECONDS = 15 * 60;
@@ -53,8 +54,6 @@ export function readHandoffGate(leadAgentId) {
         ? null
         : { requestId: row.id, requestWakeId: row.request_wake_id, holdAutomation: handoffHoldsAutomation(row) };
 }
-export const HELD_REASON_HANDOFF = "the lead is handing off to a fresh session; held through the wind-down and the successor's boot, and delivered to " +
-    "the lead row once the successor completes its first turn, or when the handoff fails or releases its hold";
 // A wake addressed to a lead row is held while that lead's handoff holds automation, except the
 // current request wake itself, which still passes every human-input and ownership guard.
 export function handoffHoldsWake(wakeId, deliverRowId) {

package/dist/leadLaunch.js

@@ -4,7 +4,7 @@ import { carriesNameFlag } from "./harnesses.js";
 import { join } from "node:path";
 import { checkoutRoot, renderProfileFile, resolveProfileFile } from "./profiles.js";
 import { activeProfile, configHash, mergedProjectVars } from "./projectYml.js";
-import { LEAD_NAME } from "./spawn.js";
+import { LEAD_NAME } from "./agentKinds.js";
 import { shellQuote } from "./tmux.js";
 // What `hive lead` and the handoff bootstrap both need to launch a claude lead: trust, posture,
 // hooks and identity env. Pane adoption and leftover cleanup stay in cmdLead.

package/dist/leadMessage.js

@@ -1,4 +1,5 @@
 import { db } from "./db.js";
+import { DELIVERY_METHOD } from "./claudeWake.js";
 import { cutToUnitBudget, flatten } from "./slug.js";
 // 300 sits in the empty band between the two measured populations (todo 475): the largest lead-bound
 // message anyone has argued must arrive whole is 143 bytes, and the smallest real worker report is 440.
@@ -14,6 +15,18 @@ export const MESSAGE_RETENTION = "-7 days";
 // direction. Far above any observed rate, and lower than agent_state_log's 20,000 because a row here
 // holds unbounded message text rather than a hook payload.
 export const MESSAGE_MAX_ROWS = 5_000;
+export const MESSAGE_STATUS = {
+    socketPending: "socket-pending",
+    fallbackPending: "fallback-pending",
+    fallbackClaimed: "fallback-claimed",
+    complete: "complete",
+    failed: "failed",
+};
+export const MESSAGE_METHOD = {
+    socket: DELIVERY_METHOD.socket,
+    pty: DELIVERY_METHOD.pty,
+    ptyAfterSocketTimeout: DELIVERY_METHOD.ptyAfterSocketTimeout,
+};
 export const DELIVERY_FIELDS = [
     "delivery_status",
     "delivery_method",

package/dist/leadMessageDelivery.js

@@ -1,52 +1,22 @@
-import { join } from "node:path";
 import { dataDir, db } from "./db.js";
-import { CROSS_SESSION_CLOSE, postClaudeWake, senderAddress } from "./claudeWake.js";
+import { CROSS_SESSION_CLOSE, promptMarkerEvidenceSql, postClaudeWake, quietMessagingOn, socketGraceDue, socketSenderAddress, SOCKET_MESSAGE_FOOTER, } from "./claudeWake.js";
 import { harnessFor, paneClassifierFor } from "./harnesses.js";
-import { LEAD_MESSAGE_THRESHOLD, renderLeadMessage, senderTag, shortenedSendNote, storeLeadMessage, } from "./leadMessage.js";
+import { LEAD_MESSAGE_THRESHOLD, MESSAGE_METHOD, MESSAGE_RETENTION, MESSAGE_STATUS, renderLeadMessage, senderTag, shortenedSendNote, storeLeadMessage, } from "./leadMessage.js";
 import { readHandoffGate } from "./leadHandoffState.js";
 import { HANDED_OFF_STATES_SQL, readLeadTurnState } from "./leadState.js";
-import { loadProjectYml } from "./projectYml.js";
 import { currentOwnership, PaneOwnershipLost, paneIdentity, requireStillOwned } from "./spawn.js";
+import { PANE_LEASE_SETTLE_MS, releasePaneLease, tryAcquirePaneLease } from "./leaseStore.js";
 import { holdsHumanInput, paneInCopyMode, sendText, sleep, TmuxTimeoutError, } from "./tmux.js";
-export const SOCKET_MESSAGE_FOOTER = "Automated hive worker message. Do not reply to this socket sender.";
-export const MESSAGE_STATUS = {
-    socketPending: "socket-pending",
-    fallbackPending: "fallback-pending",
-    fallbackClaimed: "fallback-claimed",
-    complete: "complete",
-    failed: "failed",
-};
-export const MESSAGE_METHOD = {
-    socket: "socket",
-    pty: "pty",
-    ptyAfterSocketTimeout: "pty-after-socket-timeout",
-};
-const PANE_LEASE_TTL_SECONDS = 6;
-const PANE_LEASE_SETTLE_MS = 500;
-const CONFIRM_GRACE_SECONDS = 60;
-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 = "(agent_messages.sender_tag || '[message #' || agent_messages.id || ',')";
-const EV_HEADER_END = `instr(${EV_PROMPT}, char(10))`;
+const messageMarkerAt = (promptSql, startSql) => `substr(${promptSql}, ${startSql}, length(${EV_MARKER})) = ${EV_MARKER}`;
 // The exact "[hive:worker NAME] [message #N," at prompt offset 0 (typed) or opening hive's own envelope body (socket).
 const messageEvidenceSql = (select) => `
   SELECT ${select} FROM agent_state_log ev
    WHERE ev.actor_id = (SELECT a.actor_id FROM agents a WHERE a.id = agent_messages.to_agent_id)
      AND ev.event = 'prompt'
      AND ev.created_at >= COALESCE(agent_messages.socket_attempt_at, agent_messages.created_at)
-     AND (substr(${EV_PROMPT}, 1, length(${EV_MARKER})) = ${EV_MARKER}
-          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 substr(${EV_PROMPT}, ${EV_HEADER_END} + 1, length(${EV_MARKER})) = ${EV_MARKER}
-              AND instr(${EV_PROMPT}, char(10) || '${CROSS_SESSION_CLOSE}') > ${EV_HEADER_END}))`;
-const RETAINED = "agent_messages.created_at >= datetime('now', '-7 days')";
-function quietMessagingOn(projectId) {
-    const project = db.prepare("SELECT path FROM projects WHERE id = ?").get(projectId);
-    return project !== undefined && loadProjectYml(project.path).config?.quiet_messaging === true;
-}
+     AND ${promptMarkerEvidenceSql(messageMarkerAt)}`;
+const RETAINED = `agent_messages.created_at >= datetime('now', '${MESSAGE_RETENTION}')`;
 const handoffHolds = (agentId) => readHandoffGate(agentId)?.holdAutomation === true;
 const HANDOFF_HOLD_NOTE = "the lead is handing off to a fresh session; held until the successor completes its first turn";
 function eligible(options) {
@@ -97,29 +67,6 @@ function stamp(id, column) {
 function socketText(id, text, tag) {
     return `${renderLeadMessage(id, text, tag)}\n\n${SOCKET_MESSAGE_FOOTER}`;
 }
-function acquirePaneLease(row, key) {
-    try {
-        db.prepare("INSERT OR IGNORE INTO actors (id, name, kind) VALUES (?, ?, 'agent')").run(row.from_actor, row.from_name);
-        db.prepare("DELETE FROM leases WHERE project_id = ? AND lock_key = ? AND expires_at < datetime('now')").run(row.project_id, key);
-        const held = 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(row.project_id, key, row.from_actor, PANE_LEASE_TTL_SECONDS);
-        return held?.expires_at ?? null;
-    }
-    catch {
-        return null;
-    }
-}
-function releasePaneLease(row, key, expiresAt) {
-    try {
-        db.prepare("DELETE FROM leases WHERE project_id = ? AND lock_key = ? AND expires_at = ?").run(row.project_id, key, expiresAt);
-    }
-    catch {
-    }
-}
 function hold(row, reason) {
     try {
         db.prepare("UPDATE agent_messages SET delivery_note = ? WHERE id = ? AND delivery_status = ?").run(reason, row.id, MESSAGE_STATUS.fallbackPending);
@@ -189,8 +136,11 @@ async function paneFallback(original, snapshot) {
     if (ownership !== "live" || target === undefined) {
         return failPending(row, `the lead pane this message was accepted for is ${ownership}; nothing is typed into a replacement`);
     }
-    const key = `wake-pane:${identity.tmux_socket}:${identity.tmux_target}`;
-    const expiresAt = acquirePaneLease(row, key);
+    const expiresAt = tryAcquirePaneLease(row.project_id, identity.tmux_socket, identity.tmux_target, {
+        id: row.from_actor,
+        name: row.from_name,
+        kind: "agent",
+    });
     if (expiresAt === null)
         return hold(row, "another delivery holds the lead's pane");
     let wrote = false;
@@ -241,7 +191,7 @@ async function paneFallback(original, snapshot) {
     finally {
         if (wrote)
             await sleep(PANE_LEASE_SETTLE_MS);
-        releasePaneLease(row, key, expiresAt);
+        releasePaneLease(row.project_id, identity.tmux_socket, identity.tmux_target, expiresAt);
     }
 }
 function earlierFallbackPending(row) {
@@ -277,7 +227,7 @@ export async function sendQuietLeadMessage(options) {
     if (skip === null) {
         const posted = await postClaudeWake({
             socketPath: target.claude_messaging_socket,
-            senderAddress: senderAddress(join(dataDir, "wake-sender.sock")),
+            senderAddress: socketSenderAddress(dataDir),
             text: body,
             beforeWrite: () => {
                 requireStillOwned(target.id, identity, `message #${id} socket delivery`);
@@ -348,17 +298,7 @@ export async function sendQuietLeadMessage(options) {
         `Do NOT resend blindly: read the lead's pane first, and agent_message_get(${id}) shows the recorded state.`);
 }
 function graceExpired(row, actorId, panePid) {
-    const firstStop = db
-        .prepare("SELECT MIN(created_at) AS t FROM agent_state_log WHERE actor_id = ? AND event = 'stop' AND created_at >= ?")
-        .get(actorId, row.socket_attempt_at).t;
-    let from = firstStop;
-    if (from === null) {
-        const turn = readLeadTurnState(row.to_agent_id);
-        if (turn !== null && turn.state === "working" && turn.pane_pid === panePid)
-            return false;
-        from = row.socket_attempt_at;
-    }
-    return db.prepare("SELECT (julianday('now') - julianday(?)) * 86400 >= ? AS due").get(from, CONFIRM_GRACE_SECONDS).due === 1;
+    return socketGraceDue(actorId, row.socket_attempt_at, panePid, () => readLeadTurnState(row.to_agent_id));
 }
 function confirmFromPrompts() {
     db.prepare(`UPDATE agent_messages SET confirmed_at = (${messageEvidenceSql("MIN(ev.created_at)")}), delivery_status = ?

package/dist/leadState.js

@@ -1,5 +1,6 @@
 import { liveBackgroundTasks } from "./backgroundTasks.js";
 import { db } from "./db.js";
+import { hiveWorkerEnvelopeLikeSql, isHiveWorkerEnvelope } from "./claudeWake.js";
 import { FIRST_MESSAGE_SHA_ENV, firstMessageDigest } from "./firstMessage.js";
 import { postponeGrace, readActiveHandoff } from "./leadHandoffState.js";
 export function readLeadTurnState(agentId) {
@@ -16,14 +17,14 @@ export function leadSessionEnded(row, ownership) {
 export function humanPromptSql(col) {
     const p = `CASE WHEN json_valid(${col}) THEN COALESCE(json_extract(${col}, '$.prompt'), ${col}) ELSE ${col} END`;
     return (`${p} NOT LIKE '%[hive wake #%' AND ${p} NOT LIKE '[hive:%' AND ${p} NOT LIKE '<task-notification>%' ` +
-        `AND ${p} NOT LIKE '<cross-session-message from="%" from-name="hive">' || char(10) || '[hive:worker %] [message #%,%' || char(10) || '</cross-session-message>%'`);
+        `AND NOT ${hiveWorkerEnvelopeLikeSql(p)}`);
 }
 // Includes SQLite LIKE's ASCII case-insensitivity.
 export function isHumanPrompt(prompt) {
     const p = prompt.toLowerCase();
     if (p.includes("[hive wake #") || p.startsWith("[hive:") || p.startsWith("<task-notification>"))
         return false;
-    return !/^<cross-session-message from="[\s\S]*" from-name="hive">\n\[hive:worker [\s\S]*\] \[message #[\s\S]*,[\s\S]*\n<\/cross-session-message>/.test(p);
+    return !isHiveWorkerEnvelope(p);
 }
 // The agent_state_log state label on hive's own first message to a lead; conversationHoldsWake skips it.
 export const FIRST_MESSAGE_LOG_STATE = "first_message";

package/dist/leadWatch.js

@@ -1,7 +1,7 @@
 import { db } from "./db.js";
 import { paneClassifierFor } from "./harnesses.js";
 import { readLeadTurnState } from "./leadState.js";
-import { LEAD_KIND } from "./spawn.js";
+import { LEAD_KIND } from "./agentKinds.js";
 import { foreignSocket, holdsHumanInput, observationFailed, rowOwnership } from "./tmux.js";
 export const LEAD_TARGET_GONE = "LEAD_TARGET_GONE";
 export const LEAD_TARGET_REISSUED = "LEAD_TARGET_REISSUED";

package/dist/leaseStore.js

@@ -0,0 +1,54 @@
+import { db } from "./db.js";
+export function purgeExpiredLeases(projectId, key) {
+    if (key === undefined) {
+        db.prepare("DELETE FROM leases WHERE project_id = ? AND expires_at < datetime('now')").run(projectId);
+        return;
+    }
+    db.prepare("DELETE FROM leases WHERE project_id = ? AND lock_key = ? AND expires_at < datetime('now')").run(projectId, key);
+}
+export function insertLease(projectId, key, actor, ttlSeconds) {
+    return 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, key, actor, ttlSeconds);
+}
+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 releaseOwnedLease(projectId, key, actor) {
+    return db
+        .prepare("DELETE FROM leases WHERE project_id = ? AND lock_key = ? AND owner = ?")
+        .run(projectId, key, actor).changes > 0;
+}
+export function paneLeaseKey(socket, pane) {
+    return `wake-pane:${socket}:${pane}`;
+}
+export const PANE_LEASE_TTL_SECONDS = 6;
+export const PANE_LEASE_SETTLE_MS = 500;
+export function tryAcquirePaneLease(projectId, socket, pane, actor) {
+    try {
+        db.prepare("INSERT OR IGNORE INTO actors (id, name, kind) VALUES (?, ?, ?)").run(actor.id, actor.name, actor.kind);
+        const key = paneLeaseKey(socket, pane);
+        purgeExpiredLeases(projectId, key);
+        return insertLease(projectId, key, actor.id, PANE_LEASE_TTL_SECONDS)?.expires_at ?? null;
+    }
+    catch {
+        return null;
+    }
+}
+export function releasePaneLease(projectId, socket, pane, expiresAt) {
+    try {
+        db.prepare("DELETE FROM leases WHERE project_id = ? AND lock_key = ? AND expires_at = ?").run(projectId, paneLeaseKey(socket, pane), expiresAt);
+    }
+    catch {
+    }
+}

package/dist/pads.js

@@ -0,0 +1,70 @@
+import { db } from "./db.js";
+import { currentActor } from "./context.js";
+export function splitsSurrogatePair(content, index) {
+    if (index <= 0 || index >= content.length)
+        return false;
+    const before = content.charCodeAt(index - 1);
+    const after = content.charCodeAt(index);
+    return before >= 0xd800 && before <= 0xdbff && after >= 0xdc00 && after <= 0xdfff;
+}
+function selectPad(projectId, padId, columns) {
+    const row = db.prepare(`SELECT ${columns} FROM pads WHERE project_id = ? AND id = ?`).get(projectId, padId);
+    if (!row)
+        throw new Error(`No pad with id ${padId} in project ${projectId}. Call pad_list.`);
+    return row;
+}
+export function getPad(projectId, padId) {
+    return selectPad(projectId, padId, "*");
+}
+export function getPadMeta(projectId, padId) {
+    return selectPad(projectId, padId, "id, name, revision, archived");
+}
+function revisionMismatchError(padId, expected, current) {
+    if (current == null) {
+        return new Error(`Pad ${padId} no longer exists; it may have just been deleted by another write. Call pad_list to confirm.`);
+    }
+    return new Error(`Revision mismatch for pad ${padId}: expected ${expected}, current ${current}. Re-read with pad_read and retry.`);
+}
+function currentRevisionOrDeleted(padId) {
+    const row = db.prepare("SELECT revision FROM pads WHERE id = ?").get(padId);
+    return row?.revision ?? null;
+}
+export function assertRowChanged(padId, predicateRevision, changed) {
+    if (!changed)
+        throw revisionMismatchError(padId, predicateRevision, currentRevisionOrDeleted(padId));
+}
+export function checkRevision(pad, expected, required) {
+    if (expected == null) {
+        if (required)
+            throw new Error(`expected_revision is required to overwrite pad ${pad.id}. Current revision: ${pad.revision}. Read it first with pad_read.`);
+        return;
+    }
+    if (expected !== pad.revision)
+        throw revisionMismatchError(pad.id, expected, pad.revision);
+}
+export function bumpPad(padId, predicateRevision, set, ...params) {
+    const where = predicateRevision != null ? "id = ? AND revision = ?" : "id = ?";
+    const whereParams = predicateRevision != null ? [padId, predicateRevision] : [padId];
+    const row = db.prepare(`UPDATE pads SET ${set}, revision = revision + 1,
+       updated_by = ?, updated_at = datetime('now') WHERE ${where} RETURNING revision`).get(...params, currentActor(), ...whereParams);
+    assertRowChanged(padId, predicateRevision, row != null);
+    return row.revision;
+}
+export const APPEND_WITH_SEPARATOR_SET = "content = content || (CASE WHEN content = '' OR substr(content, -1) = char(10) THEN '' ELSE char(10) END) || ?";
+export function getActivePadByName(projectId, name) {
+    return db.prepare("SELECT * FROM pads WHERE project_id = ? AND name = ? AND archived = 0").get(projectId, name);
+}
+export function listActivePads(projectId) {
+    return db.prepare(`SELECT name, revision, length(content) AS content_length, updated_by, updated_at
+       FROM pads WHERE project_id = ? AND archived = 0 ORDER BY name`).all(projectId);
+}
+export function overwritePadContent(projectId, padId, content, expectedRevision) {
+    const pad = getPadMeta(projectId, padId);
+    checkRevision(pad, expectedRevision, true);
+    return bumpPad(padId, pad.revision, "content = ?", content);
+}
+export function createPad(projectId, name, content, tags) {
+    const row = db.prepare(`INSERT OR IGNORE INTO pads (project_id, name, content, tags, updated_by)
+       VALUES (?, ?, ?, ?, ?) RETURNING id`).get(projectId, name, content, JSON.stringify(tags), currentActor());
+    return row?.id ?? null;
+}

package/dist/portfolio.js

@@ -4,7 +4,10 @@ import { existsSync } from "node:fs";
 import { parseTags } from "./result.js";
 import { ACTIVE_TODO_SQL, OPEN_BLOCKERS_SQL } from "./todoScope.js";
 import { pendingQuestionCount } from "./questions.js";
+import { ACTIVE_TIMER_WHERE as ACTIVE_WAKE_WHERE } from "./wakeSql.js";
+export { ACTIVE_WAKE_WHERE };
 import { leadSessionEnded, readLeadTurnState } from "./leadState.js";
+import { finishedIdle } from "./firstPrompt.js";
 import { liveTargets, ownershipLiveness, rowOwnership } from "./tmux.js";
 export const PORTFOLIO_REASONS = [
     "needs_human",
@@ -26,7 +29,6 @@ const NEEDS_HUMAN_ITEM_CAP = 5;
 const WAKE_OVERDUE_GRACE = "-5 minutes";
 const STALE_IN_PROGRESS = "-48 hours";
 const WAKE_UPCOMING = "+24 hours";
-export const ACTIVE_WAKE_WHERE = "cancelled_at IS NULL AND (fired_at IS NULL OR repeat_every_ms IS NOT NULL)";
 export function leadText(p) {
     return p.lead.state === "alive" && p.lead.turn !== "unknown"
         ? `alive, turn ${p.lead.turn === "working" ? "working" : "ended"}`
@@ -84,7 +86,7 @@ function projectRow(project, now, snapshot) {
     }
     tagged.sort((a, b) => (a.updated_at < b.updated_at ? -1 : a.updated_at > b.updated_at ? 1 : a.id - b.id));
     const agents = db
-        .prepare("SELECT id, kind, agent_state, tmux_target, tmux_socket, pane_pid FROM agents WHERE project_id = ? AND status = 'running' ORDER BY id")
+        .prepare("SELECT id, kind, agent_state, resumed_at, tmux_target, tmux_socket, pane_pid FROM agents WHERE project_id = ? AND status = 'running' ORDER BY id")
         .all(project.id);
     const liveness = (a) => ownershipLiveness(rowOwnership(a, snapshot));
     const workers = { working: 0, idle: 0, needs_input: 0, other: 0, unreachable: 0, unconfirmed: 0 };
@@ -115,8 +117,10 @@ function projectRow(project, now, snapshot) {
             workers.working++;
             liveWorking++;
         }
-        else if (a.agent_state === "idle")
+        else if (finishedIdle(a))
             workers.idle++;
+        else if (a.agent_state === "idle")
+            workers.other++;
         else if (a.agent_state === "waiting") {
             workers.needs_input++;
             liveWaiting++;

package/dist/projectRemove.js

@@ -1,6 +1,6 @@
 import { backupNow } from "./backup.js";
 import { dataDir, db } from "./db.js";
-import { LEAD_KIND } from "./spawn.js";
+import { LEAD_KIND } from "./agentKinds.js";
 import { foreignSocket, liveTargets, observationFailed, rowOwnership } from "./tmux.js";
 export const PROJECT_OWNER_TABLES = [
     "pads",

package/dist/projectYml.js

@@ -4,7 +4,7 @@ import { resolve, sep } from "node:path";
 import { parse } from "yaml";
 import { harnessNames } from "./harnesses.js";
 import { isValidProfileName } from "./profiles.js";
-import { errorMessage } from "./result.js";
+import { errorMessage } from "./errors.js";
 import { isWindowLayout, WINDOW_LAYOUTS } from "./tmux.js";
 import { globalConfigPath, isEmptyYamlDocument, readGlobalConfig, resolveAttachSetting, } from "./globalConfig.js";
 export const BUILT_IN_PROJECT_YML = Object.freeze({

package/dist/ptys.js

@@ -1,6 +1,8 @@
 import { execFileSync } from "node:child_process";
 import { readFileSync } from "node:fs";
 import { platform } from "node:os";
+import { parseEtimeSeconds } from "./etime.js";
+export { parseEtimeSeconds } from "./etime.js";
 const PS_LINE = /^\s*(\S+)\s+(\d+)\s+(.+?)\s*$/;
 export function parsePsSnapshot(output) {
     const rows = [];
@@ -100,15 +102,6 @@ export function ptyHeadroom() {
     }
 }
 const PS_AGE_LINE = /^\s*(\d+)\s+(\d+)\s+(\S+)\s+(\S+)\s+(.+?)\s*$/;
-export function parseEtimeSeconds(etime) {
-    const m = /^(?:(\d+)-)?(?:(\d+):)?(\d+):(\d+)$/.exec(etime) ?? /^(\d+)$/.exec(etime);
-    if (!m)
-        return null;
-    if (m.length === 2)
-        return Number(m[1]);
-    const [, days, hours, minutes, seconds] = m;
-    return (Number(days ?? 0) * 24 + Number(hours ?? 0)) * 3600 + Number(minutes) * 60 + Number(seconds);
-}
 export function parsePsSnapshotWithAge(output) {
     const rows = [];
     for (const line of output.split("\n")) {

package/dist/queenAudit.js

@@ -1,11 +1,8 @@
 import { captureQueenWriteIdentity, effectiveProjectId, isQueenLead } from "./context.js";
+import { insertQueenAuditRow, QUEEN_AUDIT_DEFAULT_LIMIT, QUEEN_AUDIT_MAX_LIMIT, QUEEN_AUDIT_SUMMARY_MAX, } from "./queenAuditStore.js";
 import { db } from "./db.js";
 import { cutToUnitBudget, flatten } from "./slug.js";
-export const QUEEN_AUDIT_SUMMARY_MAX = 160;
-export const QUEEN_AUDIT_DEFAULT_LIMIT = 20;
-export const QUEEN_AUDIT_MAX_LIMIT = 100;
-export const QUEEN_AUDIT_RETENTION = "-30 days";
-export const QUEEN_AUDIT_MAX_ROWS = 20_000;
+export { QUEEN_AUDIT_DEFAULT_LIMIT, QUEEN_AUDIT_MAX_LIMIT, QUEEN_AUDIT_MAX_ROWS, QUEEN_AUDIT_RETENTION, QUEEN_AUDIT_SUMMARY_MAX, recordQueenRefusal, } from "./queenAuditStore.js";
 function resource(type, value) {
     return typeof value === "number" && Number.isInteger(value) && value > 0 ? { type, id: value } : null;
 }
@@ -13,11 +10,6 @@ function removalSummary(r) {
     const counts = Object.entries((r.counts ?? {})).map(([t, n]) => `${t} ${n}`);
     return `removed project "${r.name}"${counts.length > 0 ? ` with ${counts.join(", ")}` : ""}`;
 }
-function insertQueenAuditRow(operation, targetProjectId, identity, resourceType, resourceId, summary, outcome = "confirmed", problem = "") {
-    db.prepare(`INSERT INTO queen_audit
-       (actor_id, home_project_id, target_project_id, operation, resource_type, resource_id, summary, outcome, problem)
-     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(identity.actor_id, identity.home_project_id, targetProjectId, operation, resourceType, resourceId, summary, outcome, problem);
-}
 export const QUEEN_AUDIT_OPERATIONS = {
     todo_create: {
         mode: "database",
@@ -85,14 +77,6 @@ function insertAudit(operation, targetProjectId, args, receipt, identity) {
     const summary = text.length <= QUEEN_AUDIT_SUMMARY_MAX ? text : cutToUnitBudget(text, QUEEN_AUDIT_SUMMARY_MAX - 1) + "…";
     insertQueenAuditRow(operation, targetProjectId, identity, touched.type, touched.id, summary);
 }
-export function recordQueenRefusal(operation, targetProjectId, problem, identity) {
-    const text = flatten(problem);
-    const summaryText = `refused: ${text}`;
-    const summary = summaryText.length <= QUEEN_AUDIT_SUMMARY_MAX
-        ? summaryText
-        : cutToUnitBudget(summaryText, QUEEN_AUDIT_SUMMARY_MAX - 1) + "…";
-    insertQueenAuditRow(operation, targetProjectId, identity, "project", targetProjectId, summary, "refused", text);
-}
 export function commitQueenStateWrite(operation, targetProjectId, args, mutate) {
     const identity = captureQueenWriteIdentity(targetProjectId);
     if (!identity)

package/dist/queenAuditStore.js

@@ -0,0 +1,20 @@
+import { db } from "./db.js";
+import { cutToUnitBudget, flatten } from "./slug.js";
+export const QUEEN_AUDIT_SUMMARY_MAX = 160;
+export const QUEEN_AUDIT_DEFAULT_LIMIT = 20;
+export const QUEEN_AUDIT_MAX_LIMIT = 100;
+export const QUEEN_AUDIT_RETENTION = "-30 days";
+export const QUEEN_AUDIT_MAX_ROWS = 20_000;
+export function insertQueenAuditRow(operation, targetProjectId, identity, resourceType, resourceId, summary, outcome = "confirmed", problem = "") {
+    db.prepare(`INSERT INTO queen_audit
+       (actor_id, home_project_id, target_project_id, operation, resource_type, resource_id, summary, outcome, problem)
+     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(identity.actor_id, identity.home_project_id, targetProjectId, operation, resourceType, resourceId, summary, outcome, problem);
+}
+export function recordQueenRefusal(operation, targetProjectId, problem, identity) {
+    const text = flatten(problem);
+    const summaryText = `refused: ${text}`;
+    const summary = summaryText.length <= QUEEN_AUDIT_SUMMARY_MAX
+        ? summaryText
+        : cutToUnitBudget(summaryText, QUEEN_AUDIT_SUMMARY_MAX - 1) + "…";
+    insertQueenAuditRow(operation, targetProjectId, identity, "project", targetProjectId, summary, "refused", text);
+}