@cmgmyr/hive 1.2.2 → 1.3.0

package/dist/cli.js

@@ -9,7 +9,7 @@ import { pathToFileURL } from "node:url";
 import { checkAbi, describeAbi, describeInterpreter, nodeRangeForNodeApi, requiredNodeApi } from "./abi.js";
 import { versionInfo } from "./version.js";
 import { claudeConfigDir } from "./claudeDir.js";
-import { ATTACH_MODES, AUTO_ATTACH_MODES, attachMode, isAttachMode, isAutoAttach, resolvedAttachMode, resolvedAutoAttach, setAttachMode, setAutoAttach, } from "./config.js";
+import { ATTACH_MODES, AUTO_ATTACH_MODES, attachMode, isAttachMode, isAutoAttach, migrateLegacyConfig, resolvedAutoAttach, setAttachMode, setAutoAttach, } from "./config.js";
 import { cliPath, dispatcherDir, dispatcherPath, dispatcherScript, durabilityLines, firstHiveOnPath, linkedWorktreePin, pathAdvice, readDispatcher, } from "./dispatcher.js";
 import { codexConfigPath, codexHiveRegistrations, codexRegistrationProblem, hiveRegistrations, registrationOffer, registrationProblem, } from "./mcpConfig.js";
 import { DEFAULT_DATA_DIR } from "./dataDir.js";
@@ -19,7 +19,7 @@ import { checkoutUpgradeSteps, detectInstallShape, globalUpgradeSteps } from "./
 import { isLowHeadroom, orphanLoginShellDetails, ptyHeadroom } from "./ptys.js";
 import { addProject, agentProjectPin, currentActor, effectiveProjectId, findProjectForCwd, getProjectByPath, gitPrimaryRoot, getProject, listProjects, registeredAncestor, takeRegistrationNotice, } from "./context.js";
 import { ensureHooksFile } from "./hooks.js";
-import { errorMessage, parseTags, registrationNoticeText, withTrailingNewline } from "./result.js";
+import { errorMessage, registrationNoticeText, withTrailingNewline } from "./result.js";
 import { ACTIVE_TIMER_WHERE, dashboardFileContained, describeStall, HELD_REASON_CONVERSATION, HELD_REASON_LEAD_PANE_DEAD, HELD_REASON_UNCLASSIFIABLE_PANE_PREFIX, isUnclassifiablePaneHold, HELD_REASON_UNSUBMITTED_INPUT_PREFIX, isUnsubmittedInputHold, janitor, resolveDashboardFile, transcriptStaleness, wasHeldForPaneReissue, } from "./scheduler.js";
 import { readTurnCount } from "./turnCount.js";
 import { STALL_BOUND_SECONDS } from "./backgroundTasks.js";
