@cmgmyr/hive 1.11.4 → 1.11.6

package/dist/tools/agents.js

@@ -2,6 +2,8 @@ import { existsSync, rmSync, statSync, realpathSync } from "node:fs";
 import { randomUUID } from "node:crypto";
 import { z } from "zod";
 import { db } from "../db.js";
+import { CLOSED_ROW_ORDER, findAgent, getAgentRow, notOwnedError, observeOwnership, PROBE_FAILED_NOTE, summaryLiveness, UNVERIFIED_OWNERSHIP_NOTE } from "../agentRecords.js";
+export { CLOSED_ROW_ORDER, findAgent, getAgentRow, notOwnedError, observeOwnership, probeFailed, PROBE_FAILED_NOTE, REISSUED_PANE_NOTE, summaryLiveness, UNVERIFIED_OWNERSHIP_NOTE } from "../agentRecords.js";
 import { confirmQueenWrite } from "../queenAudit.js";
 import { captureQueenWriteIdentity, resolveQueenLeadTarget } from "../context.js";
 import { agentBriefPath, mergedBriefVars, readAgentBrief, workerBrief, workerCommandString, writeAgentBrief, } from "../brief.js";
@@ -18,21 +20,10 @@ import { agentIdentityEnv, branchAt, closeAgentRow, currentOwnership, discardOrp
 import { COMMAND_KIND, runningCommandRow, stopLine, stopProcess, STOP_REASONS } from "../processes.js";
 import { readContextTokens, readContextFill, resolveTranscriptDir } from "../transcript.js";
 import { leadSessionEnded } from "../leadState.js";
-import { capturePane, captureFinalScreen, DEFAULT_LAYOUT, cancelCopyMode, describePaneChoice, ensureAttached, findUnsafeControlChar, holdsHumanInput, liveTargets, observationFailed, observeRowOwnership, ownershipLiveness, paneCurrentCommand, paneInCopyMode, pollPaneReadiness, rowOwnership, sendText, sessionName, setRemainOnExit, sleep, TEXT_ALLOWED_CONTROL_CHARS, tmux, TmuxTimeoutError, WINDOW_LAYOUTS, } from "../tmux.js";
+import { capturePane, captureFinalScreen, DEFAULT_LAYOUT, cancelCopyMode, describePaneChoice, ensureAttached, findUnsafeControlChar, holdsHumanInput, liveTargets, observationFailed, ownershipLiveness, paneCurrentCommand, paneInCopyMode, pollPaneReadiness, rowOwnership, sendText, sessionName, setRemainOnExit, sleep, TEXT_ALLOWED_CONTROL_CHARS, tmux, TmuxTimeoutError, WINDOW_LAYOUTS, } from "../tmux.js";
 import { agentIdParam, agentNameParam, idParam, projectIdParam } from "./params.js";
 import { deriveProvenance, lastLogEvent, lastPermissionMode, reportsAgentStateLog, } from "../stateProvenance.js";
-const CLOSED_ROW_ORDER = "(parked_at != '') DESC, closed_at DESC, id DESC";
-function closedAgentNamed(projectId, needle) {
-    return db
-        .prepare(`SELECT id, name, kind, parked_at FROM agents WHERE project_id = ? AND status != 'running' ORDER BY ${CLOSED_ROW_ORDER}`)
-        .all(projectId).find((r) => r.name.toLowerCase() === needle);
-}
-function getAgentRow(projectId, id, notFoundHint) {
-    const row = db.prepare("SELECT * FROM agents WHERE project_id = ? AND id = ?").get(projectId, id);
-    if (!row)
-        throw new Error(`No agent ${id} in project ${projectId}. ${notFoundHint}`);
-    return row;
-}
+const unknownOwnershipNote = (snapshot) => observationFailed(snapshot) ? PROBE_FAILED_NOTE : UNVERIFIED_OWNERSHIP_NOTE;
 export function classifyLostCas(row) {
     return row.status !== "running" ? { outcome: "retired", parked: !!row.parked_at } : { outcome: "revived" };
 }
@@ -42,62 +33,6 @@ function revivedError(agent, live, cause, remedy) {
         (live ? " after this call's kill-pane took the old one down" : "") +
         `. ${remedy}`);
 }
