@staff0rd/assist 0.750.0 → 0.751.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.750.0",
+  version: "0.751.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -10696,7 +10696,7 @@ function startWebServer(label2, port, handler, initialPath, open = true) {
   const server = createServer((req, res) => {
     runHandler(handler, req, res, port);
   });
-  server.listen(port, () => {
+  server.listen(port, "127.0.0.1", () => {
     console.log(chalk103.green(`${label2}: ${url}`));
     console.log(chalk103.dim("Press Ctrl+C to stop"));
     if (open) {
@@ -47380,7 +47380,7 @@ function tailscaleServeRemediation(spec, error) {
   if (status3 !== void 0 && status3 !== 502) return void 0;
   const { hostname: hostname2, port } = new URL(spec.url);
   const servePort = port || "443";
-  return status3 === 502 ? `tailscale serve on ${hostname2} answered but nothing listens on 127.0.0.1:${servePort} behind it \u2014 is ${spec.name}'s web server running (project-switch webservers)?` : `nothing serves https on ${servePort} on ${hostname2} \u2014 run \`tailscale serve --bg --https=${servePort} http://127.0.0.1:${servePort}\` on ${spec.name} (tailscale.exe under WSL)`;
+  return status3 === 502 ? `tailscale serve on ${hostname2} answered but nothing listens on 127.0.0.1:${servePort} behind it \u2014 is ${spec.name}'s web server running (project-switch webservers)?` : `nothing serves https on ${servePort} on ${hostname2} \u2014 run \`assist sessions nodes serve --port ${servePort}\` on ${spec.name}`;
 }
 
 // src/commands/sessions/nodes/isTailscaleLink.ts
@@ -47643,15 +47643,74 @@ async function doctorNodes(name, options2) {
   else printReport(report2);
 }
 
+// src/commands/sessions/nodes/listNodes.ts
+import chalk254 from "chalk";
+async function nodesReport() {
+  const live = await queryNodes();
+  if (live)
+    return { local: live.local, daemonRunning: true, links: live.links };
+  return {
+    local: resolveNodeName(),
+    daemonRunning: false,
+    links: loadLinkSpecs().map((link3) => ({ ...link3, state: "disconnected" }))
+  };
+}
+async function listNodes(options2) {
+  const report2 = await nodesReport();
+  if (options2.json) {
+    console.log(JSON.stringify(report2, null, 2));
+    return;
+  }
+  console.log(`${report2.local} ${chalk254.dim("(this node)")}`);
+  if (!report2.daemonRunning)
+    console.log(chalk254.dim("  daemon not running; showing configured links"));
+  if (report2.links.length === 0) console.log(chalk254.dim("  no links"));
+  for (const link3 of report2.links) console.log(formatLink(link3));
+}
+
+// src/commands/sessions/nodes/nodeLogs.ts
+async function fetchLogTail(name, lines2) {
+  if (name === resolveNodeName())
+    return {
+      nodeName: name,
+      path: daemonPaths.log,
+      lines: readLogTail(daemonPaths.log, lines2)
+    };
+  const link3 = findLinkSpec(name);
+  if (!link3)
+    throw new Error(`No link named ${name}; see assist sessions nodes`);
+  try {
+    return await fetchPeerJson(
+      link3.url,
+      `/api/daemon-log?lines=${lines2}`
+    );
+  } catch (error) {
+    throw new Error(
+      `Could not read ${name}'s daemon log: ${describePeerError(error)}. Run assist sessions nodes doctor ${name}`
+    );
+  }
+}
+async function nodeLogs(name, options2) {
+  const lines2 = Number.parseInt(options2.lines, 10);
+  if (!Number.isInteger(lines2) || lines2 < 1)
+    throw new Error(`-n must be a positive integer, got ${options2.lines}`);
+  const tail = await fetchLogTail(name, lines2);
+  if (options2.json) {
+    console.log(JSON.stringify(tail, null, 2));
+    return;
+  }
+  for (const line of tail.lines) console.log(line);
+}
+
 // src/commands/sessions/nodes/linkNode.ts
-import chalk255 from "chalk";
+import chalk256 from "chalk";
 
 // src/commands/sessions/nodes/notifyDaemonLinks.ts
-import chalk254 from "chalk";
+import chalk255 from "chalk";
 async function notifyDaemonLinks() {
   if (!await isDaemonRunning()) {
     console.log(
-      chalk254.yellow(
+      chalk255.yellow(
         "The sessions daemon is not running; it loads the links when it starts."
       )
     );
@@ -47659,11 +47718,11 @@ async function notifyDaemonLinks() {
   }
   try {
     await sendToDaemonAwaitAck({ type: "reload-links" });
-    console.log(chalk254.dim("The sessions daemon reloaded its links."));
+    console.log(chalk255.dim("The sessions daemon reloaded its links."));
   } catch (error) {
     const message3 = error instanceof Error ? error.message : String(error);
     console.log(
-      chalk254.yellow(
+      chalk255.yellow(
         `Could not notify the sessions daemon (${message3}); run \`assist daemon restart\` to apply the change.`
       )
     );
@@ -47769,103 +47828,108 @@ async function linkNode(name, url, options2) {
   const link3 = await buildLink(name, url, options2, others);
   await writeLinks([...others, link3]);
   console.log(
-    chalk255.green(`Linked ${name} (${describeTarget(toLinkSpec(link3))})`)
+    chalk256.green(`Linked ${name} (${describeTarget(toLinkSpec(link3))})`)
   );
   await notifyDaemonLinks();
 }
 
-// src/commands/sessions/nodes/listNodes.ts
-import chalk256 from "chalk";
-async function nodesReport() {
-  const live = await queryNodes();
-  if (live)
-    return { local: live.local, daemonRunning: true, links: live.links };
-  return {
-    local: resolveNodeName(),
-    daemonRunning: false,
-    links: loadLinkSpecs().map((link3) => ({ ...link3, state: "disconnected" }))
-  };
-}
-async function listNodes(options2) {
-  const report2 = await nodesReport();
-  if (options2.json) {
-    console.log(JSON.stringify(report2, null, 2));
-    return;
-  }
-  console.log(`${report2.local} ${chalk256.dim("(this node)")}`);
-  if (!report2.daemonRunning)
-    console.log(chalk256.dim("  daemon not running; showing configured links"));
-  if (report2.links.length === 0) console.log(chalk256.dim("  no links"));
-  for (const link3 of report2.links) console.log(formatLink(link3));
+// src/commands/sessions/nodes/registerLinkCommand.ts
+function registerLinkCommand(nodes) {
+  nodes.command("link <name> [url]").description(
+    "Link a peer node by its web server URL, by its Tailscale name with --tailscale and --port, or over ssh with --ssh and --port (name must match the peer's sessions.nodeName)"
+  ).option(
+    "--tailscale <host>",
+    "Dial the peer at https://<host>.<tailnet>.ts.net:<port> (the peer runs tailscale serve for its web server port)"
+  ).option(
+    "--ssh <alias>",
+    "Tunnel to the peer through this ~/.ssh/config alias"
+  ).option(
+    "--port <port>",
+    "The peer's web server port (with --tailscale or --ssh)"
+  ).option(
+    "--local-port <port>",
+    "Local end of the ssh tunnel (default: 43000 + port % 1000, bumped past other links)"
+  ).action(linkNode);
 }
 
-// src/commands/sessions/nodes/nodeLogs.ts
-async function fetchLogTail(name, lines2) {
-  if (name === resolveNodeName())
-    return {
-      nodeName: name,
-      path: daemonPaths.log,
-      lines: readLogTail(daemonPaths.log, lines2)
-    };
-  const link3 = findLinkSpec(name);
-  if (!link3)
-    throw new Error(`No link named ${name}; see assist sessions nodes`);
-  try {
-    return await fetchPeerJson(
-      link3.url,
-      `/api/daemon-log?lines=${lines2}`
-    );
-  } catch (error) {
+// src/commands/sessions/nodes/serveNode.ts
+import { execFile as execFile14, spawnSync as spawnSync12 } from "child_process";
+import { promisify as promisify13 } from "util";
+import chalk257 from "chalk";
+
+// src/commands/sessions/nodes/planServe.ts
+function planServe(status3, serveConfig2, port) {
+  tailnetSuffix(status3);
+  const fqdn = status3.Self?.DNSName?.replace(/\.$/, "");
+  if (!fqdn)
     throw new Error(
-      `Could not read ${name}'s daemon log: ${describePeerError(error)}. Run assist sessions nodes doctor ${name}`
+      `\`${tailscaleCli()} status --json\` reports no DNS name for this machine`
     );
-  }
+  const target = `http://127.0.0.1:${port}`;
+  const served = serveConfig2.Web?.[`${fqdn}:${port}`]?.Handlers?.["/"]?.Proxy;
+  return {
+    host: fqdn.split(".")[0],
+    url: `https://${fqdn}:${port}`,
+    target,
+    alreadyServing: served?.replace(/\/$/, "") === target,
+    args: ["serve", "--bg", `--https=${port}`, target]
+  };
 }
-async function nodeLogs(name, options2) {
-  const lines2 = Number.parseInt(options2.lines, 10);
-  if (!Number.isInteger(lines2) || lines2 < 1)
-    throw new Error(`-n must be a positive integer, got ${options2.lines}`);
-  const tail = await fetchLogTail(name, lines2);
-  if (options2.json) {
-    console.log(JSON.stringify(tail, null, 2));
-    return;
+
+// src/commands/sessions/nodes/serveNode.ts
+var execFileAsync12 = promisify13(execFile14);
+async function serveConfig() {
+  const { stdout } = await execFileAsync12(
+    tailscaleCli(),
+    ["serve", "status", "--json"],
+    { encoding: "utf8", timeout: 1e4, windowsHide: true }
+  );
+  return stdout.trim() ? JSON.parse(stdout) : {};
+}
+function runServe(args) {
+  console.log(chalk257.dim(`${tailscaleCli()} ${args.join(" ")}`));
+  const result = spawnSync12(tailscaleCli(), args, { stdio: "inherit" });
+  if (result.error) throw result.error;
+  if (result.status !== 0)
+    throw new Error(`tailscale serve exited with ${result.status}`);
+}
+async function serveNode(options2) {
+  const port = parsePort("--port", options2.port);
+  const plan2 = planServe(await tailscaleStatus(), await serveConfig(), port);
+  if (plan2.alreadyServing) {
+    console.log(chalk257.dim(`${plan2.url} already serves ${plan2.target}`));
+  } else {
+    runServe(plan2.args);
+    console.log(chalk257.green(`Serving ${plan2.target} at ${plan2.url}`));
   }
-  for (const line of tail.lines) console.log(line);
+  console.log("Link this node from another node with:");
+  console.log(
+    `  assist sessions nodes link ${resolveNodeName()} --tailscale ${plan2.host} --port ${port}`
+  );
 }
 
 // src/commands/sessions/nodes/unlinkNode.ts
-import chalk257 from "chalk";
+import chalk258 from "chalk";
 async function unlinkNode(name) {
   const links2 = readLinks();
   const remaining = links2.filter((link3) => link3.name !== name);
   if (remaining.length === links2.length) {
-    console.log(chalk257.yellow(`No link named ${name}`));
+    console.log(chalk258.yellow(`No link named ${name}`));
     return;
   }
   await writeLinks(remaining);
-  console.log(chalk257.green(`Unlinked ${name}`));
+  console.log(chalk258.green(`Unlinked ${name}`));
   await notifyDaemonLinks();
 }
 
 // src/commands/sessions/nodes/registerNodes.ts
 function registerNodes(sessions) {
   const cmd = sessions.command("nodes").description("List this node and every linked node with its link state").option("--json", "Output as JSON").action(listNodes);
-  cmd.command("link <name> [url]").description(
-    "Link a peer node by its web server URL, by its Tailscale name with --tailscale and --port, or over ssh with --ssh and --port (name must match the peer's sessions.nodeName)"
-  ).option(
-    "--tailscale <host>",
-    "Dial the peer at https://<host>.<tailnet>.ts.net:<port> (the peer runs tailscale serve for its web server port)"
-  ).option(
-    "--ssh <alias>",
-    "Tunnel to the peer through this ~/.ssh/config alias"
-  ).option(
-    "--port <port>",
-    "The peer's web server port (with --tailscale or --ssh)"
-  ).option(
-    "--local-port <port>",
-    "Local end of the ssh tunnel (default: 43000 + port % 1000, bumped past other links)"
-  ).action(linkNode);
+  registerLinkCommand(cmd);
   cmd.command("unlink <name>").description("Remove a linked node").action(unlinkNode);
+  cmd.command("serve").description(
+    "Expose this node's web server on the tailnet with tailscale serve (idempotent) and print the command that links it"
+  ).option("-p, --port <port>", "This node's web server port", "3100").action(serveNode);
   cmd.command("doctor [name]").description(
     "Probe each hop of every link (or one) in order and stop at the first failure with a remediation"
   ).option("--json", "Output as JSON").action(
@@ -47988,7 +48052,7 @@ async function renameSession(title) {
 
 // src/commands/sessions/summarise.ts
 import * as fs58 from "fs";
-import chalk258 from "chalk";
+import chalk259 from "chalk";
 
 // src/commands/sessions/summarise/shared.ts
 import * as fs57 from "fs";
@@ -48047,22 +48111,22 @@ ${firstMessage}`);
 async function summarise2(options2) {
   const files = await discoverSessionFiles();
   if (files.length === 0) {
-    console.log(chalk258.yellow("No sessions found."));
+    console.log(chalk259.yellow("No sessions found."));
     return;
   }
   const toProcess = selectCandidates(files, options2);
   if (toProcess.length === 0) {
-    console.log(chalk258.green("All sessions already summarised."));
+    console.log(chalk259.green("All sessions already summarised."));
     return;
   }
   console.log(
-    chalk258.cyan(
+    chalk259.cyan(
       `Summarising ${toProcess.length} session(s) (${files.length} total)\u2026`
     )
   );
   const { succeeded, failed: failed3 } = processSessions(toProcess);
   console.log(
-    chalk258.green(`Done: ${succeeded} summarised`) + (failed3 > 0 ? chalk258.yellow(`, ${failed3} skipped`) : "")
+    chalk259.green(`Done: ${succeeded} summarised`) + (failed3 > 0 ? chalk259.yellow(`, ${failed3} skipped`) : "")
   );
 }
 function selectCandidates(files, options2) {
@@ -48082,16 +48146,16 @@ function processSessions(files) {
   let failed3 = 0;
   for (let i = 0; i < files.length; i++) {
     const file = files[i];
-    process.stdout.write(chalk258.dim(`  [${i + 1}/${files.length}] `));
+    process.stdout.write(chalk259.dim(`  [${i + 1}/${files.length}] `));
     const summary = summariseSession(file);
     if (summary) {
       writeSummary(file, summary);
       succeeded++;
-      process.stdout.write(`${chalk258.green("\u2713")} ${summary}
+      process.stdout.write(`${chalk259.green("\u2713")} ${summary}
 `);
     } else {
       failed3++;
-      process.stdout.write(` ${chalk258.yellow("skip")}
+      process.stdout.write(` ${chalk259.yellow("skip")}
 `);
     }
   }
@@ -48121,10 +48185,10 @@ function registerSessions(program2) {
 }
 
 // src/reportCliError.ts
-import chalk259 from "chalk";
+import chalk260 from "chalk";
 function reportCliError(error) {
   if (error instanceof InvalidItemIdError || error instanceof AmbiguousRepoConfigError || error instanceof UnknownRepoConfigError || error instanceof MissingRunCwdError || error instanceof MiroExtractError) {
-    console.error(chalk259.red(error.message));
+    console.error(chalk260.red(error.message));
   } else {
     console.error(error);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.750.0",
+	"version": "0.751.0",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {