aicomputer 0.1.5 → 0.1.6

package/README.md

@@ -22,6 +22,11 @@ computer open my-box --terminal
 computer ssh
 computer ssh my-box
 computer ssh --setup
+computer agent agents my-box
+computer agent sessions list my-box
+computer agent prompt my-box "inspect /workspace" --agent codex
+computer fleet status
+computer acp serve my-box --agent codex
 ```
 
 Run `computer ssh` without a handle in an interactive terminal to pick from your available machines.
@@ -33,4 +38,6 @@ ssh agentcomputer.ai
 ssh my-box@agentcomputer.ai
 ```
 
+Use `computer agent` to inspect agents on one machine and manage remote sessions. Use `computer fleet status` to see active agent work across every machine in your fleet.
+
 You can also run without a global install via `npx aicomputer <command>`.

package/dist/index.js

@@ -857,8 +857,28 @@ function emitError(id, code, message) {
     }
   });
 }
-async function forwardRawEventStream(computerID, sessionID, signal) {
-  const response = await openAgentSessionEventsStream(computerID, sessionID, { signal });
+function forwardBridgePayload(payload, publicSessionID, backendSessionID) {
+  let message;
+  try {
+    message = JSON.parse(payload);
+  } catch {
+    return;
+  }
+  const method = typeof message.method === "string" ? message.method : "";
+  if (method !== "session/update" && method !== "session/request_permission") {
+    return;
+  }
+  const params = typeof message.params === "object" && message.params !== null ? { ...message.params } : {};
+  const payloadSessionID = typeof params.sessionId === "string" ? params.sessionId.trim() : "";
+  if (backendSessionID?.trim() && payloadSessionID && payloadSessionID !== backendSessionID.trim()) {
+    return;
+  }
+  params.sessionId = publicSessionID;
+  process.stdout.write(`${JSON.stringify({ ...message, params })}
+`);
+}
+async function forwardRawEventStream(computerID, publicSessionID, backendSessionID, signal) {
+  const response = await openAgentSessionEventsStream(computerID, publicSessionID, { signal });
   if (!response.body) {
     return;
   }
@@ -882,8 +902,7 @@ async function forwardRawEventStream(computerID, sessionID, signal) {
       if (!payload || payload === "heartbeat") {
         continue;
       }
-      process.stdout.write(`${payload}
-`);
+      forwardBridgePayload(payload, publicSessionID, backendSessionID);
     }
   }
 }
