aicomputer 0.1.17 → 0.1.18

package/dist/index.js

@@ -2,7 +2,7 @@
 import {
   formatMountHostInstallGuidance,
   getMountHostValidationIssues
-} from "./chunk-OWK5N76S.js";
+} from "./chunk-JMRAYXUO.js";
 import {
   ApiError,
   api,
@@ -33,7 +33,13 @@ import {
   timeAgo,
   vncURL,
   webURL
-} from "./chunk-5IEWKH52.js";
+} from "./chunk-3ZUTAUUD.js";
+import {
+  AGENTCOMPUTER_MUTAGEN_PATH_ENV,
+  ensureBundledMutagenInstalled,
+  ensureMutagenCommandPath,
+  isAbortError
+} from "./chunk-F2U4SFJ4.js";
 import {
   defaultMountServiceConfig,
   ensureMountDirectories,
@@ -48,8 +54,8 @@ import {
 } from "./chunk-KXLTHWW3.js";
 
 // src/index.ts
-import { Command as Command14 } from "commander";
-import chalk12 from "chalk";
+import { Command as Command15 } from "commander";
+import chalk13 from "chalk";
 import { readFileSync as readFileSync3 } from "fs";
 import { basename as basename2 } from "path";
 
@@ -3561,9 +3567,35 @@ async function confirmDeletion(sourceID) {
   });
 }
 
-// src/commands/login.ts
+// src/commands/internal-install-mutagen.ts
 import { Command as Command9 } from "commander";
 import chalk7 from "chalk";
+var internalInstallMutagenCommand = new Command9("internal-install-mutagen").option("--quiet", "Suppress output unless installation fails").action(async (options) => {
+  try {
+    const executablePath = await ensureBundledMutagenInstalled();
+    if (!options.quiet) {
+      console.log();
+      console.log(
+        chalk7.green(
+          `  Bundled Mutagen ready at ${executablePath}.`
+        )
+      );
+      console.log();
+    }
+  } catch (error) {
+    if (!options.quiet) {
+      const message = error instanceof Error ? error.message : "failed to install bundled Mutagen";
+      console.error();
+      console.error(chalk7.red(`  ${message}`));
+      console.error();
+    }
+    process.exit(1);
+  }
+});
+
+// src/commands/login.ts
+import { Command as Command10 } from "commander";
+import chalk8 from "chalk";
 import ora8 from "ora";
 
 // src/lib/browser-login.ts
@@ -3831,12 +3863,12 @@ function escapeHTML(value) {
 }
 
 // src/commands/login.ts
