@agentorg/computer 0.0.14 → 0.0.16

package/dist/agentcomputer.js

@@ -3751,7 +3751,6 @@ var require_websocket_server = __commonJS({
 });
 
 // src/main.ts
-import { readFileSync as readFileSync6 } from "node:fs";
 import { homedir as homedir2 } from "node:os";
 import { isAbsolute as isAbsolute2, join as join11, resolve as resolve5 } from "node:path";
 import { parseArgs } from "node:util";
@@ -3805,44 +3804,73 @@ async function hostBrowser(options) {
 }
 
 // src/browser-mcp.ts
+import { mkdtempSync as mkdtempSync2, rmSync as rmSync2 } from "node:fs";
 import { createRequire as createRequire2 } from "node:module";
+import { join as join2 } from "node:path";
 var require2 = createRequire2(import.meta.url);
 var mcpParts = () => require2("playwright-core/lib/coreBundle").tools;
+function listenOnSocket(socket) {
+  const http = require2("node:http");
+  const make = http.createServer;
+  http.createServer = ((...args) => {
+    http.createServer = make;
+    const server = make(...args);
+    const listen = server.listen.bind(server);
+    server.listen = (() => listen(socket));
+    server.address = () => ({ address: "127.0.0.1", family: "IPv4", port: 0 });
+    return server;
+  });
+}
 async function serveBrowserMcp(options) {
   const parts = mcpParts();
   parts.setupExitWatchdog();
+  const folder = mkdtempSync2(join2("/tmp", "agentcomputer-"));
+  process.once("exit", () => rmSync2(folder, { recursive: true, force: true }));
+  const socket = join2(folder, "mcp.sock");
   const config3 = await parts.resolveCLIConfigForMCP({
     endpoint: options.endpoint,
     outputDir: options.outputDir,
     host: "127.0.0.1",
     port: 0,
+    // What the proxy sends, which is all that can reach the socket.
+    allowedHosts: ["localhost"],
     // The tool that closes the browser refuses, as it does for any browser its clients share.
     sharedBrowserContext: true
   });
   const tools = parts.filteredTools(config3);
-  await parts.start(
-    {
-      name: "Playwright",
-      nameInConfig: "playwright",
-      // playwright-core's, as Playwright MCP's program gives it.
-      version: require2("playwright-core/package.json").version,
-      toolSchemas: tools.map((tool) => tool.schema),
-      ignoreRoots: config3.ignoreRoots,
-      /** One for each client's session: a connection of its own to the one browser. */
-      create: async () => {
-        const browser = await playwright().chromium.connect(options.endpoint);
-        const context = browser.contexts()[0];
-        if (!context) {
-          await browser.close();
-          throw new Error("The browser has no context to work in.");
-        }
-        return new parts.BrowserBackend(config3, context, tools, {
-          dispose: () => browser.close()
-        });
-      }
-    },
-    config3.server
-  );
+  listenOnSocket(socket);
+  const say = console.error;
+  console.error = () => {
+  };
+  try {
+    await parts.start(
+      {
+        name: "Playwright",
+        nameInConfig: "playwright",
+        // playwright-core's, as Playwright MCP's program gives it.
+        version: require2("playwright-core/package.json").version,
+        toolSchemas: tools.map((tool) => tool.schema),
+        ignoreRoots: config3.ignoreRoots,
+        /** One for each client's session: a connection of its own to the one browser. */
+        create: async () => {
+          const browser = await playwright().chromium.connect(options.endpoint);
+          const context = browser.contexts()[0];
+          if (!context) {
+            await browser.close();
+            throw new Error("The browser has no context to work in.");
+          }
+          return new parts.BrowserBackend(config3, context, tools, {
+            dispose: () => browser.close()
+          });
+        }
+      },
+      config3.server
+    );
+  } finally {
+    console.error = say;
+  }
+  process.stdout.write(`${JSON.stringify({ socket })}
+`);
 }
 
 // src/container.ts
@@ -3857,7 +3885,9 @@ import { promisify as promisify2 } from "node:util";
 
 // src/browser.ts
 import { spawn } from "node:child_process";
-import { join as join2 } from "node:path";
+import { rmSync as rmSync3 } from "node:fs";
+import { request as ask } from "node:http";
+import { dirname, join as join3 } from "node:path";
 import { createInterface } from "node:readline";
 import { pipeline, Readable } from "node:stream";
 import { fileURLToPath } from "node:url";
