@tarfa/cli 0.1.0 → 0.1.1

package/dist/cli.js

@@ -542,7 +542,7 @@ function findMise(home, pathVar, exists2 = existsSync) {
   return candidates.find(exists2) ?? null;
 }
 function miseCli(home) {
-  const run3 = async (mise, args, timeout) => {
+  const run4 = async (mise, args, timeout) => {
     try {
       return (await exec(mise, ["--cd", home, ...args], { timeout })).stdout.trim();
     } catch (err) {
@@ -551,10 +551,10 @@ function miseCli(home) {
     }
   };
   return {
-    install: async (mise, version) => void await run3(mise, ["use", "-g", `npm:@tarfa/cli@${version}`], 6e5),
+    install: async (mise, version) => void await run4(mise, ["use", "-g", `npm:@tarfa/cli@${version}`], 6e5),
     async locate(mise, version) {
-      const install = await run3(mise, ["where", `npm:@tarfa/cli@${version}`], 6e4);
-      const nodeHome = await run3(mise, ["where", "node"], 6e4);
+      const install = await run4(mise, ["where", `npm:@tarfa/cli@${version}`], 6e4);
+      const nodeHome = await run4(mise, ["where", "node"], 6e4);
       const cli = join2(install, "bin", "tarfa");
       const node = join2(nodeHome, "bin", "node");
       if (!install || !existsSync(cli)) throw new Error(`mise knows no install of @tarfa/cli ${version} with a bin/tarfa`);
@@ -702,29 +702,54 @@ async function backupFile(path) {
   await chmod4(copy, (await stat2(path)).mode & 511);
   return copy;
 }
+var LABEL_GONE_MS = 1e4;
+var BOOTSTRAP_TRIES = 5;
+var POLL_MS = 250;
+var RETRY_MS = 1e3;
 function serviceInstall(options) {
-  const run3 = options.run ?? systemRun;
+  const run4 = options.run ?? systemRun;
+  const sleep = options.sleep ?? ((ms) => new Promise((resolve2) => setTimeout(resolve2, ms)));
   const templates = options.templates ?? join4(packageRoot(), "templates");
   if ((options.platform ?? process.platform) === "darwin") {
     const plist = join4(options.home, "Library", "LaunchAgents", "app.tarfa.agent.plist");
     const domain = `gui/${options.uid}`;
     const legacyPlist = join4(options.home, "Library", "LaunchAgents", `${LEGACY_LABEL}.plist`);
+    const loaded = (label) => run4("launchctl", ["print", `${domain}/${label}`]).then(() => true, () => false);
+    const untilGone = async (label) => {
+      for (let waited = 0; waited < LABEL_GONE_MS && await loaded(label); waited += POLL_MS) await sleep(POLL_MS);
+    };
     return {
       kind: "launchd",
       template: () => readFile3(join4(templates, "app.tarfa.agent.plist"), "utf8"),
       installed: () => readOrNull2(plist),
       backup: () => backupFile(plist),
-      enabled: () => run3("launchctl", ["print", `${domain}/app.tarfa.agent`]).then(() => true, () => false),
+      enabled: () => loaded("app.tarfa.agent"),
       async install(text) {
         await atomicWrite(plist, text, 420);
-        await run3("launchctl", ["bootout", `${domain}/app.tarfa.agent`]).catch(() => void 0);
-        await run3("launchctl", ["bootstrap", domain, plist]);
-        return [`wrote ${plist}`, `launchctl bootstrap ${domain}`];
+        await run4("launchctl", ["bootout", `${domain}/app.tarfa.agent`]).catch(() => void 0);
+        await untilGone("app.tarfa.agent");
+        let failure;
+        for (let attempt2 = 1; attempt2 <= BOOTSTRAP_TRIES; attempt2++) {
+          try {
+            await run4("launchctl", ["bootstrap", domain, plist]);
+            return [`wrote ${plist}`, `launchctl bootstrap ${domain}${attempt2 > 1 ? ` (try ${attempt2})` : ""}`];
+          } catch (err) {
+            failure = err;
+            if (attempt2 < BOOTSTRAP_TRIES) await sleep(RETRY_MS);
+          }
+        }
+        const reason = failure instanceof Error ? failure.message : String(failure);
+        if (await loaded("app.tarfa.agent")) {
+          throw new Error(`the agent already loaded keeps running its old definition: ${reason} (${BOOTSTRAP_TRIES} tries). The new ${plist} is in place: run \`launchctl bootout ${domain}/app.tarfa.agent\`, wait until \`launchctl print ${domain}/app.tarfa.agent\` fails, then \`launchctl bootstrap ${domain} ${plist}\``);
+        }
+        throw new Error(`no agent is loaded: ${reason} (${BOOTSTRAP_TRIES} tries). The new ${plist} is in place: load it with \`launchctl bootstrap ${domain} ${plist}\`, then run tarfa setup again`);
       },
       legacyInstalled: async () => await readOrNull2(legacyPlist) !== null,
       legacyText: () => readOrNull2(legacyPlist),
+      // The old agent holds the hooks and phone ports until launchd has stopped it.
       async stopLegacy() {
-        await run3("launchctl", ["bootout", `${domain}/${LEGACY_LABEL}`]).catch(() => void 0);
+        await run4("launchctl", ["bootout", `${domain}/${LEGACY_LABEL}`]).catch(() => void 0);
+        await untilGone(LEGACY_LABEL);
         return [`launchctl bootout ${domain}/${LEGACY_LABEL}`];
       },
       async removeLegacy() {
@@ -743,7 +768,7 @@ function serviceInstall(options) {
     installed: () => readOrNull2(unit),
     backup: () => backupFile(unit),
     async enabled() {
-      const enabled = await run3("systemctl", ["--user", "is-enabled", "tarfa-agent"]).then(
+      const enabled = await run4("systemctl", ["--user", "is-enabled", "tarfa-agent"]).then(
         () => true,
         (err) => {
           if (NO_USER_MANAGER.test(String(err instanceof Error ? err.message : err))) {
@@ -752,7 +777,7 @@ function serviceInstall(options) {
           return false;
         }
       );
-      const linger = await run3("loginctl", ["show-user", options.user, "-p", "Linger", "--value"]).then((out) => out.trim() === "yes", () => false);
+      const linger = await run4("loginctl", ["show-user", options.user, "-p", "Linger", "--value"]).then((out) => out.trim() === "yes", () => false);
       return enabled && linger;
     },
     async install(text) {
@@ -765,7 +790,7 @@ function serviceInstall(options) {
         // Without linger the user's units stop at logout and do not start at boot.
         ["loginctl", ["enable-linger", options.user]]
       ];
-      for (const [command, args] of ran) await run3(command, args);
+      for (const [command, args] of ran) await run4(command, args);
       return [`wrote ${unit}`, ...copied ? [`copied ${legacyDropIns} to ${dropIns}`] : [], ...ran.map(([command, args]) => `${command} ${args.join(" ")}`)];
     },
     legacyInstalled: async () => await readOrNull2(legacyUnit) !== null,
@@ -776,14 +801,14 @@ function serviceInstall(options) {
         ["systemctl", ["--user", "stop", LEGACY_UNIT]],
         ["systemctl", ["--user", "disable", LEGACY_UNIT]]
       ];
-      for (const [command, args] of ran) await run3(command, args);
+      for (const [command, args] of ran) await run4(command, args);
       return ran.map(([command, args]) => `${command} ${args.join(" ")}`);
     },
     async removeLegacy() {
       await rm3(legacyUnit, { force: true });
       if (await exists(legacyDropIns) && !await exists(dropIns)) await cp(legacyDropIns, dropIns, { recursive: true });
       await rm3(legacyDropIns, { recursive: true, force: true });
-      await run3("systemctl", ["--user", "daemon-reload"]);
+      await run4("systemctl", ["--user", "daemon-reload"]);
       return [`removed ${legacyUnit} and its drop-ins`, "systemctl --user daemon-reload"];
     }
   };
@@ -807,12 +832,12 @@ async function readFrom(path, offset) {
   }
 }
 function agentLog(options) {
-  const run3 = options.run ?? systemRun;
+  const run4 = options.run ?? systemRun;
   const now = options.now ?? Date.now;
   if ((options.platform ?? process.platform) !== "darwin") {
     return {
       mark: async () => Math.floor(now() / 1e3),
-      since: (mark) => run3("journalctl", ["--user", "-u", "tarfa-agent", `--since=@${String(mark)}`, "--no-pager", "-o", "cat"])
+      since: (mark) => run4("journalctl", ["--user", "-u", "tarfa-agent", `--since=@${String(mark)}`, "--no-pager", "-o", "cat"])
     };
   }
   const plist = join5(options.home, "Library", "LaunchAgents", "app.tarfa.agent.plist");
@@ -844,18 +869,18 @@ import { promisify as promisify3 } from "node:util";
 var run = promisify3(execFile3);
 var systemExec = (args) => run("tailscale", args, { env: childEnv(), timeout: 3e4 });
 var NEEDS_OPERATOR = /access denied|--operator|permission denied/i;
-function tailscaleCli(exec5 = systemExec) {
+function tailscaleCli(exec4 = systemExec) {
   return {
     async status() {
       try {
-        return JSON.parse((await exec5(["status", "--json"])).stdout);
+        return JSON.parse((await exec4(["status", "--json"])).stdout);
       } catch {
         return null;
       }
     },
     async serveStatus() {
       try {
-        const { stdout } = await exec5(["serve", "status", "--json"]);
+        const { stdout } = await exec4(["serve", "status", "--json"]);
         return stdout.trim() === "" ? {} : JSON.parse(stdout);
       } catch {
         return null;
@@ -864,7 +889,7 @@ function tailscaleCli(exec5 = systemExec) {
     async serve({ port, path, target, funnel }) {
       const args = [funnel ? "funnel" : "serve", "--bg", `--https=${port}`, ...path === "/" ? [] : [`--set-path=${path}`], target];
       try {
-        await exec5(args);
+        await exec4(args);
       } catch (err) {
         const stderr = String(err.stderr ?? "").trim();
         if (NEEDS_OPERATOR.test(stderr)) throw new TailscaleOperatorError(stderr);
@@ -879,7 +904,12 @@ import { execFile as execFile4 } from "node:child_process";
 import { readFile as readFile5 } from "node:fs/promises";
 import { createServer } from "node:net";
 import { promisify as promisify4 } from "node:util";
-var exec3 = promisify4(execFile4);
+var run2 = promisify4(execFile4);
+var systemDeps = {
+  exec: async (command, args) => (await run2(command, args, { env: childEnv() })).stdout,
+  readFile: (path) => readFile5(path, "utf8")
+};
+var AGENT_COMMAND = /\bsrc\/serve\.ts\b|(^|[\s/])tarfa serve(\s|$)/;
 function isFree(port) {
   return new Promise((resolve2, reject) => {
     const server = createServer();
@@ -887,35 +917,34 @@ function isFree(port) {
     server.listen(port, "127.0.0.1", () => server.close(() => resolve2(true)));
   });
 }
-async function listenerPid(port, platform) {
+async function listenerPid(port, platform, deps) {
   try {
     if (platform === "darwin") {
-      const { stdout: stdout2 } = await exec3("lsof", ["-nP", `-iTCP:${port}`, "-sTCP:LISTEN", "-t"], { env: childEnv() });
+      const stdout2 = await deps.exec("lsof", ["-nP", `-iTCP:${port}`, "-sTCP:LISTEN", "-t"]);
       const pid2 = Number(stdout2.trim().split("\n")[0]);
       return pid2 > 0 ? pid2 : null;
     }
-    const { stdout } = await exec3("ss", ["-ltnpH", `sport = :${port}`], { env: childEnv() });
+    const stdout = await deps.exec("ss", ["-ltnpH", `sport = :${port}`]);
     const pid = /pid=(\d+)/.exec(stdout)?.[1];
     return pid ? Number(pid) : null;
   } catch {
     return null;
   }
 }
-async function isAgent(pid, platform) {
+async function isAgent(pid, platform, deps) {
   try {
     if (platform === "darwin") {
-      const { stdout } = await exec3("ps", ["-o", "command=", "-p", String(pid)], { env: childEnv() });
-      return /\bsrc\/serve\.ts\b/.test(stdout);
+      return AGENT_COMMAND.test((await deps.exec("ps", ["-o", "command=", "-p", String(pid)])).trim());
     }
-    return /\/(tarfa|perch)-agent\.service\b/.test(await readFile5(`/proc/${pid}/cgroup`, "utf8"));
+    return /\/(tarfa|perch)-agent\.service\b/.test(await deps.readFile(`/proc/${pid}/cgroup`));
   } catch {
     return false;
   }
 }
-async function portOwner(port, platform = process.platform) {
+async function portOwner(port, platform = process.platform, deps = systemDeps) {
   if (await isFree(port)) return "free";
-  const pid = await listenerPid(port, platform);
-  return pid !== null && await isAgent(pid, platform) ? "ours" : "other";
+  const pid = await listenerPid(port, platform, deps);
+  return pid !== null && await isAgent(pid, platform, deps) ? "ours" : "other";
 }
 
 // src/infrastructure/listener-check.ts
@@ -971,13 +1000,13 @@ async function mintPairingLink(deps, input) {
 // src/infrastructure/agent-service.ts
 import { execFile as execFile5 } from "node:child_process";
 import { promisify as promisify5 } from "node:util";
-var exec4 = promisify5(execFile5);
+var exec3 = promisify5(execFile5);
 function agentService(platform = process.platform, uid = process.getuid?.() ?? 0) {
   return {
     async restart() {
       const [command, args] = platform === "darwin" ? ["launchctl", ["kickstart", "-k", `gui/${uid}/app.tarfa.agent`]] : ["systemctl", ["--user", "restart", "tarfa-agent"]];
       try {
-        await exec4(command, args, { env: childEnv() });
+        await exec3(command, args, { env: childEnv() });
       } catch (err) {
         const stderr = err.stderr?.trim();
         throw new Error(`${command} ${args.join(" ")} failed${stderr ? `: ${stderr}` : ""}`);
@@ -1107,13 +1136,13 @@ function loginShell(shell = process.env.SHELL || "/bin/sh") {
     execFile6(shell, ["-lc", script], { env: childEnv(), timeout: 15e3 }, (err, stdout) => err ? reject(err) : resolve2(stdout));
   });
 }
-function codexVersions(run3 = loginShell()) {
+function codexVersions(run4 = loginShell()) {
   return async () => {
     const [cliOut, daemonOut] = await Promise.all([
-      run3("codex --version").catch((err) => {
+      run4("codex --version").catch((err) => {
         throw new Error(`cannot run codex --version: ${err.message}`);
       }),
-      run3("codex app-server daemon version").catch((err) => {
+      run4("codex app-server daemon version").catch((err) => {
         throw new Error(`cannot read the Codex app server's version: ${err.message}`);
       })
     ]);
@@ -1166,7 +1195,7 @@ async function cliState(home, env) {
   };
 }
 var CODEX_NEXT_STEP = "open Codex and trust the Tarfa hooks in /hooks; repeat after any hook change";
-async function run2(argv, rawEnv, home, io = {}) {
+async function run3(argv, rawEnv, home, io = {}) {
   const env = withLegacyEnv(rawEnv);
   if (argv[0] === "--version" || argv[0] === "-v") return packageVersion();
   if (argv[0] === "setup") return setup(argv.slice(1), env, home, io);
@@ -1605,8 +1634,9 @@ Sets this machine up as a Tarfa agent, without prompting: agent.env (backed up f
 for an installed package), the launcher the service runs (~/.tarfa/bin/tarfa-agent), the
 agent key, a new device roster that admits pairing codes only (an existing one is kept), the service started at boot (systemd
 user unit with linger, or launchd), the Claude Code hooks, and optionally a Tailscale address for
-phones. Rerunning it with the same flags changes nothing. It refuses rather than replace anything
-it did not make (an agent key, a token, another tailscale serve entry).
+phones. Rerunning it with the same flags, or with none, changes nothing: --machine-id, --project-roots,
+--phone-port and --default-path default to what the agent.env it finds holds. It refuses rather than
+replace anything it did not make (an agent key, a token, another tailscale serve entry).
 
   --machine-id <id>             the name phones show for this machine
   --project-roots <dir,dir>     absolute folders new workspaces may be made in
@@ -1689,22 +1719,23 @@ async function setup(argv, env, home, io) {
   } else {
     envText = await readText(envPath);
   }
-  const adopting = adoptRequested || cloneRepo !== null;
-  const given = adopting ? withLegacyEnv(parseEnvFile(envText ?? "")) : {};
-  const filled = (name, value) => value !== void 0 && !argv.includes(name) ? [name, value] : [];
-  const flags = parseSetupFlags(
-    adopting ? [
-      ...argv,
-      ...filled("--machine-id", given.TARFA_MACHINE_ID),
-      ...filled("--project-roots", given.TARFA_PROJECT_ROOTS?.split(":").join(",")),
-      ...filled("--phone-port", given.TARFA_PHONE_PORT),
-      ...filled("--default-path", given.TARFA_DEFAULT_PATH)
-    ] : argv
-  );
-  if ("error" in flags) throw new UsageError(`${flags.error}
+  const given = withLegacyEnv(parseEnvFile(envText ?? ""));
+  const filled = (name, value) => value !== void 0 && value !== "" && !argv.includes(name) ? [name, value] : [];
+  const flags = parseSetupFlags([
+    ...argv,
+    ...filled("--machine-id", given.TARFA_MACHINE_ID),
+    ...filled("--project-roots", given.TARFA_PROJECT_ROOTS?.split(":").join(",")),
+    ...filled("--phone-port", given.TARFA_PHONE_PORT),
+    ...filled("--default-path", given.TARFA_DEFAULT_PATH)
+  ]);
+  if ("error" in flags) {
+    const read = cloneRepo !== null && copyEnv ? joinPath(cloneRepo, "deploy", "agent.env") : envPath;
+    const source = envText === null ? `there is no ${read} yet to read them from` : `a value not given as a flag is read from ${read}`;
+    throw new UsageError(`${flags.error} (${source})
 
 ${SETUP_USAGE.split("\n")[0]}
 (tarfa setup --help for every option)`);
+  }
   const repo = await mainCheckout(kind);
   const config = loadConfig({ ...withLegacyEnv(parseEnvFile(envText ?? "")), TARFA_MACHINE_ID: flags.machineId }, home);
   const tailscale = fx.tailscale ?? tailscaleCli();
@@ -1950,7 +1981,7 @@ function formatRoster(roster) {
 }
 if (isEntrypoint(import.meta.url, process.argv[1])) {
   const argv = process.argv.slice(2);
-  const program = argv[0] === "serve" ? import("./serve.js").then((agent) => agent.main()) : run2(argv, process.env, homedir()).then((out) => {
+  const program = argv[0] === "serve" ? import("./serve.js").then((agent) => agent.main()) : run3(argv, process.env, homedir()).then((out) => {
     process.stdout.write(`${out}
 `);
   });
@@ -1966,5 +1997,5 @@ export {
   UPDATE_USAGE,
   UsageError,
   WaitTimeout,
-  run2 as run
+  run3 as run
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarfa/cli",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Tarfa agent and CLI: serves your Claude Code terminal sessions (tmux workspaces) to the Tarfa phone app.",
   "repository": {
     "type": "git",