@herdingchats/friday 0.1.598 → 0.1.609

package/herd.mjs

@@ -18,7 +18,7 @@ var __export = (target, all) => {
 var define_HERD_PACKAGE_default;
 var init_define_HERD_PACKAGE = __esm({
   "<define:HERD_PACKAGE>"() {
-    define_HERD_PACKAGE_default = { version: "0.1.598", gitHead: "7d8c736673ed8d8010c9b9915d30f42b5733edf9" };
+    define_HERD_PACKAGE_default = { version: "0.1.609", gitHead: "cfba1790271c8df777ce206f2e53c6b987e94520" };
   }
 });
 
@@ -3205,7 +3205,7 @@ import { fileURLToPath as fileURLToPath3 } from "node:url";
 // src/friday/main.ts
 init_define_HERD_PACKAGE();
 init_src();
-import { spawn as spawn6 } from "node:child_process";
+import { spawn as spawn7 } from "node:child_process";
 import { existsSync as existsSync11, readFileSync as readFileSync10 } from "node:fs";
 import { homedir as homedir4 } from "node:os";
 import { dirname as dirname10, join as join14 } from "node:path";
@@ -3438,7 +3438,7 @@ var HERD_FLAGS = {
   persona: []
 };
 var FRIDAY_FLAGS = {
-  start: ["--agents", "--config"],
+  start: ["--agents", "--config", "--verbose"],
   stop: [],
   status: [],
   logs: ["--follow", "-f", "-n"]
@@ -3517,17 +3517,64 @@ async function runLogout() {
 
 // src/config.ts
 init_define_HERD_PACKAGE();
-import { execFileSync as execFileSync3 } from "node:child_process";
+import { execFileSync as execFileSync4 } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import { existsSync as existsSync3, mkdirSync as mkdirSync4, readFileSync as readFileSync4, realpathSync as realpathSync2, writeFileSync as writeFileSync3 } from "node:fs";
 import { homedir as homedir3, hostname } from "node:os";
 import { basename, dirname as dirname4, join as join6, resolve } from "node:path";
 import { z as z18 } from "zod";
 
+// src/login-shell.ts
+init_define_HERD_PACKAGE();
+import { execFileSync, spawn as spawn2 } from "node:child_process";
+var AWAY_FROM_TERMINAL = { detached: true, killSignal: "SIGKILL" };
+function verbose(line2) {
+  if (process.env.HERD_VERBOSE) process.stderr.write(`[friday] ${line2}
+`);
+}
+function loginShellSync(shell, args, { env, timeoutMs }) {
+  verbose(`running ${shell} ${args.join(" ")}, detached from the terminal`);
+  try {
+    return execFileSync(shell, args, {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"],
+      env,
+      timeout: timeoutMs,
+      ...AWAY_FROM_TERMINAL
+    });
+  } catch (error) {
+    verbose(`${shell} ${args.join(" ")} failed: ${error.message.split("\n")[0]}`);
+    return null;
+  }
+}
+function loginShell(shell, args, { env, timeoutMs }) {
+  verbose(`running ${shell} ${args.join(" ")}, detached from the terminal`);
+  return new Promise((resolve7) => {
+    let output2 = "";
+    let child;
+    try {
+      child = spawn2(shell, args, { env, stdio: ["ignore", "pipe", "ignore"], detached: true });
+    } catch {
+      resolve7("");
+      return;
+    }
+    const timer = setTimeout(() => child.kill("SIGKILL"), timeoutMs);
+    child.stdout?.on("data", (chunk) => {
+      output2 += chunk.toString("utf8");
+    });
+    const done = () => {
+      clearTimeout(timer);
+      resolve7(output2);
+    };
+    child.on("error", done);
+    child.on("close", done);
+  });
+}
+
 // src/machine-facts.ts
 init_define_HERD_PACKAGE();
 init_src();
-import { execFileSync } from "node:child_process";
+import { execFileSync as execFileSync2 } from "node:child_process";
 import { createHash as createHash2 } from "node:crypto";
 import { readFileSync as readFileSync2, rmSync as rmSync2, statSync as statSync2, writeFileSync as writeFileSync2 } from "node:fs";
 import { dirname, join as join3 } from "node:path";
@@ -3709,7 +3756,7 @@ var USAGE_TAIL_BYTES = 256 * 1024;
 function latestCodexUsage(home = codexHome()) {
   const newest = newestRollout(join2(home, "sessions"));
   if (!newest) return null;
-  let tail2;
+  let tail3;
   try {
     const size = statSync(newest).size;
     const start = Math.max(0, size - USAGE_TAIL_BYTES);
@@ -3720,11 +3767,11 @@ function latestCodexUsage(home = codexHome()) {
     } finally {
       closeSync(fd);
     }
-    tail2 = buffer.toString("utf8");
+    tail3 = buffer.toString("utf8");
   } catch {
     return null;
   }
-  const lines = tail2.split("\n");
+  const lines = tail3.split("\n");
   for (let index = lines.length - 1; index >= 0; index -= 1) {
     const line2 = lines[index];
     const event2 = parseRecord(line2);
@@ -3770,7 +3817,7 @@ function chosenClis(clis, config) {
 }
 var runCommand = (command, args) => {
   try {
-    return execFileSync(command, args, {
+    return execFileSync2(command, args, {
       encoding: "utf8",
       stdio: ["ignore", "pipe", "ignore"],
       timeout: 1e4
@@ -3825,7 +3872,7 @@ async function loadHerdConfig(path = herdConfigPath()) {
 // src/repo-store.ts
 init_define_HERD_PACKAGE();
 init_src();
-import { execFile, execFileSync as execFileSync2 } from "node:child_process";
+import { execFile, execFileSync as execFileSync3 } from "node:child_process";
 import { randomBytes as randomBytes2 } from "node:crypto";
 import {
   existsSync as existsSync2,
@@ -3843,7 +3890,7 @@ import { promisify } from "node:util";
 
 // src/local-files.ts
 init_define_HERD_PACKAGE();
-import { spawn as spawn2 } from "node:child_process";
+import { spawn as spawn3 } from "node:child_process";
 import { constants, copyFileSync, existsSync, lstatSync, mkdirSync as mkdirSync2 } from "node:fs";
 import { dirname as dirname2, join as join4 } from "node:path";
 var INCLUDE_FILE = ".worktreeinclude";
@@ -3861,7 +3908,7 @@ var HEAVY_FOLDERS = /* @__PURE__ */ new Set([
 var MAX_COPIED = 500;
 function gitOut(env, cwd, args, input = "") {
   return new Promise((resolve7) => {
-    const child = spawn2("git", ["-C", cwd, ...args], {
+    const child = spawn3("git", ["-C", cwd, ...args], {
       env: { ...env ?? process.env, GIT_TERMINAL_PROMPT: "0" },
       stdio: ["pipe", "pipe", "ignore"]
     });
@@ -3872,6 +3919,8 @@ function gitOut(env, cwd, args, input = "") {
     });
     child.on("error", () => resolve7(""));
     child.on("close", () => resolve7(out));
+    child.stdin.on("error", () => {
+    });
     child.stdin.end(input);
   });
 }
@@ -3936,7 +3985,7 @@ async function git(env, cwd, ...args) {
     throw new StoreError(gitError(error));
   }
 }
-var gitSync = (cwd, ...args) => execFileSync2("git", ["-C", cwd, ...args], {
+var gitSync = (cwd, ...args) => execFileSync3("git", ["-C", cwd, ...args], {
   encoding: "utf8",
   stdio: ["ignore", "pipe", "pipe"],
   env: quiet(void 0)
@@ -4289,7 +4338,7 @@ function workTreeOf(folder) {
   let dir = resolve(folder);
   while (!existsSync3(dir) && dirname4(dir) !== dir) dir = dirname4(dir);
   try {
-    const top = execFileSync3("git", ["-C", dir, "rev-parse", "--show-toplevel"], {
+    const top = execFileSync4("git", ["-C", dir, "rev-parse", "--show-toplevel"], {
       encoding: "utf8",
       stdio: ["ignore", "pipe", "ignore"]
     }).trim();
@@ -4318,7 +4367,7 @@ function convosHome(root = machineRoot()) {
 var chooseConvos = (root, preferred, inWorkTree) => inWorkTree(preferred) ? join6(root, ".friday_convos") : preferred;
 function describeRepo(path) {
   const full = resolve(path);
-  const git4 = (...args) => execFileSync3("git", ["-C", full, ...args], {
+  const git4 = (...args) => execFileSync4("git", ["-C", full, ...args], {
     encoding: "utf8",
     stdio: ["ignore", "pipe", "pipe"]
   }).trim();
@@ -4391,7 +4440,7 @@ function describeCli(name, version) {
 function findClis() {
   let version;
   try {
-    const output2 = execFileSync3("claude", ["--version"], {
+    const output2 = execFileSync4("claude", ["--version"], {
       encoding: "utf8",
       stdio: ["ignore", "pipe", "ignore"],
       env: terminalEnv({}),
@@ -4430,16 +4479,7 @@ function findVersion(command, pattern, run4, shell) {
   return pattern.exec(output2)?.[1] ?? null;
 }
 function runQuietly(command, args) {
-  try {
-    return execFileSync3(command, args, {
-      encoding: "utf8",
-      stdio: ["ignore", "pipe", "ignore"],
-      env: terminalEnv({}),
-      timeout: 15e3
-    });
-  } catch {
-    return null;
-  }
+  return loginShellSync(command, args, { env: terminalEnv({}), timeoutMs: 15e3 });
 }
 function terminalEnv(extra) {
   const env = {};
@@ -5529,7 +5569,7 @@ function pickInTerminal(choices, input = process.stdin, output2 = process.stdout
 
 // src/friday/service.ts
 init_define_HERD_PACKAGE();
-import { spawn as spawn3 } from "node:child_process";
+import { spawn as spawn4 } from "node:child_process";
 import { existsSync as existsSync7, mkdirSync as mkdirSync8, openSync as openSync3, readFileSync as readFileSync7, rmSync as rmSync7, writeFileSync as writeFileSync7 } from "node:fs";
 import { userInfo } from "node:os";
 import { dirname as dirname8, join as join10, win32 } from "node:path";
@@ -5679,7 +5719,7 @@ function spawnInBackground(command, env, log) {
   mkdirSync8(dirname8(log), { recursive: true });
   const out = openSync3(log, "a");
   const [program = process.execPath, ...args] = command;
-  spawn3(program, args, {
+  spawn4(program, args, {
     detached: true,
     // On Windows, a detached process otherwise opens a console window of its own.
     windowsHide: true,
@@ -5771,9 +5811,35 @@ async function retireOldDaemon(paths, { home, run: run4 }) {
   return removed;
 }
 
+// src/friday/verbose.ts
+init_define_HERD_PACKAGE();
+var VERBOSE_ENV = "HERD_VERBOSE";
+var began = Date.now();
+function verbose2(line2) {
+  if (!process.env[VERBOSE_ENV]) return;
+  const seconds = ((Date.now() - began) / 1e3).toFixed(1);
+  process.stderr.write(`[friday +${seconds}s] ${line2}
+`);
+}
+var tail = (text4) => text4.trim().split("\n").slice(-3).join(" | ");
+function verboseExec(run4) {
+  return async (command, args, options) => {
+    if (!process.env[VERBOSE_ENV]) return run4(command, args, options);
+    const shown = [command, ...args].join(" ");
+    verbose2(`running ${shown}`);
+    const started = Date.now();
+    const ran = await run4(command, args, options);
+    const took = `${Date.now() - started}ms`;
+    verbose2(
+      ran.status === 0 ? `ran ${shown} (${took})` : `${shown} exited ${ran.status} (${took})${ran.stderr.trim() ? `: ${tail(ran.stderr)}` : ""}`
+    );
+    return ran;
+  };
+}
+
 // src/friday/versions.ts
 init_define_HERD_PACKAGE();
-import { spawn as spawn4 } from "node:child_process";
+import { spawn as spawn5 } from "node:child_process";
 import {
   existsSync as existsSync9,
   mkdirSync as mkdirSync9,
@@ -5790,7 +5856,7 @@ import { basename as basename2, dirname as dirname9, join as join12 } from "node
 var exec = (command, args, options = {}) => new Promise((resolve7) => {
   let stdout = "";
   let stderr = "";
-  const child = spawn4(command, args, {
+  const child = spawn5(command, args, {
     cwd: options.cwd,
     env: options.env ?? process.env,
     stdio: ["ignore", "pipe", "pipe"]
@@ -5991,6 +6057,9 @@ async function runStart(options) {
   const existing = readRoot2(paths);
   const wanted = chooseRoot(options.cwd, options.home);
   const running = runningSupervisor(paths);
+  verbose2(
+    `root is ${existing ?? "not set"}, this folder makes it ${wanted}, ${running ? `supervisor running at version ${running.version}` : "no supervisor running"}, service ${options.serviceKind}`
+  );
   let moving = false;
   if (existing && real(existing) !== real(wanted)) {
     print(`This machine's root is ${existing}, which holds the repos Friday works on.`);
@@ -6024,6 +6093,7 @@ async function runStart(options) {
     );
   }
   if ((options.platform ?? process.platform) === "linux") {
+    verbose2("checking the build tools node-pty needs");
     const missing = await missingBuildTools(run4);
     if (missing.length > 0) {
       throw new StartError(
@@ -6034,8 +6104,10 @@ async function runStart(options) {
   if (!options.signedIn()) {
     print("Signing in through your browser.");
     await options.signIn();
-  }
+    verbose2("signed in");
+  } else verbose2("already signed in");
   const asked = await chooseAndAsk(options, print);
+  verbose2("looking for a daemon set up the old way");
   const retired = await retireOldDaemon(paths, { home: options.home, run: run4 });
   if (retired.length > 0)
     print(
@@ -6052,7 +6124,9 @@ async function runStart(options) {
   }
   mkdirSync10(root, { recursive: true });
   writeRoot(paths, root);
+  verbose2(`installing the ${service.kind} service`);
   const changed = await service.install();
+  verbose2(`${changed ? "service changed" : "service unchanged"}, starting it`);
   await service.start(changed || moving);
   print(
     `Friday is running from ${root}, version ${currentVersion(paths)}, ${service.kind === "launchd" ? "and starts whenever you log in" : service.kind === "systemd" ? "and starts whenever you log in, as a systemd user service" : "in the background"}.`
@@ -6077,13 +6151,18 @@ async function stopped(options) {
 }
 async function chooseAndAsk(options, print) {
   if (!options.agents) return null;
+  verbose2(
+    options.agents.ask ? "asking which agents this machine runs" : "reading the saved agents"
+  );
   const chosen = await chooseAgents(options.agents, print);
+  verbose2(`agents: ${chosen ? chosen.join(", ") || "none" : "unchanged"}`);
   if (!chosen) return null;
   if (!options.agents.ask && !options.agents.given) return null;
   return { chosen, since: askToActivate(options.paths.herdHome) };
 }
 async function waitForAgents(options, asked, print) {
   if (!options.agents || !asked || asked.chosen.length === 0) return;
+  verbose2(`waiting for ${asked.chosen.join(", ")} to activate`);
   await awaitActivations(
     { ...options.agents, herdHome: options.paths.herdHome },
     asked.chosen,
@@ -6095,6 +6174,7 @@ var machineDone = (status2) => !status2.steps.some((step) => step.id === "machin
 async function printSetup(options, print, { waitForMachine = false } = {}) {
   const read = options.setup;
   if (!read) return;
+  verbose2("reading the setup checklist");
   const pollMs = options.setupPollMs ?? SETUP_POLL_MS;
   const deadline = Date.now() + (waitForMachine ? options.setupWaitMs ?? SETUP_WAIT_MS : 0);
   let last = null;
@@ -6121,6 +6201,7 @@ function defaultService(options) {
 async function ensureInstalled(options, print) {
   const { paths, version } = options;
   const current = currentVersion(paths);
+  verbose2(`installed version is ${current ?? "none"}`);
   if (current && !await versionRuns(paths.current, current, options.run)) return;
   if (version === "dev" && !options.install?.spec) {
     throw new StartError(
@@ -6137,7 +6218,7 @@ async function ensureInstalled(options, print) {
 // src/friday/supervisor.ts
 init_define_HERD_PACKAGE();
 init_src();
-import { spawn as spawn5 } from "node:child_process";
+import { spawn as spawn6 } from "node:child_process";
 import {
   closeSync as closeSync3,
   existsSync as existsSync10,
@@ -6232,7 +6313,7 @@ var Supervisor = class {
     const out = openSync4(daemonLog, "a");
     const [program = process.execPath, ...args] = this.daemonCommand();
     const startedAt = Date.now();
-    const child = spawn5(program, args, { stdio: ["ignore", out, out], env: process.env });
+    const child = spawn6(program, args, { stdio: ["ignore", out, out], env: process.env });
     closeSync3(out);
     this.daemon = child;
     this.status.daemonPid = child.pid ?? null;
@@ -6370,7 +6451,7 @@ Usage: ${FRIDAY_COMMAND} <command>
               again. Run in another folder, it offers to move the root there. --config asks
               about the agents again, and --agents claude=lot,codex=little sets their shares
               without asking: off, little, some or lot, where a bare name is some and one
-              left out off
+              left out off. --verbose says each step and command on stderr as it goes
   stop        Stop the daemon until you log in again, or run start again
   status      Whether the daemon is running, which version, and its root
   logs [-f]   Show the daemon's latest log lines. -f keeps following them
@@ -6430,16 +6511,20 @@ async function friday(args, deps = defaults()) {
         deps.print(HERD_VERSION);
         return 0;
       case "start": {
+        if (rest.includes("--verbose")) process.env[VERBOSE_ENV] = "1";
         const given = agentsFlag(rest);
+        verbose2(
+          `friday ${HERD_VERSION} on Node ${process.version}, ${process.platform}, in ${deps.cwd}, with ${process.stdin.isTTY && process.stdout.isTTY ? "a terminal" : "no terminal"}`
+        );
         return await runStart({
           paths: deps.paths,
           cwd: deps.cwd,
           home: deps.home,
           version: HERD_VERSION,
-          run: deps.run,
+          run: verboseExec(deps.run),
           signedIn: () => isLocal(apiUrl()) || readCredentials() !== null,
           signIn: () => login(openBrowser),
-          serviceKind: deps.serviceKind ?? await detectService(deps.run),
+          serviceKind: deps.serviceKind ?? await detectService(verboseExec(deps.run)),
           env: passedEnv(),
           print: deps.print,
           setup: fetchSetup,
@@ -6449,7 +6534,12 @@ async function friday(args, deps = defaults()) {
             // The choice lives in herd.config.ts, so it's asked for only before there is one, or
             // with --config.
             ask: rest.includes("--config") || !existsSync11(herdConfigIn(deps.paths.herdHome)),
-            installed: async () => installedAgents(),
+            installed: async () => {
+              verbose2("looking for installed agents");
+              const found = installedAgents();
+              verbose2(`found ${found.length > 0 ? found.join(", ") : "no agents"}`);
+              return found;
+            },
             load: () => loadHerdConfig(herdConfigIn(deps.paths.herdHome)),
             configPath: herdConfigIn(deps.paths.herdHome),
             pick: (choices) => pickInTerminal(choices),
@@ -6503,7 +6593,7 @@ function agentsFlag(args) {
 }
 function attachTo(paths, terminal) {
   const herd = existsSync11(binOf(paths.current, "herd")) ? binOf(paths.current, "herd") : join14(dirname10(process.argv[1] ?? ""), "herd.mjs");
-  const child = spawn6(process.execPath, [herd, "attach", terminal], {
+  const child = spawn7(process.execPath, [herd, "attach", terminal], {
     stdio: "inherit",
     env: { ...process.env, HERD_HOME: paths.herdHome }
   });
@@ -6572,7 +6662,7 @@ function readMissingFolder(herdHome2) {
     return null;
   }
 }
-function tail(path, count) {
+function tail2(path, count) {
   if (!existsSync11(path)) return [];
   const lines = readFileSync10(path, "utf8").split("\n");
   if (lines.at(-1) === "") lines.pop();
@@ -6587,12 +6677,12 @@ async function runLogs(args, deps) {
     return 0;
   }
   if (follow) {
-    const child = spawn6("tail", ["-n", "50", "-F", ...files], { stdio: "inherit" });
+    const child = spawn7("tail", ["-n", "50", "-F", ...files], { stdio: "inherit" });
     return await new Promise((resolve7) => child.on("close", (code) => resolve7(code ?? 0)));
   }
   for (const file of files) {
     print(`==> ${file} <==`);
-    for (const line2 of tail(file, 50)) print(line2);
+    for (const line2 of tail2(file, 50)) print(line2);
   }
   return 0;
 }
@@ -6629,7 +6719,7 @@ init_define_HERD_PACKAGE();
 
 // src/build-sandbox.ts
 init_define_HERD_PACKAGE();
-import { spawn as spawn7 } from "node:child_process";
+import { spawn as spawn8 } from "node:child_process";
 import { appendFileSync, readFileSync as readFileSync11 } from "node:fs";
 import { dirname as dirname11, join as join15 } from "node:path";
 var DEPLOY_HOSTS = ["api.cloudflare.com", "api.github.com", "registry.npmjs.org"];
@@ -6691,7 +6781,7 @@ async function runSandboxed(args) {
     }
   });
   const wrapped = await SandboxManager.wrapWithSandbox(shellQuote(command));
-  const child = spawn7(wrapped, { shell: true, stdio: "inherit" });
+  const child = spawn8(wrapped, { shell: true, stdio: "inherit" });
   const forward = (signal2) => () => child.kill(signal2);
   process.once("SIGTERM", forward("SIGTERM"));
   process.once("SIGINT", forward("SIGINT"));
@@ -8367,7 +8457,7 @@ var BuildConnection = class {
 
 // src/builds.ts
 init_define_HERD_PACKAGE();
-import { execFile as execFile2, execFileSync as execFileSync4, spawn as spawn8 } from "node:child_process";
+import { execFile as execFile2, execFileSync as execFileSync5, spawn as spawn9 } from "node:child_process";
 import { createHash as createHash3, randomUUID as randomUUID4 } from "node:crypto";
 import {
   existsSync as existsSync15,
@@ -8444,7 +8534,7 @@ function readSandboxStatus() {
 }
 var HERD_BIN = herdBin;
 var insideBuildSandbox = (env = process.env) => env.SANDBOX_RUNTIME === "1" && Boolean(env.HERD_BUILD_ID);
-var git2 = (cwd, ...args) => execFileSync4("git", args, { cwd, stdio: ["ignore", "pipe", "pipe"] }).toString().trim();
+var git2 = (cwd, ...args) => execFileSync5("git", args, { cwd, stdio: ["ignore", "pipe", "pipe"] }).toString().trim();
 var run2 = promisify2(execFile2);
 async function storeGit(env, store, ...args) {
   try {
@@ -8473,7 +8563,7 @@ function worktreeOf(dir, store) {
 }
 function cloneFolder(from, to) {
   const args = process.platform === "darwin" ? ["-c", "-R"] : ["-R", "--reflink=auto"];
-  execFileSync4("cp", [...args, from, to]);
+  execFileSync5("cp", [...args, from, to]);
 }
 function moduleFolders(dir) {
   const found = existsSync15(join22(dir, "node_modules")) ? ["node_modules"] : [];
@@ -8492,7 +8582,7 @@ function lockHash(dir) {
 }
 var npmCi = (dir) => new Promise((resolve7, reject) => {
   const network = insideBuildSandbox() ? ["--offline"] : ["--prefer-offline"];
-  const child = spawn8(
+  const child = spawn9(
     "npm",
     ["ci", ...network, "--no-audit", "--no-fund", "--no-update-notifier"],
     {
@@ -8599,7 +8689,7 @@ var BuildRunner = class _BuildRunner {
       writeFileSync13(join22(staging, ".complete"), folders.join("\n"));
       mkdirSync17(join22(this.home(), "node_modules"), { recursive: true });
       rmSync13(cache, { recursive: true, force: true });
-      execFileSync4("mv", [staging, cache]);
+      execFileSync5("mv", [staging, cache]);
     }
     mkdirSync17(join22(dir, "node_modules"), { recursive: true });
     writeFileSync13(marker, wanted);
@@ -8670,7 +8760,7 @@ var BuildRunner = class _BuildRunner {
       env.HERD_BUILD_SANDBOX = insideBuildSandbox() ? "Inside the sandbox of the build that started this one." : "";
     }
     const [executable, ...args] = command;
-    const child = spawn8(executable, args, { cwd: dir, env, stdio: "ignore", detached: true });
+    const child = spawn9(executable, args, { cwd: dir, env, stdio: "ignore", detached: true });
     const done = new Promise((resolve7) => {
       child.on("error", () => resolve7(1));
       child.on("close", (code) => resolve7(code ?? 1));
@@ -8749,7 +8839,7 @@ var BuildRunner = class _BuildRunner {
         `try { fs.readFileSync(${JSON.stringify(secret)}); process.exit(10); } catch {}`,
         `fs.writeFileSync(${JSON.stringify(join22(dir, "home", "ok"))}, "ok");`
       ].join(" ");
-      const child = spawn8(
+      const child = spawn9(
         process.execPath,
         [HERD_BIN, "build-sandbox", policyPath, "--", process.execPath, "-e", script],
         {
@@ -8820,7 +8910,7 @@ function listFromProc() {
 function listFromPs() {
   let listing = "";
   try {
-    listing = execFileSync4("ps", ["-axwwE", "-o", "pid=,command="], {
+    listing = execFileSync5("ps", ["-axwwE", "-o", "pid=,command="], {
       maxBuffer: 64 * 1024 * 1024
     }).toString();
   } catch {
@@ -8871,16 +8961,12 @@ function listClaudeAgents(timeoutMs = 1e4, command = "claude") {
   });
 }
 function findClaude(shell = process.env.SHELL || "/bin/sh", timeoutMs = 1e4) {
-  return new Promise((resolve7) => {
-    execFile3(
-      shell,
-      ["-ilc", "command -v claude"],
-      { env: terminalEnv({}), timeout: timeoutMs },
-      (_error, stdout) => {
-        const found = String(stdout ?? "").split("\n").map((line2) => line2.trim()).reverse().find((line2) => line2.startsWith("/"));
-        resolve7(found ?? null);
-      }
-    );
+  return loginShell(shell, ["-ilc", "command -v claude"], {
+    env: terminalEnv({}),
+    timeoutMs
+  }).then((stdout) => {
+    const found = stdout.split("\n").map((line2) => line2.trim()).reverse().find((line2) => line2.startsWith("/"));
+    return found ?? null;
   });
 }
 function claudeAgentsLister(find = () => findClaude(), retryMs = 5 * 60 * 1e3) {
@@ -9534,7 +9620,7 @@ var FolderWatch = class {
 // src/gh.ts
 init_define_HERD_PACKAGE();
 init_src();
-import { execFile as execFile4, spawn as spawn9 } from "node:child_process";
+import { execFile as execFile4, spawn as spawn10 } from "node:child_process";
 import { promisify as promisify3 } from "node:util";
 var GH_CHECK_MS = 10 * 60 * 1e3;
 var GH_CODE_WAIT_MS = 30 * 1e3;
@@ -9605,7 +9691,7 @@ function readDeviceCode(output2) {
   return code && url === GITHUB_DEVICE_URL ? { code, url: GITHUB_DEVICE_URL } : null;
 }
 async function signInGh(options) {
-  const spawnGh = options.spawnGh ?? ((args) => spawn9("gh", args, {
+  const spawnGh = options.spawnGh ?? ((args) => spawn10("gh", args, {
     env: options.env?.() ?? process.env,
     stdio: ["ignore", "pipe", "pipe"]
   }));
@@ -9651,11 +9737,10 @@ async function signInGh(options) {
 
 // src/login-env.ts
 init_define_HERD_PACKAGE();
-import { execFileSync as execFileSync6 } from "node:child_process";
 
 // src/worktree-settings.ts
 init_define_HERD_PACKAGE();
-import { execFileSync as execFileSync5 } from "node:child_process";
+import { execFileSync as execFileSync6 } from "node:child_process";
 import {
   appendFileSync as appendFileSync2,
   existsSync as existsSync17,
@@ -9666,7 +9751,7 @@ import {
 } from "node:fs";
 import { isAbsolute as isAbsolute3, join as join24 } from "node:path";
 var LOCAL_SETTINGS = join24(".claude", "settings.local.json");
-var git3 = (cwd, ...args) => execFileSync5("git", ["-C", cwd, ...args], {
+var git3 = (cwd, ...args) => execFileSync6("git", ["-C", cwd, ...args], {
   encoding: "utf8",
   stdio: ["ignore", "pipe", "pipe"]
 }).trim();
@@ -9752,17 +9837,13 @@ function loginShellEnv() {
   }
   const shell = process.env.SHELL || "/bin/sh";
   const script = `process.stdout.write(${JSON.stringify(MARKER)} + JSON.stringify(process.env))`;
-  try {
-    const output2 = execFileSync6(
-      shell,
-      ["-ilc", `${shellQuote2(process.execPath)} -e ${shellQuote2(script)}`],
-      { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], env: own, timeout: 15e3 }
-    );
-    const env = parseCapturedEnv(output2);
-    captured = env ? { ...own, ...env } : own;
-  } catch {
-    captured = own;
-  }
+  const output2 = loginShellSync(
+    shell,
+    ["-ilc", `${shellQuote2(process.execPath)} -e ${shellQuote2(script)}`],
+    { env: own, timeoutMs: 15e3 }
+  );
+  const env = output2 === null ? null : parseCapturedEnv(output2);
+  captured = env ? { ...own, ...env } : own;
   return captured;
 }
 
@@ -9863,7 +9944,7 @@ var MachineChecks = class {
 
 // src/terminals.ts
 init_define_HERD_PACKAGE();
-import { spawn as spawn10 } from "node:child_process";
+import { spawn as spawn11 } from "node:child_process";
 import { mkdirSync as mkdirSync19, readdirSync as readdirSync8, rmSync as rmSync16 } from "node:fs";
 import { connect as connect2 } from "node:net";
 import { join as join25 } from "node:path";
@@ -9959,7 +10040,7 @@ var HostTerminals = class {
     if (this.current()) return;
     const path = currentHostSocketPath(this.version);
     mkdirSync19(hostsDir(), { recursive: true, mode: 448 });
-    const child = spawn10(process.execPath, [herdBin, "terminal-host", "--socket", path], {
+    const child = spawn11(process.execPath, [herdBin, "terminal-host", "--socket", path], {
       detached: true,
       stdio: "ignore",
       env: { ...process.env, HERD_HOME: herdHome() }
@@ -13273,7 +13354,7 @@ async function runAgyHook(event2, stdin, env, options = {}) {
 
 // src/statusline.ts
 init_define_HERD_PACKAGE();
-import { spawn as spawn11 } from "node:child_process";
+import { spawn as spawn12 } from "node:child_process";
 import { readFileSync as readFileSync21 } from "node:fs";
 import { connect as connect3 } from "node:net";
 import { homedir as homedir7 } from "node:os";
@@ -13341,7 +13422,7 @@ function runOwnCommand(command, input, cwd, timeoutMs = OWN_COMMAND_TIMEOUT_MS)
     let output2 = "";
     let child;
     try {
-      child = spawn11("sh", ["-c", command], {
+      child = spawn12("sh", ["-c", command], {
         cwd,
         detached: true,
         stdio: ["pipe", "pipe", "ignore"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herdingchats/friday",
-  "version": "0.1.598",
+  "version": "0.1.609",
   "description": "Friday, HerdingChats' agent daemon, and the herd command it runs agents with.",
   "license": "MIT",
   "type": "module",
@@ -22,5 +22,5 @@
     "satori": "0.32.0",
     "zod": "4.6.7"
   },
-  "gitHead": "7d8c736673ed8d8010c9b9915d30f42b5733edf9"
+  "gitHead": "cfba1790271c8df777ce206f2e53c6b987e94520"
 }