@@ -904,15 +923,21 @@ async function handlePromptRequest(computerID, sessionID, id, params) {
   if (prompt.length === 0) {
     throw new Error("session/prompt requires prompt content");
   }
+  const accepted = await promptAgentSession(computerID, sessionID, { prompt });
+  const current = await getAgentSession(computerID, sessionID);
   const controller = new AbortController();
-  const streamPromise = forwardRawEventStream(computerID, sessionID, controller.signal).catch((error) => {
+  const streamPromise = forwardRawEventStream(
+    computerID,
+    sessionID,
+    current.backend_session_id,
+    controller.signal
+  ).catch((error) => {
     if (error instanceof Error && error.name === "AbortError") {
       return;
     }
-    throw error;
+    return;
   });
   try {
-    const accepted = await promptAgentSession(computerID, sessionID, { prompt });
     const settled = await waitForSessionToSettle(computerID, sessionID, accepted.prompt_id);
     emitResult(id, {
       stopReason: settled.last_stop_reason || "end_turn"
@@ -1129,7 +1154,7 @@ var StreamPrinter = class {
 };
 async function streamSessionEvents(computerID, sessionID, options = {}) {
   const response = await openAgentSessionEventsStream(computerID, sessionID, {
-    lastEventId: options.replay ? "0" : void 0,
+    lastEventId: options.lastEventId?.trim() || void 0,
     signal: options.signal
   });
   if (!response.body) {
@@ -1314,22 +1339,33 @@ agentCommand.command("prompt").description("Send a prompt to a machine agent ses
     const computer = await resolveComputer(identifier);
     const session = await resolvePromptSession(computer.id, options);
     spinner?.stop();
-    if (!options.noStream) {
+    const canStreamImmediately = !options.noStream && Boolean(session.backend_session_id?.trim());
+    if (canStreamImmediately) {
       streamPromise = streamSessionEvents(computer.id, session.id, {
-        replay: false,
         json: options.json,
         signal: controller.signal
       }).catch((error) => {
         if (error instanceof Error && error.name === "AbortError") {
           return;
         }
-        throw error;
+        return;
       });
       await new Promise((resolve) => setTimeout(resolve, 150));
     }
     const promptResponse = await promptAgentSession(computer.id, session.id, {
       prompt: [{ type: "text", text }]
     });
+    if (!options.noStream && !canStreamImmediately) {
+      streamPromise = streamSessionEvents(computer.id, session.id, {
+        json: options.json,
+        signal: controller.signal
+      }).catch((error) => {
+        if (error instanceof Error && error.name === "AbortError") {
+          return;
+        }
+        return;
+      });
+    }
     const settled = await waitForSessionToSettle(computer.id, session.id, promptResponse.prompt_id);
     controller.abort();
     if (streamPromise) {
@@ -1358,11 +1394,14 @@ agentCommand.command("prompt").description("Send a prompt to a machine agent ses
     process.exit(1);
   }
 });
-agentCommand.command("watch").description("Watch a machine agent session event stream").argument("<machine>", "Computer id or handle").requiredOption("--session <id>", "Session id").option("--no-replay", "Do not replay buffered events before following live output").option("--json", "Print raw event envelopes").action(async (identifier, options) => {
+agentCommand.command("watch").description("Watch a machine agent session event stream").argument("<machine>", "Computer id or handle").requiredOption("--session <id>", "Session id").option("--last-event-id <id>", "Replay buffered events after this event id").option("--json", "Print raw event envelopes").action(async (identifier, options) => {
   try {
     const computer = await resolveComputer(identifier);
+    if (options.lastEventId && !/^[1-9]\d*$/.test(options.lastEventId.trim())) {
+      throw new Error("--last-event-id must be a positive integer");
+    }
     await streamSessionEvents(computer.id, options.session.trim(), {
-      replay: options.replay,
+      lastEventId: options.lastEventId,
       json: options.json
     });
   } catch (error) {
@@ -1876,6 +1915,9 @@ _computer() {
     'open:Open in browser'
     'ssh:SSH into a computer'
     'ports:Manage published ports'
+    'agent:Manage cloud agent sessions'
+    'fleet:View agent activity across your fleet'
+    'acp:Run a local ACP bridge for remote agent sessions'
     'rm:Delete a computer'
     'completion:Generate shell completions'
     'help:Display help'
@@ -2002,7 +2044,7 @@ var BASH_SCRIPT = `_computer() {
   local cur prev words cword
   _init_completion || return
 
-  local commands="login logout whoami create ls get open ssh ports rm completion help"
+  local commands="login logout whoami create ls get open ssh ports agent fleet acp rm completion help"
   local ports_commands="ls publish rm"
 
   if [[ $cword -eq 1 ]]; then
@@ -2444,60 +2486,128 @@ var pkg2 = JSON.parse(
 );
 var cliName = process.argv[1] ? basename2(process.argv[1]) : "agentcomputer";
 var program = new Command9();
-program.name(cliName).description("Agent Computer CLI").version(pkg2.version ?? "0.0.0").option("-y, --yes", "Skip confirmation prompts").configureHelp({
-  formatHelp(cmd, helper) {
-    const version = pkg2.version ?? "0.0.0";
-    const lines = [];
-    lines.push(`${chalk8.bold(cliName)} ${chalk8.dim(`v${version}`)}`);
+function appendTextSection(lines, title, values) {
+  if (values.length === 0) {
+    return;
+  }
+  lines.push(`  ${chalk8.dim(title)}`);
+  lines.push("");
+  for (const value of values) {
+    lines.push(`    ${chalk8.white(value)}`);
+  }
+  lines.push("");
+}
+function appendTableSection(lines, title, entries) {
+  if (entries.length === 0) {
+    return;
+  }
+  const width = Math.max(...entries.map((entry) => entry.term.length), 0) + 2;
+  lines.push(`  ${chalk8.dim(title)}`);
+  lines.push("");
+  for (const entry of entries) {
+    lines.push(`    ${chalk8.white(padEnd(entry.term, width))}${chalk8.dim(entry.desc)}`);
+  }
+  lines.push("");
+}
+function commandPath(cmd) {
+  const parts = [];
+  let current = cmd;
+  while (current) {
+    parts.unshift(current.name());
+    current = current.parent ?? null;
+  }
+  return parts.join(" ");
+}
+function formatRootHelp(cmd) {
+  const version = pkg2.version ?? "0.0.0";
+  const lines = [];
+  const groups = [
+    ["Auth", []],
+    ["Computers", []],
+    ["Access", []],
+    ["Agents", []],
+    ["Other", []]
+  ];
+  const otherGroup = groups.find(([name]) => name === "Other")[1];
+  lines.push(`${chalk8.bold(cliName)} ${chalk8.dim(`v${version}`)}`);
+  lines.push("");
+  if (cmd.description()) {
+    lines.push(`  ${chalk8.dim(cmd.description())}`);
     lines.push("");
-    if (cmd.commands.length > 0) {
-      const groups = {
-        Auth: [],
-        Computers: [],
-        Agents: [],
-        Access: [],
-        Other: []
-      };
-      for (const sub of cmd.commands) {
-        const name = sub.name();
-        const desc = sub.description();
-        const entry = { name, desc };
-        if (["login", "logout", "whoami"].includes(name)) {
-          groups.Auth.push(entry);
-        } else if (["create", "ls", "get", "rm"].includes(name)) {
-          groups.Computers.push(entry);
-        } else if (["agent", "fleet", "acp"].includes(name)) {
-          groups.Agents.push(entry);
-        } else if (["open", "ssh", "ports"].includes(name)) {
-          groups.Access.push(entry);
-        } else {
-          groups.Other.push(entry);
-        }
-      }
-      for (const [groupName, entries] of Object.entries(groups)) {
-        if (entries.length === 0) continue;
-        lines.push(`  ${chalk8.dim(groupName)}`);
-        for (const entry of entries) {
-          const padded = entry.name.padEnd(14);
-          lines.push(`    ${chalk8.white(padded)}${chalk8.dim(entry.desc)}`);
-        }
-        lines.push("");
-      }
-    }
-    const globalOpts = [
-      { flags: "-y, --yes", desc: "Skip confirmation prompts" },
-      { flags: "-V, --version", desc: "Show version" },
-      { flags: "-h, --help", desc: "Show help" }
-    ];
-    lines.push(`  ${chalk8.dim("Options")}`);
-    for (const opt of globalOpts) {
-      const padded = opt.flags.padEnd(14);
-      lines.push(`    ${chalk8.white(padded)}${chalk8.dim(opt.desc)}`);
+  }
+  appendTextSection(lines, "Usage", [`${cliName} <command> [options]`]);
+  for (const sub of cmd.commands) {
+    const name = sub.name();
+    const entry = { term: name, desc: sub.description() };
+    if (["login", "logout", "whoami"].includes(name)) {
+      groups[0][1].push(entry);
+    } else if (["create", "ls", "get", "rm"].includes(name)) {
+      groups[1][1].push(entry);
+    } else if (["open", "ssh", "ports"].includes(name)) {
+      groups[2][1].push(entry);
+    } else if (["agent", "fleet", "acp"].includes(name)) {
+      groups[3][1].push(entry);
+    } else {
+      otherGroup.push(entry);
     }
+  }
+  for (const [groupName, entries] of groups) {
+    appendTableSection(
+      lines,
+      groupName,
+      entries
+    );
+  }
+  appendTableSection(lines, "Options", [
+    { term: "-y, --yes", desc: "Skip confirmation prompts" },
+    { term: "-V, --version", desc: "Show version" },
+    { term: "-h, --help", desc: "Show help" }
+  ]);
+  return `${lines.join("\n").trimEnd()}
+`;
+}
+function formatSubcommandHelp(cmd, helper) {
+  const lines = [];
+  const description = helper.commandDescription(cmd);
+  const argumentsList = helper.visibleArguments(cmd).map((argument) => ({
+    term: helper.argumentTerm(argument),
+    desc: helper.argumentDescription(argument)
+  }));
+  const commandList = helper.visibleCommands(cmd).map((subcommand) => ({
+    term: helper.subcommandTerm(subcommand),
+    desc: helper.subcommandDescription(subcommand)
+  }));
+  const optionList = helper.visibleOptions(cmd).map((option) => ({
+    term: helper.optionTerm(option),
+    desc: helper.optionDescription(option)
+  }));
+  lines.push(chalk8.bold(commandPath(cmd)));
+  lines.push("");
+  if (description) {
+    lines.push(`  ${chalk8.dim(description)}`);
     lines.push("");
-    return lines.join("\n");
   }
-});
+  appendTextSection(lines, "Usage", [helper.commandUsage(cmd)]);
+  appendTableSection(lines, "Arguments", argumentsList);
+  appendTableSection(lines, "Commands", commandList);
+  appendTableSection(lines, "Options", optionList);
+  return `${lines.join("\n").trimEnd()}
+`;
+}
+function applyHelpFormatting(cmd) {
+  cmd.configureHelp({
+    formatHelp(current, helper) {
+      if (!current.parent) {
+        return formatRootHelp(current);
+      }
+      return formatSubcommandHelp(current, helper);
+    }
+  });
+  for (const subcommand of cmd.commands) {
+    applyHelpFormatting(subcommand);
+  }
+}
+program.name(cliName).description("Agent Computer CLI").version(pkg2.version ?? "0.0.0").option("-y, --yes", "Skip confirmation prompts");
 program.addCommand(loginCommand);
 program.addCommand(logoutCommand);
 program.addCommand(whoamiCommand);
@@ -2512,4 +2622,5 @@ program.addCommand(sshCommand);
 program.addCommand(portsCommand);
 program.addCommand(removeCommand);
 program.addCommand(completionCommand);
+applyHelpFormatting(program);
 program.parse();

package/package.json

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