aicomputer 0.1.3 → 0.1.4

package/README.md

@@ -10,14 +10,19 @@ npm install -g aicomputer
 
 ## Usage
 
+After installing, use the `computer` command:
+
 ```bash
-agentcomputer login
-agentcomputer login --api-key <ac_live_...>
-agentcomputer whoami
-agentcomputer create my-box
-agentcomputer open my-box
-agentcomputer open my-box --terminal
-agentcomputer ssh my-box
+computer login
+computer login --api-key <ac_live_...>
+computer whoami
+computer create my-box
+computer open my-box
+computer open my-box --terminal
+computer ssh
+computer ssh my-box
 ```
 
-The package installs the `aicomputer`, `agentcomputer`, and `computer` commands. You can also run it without a global install via `npx aicomputer <command>`.
+Run `computer ssh` without a handle in an interactive terminal to pick from your available machines.
+
+You can also run without a global install via `npx aicomputer <command>`.

package/dist/index.js

@@ -8,9 +8,9 @@ import { basename as basename2 } from "path";
 
 // src/commands/access.ts
 import { spawn } from "child_process";
+import { select } from "@inquirer/prompts";
 import { Command } from "commander";
 import chalk2 from "chalk";
-import open from "open";
 import ora from "ora";
 
 // src/lib/config.ts
@@ -216,7 +216,7 @@ function vncURL(computer) {
     return null;
   }
   const domain = computer.primary_web_host.replace(/^[^.]+\./, "");
