toyon 0.9.0 → 0.10.0

package/dist/cli.js

@@ -3,7 +3,7 @@
 
 // src/cli.ts
 import { existsSync as existsSync10, statSync as statSync4 } from "fs";
-import { join as join8, resolve } from "path";
+import { join as join7, resolve } from "path";
 
 // ../shared/src/daemon.ts
 var DAEMON_FILES = {
@@ -5083,6 +5083,28 @@ function describeManaged(p) {
   return out;
 }
 
+// ../shared/src/pair.ts
+var isTailnetName = (host) => host.endsWith(".ts.net");
+var listed = (names) => names.length < 2 ? names[0] ?? "" : `${names.slice(0, -1).join(", ")} and ${names.at(-1)}`;
+function tailnetLine(phones) {
+  if (phones === null)
+    return { ok: true, text: "Your phone needs Tailscale on, signed in to the same tailnet." };
+  if (phones.length === 0) {
+    return {
+      ok: false,
+      text: "No phone has joined your tailnet. Install Tailscale on it and sign in to the same account first."
+    };
+  }
+  const on = phones.filter((p) => p.online).map((p) => p.name);
+  if (on.length > 0)
+    return { ok: true, text: `${listed(on)} ${on.length > 1 ? "are" : "is"} on your tailnet.` };
+  const off = phones.map((p) => p.name);
+  return {
+    ok: false,
+    text: `${listed(off)} ${off.length > 1 ? "are" : "is"} not answering on your tailnet. Check Tailscale is on there.`
+  };
+}
+
 // ../shared/src/ports.ts
 var DAEMON_DEFAULT_PORT = 4141;
 
@@ -5130,6 +5152,16 @@ function installCommand(method, version) {
     return ["bun", "add", "-g", `toyon@${version}`];
   return null;
 }
+function restartCommand(method, version, onPath = "none", registry = null) {
+  if (method !== "npx")
+    return "toyon restart";
+  const install = installCommand(onPath, version);
+  if (!install)
+    return `npx toyon@${version} restart`;
+  if (registry)
+    install.push(`--registry=${registry}`);
+  return `${install.join(" ")} && toyon restart`;
+}
 function newer(a, b) {
   const pa = parseVersion(a);
   const pb = parseVersion(b);
@@ -5158,7 +5190,7 @@ function parseVersion(v) {
 // package.json
 var package_default = {
   name: "toyon",
-  version: "0.9.0",
+  version: "0.10.0",
   description: "Toyon is where coding agents work on your web app while you check each change by using it. Every chat gets its own running copy with a live preview.",
   license: "MIT",
   type: "module",
@@ -5219,11 +5251,26 @@ import { homedir } from "os";
 import { join as join2 } from "path";
 
 // src/layout.ts
-import { existsSync } from "fs";
-import { dirname, join } from "path";
+import { existsSync, realpathSync } from "fs";
+import { delimiter, dirname, join } from "path";
 import { fileURLToPath } from "url";
 var here = dirname(fileURLToPath(import.meta.url));
 var packaged = existsSync(join(here, "daemon.js"));
+var method = installMethod(packaged ? join(here, "..", "package.json") : null);
+function installOnPath() {
+  for (const dir of (process.env.PATH ?? "").split(delimiter)) {
+    if (dir === "" || dir.includes("/_npx/"))
+      continue;
+    const bin = join(dir, "toyon");
+    if (!existsSync(bin))
+      continue;
+    try {
+      return installMethod(realpathSync(bin));
+    } catch {}
+  }
+  return "none";
+}
+var restartCmd = restartCommand(method, package_default.version, method === "npx" ? installOnPath() : "none", process.env.npm_config_registry ?? null);
 var daemonEntry = packaged ? join(here, "daemon.js") : join(here, "../../daemon/src/index.ts");
 var iconSvg = packaged ? join(here, "shell", "icon.svg") : join(here, "../../shell/public/icon.svg");
 
@@ -6177,7 +6224,7 @@ function policyLines(m, daemon) {
   else
     lines.push(line(true, "policy", `${m.source}: ${describeManaged(m.policy).join(", ") || "nothing turned off"}`));
   if (daemon && (daemon.source !== m.source || daemon.hash !== m.hash)) {
-    lines.push(line(false, "daemon", "read an older policy; `toyon restart` applies this one"));
+    lines.push(line(false, "daemon", `read an older policy; \`${restartCmd}\` applies this one`));
   }
   return lines;
 }
@@ -6191,7 +6238,7 @@ function agentLines(agents) {
       continue;
     const state = a.installed === null ? `${a.id} ${a.pinned} is not installed` : `${a.id} runs ${a.installed}, not the pinned ${a.pinned}`;
     if (a.error)
-      lines.push(line(false, "agents", `${state}: ${a.error}. \`toyon restart\` tries again`));
+      lines.push(line(false, "agents", `${state}: ${a.error}. \`${restartCmd}\` tries again`));
     else
       lines.push(line(true, "agents", `${state}; it may still be installing`));
   }
@@ -6228,7 +6275,7 @@ async function doctor() {
     if (h.agents)
       lines.push(...agentLines(h.agents));
     if (version !== package_default.version) {
-      lines.push(line(false, "version", `cli is ${package_default.version} and the daemon is ${version}; \`toyon restart\` brings them level`));
+      lines.push(line(false, "version", `cli is ${package_default.version} and the daemon is ${version}; \`${restartCmd}\` brings them level`));
     }
     if (h.updates?.managedBy === "policy") {
       lines.push(line(true, "updates", "off by your organization's policy"));
@@ -7951,6 +7998,11 @@ ${qrText(qrModules(mint.url))}
 `);
   console.log("Scan with your phone's camera. The code works once and lasts 2 minutes.");
   console.log(mint.url);
+  if (isTailnetName(new URL(mint.url).hostname)) {
+    const r = await fetch(`${base}/pair/phones`, { headers: { authorization: `Bearer ${token}` } }).catch(() => null);
+    const phones = r?.ok ? await r.json() : null;
+    console.log(tailnetLine(phones).text);
+  }
   return null;
 }
 async function pair() {
@@ -8149,7 +8201,7 @@ async function remote(cmd) {
     } catch (e) {
       if (!(e instanceof TailscaleError))
         throw e;
-      if (was?.host.endsWith(".ts.net"))
+      if (was && isTailnetName(was.host))
         console.error(`toyon: could not remove tailscale serve entries: ${e.message}`);
     }
   } else if (cmd.to !== null) {
@@ -8310,7 +8362,6 @@ async function uninstall(opts) {
 
 // src/update.ts
 import { spawnSync as spawnSync2 } from "child_process";
-import { join as join7 } from "path";
 var WAIT_MS2 = 15000;
 async function update() {
   const managed = await loadManaged();
@@ -8320,7 +8371,6 @@ async function update() {
     console.error("updates are turned off for this machine (TOYON_UPDATES=off)");
     return 1;
   }
-  const method = installMethod(packaged ? join7(here, "..", "package.json") : null);
   if (method === "none") {
     console.error("toyon update works on a global npm or bun install, and this Toyon is not one; update it the way it was installed");
     return 1;
@@ -8374,7 +8424,7 @@ async function restartOnto(version) {
   }
   const token = readToken();
   if (!token) {
-    console.error("the daemon token is missing, so the daemon cannot be asked to restart; `toyon restart` does it by hand");
+    console.error(`the daemon token is missing, so the daemon cannot be asked to restart; \`${restartCmd}\` does it by hand`);
     return 1;
   }
   const res = await fetch(`${base}/restart?token=${token}`, { method: "POST" }).catch(() => null);
@@ -8401,7 +8451,7 @@ function behind(daemonVersion) {
 async function open2(cmd) {
   const explicit = cmd.path !== null;
   const target = resolve(cmd.path ?? process.cwd());
-  const register = explicit || existsSync10(join8(target, ".git"));
+  const register = explicit || existsSync10(join7(target, ".git"));
   if (process.platform === "linux") {
     const missing = missingSandboxTools();
     const blocked = missing.length === 0 ? bwrapStartError() : null;
@@ -8418,7 +8468,7 @@ async function open2(cmd) {
       return 1;
     }
   } else if (behind(running.version)) {
-    console.log(`toyon: the running daemon is ${running.version ?? "older"}; \`toyon restart\` starts ${package_default.version}`);
+    console.log(`toyon: the running daemon is ${running.version ?? "older"}; \`${restartCmd}\` starts ${package_default.version}`);
   }
   const token = readToken();
   if (!token) {
@@ -8487,7 +8537,7 @@ async function run(cmd) {
       else if (!behind(h.version))
         console.log(`toyon ${package_default.version} (daemon ${h.version} running)`);
       else
-        console.log(`toyon ${package_default.version} (daemon ${h.version ?? "?"} running; \`toyon restart\` to update)`);
+        console.log(`toyon ${package_default.version} (daemon ${h.version ?? "?"} running; \`${restartCmd}\` to update)`);
       return 0;
     }
     case "stop":