@dylanpiercey/work 0.0.46 → 0.0.48

package/bin/work.mjs

@@ -1,7 +1,8 @@
 #!/usr/bin/env node
 // work CLI — ships with the npm package (no dependencies; plain node).
 //
-//   work setup    install/refresh the background service (+ optional tunnel)
+//   work setup    install missing tools, sign in, install/refresh the background service
+//   work doctor   report machine readiness (--json, --fix to install what's missing)
 //   work start    run the server in the foreground
 //   work update   upgrade the npm package and refresh the service
 //   work usage    print agent plan/quota usage
@@ -12,6 +13,9 @@ import os from "node:os";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { createRequire } from "node:module";
+import readline from "node:readline/promises";
+import { doctor, formatDoctor } from "../lib/setup/doctor.mjs";
+import { authGithub, installAgent, installTool } from "../lib/setup/install.mjs";
 
 const pkgRoot = path.dirname(path.dirname(fileURLToPath(import.meta.url)));
 const pkg = JSON.parse(fs.readFileSync(path.join(pkgRoot, "package.json"), "utf8"));
@@ -41,6 +45,9 @@ switch (command) {
   case "setup":
     await setup();
     break;
+  case "doctor":
+    await doctorCmd();
+    break;
   case "update":
     await update();
     break;
@@ -54,7 +61,7 @@ switch (command) {
     break;
   default:
     console.log(
-      `work ${pkg.version}\n\nusage: work <setup|start|update|usage|version>`,
+      `work ${pkg.version}\n\nusage: work <setup|doctor|start|update|usage|version>`,
     );
 }
 
@@ -136,51 +143,7 @@ function short(ms) {
 }
 
 async function setup() {
-  // Runtime tools. The curl installer normally provides these; a plain
-  // `npm i -g` user may be missing them.
-  for (const tool of ["git", "tmux"]) {
-    if (!have(tool)) die(`${tool} not found — install it and re-run (the curl installer does this automatically)`);
-  }
-
-  // Default toolset (mirrors DylanPiercey/start): gh for PR features plus
-  // the utilities agents reach for constantly. Static binaries via mise,
-  // each non-fatal, skipped when already on PATH.
-  if (have("mise")) {
-    const tools = [
-      "gh",
-      "ripgrep", // rg
-      "fd",
-      "jq",
-      "delta",
-      "ast-grep",
-      "hyperfine",
-      "fzf",
-      "bottom",
-      "pnpm",
-    ];
-    // Note: ast-grep's short alias `sg` collides with the coreutils
-    // setgroups command — check the long binary name.
-    const binOf = { ripgrep: "rg", bottom: "btm" };
-    for (const tool of tools) {
-      if (have(binOf[tool] || tool)) continue;
-      log(`installing ${tool} via mise`);
-      if (spawnSync("mise", ["use", "-g", "-y", `${tool}@latest`], { stdio: "inherit" }).status !== 0) {
-        warn(`${tool} install failed (non-fatal)`);
-      }
-    }
-  } else if (!have("gh")) {
-    warn("gh not found and mise unavailable — PR features need gh; install it and re-run");
-  }
-  if (have("gh") && spawnSync("gh", ["auth", "status"], { stdio: "ignore" }).status !== 0) {
-    if (process.env.GH_TOKEN || process.env.GITHUB_TOKEN) {
-      log("gh will use GH_TOKEN from the environment");
-    } else if (yes) {
-      warn("gh is not authenticated — run `gh auth login` later");
-    } else {
-      log("authenticating gh (GitHub PRs/clones)");
-      sh("gh", ["auth", "login"]);
-    }
-  }
+  await fix(await doctor(), { agents: yes ? "skip" : "prompt" });
 
   // One-shot cleanups between versions. Run them against the settings the
   // service actually uses: migrate.mjs exits quietly when it finds no db, so
@@ -206,6 +169,73 @@ async function update() {
   sh("work", ["setup", ...(yes ? ["--yes"] : [])]);
 }
 
+/** Machine readiness from lib/setup — the same probe the Settings page runs. */
+async function doctorCmd() {
+  let d = await doctor();
+  if (args.includes("--fix")) {
+    await fix(d, { agents: yes ? "skip" : "prompt" });
+    d = await doctor();
+  }
+  if (args.includes("--json")) return console.log(JSON.stringify(d, null, 2));
+  console.log(formatDoctor(d));
+  if (!d.ready) process.exit(1);
+}
+
+/**
+ * Bring the machine to "ready": required tools, then optional ones (each
+ * non-fatal), then gh sign-in, then agent CLIs. `--yes` never prompts —
+ * sign-in and agents are deferred with a hint. Re-runs are idempotent
+ * because everything is keyed off what doctor() found missing.
+ */
+async function fix(d, { agents = "prompt" } = {}) {
+  for (const tool of d.tools.filter((t) => !t.installed)) {
+    if (!tool.installable) {
+      if (tool.required) die(`${tool.label} not found — install it and re-run (the curl installer does this automatically)`);
+      continue;
+    }
+    log(`installing ${tool.label} via mise`);
+    try {
+      await installTool(tool.id, { log: (l) => console.log(`    ${l}`) });
+    } catch (err) {
+      if (tool.required) die(`${tool.label} install failed: ${err.message}`);
+      warn(`${tool.label} install failed (non-fatal)`);
+    }
+  }
+  const authed = d.github.some((h) => h.authed);
+  if (!authed && have("gh")) {
+    if (process.env.GH_TOKEN || process.env.GITHUB_TOKEN) {
+      log("gh will use GH_TOKEN from the environment");
+    } else if (yes) {
+      warn("gh is not authenticated — run `gh auth login` later");
+    } else {
+      log("signing in to GitHub (PRs/clones)");
+      await authGithub("github.com", { interactive: true }).catch((err) => warn(err.message));
+    }
+  }
+  const missingAgents = d.agents.filter((a) => !a.installed);
+  if (missingAgents.length && agents !== "skip") {
+    const names = missingAgents.map((a) => a.label).join(", ");
+    let go = agents === "all";
+    if (!go) {
+      const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+      const ans = await rl.question(`Install coding agent CLIs (${names})? [y/N] `).catch(() => "");
+      rl.close();
+      go = /^y/i.test(ans.trim());
+    }
+    if (go) {
+      for (const a of missingAgents) {
+        try {
+          await installAgent(a.id, { log: (l) => console.log(`    ${l}`) });
+        } catch (err) {
+          warn(`${a.label} install failed (non-fatal): ${err.message}`);
+        }
+      }
+    }
+  } else if (!d.agents.some((a) => a.installed)) {
+    warn(`no coding agent CLI found — install one later from Settings or: work doctor --fix`);
+  }
+}
+
 /** PATH baked into the service — it runs without a login shell. */
 function servicePath() {
   const home = os.homedir();
@@ -295,10 +325,11 @@ function isWorkServerCmd(cmd) {
     /\bwork\.mjs\s+start(?:\s|$)/.test(cmd) ||
     /(?:^|[\s/])work\s+start(?:\s|$)/.test(cmd) ||
     /run-prod\.sh/.test(cmd) ||
+    /run-local\.sh/.test(cmd) ||
     /--why=work server is running/.test(cmd) ||
     /--why="work server is running"/.test(cmd) ||
     (/@dylanpiercey\/work\//.test(cmd) && !/\bnpm\b/.test(cmd)) ||
-    /\/work\/(?:\S*\/)?dist\/index\.mjs/.test(cmd)
+    /\/work\/(?:\S*\/)?(?:dist|\.run)\/index\.mjs/.test(cmd)
   );
 }
 
@@ -368,7 +399,11 @@ function stopOldCopies(port) {
         if (!name.endsWith(".plist")) continue;
         const file = path.join(agents, name);
         const text = fs.readFileSync(file, "utf8");
-        if (!/dev\.work\.app|work\.mjs|run-prod\.sh|@dylanpiercey\/work/.test(text))
+        if (
+          !/dev\.work\.app|work\.mjs|run-prod\.sh|run-local\.sh|@dylanpiercey\/work/.test(
+            text,
+          )
+        )
           continue;
         const label = text.match(
           /<key>Label<\/key>\s*<string>([^<]+)<\/string>/,