@@ -4829,10 +4859,10 @@ function $constructor(name, initializer4, proto, params) {
     if (initialized) {
       const own3 = Object.getPrototypeOf(inst);
       const ctorProto = inst._zod.constr.prototype;
-      let up = own3;
-      while (up && up !== ctorProto)
-        up = Object.getPrototypeOf(up);
-      const target = up ?? own3;
+      let up2 = own3;
+      while (up2 && up2 !== ctorProto)
+        up2 = Object.getPrototypeOf(up2);
+      const target = up2 ?? own3;
       if (!initialized.has(target)) {
         initialized.add(target);
         members(target, protoMembers);
@@ -18888,14 +18918,14 @@ var require_validate = /* @__PURE__ */ __commonJSMin(((exports) => {
     } else {
       const matches = RELATIVE_JSON_POINTER.exec($data);
       if (!matches) throw new Error(`Invalid JSON-pointer: ${$data}`);
-      const up = +matches[1];
+      const up2 = +matches[1];
       jsonPointer = matches[2];
       if (jsonPointer === "#") {
-        if (up >= dataLevel) throw new Error(errorMsg("property/index", up));
-        return dataPathArr[dataLevel - up];
+        if (up2 >= dataLevel) throw new Error(errorMsg("property/index", up2));
+        return dataPathArr[dataLevel - up2];
       }
-      if (up > dataLevel) throw new Error(errorMsg("data", up));
-      data = dataNames[dataLevel - up];
+      if (up2 > dataLevel) throw new Error(errorMsg("data", up2));
+      data = dataNames[dataLevel - up2];
       if (!jsonPointer) return data;
     }
     let expr = data;
@@ -18905,8 +18935,8 @@ var require_validate = /* @__PURE__ */ __commonJSMin(((exports) => {
       expr = (0, codegen_1._)`${expr} && ${data}`;
     }
     return expr;
-    function errorMsg(pointerType, up) {
-      return `Cannot access ${pointerType} ${up} levels up, current level is ${dataLevel}`;
+    function errorMsg(pointerType, up2) {
+      return `Cannot access ${pointerType} ${up2} levels up, current level is ${dataLevel}`;
     }
   }
   exports.getData = getData;
@@ -27958,7 +27988,10 @@ var StreamableHTTPClientTransport = class {
 
 // src/browser.ts
 var RUNS_CODE = "browser_run_code_unsafe";
-var MAX_BODY = 8 * 1024 * 1024;
+var SCREENSHOT = "browser_take_screenshot";
+var MIB = 1024 * 1024;
+var MAX_BODY = 8 * MIB;
+var MAX_PICTURE = 3 * MIB;
 var START_MS = 3e4;
 var STOP_MS = 2e3;
 var ONE_REQUEST = "A body is one JSON-RPC request, as a JSON object: send each request in its own POST.";
@@ -27980,16 +28013,64 @@ function sendAnswer(upstream, response) {
   pipeline(Readable.fromWeb(upstream.body), response, () => {
   });
 }
+function socketFetch(socket) {
+  return (url3, init = {}) => new Promise((done, failed) => {
+    const { body } = init;
+    if (body != null && typeof body !== "string" && !(body instanceof Uint8Array))
+      return failed(new TypeError("A body to the browser's server is text or bytes."));
+    const { pathname, search: search2 } = new URL(url3);
+    const headers = Object.fromEntries(new Headers(init.headers));
+    if (body != null) headers["content-length"] = String(Buffer.byteLength(body));
+    const sent = ask(
+      {
+        socketPath: socket,
+        path: pathname + search2,
+        method: init.method ?? "GET",
+        headers,
+        signal: init.signal ?? void 0
+      },
+      (answer) => {
+        const answered2 = new Headers();
+        for (const [name, value] of Object.entries(answer.headers))
+          for (const one of [value ?? []].flat()) answered2.append(name, one);
+        const status = answer.statusCode ?? 502;
+        const none2 = [204, 205, 304].includes(status);
+        if (none2) answer.resume();
+        done(
+          new Response(none2 ? null : Readable.toWeb(answer), {
+            status,
+            headers: answered2
+          })
+        );
+      }
+    );
+    sent.on("error", failed);
+    sent.end(body ?? void 0);
+  });
+}
+var MCP = "http://localhost/mcp";
 var self = fileURLToPath(import.meta.url);
-function withoutHidden(text3, hidden) {
-  const clean = (json4) => {
+function changed(text3, change) {
+  const one = (json4) => {
     const message = JSON.parse(json4);
-    if (message.result?.tools)
-      message.result.tools = message.result.tools.filter((tool) => !hidden.has(tool.name));
+    change(message);
     return JSON.stringify(message);
   };
-  if (text3.trimStart().startsWith("{")) return clean(text3);
-  return text3.replace(/^data: (\{.*\})$/gm, (_, json4) => `data: ${clean(json4)}`);
+  if (text3.trimStart().startsWith("{")) return one(text3);
+  return text3.replace(/^data: (\{[^\n\r]*\})$/gm, (_, json4) => `data: ${one(json4)}`);
+}
+var withoutHidden = (hidden) => (message) => {
+  if (message.result?.tools)
+    message.result.tools = message.result.tools.filter((tool) => !hidden.has(tool.name));
+};
+function withoutLarge(message) {
+  const sizes = (message.result?.content ?? []).map(
+    (block) => block.type === "image" ? Buffer.byteLength(block.data ?? "", "base64") : 0
+  );
+  const size = Math.max(0, ...sizes);
+  if (size <= MAX_PICTURE) return;
+  const text3 = `The screenshot is ${(Math.ceil(size / MIB * 10) / 10).toFixed(1)} MiB, and the most a screenshot may be is ${MAX_PICTURE / MIB} MiB. Take it again without fullPage for what is on screen, or with element and target for one part of the page.`;
+  message.result = { isError: true, content: [{ type: "text", text: text3 }] };
 }
 async function end(child) {
   if (child.exitCode !== null || child.signalCode !== null) return;
@@ -28002,7 +28083,10 @@ async function end(child) {
 var Browser = class {
   #host;
   #mcp;
-  #origin;
+  /** Where its server answers, by way of its Unix socket. */
+  #served;
+  /** The folder its server made for its socket. */
+  #socketFolder;
   /** The bound browser's socket, for the live viewer. */
   endpoint;
   #hidden;
@@ -28024,7 +28108,7 @@ var Browser = class {
         self,
         "browser-host",
         "--profile",
-        join2(folder, "profile"),
+        join3(folder, "profile"),
         ...config3.path ? ["--executable", config3.path] : ["--channel", config3.browser ?? "chrome"],
         ...config3.sandbox === false ? ["--no-sandbox"] : []
       ],
@@ -28047,12 +28131,12 @@ var Browser = class {
     });
     this.endpoint.catch(() => {
     });
-    this.#origin = this.endpoint.then(
+    this.#served = this.endpoint.then(
       (endpoint) => new Promise((done, failed) => {
         if (this.#stopping) return failed(new Error("It stopped."));
         const mcp = spawn(
           process.execPath,
-          [self, "browser-mcp", "--endpoint", endpoint, "--output", join2(folder, "output")],
+          [self, "browser-mcp", "--endpoint", endpoint, "--output", join3(folder, "output")],
           // Its own limit on which files it touches is the folder it starts in.
           { cwd, stdio: ["ignore", "pipe", "pipe"] }
         );
@@ -28063,34 +28147,39 @@ var Browser = class {
           (code) => failed(new Error(`The browser's server exited with ${code}.`))
         );
         mcp.once("exit", ended("The browser's server"));
-        for (const stream of [mcp.stdout, mcp.stderr])
-          createInterface({ input: stream }).on("line", (line) => {
+        createInterface({ input: mcp.stdout }).on("line", (line) => {
+          try {
+            const { socket } = JSON.parse(line);
+            log(`The browser's server is on ${socket}.`);
+            this.#socketFolder = dirname(socket);
+            done(socketFetch(socket));
+          } catch {
             log(line);
-            const listening = /^Listening on (http:\/\/[^/\s]+)/.exec(line);
-            if (listening) done(listening[1]);
-          });
+          }
+        });
+        createInterface({ input: mcp.stderr }).on("line", log);
       })
     );
-    this.#origin.catch(() => {
+    this.#served.catch(() => {
     });
   }
   /** Wait until it answers, and read its tools. */
   async ready() {
-    const origin = await Promise.race([
-      this.#origin,
+    const served = await Promise.race([
+      this.#served,
       new Promise(
         (_, failed) => setTimeout(() => failed(new Error("The browser's server didn't start.")), START_MS)
       )
     ]);
     const client = new Client({ name: "agentcomputer", version: "0" });
-    await client.connect(new StreamableHTTPClientTransport(new URL(`${origin}/mcp`)));
+    await client.connect(new StreamableHTTPClientTransport(new URL(MCP), { fetch: served }));
     const { tools } = await client.listTools();
     await client.close();
     this.tools = tools.map((tool) => tool.name).filter((name) => !this.#hidden.has(name));
   }
   /** Answer one MCP request by passing it on, enforcing what this computer may not do. */
   async handle(request, response) {
-    const origin = await this.#origin;
+    const served = await this.#served;
     const chunks = [];
     let size = 0;
     for await (const chunk of request) {
@@ -28134,7 +28223,7 @@ var Browser = class {
     const session = headers["mcp-session-id"] ?? "";
     if (request.method === "DELETE") this.gate?.sessionEnded(session);
     if (tool && this.gate?.takeAnsweredChooser(session) && tool !== "browser_file_upload")
-      await fetch(`${origin}/mcp`, {
+      await served(MCP, {
         method: "POST",
         headers,
         body: JSON.stringify({
@@ -28147,20 +28236,22 @@ var Browser = class {
       });
     if (tool === "browser_file_upload") this.gate?.agentAnsweredChooser();
     if (message) headers["content-type"] = "application/json";
-    const upstream = await fetch(`${origin}/mcp`, {
+    const upstream = await served(MCP, {
       method: request.method,
       headers,
       ...message ? { body: JSON.stringify(message) } : {}
     });
-    if (message?.method === "tools/list" && this.#hidden.size > 0) {
-      const text3 = withoutHidden(await upstream.text(), this.#hidden);
-      return sendAnswer(new Response(text3, upstream), response);
-    }
-    sendAnswer(upstream, response);
+    let change;
+    if (message?.method === "tools/list" && this.#hidden.size > 0)
+      change = withoutHidden(this.#hidden);
+    else if (tool === SCREENSHOT) change = withoutLarge;
+    if (!change) return sendAnswer(upstream, response);
+    sendAnswer(new Response(changed(await upstream.text(), change), upstream), response);
   }
   async stop() {
     this.#stopping = true;
     await Promise.all([this.#mcp, this.#host].map((child) => child ? end(child) : void 0));
+    if (this.#socketFolder) rmSync3(this.#socketFolder, { recursive: true, force: true });
   }
 };
 
@@ -28173,7 +28264,7 @@ import { join as join7 } from "node:path";
 import { chmodSync as chmodSync2, existsSync, statSync as statSync2 } from "node:fs";
 import { createRequire as createRequire3 } from "node:module";
 import { hostname as hostname3 } from "node:os";
-import { basename as basename2, dirname as dirname3, join as join6 } from "node:path";
+import { basename as basename2, dirname as dirname4, join as join6 } from "node:path";
 
 // node_modules/@agentorg/exec/dist/lib.js
 import { realpathSync } from "node:fs";
@@ -28183,7 +28274,7 @@ import { Http2ServerRequest, constants } from "node:http2";
 import { Readable as Readable2 } from "node:stream";
 import { randomBytes as randomBytes3 } from "node:crypto";
 import { lstat as lstat2, open as open3, readdir as readdir2, rename as rename2, rm as rm2, stat as stat2 } from "node:fs/promises";
-import { dirname as dirname2, join as join3 } from "node:path";
+import { dirname as dirname2, join as join32 } from "node:path";
 import { randomBytes as randomBytes2 } from "node:crypto";
 import {
   chmod,
@@ -28197,7 +28288,7 @@ import {
   stat,
   writeFile
 } from "node:fs/promises";
-import { basename, dirname, join as join4, resolve, sep as sep2 } from "node:path";
+import { basename, dirname as dirname3, join as join4, resolve, sep as sep2 } from "node:path";
 import { spawn as spawn2 } from "node:child_process";
 import { randomBytes } from "node:crypto";
 import { StringDecoder } from "node:string_decoder";
@@ -30622,10 +30713,10 @@ function $constructor2(name, initializer32, proto, params) {
     if (initialized) {
       const own22 = Object.getPrototypeOf(inst);
       const ctorProto = inst._zod.constr.prototype;
-      let up = own22;
-      while (up && up !== ctorProto)
-        up = Object.getPrototypeOf(up);
-      const target = up ?? own22;
+      let up2 = own22;
+      while (up2 && up2 !== ctorProto)
+        up2 = Object.getPrototypeOf(up2);
+      const target = up2 ?? own22;
       if (!initialized.has(target)) {
         initialized.add(target);
         members2(target, protoMembers);
@@ -48482,21 +48573,21 @@ function visit(schema, fnOrHandlers) {
       case "object": {
         const oldShape = def.shape;
         const keys = Object.keys(oldShape);
-        let changed2 = false;
+        let changed22 = false;
         const newShape = {};
         for (const k of keys) {
           const mapped = run3(oldShape[k]);
           if (mapped !== oldShape[k])
-            changed2 = true;
+            changed22 = true;
           newShape[k] = mapped;
         }
         let newCatchall = def.catchall;
         if (def.catchall) {
           newCatchall = run3(def.catchall);
           if (newCatchall !== def.catchall)
-            changed2 = true;
+            changed22 = true;
         }
-        return changed2 ? clone2(s, { ...def, shape: newShape, catchall: newCatchall }) : s;
+        return changed22 ? clone2(s, { ...def, shape: newShape, catchall: newCatchall }) : s;
       }
       case "array": {
         const mapped = run3(def.element);
@@ -48504,21 +48595,21 @@ function visit(schema, fnOrHandlers) {
       }
       case "tuple": {
         const oldItems = def.items;
-        let changed2 = false;
+        let changed22 = false;
         const newItems = [];
         for (const item of oldItems) {
           const mapped = run3(item);
           if (mapped !== item)
-            changed2 = true;
+            changed22 = true;
           newItems.push(mapped);
         }
         let newRest = def.rest;
         if (def.rest) {
           newRest = run3(def.rest);
           if (newRest !== def.rest)
-            changed2 = true;
+            changed22 = true;
         }
-        return changed2 ? clone2(s, { ...def, items: newItems, rest: newRest }) : s;
+        return changed22 ? clone2(s, { ...def, items: newItems, rest: newRest }) : s;
       }
       case "record":
       case "map": {
@@ -48532,15 +48623,15 @@ function visit(schema, fnOrHandlers) {
       }
       case "union": {
         const oldOptions = def.options;
-        let changed2 = false;
+        let changed22 = false;
         const newOptions = [];
         for (const opt of oldOptions) {
           const mapped = run3(opt);
           if (mapped !== opt)
-            changed2 = true;
+            changed22 = true;
           newOptions.push(mapped);
         }
-        return changed2 ? clone2(s, { ...def, options: newOptions }) : s;
+        return changed22 ? clone2(s, { ...def, options: newOptions }) : s;
       }
       case "intersection": {
         const newLeft = run3(def.left);
@@ -56621,14 +56712,14 @@ var require_validate2 = /* @__PURE__ */ __commonJSMin2(((exports) => {
     } else {
       const matches = RELATIVE_JSON_POINTER.exec($data);
       if (!matches) throw new Error(`Invalid JSON-pointer: ${$data}`);
-      const up = +matches[1];
+      const up2 = +matches[1];
       jsonPointer = matches[2];
       if (jsonPointer === "#") {
-        if (up >= dataLevel) throw new Error(errorMsg("property/index", up));
-        return dataPathArr[dataLevel - up];
+        if (up2 >= dataLevel) throw new Error(errorMsg("property/index", up2));
+        return dataPathArr[dataLevel - up2];
       }
-      if (up > dataLevel) throw new Error(errorMsg("data", up));
-      data = dataNames[dataLevel - up];
+      if (up2 > dataLevel) throw new Error(errorMsg("data", up2));
+      data = dataNames[dataLevel - up2];
       if (!jsonPointer) return data;
     }
     let expr = data;
@@ -56638,8 +56729,8 @@ var require_validate2 = /* @__PURE__ */ __commonJSMin2(((exports) => {
       expr = (0, codegen_1._)`${expr} && ${data}`;
     }
     return expr;
-    function errorMsg(pointerType, up) {
-      return `Cannot access ${pointerType} ${up} levels up, current level is ${dataLevel}`;
+    function errorMsg(pointerType, up2) {
+      return `Cannot access ${pointerType} ${up2} levels up, current level is ${dataLevel}`;
     }
   }
   exports.getData = getData;
@@ -65904,6 +65995,7 @@ var Sessions = class {
     this.#room();
     const started = Date.now();
     const session = this.#start(input2.cmd, input2.workdir ?? this.#root);
+    if (input2.group) session.group = input2.group;
     const wait = clamp(input2.yield_time_ms ?? DEFAULT_YIELD_MS, MIN_YIELD_MS, MAX_YIELD_MS);
     return this.#after(session, wait, started, input2.max_output_tokens);
   }
@@ -65988,26 +66080,37 @@ var Sessions = class {
     if (!session) throw new ExecRefused(`No terminal ${id.slice(0, 64)} is here.`);
     await this.#end([session], "SIGINT");
   }
+  /**
+   * End the terminals still running of one group, as `stop` ends one, and say how many. A shell a
+   * person opened is in no group.
+   */
+  async stopGroup(group) {
+    const running2 = [...this.#sessions.values()].filter(
+      (session) => session.group === group && session.exitCode === void 0
+    );
+    await this.#end(running2, "SIGINT");
+    return running2.length;
+  }
   /** Stop every terminal: a polite signal, then a certain one. */
   async stopAll() {
     await this.#end([...this.#sessions.values()], "SIGTERM");
   }
   async #end(sessions, polite) {
-    const running = sessions.filter((s) => s.exitCode === void 0);
-    for (const session of running) session.signal(session.tty ? "SIGHUP" : polite);
+    const running2 = sessions.filter((s) => s.exitCode === void 0);
+    for (const session of running2) session.signal(session.tty ? "SIGHUP" : polite);
     let timer;
     await Promise.race([
-      Promise.all(running.map((s) => s.ended)),
+      Promise.all(running2.map((s) => s.ended)),
       new Promise((done) => {
         timer = setTimeout(done, KILL_AFTER_MS);
       })
     ]);
     clearTimeout(timer);
-    for (const session of running) if (session.exitCode === void 0) session.signal("SIGKILL");
+    for (const session of running2) if (session.exitCode === void 0) session.signal("SIGKILL");
   }
   #room() {
-    const running = [...this.#sessions.values()].filter((s) => s.exitCode === void 0);
-    if (running.length >= MAX_RUNNING)
+    const running2 = [...this.#sessions.values()].filter((s) => s.exitCode === void 0);
+    if (running2.length >= MAX_RUNNING)
       throw new ExecRefused(`${MAX_RUNNING} commands are running. Wait for one, or stop one.`);
   }
   #running(id) {
@@ -66218,7 +66321,7 @@ async function inside(root, path) {
         () => false
       ))
         throw refused2();
-      const above = dirname(at);
+      const above = dirname3(at);
       if (above === at) throw refused2();
       return join4(await real(above), basename(at));
     }
@@ -66306,7 +66409,7 @@ ${cut(shown.join("\n"), MAX_READ_CHARS)}`;
         after = before.split(input2.old_text).join(input2.new_text);
       }
       if (after === before) throw new ExecRefused("That edit changes nothing.");
-      const temporary = join4(dirname(path), `.agentexec-${randomBytes2(6).toString("hex")}`);
+      const temporary = join4(dirname3(path), `.agentexec-${randomBytes2(6).toString("hex")}`);
       try {
         await writeFile(temporary, after, found ? { mode: found.mode } : {});
         if (found) await chmod(temporary, found.mode & 511);
@@ -66379,7 +66482,7 @@ function searched(job) {
   const more = out.length > limit;
   return (more ? [...out.slice(0, limit), `\u2026 more than ${limit} matches`] : out).join("\n");
 }
-function changed(job) {
+function changed2(job) {
   const changes = [];
   let more = false;
   const newest = () => {
@@ -66432,7 +66535,7 @@ function changedSince(root, since) {
 }
 if (!isMainThread && workerData?.agentexecSearch) {
   const job = workerData;
-  parentPort?.postMessage("since" in job ? changed(job) : searched(job));
+  parentPort?.postMessage("since" in job ? changed2(job) : searched(job));
 }
 var MAX_READ_BYTES = 1024 * 1024;
 function createHostFiles(root, level) {
@@ -66445,7 +66548,7 @@ function createHostFiles(root, level) {
       found.sort(foldersFirst);
       const entries = await Promise.all(
         found.slice(0, MAX_ENTRIES).map(async (entry) => {
-          const own22 = await lstat2(join3(folder, entry.name)).catch(() => void 0);
+          const own22 = await lstat2(join32(folder, entry.name)).catch(() => void 0);
           return own22 && {
             name: entry.name,
             kind: entry.isDirectory() ? "folder" : entry.isSymbolicLink() ? "link" : "file",
@@ -66492,7 +66595,7 @@ function createHostFiles(root, level) {
       });
       if (before?.isDirectory()) throw new ExecRefused(`${path} is a folder.`);
       await stat2(dirname2(target));
-      const temporary = join3(dirname2(target), `.agentexec-${randomBytes3(6).toString("hex")}`);
+      const temporary = join32(dirname2(target), `.agentexec-${randomBytes3(6).toString("hex")}`);
       const file2 = await open3(temporary, "wx");
       const discard = async () => {
         await file2.close().catch(() => {
@@ -66585,6 +66688,14 @@ var Answered = {
   session_id: external_exports.string().nullable().describe("For write_stdin, while it is still running."),
   text: external_exports.string().describe("What it wrote since the last call, cut in the middle if long.")
 };
+var GROUP = "agentexec/group";
+var STOP_GROUP = "agentexec/group/stop";
+var Group = external_exports.string().min(1).max(200);
+var groupOf = (meta3) => {
+  const word = Group.optional().safeParse(meta3?.[GROUP]);
+  if (!word.success) throw new ExecRefused(`${GROUP} in _meta is a string of 1 to 200 characters.`);
+  return word.data;
+};
 var YieldTime = external_exports.number().int().positive().optional();
 var MaxTokens = external_exports.number().int().positive().optional();
 var READ_ONLY = { readOnlyHint: true };
@@ -66613,6 +66724,11 @@ function createServer2(root, sessions, version22, level, extraTools = []) {
       }
     );
   if (level === "terminal") {
+    server.server.setRequestHandler(
+      STOP_GROUP,
+      { params: external_exports.object({ group: Group }), result: external_exports.object({ stopped: external_exports.number() }) },
+      async ({ group }) => ({ stopped: await sessions.stopGroup(group) })
+    );
     server.registerTool(
       "exec_command",
       {
@@ -66626,7 +66742,7 @@ function createServer2(root, sessions, version22, level, extraTools = []) {
         outputSchema: Answered,
         annotations: { destructiveHint: true }
       },
-      (input2) => answering(() => sessions.exec(input2))
+      (input2, ctx) => answering(async () => sessions.exec({ ...input2, group: groupOf(ctx.mcpReq._meta) }))
     );
     server.registerTool(
       "write_stdin",
@@ -66729,7 +66845,7 @@ function createServer2(root, sessions, version22, level, extraTools = []) {
     );
   return server;
 }
-var VERSION = "0.0.7";
+var VERSION = "0.0.8";
 function createAgentExec(options) {
   const root = realpathSync(resolve3(options.workspace));
   const level = options.level ?? "read";
@@ -67034,8 +67150,8 @@ var BrowserLive = class {
   }
   /** The cast of a page, started if no socket was shown it yet. */
   #cast(page) {
-    const running = this.#casts.get(page);
-    if (running) return running;
+    const running2 = this.#casts.get(page);
+    if (running2) return running2;
     const onFrame = (frame) => {
       const watching = this.#shownTo(page);
       if (frame.width !== cast.size.width || frame.height !== cast.size.height) {
@@ -67733,7 +67849,7 @@ var loadPty = () => {
     } catch {
       return fails("node-pty isn't installed with this service.");
     }
-    const root = dirname3(require3.resolve("node-pty/package.json"));
+    const root = dirname4(require3.resolve("node-pty/package.json"));
     for (const helper of [
       join6(root, "prebuilds", `${process.platform}-${process.arch}`, "spawn-helper"),
       join6(root, "build", "Release", "spawn-helper")
@@ -67748,7 +67864,6 @@ var loadPty = () => {
   return pty;
 };
 var ProcessRuntime = class {
-  isolation = "none";
   #config;
   #contained;
   /** `contained` is for inside a container, where the computer and its load are its own. */
@@ -67756,6 +67871,9 @@ var ProcessRuntime = class {
     this.#config = config3;
     this.#contained = contained;
   }
+  async available() {
+    return true;
+  }
   async prepare() {
   }
   async stopLeftover() {
@@ -67850,7 +67968,7 @@ async function serveInside(options) {
   if (!token) throw new Error(`${INNER_TOKEN_VARIABLE} is not set.`);
   delete process.env[INNER_TOKEN_VARIABLE];
   const digest = digestOf(token);
-  const running = new ProcessRuntime({ path: BROWSER, sandbox: false }, true).start(
+  const running2 = new ProcessRuntime({ path: BROWSER, sandbox: false }, true).start(
     {
       id: "inside",
       ...options,
@@ -67877,13 +67995,13 @@ async function serveInside(options) {
     if (!given || !sameToken(given, digest)) return void response.writeHead(401).end();
     const { pathname } = new URL(request.url ?? "/", "http://localhost");
     if (pathname === "/ready") {
-      const { browserTools, surfaces } = await running;
+      const { browserTools, surfaces } = await running2;
       response.writeHead(200, { "Content-Type": "application/json" });
       return void response.end(JSON.stringify({ browserTools, surfaces }));
     }
     const endpoint = /^\/mcp\/(computer|browser)$/.exec(pathname)?.[1];
     if (!endpoint) return void response.writeHead(404).end();
-    return (await running).handle(endpoint, request, response);
+    return (await running2).handle(endpoint, request, response);
   };
   const server = createServer3((request, response) => {
     route(request, response).catch((error62) => {
@@ -67899,14 +68017,14 @@ async function serveInside(options) {
     const mode = url3.searchParams.get("mode");
     if (!given || !sameToken(given, digest) || !surface || mode !== "watch" && mode !== "operate")
       return void socket.end("HTTP/1.1 401 Unauthorized\r\nConnection: close\r\n\r\n");
-    running.then((computer) => computer.openLive(surface, mode, request, socket, head)).catch(() => socket.destroy());
+    running2.then((computer) => computer.openLive(surface, mode, request, socket, head)).catch(() => socket.destroy());
   });
   server.listen(INNER_PORT, "0.0.0.0");
   for (const signal of ["SIGINT", "SIGTERM"])
     process.once(signal, () => {
-      void running.then((computer) => computer.stop()).finally(() => process.exit(0));
+      void running2.then((computer) => computer.stop()).finally(() => process.exit(0));
     });
-  await running;
+  await running2;
 }
 
 // src/container.ts
@@ -67941,17 +68059,30 @@ var UPGRADE_HEADERS = [
 var nameOf = (id) => `agentcomputer-${id}`;
 var sleep5 = (ms) => new Promise((done) => setTimeout(done, ms));
 var ContainerRuntime = class {
-  isolation = "container";
   #image;
   constructor(image) {
     this.#image = image;
   }
-  async prepare() {
+  /** Whether Docker answers, asked for no longer than this. */
+  async #answers(ms) {
     try {
-      await docker(["version", "--format", "{{.Server.Version}}"]);
-    } catch (error62) {
-      throw new Error(`Container isolation needs Docker, which didn't answer: ${String(error62)}`);
+      await run2("docker", ["version", "--format", "{{.Server.Version}}"], { timeout: ms });
+      return true;
+    } catch {
+      return false;
     }
+  }
+  // Asked each time the service says what it can make, so it doesn't wait on a Docker that hangs.
+  available() {
+    return this.#answers(1e3);
+  }
+  /** Docker, or the refusal of what can't be done without it. */
+  async #docker() {
+    if (!await this.#answers(1e4))
+      throw new ApiError(409, "A container needs Docker, which isn't answering on this machine.");
+  }
+  async prepare() {
+    await this.#docker();
     try {
       await docker(["image", "inspect", "--format", "{{.Id}}", this.#image]);
     } catch {
@@ -68092,11 +68223,14 @@ var ContainerRuntime = class {
     }
     throw new Error("Its container didn't start. Its logs say why.");
   }
+  // Neither is said to be done where Docker doesn't answer: the container would be left as it is.
   async stopLeftover(id) {
+    await this.#docker();
     await docker(["stop", "--time", STOP_SECONDS, nameOf(id)]).catch(() => {
     });
   }
   async remove(id) {
+    await this.#docker();
     await docker(["rm", "--force", nameOf(id)]).catch(() => {
     });
   }
@@ -68145,10 +68279,14 @@ async function forward(url3, authorization, request, response) {
 }
 
 // src/handlers.ts
-var VERSION2 = "0.0.14";
+var VERSION2 = "0.0.16";
 function createHandlers(computers) {
   return {
-    getInfo: async () => ({ version: VERSION2, isolation: computers.isolation }),
+    getInfo: async () => ({
+      version: VERSION2,
+      isolation: computers.isolation,
+      isolationsAvailable: await computers.available()
+    }),
     listComputers: async ({ state }) => computers.list(state),
     createComputer: (input2) => computers.create(input2),
     getComputer: async ({ computerID }) => computers.get(computerID),
@@ -68167,6 +68305,81 @@ function createHandlers(computers) {
   };
 }
 
+// src/running.ts
+import { spawn as spawn4 } from "node:child_process";
+import { closeSync, openSync, readFileSync as readFileSync4, statSync as statSync3, writeFileSync as writeFileSync2 } from "node:fs";
+import { join as join9 } from "node:path";
+var MAX_LOG = 1024 * 1024;
+var STOP_MS2 = 3e4;
+var sleep6 = (ms) => new Promise((done) => setTimeout(done, ms));
+var recordOf = (data) => join9(data, "server.json");
+function recorded(data) {
+  try {
+    const { url: url3, pid } = JSON.parse(readFileSync4(recordOf(data), "utf8"));
+    return { url: url3, pid, token: readFileSync4(join9(data, "control-token"), "utf8").trim() };
+  } catch {
+    return void 0;
+  }
+}
+async function running(data, said = recorded(data)) {
+  if (!said) return void 0;
+  try {
+    const answer = await fetch(`${said.url}/v1/info`, {
+      headers: { Authorization: `Bearer ${said.token}` },
+      signal: AbortSignal.timeout(3e3)
+    });
+    if (!answer.ok) return void 0;
+    const { version: version3, isolation } = await answer.json();
+    return { url: said.url, pid: said.pid, version: version3, isolation };
+  } catch {
+    return void 0;
+  }
+}
+async function up(data, program, args) {
+  const already = await running(data);
+  if (already) return already;
+  const log = join9(privateFolder(data), "service.log");
+  try {
+    const before = readFileSync4(log);
+    if (before.length > MAX_LOG) writeFileSync2(log, before.subarray(before.length - MAX_LOG));
+  } catch {
+  }
+  const from = statSync3(log, { throwIfNoEntry: false })?.size ?? 0;
+  const out = openSync(log, "a", 384);
+  const child = spawn4(process.execPath, [program, "serve", ...args], {
+    detached: true,
+    stdio: ["ignore", out, out]
+  });
+  closeSync(out);
+  child.unref();
+  let ended = false;
+  child.once("exit", () => {
+    ended = true;
+  });
+  for (; ; await sleep6(100)) {
+    const said = recorded(data);
+    const up2 = await running(data, said);
+    const own3 = said?.pid === child.pid;
+    if (up2 && (own3 || ended)) return up2;
+    if (!ended && !own3) continue;
+    if (!ended) {
+      child.kill();
+      throw new Error(`The service doesn't answer at ${said?.url} from here, so it was stopped.`);
+    }
+    const wrote = readFileSync4(log).subarray(from).toString().trim();
+    throw new Error(`The service didn't start.${wrote ? ` It said:
+${wrote}` : ""}`);
+  }
+}
+async function down(data) {
+  const found = await running(data);
+  if (!found) return;
+  process.kill(found.pid, "SIGTERM");
+  for (const deadline = Date.now() + STOP_MS2; Date.now() < deadline; await sleep6(100))
+    if (!await running(data)) return;
+  throw new Error(`The service at ${found.url} didn't stop.`);
+}
+
 // node_modules/openapi-fetch/dist/index.mjs
 var PATH_PARAM_RE = /\{[^{}]+\}/g;
 var supportsRequestInitExt = () => {
@@ -68852,13 +69065,14 @@ var Computer = class _Computer {
     this.files = new Files(this.#computer);
   }
   static async create(opts) {
-    const { access, browser, workspace, name, timeoutMs, metadata, apiKey, apiUrl } = opts;
+    const { access, browser, isolation, workspace, name, timeoutMs, metadata, apiKey, apiUrl } = opts;
     const connection = { ...apiKey ? { apiKey } : {}, ...apiUrl ? { apiUrl } : {} };
     const created = answered(
       await apiOf(connection).POST("/v1/computers", {
         body: {
           access,
           browser: browser ?? false,
+          ...isolation === void 0 ? {} : { isolation },
           ...workspace === void 0 ? {} : { workspace },
           ...name === void 0 ? {} : { name },
           ...timeoutMs === void 0 ? {} : { timeout: seconds(timeoutMs) },
@@ -68963,13 +69177,12 @@ var Computer = class _Computer {
 };
 
 // src/service.ts
-import { readFileSync as readFileSync5, rmSync as rmSync3 } from "node:fs";
+import { readFileSync as readFileSync6, rmSync as rmSync5 } from "node:fs";
 import {
   createServer as createServer5,
   STATUS_CODES as STATUS_CODES3
 } from "node:http";
 import { createServer as createTlsServer } from "node:https";
-import { join as join10 } from "node:path";
 
 // node_modules/@modelcontextprotocol/server/dist/chunk-vYduTEsO.mjs
 var __create4 = Object.create;
@@ -72430,7 +72643,7 @@ var REQUEST_STATE_ONLY_LEG_PACING_MS3 = 250;
 function inputRequiredRoundsExceededMessage3(method, maxRounds) {
   return `Multi-round-trip request '${method}' still required input after ${maxRounds} rounds (inputRequired.maxRounds)`;
 }
-function sleep6(ms, signal) {
+function sleep7(ms, signal) {
   return new Promise((resolve6, reject) => {
     if (signal?.aborted) {
       reject(signal.reason instanceof SdkError3 ? signal.reason : new SdkError3(SdkErrorCode3.RequestTimeout, String(signal.reason)));
@@ -76061,14 +76274,14 @@ var require_validate3 = /* @__PURE__ */ __commonJSMin3(((exports) => {
     } else {
       const matches = RELATIVE_JSON_POINTER.exec($data);
       if (!matches) throw new Error(`Invalid JSON-pointer: ${$data}`);
-      const up = +matches[1];
+      const up2 = +matches[1];
       jsonPointer = matches[2];
       if (jsonPointer === "#") {
-        if (up >= dataLevel) throw new Error(errorMsg("property/index", up));
-        return dataPathArr[dataLevel - up];
+        if (up2 >= dataLevel) throw new Error(errorMsg("property/index", up2));
+        return dataPathArr[dataLevel - up2];
       }
-      if (up > dataLevel) throw new Error(errorMsg("data", up));
-      data = dataNames[dataLevel - up];
+      if (up2 > dataLevel) throw new Error(errorMsg("data", up2));
+      data = dataNames[dataLevel - up2];
       if (!jsonPointer) return data;
     }
     let expr = data;
@@ -76078,8 +76291,8 @@ var require_validate3 = /* @__PURE__ */ __commonJSMin3(((exports) => {
       expr = (0, codegen_1._)`${expr} && ${data}`;
     }
     return expr;
-    function errorMsg(pointerType, up) {
-      return `Cannot access ${pointerType} ${up} levels up, current level is ${dataLevel}`;
+    function errorMsg(pointerType, up2) {
+      return `Cannot access ${pointerType} ${up2} levels up, current level is ${dataLevel}`;
     }
   }
   exports.getData = getData;
@@ -81427,7 +81640,7 @@ var LegacyInputRequiredShim2 = class {
         } finally {
           roundAbort.dispose();
         }
-      } else await sleep6(REQUEST_STATE_ONLY_LEG_PACING_MS3, outerSignal);
+      } else await sleep7(REQUEST_STATE_ONLY_LEG_PACING_MS3, outerSignal);
       let ctxNext = {
         ...ctx,
         mcpReq: {
@@ -84784,8 +84997,8 @@ var NodeStreamableHTTPServerTransport2 = class {
 
 // src/computers.ts
 import { randomBytes as randomBytes5 } from "node:crypto";
-import { appendFileSync, existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync4, rmSync as rmSync2, statSync as statSync3 } from "node:fs";
-import { isAbsolute, join as join9, resolve as resolve4 } from "node:path";
+import { appendFileSync, existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync5, rmSync as rmSync4, statSync as statSync4 } from "node:fs";
+import { isAbsolute, join as join10, resolve as resolve4 } from "node:path";
 var READ = ["about", "read", "list", "search"];
 var FILES = [...READ, "edit"];
 var TOOLS2 = {
@@ -84793,29 +85006,37 @@ var TOOLS2 = {
   files: FILES,
   terminal: [...FILES, "exec_command", "write_stdin", "list_sessions"]
 };
-var MAX_LOG = 256 * 1024;
+var MAX_LOG2 = 256 * 1024;
 var MAX_TIMER_S = 2e6;
 var TICKET_MS = 6e4;
 var expiry = (seconds2) => new Date(Date.now() + seconds2 * 1e3).toISOString();
+var messageOf = (error62) => error62 instanceof Error ? error62.message : String(error62);
+var refusalOf = (error62) => error62 instanceof ApiError ? error62 : new ApiError(500, messageOf(error62));
 var Computers = class {
   #data;
   #base;
-  #runtime;
+  #runtimes;
+  /** The isolation of a computer made without saying which. */
+  isolation;
   #stored = /* @__PURE__ */ new Map();
   #live = /* @__PURE__ */ new Map();
   #tickets = /* @__PURE__ */ new Map();
   #file;
-  constructor(data, base, runtime) {
+  constructor(data, base, runtimes, isolation) {
     this.#data = data;
     this.#base = base;
-    this.#runtime = runtime;
-    this.#file = join9(data, "computers.json");
+    this.#runtimes = runtimes;
+    this.isolation = isolation;
+    this.#file = join10(data, "computers.json");
     if (existsSync2(this.#file))
-      for (const entry of JSON.parse(readFileSync4(this.#file, "utf8")))
-        this.#stored.set(entry.id, entry);
+      for (const entry of JSON.parse(readFileSync5(this.#file, "utf8")))
+        this.#stored.set(entry.id, { ...entry, isolation: entry.isolation ?? isolation });
   }
-  get isolation() {
-    return this.#runtime.isolation;
+  /** The isolations a computer can be made in now. */
+  async available() {
+    const all = Object.keys(this.#runtimes);
+    const can = await Promise.all(all.map((one) => this.#runtimes[one].available()));
+    return all.filter((_, index) => can[index]);
   }
   /** Bring back what was running when the service last stopped. */
   async resume() {
@@ -84823,12 +85044,17 @@ var Computers = class {
       if (stored.state !== "running") continue;
       if (stored.endAt && Date.parse(stored.endAt) <= Date.now()) {
         stored.state = "stopped";
-        await this.#runtime.stopLeftover(stored.id);
+        await this.#runtimes[stored.isolation].stopLeftover(stored.id).catch(
+          (error62) => this.#log(stored.id, `What it left running wasn't stopped: ${messageOf(error62)}`)
+        );
         continue;
       }
-      await this.#start(stored).catch(
-        (error62) => this.#log(stored.id, `It didn't start again: ${String(error62)}`)
-      );
+      await this.#start(stored).catch((error62) => {
+        const live = this.#live.get(stored.id);
+        if (live) live.failed = true;
+        this.#arm(stored);
+        this.#log(stored.id, `It didn't start again: ${messageOf(error62)}`);
+      });
     }
     this.#save();
   }
@@ -84841,7 +85067,7 @@ var Computers = class {
     if (input2.workspace !== void 0) {
       let folder = false;
       try {
-        folder = isAbsolute(input2.workspace) && statSync3(input2.workspace).isDirectory();
+        folder = isAbsolute(input2.workspace) && statSync4(input2.workspace).isDirectory();
       } catch {
       }
       if (!folder) throw new ApiError(400, `There's no folder at ${input2.workspace}.`);
@@ -84854,6 +85080,7 @@ var Computers = class {
       id,
       name: name ?? id,
       access,
+      isolation: input2.isolation ?? this.isolation,
       browser,
       ...workspace ? { workspace } : {},
       metadata: metadata ?? {},
@@ -84864,7 +85091,7 @@ var Computers = class {
       ...timeout === void 0 ? {} : { endAt: expiry(timeout) }
     };
     if (!workspace && access !== "none") {
-      stored.workspace = join9(this.#folder(id), "workspace");
+      stored.workspace = join10(this.#folder(id), "workspace");
       mkdirSync2(stored.workspace, { recursive: true, mode: 448 });
     }
     this.#stored.set(id, stored);
@@ -84873,9 +85100,10 @@ var Computers = class {
     } catch (error62) {
       await this.#halt(id);
       this.#stored.delete(id);
-      await this.#runtime.remove(id);
-      rmSync2(this.#folder(id), { recursive: true, force: true });
-      throw new ApiError(500, error62 instanceof Error ? error62.message : String(error62));
+      await this.#runtimes[stored.isolation].remove(id).catch(() => {
+      });
+      rmSync4(this.#folder(id), { recursive: true, force: true });
+      throw refusalOf(error62);
     }
     this.#save();
     return { ...this.#describe(stored), accessToken: token };
@@ -84930,25 +85158,31 @@ var Computers = class {
       await this.#halt(id);
       stored.state = "stopped";
       this.#save();
-      throw new ApiError(500, error62 instanceof Error ? error62.message : String(error62));
+      throw refusalOf(error62);
     }
     this.#save();
     return this.#describe(stored);
   }
   /** Stop everything and remove what the service made. A folder someone named stays. */
   async kill(id) {
-    this.#found(id);
+    const stored = this.#found(id);
     await this.#halt(id);
-    await this.#runtime.remove(id);
+    try {
+      await this.#runtimes[stored.isolation].remove(id);
+    } catch (error62) {
+      stored.state = "stopped";
+      this.#save();
+      throw refusalOf(error62);
+    }
     this.#stored.delete(id);
     this.#save();
-    rmSync2(this.#folder(id), { recursive: true, force: true });
+    rmSync4(this.#folder(id), { recursive: true, force: true });
   }
   logs(id) {
     this.#found(id);
     let text3 = "";
     try {
-      text3 = readFileSync4(this.#logFile(id), "utf8");
+      text3 = readFileSync5(this.#logFile(id), "utf8");
     } catch {
     }
     return text3.split("\n").filter(Boolean).map((entry) => ({
@@ -84965,17 +85199,17 @@ var Computers = class {
       throw new ApiError(404, "This computer has no files or terminal.");
     if (endpoint === "browser" && !stored.browser)
       throw new ApiError(404, "This computer has no browser.");
-    const running = this.#live.get(id)?.running;
-    if (!running) throw new ApiError(409, "It has stopped.");
+    const running2 = this.#live.get(id)?.running;
+    if (!running2) throw new ApiError(409, "It has stopped.");
     this.#log(id, `${request.method} mcp/${endpoint}`);
-    return running.handle(endpoint, request, response);
+    return running2.handle(endpoint, request, response);
   }
   /** A one-time ticket to open one of its surfaces live. */
   liveSession(id, surface, mode) {
     this.#found(id);
-    const running = this.#live.get(id)?.running;
-    if (!running) throw new ApiError(409, "It has stopped.");
-    const info = running.surfaces.find((one) => one.surface === surface);
+    const running2 = this.#live.get(id)?.running;
+    if (!running2) throw new ApiError(409, "It has stopped.");
+    const info = running2.surfaces.find((one) => one.surface === surface);
     if (!info) throw new ApiError(409, `This computer has no ${surface} to open.`);
     if (info.unavailable) throw new ApiError(409, info.unavailable);
     if (mode === "operate" && !info.operate)
@@ -85000,10 +85234,10 @@ var Computers = class {
     this.#tickets.delete(ticket);
     if (!found || found.expiresAt <= Date.now())
       throw new ApiError(404, "There's no such live session: it was used, or it expired.");
-    const running = this.#live.get(found.computerID)?.running;
-    if (!running) throw new ApiError(409, "It has stopped.");
+    const running2 = this.#live.get(found.computerID)?.running;
+    if (!running2) throw new ApiError(409, "It has stopped.");
     this.#log(found.computerID, `live ${found.surface} ${found.mode}`);
-    await running.openLive(found.surface, found.mode, request, socket, head);
+    await running2.openLive(found.surface, found.mode, request, socket, head);
   }
   /** Stop every computer, leaving their records to resume at the next start. */
   async close() {
@@ -85015,17 +85249,17 @@ var Computers = class {
     return stored;
   }
   #folder(id) {
-    return privateFolder(join9(this.#data, "computers", id));
+    return privateFolder(join10(this.#data, "computers", id));
   }
   #logFile(id) {
-    return join9(this.#folder(id), "log");
+    return join10(this.#folder(id), "log");
   }
   #log(id, line) {
     if (!this.#stored.has(id)) return;
     try {
       const file2 = this.#logFile(id);
-      if (existsSync2(file2) && statSync3(file2).size > MAX_LOG)
-        writePrivate(file2, readFileSync4(file2, "utf8").slice(-MAX_LOG / 2));
+      if (existsSync2(file2) && statSync4(file2).size > MAX_LOG2)
+        writePrivate(file2, readFileSync5(file2, "utf8").slice(-MAX_LOG2 / 2));
       appendFileSync(file2, `${(/* @__PURE__ */ new Date()).toISOString()} ${line}
 `, { mode: 384 });
     } catch {
@@ -85036,12 +85270,13 @@ var Computers = class {
   }
   #describe(stored) {
     const path = `${this.#base()}/v1/computers/${stored.id}/mcp`;
-    const down = this.#live.get(stored.id)?.failed === true;
+    const down2 = this.#live.get(stored.id)?.failed === true;
     return {
       computerID: stored.id,
       name: stored.name,
-      state: stored.state === "running" && down ? "failed" : stored.state,
+      state: stored.state === "running" && down2 ? "failed" : stored.state,
       access: stored.access,
+      isolation: stored.isolation,
       browser: stored.browser,
       workspace: stored.workspace ?? null,
       startedAt: stored.startedAt,
@@ -85057,7 +85292,9 @@ var Computers = class {
     const live = {};
     this.#live.set(stored.id, live);
     stored.startedAt = (/* @__PURE__ */ new Date()).toISOString();
-    live.running = await this.#runtime.start(
+    const runtime = this.#runtimes[stored.isolation];
+    await runtime.prepare();
+    live.running = await runtime.start(
       {
         id: stored.id,
         access: stored.access,
@@ -85110,7 +85347,7 @@ var OPENAPI = {
   "openapi": "3.1.0",
   "info": {
     "title": "AgentComputer",
-    "version": "0.0.14",
+    "version": "0.0.16",
     "description": "Computers for agents. This file is the source of truth: the HTTP API, the MCP control tools and the SDK are all generated from it. An operation with `x-mcp-tool` is also an MCP tool of that name.",
     "license": {
       "name": "Apache-2.0",
@@ -85570,7 +85807,8 @@ var OPENAPI = {
           "running",
           "stopped",
           "failed"
-        ]
+        ],
+        "description": "failed: it was to be running and isn't, because its browser or container ended by itself, or because it couldn't be brought back when the service started. Its logs say why. Stop it and start it again."
       },
       "Timeout": {
         "type": "integer",
@@ -85611,6 +85849,10 @@ var OPENAPI = {
             "maxLength": 4096,
             "description": "The full path of a folder that exists, on the service's machine. With none, the service makes a folder, which goes when the computer is killed. A folder named here never does."
           },
+          "isolation": {
+            "$ref": "#/components/schemas/Isolation",
+            "description": "How it is isolated, which it keeps for as long as it exists. Left out, it is the service's own, the `isolation` that `getInfo` answers."
+          },
           "timeout": {
             "$ref": "#/components/schemas/Timeout"
           },
@@ -85619,6 +85861,14 @@ var OPENAPI = {
           }
         }
       },
+      "Isolation": {
+        "type": "string",
+        "enum": [
+          "none",
+          "container"
+        ],
+        "description": "none: processes of whoever started the service. container: a container of its own, which needs Docker on the service's machine."
+      },
       "Endpoints": {
         "type": "object",
         "required": [
@@ -85650,6 +85900,7 @@ var OPENAPI = {
           "name",
           "state",
           "access",
+          "isolation",
           "browser",
           "workspace",
           "startedAt",
@@ -85670,6 +85921,10 @@ var OPENAPI = {
           "access": {
             "$ref": "#/components/schemas/Access"
           },
+          "isolation": {
+            "$ref": "#/components/schemas/Isolation",
+            "description": "The isolation it was made in. It is never run in another."
+          },
           "browser": {
             "type": "boolean"
           },
@@ -86828,19 +87083,23 @@ var OPENAPI = {
         "type": "object",
         "required": [
           "version",
-          "isolation"
+          "isolation",
+          "isolationsAvailable"
         ],
         "properties": {
           "version": {
             "type": "string"
           },
           "isolation": {
-            "type": "string",
-            "enum": [
-              "none",
-              "container"
-            ],
-            "description": "How this service isolates its computers, chosen when it is started."
+            "$ref": "#/components/schemas/Isolation",
+            "description": "The isolation of a computer made without saying which, chosen when the service is started."
+          },
+          "isolationsAvailable": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Isolation"
+            },
+            "description": "The isolations a computer can be made in now, `none` first. `container` is among them while Docker answers on the service's machine. It is what to offer, not a promise: Docker is asked for a second here and for ten when a container is made, so one that is slow can be missing here and still be made. If `isolation` itself is missing, a computer made without saying which is refused with 409."
           }
         }
       }
@@ -86868,7 +87127,8 @@ var OPERATIONS = [
       "type": "object",
       "required": [
         "version",
-        "isolation"
+        "isolation",
+        "isolationsAvailable"
       ],
       "properties": {
         "version": {
@@ -86880,7 +87140,19 @@ var OPERATIONS = [
             "none",
             "container"
           ],
-          "description": "How this service isolates its computers, chosen when it is started."
+          "description": "The isolation of a computer made without saying which, chosen when the service is started."
+        },
+        "isolationsAvailable": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "none",
+              "container"
+            ],
+            "description": "none: processes of whoever started the service. container: a container of its own, which needs Docker on the service's machine."
+          },
+          "description": "The isolations a computer can be made in now, `none` first. `container` is among them while Docker answers on the service's machine. It is what to offer, not a promise: Docker is asked for a second here and for ten when a container is made, so one that is slow can be missing here and still be made. If `isolation` itself is missing, a computer made without saying which is refused with 409."
         }
       }
     },
@@ -86908,7 +87180,8 @@ var OPERATIONS = [
             "running",
             "stopped",
             "failed"
-          ]
+          ],
+          "description": "failed: it was to be running and isn't, because its browser or container ended by itself, or because it couldn't be brought back when the service started. Its logs say why. Stop it and start it again."
         }
       },
       "required": []
@@ -86922,6 +87195,7 @@ var OPERATIONS = [
           "name",
           "state",
           "access",
+          "isolation",
           "browser",
           "workspace",
           "startedAt",
@@ -86942,7 +87216,8 @@ var OPERATIONS = [
               "running",
               "stopped",
               "failed"
-            ]
+            ],
+            "description": "failed: it was to be running and isn't, because its browser or container ended by itself, or because it couldn't be brought back when the service started. Its logs say why. Stop it and start it again."
           },
           "access": {
             "type": "string",
@@ -86954,6 +87229,14 @@ var OPERATIONS = [
             ],
             "description": "How far it reaches into files and commands, each level containing the one before: `read` has about, read, list and search; `files` adds edit; `terminal` adds exec_command, write_stdin and list_sessions. Below terminal, the browser's code-running tool is hidden."
           },
+          "isolation": {
+            "type": "string",
+            "enum": [
+              "none",
+              "container"
+            ],
+            "description": "The isolation it was made in. It is never run in another."
+          },
           "browser": {
             "type": "boolean"
           },
@@ -87053,6 +87336,14 @@ var OPERATIONS = [
           "maxLength": 4096,
           "description": "The full path of a folder that exists, on the service's machine. With none, the service makes a folder, which goes when the computer is killed. A folder named here never does."
         },
+        "isolation": {
+          "type": "string",
+          "enum": [
+            "none",
+            "container"
+          ],
+          "description": "How it is isolated, which it keeps for as long as it exists. Left out, it is the service's own, the `isolation` that `getInfo` answers."
+        },
         "timeout": {
           "type": "integer",
           "minimum": 1,
@@ -87081,6 +87372,7 @@ var OPERATIONS = [
             "name",
             "state",
             "access",
+            "isolation",
             "browser",
             "workspace",
             "startedAt",
@@ -87101,7 +87393,8 @@ var OPERATIONS = [
                 "running",
                 "stopped",
                 "failed"
-              ]
+              ],
+              "description": "failed: it was to be running and isn't, because its browser or container ended by itself, or because it couldn't be brought back when the service started. Its logs say why. Stop it and start it again."
             },
             "access": {
               "type": "string",
@@ -87113,6 +87406,14 @@ var OPERATIONS = [
               ],
               "description": "How far it reaches into files and commands, each level containing the one before: `read` has about, read, list and search; `files` adds edit; `terminal` adds exec_command, write_stdin and list_sessions. Below terminal, the browser's code-running tool is hidden."
             },
+            "isolation": {
+              "type": "string",
+              "enum": [
+                "none",
+                "container"
+              ],
+              "description": "The isolation it was made in. It is never run in another."
+            },
             "browser": {
               "type": "boolean"
             },
@@ -87221,6 +87522,7 @@ var OPERATIONS = [
             "name",
             "state",
             "access",
+            "isolation",
             "browser",
             "workspace",
             "startedAt",
@@ -87241,7 +87543,8 @@ var OPERATIONS = [
                 "running",
                 "stopped",
                 "failed"
-              ]
+              ],
+              "description": "failed: it was to be running and isn't, because its browser or container ended by itself, or because it couldn't be brought back when the service started. Its logs say why. Stop it and start it again."
             },
             "access": {
               "type": "string",
@@ -87253,6 +87556,14 @@ var OPERATIONS = [
               ],
               "description": "How far it reaches into files and commands, each level containing the one before: `read` has about, read, list and search; `files` adds edit; `terminal` adds exec_command, write_stdin and list_sessions. Below terminal, the browser's code-running tool is hidden."
             },
+            "isolation": {
+              "type": "string",
+              "enum": [
+                "none",
+                "container"
+              ],
+              "description": "The isolation it was made in. It is never run in another."
+            },
             "browser": {
               "type": "boolean"
             },
@@ -87452,6 +87763,7 @@ var OPERATIONS = [
         "name",
         "state",
         "access",
+        "isolation",
         "browser",
         "workspace",
         "startedAt",
@@ -87472,7 +87784,8 @@ var OPERATIONS = [
             "running",
             "stopped",
             "failed"
-          ]
+          ],
+          "description": "failed: it was to be running and isn't, because its browser or container ended by itself, or because it couldn't be brought back when the service started. Its logs say why. Stop it and start it again."
         },
         "access": {
           "type": "string",
@@ -87484,6 +87797,14 @@ var OPERATIONS = [
           ],
           "description": "How far it reaches into files and commands, each level containing the one before: `read` has about, read, list and search; `files` adds edit; `terminal` adds exec_command, write_stdin and list_sessions. Below terminal, the browser's code-running tool is hidden."
         },
+        "isolation": {
+          "type": "string",
+          "enum": [
+            "none",
+            "container"
+          ],
+          "description": "The isolation it was made in. It is never run in another."
+        },
         "browser": {
           "type": "boolean"
         },
@@ -87576,6 +87897,7 @@ var OPERATIONS = [
         "name",
         "state",
         "access",
+        "isolation",
         "browser",
         "workspace",
         "startedAt",
@@ -87596,7 +87918,8 @@ var OPERATIONS = [
             "running",
             "stopped",
             "failed"
-          ]
+          ],
+          "description": "failed: it was to be running and isn't, because its browser or container ended by itself, or because it couldn't be brought back when the service started. Its logs say why. Stop it and start it again."
         },
         "access": {
           "type": "string",
@@ -87608,6 +87931,14 @@ var OPERATIONS = [
           ],
           "description": "How far it reaches into files and commands, each level containing the one before: `read` has about, read, list and search; `files` adds edit; `terminal` adds exec_command, write_stdin and list_sessions. Below terminal, the browser's code-running tool is hidden."
         },
+        "isolation": {
+          "type": "string",
+          "enum": [
+            "none",
+            "container"
+          ],
+          "description": "The isolation it was made in. It is never run in another."
+        },
         "browser": {
           "type": "boolean"
         },
@@ -87705,6 +88036,7 @@ var OPERATIONS = [
         "name",
         "state",
         "access",
+        "isolation",
         "browser",
         "workspace",
         "startedAt",
@@ -87725,7 +88057,8 @@ var OPERATIONS = [
             "running",
             "stopped",
             "failed"
-          ]
+          ],
+          "description": "failed: it was to be running and isn't, because its browser or container ended by itself, or because it couldn't be brought back when the service started. Its logs say why. Stop it and start it again."
         },
         "access": {
           "type": "string",
@@ -87737,6 +88070,14 @@ var OPERATIONS = [
           ],
           "description": "How far it reaches into files and commands, each level containing the one before: `read` has about, read, list and search; `files` adds edit; `terminal` adds exec_command, write_stdin and list_sessions. Below terminal, the browser's code-running tool is hidden."
         },
+        "isolation": {
+          "type": "string",
+          "enum": [
+            "none",
+            "container"
+          ],
+          "description": "The isolation it was made in. It is never run in another."
+        },
         "browser": {
           "type": "boolean"
         },
@@ -88024,9 +88365,12 @@ async function serve(options) {
   checkExposure(host, options);
   const data = privateFolder(options.data);
   const control = digestOf(controlToken(data));
+  const live = await running(data);
+  if (live)
+    throw new Error(`A service is already running with its data in ${data}, at ${live.url}.`);
   let base = "";
-  await options.runtime.prepare();
-  const computers = new Computers(data, () => base, options.runtime);
+  await options.runtimes[options.isolation].prepare();
+  const computers = new Computers(data, () => base, options.runtimes, options.isolation);
   const handlers = createHandlers(computers);
   const routes = OPERATIONS.map((operation) => ({
     operation,
@@ -88114,7 +88458,7 @@ async function serve(options) {
     });
   };
   const server = options.tls ? createTlsServer(
-    { cert: readFileSync5(options.tls.cert), key: readFileSync5(options.tls.key) },
+    { cert: readFileSync6(options.tls.cert), key: readFileSync6(options.tls.key) },
     listener
   ) : createServer5(listener);
   const allowed = new Set(options.allowOrigins ?? []);
@@ -88146,11 +88490,12 @@ ${JSON.stringify({ code: status, message })}
   const bound = server.address();
   const scheme = options.tls ? "https" : "http";
   base = options.publicUrl?.replace(/\/+$/, "") ?? `${scheme}://${bound.family === "IPv6" ? `[${bound.address}]` : bound.address}:${bound.port}`;
+  const record3 = recordOf(data);
+  rmSync5(record3, { force: true });
   await computers.resume();
-  const record3 = join10(data, "server.json");
   writePrivate(
     record3,
-    JSON.stringify({ url: base, pid: process.pid, isolation: options.runtime.isolation })
+    JSON.stringify({ url: base, pid: process.pid, isolation: options.isolation })
   );
   process.stdout.write(`AgentComputer on ${base}, data in ${data}
 `);
@@ -88162,7 +88507,7 @@ ${JSON.stringify({ code: status, message })}
       process.stderr.write(`${String(error62)}
 `);
     });
-    rmSync3(record3, { force: true });
+    rmSync5(record3, { force: true });
     process.exit(0);
   };
   for (const signal of ["SIGINT", "SIGTERM"]) process.once(signal, () => void stop());
@@ -88176,9 +88521,14 @@ var USAGE = `Usage: agentcomputer <command> [--data DIR]
         [--browser-name NAME] [--browser-path PATH]
                                     run the service; 127.0.0.1:7878 by default, and
                                     anywhere else only with TLS
-  info                              the service's version and isolation
+  up [the options of serve]         run the service in the background and return once it
+                                    answers, printing where; one running is left as it is
+  down                              stop the service, and its computers with it
+  status                            where the service is running, if it is
+  info                              the service's version, the isolation it gives a computer
+                                    made without saying, and the ones it can make now
   create --access none|read|files|terminal [--browser] [--workspace DIR] [--name NAME]
-         [--timeout SECONDS] [--metadata KEY=VALUE]...
+         [--isolation none|container] [--timeout SECONDS] [--metadata KEY=VALUE]...
                                     make a computer; prints its endpoints and token, once
   list [--state running|stopped|failed]
                                     the computers
@@ -88191,6 +88541,8 @@ var USAGE = `Usage: agentcomputer <command> [--data DIR]
                                     a one-time ticket to open one live, as a WebSocket
   kill <id>                         stop it and remove what the service made
 
+--version prints this program's version, with no service.
+
 The data folder is --data, else $AGENTCOMPUTER_DATA, else $XDG_DATA_HOME/agentcomputer, else
 ~/.local/share/agentcomputer. Commands find the running service there, with its control token.
 `;
@@ -88203,20 +88555,18 @@ function dataFolder(given) {
     given ?? process.env.AGENTCOMPUTER_DATA ?? (xdg && isAbsolute2(xdg) ? join11(xdg, "agentcomputer") : join11(homedir2(), ".local", "share", "agentcomputer"))
   );
 }
+var none = (data) => `No service is running with its data in ${data}. Start one: agentcomputer up`;
 function connectionTo(data) {
-  try {
-    const { url: url3 } = JSON.parse(readFileSync6(join11(data, "server.json"), "utf8"));
-    return { apiUrl: url3, apiKey: readFileSync6(join11(data, "control-token"), "utf8").trim() };
-  } catch {
-    throw new Error(
-      `No service is running with its data in ${data}. Start one: agentcomputer serve`
-    );
-  }
+  const said = recorded(data);
+  if (!said) throw new Error(none(data));
+  return { apiUrl: said.url, apiKey: said.token };
 }
 async function main() {
-  const { values, positionals } = parseArgs({
+  const { values, positionals, tokens } = parseArgs({
     allowPositionals: true,
+    tokens: true,
     options: {
+      version: { type: "boolean" },
       data: { type: "string" },
       listen: { type: "string" },
       isolation: { type: "string" },
@@ -88247,19 +88597,38 @@ async function main() {
     }
   });
   const [command, id, extra] = positionals;
+  if (values.version) return void process.stdout.write(`${VERSION2}
+`);
   if (values.help || !command) return void process.stdout.write(USAGE);
   const data = dataFolder(values.data);
   const out = (value) => process.stdout.write(`${JSON.stringify(value, null, 2)}
 `);
+  if (command === "status") {
+    const found = await running(data);
+    if (!found) throw new Error(none(data));
+    return out(found);
+  }
+  if (command === "up") {
+    const given = process.argv.slice(2);
+    given.splice(tokens.find((token) => token.kind === "positional")?.index, 1);
+    return out(await up(data, process.argv[1], given));
+  }
+  if (command === "down") return down(data);
+  if ((command === "start" || command === "stop") && !id) {
+    const service = command === "start" ? "up" : "down";
+    throw new UsageError(
+      `${command} takes a computer's id. For the service itself: agentcomputer ${service}`
+    );
+  }
   const idOf = () => {
     if (!id) throw new UsageError(`${command} takes a computer's id.`);
     return id;
   };
   const milliseconds = (seconds2) => Number(seconds2) * 1e3;
+  const { isolation } = values;
+  if (isolation !== void 0 && isolation !== "none" && isolation !== "container")
+    throw new UsageError("--isolation is none or container.");
   if (command === "serve") {
-    const isolation = values.isolation ?? "none";
-    if (isolation !== "none" && isolation !== "container")
-      throw new UsageError("--isolation is none or container.");
     const { "tls-cert": cert, "tls-key": key } = values;
     if (Boolean(cert) !== Boolean(key))
       throw new UsageError("--tls-cert and --tls-key go together.");
@@ -88270,10 +88639,11 @@ async function main() {
       tlsProxy: values["tls-proxy"],
       publicUrl: values["public-url"],
       allowOrigins: values["allow-origin"],
-      runtime: isolation === "container" ? new ContainerRuntime(values.image ?? `${IMAGE}:${VERSION2}`) : new ProcessRuntime({
-        browser: values["browser-name"],
-        path: values["browser-path"]
-      })
+      isolation: isolation ?? "none",
+      runtimes: {
+        none: new ProcessRuntime({ browser: values["browser-name"], path: values["browser-path"] }),
+        container: new ContainerRuntime(values.image ?? `${IMAGE}:${VERSION2}`)
+      }
     });
   }
   if (command === "browser-host")
@@ -88303,6 +88673,7 @@ async function main() {
         ...connection,
         access: values.access,
         ...values.browser ? { browser: true } : {},
+        ...isolation ? { isolation } : {},
         ...values.workspace ? { workspace: resolve5(values.workspace) } : {},
         ...values.name ? { name: values.name } : {},
         ...values.timeout ? { timeoutMs: milliseconds(values.timeout) } : {},