@@ -30,7 +30,7 @@ import { asNameClash, buildEnvFlags, closeAgentRow, isReservedAgentName, launchA
 import { adoptableWindow, applyLayout, claimInitialWindow, configureHiveWindow, controlModeFor, createWindow, DEFAULT_LAYOUT, describePaneChoice, ensureSession, findProjectWindow, foreignSocket, isPaneTarget, isViewSessionName, listOwnedWindows, ORPHAN_MIN_AGE_MS, orphanScratchServers, orphansWorthWarningAbout, paneIsAloneInWindow, paneVisibility, panePid, PROCESSES_LAYOUT, processesPaneTitle, processesWindowName, projectWindows, RAW_ATTACH_TMUX_CONFIG, renderAttachCommand, resolveAttachTarget, resolveInTmuxTarget, paneReissued, rowLive, rowLiveProbe, SESSION_PREFIX, appendGlobalHook, globalHooks, replaceGlobalHooks, sessionName, setPaneTitle, shellQuote, shownPaneTitle, makeProcessesWindow, tmux, TMUX_DOC, tmuxSaysNothingThere, tmuxTimeoutOverride, tmuxSocketPath, untrustedTmuxServer, waitForPaneEstablished, windowLayout, } from "./tmux.js";
 import { describeVisibility, processCounts } from "./dashboard.js";
 import { runningCommandRow, runningCommandRows, snapshotProcesses, stopAllProcesses, stopLine, stopProcess, STOP_REASONS, } from "./processes.js";
-import { activeProfile, agentVarKeys, configHash, loadProjectYml, mergedProjectVars, NO_PROFILE, resolveCommandDir, } from "./projectYml.js";
+import { activeProfile, agentVarKeys, BUILT_IN_PROJECT_YML, configHash, loadProjectYml, mergedProjectVars, NO_PROFILE, PROJECT_YML_KEYS, resolveCommandDir, } from "./projectYml.js";
 import { writeProjectPosture } from "./brief.js";
 import { carriesNameFlag, harnessFor, hasTranscriptSignal, paneClassifierFor, transcriptDirFor } from "./harnesses.js";
 import { codexHomeDir, codexInstructionsPhrase, ensureCodexHome, reapCodexHome } from "./codexHome.js";
@@ -38,7 +38,7 @@ import { TRIAGE_MESSAGE } from "./kickoff.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 { COMMENT_COUNT_SQL, getTodoDetail, listTodoSummaries, OPEN_BLOCKERS_SQL, TODO_STATUSES, } from "./tools/todos.js";
+import { getTodoDetail, listTodoSummaries, OPEN_BLOCKERS_SQL, TODO_STATUSES, } from "./tools/todos.js";
 import { createPad, getActivePadByName, listActivePads, overwritePadContent, } from "./tools/pads.js";
 function usage() {
     console.log(`hive — run a crew of Claude Code and Codex workers from one lead session
@@ -311,6 +311,12 @@ function ensureLeadRow(project, command) {
         casExpected: "",
     };
 }
+function reportMigrationResult(result) {
+    if (result.notice)
+        console.error(result.notice);
+    for (const warning of result.warnings)
+        console.error(`! ${warning}`);
+}
 async function cmdLead(argv) {
     const unknownFlag = argv.find((a) => a.startsWith("--") && a !== "--no-dashboard");
     if (unknownFlag !== undefined) {
@@ -324,6 +330,7 @@ async function cmdLead(argv) {
         const project = resolveProject(path, (text) => {
             registrationNotice = text;
         });
+        reportMigrationResult(migrateLegacyConfig());
         const session = sessionName();
         const hooksPath = ensureHooksFile();
         const { config, warnings } = loadProjectYml(project.path);
@@ -387,6 +394,14 @@ async function cmdLead(argv) {
         // actually starts under it) and correct regardless of whether this invocation ends up creating
         // a pane or adopting one. Which home ends up orphaned - this one, or the previous invocation's -
         // is decided after createdPane is known, below.
+        const leadEnv = {
+            HIVE_AGENT_ID: leadActorId,
+            HIVE_AGENT_NAME: LEAD_NAME,
+            HIVE_LEAD: "1",
+            HIVE_DATA_DIR: dataDir,
+            HIVE_PROJECT_LOCK: "",
+            HIVE_PROJECT_PATH: "",
+        };
         let newCodexHomeKey;
         if (leadHarness.needsHome) {
             newCodexHomeKey = randomUUID();
@@ -401,6 +416,7 @@ async function cmdLead(argv) {
                 const home = ensureCodexHome({
                     key: newCodexHomeKey,
                     actorId: leadActorId,
+                    serverEnv: leadEnv,
                     cwd: project.path,
                     brief: renderedPosture ?? "",
                     lead: true,
@@ -425,12 +441,7 @@ async function cmdLead(argv) {
                 (instructionsPhrase ? ` (${instructionsPhrase})` : ""));
         }
         const envFlags = buildEnvFlags({
-            HIVE_AGENT_ID: leadActorId,
-            HIVE_AGENT_NAME: LEAD_NAME,
-            HIVE_LEAD: "1",
-            HIVE_DATA_DIR: dataDir,
-            HIVE_PROJECT_LOCK: "",
-            HIVE_PROJECT_PATH: "",
+            ...leadEnv,
             ...(newCodexHomeKey ? { CODEX_HOME: codexHomeDir(newCodexHomeKey) } : {}),
         });
         const { leadPane, leadWindow, createdPane } = withWindowClaim(() => {
@@ -553,7 +564,7 @@ const HIVE_YML_TEMPLATE = `# hive project config. Read by \`hive lead\` from the
 # Commands defined here run only after a one-time interactive approval,
 # and re-require it whenever they change.
 
-placement: split                # placement for workers and visible processes: split (panes) or
+# placement: split              # placement for workers and visible processes: split (panes) or
                                 # window (tabs)
 
 # layout: main-vertical         # pane arrangement for placement: split.
@@ -573,11 +584,6 @@ placement: split                # placement for workers and visible processes: s
 
 # dashboard: true               # write .hive/dashboard.html (default: false)
 
-# review_tags: [from-review]    # todo tags \`hive doctor\` counts as review findings and
-                                # reports as triaged (has a comment, completed, or archived)
-                                # or untriaged. A tag also matches its own suffixed rounds.
-                                # Absent means it tracks none.
-
 # vars:                         # substituted into the profile runbook
 #   repo: owner/name            # {{repo}}
 #   ticket_prefix: DEVX         # sections needing it drop when it is unset
@@ -729,6 +735,7 @@ async function cmdInit(argv) {
     rejectUnknownFlags("init", parsed, "--profile <name> and --no-profile");
     requireFlagValues("init", parsed);
     const noProfile = parsed.flags.has("--no-profile");
+    const profileFlag = noProfile || parsed.values.has("--profile");
     const path = parsed.positional[0];
     let chosen = noProfile ? NO_PROFILE : null;
     if (parsed.values.has("--profile")) {
@@ -789,21 +796,32 @@ async function cmdInit(argv) {
     if (path == null && newlyRegistered)
         console.error(registrationNoticeText(project));
     const ymlPath = join(project.path, "hive.yml");
-    const already = existsSync(ymlPath) ? loadProjectYml(project.path).config?.profile ?? null : null;
+    const ymlExists = existsSync(ymlPath);
+    const loaded = loadProjectYml(project.path);
+    const projectProfileSet = ymlExists && loaded.sources.profile === "project";
+    const already = projectProfileSet ? loaded.config?.profile ?? null : null;
+    let inheritedProfile = false;
     if (already != null) {
         if (chosen != null && chosen !== already) {
             console.log(`- hive.yml: already set to "profile: ${already}"; edit it by hand to change it`);
         }
         chosen = already;
     }
+    else if (projectProfileSet && !profileFlag) {
+        chosen = null;
+    }
+    else if (!projectProfileSet && !profileFlag && loaded.config?.profile != null) {
+        chosen = loaded.config.profile;
+        inheritedProfile = loaded.sources.profile === "global";
+    }
     else if (chosen == null && process.stdin.isTTY && process.stdout.isTTY) {
         chosen = await askForProfile();
     }
-    if (!existsSync(ymlPath)) {
-        writeFileSync(ymlPath, HIVE_YML_TEMPLATE + (chosen ? `\nprofile: ${chosen}\n` : ""));
+    if (!ymlExists) {
+        writeFileSync(ymlPath, HIVE_YML_TEMPLATE + (chosen && !inheritedProfile ? `\nprofile: ${chosen}\n` : ""));
         console.log(`- hive.yml: created${chosen ? ` with profile: ${chosen}` : ""}`);
     }
-    else if (already == null && chosen != null) {
+    else if (already == null && chosen != null && !inheritedProfile) {
         writeProfileKey(ymlPath, chosen);
         console.log(`- hive.yml: added profile: ${chosen}`);
     }
@@ -1462,7 +1480,6 @@ const verboseInfo = (_check, label, ...lines) => {
     if (doctorVerbose)
         report("info", label, lines);
 };
-const isReviewFindingTag = (bases, tag) => bases.some((base) => tag === base || tag.startsWith(`${base}-`));
 function cmdUpgrade(argv) {
     const parsed = parseArgs(argv, { flags: ["--check", "--run"] });
     rejectUnknownFlags("upgrade", parsed, "--check, --run");
@@ -1576,6 +1593,7 @@ function cmdSetup(argv) {
         console.log("Or pin this worktree anyway: hive setup --force");
         process.exit(1);
     }
+    reportMigrationResult(migrateLegacyConfig());
     mkdirSync(dir, { recursive: true });
     writeFileSync(file, dispatcherScript(node, cli));
     chmodSync(file, 0o755);
@@ -2023,6 +2041,33 @@ function reportStalledWorkers(projectId) {
             "worker does not reliably remember what it was doing (.claude/rules/worker-state.md).");
     }
 }
+function reportEffectiveConfig(loaded) {
+    const config = loaded.config ?? BUILT_IN_PROJECT_YML;
+    for (const key of PROJECT_YML_KEYS) {
+        info(`config ${key}`, `${JSON.stringify(config[key])} (source: ${loaded.sources[key] ?? "built-in"})`);
+    }
+    const varKeys = new Set(Object.keys(config.vars));
+    for (const key of Object.keys(loaded.sources)) {
+        if (key.startsWith("vars."))
+            varKeys.add(key.slice("vars.".length));
+    }
+    for (const key of [...varKeys].sort()) {
+        const value = Object.hasOwn(config.vars, key) ? config.vars[key] : null;
+        info(`config vars.${key}`, `${JSON.stringify(value)} (source: ${loaded.sources[`vars.${key}`] ?? "built-in"})`);
+    }
+    const { mode: attachMode, source: attachSource } = loaded.attach;
+    info("attach mode", attachSource === "env"
+        ? `${attachMode} (HIVE_ATTACH_MODE override; testing only, does not reach auto-attach; source: env)`
+        : attachSource === "global"
+            ? `${attachMode} (set with \`hive setup --attach\`; source: global)`
+            : `${attachMode} (default; set with \`hive setup --attach\`; source: built-in)`);
+    const { value: autoAttach, source: autoAttachSource } = loaded.autoAttach;
+    info("auto-attach", autoAttachSource === "env"
+        ? `${autoAttach} (HIVE_AUTO_ATTACH override; testing only; source: env)`
+        : autoAttachSource === "global"
+            ? `${autoAttach} (set with \`hive setup --auto-attach\`; source: global)`
+            : `${autoAttach} (default; set with \`hive setup --auto-attach\`; source: built-in)`);
+}
 function cmdDoctor(argv) {
     const strict = argv.includes("--strict");
     doctorVerbose = argv.includes("--verbose");
@@ -2032,6 +2077,7 @@ function cmdDoctor(argv) {
         console.error(`hive doctor: unknown argument "${unknown}". Flags are --strict and --verbose.`);
         process.exit(1);
     }
+    reportMigrationResult(migrateLegacyConfig());
     let failures = 0;
     const fail = (label, ...lines) => {
         failures += 1;
@@ -2089,9 +2135,15 @@ function cmdDoctor(argv) {
     reportSessionInterpreters();
     reportCodexHomes(here?.id ?? null);
     const loaded = loadProjectYml(here?.path ?? process.cwd());
-    for (const w of loaded.warnings)
-        warn("hive.yml", w);
+    for (const w of loaded.warnings) {
+        const qualified = /^([^:]+): ([\s\S]*)$/.exec(w);
+        if (qualified)
+            warn(qualified[1], qualified[2]);
+        else
+            warn("hive.yml", w);
+    }
     const config = loaded.config;
+    reportEffectiveConfig(loaded);
     const profile = activeProfile(config);
     if (here && existsSync(join(here.path, ".claude", "dashboard", "index.html"))) {
         info("dashboard", "an older hive wrote .claude/dashboard/index.html; hive now writes .hive/dashboard.html. Delete the old file and directory.");
@@ -2399,20 +2451,7 @@ function cmdDoctor(argv) {
         return health.message;
     });
     {
-        const { value, source } = resolvedAutoAttach();
-        info("auto-attach", source === "env"
-            ? `${value} (HIVE_AUTO_ATTACH override; testing only)`
-            : source === "config"
-                ? `${value} (set with \`hive setup --auto-attach\`)`
-                : `${value} (default; set with \`hive setup --auto-attach\`)`);
-    }
-    {
-        const { mode, source } = resolvedAttachMode();
-        info("attach mode", source === "env"
-            ? `${mode} (HIVE_ATTACH_MODE override; testing only, does not reach auto-attach)`
-            : source === "config"
-                ? `${mode} (set with \`hive setup --attach\`)`
-                : `${mode} (default; set with \`hive setup --attach\`)`);
+        const { mode } = loaded.attach;
         if (mode === "raw") {
             try {
                 const owned = tmux("list-windows", "-a", "-F", "#{session_name}:#{window_id}\t#{@hive-owned}")
@@ -2432,8 +2471,7 @@ function cmdDoctor(argv) {
                         `monitor-bell ${option("-w", "monitor-bell")}`);
                 }
             }
-            catch {
-            }
+            catch { }
         }
     }
     if (here) {
@@ -2444,25 +2482,6 @@ function cmdDoctor(argv) {
             info("processes", `${running} running (${located}), ${notStarted} defined not running`);
         }
     }
-    const reviewTags = config?.review_tags ?? [];
-    // Never name hive.yml here: doctor stays silent about that file when nothing is wrong with it
-    // (test/config-warnings.test.mjs), and this line prints on every ordinary run.
-    if (here && reviewTags.length === 0) {
-        info("review findings", "no review_tags configured; nothing to track.");
-    }
-    else if (here) {
-        const findings = db
-            .prepare(`SELECT id, tags, status, archived_at, ${COMMENT_COUNT_SQL} AS comment_count
-           FROM todos t WHERE t.project_id = ?`)
-            .all(here.id).filter((t) => parseTags(t.tags).some((tag) => isReviewFindingTag(reviewTags, tag)));
-        const untriaged = findings.filter((t) => t.comment_count === 0 && t.status !== "completed" && t.archived_at == null);
-        info("review findings", `${findings.length} tracked (tagged ${reviewTags.join(", ")}): ` +
-            `${findings.length - untriaged.length} triaged, ${untriaged.length} untriaged.`);
-        if (untriaged.length > 0) {
-            warn("review findings", `${untriaged.length} untriaged: ${untriaged.map((t) => `todo ${t.id}`).join(", ")}.`, "Triage means a comment recording a decision, or completed/archived - comment with the outcome " +
-                "(dispatched, rejected and why, etc.) on each before closing this wave.");
-        }
-    }
     const problems = failures + (strict ? gatingWarnings : 0);
     const tail = strict
         ? `${warnings} warning(s), ${gatingWarnings} promoted by --strict.`

package/dist/codexHome.js

@@ -172,6 +172,21 @@ function localOverrideHeading(path) {
 export function codexInstructionsPhrase(layers) {
     return layers.length ? `instructions: ${layers.join(", ")}` : undefined;
 }
+// Empty values are dropped: an unset variable and an empty one read the same to the server.
+function mcpEnvTable(env) {
+    const entries = Object.entries(env).filter(([k, v]) => k.startsWith("HIVE_") && v !== "");
+    return [`[mcp_servers.hive.env]`, ...entries.map(([k, v]) => `${k} = ${tomlString(v)}`), ""];
+}
+// Resume reuses a home written at spawn, so its env table can predate a rename or this fix itself.
+export function refreshCodexMcpEnv(key, env) {
+    const path = join(codexHomeDir(key), "config.toml");
+    if (!existsSync(path))
+        return;
+    const table = mcpEnvTable(env).join("\n") + "\n";
+    const current = readFileSync(path, "utf8");
+    const existing = /^\[mcp_servers\.hive\.env\]\n(?:(?!\[).*\n)*/m;
+    writeFileSync(path, existing.test(current) ? current.replace(existing, table) : current + "\n" + table);
+}
 // Must be written before any [section] header, or TOML nests it inside whichever table precedes it -
 // accepted silently, delivered to nobody. See tmux-and-panes.md, "the brief-delivery TOML trap".
 function configToml(input) {
@@ -190,28 +205,27 @@ function configToml(input) {
         `trust_level = "trusted"`,
         "",
         `[mcp_servers.hive]`,
+        `default_tools_approval_mode = "approve"`,
         `command = ${tomlString(input.nodeBin)}`,
         `args = [${tomlString(input.indexJs)}]`,
         "",
-        `[mcp_servers.hive.env]`,
-        `HIVE_AGENT_ID = ${tomlString(input.actorId)}`,
-        "",
+        ...mcpEnvTable(input.serverEnv),
         // Only accepted under [tui]; a top-level status_line is an unknown field to --strict-config.
         `[tui]`,
         `status_line = ${tomlStringArray(input.statusLine)}`,
     ].join("\n") + "\n");
 }
 // Pure on purpose: agent_resume reuses it against an EXISTING home, so it must not write.
-export function codexLaunchArgs(cwd) {
+export function codexLaunchArgs(cwd, readOnly = false) {
     const root = gitPrimaryRoot(cwd);
     const commonDir = root ? join(root, ".git") : null;
     return [
         // Declining review of hive's OWN generated hooks.json, not a stranger's - see the reference.
         "--dangerously-bypass-hook-trust",
         // NOT parity with claude's posture, and --add-dir is NOT containment - see the reference.
-        "--dangerously-bypass-approvals-and-sandbox",
+        ...(readOnly ? ["--sandbox", "read-only", "-c", 'approval_policy="never"'] : ["--dangerously-bypass-approvals-and-sandbox"]),
         // Inert alongside the flag above, kept because its value seeds [projects.<root>] trust.
-        ...(commonDir ? ["--add-dir", commonDir] : []),
+        ...(commonDir && !readOnly ? ["--add-dir", commonDir] : []),
     ];
 }
 export function ensureCodexHooksFile(key, options) {
@@ -287,11 +301,12 @@ export function ensureCodexHome(input) {
         projectRoot,
         nodeBin: process.execPath,
         indexJs,
-        actorId: input.actorId,
+        serverEnv: { ...input.serverEnv, HIVE_AGENT_ID: input.actorId },
         statusLine,
+        readOnly: input.readOnly,
         modelContextWindow,
         modelAutoCompactTokenLimit,
     }));
     const instructionLayers = [...(hasGlobal ? ["global"] : []), ...(localOverride ? ["local"] : [])];
-    return { extraArgs: codexLaunchArgs(input.cwd), hooksWired, instructionLayers };
+    return { extraArgs: codexLaunchArgs(input.cwd, input.readOnly), hooksWired, instructionLayers };
 }

package/dist/config.js

@@ -1,72 +1,19 @@
-import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
-import { storeDir } from "./dataDir.js";
-export const ATTACH_MODES = ["auto", "raw", "control"];
-export function isAttachMode(value) {
-    return ATTACH_MODES.includes(value);
-}
-export const AUTO_ATTACH_MODES = ["auto", "on", "off"];
-export function isAutoAttach(value) {
-    return AUTO_ATTACH_MODES.includes(value);
-}
-function configPath() {
-    return join(storeDir(), "config.json");
-}
-function readConfig() {
-    const path = configPath();
-    let raw;
-    try {
-        raw = readFileSync(path, "utf8");
-    }
-    catch {
-        return {};
-    }
-    try {
-        const parsed = JSON.parse(raw);
-        return parsed !== null && typeof parsed === "object" ? parsed : {};
-    }
-    catch {
-        return {};
-    }
-}
-function envAttachMode() {
-    const value = process.env.HIVE_ATTACH_MODE;
-    return isAttachMode(value) ? value : null;
-}
-function envAutoAttach() {
-    const value = process.env.HIVE_AUTO_ATTACH;
-    if (value === "0")
-        return "off";
-    return isAutoAttach(value) ? value : null;
-}
+import { readGlobalConfig, resolveAttachSetting, writeGlobalConfigKey } from "./globalConfig.js";
+export { ATTACH_MODES, AUTO_ATTACH_MODES, isAttachMode, isAutoAttach, migrateLegacyConfig, } from "./globalConfig.js";
 export function resolvedAttachMode() {
-    const fromEnv = envAttachMode();
-    if (fromEnv)
-        return { mode: fromEnv, source: "env" };
-    const value = readConfig().attach;
-    return isAttachMode(value) ? { mode: value, source: "config" } : { mode: "auto", source: "detection" };
+    const global = readGlobalConfig();
+    return resolveAttachSetting("attach", global.root, global.legacy, global.warnings);
 }
 export function attachMode() {
     return resolvedAttachMode().mode;
 }
 export function resolvedAutoAttach() {
-    const fromEnv = envAutoAttach();
-    if (fromEnv)
-        return { value: fromEnv, source: "env" };
-    const value = readConfig().autoAttach;
-    return isAutoAttach(value)
-        ? { value, source: "config" }
-        : { value: "auto", source: "detection" };
+    const global = readGlobalConfig();
+    return resolveAttachSetting("autoAttach", global.root, global.legacy, global.warnings);
 }
 export function setAttachMode(mode) {
-    const config = readConfig();
-    config.attach = mode;
-    mkdirSync(storeDir(), { recursive: true });
-    writeFileSync(configPath(), `${JSON.stringify(config, null, 2)}\n`);
+    writeGlobalConfigKey("attach", mode);
 }
 export function setAutoAttach(value) {
-    const config = readConfig();
-    config.autoAttach = value;
-    mkdirSync(storeDir(), { recursive: true });
-    writeFileSync(configPath(), `${JSON.stringify(config, null, 2)}\n`);
+    writeGlobalConfigKey("autoAttach", value);
 }

package/dist/db.js

@@ -368,6 +368,10 @@ ALTER TABLE wake_block_notices RENAME COLUMN timer_id TO wake_id;
 CREATE INDEX idx_wakes_active ON wakes(project_id, kind)
   WHERE cancelled_at IS NULL;
 CREATE INDEX idx_wakes_parent ON wakes(parent_wake_id) WHERE parent_wake_id IS NOT NULL;
+`,
+    `
+ALTER TABLE agents ADD COLUMN model TEXT;
+ALTER TABLE agents ADD COLUMN extra_args TEXT;
 `,
 ];
 export function storeSchemaAhead(database) {
@@ -392,12 +396,17 @@ function retryOnBusy(fn, label) {
         }
         catch (e) {
             const busy = e instanceof Error && (e.code === "SQLITE_BUSY" || /database is locked/.test(e.message));
-            if (!busy || attempt >= MIGRATE_LOCK_MAX_ATTEMPTS) {
+            if (busy && attempt < MIGRATE_LOCK_MAX_ATTEMPTS)
+                continue;
+            if (busy) {
                 console.error(`hive: ${label} did not complete after ${attempt} attempt(s): the store's write lock never freed ` +
                     "up. Another hive process is likely still applying a migration (or is stuck); check for a " +
                     `wedged hive process and try again. Underlying error: ${errorMessage(e)}`);
-                process.exit(1);
             }
+            else {
+                console.error(`hive: ${label} failed: ${errorMessage(e)}`);
+            }
+            process.exit(1);
         }
     }
 }
@@ -424,7 +433,15 @@ export function migrate() {
             const version = i + 1;
             if (applied.has(version))
                 return;
-            db.exec(sql);
+            try {
+                db.exec(sql);
+            }
+            catch (e) {
+                const wrapped = new Error(`migration ${version}: ${errorMessage(e)}`);
+                if (e instanceof Error)
+                    wrapped.code = e.code;
+                throw wrapped;
+            }
             db.prepare("INSERT INTO migrations (version) VALUES (?)").run(version);
         });
     });