aicomputer 0.1.18 → 0.1.20

package/dist/index.js

@@ -1,8 +1,52 @@
 #!/usr/bin/env node
+import {
+  ensureSSHAliasConfig
+} from "./chunk-D3SAFNSI.js";
+import {
+  compareVersions,
+  resolveLatestPublishedVersion
+} from "./chunk-GGBVVRLL.js";
 import {
   formatMountHostInstallGuidance,
   getMountHostValidationIssues
 } from "./chunk-JMRAYXUO.js";
+import {
+  formatStatus,
+  padEnd,
+  promptForSSHComputer,
+  reconcileMounts,
+  teardownManagedSessions,
+  timeAgo
+} from "./chunk-36BZXAAX.js";
+import {
+  isAbortError
+} from "./chunk-TPFE3CC6.js";
+import {
+  defaultMountServiceConfig,
+  ensureMountDirectories,
+  getMountPaths,
+  readMountConfig,
+  readMountControllerLock,
+  readMountStatusSnapshot,
+  removeMountControllerLock,
+  writeMountConfig,
+  writeMountControllerLock,
+  writeMountStatusSnapshot
+} from "./chunk-KXLTHWW3.js";
+import {
+  AGENTCOMPUTER_MUTAGEN_PATH_ENV,
+  ensureBundledMutagenInstalled,
+  ensureMutagenCommandPath
+} from "./chunk-GD42GHW3.js";
+import {
+  ensureDefaultSSHKeyRegistered,
+  openSSHConnection,
+  prepareSSHConnection,
+  prepareSSHConnectionByIdentifier
+} from "./chunk-4TE5XTYE.js";
+import {
+  ensureBundledAutosshInstalled
+} from "./chunk-3ZF7JRBW.js";
 import {
   ApiError,
   api,
@@ -12,7 +56,6 @@ import {
   createComputer,
   deleteComputer,
   deletePublishedPort,
-  formatStatus,
   getAPIKey,
   getBaseURL,
   getComputerByID,
@@ -23,168 +66,27 @@ import {
   hasEnvAPIKey,
   listComputers,
   listPublishedPorts,
-  padEnd,
-  promptForSSHComputer,
+  powerOffComputer,
+  powerOnComputer,
   publishPort,
-  reconcileMounts,
   resolveComputer,
   setAPIKey,
-  teardownManagedSessions,
-  timeAgo,
   vncURL,
   webURL
-} from "./chunk-3ZUTAUUD.js";
-import {
-  AGENTCOMPUTER_MUTAGEN_PATH_ENV,
-  ensureBundledMutagenInstalled,
-  ensureMutagenCommandPath,
-  isAbortError
-} from "./chunk-F2U4SFJ4.js";
-import {
-  defaultMountServiceConfig,
-  ensureMountDirectories,
-  getMountPaths,
-  readMountConfig,
-  readMountControllerLock,
-  readMountStatusSnapshot,
-  removeMountControllerLock,
-  writeMountConfig,
-  writeMountControllerLock,
-  writeMountStatusSnapshot
-} from "./chunk-KXLTHWW3.js";
+} from "./chunk-LOGK7YYJ.js";
+import "./chunk-5Y2NWK5I.js";
 
 // src/index.ts
-import { Command as Command15 } from "commander";
-import chalk13 from "chalk";
+import { Command as Command16 } from "commander";
+import chalk14 from "chalk";
 import { readFileSync as readFileSync3 } from "fs";
-import { basename as basename2 } from "path";
+import { basename } from "path";
 
 // src/commands/access.ts
 import { Command } from "commander";
 import chalk from "chalk";
 import ora from "ora";
 
-// src/lib/ssh-access.ts
-import { spawn } from "child_process";
-
-// src/lib/ssh-keys.ts
-import { basename } from "path";
-import { homedir } from "os";
-import { readFile, mkdir } from "fs/promises";
-import { execFileSync } from "child_process";
-import { existsSync } from "fs";
-var DEFAULT_PUBLIC_KEY_PATHS = [
-  `${homedir()}/.ssh/id_ed25519.pub`,
-  `${homedir()}/.ssh/id_ecdsa.pub`,
-  `${homedir()}/.ssh/id_rsa.pub`
-];
-async function ensureDefaultSSHKeyRegistered() {
-  for (const path of DEFAULT_PUBLIC_KEY_PATHS) {
-    try {
-      const publicKey2 = (await readFile(path, "utf8")).trim();
-      if (!publicKey2) {
-        continue;
-      }
-      const key2 = await api("/v1/ssh-keys", {
-        method: "POST",
-        body: JSON.stringify({
-          name: basename(path),
-          public_key: publicKey2
-        })
-      });
-      return {
-        key: key2,
-        publicKeyPath: path,
-        privateKeyPath: path.replace(/\.pub$/, "")
-      };
-    } catch (error) {
-      if (error?.code === "ENOENT") {
-        continue;
-      }
-      throw error;
-    }
-  }
-  const generated = await generateSSHKey();
-  const publicKey = (await readFile(generated.publicKeyPath, "utf8")).trim();
-  const key = await api("/v1/ssh-keys", {
-    method: "POST",
-    body: JSON.stringify({
-      name: basename(generated.publicKeyPath),
-      public_key: publicKey
-    })
-  });
-  return {
-    key,
-    publicKeyPath: generated.publicKeyPath,
-    privateKeyPath: generated.privateKeyPath
-  };
-}
-async function generateSSHKey() {
-  const sshDir = `${homedir()}/.ssh`;
-  if (!existsSync(sshDir)) {
-    await mkdir(sshDir, { mode: 448 });
-  }
-  const privateKeyPath = `${sshDir}/id_ed25519`;
-  const publicKeyPath = `${privateKeyPath}.pub`;
-  console.log("No SSH key found \u2014 generating one at", publicKeyPath);
-  execFileSync("ssh-keygen", ["-t", "ed25519", "-f", privateKeyPath, "-N", ""], {
-    stdio: "inherit"
-  });
-  return { publicKeyPath, privateKeyPath };
-}
-
-// src/lib/ssh-access.ts
-async function prepareSSHConnection(computer) {
-  const registered = await ensureDefaultSSHKeyRegistered();
-  const info = await getConnectionInfo(computer.id);
-  if (!info.connection.ssh_available) {
-    throw new Error("SSH is not available for this computer");
-  }
-  return {
-    computer,
-    command: formatSSHCommand(
-      info.connection.ssh_user,
-      info.connection.ssh_host,
-      info.connection.ssh_port
-    ),
-    args: [
-      "-i",
-      registered.privateKeyPath,
-      "-p",
-      String(info.connection.ssh_port),
-      `${info.connection.ssh_user}@${info.connection.ssh_host}`
-    ]
-  };
-}
-async function prepareSSHConnectionByIdentifier(identifier) {
-  const computer = await resolveComputer(identifier);
-  return prepareSSHConnection(computer);
-}
-async function openSSHConnection(connection) {
-  await new Promise((resolve, reject) => {
-    const child = spawn("ssh", connection.args, {
-      stdio: "inherit"
-    });
-    child.on("error", reject);
-    child.on("exit", (code) => {
-      if (code === 0) {
-        resolve();
-        return;
-      }
-      reject(new Error(`ssh exited with code ${code ?? 1}`));
-    });
-  });
-}
-function formatSSHCommand(user, host, port) {
-  if (!user.trim() || !host.trim()) {
-    return "ssh unavailable";
-  }
-  if (port <= 0 || port === 22) {
-    return `ssh ${user}@${host}`;
-  }
-  return `ssh -p ${port} ${user}@${host}`;
-}
-
 // src/lib/open-browser.ts
 import { constants } from "fs";
 import { access } from "fs/promises";
@@ -242,74 +144,6 @@ async function openBrowserURL(url) {
   await open(url);
 }
 
-// src/lib/ssh-config.ts
-import { homedir as homedir2 } from "os";
-import { join } from "path";
-import { mkdir as mkdir2, readFile as readFile2, writeFile } from "fs/promises";
-var MANAGED_BLOCK_START = "# >>> agentcomputer ssh setup >>>";
-var MANAGED_BLOCK_END = "# <<< agentcomputer ssh setup <<<";
-async function ensureSSHAliasConfig(options) {
-  const sshDir = join(homedir2(), ".ssh");
-  const configPath = join(sshDir, "config");
-  await mkdir2(sshDir, { recursive: true, mode: 448 });
-  let existing = "";
-  try {
-    existing = await readFile2(configPath, "utf8");
-  } catch (error) {
-    if (error.code !== "ENOENT") {
-      throw error;
-    }
-  }
-  const nextBlock = renderManagedBlock(options);
-  const managedBlockPattern = new RegExp(
-    `${escapeRegex(MANAGED_BLOCK_START)}[\\s\\S]*?${escapeRegex(MANAGED_BLOCK_END)}\\n?`,
-    "m"
-  );
-  let nextContents;
-  if (managedBlockPattern.test(existing)) {
-    nextContents = existing.replace(managedBlockPattern, nextBlock);
-  } else {
-    const normalized = existing.length === 0 ? "" : existing.endsWith("\n") ? existing : `${existing}
-`;
-    nextContents = normalized.length === 0 ? nextBlock : `${normalized}
-${nextBlock}`;
-  }
-  const changed = nextContents !== existing;
-  if (changed) {
-    await writeFile(configPath, nextContents, { mode: 384 });
-  }
-  return {
-    configPath,
-    changed
-  };
-}
-function renderManagedBlock(options) {
-  const user = options.user?.trim() || "agentcomputer";
-  const identityFile = formatIdentityFilePath(options.identityFilePath);
-  return `${MANAGED_BLOCK_START}
-Host ${options.alias}
-  HostName ${options.host}
-  Port ${options.port}
-  User ${user}
-  IdentityFile ${identityFile}
-  IdentitiesOnly yes
-  ServerAliveInterval 30
-  ServerAliveCountMax 4
-${MANAGED_BLOCK_END}
-`;
-}
-function formatIdentityFilePath(path) {
-  const normalized = path.trim();
-  const homePath = `${homedir2()}/`;
-  if (normalized.startsWith(homePath)) {
-    return `~/${normalized.slice(homePath.length)}`;
-  }
-  return normalized.replaceAll(" ", "\\ ");
-}
-function escapeRegex(value) {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-
 // src/lib/ssh-setup.ts
 async function ensureSSHAccessConfigured(options = {}) {
   const alias = normalizeSSHAlias(options.alias ?? "agentcomputer.ai");
@@ -389,8 +223,8 @@ var openCommand = new Command("open").description("Open a computer in your brows
     process.exit(1);
   }
 });
-var sshCommand = new Command("ssh").description("Open an SSH session to a computer").argument("[id-or-handle]", "Computer id or handle").option("--setup", "Register key and configure a global SSH alias").option("--alias <alias>", "SSH host alias", "agentcomputer.ai").option("--host <host>", "SSH gateway host", "ssh.agentcomputer.ai").option("--port <port>", "SSH gateway port", "443").action(
-  async (identifier, options) => {
+var sshCommand = new Command("ssh").description("Open an SSH session to a computer").allowUnknownOption(true).argument("[id-or-handle]", "Computer id or handle").argument("[ssh-args...]", "SSH arguments passed through after the machine handle").option("--setup", "Register key and configure a global SSH alias").option("--tmux", "Attach or create a persistent tmux session on connect").option("--alias <alias>", "SSH host alias", "agentcomputer.ai").option("--host <host>", "SSH gateway host", "ssh.agentcomputer.ai").option("--port <port>", "SSH gateway port", "443").action(
+  async (identifier, sshArgs, options) => {
     if (options.setup) {
       await setupSSHAlias(options);
       return;
@@ -400,7 +234,10 @@ var sshCommand = new Command("ssh").description("Open an SSH session to a comput
     ).start();
     try {
       const computer = await resolveSSHComputer(identifier, spinner);
-      const connection = await prepareSSHConnection(computer);
+      const connection = await prepareSSHConnection(computer, {
+        extraArgs: sshArgs,
+        tmux: options.tmux
+      });
       spinner.succeed(`Connecting to ${chalk.bold(computer.handle)}`);
       console.log(chalk.dim(`  ${connection.command}`));
       console.log();
@@ -1311,7 +1148,7 @@ import ora4 from "ora";
 
 // src/lib/remote-auth.ts
 import { randomBytes } from "crypto";
-import { spawn as spawn2 } from "child_process";
+import { spawn } from "child_process";
 import ora3 from "ora";
 var readyPollIntervalMs = 2e3;
 var readyPollTimeoutMs = 18e4;
@@ -1447,7 +1284,7 @@ async function runRemoteCommand(target, remoteArgs, script) {
     ...remoteArgs
   ];
   return new Promise((resolve, reject) => {
-    const child = spawn2("ssh", args, {
+    const child = spawn("ssh", args, {
       stdio: ["pipe", "pipe", "pipe"]
     });
     let stdout = "";
@@ -2007,13 +1844,14 @@ function isInternalCondition(value) {
 }
 function printComputer(computer) {
   const vnc = vncURL(computer);
-  const ssh = computer.ssh_enabled ? formatSSHCommand2(computer.handle, computer.ssh_host, computer.ssh_port) : "disabled";
+  const ssh = computer.ssh_enabled ? formatSSHCommand(computer.handle, computer.ssh_host, computer.ssh_port) : "disabled";
   const isCustom = computer.runtime_family === "custom-machine";
   console.log();
   console.log(`  ${chalk4.bold.white(computer.handle)}  ${formatStatus(computer.status)}`);
   console.log();
   console.log(`  ${chalk4.dim("ID")}        ${computer.id}`);
   console.log(`  ${chalk4.dim("Tier")}      ${computer.tier}`);
+  console.log(`  ${chalk4.dim("Power")}     ${formatDesiredPowerState(computer.desired_power_state)}`);
   if (isCustom) {
     console.log(`  ${chalk4.dim("Runtime")}   ${computer.runtime_family}`);
     console.log(`  ${chalk4.dim("Source")}    ${computer.source_kind}`);
@@ -2043,7 +1881,7 @@ function printComputer(computer) {
   console.log(`  ${chalk4.dim("Created")}   ${timeAgo(computer.created_at)}`);
   console.log();
 }
-function formatSSHCommand2(user, host, port) {
+function formatSSHCommand(user, host, port) {
   if (!user.trim() || !host.trim()) {
     return "ssh unavailable";
   }
@@ -2071,6 +1909,12 @@ function formatManagedWorkerLaunchSource(computer) {
   }
   return `saved custom source ${computer.user_source_id}`;
 }
+function formatDesiredPowerState(state) {
+  return state === "off" ? chalk4.yellow("off") : chalk4.green("on");
+}
+function supportsPowerLifecycle(computer) {
+  return computer.runtime_family === "managed-worker";
+}
 function printComputerTable(computers) {
   const handleWidth = Math.max(6, ...computers.map((c) => c.handle.length));
   const statusWidth = 12;
@@ -2327,6 +2171,72 @@ var removeCommand = new Command5("rm").description("Delete a computer").argument
     process.exit(1);
   }
 });
+var powerOffCommand = new Command5("power-off").description("Power off a managed worker without deleting its storage").argument("<id-or-handle>", "Computer id or handle").option("--json", "Print raw JSON").action(async (identifier, options) => {
+  const spinner = options.json ? null : ora5("Resolving computer...").start();
+  try {
+    const computer = await resolveComputer(identifier);
+    if (!supportsPowerLifecycle(computer)) {
+      throw new Error("power lifecycle is only available for managed-worker machines");
+    }
+    spinner?.start("Powering off computer...");
+    const poweredOff = await powerOffComputer(computer.id);
+    spinner?.succeed(chalk4.green(`Powered off ${chalk4.bold(poweredOff.handle)}`));
+    await notifyMountDaemon(
+      getMountPaths((readMountConfig() ?? defaultMountServiceConfig()).rootPath)
+    ).catch(
+      () => false
+    );
+    if (options.json) {
+      console.log(JSON.stringify(poweredOff, null, 2));
+      return;
+    }
+    printComputer(poweredOff);
+  } catch (error) {
+    if (spinner) {
+      spinner.fail(
+        error instanceof Error ? error.message : "Failed to power off computer"
+      );
+    } else {
+      console.error(
+        error instanceof Error ? error.message : "Failed to power off computer"
+      );
+    }
+    process.exit(1);
+  }
+});
+var powerOnCommand = new Command5("power-on").description("Power on a managed worker and recreate its runtime").argument("<id-or-handle>", "Computer id or handle").option("--json", "Print raw JSON").action(async (identifier, options) => {
+  const spinner = options.json ? null : ora5("Resolving computer...").start();
+  try {
+    const computer = await resolveComputer(identifier);
+    if (!supportsPowerLifecycle(computer)) {
+      throw new Error("power lifecycle is only available for managed-worker machines");
+    }
+    spinner?.start("Powering on computer...");
+    const poweredOn = await powerOnComputer(computer.id);
+    spinner?.succeed(chalk4.green(`Powered on ${chalk4.bold(poweredOn.handle)}`));
+    await notifyMountDaemon(
+      getMountPaths((readMountConfig() ?? defaultMountServiceConfig()).rootPath)
+    ).catch(
+      () => false
+    );
+    if (options.json) {
+      console.log(JSON.stringify(poweredOn, null, 2));
+      return;
+    }
+    printComputer(poweredOn);
+  } catch (error) {
+    if (spinner) {
+      spinner.fail(
+        error instanceof Error ? error.message : "Failed to power on computer"
+      );
+    } else {
+      console.error(
+        error instanceof Error ? error.message : "Failed to power on computer"
+      );
+    }
+    process.exit(1);
+  }
+});
 function parseRuntimeFamilyOption(value) {
   switch (value) {
     case void 0:
@@ -2462,6 +2372,8 @@ _computer() {
     'create:Create a computer'
     'ls:List computers'
     'get:Show computer details'
+    'power-on:Power on a managed worker'
+    'power-off:Power off a managed worker'
     'image:Manage machine image sources'
     'open:Open in browser'
     'ssh:SSH into a computer'
@@ -2552,6 +2464,11 @@ _computer() {
             '--json[Print raw JSON]' \\
             '1:computer:_computer_handles'
           ;;
+        power-on|power-off)
+          _arguments \\
+            '--json[Print raw JSON]' \\
+            '1:computer:_computer_handles'
+          ;;
         image)
           _arguments -C \\
             '1:command:->image_command' \\
@@ -2816,10 +2733,10 @@ var completionCommand = new Command6("completion").description("Generate shell c
 });
 
 // src/commands/codex-login.ts
-import { spawn as spawn3 } from "child_process";
-import { readFile as readFile3 } from "fs/promises";
-import { homedir as homedir3 } from "os";
-import { join as join2 } from "path";
+import { spawn as spawn2 } from "child_process";
+import { readFile } from "fs/promises";
+import { homedir } from "os";
+import { join } from "path";
 import { Command as Command7 } from "commander";
 import chalk5 from "chalk";
 import ora6 from "ora";
@@ -3019,10 +2936,10 @@ async function getLocalCodexStatus() {
   return parseCodexStatusOutput(result.stdout, result.stderr);
 }
 async function readLocalCodexAuthFile() {
-  const authPath = join2(homedir3(), ".codex", "auth.json");
+  const authPath = join(homedir(), ".codex", "auth.json");
   let raw;
   try {
-    raw = await readFile3(authPath, "utf8");
+    raw = await readFile(authPath, "utf8");
   } catch (error) {
     throw new Error(
       error instanceof Error ? `failed to read ${authPath}: ${error.message}` : `failed to read ${authPath}`
@@ -3040,7 +2957,7 @@ async function readLocalCodexAuthFile() {
 }
 async function runInteractiveCodexLogin() {
   await new Promise((resolve, reject) => {
-    const child = spawn3("codex", ["login"], {
+    const child = spawn2("codex", ["login"], {
       stdio: "inherit"
     });
     child.on("error", (error) => {
@@ -3063,7 +2980,7 @@ async function runInteractiveCodexLogin() {
 }
 async function captureLocalCommand(command, args) {
   return new Promise((resolve, reject) => {
-    const child = spawn3(command, args, {
+    const child = spawn2(command, args, {
       stdio: ["ignore", "pipe", "pipe"]
     });
     let stdout = "";
@@ -3567,16 +3484,42 @@ async function confirmDeletion(sourceID) {
   });
 }
 
-// src/commands/internal-install-mutagen.ts
+// src/commands/internal-install-autossh.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) => {
+var internalInstallAutosshCommand = new Command9(
+  "internal-install-autossh"
+).option("--quiet", "Suppress output unless installation fails").action(async (options) => {
+  try {
+    const executablePath = await ensureBundledAutosshInstalled();
+    if (!options.quiet) {
+      console.log();
+      console.log(
+        chalk7.green(`  Bundled autossh ready at ${executablePath}.`)
+      );
+      console.log();
+    }
+  } catch (error) {
+    if (!options.quiet) {
+      const message = error instanceof Error ? error.message : "failed to install bundled autossh";
+      console.error();
+      console.error(chalk7.red(`  ${message}`));
+      console.error();
+    }
+    process.exit(1);
+  }
+});
+
+// src/commands/internal-install-mutagen.ts
+import { Command as Command10 } from "commander";
+import chalk8 from "chalk";
+var internalInstallMutagenCommand = new Command10("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(
+        chalk8.green(
           `  Bundled Mutagen ready at ${executablePath}.`
         )
       );
@@ -3586,7 +3529,7 @@ var internalInstallMutagenCommand = new Command9("internal-install-mutagen").opt
     if (!options.quiet) {
       const message = error instanceof Error ? error.message : "failed to install bundled Mutagen";
       console.error();
-      console.error(chalk7.red(`  ${message}`));
+      console.error(chalk8.red(`  ${message}`));
       console.error();
     }
     process.exit(1);
@@ -3594,8 +3537,8 @@ var internalInstallMutagenCommand = new Command9("internal-install-mutagen").opt
 });
 
 // src/commands/login.ts
-import { Command as Command10 } from "commander";
-import chalk8 from "chalk";
+import { Command as Command11 } from "commander";
+import chalk9 from "chalk";
 import ora8 from "ora";
 
 // src/lib/browser-login.ts
@@ -3863,12 +3806,12 @@ function escapeHTML(value) {
 }
 
 // src/commands/login.ts
-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) => {
+var loginCommand = new Command11("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(
-      chalk8.yellow("  Already logged in. Use --force to overwrite.")
+      chalk9.yellow("  Already logged in. Use --force to overwrite.")
     );
     console.log();
     return;
@@ -3877,8 +3820,8 @@ var loginCommand = new Command10("login").description("Authenticate the CLI").op
   const apiKey = await resolveAPIKeyInput(options.apiKey, options.stdin);
   if (!apiKey && wantsManualLogin) {
     console.log();
-    console.log(chalk8.dim("  Usage: computer login --api-key <ac_live_...>"));
-    console.log(chalk8.dim(`  API:   ${getBaseURL()}`));
+    console.log(chalk9.dim("  Usage: computer login --api-key <ac_live_...>"));
+    console.log(chalk9.dim(`  API:   ${getBaseURL()}`));
     console.log();
     process.exit(1);
   }
@@ -3888,7 +3831,7 @@ var loginCommand = new Command10("login").description("Authenticate the CLI").op
   }
   if (!apiKey.startsWith("ac_live_")) {
     console.log();
-    console.log(chalk8.red("  API key must start with ac_live_"));
+    console.log(chalk9.red("  API key must start with ac_live_"));
     console.log();
     process.exit(1);
   }
@@ -3896,7 +3839,7 @@ var loginCommand = new Command10("login").description("Authenticate the CLI").op
   try {
     const me = await apiWithKey(apiKey, "/v1/me");
     setAPIKey(apiKey);
-    spinner.succeed(`Logged in as ${chalk8.bold(me.user.email)}`);
+    spinner.succeed(`Logged in as ${chalk9.bold(me.user.email)}`);
   } catch (error) {
     spinner.fail(
       error instanceof Error ? error.message : "Failed to validate API key"
@@ -3916,15 +3859,15 @@ async function runBrowserLogin() {
       spinner.stop();
       console.log();
       console.log(
-        chalk8.yellow("  Browser auto-open failed. Open this URL to continue:")
+        chalk9.yellow("  Browser auto-open failed. Open this URL to continue:")
       );
-      console.log(chalk8.dim(`  ${attempt.loginURL}`));
+      console.log(chalk9.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 ${chalk8.bold(result.me.user.email)}`);
+    spinner.succeed(`Logged in as ${chalk9.bold(result.me.user.email)}`);
     await continueFirstLoginFlow(result);
   } catch (error) {
     spinner.fail(
@@ -3958,8 +3901,8 @@ async function continueFirstLoginFlow(result) {
   }
   console.log();
   console.log(
-    chalk8.cyan(
-      `Continuing first-time setup for ${chalk8.bold(machineHandle)}...
+    chalk9.cyan(
+      `Continuing first-time setup for ${chalk9.bold(machineHandle)}...
 `
     )
   );
@@ -3972,8 +3915,8 @@ async function continueFirstLoginFlow(result) {
     const spinner = ora8(`Preparing SSH access for ${machineHandle}...`).start();
     try {
       const connection = await prepareSSHConnectionByIdentifier(machineHandle);
-      spinner.succeed(`Connecting to ${chalk8.bold(machineHandle)}`);
-      console.log(chalk8.dim(`  ${connection.command}`));
+      spinner.succeed(`Connecting to ${chalk9.bold(machineHandle)}`);
+      console.log(chalk9.dim(`  ${connection.command}`));
       console.log();
       await openSSHConnection(connection);
     } catch (error) {
@@ -3984,19 +3927,19 @@ async function continueFirstLoginFlow(result) {
     }
   } catch (error) {
     const message = error instanceof Error ? error.message : "Failed to finish first-time setup";
-    console.error(chalk8.red(`
+    console.error(chalk9.red(`
 ${message}`));
     console.log();
     if (result.provider === "claude") {
       console.log(
-        chalk8.dim(`  computer claude-login --machine ${machineHandle}`)
+        chalk9.dim(`  computer claude-login --machine ${machineHandle}`)
       );
     } else if (result.provider === "codex") {
       console.log(
-        chalk8.dim(`  computer codex-login --machine ${machineHandle}`)
+        chalk9.dim(`  computer codex-login --machine ${machineHandle}`)
       );
     }
-    console.log(chalk8.dim(`  computer ssh ${machineHandle}`));
+    console.log(chalk9.dim(`  computer ssh ${machineHandle}`));
     console.log();
     process.exit(1);
   }
@@ -4010,23 +3953,23 @@ async function runSelectedProvider(provider, machineHandle) {
     await runCodexLogin({ machine: machineHandle });
     return;
   }
-  console.log(chalk8.green(`Sandbox ${chalk8.bold(machineHandle)} is ready.`));
+  console.log(chalk9.green(`Sandbox ${chalk9.bold(machineHandle)} is ready.`));
   console.log();
 }
 function printNextStep(machineHandle) {
-  console.log(chalk8.green(`Sandbox ${chalk8.bold(machineHandle)} is ready.`));
-  console.log(chalk8.dim(`  computer ssh ${machineHandle}`));
+  console.log(chalk9.green(`Sandbox ${chalk9.bold(machineHandle)} is ready.`));
+  console.log(chalk9.dim(`  computer ssh ${machineHandle}`));
   console.log();
 }
 
 // src/commands/mount.ts
-import { spawn as spawn4 } from "child_process";
-import { Command as Command11, Option } from "commander";
-import chalk9 from "chalk";
+import { spawn as spawn3 } from "child_process";
+import { Command as Command12, Option } from "commander";
+import chalk10 from "chalk";
 import ora9 from "ora";
 
 // src/lib/mount-daemon.ts
-import { mkdir as mkdir3 } from "fs/promises";
+import { mkdir } from "fs/promises";
 function getMountControllerState(rootPath = defaultMountServiceConfig().rootPath) {
   const lock = readMountControllerLock(rootPath);
   if (!lock) {
@@ -4042,7 +3985,7 @@ async function runMountDaemon(config, options = {}) {
   const { onReady, onStarted } = options;
   const paths = getMountPaths(config.rootPath);
   ensureMountDirectories(paths);
-  await mkdir3(paths.rootPath, { recursive: true });
+  await mkdir(paths.rootPath, { recursive: true });
   await acquireControllerLock(config.rootPath);
   writeMountStatusSnapshot(
     {
@@ -4072,10 +4015,11 @@ async function runMountDaemon(config, options = {}) {
     config.rootPath
   );
   await teardownManagedSessions(config, paths);
-  await mkdir3(paths.rootPath, { recursive: true });
+  await mkdir(paths.rootPath, { recursive: true });
   let running = false;
   let queued = false;
   let shuttingDown = false;
+  let readyNotified = false;
   let activeRun = null;
   let activeRunController = null;
   const runOnce = async () => {
@@ -4097,6 +4041,11 @@ async function runMountDaemon(config, options = {}) {
           process.pid,
           controller.signal
         );
+        const snapshot = readMountStatusSnapshot(config.rootPath);
+        if (!readyNotified && snapshot?.startupPhase === "ready") {
+          readyNotified = true;
+          onReady?.();
+        }
       } catch (error) {
         if (shuttingDown && isAbortError(error)) {
           return;
@@ -4198,8 +4147,6 @@ async function runMountDaemon(config, options = {}) {
     void shutdown();
   });
   await runOnce();
-  writeMountStatusSnapshot(markMountStartupReady(readMountStatusSnapshot(config.rootPath), process.pid), config.rootPath);
-  onReady?.();
   await new Promise(() => {
   });
 }
@@ -4228,28 +4175,13 @@ 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 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(
+var mountCommand = new Command12("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()).addOption(new Option("--open-root-when-ready").hideHelp()).action(async (options) => {
@@ -4283,14 +4215,22 @@ var mountCommand = new Command11("mount").description("Mirror SSH-ready machines
       return;
     }
     const child = await startMountControllerInForeground(resolved.config.rootPath);
-    await waitForMountControllerReady(resolved.config.rootPath, child.pid, spinner);
+    const controls = attachForegroundControls(child);
     spinner.succeed("Machine mount controller running");
     printMountStartSummary(
       resolved.config,
       child.pid ?? process.pid,
       "foreground"
     );
-    await superviseForegroundMountController(child);
+    try {
+      await superviseForegroundMountController(
+        resolved.config.rootPath,
+        child,
+        controls
+      );
+    } finally {
+      controls.close();
+    }
   } catch (error) {
     spinner.fail(
       error instanceof Error ? error.message : "Failed to start machine mount controller"
@@ -4298,42 +4238,9 @@ var mountCommand = new Command11("mount").description("Mirror SSH-ready machines
     process.exit(1);
   }
 }).addCommand(
-  new Command11("status").description("Show machine mount controller status").action(() => {
+  new Command12("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(`  ${chalk9.bold("Machine Mounts")}`);
-    console.log();
-    console.log(
-      `  ${chalk9.dim("Running")}    ${controller.running ? chalk9.green("yes") : chalk9.dim("no")}`
-    );
-    if (controller.pid) {
-      console.log(`  ${chalk9.dim("PID")}        ${controller.pid}`);
-    }
-    console.log(`  ${chalk9.dim("Root")}       ${config.rootPath}`);
-    console.log(`  ${chalk9.dim("Alias")}      ${config.alias}`);
-    console.log(
-      `  ${chalk9.dim("Updated")}    ${snapshot?.updatedAt ? timeAgo(snapshot.updatedAt) : chalk9.dim("never")}`
-    );
-    console.log(
-      `  ${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(`  ${chalk9.white(mount.handle)}  ${state}  ${chalk9.dim(mount.mountPath)}`);
-        if (mount.message) {
-          console.log(`  ${chalk9.dim(mount.message)}`);
-        }
-      }
-    }
-    if (snapshot?.lastIssue) {
-      console.log();
-      console.log(`  ${chalk9.dim("Last issue")} ${chalk9.yellow(snapshot.lastIssue)}`);
-    }
-    console.log();
+    renderMountStatus(config);
   })
 );
 function parsePositiveInt(raw, label) {
@@ -4377,7 +4284,7 @@ async function startMountControllerInBackground(rootPath) {
   return child.pid;
 }
 async function startMountControllerInForeground(rootPath) {
-  const child = startMountControllerProcess(rootPath, false, true);
+  const child = startMountControllerProcess(rootPath, true, true);
   await waitForMountControllerRunning(rootPath, child.pid);
   return child;
 }
@@ -4394,7 +4301,7 @@ function startMountControllerProcess(rootPath, detached, openRootWhenReady) {
   if (openRootWhenReady) {
     args.push("--open-root-when-ready");
   }
-  const child = spawn4(process.execPath, [entrypoint, ...args], {
+  const child = spawn3(process.execPath, [entrypoint, ...args], {
     cwd: process.cwd(),
     detached,
     env: process.env,
@@ -4419,45 +4326,30 @@ async function waitForMountControllerRunning(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) {
+async function superviseForegroundMountController(rootPath, child, controls) {
+  let lifecycleState = createMountLifecycleState();
+  lifecycleState = updateMountLifecycleDisplay(
+    lifecycleState,
+    readMountStatusSnapshot(rootPath)
+  );
   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 {
+      clearInterval(interval);
+      if (lifecycleState.spinner) {
+        lifecycleState.spinner.stop();
+        lifecycleState.spinner = null;
       }
-      process.exit(0);
-    };
-    const onSigint = () => {
-      stopAndExit("SIGINT");
     };
-    const onSigterm = () => {
-      stopAndExit("SIGTERM");
+    const backgroundAndExit = () => {
+      cleanup();
+      child.unref();
+      console.log();
+      console.log(chalk10.dim(`  Backgrounded mount controller (pid ${child.pid ?? "unknown"}).`));
+      console.log(chalk10.dim("  Use `computer mount status` to inspect sync state."));
+      console.log();
+      resolve();
     };
     const onError = (error) => {
       cleanup();
@@ -4475,26 +4367,367 @@ async function superviseForegroundMountController(child) {
         )
       );
     };
-    process.once("SIGINT", onSigint);
-    process.once("SIGTERM", onSigterm);
+    const interval = setInterval(() => {
+      const action = controls.consumeAction();
+      if (action === "background") {
+        backgroundAndExit();
+        return;
+      }
+      if (action === "stop") {
+        cleanup();
+        resolve();
+        return;
+      }
+      lifecycleState = updateMountLifecycleDisplay(
+        lifecycleState,
+        readMountStatusSnapshot(rootPath)
+      );
+    }, 1e3);
     child.once("error", onError);
     child.once("exit", onExit);
   });
 }
 function printMountStartSummary(config, pid, mode) {
   console.log();
-  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(chalk10.dim(`  PID:         ${pid}`));
+  console.log(chalk10.dim(`  Root:        ${config.rootPath}`));
+  console.log(chalk10.dim(`  SSH alias:   ${config.alias}`));
+  console.log(chalk10.dim(`  Poll:        ${config.pollIntervalMs}ms`));
   console.log();
   console.log(
-    chalk9.dim(
-      mode === "background" ? "  Use `computer mount status` to inspect sync state." : "  Press Ctrl-C to stop syncing."
+    chalk10.dim(
+      mode === "background" ? "  Use `computer mount status` to inspect sync state." : "  Press Ctrl-C to stop syncing or Ctrl-B to move it to the background."
     )
   );
   console.log();
 }
+function renderMountStatus(config) {
+  const controller = getMountControllerState(config.rootPath);
+  const snapshot = readMountStatusSnapshot(config.rootPath);
+  console.log();
+  console.log(`  ${chalk10.bold("Machine Mounts")}`);
+  console.log();
+  console.log(
+    `  ${chalk10.dim("Running")}    ${controller.running ? chalk10.green("yes") : chalk10.dim("no")}`
+  );
+  if (controller.pid) {
+    console.log(`  ${chalk10.dim("PID")}        ${controller.pid}`);
+  }
+  console.log(`  ${chalk10.dim("Root")}       ${config.rootPath}`);
+  console.log(`  ${chalk10.dim("Alias")}      ${config.alias}`);
+  console.log(
+    `  ${chalk10.dim("Updated")}    ${snapshot?.updatedAt ? timeAgo(snapshot.updatedAt) : chalk10.dim("never")}`
+  );
+  console.log(
+    `  ${chalk10.dim("Healthy")}    ${snapshot?.lastHealthySyncAt ? timeAgo(snapshot.lastHealthySyncAt) : chalk10.dim("never")}`
+  );
+  if (snapshot?.startupPhase && snapshot.startupPhase !== "ready") {
+    console.log(`  ${chalk10.dim("Startup")}    ${chalk10.cyan(snapshot.startupPhase)}`);
+    if (snapshot.startupMessage) {
+      console.log(`  ${chalk10.dim(snapshot.startupMessage)}`);
+    }
+  }
+  if (controller.running && snapshot?.mounts.length) {
+    console.log();
+    for (const mount of snapshot.mounts) {
+      renderMountSnapshot(mount);
+    }
+  }
+  if (snapshot?.lastIssue) {
+    console.log();
+    console.log(`  ${chalk10.dim("Last issue")} ${chalk10.yellow(snapshot.lastIssue)}`);
+  }
+  console.log();
+}
+function renderMountSnapshot(mount) {
+  const state = formatMountState(mount.state);
+  console.log(`  ${chalk10.white(mount.handle)}  ${state}  ${chalk10.dim(mount.mountPath)}`);
+  const details = formatMountDetails(mount);
+  if (details) {
+    console.log(`  ${chalk10.dim(details)}`);
+  }
+}
+function formatMountDetails(mount) {
+  const details = [];
+  if (mount.message) {
+    details.push(mount.message);
+  }
+  if (mount.etaSeconds !== void 0 && !details.some((detail) => detail.includes("eta ~"))) {
+    details.push(`eta ~${formatEtaSeconds(mount.etaSeconds)}`);
+  }
+  return details.length > 0 ? details.join("; ") : void 0;
+}
+function formatEtaSeconds(seconds) {
+  if (seconds < 60) {
+    return `${seconds}s`;
+  }
+  const minutes = Math.floor(seconds / 60);
+  const remainder = seconds % 60;
+  return remainder === 0 ? `${minutes}m` : `${minutes}m ${remainder}s`;
+}
+function attachForegroundControls(child) {
+  let pendingAction = null;
+  const canUseRawMode = process.stdin.isTTY && typeof process.stdin.setRawMode === "function";
+  const requestStop = () => {
+    if (!pendingAction) {
+      pendingAction = "stop";
+    }
+    try {
+      if (child.pid) {
+        process.kill(child.pid, "SIGTERM");
+      }
+    } catch {
+    }
+  };
+  const onData = (chunk) => {
+    const text = chunk.toString();
+    for (const character of text) {
+      if (character === "") {
+        if (!pendingAction) {
+          pendingAction = "background";
+        }
+      } else if (character === "") {
+        requestStop();
+      }
+    }
+  };
+  const onSigint = () => {
+    requestStop();
+  };
+  const onSigterm = () => {
+    requestStop();
+  };
+  if (canUseRawMode) {
+    process.stdin.setRawMode(true);
+    process.stdin.resume();
+    process.stdin.on("data", onData);
+  }
+  process.on("SIGINT", onSigint);
+  process.on("SIGTERM", onSigterm);
+  return {
+    consumeAction() {
+      const action = pendingAction;
+      pendingAction = null;
+      return action;
+    },
+    close() {
+      if (canUseRawMode) {
+        process.stdin.off("data", onData);
+        process.stdin.setRawMode(false);
+        process.stdin.pause();
+      }
+      process.off("SIGINT", onSigint);
+      process.off("SIGTERM", onSigterm);
+    }
+  };
+}
+function createMountLifecycleState() {
+  return {
+    view: void 0,
+    spinner: null
+  };
+}
+function updateMountLifecycleDisplay(state, snapshot) {
+  const nextView = describeMountLifecycle(snapshot);
+  const previousView = state.view;
+  if (previousView?.key === nextView.key) {
+    if (state.spinner) {
+      state.spinner.text = nextView.text;
+    }
+    return {
+      ...state,
+      view: nextView
+    };
+  }
+  if (state.spinner) {
+    if (nextView.status === "success") {
+      state.spinner.succeed(nextView.text);
+      return {
+        view: nextView,
+        spinner: null
+      };
+    }
+    if (nextView.status === "warning") {
+      state.spinner.warn(nextView.text);
+      return {
+        view: nextView,
+        spinner: null
+      };
+    }
+    state.spinner.succeed(previousView?.completionText ?? previousView?.text ?? "");
+  }
+  if (nextView.status === "loading") {
+    return {
+      view: nextView,
+      spinner: ora9({
+        spinner: MOUNT_START_SPINNER,
+        text: nextView.text
+      }).start()
+    };
+  }
+  console.log(chalk10.dim(`  ${nextView.text}`));
+  return {
+    view: nextView,
+    spinner: null
+  };
+}
+function describeMountLifecycle(snapshot) {
+  if (!snapshot) {
+    return {
+      key: "waiting",
+      text: "Waiting for mount controller state",
+      completionText: "Mount controller state received",
+      status: "loading"
+    };
+  }
+  const actionableMounts = (snapshot?.mounts ?? []).filter((mount) => mount.state !== "pending");
+  const readyCount = actionableMounts.filter((mount) => mount.state === "mounted").length;
+  const totalCount = actionableMounts.length;
+  if (snapshot?.lastIssue && actionableMounts.some((mount) => mount.state === "error" || mount.state === "degraded")) {
+    return {
+      key: "issue",
+      text: `Needs attention: ${snapshot.lastIssue}`,
+      status: "warning"
+    };
+  }
+  if (snapshot?.startupPhase === "cleaning") {
+    return {
+      key: "cleaning",
+      text: "Cleaning stale mount state",
+      completionText: "Cleaned stale mount state",
+      status: "loading"
+    };
+  }
+  if (actionableMounts.some((mount) => mount.state === "reconnecting")) {
+    return {
+      key: "waiting",
+      text: formatLifecycleText(
+        "Waiting for remote availability",
+        readyCount,
+        totalCount
+      ),
+      completionText: "Remote availability restored",
+      status: "loading"
+    };
+  }
+  const phaseMatch = findLifecyclePhaseMatch(actionableMounts);
+  if (phaseMatch) {
+    return phaseMatch;
+  }
+  if (snapshot?.startupPhase !== "ready") {
+    return {
+      key: "waiting",
+      text: formatLifecycleText("Waiting for initial sync", readyCount, totalCount),
+      completionText: "Initial sync started",
+      status: "loading"
+    };
+  }
+  if (totalCount === 0) {
+    return {
+      key: "connected",
+      text: "Connected and waiting for SSH-ready machines",
+      status: "success"
+    };
+  }
+  return {
+    key: "connected",
+    text: "Connected and serving files bidirectionally",
+    status: "success"
+  };
+}
+function findLifecyclePhaseMatch(mounts) {
+  const phaseDefinitions = [
+    {
+      key: "scanning",
+      label: "Scanning files",
+      completionText: "Finished scanning files",
+      match: (mount) => (mount.status ?? "").toLowerCase().includes("scanning")
+    },
+    {
+      key: "staging",
+      label: "Staging files",
+      completionText: "Finished staging files",
+      match: (mount) => (mount.status ?? "").toLowerCase().includes("staging")
+    },
+    {
+      key: "reconciling",
+      label: "Reconciling changes",
+      completionText: "Reconciled changes",
+      match: (mount) => (mount.status ?? "").toLowerCase().includes("reconciling")
+    },
+    {
+      key: "applying",
+      label: "Applying changes",
+      completionText: "Applied changes",
+      match: (mount) => (mount.status ?? "").toLowerCase().includes("applying")
+    },
+    {
+      key: "saving",
+      label: "Finalizing sync",
+      completionText: "Finalized sync state",
+      match: (mount) => (mount.status ?? "").toLowerCase().includes("saving")
+    }
+  ];
+  const readyCount = mounts.filter((mount) => mount.state === "mounted").length;
+  const totalCount = mounts.length;
+  for (const phase of phaseDefinitions) {
+    const matches = mounts.filter(
+      (mount) => mount.state === "syncing" && phase.match(mount)
+    );
+    if (matches.length === 0) {
+      continue;
+    }
+    const representative = selectRepresentativeMount(matches);
+    const progress = formatLifecycleProgress(representative);
+    return {
+      key: phase.key,
+      text: formatLifecycleText(phase.label, readyCount, totalCount, progress),
+      completionText: phase.completionText,
+      status: "loading"
+    };
+  }
+  return null;
+}
+function selectRepresentativeMount(mounts) {
+  let best = mounts[0];
+  for (const candidate of mounts.slice(1)) {
+    const candidateProgress = getMountProgressPercent(candidate) ?? -1;
+    const bestProgress = getMountProgressPercent(best) ?? -1;
+    if (candidateProgress > bestProgress) {
+      best = candidate;
+    }
+  }
+  return best;
+}
+function formatLifecycleText(label, readyCount, totalCount, progress) {
+  const details = [];
+  if (totalCount > 0) {
+    details.push(`${readyCount}/${totalCount} ready`);
+  }
+  if (progress) {
+    details.push(progress);
+  }
+  return details.length > 0 ? `${label} (${details.join(", ")})` : label;
+}
+function formatLifecycleProgress(mount) {
+  const parts = [];
+  const percent = getMountProgressPercent(mount);
+  if (percent !== void 0) {
+    parts.push(`${percent}%`);
+  }
+  if (mount.etaSeconds !== void 0) {
+    parts.push(`eta ~${formatEtaSeconds(mount.etaSeconds)}`);
+  }
+  return parts.length > 0 ? parts.join(", ") : void 0;
+}
+function getMountProgressPercent(mount) {
+  const match = mount.progress?.match(/(\d+)%/);
+  if (!match) {
+    return void 0;
+  }
+  const percent = Number.parseInt(match[1] ?? "", 10);
+  return Number.isFinite(percent) ? percent : void 0;
+}
 function processExists2(pid) {
   if (!Number.isInteger(pid) || pid <= 0) {
     return false;
@@ -4510,7 +4743,7 @@ function revealMountRootInFinder(rootPath) {
   if (process.platform !== "darwin") {
     return;
   }
-  const child = spawn4("open", [rootPath], {
+  const child = spawn3("open", [rootPath], {
     stdio: "ignore",
     detached: true
   });
@@ -4521,35 +4754,36 @@ function revealMountRootInFinder(rootPath) {
 function formatMountState(state) {
   switch (state) {
     case "mounted":
-      return chalk9.green(state);
+      return chalk10.green(state);
+    case "syncing":
     case "reconnecting":
-      return chalk9.cyan(state);
+      return chalk10.cyan(state);
     case "degraded":
     case "pending":
-      return chalk9.yellow(state);
+      return chalk10.yellow(state);
     default:
-      return chalk9.red(state);
+      return chalk10.red(state);
   }
 }
 
 // src/commands/logout.ts
-import { Command as Command12 } from "commander";
-import chalk10 from "chalk";
-var logoutCommand = new Command12("logout").description("Remove stored API key").action(() => {
+import { Command as Command13 } from "commander";
+import chalk11 from "chalk";
+var logoutCommand = new Command13("logout").description("Remove stored API key").action(() => {
   if (!getStoredAPIKey()) {
     console.log();
-    console.log(chalk10.dim("  Not logged in."));
+    console.log(chalk11.dim("  Not logged in."));
     if (hasEnvAPIKey()) {
-      console.log(chalk10.dim("  Environment API key is still active in this shell."));
+      console.log(chalk11.dim("  Environment API key is still active in this shell."));
     }
     console.log();
     return;
   }
   clearAPIKey();
   console.log();
-  console.log(chalk10.green("  Logged out."));
+  console.log(chalk11.green("  Logged out."));
   if (hasEnvAPIKey()) {
-    console.log(chalk10.dim("  Environment API key is still active in this shell."));
+    console.log(chalk11.dim("  Environment API key is still active in this shell."));
   }
   console.log();
 });
@@ -4557,27 +4791,12 @@ var logoutCommand = new Command12("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 Command13 } from "commander";
-import chalk11 from "chalk";
+import { Command as Command14 } from "commander";
+import chalk12 from "chalk";
 import ora10 from "ora";
 var pkg2 = JSON.parse(
   readFileSync2(new URL("../package.json", import.meta.url), "utf8")
 );
-function normalizeVersion(version) {
-  return version.split("-")[0].split(".").map((part) => Number.parseInt(part, 10)).map((part) => Number.isNaN(part) ? 0 : part);
-}
-function compareVersions(a, b) {
-  const left = normalizeVersion(a);
-  const right = normalizeVersion(b);
-  const size = Math.max(left.length, right.length);
-  for (let index = 0; index < size; index += 1) {
-    const diff = (left[index] ?? 0) - (right[index] ?? 0);
-    if (diff !== 0) {
-      return diff;
-    }
-  }
-  return 0;
-}
 function resolveExecutablePath() {
   const candidate = process.argv[1] || process.execPath;
   try {
@@ -4625,8 +4844,9 @@ function findNixProfileElement(executablePath) {
   }
   return null;
 }
-function resolveUpgradeCommand(method, executablePath) {
+function resolveUpgradeCommand(method, executablePath, targetVersion) {
   const packageName = pkg2.name ?? "aicomputer";
+  const packageSpec = `${packageName}@${targetVersion}`;
   switch (method) {
     case "nix": {
       const element = findNixProfileElement(executablePath);
@@ -4644,34 +4864,32 @@ function resolveUpgradeCommand(method, executablePath) {
     case "pnpm":
       return {
         command: "pnpm",
-        args: ["add", "-g", `${packageName}@latest`],
-        label: `pnpm add -g ${packageName}@latest`
+        args: ["add", "-g", packageSpec],
+        label: `pnpm add -g ${packageSpec}`
       };
     case "yarn":
       return {
         command: "yarn",
-        args: ["global", "add", `${packageName}@latest`],
-        label: `yarn global add ${packageName}@latest`
+        args: ["global", "add", packageSpec],
+        label: `yarn global add ${packageSpec}`
       };
     case "npm":
     case "unknown":
       return {
         command: "npm",
-        args: ["install", "-g", `${packageName}@latest`],
-        label: `npm install -g ${packageName}@latest`
+        args: ["install", "-g", packageSpec],
+        label: `npm install -g ${packageSpec}`
       };
   }
 }
 async function getLatestVersion(packageName) {
-  const response = await fetch(`https://registry.npmjs.org/${packageName}/latest`);
+  const response = await fetch(`https://registry.npmjs.org/${packageName}`);
   if (!response.ok) {
     throw new Error(`Failed to check npm registry (${response.status})`);
   }
-  const payload = await response.json();
-  if (!payload.version) {
-    throw new Error("Registry response missing version");
-  }
-  return payload.version;
+  return resolveLatestPublishedVersion(
+    await response.json()
+  );
 }
 function attemptBundledMutagenRefresh(executablePath) {
   const install = spawnSync(
@@ -4686,12 +4904,12 @@ function attemptBundledMutagenRefresh(executablePath) {
   }
   console.log();
   console.log(
-    chalk11.yellow(
+    chalk12.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 () => {
+var upgradeCommand = new Command14("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();
@@ -4713,7 +4931,7 @@ var upgradeCommand = new Command13("upgrade").description("Update the CLI to the
   const method = detectInstallMethod(executablePath);
   let upgrade;
   try {
-    upgrade = resolveUpgradeCommand(method, executablePath);
+    upgrade = resolveUpgradeCommand(method, executablePath, latestVersion);
   } catch (error) {
     spinner.fail(
       error instanceof Error ? error.message : "Failed to prepare upgrade"
@@ -4724,9 +4942,9 @@ var upgradeCommand = new Command13("upgrade").description("Update the CLI to the
   spinner.stop();
   console.log();
   console.log(
-    chalk11.dim(`  Updating ${chalk11.bold(`v${currentVersion}`)} -> ${chalk11.bold(`v${latestVersion}`)}`)
+    chalk12.dim(`  Updating ${chalk12.bold(`v${currentVersion}`)} -> ${chalk12.bold(`v${latestVersion}`)}`)
   );
-  console.log(chalk11.dim(`  ${upgrade.label}`));
+  console.log(chalk12.dim(`  ${upgrade.label}`));
   console.log();
   const result = spawnSync(upgrade.command, upgrade.args, {
     stdio: "inherit"
@@ -4736,7 +4954,7 @@ var upgradeCommand = new Command13("upgrade").description("Update the CLI to the
       attemptBundledMutagenRefresh(executablePath);
     }
     console.log();
-    console.log(chalk11.green(`  Updated to v${latestVersion}.`));
+    console.log(chalk12.green(`  Updated to v${latestVersion}.`));
     console.log();
     return;
   }
@@ -4744,10 +4962,10 @@ var upgradeCommand = new Command13("upgrade").description("Update the CLI to the
 });
 
 // src/commands/whoami.ts
-import { Command as Command14 } from "commander";
-import chalk12 from "chalk";
+import { Command as Command15 } from "commander";
+import chalk13 from "chalk";
 import ora11 from "ora";
-var whoamiCommand = new Command14("whoami").description("Show current user").option("--json", "Print raw JSON").action(async (options) => {
+var whoamiCommand = new Command15("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");
@@ -4757,39 +4975,66 @@ var whoamiCommand = new Command14("whoami").description("Show current user").opt
       return;
     }
     console.log();
-    console.log(`  ${chalk12.bold.white(me.user.display_name || me.user.email)}`);
+    console.log(
+      `  ${chalk13.bold.white(me.user.display_name || me.user.email)}`
+    );
     if (me.user.display_name) {
-      console.log(`  ${chalk12.dim(me.user.email)}`);
+      console.log(`  ${chalk13.dim(me.user.email)}`);
     }
     if (me.api_key.name) {
-      console.log(`  ${chalk12.dim("Key:")}  ${me.api_key.name}`);
+      console.log(`  ${chalk13.dim("Key:")}  ${me.api_key.name}`);
+    }
+    if (me.runtime_credit) {
+      console.log(
+        `  ${chalk13.dim("Credits:")}  ${formatRuntimeHours(me.runtime_credit.available_credit_seconds)} remaining`
+      );
+      if (me.runtime_credit.in_grace && me.runtime_credit.grace_expires_at) {
+        console.log(
+          `  ${chalk13.dim("Grace:")}  Stops at ${new Date(me.runtime_credit.grace_expires_at).toLocaleString()}`
+        );
+      } else {
+        console.log(
+          `  ${chalk13.dim("Reset:")}  ${new Date(me.runtime_credit.period_ends_at).toLocaleDateString()}`
+        );
+      }
     }
-    console.log(`  ${chalk12.dim("API:")}  ${chalk12.dim(getBaseURL())}`);
+    console.log(`  ${chalk13.dim("API:")}  ${chalk13.dim(getBaseURL())}`);
     console.log();
   } catch (error) {
     if (spinner) {
-      spinner.fail(error instanceof Error ? error.message : "Failed to load user");
+      spinner.fail(
+        error instanceof Error ? error.message : "Failed to load user"
+      );
     } else {
-      console.error(error instanceof Error ? error.message : "Failed to load user");
+      console.error(
+        error instanceof Error ? error.message : "Failed to load user"
+      );
     }
     process.exit(1);
   }
 });
+function formatRuntimeHours(seconds) {
+  const hours = Math.max(seconds, 0) / 3600;
+  if (hours >= 10) {
+    return `${Math.round(hours)}h`;
+  }
+  return `${hours.toFixed(1)}h`;
+}
 
 // src/index.ts
 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 Command15();
+var cliName = process.argv[1] ? basename(process.argv[1]) : "agentcomputer";
+var program = new Command16();
 function appendTextSection(lines, title, values) {
   if (values.length === 0) {
     return;
   }
-  lines.push(`  ${chalk13.dim(title)}`);
+  lines.push(`  ${chalk14.dim(title)}`);
   lines.push("");
   for (const value of values) {
-    lines.push(`    ${chalk13.white(value)}`);
+    lines.push(`    ${chalk14.white(value)}`);
   }
   lines.push("");
 }
@@ -4798,10 +5043,10 @@ function appendTableSection(lines, title, entries) {
     return;
   }
   const width = Math.max(...entries.map((entry) => entry.term.length), 0) + 2;
-  lines.push(`  ${chalk13.dim(title)}`);
+  lines.push(`  ${chalk14.dim(title)}`);
   lines.push("");
   for (const entry of entries) {
-    lines.push(`    ${chalk13.white(padEnd(entry.term, width))}${chalk13.dim(entry.desc)}`);
+    lines.push(`    ${chalk14.white(padEnd(entry.term, width))}${chalk14.dim(entry.desc)}`);
   }
   lines.push("");
 }
@@ -4827,10 +5072,10 @@ function formatRootHelp(cmd) {
     ["Other", []]
   ];
   const otherGroup = groups.find(([name]) => name === "Other")[1];
-  lines.push(`${chalk13.bold(cliName)} ${chalk13.dim(`v${version}`)}`);
+  lines.push(`${chalk14.bold(cliName)} ${chalk14.dim(`v${version}`)}`);
   lines.push("");
   if (cmd.description()) {
-    lines.push(`  ${chalk13.dim(cmd.description())}`);
+    lines.push(`  ${chalk14.dim(cmd.description())}`);
     lines.push("");
   }
   appendTextSection(lines, "Usage", [`${cliName} <command> [options]`]);
@@ -4839,7 +5084,7 @@ function formatRootHelp(cmd) {
     const entry = { term: name, desc: sub.description() };
     if (["login", "logout", "whoami", "claude-login", "codex-login"].includes(name)) {
       groups[0][1].push(entry);
-    } else if (["create", "ls", "get", "rm"].includes(name)) {
+    } else if (["create", "ls", "get", "power-on", "power-off", "rm"].includes(name)) {
       groups[1][1].push(entry);
     } else if (name === "image") {
       groups[2][1].push(entry);
@@ -4883,10 +5128,10 @@ function formatSubcommandHelp(cmd, helper) {
     term: helper.optionTerm(option),
     desc: helper.optionDescription(option)
   }));
-  lines.push(chalk13.bold(commandPath(cmd)));
+  lines.push(chalk14.bold(commandPath(cmd)));
   lines.push("");
   if (description) {
-    lines.push(`  ${chalk13.dim(description)}`);
+    lines.push(`  ${chalk14.dim(description)}`);
     lines.push("");
   }
   appendTextSection(lines, "Usage", [helper.commandUsage(cmd)]);
@@ -4912,6 +5157,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(internalInstallAutosshCommand, { hidden: true });
 program.addCommand(internalInstallMutagenCommand, { hidden: true });
 program.addCommand(logoutCommand);
 program.addCommand(whoamiCommand);
@@ -4920,6 +5166,8 @@ program.addCommand(codexLoginCommand);
 program.addCommand(createCommand);
 program.addCommand(lsCommand);
 program.addCommand(getCommand);
+program.addCommand(powerOnCommand);
+program.addCommand(powerOffCommand);
 program.addCommand(imageCommand);
 program.addCommand(agentCommand);
 program.addCommand(acpCommand);