-  return `https://6080--${computer.handle}.${domain}/vnc_lite.html`;
+  return `https://6080--${computer.handle}.${domain}/vnc.html?autoconnect=1&resize=remote`;
 }
 function terminalURL(computer) {
   if (computer.runtime_family !== "managed-worker") {
@@ -236,7 +236,9 @@ function normalizePrimaryPath(primaryPath) {
 // src/lib/ssh-keys.ts
 import { basename } from "path";
 import { homedir as homedir2 } from "os";
-import { readFile } from "fs/promises";
+import { readFile, mkdir } from "fs/promises";
+import { execFileSync } from "child_process";
+import { existsSync as existsSync2 } from "fs";
 var DEFAULT_PUBLIC_KEY_PATHS = [
   `${homedir2()}/.ssh/id_ed25519.pub`,
   `${homedir2()}/.ssh/id_ecdsa.pub`,
@@ -245,19 +247,19 @@ var DEFAULT_PUBLIC_KEY_PATHS = [
 async function ensureDefaultSSHKeyRegistered() {
   for (const path of DEFAULT_PUBLIC_KEY_PATHS) {
     try {
-      const publicKey = (await readFile(path, "utf8")).trim();
-      if (!publicKey) {
+      const publicKey2 = (await readFile(path, "utf8")).trim();
+      if (!publicKey2) {
         continue;
       }
-      const key = await api("/v1/ssh-keys", {
+      const key2 = await api("/v1/ssh-keys", {
         method: "POST",
         body: JSON.stringify({
           name: basename(path),
-          public_key: publicKey
+          public_key: publicKey2
         })
       });
       return {
-        key,
+        key: key2,
         publicKeyPath: path,
         privateKeyPath: path.replace(/\.pub$/, "")
       };
@@ -268,7 +270,33 @@ async function ensureDefaultSSHKeyRegistered() {
       throw error;
     }
   }
-  throw new Error("no SSH public key found in ~/.ssh (looked for id_ed25519.pub, id_ecdsa.pub, id_rsa.pub)");
+  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 = `${homedir2()}/.ssh`;
+  if (!existsSync2(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/format.ts
@@ -306,6 +334,53 @@ function formatStatus(status) {
   }
 }
 
+// src/lib/open-browser.ts
+import { constants } from "fs";
+import { access } from "fs/promises";
+import open from "open";
+var IMAGE_BROWSER_LAUNCHER = "/usr/local/bin/browser-launcher";
+async function isExecutable(path) {
+  try {
+    await access(path, constants.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function hasBrokenChromeBrowserEnv() {
+  const configuredBrowser = process.env.BROWSER?.trim().toLowerCase();
+  switch (configuredBrowser) {
+    case "chrome":
+    case "google-chrome":
+    case "google chrome":
+      return true;
+    default:
+      return false;
+  }
+}
+async function openBrowserURL(url) {
+  if (process.platform !== "linux") {
+    await open(url);
+    return;
+  }
+  if (hasBrokenChromeBrowserEnv()) {
+    delete process.env.BROWSER;
+  }
+  if (await isExecutable(IMAGE_BROWSER_LAUNCHER)) {
+    try {
+      await open(url, { app: { name: IMAGE_BROWSER_LAUNCHER } });
+      return;
+    } catch {
+    }
+  }
+  try {
+    await open(url, { app: { name: "xdg-open" } });
+    return;
+  } catch {
+  }
+  await open(url);
+}
+
 // src/commands/access.ts
 var openCommand = new Command("open").description("Open a computer in your browser").argument("<id-or-handle>", "Computer id or handle").option("--vnc", "Open VNC desktop instead of gateway").option("--terminal", "Open the terminal surface instead of gateway").action(async (identifier, options) => {
   const spinner = ora("Preparing access...").start();
@@ -321,7 +396,7 @@ var openCommand = new Command("open").description("Open a computer in your brows
       }
       const url = info.connection.vnc_url;
       spinner.succeed(`Opening VNC for ${chalk2.bold(computer.handle)}`);
-      await open(url);
+      await openBrowserURL(url);
       console.log(chalk2.dim(`  ${url}`));
       return;
     }
@@ -329,25 +404,27 @@ var openCommand = new Command("open").description("Open a computer in your brows
       if (!info.connection.terminal_available) {
         throw new Error("Terminal access is not available for this computer");
       }
-      const access2 = await createTerminalAccess(computer.id);
+      const access3 = await createTerminalAccess(computer.id);
       spinner.succeed(`Opening terminal for ${chalk2.bold(computer.handle)}`);
-      await open(access2.access_url);
-      console.log(chalk2.dim(`  ${access2.access_url}`));
+      await openBrowserURL(access3.access_url);
+      console.log(chalk2.dim(`  ${access3.access_url}`));
       return;
     }
-    const access = await createBrowserAccess(computer.id);
+    const access2 = await createBrowserAccess(computer.id);
     spinner.succeed(`Opening ${chalk2.bold(computer.handle)}`);
-    await open(access.access_url);
-    console.log(chalk2.dim(`  ${access.access_url}`));
+    await openBrowserURL(access2.access_url);
+    console.log(chalk2.dim(`  ${access2.access_url}`));
   } catch (error) {
     spinner.fail(error instanceof Error ? error.message : "Failed to open computer");
     process.exit(1);
   }
 });
-var sshCommand = new Command("ssh").description("Open an SSH session to a computer").argument("<id-or-handle>", "Computer id or handle").action(async (identifier) => {
-  const spinner = ora("Preparing SSH access...").start();
+var sshCommand = new Command("ssh").description("Open an SSH session to a computer").argument("[id-or-handle]", "Computer id or handle").action(async (identifier) => {
+  const spinner = ora(
+    identifier ? "Preparing SSH access..." : "Fetching computers..."
+  ).start();
   try {
-    const computer = await resolveComputer(identifier);
+    const computer = await resolveSSHComputer(identifier, spinner);
     const info = await getConnectionInfo(computer.id);
     if (!info.connection.ssh_available) {
       throw new Error("SSH is not available for this computer");
@@ -457,12 +534,55 @@ async function runSSH(args) {
     });
   });
 }
+async function resolveSSHComputer(identifier, spinner) {
+  const trimmed = identifier?.trim();
+  if (trimmed) {
+    return resolveComputer(trimmed);
+  }
+  if (!process.stdin.isTTY || !process.stdout.isTTY) {
+    throw new Error("computer id or handle is required when not running interactively");
+  }
+  const computers = await listComputers();
+  const available = computers.filter(isSSHSelectable);
+  if (available.length === 0) {
+    if (computers.length === 0) {
+      throw new Error("no computers found");
+    }
+    throw new Error("no running computers with SSH enabled");
+  }
+  const handleWidth = Math.max(6, ...available.map((computer) => computer.handle.length));
+  spinner.stop();
+  let selectedID;
+  try {
+    selectedID = await select({
+      message: "Select a computer to SSH into",
+      pageSize: Math.min(available.length, 10),
+      choices: available.map((computer) => ({
+        name: `${padEnd(chalk2.white(computer.handle), handleWidth + 2)}${padEnd(formatStatus(computer.status), 12)}${chalk2.dim(describeSSHChoice(computer))}`,
+        value: computer.id
+      }))
+    });
+  } finally {
+    spinner.start("Preparing SSH access...");
+  }
+  return available.find((computer) => computer.id === selectedID) ?? available[0];
+}
+function isSSHSelectable(computer) {
+  return computer.ssh_enabled && computer.status === "running";
+}
+function describeSSHChoice(computer) {
+  const displayName = computer.display_name.trim();
+  if (displayName && displayName !== computer.handle) {
+    return `${displayName}  ${timeAgo(computer.updated_at)}`;
+  }
+  return `${computer.runtime_family}  ${timeAgo(computer.updated_at)}`;
+}
 
 // src/commands/computers.ts
 import { Command as Command2 } from "commander";
 import chalk3 from "chalk";
 import ora2 from "ora";
-import { select, input as textInput, confirm } from "@inquirer/prompts";
+import { select as select2, input as textInput, confirm } from "@inquirer/prompts";
 function isInternalCondition(value) {
   return /^[A-Z][a-zA-Z]+$/.test(value);
 }
@@ -665,7 +785,7 @@ async function resolveCreateOptions(options) {
     validateCreateOptions(selectedOptions);
     return selectedOptions;
   }
-  const runtimeChoice = await select({
+  const runtimeChoice = await select2({
     message: "Select runtime",
     choices: [
       {
@@ -685,7 +805,7 @@ async function resolveCreateOptions(options) {
     selectedOptions.imageRef = (await textInput({ message: "OCI image ref (required):" })).trim();
     selectedOptions.primaryPort = (await textInput({ message: "Primary port:", default: "3000" })).trim();
     selectedOptions.primaryPath = (await textInput({ message: "Primary path:", default: "/" })).trim();
-    selectedOptions.healthcheckType = await select({
+    selectedOptions.healthcheckType = await select2({
       message: "Healthcheck type",
       choices: [
         { name: "tcp", value: "tcp" },
@@ -804,7 +924,7 @@ function resolveOptionalToggle(enabled, disabled, label) {
 
 // src/commands/completion.ts
 import { Command as Command3 } from "commander";
-var ZSH_SCRIPT = `#compdef computer
+var ZSH_SCRIPT = `#compdef computer agentcomputer aicomputer
 
 _computer() {
   local -a commands
@@ -933,7 +1053,8 @@ _computer() {
 
 _computer_handles() {
   local -a handles
-  if handles=(\${(f)"$(computer ls --json 2>/dev/null | grep '"handle"' | sed 's/.*"handle": "\\([^"]*\\)".*/\\1/')"}); then
+  local cli="\${words[1]:-computer}"
+  if handles=(\${(f)"$(\${cli} ls --json 2>/dev/null | grep '"handle"' | sed 's/.*"handle": "\\([^"]*\\)".*/\\1/')"}); then
     _describe -t handles 'computer handle' handles
   fi
 }
@@ -968,8 +1089,8 @@ var BASH_SCRIPT = `_computer() {
       ;;
     get|open|ssh|rm)
       if [[ $cword -eq 2 ]]; then
-        local handles
-        handles=$(computer ls --json 2>/dev/null | grep '"handle"' | sed 's/.*"handle": "\\([^"]*\\)".*/\\1/')
+        local handles cli="\${words[0]:-computer}"
+        handles=$(\${cli} ls --json 2>/dev/null | grep '"handle"' | sed 's/.*"handle": "\\([^"]*\\)".*/\\1/')
         COMPREPLY=($(compgen -W "$handles" -- "$cur"))
       else
         case "$cmd" in
@@ -983,8 +1104,8 @@ var BASH_SCRIPT = `_computer() {
       if [[ $cword -eq 2 ]]; then
         COMPREPLY=($(compgen -W "$ports_commands" -- "$cur"))
       elif [[ $cword -eq 3 ]]; then
-        local handles
-        handles=$(computer ls --json 2>/dev/null | grep '"handle"' | sed 's/.*"handle": "\\([^"]*\\)".*/\\1/')
+        local handles cli="\${words[0]:-computer}"
+        handles=$(\${cli} ls --json 2>/dev/null | grep '"handle"' | sed 's/.*"handle": "\\([^"]*\\)".*/\\1/')
         COMPREPLY=($(compgen -W "$handles" -- "$cur"))
       fi
       ;;
@@ -996,7 +1117,7 @@ var BASH_SCRIPT = `_computer() {
   esac
 }
 
-complete -F _computer computer`;
+complete -F _computer computer agentcomputer aicomputer`;
 var completionCommand = new Command3("completion").description("Generate shell completions").argument("<shell>", "Shell type (bash or zsh)").action((shell) => {
   switch (shell) {
     case "zsh":
@@ -1014,7 +1135,6 @@ var completionCommand = new Command3("completion").description("Generate shell c
 // src/commands/login.ts
 import { Command as Command4 } from "commander";
 import chalk4 from "chalk";
-import open2 from "open";
 import ora3 from "ora";
 
 // src/lib/browser-login.ts
@@ -1289,7 +1409,7 @@ async function runBrowserLogin() {
     attempt = await createBrowserLoginAttempt();
     spinner.text = "Opening browser...";
     try {
-      await open2(attempt.loginURL);
+      await openBrowserURL(attempt.loginURL);
     } catch {
       spinner.stop();
       console.log();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aicomputer",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Computer CLI - manage your Agent Computer fleet from the terminal",
   "homepage": "https://agentcomputer.ai",
   "repository": {