@herdingchats/friday 0.1.561 → 0.1.567

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.561", gitHead: "dc277703d4460a12bee165c4c4e6653088631c16" };
+    define_HERD_PACKAGE_default = { version: "0.1.567", gitHead: "816afa2c448b0a5330ddece39cdb0567ef65a3c5" };
   }
 });
 
@@ -3156,6 +3156,7 @@ import { spawn as spawn6 } 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";
+import { createInterface } from "node:readline/promises";
 import { z as z22 } from "zod";
 
 // src/auth.ts
@@ -3384,7 +3385,7 @@ var HERD_FLAGS = {
   persona: []
 };
 var FRIDAY_FLAGS = {
-  start: ["--agents"],
+  start: ["--agents", "--config"],
   stop: [],
   status: [],
   logs: ["--follow", "-f", "-n"]
@@ -5170,16 +5171,18 @@ async function chooseAgents(options, print) {
   }
   const saved = loaded.status === "ok" ? loaded.config : void 0;
   const choices = agentChoices(installed, saved);
-  const asked = options.given ? null : await (options.pick?.(choices) ?? Promise.resolve(null));
+  const asked = options.given || !options.ask ? null : await (options.pick?.(choices) ?? Promise.resolve(null));
   const shares = options.given ?? asked ?? // No terminal: what was chosen before, or what's installed.
   Object.fromEntries(choices.map((choice) => [choice.cli, choice.share]));
-  if (!sameChoice(saved, shares) || !existsSync5(options.configPath)) {
+  const choosing = options.ask || options.given !== void 0;
+  if (choosing && (!sameChoice(saved, shares) || !existsSync5(options.configPath))) {
     mkdirSync6(dirname6(options.configPath), { recursive: true, mode: 448 });
     writeFileSync5(options.configPath, configSource(withChoice(saved, shares)), { mode: 384 });
   }
   const chosen = ADAPTERS.map(({ cli }) => cli).filter((cli) => (shares[cli] ?? "off") !== "off");
+  const change = options.ask ? "" : ` ${START_COMMAND} --config changes that.`;
   print(
-    chosen.length > 0 ? `This machine runs ${chosen.map((cli) => `${label2(cli)} (${SHARE_LABELS[shares[cli]]})`).join(", ")}.` : "This machine runs no agents, so it takes no work. Run this again to choose some."
+    chosen.length > 0 ? `This machine runs ${chosen.map((cli) => `${label2(cli)} (${SHARE_LABELS[shares[cli]]})`).join(", ")}.${change}` : `This machine runs no agents, so it takes no work. ${START_COMMAND} --config chooses some.`
   );
   return chosen;
 }
@@ -5888,16 +5891,25 @@ async function runStart(options) {
   const existing = readRoot2(paths);
   const wanted = chooseRoot(options.cwd, options.home);
   const running = runningSupervisor(paths);
+  let moving = false;
   if (existing && real(existing) !== real(wanted)) {
     print(`This machine's root is ${existing}, which holds the repos Friday works on.`);
-    if (running) {
-      print(`Friday is running there, version ${running.version}, so nothing changed.`);
-      await waitForAgents(options, await chooseAndAsk(options, print), print);
-      await printSetup(options, print);
-      return 0;
+    moving = await options.confirm?.(
+      `Make ${wanted} the root instead? Conversations already going carry on where they are.`
+    ) ?? false;
+    if (!moving) {
+      print(
+        options.confirm ? "The root stays where it is." : `Run this in a terminal to move the root to ${wanted}.`
+      );
+      if (running) {
+        print(`Friday is running there, version ${running.version}, so nothing changed.`);
+        await waitForAgents(options, await chooseAndAsk(options, print), print);
+        await printSetup(options, print);
+        return 0;
+      }
     }
   }
-  const root = existing ?? wanted;
+  const root = moving ? wanted : existing ?? wanted;
   if (running && root === existing) {
     print(`Friday is running from ${root}, version ${running.version}. Nothing changed.`);
     await waitForAgents(options, await chooseAndAsk(options, print), print);
@@ -5906,6 +5918,7 @@ async function runStart(options) {
   }
   const repo = insideWorkTree(root);
   if (repo) {
+    if (moving) print("The root stays where it is.");
     throw new StartError(
       `${root} is inside the git repo ${repo}, so it can't be the machine's root: every conversation would load that repo's settings. Run ${START_COMMAND} in a folder outside any repo, such as the one that holds your checkouts, like ~/code.`
     );
@@ -5929,13 +5942,18 @@ async function runStart(options) {
       `Stopped the old daemon: removed ${retired.join(" and ")}. Its checkout is left as it was.`
     );
   await ensureInstalled(options, print);
-  mkdirSync10(root, { recursive: true });
-  writeRoot(paths, root);
   const command = [process.execPath, binOf(paths.current, "friday"), "supervise"];
   const env = { HERD_HOME: paths.herdHome, ...options.env };
   const service = (options.service ?? defaultService(options))(command, env);
+  if (moving && running) {
+    print(`Stopping Friday at ${existing} to start it again from ${root}.`);
+    await service.stop();
+    await stopped(options);
+  }
+  mkdirSync10(root, { recursive: true });
+  writeRoot(paths, root);
   const changed = await service.install();
-  await service.start(changed);
+  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"}.`
   );
@@ -5946,10 +5964,22 @@ async function runStart(options) {
   );
   return 0;
 }
+async function stopped(options) {
+  const deadline = Date.now() + (options.stopWaitMs ?? 15e3);
+  while (runningSupervisor(options.paths)) {
+    if (Date.now() > deadline) {
+      throw new StartError(
+        `Friday didn't stop within ${Math.round((options.stopWaitMs ?? 15e3) / 1e3)} seconds, so the root wasn't moved. Run ${FRIDAY_COMMAND} stop, then this again.`
+      );
+    }
+    await new Promise((done) => setTimeout(done, options.stopPollMs ?? 250));
+  }
+}
 async function chooseAndAsk(options, print) {
   if (!options.agents) return null;
   const chosen = await chooseAgents(options.agents, print);
   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) {
@@ -6235,10 +6265,12 @@ Usage: ${FRIDAY_COMMAND} <command>
 
   start       Make this computer a machine, with the folder this runs in as its root, which
               holds your repos, such as ~/code. Signs in through your browser when
-              needed, asks how much of each agent you have, starts the daemon now and whenever
-              you log in, waits for each agent to check in, then shows what's left to set up.
-              Safe to run again. --agents claude=lot,codex=little sets the shares without
-              asking: off, little, some or lot, where a bare name is some and one left out off
+              needed, asks how much of each agent you have the first time, starts the daemon
+              now and whenever you log in, then shows what's left to set up. Safe to run
+              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
   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
@@ -6312,7 +6344,11 @@ async function friday(args, deps = defaults()) {
           print: deps.print,
           setup: fetchSetup,
           ...process.env.HERD_PACKAGE_SPEC ? { install: { spec: process.env.HERD_PACKAGE_SPEC } } : {},
+          ...process.stdin.isTTY && process.stdout.isTTY ? { confirm: confirmInTerminal } : {},
           agents: {
+            // 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(),
             load: () => loadHerdConfig(herdConfigIn(deps.paths.herdHome)),
             configPath: herdConfigIn(deps.paths.herdHome),
@@ -6345,6 +6381,14 @@ ${HELP}`);
     throw error;
   }
 }
+async function confirmInTerminal(question) {
+  const lines = createInterface({ input: process.stdin, output: process.stdout });
+  try {
+    return /^y(es)?$/i.test((await lines.question(`${question} [y/N] `)).trim());
+  } finally {
+    lines.close();
+  }
+}
 function agentsFlag(args) {
   const at = args.findIndex((arg) => arg === "--agents" || arg.startsWith("--agents="));
   if (at < 0) return void 0;
@@ -7603,6 +7647,7 @@ var QUEUED = /\(alt\+m to send immediately\)\s*$|Press up to edit queued message
 var TRUST_QUESTION = /^\s*Do you trust the contents of this project\?/;
 var TRUST_YES = /^\s*(>)?\s*Yes, I trust this folder/;
 var NOT_SIGNED_IN = /You are currently not signed in\./;
+var LOGIN_METHODS = /^\s*Select login method:/;
 var RESUME_HINT = /^Resume with -c/;
 function promptBox2(lines) {
   for (let bottom = lines.length - 1; bottom >= 2; bottom--) {
@@ -7641,7 +7686,7 @@ function readAgyScreen(raw) {
       trustPrompt: { yesHighlighted: Boolean(yes && TRUST_YES.exec(yes)?.[1]) }
     };
   }
-  if (lines.some((line2) => NOT_SIGNED_IN.test(line2))) {
+  if (lines.some((line2) => NOT_SIGNED_IN.test(line2)) && lines.some((line2) => LOGIN_METHODS.test(line2))) {
     return { ...reading, program: "agy", state: "signed_out" };
   }
   const last = [...lines].reverse().find((line2) => line2.trim().length > 0) ?? "";
@@ -9763,7 +9808,7 @@ var HostTerminals = class {
     await this.askFor(name, { op: "kill", name });
   }
   async retire(canStop) {
-    const stopped = [];
+    const stopped2 = [];
     for (const host of await this.discover()) {
       if (host.current) continue;
       const version = host.hello.version ?? "unversioned";
@@ -9775,12 +9820,12 @@ var HostTerminals = class {
         continue;
       }
       if (await this.stop(host)) {
-        stopped.push(version);
+        stopped2.push(version);
         this.log(`Retired terminal host ${version}, which had nothing left running.`);
       }
     }
-    if (stopped.length > 0) await this.discover();
-    return stopped;
+    if (stopped2.length > 0) await this.discover();
+    return stopped2;
   }
   /** Stops a host: politely where it knows how, and otherwise by its process. */
   async stop(host) {
@@ -10855,12 +10900,12 @@ async function retireHosts(ws) {
   if (!terminals.retire || Date.now() - ws.retiredAt < every) return;
   ws.retiredAt = Date.now();
   const inHost = (version) => Object.values(ws.load()).filter((workspace) => workspace.hostVersion === version);
-  const stopped = await terminals.retire(
+  const stopped2 = await terminals.retire(
     (version) => inHost(version).every(
       (workspace) => !workspace.claimId && (workspace.status === "idle" || workspace.status === "exited")
     )
   );
-  for (const version of stopped) {
+  for (const version of stopped2) {
     for (const workspace of inHost(version)) {
       const id2 = workspace.conversationId;
       await ws.serially(id2, async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herdingchats/friday",
-  "version": "0.1.561",
+  "version": "0.1.567",
   "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": "dc277703d4460a12bee165c4c4e6653088631c16"
+  "gitHead": "816afa2c448b0a5330ddece39cdb0567ef65a3c5"
 }