@cmgmyr/hive 1.11.4 → 1.11.6

package/dist/agentKinds.js

@@ -0,0 +1,6 @@
+export const LEAD_KIND = "lead";
+export const LEAD_ACTOR_PREFIX = `${LEAD_KIND}:`;
+export const isLeadActorId = (actorId) => actorId.startsWith(LEAD_ACTOR_PREFIX);
+export const mintLeadActorId = (agentId) => `${LEAD_ACTOR_PREFIX}${agentId}`;
+export const LEAD_NAME = LEAD_KIND;
+export const isReservedAgentName = (name) => name.toLowerCase() === LEAD_NAME;

package/dist/agentRecords.js

@@ -0,0 +1,98 @@
+import { db } from "./db.js";
+import { LEAD_KIND } from "./agentKinds.js";
+import { observationFailed, observeRowOwnership, ownershipLiveness, rowOwnership } from "./tmux.js";
+export const CLOSED_ROW_ORDER = "(parked_at != '') DESC, closed_at DESC, id DESC";
+export 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;
+}
+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);
+}
+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.");
+}
+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;
+export 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}`);
+}
+export function summaryLiveness(row, snapshot) {
+    if (row.status !== "running")
+        return false;
+    return ownershipLiveness(rowOwnership(row, snapshot));
+}

package/dist/backup.js

@@ -2,7 +2,7 @@ import SqliteDb from "better-sqlite3";
 import { randomUUID } from "node:crypto";
 import { cpSync, existsSync, mkdirSync, readdirSync, renameSync, rmSync, statSync } from "node:fs";
 import { join } from "node:path";
-import { errorMessage } from "./result.js";
+import { errorMessage } from "./errors.js";
 export const BACKUP_DIRNAME = "backups";
 export function backupsDir(dataDir) {
     return join(dataDir, BACKUP_DIRNAME);

package/dist/build-info.json

@@ -1 +1 @@
-{"version":"1.11.4","sha":"be85c43","dirty":false,"build_id":"002d81642b9604f453a66605e3bc23656ad7b425069e016be8bfda87d6e532d1"}
+{"version":"1.11.6","sha":"b4e9fb0","dirty":false,"build_id":"fb0debbc0e5e030650660c10505b25c26e60160403f384ce900920146e639961"}

package/dist/cli.js

@@ -23,7 +23,8 @@ import { confirmQueenWrite, listQueenAudit } from "./queenAudit.js";
 import { formatRowCounts, projectRowCounts, removeProject } from "./projectRemove.js";
 import { ensureHooksFile, ensureLeadHooksFile } from "./hooks.js";
 import { errorMessage, registrationNoticeText, withTrailingNewline } from "./result.js";
-import { ACTIVE_TIMER_WHERE, socketAwaitingWhere, dashboardFileContained, describeStall, HELD_REASON_UNCLASSIFIABLE_PANE_PREFIX, HELD_REASON_UNSUBMITTED_INPUT_PREFIX, janitor, resolveDashboardFile, generateQueenDashboardNow, transcriptStaleness, } from "./scheduler.js";
+import { socketAwaitingWhere, dashboardFileContained, describeStall, HELD_REASON_UNCLASSIFIABLE_PANE_PREFIX, HELD_REASON_UNSUBMITTED_INPUT_PREFIX, janitor, resolveDashboardFile, generateQueenDashboardNow, transcriptStaleness, } from "./scheduler.js";
+import { ACTIVE_TIMER_WHERE } from "./wakeSql.js";
 import { readTurnCount } from "./turnCount.js";
 import { leadSessionEnded } from "./leadState.js";
 import { heldReasonLabel } from "./heldLabel.js";
@@ -36,7 +37,7 @@ import { asNameClash, buildEnvFlags, closeAgentRow, isReservedAgentName, launchA
 import { adoptableWindow, applyLayout, claimInitialWindow, configureHiveWindow, controlModeFor, createWindow, DEFAULT_LAYOUT, describePaneChoice, ensureSession, findProjectWindow, foreignSocket, isViewSessionName, listOwnedWindows, liveTargets, observationFailed, observeRowOwnership, ORPHAN_MIN_AGE_MS, orphanScratchServers, orphansWorthWarningAbout, paneIsAloneInWindow, paneVisibility, panePidForRecord, PROCESSES_LAYOUT, processesPaneTitle, processesWindowName, projectWindows, RAW_ATTACH_TMUX_CONFIG, renderAttachCommand, resolveAttachTarget, resolveInTmuxTarget, rowLive, rowOwnership, SESSION_PREFIX, appendGlobalHook, globalHooks, replaceGlobalHooks, sessionName, setPaneTitle, shellQuote, shownPaneTitle, makeProcessesWindow, tmux, TMUX_DOC, tmuxSaysNothingThere, tmuxTimeoutOverride, tmuxSocketPath, untrustedTmuxServer, waitForPaneEstablished, windowLayout, } from "./tmux.js";
 import { collectCrew, crewStoreProblem } from "./crew.js";
 import { describeVisibility, formatLocal, processCounts } from "./dashboard.js";
-import { runningCommandRow, runningCommandRows, snapshotProcesses, stopAllProcesses, stopLine, stopProcess, STOP_REASONS, } from "./processes.js";
+import { runningCommandRow, runningCommandRows, snapshotProcesses, stopAllProcesses, stopLine, stopProcess, renderStart, STOP_REASONS, } from "./processes.js";
 import { activeProfile, agentVarKeys, BUILT_IN_PROJECT_YML, configHash, loadProjectYml, mergedProjectVars, NO_PROFILE, PROJECT_YML_KEYS, resolveCommandDir, resolveFirstMessage, } from "./projectYml.js";
 import { appendClaudeLeadArgs, crewPluginDir, isTrusted, leadIdentityEnv, renderLeadPosture } from "./leadLaunch.js";
 import { handoffStatusSegment } from "./leadHandoff.js";
@@ -47,8 +48,9 @@ import { FIRST_MESSAGE_SHA_ENV, firstMessageDigest } from "./firstMessage.js";
 import { ageSecondsSince, deriveProvenance, describeForHuman, describeLastLogEvent, humanizeAge, lastLogEvent, lastPermissionMode, reportsAgentStateLog, } from "./stateProvenance.js";
 import { awaitingFirstPromptSql } from "./firstPrompt.js";
 import { checkoutRoot, createProfile, forkProfile, PROFILE_FILES, ProfileError, profileExists, profileFileNames, profileNames, profileStatus, readProfileFile, referencedPads, referencedPaths, renderProfileFile, resolveProfileFile, REWRITE_THRESHOLD, templateVars, userProfilesDir, } from "./profiles.js";
-import { getTodoDetail, listTodoSummaries, OPEN_BLOCKERS_SQL, TODO_STATUSES, } from "./tools/todos.js";
-import { createPad, getActivePadByName, listActivePads, overwritePadContent, } from "./tools/pads.js";
+import { getTodoDetail, listTodoSummaries, } from "./todos.js";
+import { ACTIVE_TODO_SQL, OPEN_BLOCKERS_SQL, TODO_STATUSES } from "./todoScope.js";
+import { createPad, getActivePadByName, listActivePads, overwritePadContent, } from "./pads.js";
 import { answerQuestion, listQuestions } from "./questions.js";
 function usage() {
     console.log(`hive — run a crew of Claude Code and Codex workers from one lead session
