@cmgmyr/hive 1.11.6 → 1.11.7

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/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/portfolio.js

@@ -7,6 +7,7 @@ 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",
@@ -85,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 };
@@ -116,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/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/queenDashboard.js

@@ -3,6 +3,7 @@ import { join, sep } from "node:path";
 import { pathToFileURL } from "node:url";
 import { db } from "./db.js";
 import { SECTION_STYLE, SPRITE, chevron, renderBoardPadsTodos, sectionScript } from "./dashboard.js";
+import { parseStoreTimestamp } from "./storeClock.js";
 export const QUEEN_BRIEF_KEY = "queen:brief";
 const LANE_ORDER = ["waiting_on_you", "stuck", "moving", "quiet"];
 const LANE_RANK = { waiting_on_you: 0, stuck: 1, moving: 2, quiet: 3 };
@@ -103,7 +104,7 @@ const REASON_SEVERE = new Set([
     "wake_overdue_5m",
 ]);
 function parseUtc(ts) {
-    return Date.parse(`${ts.replace(" ", "T")}Z`);
+    return parseStoreTimestamp(ts);
 }
 function age(from, asOf) {
     const seconds = Math.max(0, Math.floor((parseUtc(asOf) - parseUtc(from)) / 1000));