-var loginCommand = new Command9("login").description("Authenticate the CLI").option("--api-key <key>", "API key starting with ac_live_").option("--stdin", "Read the API key from stdin").option("-f, --force", "Overwrite an existing stored API key").action(async (options) => {
+var loginCommand = new Command10("login").description("Authenticate the CLI").option("--api-key <key>", "API key starting with ac_live_").option("--stdin", "Read the API key from stdin").option("-f, --force", "Overwrite an existing stored API key").action(async (options) => {
   const existingKey = getStoredAPIKey();
   if (existingKey && !options.force) {
     console.log();
     console.log(
-      chalk7.yellow("  Already logged in. Use --force to overwrite.")
+      chalk8.yellow("  Already logged in. Use --force to overwrite.")
     );
     console.log();
     return;
@@ -3845,8 +3877,8 @@ var loginCommand = new Command9("login").description("Authenticate the CLI").opt
   const apiKey = await resolveAPIKeyInput(options.apiKey, options.stdin);
   if (!apiKey && wantsManualLogin) {
     console.log();
-    console.log(chalk7.dim("  Usage: computer login --api-key <ac_live_...>"));
-    console.log(chalk7.dim(`  API:   ${getBaseURL()}`));
+    console.log(chalk8.dim("  Usage: computer login --api-key <ac_live_...>"));
+    console.log(chalk8.dim(`  API:   ${getBaseURL()}`));
     console.log();
     process.exit(1);
   }
@@ -3856,7 +3888,7 @@ var loginCommand = new Command9("login").description("Authenticate the CLI").opt
   }
   if (!apiKey.startsWith("ac_live_")) {
     console.log();
-    console.log(chalk7.red("  API key must start with ac_live_"));
+    console.log(chalk8.red("  API key must start with ac_live_"));
     console.log();
     process.exit(1);
   }
@@ -3864,7 +3896,7 @@ var loginCommand = new Command9("login").description("Authenticate the CLI").opt
   try {
     const me = await apiWithKey(apiKey, "/v1/me");
     setAPIKey(apiKey);
-    spinner.succeed(`Logged in as ${chalk7.bold(me.user.email)}`);
+    spinner.succeed(`Logged in as ${chalk8.bold(me.user.email)}`);
   } catch (error) {
     spinner.fail(
       error instanceof Error ? error.message : "Failed to validate API key"
@@ -3884,15 +3916,15 @@ async function runBrowserLogin() {
       spinner.stop();
       console.log();
       console.log(
-        chalk7.yellow("  Browser auto-open failed. Open this URL to continue:")
+        chalk8.yellow("  Browser auto-open failed. Open this URL to continue:")
       );
-      console.log(chalk7.dim(`  ${attempt.loginURL}`));
+      console.log(chalk8.dim(`  ${attempt.loginURL}`));
       console.log();
       spinner.start("Waiting for browser login...");
     }
     spinner.text = "Waiting for browser login...";
     const result = await attempt.waitForResult();
-    spinner.succeed(`Logged in as ${chalk7.bold(result.me.user.email)}`);
+    spinner.succeed(`Logged in as ${chalk8.bold(result.me.user.email)}`);
     await continueFirstLoginFlow(result);
   } catch (error) {
     spinner.fail(
@@ -3926,8 +3958,8 @@ async function continueFirstLoginFlow(result) {
   }
   console.log();
   console.log(
-    chalk7.cyan(
-      `Continuing first-time setup for ${chalk7.bold(machineHandle)}...
+    chalk8.cyan(
+      `Continuing first-time setup for ${chalk8.bold(machineHandle)}...
 `
     )
   );
@@ -3940,8 +3972,8 @@ async function continueFirstLoginFlow(result) {
     const spinner = ora8(`Preparing SSH access for ${machineHandle}...`).start();
     try {
       const connection = await prepareSSHConnectionByIdentifier(machineHandle);
-      spinner.succeed(`Connecting to ${chalk7.bold(machineHandle)}`);
-      console.log(chalk7.dim(`  ${connection.command}`));
+      spinner.succeed(`Connecting to ${chalk8.bold(machineHandle)}`);
+      console.log(chalk8.dim(`  ${connection.command}`));
       console.log();
       await openSSHConnection(connection);
     } catch (error) {
@@ -3952,19 +3984,19 @@ async function continueFirstLoginFlow(result) {
     }
   } catch (error) {
     const message = error instanceof Error ? error.message : "Failed to finish first-time setup";
-    console.error(chalk7.red(`
+    console.error(chalk8.red(`
 ${message}`));
     console.log();
     if (result.provider === "claude") {
       console.log(
-        chalk7.dim(`  computer claude-login --machine ${machineHandle}`)
+        chalk8.dim(`  computer claude-login --machine ${machineHandle}`)
       );
     } else if (result.provider === "codex") {
       console.log(
-        chalk7.dim(`  computer codex-login --machine ${machineHandle}`)
+        chalk8.dim(`  computer codex-login --machine ${machineHandle}`)
       );
     }
-    console.log(chalk7.dim(`  computer ssh ${machineHandle}`));
+    console.log(chalk8.dim(`  computer ssh ${machineHandle}`));
     console.log();
     process.exit(1);
   }
@@ -3978,19 +4010,19 @@ async function runSelectedProvider(provider, machineHandle) {
     await runCodexLogin({ machine: machineHandle });
     return;
   }
-  console.log(chalk7.green(`Sandbox ${chalk7.bold(machineHandle)} is ready.`));
+  console.log(chalk8.green(`Sandbox ${chalk8.bold(machineHandle)} is ready.`));
   console.log();
 }
 function printNextStep(machineHandle) {
-  console.log(chalk7.green(`Sandbox ${chalk7.bold(machineHandle)} is ready.`));
-  console.log(chalk7.dim(`  computer ssh ${machineHandle}`));
+  console.log(chalk8.green(`Sandbox ${chalk8.bold(machineHandle)} is ready.`));
+  console.log(chalk8.dim(`  computer ssh ${machineHandle}`));
   console.log();
 }
 
 // src/commands/mount.ts
 import { spawn as spawn4 } from "child_process";
-import { Command as Command10, Option } from "commander";
-import chalk8 from "chalk";
+import { Command as Command11, Option } from "commander";
+import chalk9 from "chalk";
 import ora9 from "ora";
 
 // src/lib/mount-daemon.ts
@@ -4007,7 +4039,7 @@ function getMountControllerState(rootPath = defaultMountServiceConfig().rootPath
   return { running: true, pid: lock.pid };
 }
 async function runMountDaemon(config, options = {}) {
-  const { onStarted } = options;
+  const { onReady, onStarted } = options;
   const paths = getMountPaths(config.rootPath);
   ensureMountDirectories(paths);
   await mkdir3(paths.rootPath, { recursive: true });
@@ -4017,16 +4049,35 @@ async function runMountDaemon(config, options = {}) {
       updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
       controllerPid: process.pid,
       running: true,
+      startupPhase: "starting",
+      startupMessage: "Starting mount controller...",
       mounts: []
     },
     config.rootPath
   );
   onStarted?.();
+  writeMountStatusSnapshot(
+    {
+      ...readMountStatusSnapshot(config.rootPath) ?? {
+        controllerPid: process.pid,
+        running: true,
+        mounts: []
+      },
+      updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      controllerPid: process.pid,
+      running: true,
+      startupPhase: "cleaning",
+      startupMessage: "Cleaning stale mount state..."
+    },
+    config.rootPath
+  );
   await teardownManagedSessions(config, paths);
+  await mkdir3(paths.rootPath, { recursive: true });
   let running = false;
   let queued = false;
   let shuttingDown = false;
   let activeRun = null;
+  let activeRunController = null;
   const runOnce = async () => {
     if (shuttingDown) {
       return;
@@ -4035,12 +4086,19 @@ async function runMountDaemon(config, options = {}) {
       queued = true;
       return activeRun ?? void 0;
     }
+    const controller = new AbortController();
+    activeRunController = controller;
     activeRun = (async () => {
       running = true;
       try {
-        await reconcileMounts(config, paths, process.pid);
+        await reconcileMounts(
+          config,
+          paths,
+          process.pid,
+          controller.signal
+        );
       } catch (error) {
-        if (shuttingDown) {
+        if (shuttingDown && isAbortError(error)) {
           return;
         }
         const previous = readMountStatusSnapshot(config.rootPath);
@@ -4049,6 +4107,8 @@ async function runMountDaemon(config, options = {}) {
             updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
             controllerPid: process.pid,
             running: true,
+            startupPhase: previous?.startupPhase === "ready" ? "ready" : "syncing",
+            startupMessage: previous?.startupPhase === "ready" ? void 0 : "Waiting for initial sync...",
             lastHealthySyncAt: previous?.lastHealthySyncAt,
             lastSuccessfulSyncAt: previous?.lastSuccessfulSyncAt,
             lastIssueAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -4064,6 +4124,7 @@ async function runMountDaemon(config, options = {}) {
       } finally {
         running = false;
         activeRun = null;
+        activeRunController = null;
         if (queued && !shuttingDown) {
           queued = false;
           void runOnce();
@@ -4079,6 +4140,21 @@ async function runMountDaemon(config, options = {}) {
     server.once("error", reject);
     server.listen(paths.socketPath, () => resolve());
   });
+  writeMountStatusSnapshot(
+    {
+      ...readMountStatusSnapshot(config.rootPath) ?? {
+        controllerPid: process.pid,
+        running: true,
+        mounts: []
+      },
+      updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      controllerPid: process.pid,
+      running: true,
+      startupPhase: "syncing",
+      startupMessage: "Waiting for initial sync..."
+    },
+    config.rootPath
+  );
   const interval = setInterval(() => {
     void runOnce();
   }, config.pollIntervalMs);
@@ -4089,6 +4165,7 @@ async function runMountDaemon(config, options = {}) {
     shuttingDown = true;
     clearInterval(interval);
     server.close();
+    activeRunController?.abort();
     if (activeRun) {
       await activeRun.catch(() => {
       });
@@ -4100,6 +4177,8 @@ async function runMountDaemon(config, options = {}) {
         updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
         controllerPid: previous?.controllerPid,
         running: false,
+        startupPhase: void 0,
+        startupMessage: void 0,
         lastHealthySyncAt: previous?.lastHealthySyncAt,
         lastSuccessfulSyncAt: previous?.lastSuccessfulSyncAt,
         lastIssueAt: previous?.lastIssueAt,
@@ -4119,6 +4198,8 @@ async function runMountDaemon(config, options = {}) {
     void shutdown();
   });
   await runOnce();
+  writeMountStatusSnapshot(markMountStartupReady(readMountStatusSnapshot(config.rootPath), process.pid), config.rootPath);
+  onReady?.();
   await new Promise(() => {
   });
 }
@@ -4147,41 +4228,69 @@ function processExists(pid) {
     return false;
   }
 }
+function markMountStartupReady(snapshot, controllerPid) {
+  return {
+    updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    controllerPid,
+    running: true,
+    startupPhase: "ready",
+    startupMessage: void 0,
+    lastHealthySyncAt: snapshot?.lastHealthySyncAt,
+    lastSuccessfulSyncAt: snapshot?.lastSuccessfulSyncAt,
+    lastIssueAt: snapshot?.lastIssueAt,
+    lastIssue: snapshot?.lastIssue,
+    lastError: snapshot?.lastError,
+    mounts: snapshot?.mounts ?? []
+  };
+}
 
 // src/commands/mount.ts
-var mountCommand = new Command10("mount").description("Mirror SSH-ready machines under ~/agentcomputer with a local mount controller").option("--alias <alias>", "SSH host alias", "agentcomputer.ai").option("--host <host>", "SSH gateway host", "ssh.agentcomputer.ai").option("--port <port>", "SSH gateway port", "443").option("--poll-interval <ms>", "Reconcile interval in milliseconds", "5000").option("--connect-timeout <seconds>", "SSH connect timeout for Mutagen", "5").option(
+var MOUNT_START_SPINNER = {
+  interval: 90,
+  frames: ["\u25F0", "\u25F3", "\u25F2", "\u25F1"]
+};
+var mountCommand = new Command11("mount").description("Mirror SSH-ready machines under ~/agentcomputer with a local mount controller").option("--alias <alias>", "SSH host alias", "agentcomputer.ai").option("--host <host>", "SSH gateway host", "ssh.agentcomputer.ai").option("--port <port>", "SSH gateway port", "443").option("--poll-interval <ms>", "Reconcile interval in milliseconds", "5000").option("--connect-timeout <seconds>", "SSH connect timeout for Mutagen", "5").option(
   "--background",
   "Run the mount controller in the background and print its PID"
-).addOption(new Option("--daemonized").hideHelp()).action(async (options) => {
-  const spinner = ora9(
-    options.background ? "Starting machine mount controller in background..." : "Starting machine mount controller..."
-  ).start();
+).addOption(new Option("--daemonized").hideHelp()).addOption(new Option("--open-root-when-ready").hideHelp()).action(async (options) => {
+  const spinner = ora9({
+    spinner: MOUNT_START_SPINNER,
+    text: options.background ? "Starting machine mount controller in background..." : "Starting machine mount controller..."
+  }).start();
   try {
     if (options.daemonized) {
-      const config2 = readMountConfig() ?? defaultMountServiceConfig();
-      await runMountDaemon(config2, {
+      const config = readMountConfig() ?? defaultMountServiceConfig();
+      await runMountDaemon(config, {
         onStarted: () => {
           spinner.succeed("Machine mount controller running");
-          printMountStartSummary(config2, process.pid, "foreground");
+          printMountStartSummary(config, process.pid, "foreground");
+        },
+        onReady: () => {
+          if (options.openRootWhenReady) {
+            revealMountRootInFinder(config.rootPath);
+          }
         }
       });
       return;
     }
-    const config = await resolveMountServiceConfig(options);
-    writeMountConfig(config);
+    const resolved = await resolveMountServiceConfig(options);
+    writeMountConfig(resolved.config);
+    process.env[AGENTCOMPUTER_MUTAGEN_PATH_ENV] = resolved.mutagenPath;
     if (options.background) {
-      const pid = await startMountControllerInBackground(config.rootPath);
+      const pid = await startMountControllerInBackground(resolved.config.rootPath);
       spinner.succeed("Machine mount controller running in background");
-      printMountStartSummary(config, pid, "background");
+      printMountStartSummary(resolved.config, pid, "background");
       return;
     }
-    await runMountDaemon(config, {
-      onStarted: () => {
-        spinner.succeed("Machine mount controller running");
-        printMountStartSummary(config, process.pid, "foreground");
-        revealMountRootInFinder(config.rootPath);
-      }
-    });
+    const child = await startMountControllerInForeground(resolved.config.rootPath);
+    await waitForMountControllerReady(resolved.config.rootPath, child.pid, spinner);
+    spinner.succeed("Machine mount controller running");
+    printMountStartSummary(
+      resolved.config,
+      child.pid ?? process.pid,
+      "foreground"
+    );
+    await superviseForegroundMountController(child);
   } catch (error) {
     spinner.fail(
       error instanceof Error ? error.message : "Failed to start machine mount controller"
@@ -4189,40 +4298,40 @@ var mountCommand = new Command10("mount").description("Mirror SSH-ready machines
     process.exit(1);
   }
 }).addCommand(
-  new Command10("status").description("Show machine mount controller status").action(() => {
+  new Command11("status").description("Show machine mount controller status").action(() => {
     const config = readMountConfig() ?? defaultMountServiceConfig();
     const controller = getMountControllerState(config.rootPath);
     const snapshot = readMountStatusSnapshot(config.rootPath);
     console.log();
-    console.log(`  ${chalk8.bold("Machine Mounts")}`);
+    console.log(`  ${chalk9.bold("Machine Mounts")}`);
     console.log();
     console.log(
-      `  ${chalk8.dim("Running")}    ${controller.running ? chalk8.green("yes") : chalk8.dim("no")}`
+      `  ${chalk9.dim("Running")}    ${controller.running ? chalk9.green("yes") : chalk9.dim("no")}`
     );
     if (controller.pid) {
-      console.log(`  ${chalk8.dim("PID")}        ${controller.pid}`);
+      console.log(`  ${chalk9.dim("PID")}        ${controller.pid}`);
     }
-    console.log(`  ${chalk8.dim("Root")}       ${config.rootPath}`);
-    console.log(`  ${chalk8.dim("Alias")}      ${config.alias}`);
+    console.log(`  ${chalk9.dim("Root")}       ${config.rootPath}`);
+    console.log(`  ${chalk9.dim("Alias")}      ${config.alias}`);
     console.log(
-      `  ${chalk8.dim("Updated")}    ${snapshot?.updatedAt ? timeAgo(snapshot.updatedAt) : chalk8.dim("never")}`
+      `  ${chalk9.dim("Updated")}    ${snapshot?.updatedAt ? timeAgo(snapshot.updatedAt) : chalk9.dim("never")}`
     );
     console.log(
-      `  ${chalk8.dim("Healthy")}    ${snapshot?.lastHealthySyncAt ? timeAgo(snapshot.lastHealthySyncAt) : chalk8.dim("never")}`
+      `  ${chalk9.dim("Healthy")}    ${snapshot?.lastHealthySyncAt ? timeAgo(snapshot.lastHealthySyncAt) : chalk9.dim("never")}`
     );
     if (controller.running && snapshot?.mounts.length) {
       console.log();
       for (const mount of snapshot.mounts) {
         const state = formatMountState(mount.state);
-        console.log(`  ${chalk8.white(mount.handle)}  ${state}  ${chalk8.dim(mount.mountPath)}`);
+        console.log(`  ${chalk9.white(mount.handle)}  ${state}  ${chalk9.dim(mount.mountPath)}`);
         if (mount.message) {
-          console.log(`  ${chalk8.dim(mount.message)}`);
+          console.log(`  ${chalk9.dim(mount.message)}`);
         }
       }
     }
     if (snapshot?.lastIssue) {
       console.log();
-      console.log(`  ${chalk8.dim("Last issue")} ${chalk8.yellow(snapshot.lastIssue)}`);
+      console.log(`  ${chalk9.dim("Last issue")} ${chalk9.yellow(snapshot.lastIssue)}`);
     }
     console.log();
   })
@@ -4244,20 +4353,35 @@ async function resolveMountServiceConfig(options) {
       ].join("\n")
     );
   }
+  const mutagenPath = await ensureMutagenCommandPath();
   const sshSetup = await ensureSSHAccessConfigured(options);
   return {
-    ...defaultMountServiceConfig(),
-    alias: sshSetup.alias,
-    host: sshSetup.host,
-    port: sshSetup.port,
-    pollIntervalMs: parsePositiveInt(options.pollInterval, "poll interval"),
-    connectTimeoutSeconds: parsePositiveInt(
-      options.connectTimeout,
-      "connect timeout"
-    )
+    config: {
+      ...defaultMountServiceConfig(),
+      alias: sshSetup.alias,
+      host: sshSetup.host,
+      port: sshSetup.port,
+      pollIntervalMs: parsePositiveInt(options.pollInterval, "poll interval"),
+      connectTimeoutSeconds: parsePositiveInt(
+        options.connectTimeout,
+        "connect timeout"
+      )
+    },
+    mutagenPath
   };
 }
 async function startMountControllerInBackground(rootPath) {
+  const child = startMountControllerProcess(rootPath, true, false);
+  child.unref();
+  await waitForMountControllerRunning(rootPath, child.pid);
+  return child.pid;
+}
+async function startMountControllerInForeground(rootPath) {
+  const child = startMountControllerProcess(rootPath, false, true);
+  await waitForMountControllerRunning(rootPath, child.pid);
+  return child;
+}
+function startMountControllerProcess(rootPath, detached, openRootWhenReady) {
   const controller = getMountControllerState(rootPath);
   if (controller.running) {
     throw new Error(`computer mount is already running (pid ${controller.pid})`);
@@ -4266,20 +4390,22 @@ async function startMountControllerInBackground(rootPath) {
   if (!entrypoint) {
     throw new Error("unable to determine CLI entrypoint for background mount");
   }
-  const child = spawn4(process.execPath, [entrypoint, "mount", "--daemonized"], {
+  const args = ["mount", "--daemonized"];
+  if (openRootWhenReady) {
+    args.push("--open-root-when-ready");
+  }
+  const child = spawn4(process.execPath, [entrypoint, ...args], {
     cwd: process.cwd(),
-    detached: true,
+    detached,
     env: process.env,
     stdio: "ignore"
   });
   if (!child.pid) {
-    throw new Error("failed to start machine mount controller in background");
+    throw new Error("failed to start machine mount controller");
   }
-  child.unref();
-  await waitForBackgroundMountController(rootPath, child.pid);
-  return child.pid;
+  return child;
 }
-async function waitForBackgroundMountController(rootPath, pid) {
+async function waitForMountControllerRunning(rootPath, pid) {
   const deadline = Date.now() + 3e3;
   while (Date.now() < deadline) {
     const controller = getMountControllerState(rootPath);
@@ -4293,15 +4419,77 @@ async function waitForBackgroundMountController(rootPath, pid) {
   }
   throw new Error("failed to start machine mount controller in background");
 }
+async function waitForMountControllerReady(rootPath, pid, spinner) {
+  const deadline = Date.now() + 12e4;
+  while (Date.now() < deadline) {
+    const controller = getMountControllerState(rootPath);
+    const snapshot = readMountStatusSnapshot(rootPath);
+    if (snapshot?.controllerPid === pid && snapshot.startupMessage) {
+      spinner.text = snapshot.startupMessage;
+    }
+    if (snapshot?.controllerPid === pid && snapshot.startupPhase === "ready") {
+      return;
+    }
+    if (!controller.running && !processExists2(pid)) {
+      break;
+    }
+    await new Promise((resolve) => setTimeout(resolve, 100));
+  }
+  throw new Error("mount controller did not finish startup");
+}
+async function superviseForegroundMountController(child) {
+  await new Promise((resolve, reject) => {
+    const cleanup = () => {
+      process.off("SIGINT", onSigint);
+      process.off("SIGTERM", onSigterm);
+      child.off("error", onError);
+      child.off("exit", onExit);
+    };
+    const stopAndExit = (signal) => {
+      cleanup();
+      try {
+        child.kill(signal);
+      } catch {
+      }
+      process.exit(0);
+    };
+    const onSigint = () => {
+      stopAndExit("SIGINT");
+    };
+    const onSigterm = () => {
+      stopAndExit("SIGTERM");
+    };
+    const onError = (error) => {
+      cleanup();
+      reject(error);
+    };
+    const onExit = (code, signal) => {
+      cleanup();
+      if (code === 0) {
+        resolve();
+        return;
+      }
+      reject(
+        new Error(
+          signal ? `machine mount controller exited from ${signal}` : `machine mount controller exited with code ${code ?? "unknown"}`
+        )
+      );
+    };
+    process.once("SIGINT", onSigint);
+    process.once("SIGTERM", onSigterm);
+    child.once("error", onError);
+    child.once("exit", onExit);
+  });
+}
 function printMountStartSummary(config, pid, mode) {
   console.log();
-  console.log(chalk8.dim(`  PID:         ${pid}`));
-  console.log(chalk8.dim(`  Root:        ${config.rootPath}`));
-  console.log(chalk8.dim(`  SSH alias:   ${config.alias}`));
-  console.log(chalk8.dim(`  Poll:        ${config.pollIntervalMs}ms`));
+  console.log(chalk9.dim(`  PID:         ${pid}`));
+  console.log(chalk9.dim(`  Root:        ${config.rootPath}`));
+  console.log(chalk9.dim(`  SSH alias:   ${config.alias}`));
+  console.log(chalk9.dim(`  Poll:        ${config.pollIntervalMs}ms`));
   console.log();
   console.log(
-    chalk8.dim(
+    chalk9.dim(
       mode === "background" ? "  Use `computer mount status` to inspect sync state." : "  Press Ctrl-C to stop syncing."
     )
   );
@@ -4333,35 +4521,35 @@ function revealMountRootInFinder(rootPath) {
 function formatMountState(state) {
   switch (state) {
     case "mounted":
-      return chalk8.green(state);
+      return chalk9.green(state);
     case "reconnecting":
-      return chalk8.cyan(state);
+      return chalk9.cyan(state);
     case "degraded":
     case "pending":
-      return chalk8.yellow(state);
+      return chalk9.yellow(state);
     default:
-      return chalk8.red(state);
+      return chalk9.red(state);
   }
 }
 
 // src/commands/logout.ts
-import { Command as Command11 } from "commander";
-import chalk9 from "chalk";
-var logoutCommand = new Command11("logout").description("Remove stored API key").action(() => {
+import { Command as Command12 } from "commander";
+import chalk10 from "chalk";
+var logoutCommand = new Command12("logout").description("Remove stored API key").action(() => {
   if (!getStoredAPIKey()) {
     console.log();
-    console.log(chalk9.dim("  Not logged in."));
+    console.log(chalk10.dim("  Not logged in."));
     if (hasEnvAPIKey()) {
-      console.log(chalk9.dim("  Environment API key is still active in this shell."));
+      console.log(chalk10.dim("  Environment API key is still active in this shell."));
     }
     console.log();
     return;
   }
   clearAPIKey();
   console.log();
-  console.log(chalk9.green("  Logged out."));
+  console.log(chalk10.green("  Logged out."));
   if (hasEnvAPIKey()) {
-    console.log(chalk9.dim("  Environment API key is still active in this shell."));
+    console.log(chalk10.dim("  Environment API key is still active in this shell."));
   }
   console.log();
 });
@@ -4369,8 +4557,8 @@ var logoutCommand = new Command11("logout").description("Remove stored API key")
 // src/commands/upgrade.ts
 import { spawnSync } from "child_process";
 import { readFileSync as readFileSync2, realpathSync } from "fs";
-import { Command as Command12 } from "commander";
-import chalk10 from "chalk";
+import { Command as Command13 } from "commander";
+import chalk11 from "chalk";
 import ora10 from "ora";
 var pkg2 = JSON.parse(
   readFileSync2(new URL("../package.json", import.meta.url), "utf8")
@@ -4485,7 +4673,25 @@ async function getLatestVersion(packageName) {
   }
   return payload.version;
 }
-var upgradeCommand = new Command12("upgrade").description("Update the CLI to the latest version").action(async () => {
+function attemptBundledMutagenRefresh(executablePath) {
+  const install = spawnSync(
+    process.execPath,
+    [executablePath, "internal-install-mutagen", "--quiet"],
+    {
+      stdio: "ignore"
+    }
+  );
+  if (install.status === 0) {
+    return;
+  }
+  console.log();
+  console.log(
+    chalk11.yellow(
+      "  CLI updated, but bundled Mutagen did not finish installing. `computer mount` will retry on first use."
+    )
+  );
+}
+var upgradeCommand = new Command13("upgrade").description("Update the CLI to the latest version").action(async () => {
   const currentVersion = pkg2.version ?? "0.0.0";
   const packageName = pkg2.name ?? "aicomputer";
   const spinner = ora10("Checking for updates...").start();
@@ -4518,16 +4724,19 @@ var upgradeCommand = new Command12("upgrade").description("Update the CLI to the
   spinner.stop();
   console.log();
   console.log(
-    chalk10.dim(`  Updating ${chalk10.bold(`v${currentVersion}`)} -> ${chalk10.bold(`v${latestVersion}`)}`)
+    chalk11.dim(`  Updating ${chalk11.bold(`v${currentVersion}`)} -> ${chalk11.bold(`v${latestVersion}`)}`)
   );
-  console.log(chalk10.dim(`  ${upgrade.label}`));
+  console.log(chalk11.dim(`  ${upgrade.label}`));
   console.log();
   const result = spawnSync(upgrade.command, upgrade.args, {
     stdio: "inherit"
   });
   if (result.status === 0) {
+    if (method !== "nix") {
+      attemptBundledMutagenRefresh(executablePath);
+    }
     console.log();
-    console.log(chalk10.green(`  Updated to v${latestVersion}.`));
+    console.log(chalk11.green(`  Updated to v${latestVersion}.`));
     console.log();
     return;
   }
@@ -4535,10 +4744,10 @@ var upgradeCommand = new Command12("upgrade").description("Update the CLI to the
 });
 
 // src/commands/whoami.ts
-import { Command as Command13 } from "commander";
-import chalk11 from "chalk";
+import { Command as Command14 } from "commander";
+import chalk12 from "chalk";
 import ora11 from "ora";
-var whoamiCommand = new Command13("whoami").description("Show current user").option("--json", "Print raw JSON").action(async (options) => {
+var whoamiCommand = new Command14("whoami").description("Show current user").option("--json", "Print raw JSON").action(async (options) => {
   const spinner = options.json ? null : ora11("Loading user...").start();
   try {
     const me = await api("/v1/me");
@@ -4548,14 +4757,14 @@ var whoamiCommand = new Command13("whoami").description("Show current user").opt
       return;
     }
     console.log();
-    console.log(`  ${chalk11.bold.white(me.user.display_name || me.user.email)}`);
+    console.log(`  ${chalk12.bold.white(me.user.display_name || me.user.email)}`);
     if (me.user.display_name) {
-      console.log(`  ${chalk11.dim(me.user.email)}`);
+      console.log(`  ${chalk12.dim(me.user.email)}`);
     }
     if (me.api_key.name) {
-      console.log(`  ${chalk11.dim("Key:")}  ${me.api_key.name}`);
+      console.log(`  ${chalk12.dim("Key:")}  ${me.api_key.name}`);
     }
-    console.log(`  ${chalk11.dim("API:")}  ${chalk11.dim(getBaseURL())}`);
+    console.log(`  ${chalk12.dim("API:")}  ${chalk12.dim(getBaseURL())}`);
     console.log();
   } catch (error) {
     if (spinner) {
@@ -4572,15 +4781,15 @@ var pkg3 = JSON.parse(
   readFileSync3(new URL("../package.json", import.meta.url), "utf8")
 );
 var cliName = process.argv[1] ? basename2(process.argv[1]) : "agentcomputer";
-var program = new Command14();
+var program = new Command15();
 function appendTextSection(lines, title, values) {
   if (values.length === 0) {
     return;
   }
-  lines.push(`  ${chalk12.dim(title)}`);
+  lines.push(`  ${chalk13.dim(title)}`);
   lines.push("");
   for (const value of values) {
-    lines.push(`    ${chalk12.white(value)}`);
+    lines.push(`    ${chalk13.white(value)}`);
   }
   lines.push("");
 }
@@ -4589,10 +4798,10 @@ function appendTableSection(lines, title, entries) {
     return;
   }
   const width = Math.max(...entries.map((entry) => entry.term.length), 0) + 2;
-  lines.push(`  ${chalk12.dim(title)}`);
+  lines.push(`  ${chalk13.dim(title)}`);
   lines.push("");
   for (const entry of entries) {
-    lines.push(`    ${chalk12.white(padEnd(entry.term, width))}${chalk12.dim(entry.desc)}`);
+    lines.push(`    ${chalk13.white(padEnd(entry.term, width))}${chalk13.dim(entry.desc)}`);
   }
   lines.push("");
 }
@@ -4618,10 +4827,10 @@ function formatRootHelp(cmd) {
     ["Other", []]
   ];
   const otherGroup = groups.find(([name]) => name === "Other")[1];
-  lines.push(`${chalk12.bold(cliName)} ${chalk12.dim(`v${version}`)}`);
+  lines.push(`${chalk13.bold(cliName)} ${chalk13.dim(`v${version}`)}`);
   lines.push("");
   if (cmd.description()) {
-    lines.push(`  ${chalk12.dim(cmd.description())}`);
+    lines.push(`  ${chalk13.dim(cmd.description())}`);
     lines.push("");
   }
   appendTextSection(lines, "Usage", [`${cliName} <command> [options]`]);
@@ -4674,10 +4883,10 @@ function formatSubcommandHelp(cmd, helper) {
     term: helper.optionTerm(option),
     desc: helper.optionDescription(option)
   }));
-  lines.push(chalk12.bold(commandPath(cmd)));
+  lines.push(chalk13.bold(commandPath(cmd)));
   lines.push("");
   if (description) {
-    lines.push(`  ${chalk12.dim(description)}`);
+    lines.push(`  ${chalk13.dim(description)}`);
     lines.push("");
   }
   appendTextSection(lines, "Usage", [helper.commandUsage(cmd)]);
@@ -4703,6 +4912,7 @@ function applyHelpFormatting(cmd) {
 program.name(cliName).description("Agent Computer CLI").version(pkg3.version ?? "0.0.0").option("-y, --yes", "Skip confirmation prompts");
 program.addCommand(loginCommand);
 program.addCommand(upgradeCommand);
+program.addCommand(internalInstallMutagenCommand, { hidden: true });
 program.addCommand(logoutCommand);
 program.addCommand(whoamiCommand);
 program.addCommand(claudeLoginCommand);