@@ -213,9 +215,15 @@ async function ensureTrusted(projectId, name, command, dir, env) {
     db.prepare("INSERT OR IGNORE INTO command_trust (project_id, name, config_hash) VALUES (?, ?, ?)").run(projectId, name, hash);
     return true;
 }
-function startYmlCommand(project, name, proc, config) {
+function startYmlCommand(project, name, proc, config, trusted) {
+    if (!trusted)
+        return { status: "refused", reason: "untrusted" };
     if (isReservedAgentName(name)) {
-        return `skipped: "lead" is reserved for this project's lead session and cannot be used as a process name`;
+        return {
+            status: "refused",
+            reason: "reserved-name",
+            message: `skipped: "lead" is reserved for this project's lead session and cannot be used as a process name`,
+        };
     }
     const existing = db
         .prepare("SELECT id, tmux_target, tmux_socket FROM agents WHERE project_id = ? AND name = ? AND status = 'running'")
@@ -225,10 +233,15 @@ function startYmlCommand(project, name, proc, config) {
         if (live) {
             const windows = projectWindows(sessionName(), project.id);
             const where = windows === null ? null : paneVisibility(existing.tmux_target, windows);
-            return where === "shown" || where === "hidden" ? `already running (${where})` : "already running";
+            return { status: "already-running", location: where === "shown" || where === "hidden" ? where : null };
+        }
+        if (live === null) {
+            return {
+                status: "refused",
+                reason: "unknown-liveness",
+                message: "skipped: tmux could not be probed, so hive cannot tell whether it is already running",
+            };
         }
-        if (live === null)
-            return "skipped: tmux could not be probed, so hive cannot tell whether it is already running";
         closeAgentRow(existing.id);
     }
     let dir;
@@ -236,7 +249,7 @@ function startYmlCommand(project, name, proc, config) {
         dir = resolveCommandDir(project.path, proc.dir);
     }
     catch (e) {
-        return `skipped: ${errorMessage(e)}`;
+        return { status: "refused", reason: "escaped-dir", message: `skipped: ${errorMessage(e)}` };
     }
     const placement = proc.visible
         ? (config.placement ?? (process.env.HIVE_SPAWN_PLACEMENT === "window" ? "window" : "split"))
@@ -260,17 +273,20 @@ function startYmlCommand(project, name, proc, config) {
             setPaneTitle(target, shownPaneTitle(project.name, name));
             if (landedInProjectId != null) {
                 const landedName = getProject(landedInProjectId)?.name ?? `project ${landedInProjectId}`;
-                return `started, landed in project "${landedName}"'s window`;
+                return { status: "started", message: `started, landed in project "${landedName}"'s window` };
             }
-            return "started";
+            return { status: "started", message: "started" };
         }
-        return inProcessesWindow
-            ? "started (hidden)"
-            : "started in its own window: it opened this project's tmux session, and a session's first window " +
-                `cannot be a tile. Move it with: hive hide "${name}"`;
+        return {
+            status: "started",
+            message: inProcessesWindow
+                ? "started (hidden)"
+                : "started in its own window: it opened this project's tmux session, and a session's first window " +
+                    `cannot be a tile. Move it with: hive hide "${name}"`,
+        };
     }
     catch (e) {
-        return `failed: ${errorMessage(e)}`;
+        return { status: "failed", message: errorMessage(e) };
     }
 }
 function attach(session, project, window) {
@@ -636,9 +652,10 @@ async function cmdLead(argv) {
                     console.log(`- ${name}: defined, auto_start off (start with: hive start "${name}")`);
                     continue;
                 }
-                if (await ensureTrusted(project.id, name, proc.command, proc.dir, proc.env)) {
-                    console.log(`- ${name}: ${startYmlCommand(project, name, proc, config)}`);
-                }
+                const trusted = await ensureTrusted(project.id, name, proc.command, proc.dir, proc.env);
+                const result = startYmlCommand(project, name, proc, config, trusted);
+                if (trusted)
+                    console.log(`- ${name}: ${renderStart(result)}`);
             }
         }
         if (registrationNotice) {
@@ -1366,9 +1383,12 @@ async function cmdStart(argv) {
         console.log(processNotDefined(config, name));
         process.exit(1);
     }
-    if (await ensureTrusted(project.id, name, proc.command, proc.dir, proc.env)) {
-        console.log(`${name}: ${startYmlCommand(project, name, proc, config)}`);
-    }
+    const trusted = await ensureTrusted(project.id, name, proc.command, proc.dir, proc.env);
+    const result = startYmlCommand(project, name, proc, config, trusted);
+    if (trusted)
+        console.log(`${name}: ${renderStart(result)}`);
+    if (!trusted || result.status === "failed" || result.status === "refused")
+        process.exitCode = 1;
 }
 function processNotDefined(config, name) {
     const known = Object.keys(config?.processes ?? {});
@@ -1631,7 +1651,7 @@ function cmdStatus() {
             .prepare("SELECT * FROM agents WHERE project_id = ? AND status = 'running' ORDER BY kind DESC, id")
             .all(project.id);
         const todos = db
-            .prepare("SELECT COUNT(*) AS n FROM todos WHERE project_id = ? AND status IN ('open', 'in_progress') AND archived_at IS NULL")
+            .prepare(`SELECT COUNT(*) AS n FROM todos t WHERE t.project_id = ? AND ${ACTIVE_TODO_SQL}`)
             .get(project.id).n;
         const { wakes, heldWakes } = db
             .prepare(`SELECT COUNT(*) AS wakes, COUNT(held_at) AS heldWakes FROM wakes WHERE project_id = ? AND ${ACTIVE_TIMER_WHERE}`)
@@ -2769,9 +2789,9 @@ function cmdStatusline() {
     const count = (sql) => db.prepare(sql).get(project.id).n;
     const agents = count("SELECT COUNT(*) AS n FROM agents WHERE project_id = ? AND status = 'running' AND kind = 'agent'");
     const commands = count("SELECT COUNT(*) AS n FROM agents WHERE project_id = ? AND status = 'running' AND kind = 'command'");
-    const todos = count("SELECT COUNT(*) AS n FROM todos WHERE project_id = ? AND status IN ('open', 'in_progress') AND archived_at IS NULL");
+    const todos = count(`SELECT COUNT(*) AS n FROM todos t WHERE t.project_id = ? AND ${ACTIVE_TODO_SQL}`);
     const ready = count(`SELECT COUNT(*) AS n FROM todos t
-     WHERE t.project_id = ? AND t.status IN ('open', 'in_progress') AND t.archived_at IS NULL
+     WHERE t.project_id = ? AND ${ACTIVE_TODO_SQL}
        AND NOT EXISTS (${OPEN_BLOCKERS_SQL})`);
     const pads = count("SELECT COUNT(*) AS n FROM pads WHERE project_id = ? AND archived = 0");
     const wakes = count(`SELECT COUNT(*) AS n FROM wakes WHERE project_id = ? AND ${ACTIVE_TIMER_WHERE}`);

package/dist/codexHome.js

@@ -303,7 +303,6 @@ export function ensureCodexHome(input) {
         indexJs,
         serverEnv: { ...input.serverEnv, HIVE_AGENT_ID: input.actorId },
         statusLine,
-        readOnly: input.readOnly,
         modelContextWindow,
         modelAutoCompactTokenLimit,
     }));

package/dist/context.js

@@ -1,12 +1,12 @@
-import { execFileSync } from "node:child_process";
 import { lstatSync, realpathSync } from "node:fs";
 import { userInfo } from "node:os";
 import { basename, dirname, join, resolve, sep } from "node:path";
 import { storeDir } from "./dataDir.js";
 import { db } from "./db.js";
-import { LEAD_KIND } from "./spawn.js";
+import { LEAD_KIND } from "./agentKinds.js";
 import { rowOwnership } from "./tmux.js";
-import { recordQueenRefusal } from "./queenAudit.js";
+import { recordQueenRefusal } from "./queenAuditStore.js";
+import { gitOut } from "./git.js";
 let selectedId = null;
 let cachedActorId = null;
 let lastTouchMs = 0;
@@ -92,18 +92,13 @@ export function registeredAncestor(dir) {
     return bestPrefixMatch(projects, dir);
 }
 export function gitPrimaryRoot(dir) {
+    const commonDir = gitOut(dir, ["rev-parse", "--git-common-dir"]);
+    if (commonDir === null)
+        return null;
+    const resolvedCommonDir = resolve(dir, commonDir);
+    if (basename(resolvedCommonDir) !== ".git")
+        return null;
     try {
-        const { GIT_DIR: _gitDir, GIT_COMMON_DIR: _gitCommonDir, GIT_WORK_TREE: _gitWorkTree, ...env } = process.env;
-        const commonDir = execFileSync("git", ["rev-parse", "--git-common-dir"], {
-            cwd: dir,
-            encoding: "utf8",
-            stdio: ["ignore", "pipe", "ignore"],
-            timeout: 2000,
-            env,
-        }).trim();
-        const resolvedCommonDir = resolve(dir, commonDir);
-        if (basename(resolvedCommonDir) !== ".git")
-            return null;
         return realpathSync(dirname(resolvedCommonDir));
     }
     catch {
@@ -111,19 +106,13 @@ export function gitPrimaryRoot(dir) {
     }
 }
 function gitDirs(dir) {
+    const result = gitOut(dir, ["rev-parse", "--git-dir", "--git-common-dir"]);
+    if (result === null)
+        return null;
+    const out = result.split("\n");
+    if (out.length !== 2)
+        return null;
     try {
-        const { GIT_DIR: _gitDir, GIT_COMMON_DIR: _gitCommonDir, GIT_WORK_TREE: _gitWorkTree, ...env } = process.env;
-        const out = execFileSync("git", ["rev-parse", "--git-dir", "--git-common-dir"], {
-            cwd: dir,
-            encoding: "utf8",
-            stdio: ["ignore", "pipe", "ignore"],
-            timeout: 2000,
-            env,
-        })
-            .trim()
-            .split("\n");
-        if (out.length !== 2)
-            return null;
         return {
             gitDir: realpathSync(resolve(dir, out[0])),
             commonDir: realpathSync(resolve(dir, out[1])),

package/dist/crew.js

@@ -1,15 +1,16 @@
-import { execFileSync } from "node:child_process";
 import { db } from "./db.js";
 import { isLinkedWorktree } from "./context.js";
 import { awaitingFirstPrompt } from "./firstPrompt.js";
 import { heldReasonLabel } from "./heldLabel.js";
 import { harnessFor, paneClassifierFor } from "./harnesses.js";
 import { NEEDS_HUMAN_TAG } from "./portfolio.js";
+import { ACTIVE_TODO_SQL } from "./todoScope.js";
 import { pendingQuestionCount } from "./questions.js";
 import { loadProjectYml } from "./projectYml.js";
 import { parseTags } from "./result.js";
-import { ACTIVE_TIMER_WHERE } from "./scheduler.js";
+import { ACTIVE_TIMER_WHERE } from "./wakeSql.js";
 import { reportsAgentStateLog } from "./stateProvenance.js";
+import { gitOut } from "./git.js";
 import { liveTargets, rowOwnership } from "./tmux.js";
 import { SKILL_TOOL, lastComponent, readContextFill, readRecentToolCalls, } from "./transcript.js";
 export function crewStoreProblem(database = db) {
@@ -50,36 +51,18 @@ function oneShotWatched(pending) {
         }
     });
 }
-function stripped(env) {
-    const { GIT_DIR: _gitDir, GIT_COMMON_DIR: _gitCommonDir, GIT_WORK_TREE: _gitWorkTree, ...rest } = env;
-    return rest;
-}
-function git(cwd, args) {
-    try {
-        return execFileSync("git", args, {
-            cwd,
-            encoding: "utf8",
-            stdio: ["ignore", "pipe", "ignore"],
-            timeout: 2000,
-            env: stripped(process.env),
-        }).trim();
-    }
-    catch {
-        return null;
-    }
-}
 export function readCommitsAhead(cwd, projectRoot) {
     if (!cwd || cwd === projectRoot || !isLinkedWorktree(cwd))
         return null;
     const candidates = [];
-    const remoteHead = git(cwd, ["symbolic-ref", "--quiet", "refs/remotes/origin/HEAD"]);
+    const remoteHead = gitOut(cwd, ["symbolic-ref", "--quiet", "refs/remotes/origin/HEAD"]);
     if (remoteHead)
         candidates.push(remoteHead);
     candidates.push("refs/heads/main", "refs/heads/master");
     for (const ref of candidates) {
-        if (git(cwd, ["rev-parse", "--verify", "--quiet", `${ref}^{commit}`]) === null)
+        if (gitOut(cwd, ["rev-parse", "--verify", "--quiet", `${ref}^{commit}`]) === null)
             continue;
-        const count = git(cwd, ["rev-list", "--count", `${ref}..HEAD`]);
+        const count = gitOut(cwd, ["rev-list", "--count", `${ref}..HEAD`]);
         return count !== null && /^\d+$/.test(count) ? Number(count) : null;
     }
     return null;
@@ -481,7 +464,7 @@ export function collectCrew(project, now) {
         if (!staffed.has(todo.id))
             lanes.push({ todo, worker: null });
     const needsYou = db
-        .prepare("SELECT id, slug, tags FROM todos WHERE project_id = ? AND status != 'completed' AND archived_at IS NULL ORDER BY id")
+        .prepare(`SELECT t.id, t.slug, t.tags FROM todos t WHERE t.project_id = ? AND ${ACTIVE_TODO_SQL} ORDER BY t.id`)
         .all(project.id)
         .filter((t) => parseTags(t.tags).includes(NEEDS_HUMAN_TAG))
         .map((t) => ({ id: t.id, slug: t.slug }));

package/dist/dashboard.js

@@ -1,6 +1,8 @@
 import { createHash } from "node:crypto";
-import { createRequire } from "node:module";
+import { listQuestions, pendingQuestionCount } from "./questions.js";
+import { ACTIVE_TIMER_WHERE } from "./wakeSql.js";
 import { db } from "./db.js";
+import { ACTIVE_TODO_SQL, NOT_COMPLETED_TODO_SQL, OPEN_BLOCKERS_SQL } from "./todoScope.js";
 import { getProject } from "./context.js";
 export const describeVisibility = (visibility) => visibility === null ? "running" : visibility === "window" ? "own window" : visibility;
 export function processCounts(procs) {
@@ -13,7 +15,6 @@ export function processCounts(procs) {
 }
 import { awaitingFirstPrompt } from "./firstPrompt.js";
 import { SLUG_MAX_LEN, cutToUnitBudget } from "./slug.js";
-const requireFromHere = createRequire(import.meta.url);
 export const TODO_CAP = 100;
 export const AGENT_CAP = 50;
 export const WAKE_CAP = 50;
@@ -86,7 +87,6 @@ function fetchProject(projectId) {
         throw new Error(`No project ${projectId}.`);
     return row;
 }
-const PENDING_WAKE_WHERE = "cancelled_at IS NULL AND (fired_at IS NULL OR repeat_every_ms IS NOT NULL)";
 function agentStatusLevel(state) {
     if (state === "working")
         return "live";
@@ -120,19 +120,16 @@ function fetchNowAgents(projectId) {
 function fetchNextWake(projectId) {
     return db
         .prepare(`SELECT kind, due_at, max_wait_at, deliver_actor FROM wakes
-       WHERE project_id = ? AND ${PENDING_WAKE_WHERE}
+       WHERE project_id = ? AND ${ACTIVE_TIMER_WHERE}
        ORDER BY COALESCE(due_at, max_wait_at, created_at) LIMIT 1`)
         .get(projectId);
 }
 function fetchTodoCounts(projectId) {
     return db
         .prepare(`SELECT
-         (SELECT COUNT(*) FROM todos WHERE project_id = ? AND archived_at IS NULL AND status != 'completed') AS open,
-         (SELECT COUNT(*) FROM todos t WHERE t.project_id = ? AND t.archived_at IS NULL AND t.status != 'completed'
-            AND EXISTS (
-              SELECT 1 FROM todo_blockers b JOIN todos bt ON bt.id = b.blocker_id
-               WHERE b.todo_id = t.id AND bt.status != 'completed'
-            )) AS blocked,
+         (SELECT COUNT(*) FROM todos t WHERE t.project_id = ? AND ${ACTIVE_TODO_SQL}) AS open,
+         (SELECT COUNT(*) FROM todos t WHERE t.project_id = ? AND ${ACTIVE_TODO_SQL}
+            AND EXISTS (${OPEN_BLOCKERS_SQL})) AS blocked,
          (SELECT COUNT(*) FROM todos
             WHERE project_id = ? AND completed_at IS NOT NULL
               AND date(completed_at, 'localtime') >= date('now', 'localtime', '-6 days')) AS completed7d`)
@@ -262,10 +259,9 @@ function renderBoardSection(index, projectId) {
 }
 const OPEN_TODOS_SQL = `
   SELECT t.id, t.title, t.body, t.slug, t.status, t.priority,
-    (SELECT COUNT(*) FROM todo_blockers b JOIN todos bt ON bt.id = b.blocker_id
-      WHERE b.todo_id = t.id AND bt.status != 'completed') AS open_blockers
+    EXISTS (${OPEN_BLOCKERS_SQL}) AS blocked
   FROM todos t
-  WHERE t.project_id = ? AND t.archived_at IS NULL AND t.status != 'completed'
+  WHERE t.project_id = ? AND ${ACTIVE_TODO_SQL}
   ORDER BY CASE t.priority WHEN 'high' THEN 0 WHEN 'medium' THEN 1 ELSE 2 END, t.id`;
 function fetchBlockersFor(todoIds) {
     const byTodo = new Map();
@@ -274,7 +270,7 @@ function fetchBlockersFor(todoIds) {
     const placeholders = todoIds.map(() => "?").join(",");
     const rows = db
         .prepare(`SELECT b.todo_id, t.id, t.title FROM todo_blockers b JOIN todos t ON t.id = b.blocker_id
-       WHERE b.todo_id IN (${placeholders}) AND t.status != 'completed'`)
+       WHERE b.todo_id IN (${placeholders}) AND t.${NOT_COMPLETED_TODO_SQL}`)
         .all(...todoIds);
     for (const row of rows) {
         const list = byTodo.get(row.todo_id) ?? [];
@@ -291,11 +287,11 @@ function todoBadgeLevel(status, blocked) {
 function renderTodosSection(index, projectId) {
     const all = db.prepare(OPEN_TODOS_SQL).all(projectId);
     const shown = all.slice(0, TODO_CAP);
-    const blockersByTodo = fetchBlockersFor(shown.filter((t) => t.open_blockers > 0).map((t) => t.id));
-    const blockedCount = all.filter((t) => t.open_blockers > 0).length;
+    const blockersByTodo = fetchBlockersFor(shown.filter((t) => t.blocked).map((t) => t.id));
+    const blockedCount = all.filter((t) => t.blocked).length;
     const rows = shown
         .map((t) => {
-        const blocked = t.open_blockers > 0;
+        const blocked = Boolean(t.blocked);
         const blockers = blocked
             ? (blockersByTodo.get(t.id) ?? []).map((b) => `${mono(`#${b.id}`)} ${prose(b.title)}`).join(", ")
             : "";
@@ -324,7 +320,7 @@ function renderTodosSection(index, projectId) {
             `<p class="filter-none" id="todo-filter-none" hidden>No open todo matches that filter.</p>`
         : "";
     const body = filter +
-        renderCappedList(shown.length, all.length, "open todos", "todos", rows, emptyState("No open todos.", "Every todo in this project is completed or archived. New ones land here."), "todo-list");
+        renderCappedList(shown.length, all.length, "open todos", "todos", rows, emptyState("No open todos.", "No active todos are listed. New open or in-progress todos land here. Backlog todos stay off this list."), "todo-list");
     return section(index, "todos", "Todos", `${all.length} open, ${blockedCount} blocked`, "checklist", String(shown.length), body);
 }
 export const CHART_DAYS = 7;
@@ -431,7 +427,7 @@ function renderThroughputSection(index, stats) {
 function renderWakesSection(index, projectId) {
     const all = db
         .prepare(`SELECT id, kind, body, owner, deliver_actor, due_at, max_wait_at, fire_count, repeat_every_ms, held_at
-       FROM wakes WHERE project_id = ? AND ${PENDING_WAKE_WHERE}
+       FROM wakes WHERE project_id = ? AND ${ACTIVE_TIMER_WHERE}
        ORDER BY COALESCE(due_at, max_wait_at, created_at)`)
         .all(projectId);
     const shown = all.slice(0, WAKE_CAP);
@@ -465,8 +461,6 @@ function questionAge(createdAt) {
     return "now";
 }
 function renderQuestionsSection(index, projectId) {
-    // A static import of questions.js cycles through tools/wakes.ts and scheduler.ts.
-    const { listQuestions, pendingQuestionCount } = requireFromHere("./questions.js");
     const questions = listQuestions(projectId);
     if (questions.length === 0)
         return "";

package/dist/db.js

@@ -4,7 +4,7 @@ import { join } from "node:path";
 import { guardAbi } from "./abi.js";
 import { guardStoreDir } from "./dataDir.js";
 import { maybeBackupBeforeMigrations } from "./backup.js";
-import { errorMessage } from "./result.js";
+import { errorMessage } from "./errors.js";
 export const dataDir = guardStoreDir();
 mkdirSync(dataDir, { recursive: true });
 function sleepSync(ms) {
@@ -576,6 +576,42 @@ ALTER TABLE queen_audit ADD COLUMN problem TEXT NOT NULL DEFAULT '';
 `,
     `
 ALTER TABLE agents ADD COLUMN pane_started_at TEXT;
+`,
+    `
+DROP TRIGGER fence_handoff_held_claim;
+CREATE TRIGGER fence_handoff_held_claim
+BEFORE UPDATE OF fire_count, delivery_method ON wakes
+FOR EACH ROW
+WHEN (NEW.fire_count > OLD.fire_count
+      OR (NEW.delivery_method IS 'pty-after-socket-timeout'
+          AND OLD.delivery_method IS NOT 'pty-after-socket-timeout'
+          AND NEW.typed_at IS NULL))
+  AND EXISTS (
+    SELECT 1 FROM lead_handoffs h
+     WHERE h.lead_agent_id = (SELECT a.id FROM agents a
+                               WHERE a.actor_id = NEW.deliver_actor
+                               ORDER BY (a.status = 'running') DESC,
+                                        a.id DESC
+                               LIMIT 1)
+       AND h.state NOT IN ('completed', 'failed')
+       AND h.request_wake_id IS NOT NEW.id
+       AND (
+            (h.state = 'grace'
+             AND h.hold_released_at IS NULL
+             AND h.grace_started_at IS NOT NULL
+             AND (julianday('now') - julianday(h.grace_started_at)) * 86400 < 900)
+            OR ((h.state IN ('grace', 'started')
+                 OR (h.hold_released_at IS NULL AND (
+                       h.state IN ('respawning', 'ambiguous', 'wind_down')
+                       OR (h.state = 'requested'
+                           AND (h.reason = 'stop' OR h.pass >= 2))
+                       OR (h.state = 'postponed' AND h.reason = 'stop'))))
+                AND h.state <> 'grace'
+                AND (julianday('now') - julianday(h.updated_at)) * 86400 < 3600)
+       ))
+BEGIN
+  SELECT RAISE(IGNORE);
+END;
 `,
 ];
 export function storeSchemaAhead(database) {

package/dist/errors.js

@@ -0,0 +1,3 @@
+export function errorMessage(e) {
+    return e instanceof Error ? e.message : String(e);
+}

package/dist/git.js

@@ -0,0 +1,16 @@
+import { execFileSync } from "node:child_process";
+export function gitOut(cwd, args) {
+    const { GIT_DIR: _gitDir, GIT_COMMON_DIR: _gitCommonDir, GIT_WORK_TREE: _gitWorkTree, ...env } = process.env;
+    try {
+        return execFileSync("git", args, {
+            cwd,
+            encoding: "utf8",
+            stdio: ["ignore", "pipe", "ignore"],
+            timeout: 2000,
+            env,
+        }).trim();
+    }
+    catch {
+        return null;
+    }
+}

package/dist/globalConfig.js

@@ -3,7 +3,7 @@ import { chmodSync, closeSync, lstatSync, mkdirSync, openSync, readFileSync, ren
 import { basename, dirname, join } from "node:path";
 import { isMap, parse, parseDocument } from "yaml";
 import { storeDir } from "./dataDir.js";
-import { errorMessage } from "./result.js";
+import { errorMessage } from "./errors.js";
 export const ATTACH_MODES = ["auto", "raw", "control"];
 export const AUTO_ATTACH_MODES = ["auto", "on", "off"];
 export function isAttachMode(value) {

package/dist/harnesses.js

@@ -53,7 +53,6 @@ const claudeHarness = {
     supportsRename: true,
     classifiesPaneScreen: true,
     paneClassifier: { choiceCheck: paneChoiceCheck, inputBoxState, inputBoxSnapshot, hasInputBox: paneHasInputBox, trailerView: claudeTrailerView },
-    hasScopes: true,
     needsHome: false,
     // "--" so a message that starts with a dash is never read as a flag.
     initialPromptArgs: (message) => ["--", message],
@@ -82,7 +81,6 @@ export const codexHarness = {
         hasInputBox: codexPaneHasInputBox,
         trailerView: codexTrailerView,
     },
-    hasScopes: false,
     needsHome: true,
     // Auto-submits with no Enter; verified live on v0.149.0.
     initialPromptArgs: (message) => ["--", message],
@@ -106,7 +104,6 @@ const unknownHarness = {
     supportsRename: false,
     classifiesPaneScreen: false,
     paneClassifier: null,
-    hasScopes: false,
     needsHome: false,
     initialPromptArgs: null,
     // An unrecognized command's vocabulary is unknown, so it stops nothing rather than guessing.