-export function findAgent(projectId, ref) {
-    if (ref.agent_id != null) {
-        return getAgentRow(projectId, ref.agent_id, "Call agent_list.");
-    }
-    if (ref.name) {
-        const rows = db
-            .prepare("SELECT * FROM agents WHERE project_id = ? AND status = 'running' ORDER BY id")
-            .all(projectId);
-        const exact = rows.filter((r) => r.name === ref.name);
-        if (exact.length === 1)
-            return exact[0];
-        if (exact.length > 1) {
-            throw new Error(`Multiple running agents named "${ref.name}". Target by agent_id instead.`);
-        }
-        const needle = ref.name.toLowerCase();
-        const sameName = rows.filter((r) => r.name.toLowerCase() === needle);
-        if (sameName.length === 1)
-            return sameName[0];
-        const closed = closedAgentNamed(projectId, needle);
-        if (closed) {
-            if (closed.parked_at) {
-                throw new Error(`Agent ${closed.id} ("${closed.name}") is PARKED, not finished - it was paused on ` +
-                    `${closed.parked_at} and its session is waiting. Bring it back with agent_resume(agent_id: ` +
-                    `${closed.id}), or abandon the park with agent_close(agent_id: ${closed.id}).`);
-            }
-            const remedy = closed.kind === LEAD_KIND ? "Run `hive lead` to start a new one" : "Spawn a new worker";
-            throw new Error(`Agent ${closed.id} ("${closed.name}") is closed. ${remedy}, or target a running one by name or agent_id.`);
-        }
-        const partial = rows.filter((r) => r.name.toLowerCase().includes(needle));
-        if (partial.length === 1)
-            return partial[0];
-        if (partial.length > 1) {
-            const candidates = partial.map((r) => `${r.name} (agent_id ${r.id})`).join(", ");
-            throw new Error(`"${ref.name}" matches ${partial.length} running agents: ${candidates}. Use the full name or agent_id.`);
-        }
-        if (/^\d+$/.test(ref.name)) {
-            const id = Number(ref.name);
-            if (Number.isSafeInteger(id)) {
-                const byId = db
-                    .prepare("SELECT * FROM agents WHERE project_id = ? AND id = ? AND status = 'running'")
-                    .get(projectId, id);
-                if (byId)
-                    return byId;
-            }
-        }
-        else if (/^[a-z]+:\d+$/i.test(ref.name)) {
-            const byActorId = db
-                .prepare("SELECT * FROM agents WHERE project_id = ? AND actor_id = ? AND status = 'running'")
-                .get(projectId, ref.name);
-            if (byActorId)
-                return byActorId;
-        }
-        throw new Error(`No running agent matching "${ref.name}" in project ${projectId}. Call agent_list.`);
-    }
-    throw new Error("Pass agent_id or name.");
-}
 function findClosedAgent(projectId, ref) {
     if (ref.agent_id != null) {
         const row = getAgentRow(projectId, ref.agent_id, "Call agent_list(include_closed: true).");
@@ -190,28 +125,6 @@ function closeRowOnly(agent, confirmSelf) {
             (ownership === "unknown" ? " Anything still running in that pane was left alone." : ""),
     };
 }
-export const PROBE_FAILED_NOTE = "tmux could not be probed, so liveness is unknown. Nothing was changed. Retry in a few seconds.";
-const unknownOwnershipNote = (snapshot) => observationFailed(snapshot) ? PROBE_FAILED_NOTE : UNVERIFIED_OWNERSHIP_NOTE;
-const UNVERIFIED_OWNERSHIP_NOTE = "This row's pane cannot be verified as its own: it is on another tmux socket, or no pane pid was recorded for it, so liveness is unknown and no screen was read. Nothing was changed. If the row is stale, a human or peer lead can retire it with agent_close(row_only=true).";
-export const probeFailed = (agent) => new Error(`Agent ${agent.id} ("${agent.name}"): ${PROBE_FAILED_NOTE}`);
-// A failed probe throws rather than answering unknown, so callers keep the retry wording.
-export function observeOwnership(agent) {
-    const ownership = observeRowOwnership(agent);
-    if (ownership === "probe-failed")
-        throw probeFailed(agent);
-    return ownership;
-}
-export const REISSUED_PANE_NOTE = "Its recorded pane id now belongs to a different process (the recorded pane pid no longer matches), so its own process is gone and the pane is someone else's. Nothing was typed, read or killed there.";
-export function notOwnedError(agent, ownership) {
-    const who = `Agent ${agent.id} ("${agent.name}")`;
-    if (ownership === "gone") {
-        return new Error(`${who} has no live tmux window (its process exited or the window was killed). Close it with agent_close and spawn a new one.`);
-    }
-    if (ownership === "reissued") {
-        return new Error(`${who}: pane ownership reads reissued. ${REISSUED_PANE_NOTE} Close the row with agent_close, which retires it without touching that pane.`);
-    }
-    return new Error(`${who}: pane ownership reads unknown. ${UNVERIFIED_OWNERSHIP_NOTE}`);
-}
 // Rechecked just before a kill. "changed" skips the kill and lets the row CAS report the race.
 function stillOwnsPane(agent, action) {
     const now = currentOwnership(agent.id, paneIdentity(agent));
@@ -327,11 +240,6 @@ function nextWorkerName(projectId) {
     return `worker-${count + 1}`;
 }
 const PANE_READY_MS = Number(process.env.HIVE_SPAWN_READY_MS ?? 45_000);
-export function summaryLiveness(row, snapshot) {
-    if (row.status !== "running")
-        return false;
-    return ownershipLiveness(rowOwnership(row, snapshot));
-}
 function capturePaneQuietly(target) {
     try {
         return capturePane(target, 15);
@@ -695,19 +603,15 @@ export function registerAgents(server) {
                                     note: "The pane never became ready. The brief is loaded regardless; check agent_output before sending the worker its assignment - typing into it now risks losing the text silently.",
                                 }),
                 }
-                : harness.classifiesPaneScreen
-                    ? {
-                        instructions: workerBrief(briefFor(actorId)),
-                    }
-                    : {
-                        brief_path: writeAgentBrief(agentId, workerBrief(briefFor(actorId))),
-                        note: `This worker runs ${JSON.stringify(commandHead(baseCommand))}, which hive cannot brief and ` +
-                            "cannot type into: the guards that make typing safe read claude's chrome, so agent_send's " +
-                            "text path refuses this pane. There are no instructions to prepend, because there is no " +
-                            "supported way to send them. The brief is written to brief_path - open that pane " +
-                            "(tmux attach) and paste it in yourself, or drive the worker with agent_send(keys: [...]). " +
-                            "Wakes aimed at this worker are refused for the same reason.",
-                    }),
+                : {
+                    brief_path: writeAgentBrief(agentId, workerBrief(briefFor(actorId))),
+                    note: `This worker runs ${JSON.stringify(commandHead(baseCommand))}, which hive cannot brief and ` +
+                        "cannot type into: the guards that make typing safe read claude's chrome, so agent_send's " +
+                        "text path refuses this pane. There are no instructions to prepend, because there is no " +
+                        "supported way to send them. The brief is written to brief_path - open that pane " +
+                        "(tmux attach) and paste it in yourself, or drive the worker with agent_send(keys: [...]). " +
+                        "Wakes aimed at this worker are refused for the same reason.",
+                }),
         };
         if (omittedTodoWarning) {
             const existingNote = typeof receipt.note === "string" ? receipt.note : "";

package/dist/tools/pads.js

@@ -1,89 +1,10 @@
 import { z } from "zod";
 import { db } from "../db.js";
-import { currentActor, effectiveProjectId, resolveProject } from "../context.js";
+import { effectiveProjectId, resolveProject } from "../context.js";
 import { matchesAnyTag, parseTags, run } from "../result.js";
 import { idParam, limitParam, offsetParam, projectIdParam } from "./params.js";
-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;
-}
-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;
-}
-function assertRowChanged(padId, predicateRevision, changed) {
-    if (!changed) {
-        throw revisionMismatchError(padId, predicateRevision, currentRevisionOrDeleted(padId));
-    }
-}
-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;
-}
+import { APPEND_WITH_SEPARATOR_SET, assertRowChanged, bumpPad, checkRevision, createPad, getPad, getPadMeta, splitsSurrogatePair } from "../pads.js";
+export { APPEND_WITH_SEPARATOR_SET, assertRowChanged, bumpPad, checkRevision, createPad, getActivePadByName, getPad, getPadMeta, listActivePads, overwritePadContent, splitsSurrogatePair } from "../pads.js";
 export function registerPads(server) {
     server.registerTool("pad_write", {
         description: "Create a pad, or fully overwrite one by passing pad_id plus expected_revision. Pad names are unique per project. Prefer pad_append/pad_edit for targeted changes.",

package/dist/tools/todos.js

@@ -1,11 +1,16 @@
 import { z } from "zod";
 import { db } from "../db.js";
+import { getTodo, getTodoDetail, listTodoSummaries } from "../todos.js";
+import { TODO_STATUSES } from "../todoScope.js";
+export { COMMENT_COUNT_SQL, getTodo, getTodoDetail, listTodoSummaries } from "../todos.js";
+export { TODO_STATUSES } from "../todoScope.js";
 import { commitQueenStateWrite } from "../queenAudit.js";
 import { currentActor, effectiveProjectId, resolveProject } from "../context.js";
-import { matchesAnyTag, parseTags, run } from "../result.js";
+import { run } from "../result.js";
 import { findUnsafeControlChar } from "../tmux.js";
 import { SLUG_MAX_LEN, fallbackSlug } from "../slug.js";
 import { idParam, limitParam, offsetParam, projectIdParam } from "./params.js";
+import { NOT_COMPLETED_TODO_SQL, OPEN_BLOCKERS_SQL } from "../todoScope.js";
 const priorityParam = z.enum(["high", "medium", "low"]);
 const slugParam = z
     .string()
@@ -17,99 +22,9 @@ const slugParam = z
     .describe(`Short label, ~3-5 words (${SLUG_MAX_LEN} chars max). When set, it renders beside the id: bracketed in \`hive todos\`, \`hive todo <id>\`, and the session-start digest, and as the row's whole label in the dashboard. Left unset, those surfaces fall back to the title - shown in full in \`hive todos\`/\`hive todo <id>\`/the digest, truncated to this same length in the dashboard. Free text, not a pad-style slug. Pass "" to clear a previously-set slug back to unset.`)
     .optional();
 export { SLUG_MAX_LEN, fallbackSlug };
-export const TODO_STATUSES = ["open", "in_progress", "backlog", "completed"];
 const statusParam = z.enum(TODO_STATUSES);
-const OPEN_BLOCKERS_FROM_WHERE = `FROM todo_blockers b JOIN todos bt ON bt.id = b.blocker_id
-   WHERE b.todo_id = t.id AND bt.status != 'completed'`;
-export const OPEN_BLOCKERS_SQL = `SELECT 1 ${OPEN_BLOCKERS_FROM_WHERE}`;
 const LIVE_DEPENDENTS_SQL = `SELECT t.id AS todo_id FROM todo_blockers b JOIN todos t ON t.id = b.todo_id
-   WHERE b.blocker_id = ? AND t.status != 'completed' AND t.archived_at IS NULL`;
-export const COMMENT_COUNT_SQL = `(SELECT COUNT(*) FROM todo_comments c WHERE c.todo_id = t.id)`;
-const SUMMARY_SQL = `
-  SELECT t.*,
-    (SELECT COUNT(*) ${OPEN_BLOCKERS_FROM_WHERE}) AS open_blockers,
-    ${COMMENT_COUNT_SQL} AS comment_count
-  FROM todos t`;
-function getTodo(projectId, todoId) {
-    const row = db
-        .prepare(`${SUMMARY_SQL} WHERE t.project_id = ? AND t.id = ?`)
-        .get(projectId, todoId);
-    if (!row)
-        throw new Error(`No todo with id ${todoId} in project ${projectId}. Call todo_list.`);
-    return row;
-}
-function summarize(row) {
-    return {
-        todo_id: row.id,
-        title: row.title,
-        slug: row.slug || fallbackSlug(row.title) || `todo ${row.id}`,
-        status: row.status,
-        priority: row.priority,
-        tags: parseTags(row.tags),
-        archived: row.archived_at != null,
-        is_blocked: (row.open_blockers ?? 0) > 0,
-        open_blockers: row.open_blockers ?? 0,
-        comment_count: row.comment_count ?? 0,
-        updated_at: row.updated_at,
-    };
-}
-export function listTodoSummaries(projectId, filter = {}) {
-    const limit = Math.min(filter.limit ?? 50, 200);
-    const offset = filter.offset ?? 0;
-    let sql = `${SUMMARY_SQL} WHERE t.project_id = ?`;
-    const params = [projectId];
-    if (!filter.includeArchived) {
-        sql += " AND t.archived_at IS NULL";
-    }
-    if (filter.statuses && filter.statuses.length > 0) {
-        sql += ` AND t.status IN (${filter.statuses.map(() => "?").join(",")})`;
-        params.push(...filter.statuses);
-    }
-    if (filter.priority) {
-        sql += " AND t.priority = ?";
-        params.push(filter.priority);
-    }
-    if (filter.query) {
-        sql += " AND (t.title LIKE ? OR t.body LIKE ? OR t.slug LIKE ?)";
-        params.push(`%${filter.query}%`, `%${filter.query}%`, `%${filter.query}%`);
-    }
-    sql += " ORDER BY t.updated_at DESC";
-    let rows = db.prepare(sql).all(...params).filter((r) => matchesAnyTag(r.tags, filter.tags));
-    if (filter.isBlocked != null) {
-        rows = rows.filter((r) => ((r.open_blockers ?? 0) > 0) === filter.isBlocked);
-    }
-    return {
-        total_count: rows.length,
-        offset,
-        limit,
-        todos: rows.slice(offset, offset + limit).map(summarize),
-    };
-}
-export function getTodoDetail(projectId, todoId, includeComments) {
-    const todo = getTodo(projectId, todoId);
-    const blockers = db
-        .prepare(`SELECT t.id, t.title, t.status FROM todo_blockers b
-       JOIN todos t ON t.id = b.blocker_id WHERE b.todo_id = ?`)
-        .all(todo.id);
-    const blocking = db
-        .prepare(`SELECT t.id, t.title, t.status FROM todo_blockers b
-       JOIN todos t ON t.id = b.todo_id WHERE b.blocker_id = ?`)
-        .all(todo.id);
-    const result = {
-        ...summarize(todo),
-        body: todo.body,
-        created_at: todo.created_at,
-        completed_at: todo.completed_at,
-        blockers,
-        blocking,
-    };
-    if (includeComments) {
-        result.comments = db
-            .prepare("SELECT id, author, body, created_at FROM todo_comments WHERE todo_id = ? ORDER BY created_at")
-            .all(todo.id);
-    }
-    return result;
-}
+   WHERE b.blocker_id = ? AND t.${NOT_COMPLETED_TODO_SQL} AND t.archived_at IS NULL`;
 function transitiveBlockers(startId) {
     const seen = new Set();
     const stack = [startId];
@@ -191,10 +106,7 @@ const completeTodo = db.transaction((projectId, todoId, completed) => {
     if (completed) {
         newlyUnblocked = db
             .prepare(`${LIVE_DEPENDENTS_SQL}
-             AND NOT EXISTS (
-               SELECT 1 FROM todo_blockers b2 JOIN todos bt ON bt.id = b2.blocker_id
-               WHERE b2.todo_id = t.id AND bt.status != 'completed'
-             )`)
+             AND NOT EXISTS (${OPEN_BLOCKERS_SQL})`)
             .all(todo.id).map((r) => r.todo_id);
     }
     return { todo_id: todo.id, completed, newly_unblocked: newlyUnblocked };

package/dist/tools/wakes.js

@@ -1,15 +1,18 @@
 import { z } from "zod";
 import { db } from "../db.js";
+import { assertSafeWakeBody, resolveAgentRef, resolveWakeDelivery } from "../wakeTarget.js";
+export { assertSafeWakeBody, resolveAgentRef, resolveWakeDelivery } from "../wakeTarget.js";
 import { commitQueenStateWrite } from "../queenAudit.js";
-import { captureQueenWriteIdentity, currentActor, effectiveProjectId, getProject, isQueenLead, resolveQueenLeadTarget, } from "../context.js";
+import { currentActor, effectiveProjectId, getProject, isQueenLead, } from "../context.js";
 import { run } from "../result.js";
-import { findAgent, observeOwnership, notOwnedError, summaryLiveness } from "./agents.js";
-import { ACTIVE_TIMER_WHERE, LOG_RETENTION, OWNED_BY_WATCH, WATCH_SCOPE_PROJECT, seedGoneCursor, } from "../scheduler.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 { idParam, projectIdParam } from "./params.js";
 import { cutToUnitBudget } from "../slug.js";
 import { awaitingFirstPrompt } from "../firstPrompt.js";
 import { deriveProvenance } from "../stateProvenance.js";
-import { findUnsafeControlChar, foreignSocket, liveTargets, observationFailed, rowOwnership, TEXT_ALLOWED_CONTROL_CHARS, } from "../tmux.js";
+import { foreignSocket, liveTargets, observationFailed, rowOwnership, } from "../tmux.js";
 import { readLeadTurnState } from "../leadState.js";
 import { LEAD_TARGET_GONE, LEAD_TARGET_REISSUED, leadSubscription, paneVeto, runningLeadOf } from "../leadWatch.js";
 import { isRunningLeadActor, LEAD_KIND } from "../spawn.js";
@@ -17,67 +20,6 @@ import { commandHead, screenClassifiable } from "../harnesses.js";
 const agentRefParam = z
     .union([idParam, z.string()])
     .describe("Running agent's name (preferred), or its numeric agent id.");
-function resolveAgentRef(projectId, ref) {
-    return typeof ref === "number"
-        ? findAgent(projectId, { agent_id: ref })
-        : findAgent(projectId, { name: ref });
-}
-function refuseUnclassifiableTarget(agent) {
-    if (screenClassifiable(agent.command))
-        return;
-    throw new Error(`Agent ${agent.id} ("${agent.name}") runs ${JSON.stringify(commandHead(agent.command))}, and hive can only ` +
-        "classify a claude screen. A wake is delivered by pasting its body and pressing Enter, and the two guards " +
-        "that decide whether that is safe - a dialog on screen, unsubmitted human text in the box - both read " +
-        "claude's own chrome, so on this pane neither can answer. Delivery would type blind: into a dialog it " +
-        "answers the highlighted option, and on a shell it executes whatever the paste merged with. " +
-        "Refused here rather than at delivery, where it could only ever be held forever - a pane's harness never " +
-        "becomes classifiable, so that hold would never clear, and a timer that cannot fire is worse than an " +
-        "error you can read now. Drive this pane with agent_send(keys: [...]) instead, which is unguarded for " +
-        "exactly this reason.");
-}
-export function resolveWakeDelivery(projectId, deliverTo, queenOperation) {
-    if (deliverTo != null) {
-        const agent = queenOperation
-            ? resolveQueenLeadTarget(queenOperation, projectId, deliverTo, () => resolveAgentRef(projectId, deliverTo))
-            : resolveAgentRef(projectId, deliverTo);
-        // Before the liveness probe: the harness is a durable fact about the row, while liveness is a
-        // question about right now, so a dead bash worker should say what is actually wrong with it.
-        refuseUnclassifiableTarget(agent);
-        const ownership = agent.status === "running" ? observeOwnership(agent) : "gone";
-        if (ownership === "gone")
-            throw new Error(`Agent "${agent.name}" has no live tmux window to deliver to.`);
-        if (ownership !== "live")
-            throw notOwnedError(agent, ownership);
-        return { actor: agent.actor_id, pane: agent.tmux_target };
-    }
-    const actor = currentActor();
-    const own = db
-        .prepare("SELECT * FROM agents WHERE actor_id = ? AND status = 'running' ORDER BY id DESC LIMIT 1")
-        .get(actor);
-    if (queenOperation && !own && captureQueenWriteIdentity(projectId)) {
-        resolveQueenLeadTarget(queenOperation, projectId, deliverTo, () => {
-            throw new Error("the calling session has no running agent row to receive this wake");
-        });
-    }
-    // Checked on the ROW, not behind the liveness probe: isLive is three-state, and letting a null
-    // fall through to the TMUX_PANE branch below accepts a wake the scheduler will then hold forever
-    // against that same row's command - the never-firing timer this refusal exists to prevent.
-    const target = own && queenOperation ? resolveQueenLeadTarget(queenOperation, projectId, deliverTo, () => own) : own;
-    if (target)
-        refuseUnclassifiableTarget(target);
-    if (target) {
-        const ownership = observeOwnership(target);
-        if (ownership === "live")
-            return { actor, pane: target.tmux_target };
-        // Unknown never falls through to the ambient pane: that would bind this row's actor to a pane it may not own.
-        if (ownership === "unknown")
-            throw notOwnedError(target, ownership);
-    }
-    const pane = process.env.TMUX_PANE;
-    if (pane)
-        return { actor, pane };
-    throw new Error("This session cannot receive wake-ups: it is not running inside tmux, so nothing can be typed into its terminal. Start the lead inside tmux (run tmux, then claude; watch with tmux attach, or tmux -CC attach for iTerm's native windows), or pass deliver_to targeting a spawned agent.");
-}
 function pendingWakes(projectId) {
     return db
         .prepare(`SELECT * FROM wakes WHERE project_id = ? AND ${ACTIVE_TIMER_WHERE} ORDER BY id`)
@@ -138,16 +80,6 @@ function deliveredByNote(t) {
         : null;
 }
 export const truncateBody = (body) => body.length > 120 ? `${cutToUnitBudget(body, 120)}…` : body;
-export function assertSafeWakeBody(body) {
-    const bad = findUnsafeControlChar(body, TEXT_ALLOWED_CONTROL_CHARS);
-    if (bad) {
-        throw new Error(`body cannot contain ${bad.label} at offset ${bad.index}: it is typed literally into the target pane ` +
-            "when the wake fires, and a raw control byte reaches tmux as a keystroke instead of as text, " +
-            "silently turning the delivery into a keys call nobody chose. Tab and newline are the only control " +
-            "characters allowed - every wake in this project is multi-line prose. To send an actual keystroke " +
-            'on purpose, call agent_send(keys: [...]) against the target directly instead of scheduling it here.');
-    }
-}
 const baseWakeFields = (t, { truncate = true } = {}) => ({
     wake_id: t.id,
     kind: t.kind,

package/dist/version.js

@@ -1,7 +1,7 @@
-import { execFileSync } from "node:child_process";
 import { readFileSync, statSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
+import { gitOut } from "./git.js";
 const moduleDir = dirname(fileURLToPath(import.meta.url));
 const checkoutRoot = join(moduleDir, "..");
 function readBuildInfo() {
@@ -60,22 +60,9 @@ function packageVersion() {
     }
 }
 function currentGit() {
-    try {
-        const sha = execFileSync("git", ["rev-parse", "--short", "HEAD"], {
-            cwd: checkoutRoot,
-            encoding: "utf8",
-            stdio: ["ignore", "pipe", "ignore"],
-        }).trim();
-        const status = execFileSync("git", ["status", "--porcelain"], {
-            cwd: checkoutRoot,
-            encoding: "utf8",
-            stdio: ["ignore", "pipe", "ignore"],
-        });
-        return { sha, dirty: status.trim().length > 0 };
-    }
-    catch {
-        return null;
-    }
+    const sha = gitOut(checkoutRoot, ["rev-parse", "--short", "HEAD"]);
+    const status = gitOut(checkoutRoot, ["status", "--porcelain"]);
+    return sha === null || status === null ? null : { sha, dirty: status.length > 0 };
 }
 const describe = (sha, dirty) => `${sha}${dirty ? "-dirty" : ""}`;
 export function versionInfo() {

package/dist/wakeSql.js

@@ -0,0 +1 @@
+export const ACTIVE_TIMER_WHERE = "cancelled_at IS NULL AND (fired_at IS NULL OR repeat_every_ms IS NOT NULL)";

package/dist/wakeTarget.js

@@ -0,0 +1,76 @@
+import { db } from "./db.js";
+import { captureQueenWriteIdentity, currentActor, resolveQueenLeadTarget } from "./context.js";
+import { findAgent, observeOwnership, notOwnedError } from "./agentRecords.js";
+import { commandHead, screenClassifiable } from "./harnesses.js";
+import { findUnsafeControlChar, TEXT_ALLOWED_CONTROL_CHARS } from "./tmux.js";
+export function resolveAgentRef(projectId, ref) {
+    return typeof ref === "number"
+        ? findAgent(projectId, { agent_id: ref })
+        : findAgent(projectId, { name: ref });
+}
+function refuseUnclassifiableTarget(agent) {
+    if (screenClassifiable(agent.command))
+        return;
+    throw new Error(`Agent ${agent.id} ("${agent.name}") runs ${JSON.stringify(commandHead(agent.command))}, and hive can only ` +
+        "classify a claude screen. A wake is delivered by pasting its body and pressing Enter, and the two guards " +
+        "that decide whether that is safe - a dialog on screen, unsubmitted human text in the box - both read " +
+        "claude's own chrome, so on this pane neither can answer. Delivery would type blind: into a dialog it " +
+        "answers the highlighted option, and on a shell it executes whatever the paste merged with. " +
+        "Refused here rather than at delivery, where it could only ever be held forever - a pane's harness never " +
+        "becomes classifiable, so that hold would never clear, and a timer that cannot fire is worse than an " +
+        "error you can read now. Drive this pane with agent_send(keys: [...]) instead, which is unguarded for " +
+        "exactly this reason.");
+}
+export function resolveWakeDelivery(projectId, deliverTo, queenOperation) {
+    if (deliverTo != null) {
+        const agent = queenOperation
+            ? resolveQueenLeadTarget(queenOperation, projectId, deliverTo, () => resolveAgentRef(projectId, deliverTo))
+            : resolveAgentRef(projectId, deliverTo);
+        // Before the liveness probe: the harness is a durable fact about the row, while liveness is a
+        // question about right now, so a dead bash worker should say what is actually wrong with it.
+        refuseUnclassifiableTarget(agent);
+        const ownership = agent.status === "running" ? observeOwnership(agent) : "gone";
+        if (ownership === "gone")
+            throw new Error(`Agent "${agent.name}" has no live tmux window to deliver to.`);
+        if (ownership !== "live")
+            throw notOwnedError(agent, ownership);
+        return { actor: agent.actor_id, pane: agent.tmux_target };
+    }
+    const actor = currentActor();
+    const own = db
+        .prepare("SELECT * FROM agents WHERE actor_id = ? AND status = 'running' ORDER BY id DESC LIMIT 1")
+        .get(actor);
+    if (queenOperation && !own && captureQueenWriteIdentity(projectId)) {
+        resolveQueenLeadTarget(queenOperation, projectId, deliverTo, () => {
+            throw new Error("the calling session has no running agent row to receive this wake");
+        });
+    }
+    // Checked on the ROW, not behind the liveness probe: isLive is three-state, and letting a null
+    // fall through to the TMUX_PANE branch below accepts a wake the scheduler will then hold forever
+    // against that same row's command - the never-firing timer this refusal exists to prevent.
+    const target = own && queenOperation ? resolveQueenLeadTarget(queenOperation, projectId, deliverTo, () => own) : own;
+    if (target)
+        refuseUnclassifiableTarget(target);
+    if (target) {
+        const ownership = observeOwnership(target);
+        if (ownership === "live")
+            return { actor, pane: target.tmux_target };
+        // Unknown never falls through to the ambient pane: that would bind this row's actor to a pane it may not own.
+        if (ownership === "unknown")
+            throw notOwnedError(target, ownership);
+    }
+    const pane = process.env.TMUX_PANE;
+    if (pane)
+        return { actor, pane };
+    throw new Error("This session cannot receive wake-ups: it is not running inside tmux, so nothing can be typed into its terminal. Start the lead inside tmux (run tmux, then claude; watch with tmux attach, or tmux -CC attach for iTerm's native windows), or pass deliver_to targeting a spawned agent.");
+}
+export function assertSafeWakeBody(body) {
+    const bad = findUnsafeControlChar(body, TEXT_ALLOWED_CONTROL_CHARS);
+    if (bad) {
+        throw new Error(`body cannot contain ${bad.label} at offset ${bad.index}: it is typed literally into the target pane ` +
+            "when the wake fires, and a raw control byte reaches tmux as a keystroke instead of as text, " +
+            "silently turning the delivery into a keys call nobody chose. Tab and newline are the only control " +
+            "characters allowed - every wake in this project is multi-line prose. To send an actual keystroke " +
+            'on purpose, call agent_send(keys: [...]) against the target directly instead of scheduling it here.');
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmgmyr/hive",
-  "version": "1.11.4",
+  "version": "1.11.6",
   "description": "Run a crew of Claude Code and Codex workers from one lead session: visible tmux panes, exact state from hooks, one local SQLite store.",
   "type": "module",
   "bin": {