@herdingchats/friday 0.1.683 → 0.1.701

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.683", gitHead: "a61eea3d8eae51e4b4365ef53c98c40dc64360f3" };
+    define_HERD_PACKAGE_default = { version: "0.1.701", gitHead: "dee83b97beed4102f6d56d692f1c1e306b62dbb6" };
   }
 });
 
@@ -508,7 +508,13 @@ var init_terminals = __esm({
       rows: z6.number().int().min(5).max(1e3)
     };
     terminalFrameSchema = z6.discriminatedUnion("type", [
-      z6.object({ type: z6.literal("snapshot"), data: z6.string() }),
+      // The screen, and its size, which a watcher draws it at. Hosts from before sizes don't say.
+      z6.object({
+        type: z6.literal("snapshot"),
+        data: z6.string(),
+        cols: size.cols.optional(),
+        rows: size.rows.optional()
+      }),
       z6.object({ type: z6.literal("data"), data: z6.string() }),
       z6.object({ type: z6.literal("exit"), exitCode: z6.number().int().nullable() }),
       z6.object({ type: z6.literal("mode"), mode: terminalModeSchema }),
@@ -1507,7 +1513,10 @@ var init_events = __esm({
         kind: z13.literal("bound"),
         machine: z13.object({ name: nonEmpty6, online: z13.boolean() }),
         // The worker's name, such as `mac-mini/claude`, and never its configuration or capabilities.
-        worker: nonEmpty6.optional()
+        worker: nonEmpty6.optional(),
+        // Only for the machine's owner, while it's online: what they may do with its terminal from
+        // the web. Absent for anyone else, and where the machine allows nothing or can't.
+        terminal: z13.enum(["drive", "watch"]).optional()
       }),
       z13.object({ kind: z13.literal("waiting_for_machine") }),
       z13.object({ kind: z13.literal("author_not_linked") })
@@ -3309,7 +3318,7 @@ import { spawn as spawn8 } from "node:child_process";
 import { existsSync as existsSync12, readFileSync as readFileSync10 } from "node:fs";
 import { homedir as homedir5 } from "node:os";
 import { dirname as dirname10, join as join16 } from "node:path";
-import { createInterface } from "node:readline/promises";
+import { createInterface as createInterface2 } from "node:readline/promises";
 import { z as z23 } from "zod";
 
 // src/auth.ts
@@ -3368,16 +3377,93 @@ async function postForm(url, fields) {
     body: new URLSearchParams(fields)
   });
 }
-async function login(openBrowser2, { api = apiUrl(), timeoutMs = 10 * 60 * 1e3 } = {}) {
-  const discovered = await fetch(`${api}/.well-known/oauth-authorization-server`).catch(() => null);
-  const metadata = metadataSchema.safeParse(await discovered?.json().catch(() => null));
-  if (!metadata.success) throw new HerdError(`Couldn't find where to sign in for ${api}.`);
-  const meta = metadata.data;
+var deviceRedirectFor = (api) => {
+  const url = new URL(api);
+  url.hostname = url.hostname.replace(/^api\./, "chat.");
+  return `${url.origin}/sign-in/code`;
+};
+var wantsDevice = (args, env = process.env) => args.includes("--device") || Boolean(env.SSH_CONNECTION || env.SSH_TTY);
+function parsePasted(pasted) {
+  const text4 = pasted.trim();
+  if (/^https?:\/\//.test(text4)) {
+    const url = new URL(text4);
+    const code = url.searchParams.get("code");
+    return code ? { state: url.searchParams.get("state") ?? "", code } : null;
+  }
+  const dot = text4.indexOf(".");
+  return dot > 0 && dot < text4.length - 1 ? { state: text4.slice(0, dot), code: text4.slice(dot + 1) } : null;
+}
+async function loopback(openBrowser2, timeoutMs) {
   const server = createServer();
   await new Promise((resolve8) => server.listen(0, "127.0.0.1", resolve8));
   const address = server.address();
   const port = typeof address === "object" && address ? address.port : 0;
   const redirectUri = `http://127.0.0.1:${port}/callback`;
+  return {
+    redirectUri,
+    close: () => server.close(),
+    code: async (authorize, state) => {
+      const code = new Promise((resolve8, reject) => {
+        const timer = setTimeout(
+          () => reject(new HerdError("Nobody signed in within 10 minutes. Run herd login again.")),
+          timeoutMs
+        );
+        server.on("request", (req, res) => {
+          const url = new URL(req.url ?? "/", redirectUri);
+          if (url.pathname !== "/callback") return void res.writeHead(404).end();
+          clearTimeout(timer);
+          const error = url.searchParams.get("error");
+          const ok = !error && url.searchParams.get("state") === state;
+          res.writeHead(ok ? 200 : 400, { "Content-Type": "text/plain" }).end(ok ? "Signed in to herd. You can close this tab." : "Sign-in didn't complete.");
+          if (error) return reject(new HerdError(`Sign-in was refused: ${error}.`));
+          if (!ok) return reject(new HerdError("Sign-in came back for a different request."));
+          resolve8(url.searchParams.get("code") ?? "");
+        });
+      });
+      code.catch(() => {
+      });
+      await openBrowser2(authorize);
+      return code;
+    }
+  };
+}
+function device(redirectUri, print, readCode) {
+  return {
+    redirectUri,
+    close: () => {
+    },
+    code: async (authorize, state) => {
+      print(`Open this link on any device and sign in:
+
+  ${authorize}
+`);
+      for (let tries = 0; tries < 3; tries += 1) {
+        const pasted = parsePasted(await readCode("Paste the code it shows: "));
+        if (!pasted) {
+          print("That doesn't look like the code. Copy it with the button on the page.");
+          continue;
+        }
+        if (pasted.state !== state) {
+          throw new HerdError("That code is from a different sign-in. Run herd login again.");
+        }
+        return pasted.code;
+      }
+      throw new HerdError("No code was pasted. Run herd login again.");
+    }
+  };
+}
+async function login(how, {
+  api = apiUrl(),
+  timeoutMs = 10 * 60 * 1e3,
+  deviceRedirect = deviceRedirectFor(api)
+} = {}) {
+  const discovered = await fetch(`${api}/.well-known/oauth-authorization-server`).catch(() => null);
+  const metadata = metadataSchema.safeParse(await discovered?.json().catch(() => null));
+  if (!metadata.success) throw new HerdError(`Couldn't find where to sign in for ${api}.`);
+  const meta = metadata.data;
+  const way = typeof how === "function" ? { openBrowser: how } : how;
+  const source = "openBrowser" in way ? await loopback(way.openBrowser, timeoutMs) : device(deviceRedirect, way.print, way.readCode);
+  const { redirectUri } = source;
   try {
     const registration2 = await fetch(meta.registration_endpoint, {
       method: "POST",
@@ -3406,30 +3492,11 @@ async function login(openBrowser2, { api = apiUrl(), timeoutMs = 10 * 60 * 1e3 }
       state,
       resource: api
     }).toString();
-    const code = new Promise((resolve8, reject) => {
-      const timer = setTimeout(
-        () => reject(new HerdError("Nobody signed in within 10 minutes. Run herd login again.")),
-        timeoutMs
-      );
-      server.on("request", (req, res) => {
-        const url = new URL(req.url ?? "/", redirectUri);
-        if (url.pathname !== "/callback") return void res.writeHead(404).end();
-        clearTimeout(timer);
-        const error = url.searchParams.get("error");
-        const ok = !error && url.searchParams.get("state") === state;
-        res.writeHead(ok ? 200 : 400, { "Content-Type": "text/plain" }).end(ok ? "Signed in to herd. You can close this tab." : "Sign-in didn't complete.");
-        if (error) return reject(new HerdError(`Sign-in was refused: ${error}.`));
-        if (!ok) return reject(new HerdError("Sign-in came back for a different request."));
-        resolve8(url.searchParams.get("code") ?? "");
-      });
-    });
-    code.catch(() => {
-    });
-    await openBrowser2(authorize.toString());
+    const code = await source.code(authorize.toString(), state);
     const response = await postForm(meta.token_endpoint, {
       grant_type: "authorization_code",
       client_id: client.data.client_id,
-      code: await code,
+      code,
       redirect_uri: redirectUri,
       code_verifier: verifier,
       resource: api
@@ -3446,7 +3513,7 @@ async function login(openBrowser2, { api = apiUrl(), timeoutMs = 10 * 60 * 1e3 }
       refreshToken: tokens.data.refresh_token
     });
   } finally {
-    server.close();
+    source.close();
   }
 }
 var EXPIRY_MARGIN_MS = 60 * 1e3;
@@ -3508,7 +3575,7 @@ async function apiFetch(path, init = {}) {
 // src/cli-flags.ts
 init_define_HERD_PACKAGE();
 var HERD_FLAGS = {
-  login: [],
+  login: ["--device"],
   logout: [],
   daemon: ["--repo"],
   attach: ["--watch"],
@@ -3539,7 +3606,7 @@ var HERD_FLAGS = {
   persona: []
 };
 var FRIDAY_FLAGS = {
-  start: ["--agents", "--config", "--verbose"],
+  start: ["--agents", "--config", "--device", "--verbose"],
   stop: [],
   status: [],
   logs: ["--follow", "-f", "-n"]
@@ -3591,6 +3658,7 @@ function commandHelp(overview, command) {
 // src/commands/login.ts
 init_define_HERD_PACKAGE();
 import { spawn } from "node:child_process";
+import { createInterface } from "node:readline/promises";
 function openBrowser(url) {
   console.log(`Opening your browser to sign in. If it doesn't open, visit:
 
@@ -3603,12 +3671,34 @@ function openBrowser(url) {
   } catch {
   }
 }
-async function runLogin() {
+async function readCodeFromTerminal(prompt) {
+  if (!process.stdin.isTTY) {
+    throw new HerdError("Signing in with a code needs a terminal to paste it into.");
+  }
+  const lines = createInterface({ input: process.stdin, output: process.stdout });
+  try {
+    return await lines.question(prompt);
+  } finally {
+    lines.close();
+  }
+}
+function signInWay(args, env = process.env) {
+  if (wantsDevice(args, env)) {
+    return { readCode: readCodeFromTerminal, print: (line2) => console.log(line2) };
+  }
+  return {
+    openBrowser: (url) => {
+      openBrowser(url);
+      console.log("Signing in on another device, such as over SSH? Run this with --device.\n");
+    }
+  };
+}
+async function runLogin(args = []) {
   if (isLocal(apiUrl())) {
     console.log("The local dev server needs no sign-in.");
     return 0;
   }
-  await login(openBrowser);
+  await login(signInWay(args));
   console.log("Signed in.");
   return 0;
 }
@@ -5415,6 +5505,25 @@ var Activator = class {
     }
     this.request([{ name: agent, version }]);
   }
+  /**
+   * The terminal an agent's activation runs in, for its owner to sign in from the web. One that
+   * isn't running is started, and its terminal named once it's open. Null if it didn't open.
+   */
+  async terminalFor(agent, version, { waitMs = 6e4, pollMs = 200 } = {}) {
+    if (this.current?.agent !== agent) this.request([{ name: agent, version }], { force: true });
+    const until = Date.now() + waitMs;
+    while (Date.now() < until && !this.stopped) {
+      const current = this.current;
+      if (current?.agent === agent) {
+        const open = (await this.options.terminals.list().catch(() => [])).some(
+          (t) => t.name === current.terminal && !t.exited
+        );
+        if (open) return current.terminal;
+      }
+      await new Promise((resolve8) => setTimeout(resolve8, pollMs));
+    }
+    return null;
+  }
   /** Resolves once nothing is queued or running, as tests wait for. */
   async settled() {
     while (this.running) await this.running;
@@ -5515,7 +5624,8 @@ var Activator = class {
   async waitForCheckIn(version, driver, current, folder, wasSignedOut) {
     const { terminals } = this.options;
     const { agent } = current;
-    const deadline = Date.now() + (this.options.deadlineMs ?? ACTIVATION_DEADLINE_MS);
+    const deadlineMs = this.options.deadlineMs ?? ACTIVATION_DEADLINE_MS;
+    let deadline = Date.now() + deadlineMs;
     const restartMs = this.options.signInRestartMs ?? SIGN_IN_RESTART_MS;
     const checkInMs = this.options.checkInMs ?? CHECK_IN_MS;
     const pollMs = this.options.pollMs ?? ACTIVATION_POLL_MS;
@@ -5551,6 +5661,8 @@ var Activator = class {
     };
     await start();
     while (!current.checkedIn && Date.now() < deadline && !this.stopped) {
+      const lookers = lookingAt((await terminals.list()).find((t) => t.name === current.terminal));
+      if (lookers > 0) deadline = Math.max(deadline, Date.now() + deadlineMs);
       const reading = await driver.read(current.terminal).catch(() => null);
       if (reading?.state === "signed_out" && Date.now() - startedAt >= checkInMs) {
         seen = "signed_out";
@@ -6676,7 +6788,7 @@ async function runStart(options) {
     }
   }
   if (!options.signedIn()) {
-    print("Signing in through your browser.");
+    print("Signing in.");
     await options.signIn();
     verbose2("signed in");
   } else verbose2("already signed in");
@@ -7043,7 +7155,8 @@ 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 the first time, starts the daemon
+              needed, or with a code to paste from another device with --device or over
+              SSH. 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
@@ -7120,7 +7233,7 @@ async function friday(args, deps = defaults()) {
           version: HERD_VERSION,
           run: verboseExec(deps.run),
           signedIn: () => isLocal(apiUrl()) || readCredentials() !== null,
-          signIn: () => login(openBrowser),
+          signIn: () => login(signInWay(rest)),
           serviceKind: deps.serviceKind ?? await detectService(verboseExec(deps.run)),
           env: passedEnv(),
           print: deps.print,
@@ -7169,7 +7282,7 @@ ${HELP}`);
   }
 }
 async function confirmInTerminal(question) {
-  const lines = createInterface({ input: process.stdin, output: process.stdout });
+  const lines = createInterface2({ input: process.stdin, output: process.stdout });
   try {
     return /^y(es)?$/i.test((await lines.question(`${question} [y/N] `)).trim());
   } finally {
@@ -10647,15 +10760,15 @@ async function signInGh(options) {
   const codeTimer = setTimeout(() => resolveCode(false), options.codeWaitMs ?? GH_CODE_WAIT_MS);
   const found = await codeShown;
   clearTimeout(codeTimer);
-  const device = readDeviceCode(output2);
-  if (!found || !device) {
+  const device2 = readDeviceCode(output2);
+  if (!found || !device2) {
     child.kill();
     const failed = { state: "failed", reason: "no_code" };
     await options.update(failed);
     return failed;
   }
   sent = true;
-  await options.update({ state: "code", code: device.code, url: device.url });
+  await options.update({ state: "code", code: device2.code, url: device2.url });
   const approveTimer = setTimeout(() => child.kill(), options.approveWaitMs ?? GH_APPROVE_WAIT_MS);
   await exited;
   clearTimeout(approveTimer);
@@ -10986,9 +11099,13 @@ var Session = class {
     });
   }
   fromHost(message) {
-    if (message.type === "snapshot") {
+    const size2 = typeof message.cols === "number" && typeof message.rows === "number" ? { cols: message.cols, rows: message.rows } : null;
+    if (message.type === "resize" && size2) {
+      this.flush();
+      this.send({ type: "resize", ...size2 });
+    } else if (message.type === "snapshot") {
       this.pending = "";
-      this.send({ type: "snapshot", data: message.data ?? "" });
+      this.send({ type: "snapshot", data: message.data ?? "", ...size2 ?? {} });
     } else if (message.type === "data") {
       if (this.behind) return;
       this.pending += message.data ?? "";
@@ -14172,8 +14289,12 @@ async function runDaemon(args) {
     }),
     access: () => daemon?.configuration().config?.terminals?.remote ?? "drive",
     resolve: async (target) => {
-      if (target.kind !== "conversation") {
-        return { refused: "This machine can't open an agent's sign-in terminal from the web yet." };
+      if (target.kind === "activation") {
+        const cli = clis.find((candidate) => candidate.name === target.agent);
+        if (!cli || !activator) return { refused: "This machine doesn't run that agent." };
+        const terminal = await activator.terminalFor(cli.name, cli.version);
+        if (!terminal) return { refused: "The agent's sign-in didn't start on this machine." };
+        return { terminal, socketPath: await terminals.pathOf(terminal) };
       }
       const workspace = workspaces.get(target.conversationId);
       if (!workspace) return { refused: "This machine doesn't hold that conversation." };
@@ -15592,7 +15713,8 @@ var HELP4 = `herd: work on HerdingChats conversations from this computer.
 Usage: herd <command>
 
 On this computer:
-  login                 Sign in through your browser
+  login [--device]      Sign in through your browser. --device, or running over SSH, signs in from
+                        another device with a code to paste
   logout                Remove this computer's sign-in
   daemon [--repo <path>]...
                         Run this machine's daemon, working from its root folder. Repos given with
@@ -15676,7 +15798,7 @@ async function main(args) {
         console.log(HERD_VERSION);
         return 0;
       case "login":
-        return await runLogin();
+        return await runLogin(rest);
       case "logout":
         return await runLogout();
       case "daemon":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herdingchats/friday",
-  "version": "0.1.683",
+  "version": "0.1.701",
   "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": "a61eea3d8eae51e4b4365ef53c98c40dc64360f3"
+  "gitHead": "dee83b97beed4102f6d56d692f1c1e306b62dbb6"
 }

package/terminal-host.mjs

@@ -230,6 +230,16 @@ var TerminalHost = class {
     if (held.info.exited) return;
     held.pty.resize(cols, rows);
     held.term.resize(cols, rows);
+    for (const socket of held.watchers) {
+      socket.write(`${JSON.stringify({ type: "resize", cols, rows })}
+`);
+    }
+  }
+  /** The screen as `attach` and `watch` send it first: its contents, and its size. */
+  async sized(name) {
+    const held = this.get(name);
+    const data = await this.snapshot(name);
+    return { type: "snapshot", data, cols: held.term.cols, rows: held.term.rows };
   }
   subscribe(name, socket) {
     const held = this.get(name);
@@ -253,7 +263,7 @@ var TerminalHost = class {
       return;
     }
     if (size.cols && size.rows) this.resize(name, size.cols, size.rows);
-    socket.write(`${JSON.stringify({ type: "snapshot", data: await this.snapshot(name) })}
+    socket.write(`${JSON.stringify(await this.sized(name))}
 `);
     held.viewers.add(socket);
     held.drivenAt = Date.now();
@@ -294,7 +304,7 @@ var TerminalHost = class {
 `);
       return;
     }
-    socket.write(`${JSON.stringify({ type: "snapshot", data: await this.snapshot(name) })}
+    socket.write(`${JSON.stringify(await this.sized(name))}
 `);
     held.watchers.add(socket);
     held.subscribers.add(socket);