@hasna/computer 0.1.4 → 0.1.6

package/LICENSE

@@ -1,3 +1,4 @@
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -34,7 +35,8 @@
 
       "Work" shall mean the work of authorship, whether in Source or
       Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work.
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
 
       "Derivative Works" shall mean any work, whether in Source or Object
       form, that is based on (or derived from) the Work and for which the
@@ -174,7 +176,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   Copyright 2026 Andrei Hasna
+   Copyright 2026 Hasna, Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

package/README.md

@@ -67,6 +67,19 @@ Add to your Claude Code config:
 }
 ```
 
+## HTTP mode
+
+Shared Streamable HTTP transport for multi-agent sessions (stdio remains the default):
+
+```bash
+computer-mcp --http              # http://127.0.0.1:8806/mcp
+MCP_HTTP=1 computer-mcp          # same via env
+computer-mcp --http --port 9000    # override port
+```
+
+- Health: `GET http://127.0.0.1:8806/health` → `{"status":"ok","name":"computer"}`
+- MCP endpoint is also mounted on `computer-serve` at `/mcp`.
+
 **Available tools:**
 - `computer_run_task` — Run a full computer use task
 - `computer_screenshot` — Capture the screen

package/dist/mcp/http.d.ts

@@ -0,0 +1,15 @@
+export declare const MCP_HTTP_PORT = 8806;
+export declare const MCP_NAME = "computer";
+export declare function isHttpMode(argv: string[]): boolean;
+export declare function resolveHttpPort(argv: string[]): number;
+export declare function healthPayload(): {
+    status: string;
+    name: string;
+};
+/** Handle /health and /mcp; return null if the request is unrelated. */
+export declare function handleMcpHttpRequest(req: Request): Promise<Response | null>;
+export declare function startMcpHttpServer(port: number): Promise<{
+    port: number;
+    stop: () => void;
+}>;
+//# sourceMappingURL=http.d.ts.map

package/dist/mcp/http.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/mcp/http.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,aAAa,OAAO,CAAC;AAClC,eAAO,MAAM,QAAQ,aAAa,CAAC;AAEnC,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAElD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAiBtD;AAED,wBAAgB,aAAa,IAAI;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAEhE;AAYD,wEAAwE;AACxE,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CASjF;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,MAAM,GACX,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,IAAI,CAAA;CAAE,CAAC,CAW7C"}

package/dist/mcp/http.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=http.test.d.ts.map

package/dist/mcp/http.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"http.test.d.ts","sourceRoot":"","sources":["../../src/mcp/http.test.ts"],"names":[],"mappings":""}

package/dist/mcp/index.d.ts

@@ -1,3 +1,3 @@
 #!/usr/bin/env bun
-export {};
+export { buildServer } from "./server.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/mcp/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mcp/index.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mcp/index.ts"],"names":[],"mappings":";AA2BA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC"}

package/dist/mcp/index.js

@@ -17,9 +17,11 @@ var __export = (target, all) => {
 var __require = import.meta.require;
 
 // src/mcp/index.ts
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 
+// src/mcp/server.ts
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+
 // node_modules/zod/v3/external.js
 var exports_external = {};
 __export(exports_external, {
@@ -23888,240 +23890,322 @@ function getAccessibilityHelperPath() {
   throw new Error("Accessibility helper not found. Run `swiftc helpers/accessibility.swift -o helpers/accessibility -framework AppKit` from the project root.");
 }
 
-// src/mcp/index.ts
-var server = new McpServer({
-  name: "computer",
-  version: "0.1.0"
-});
-server.tool("computer_run_task", "Run a computer use task \u2014 the AI sees your screen and controls mouse/keyboard to complete it", {
-  task: exports_external.string().describe("Natural language description of what to do"),
-  provider: exports_external.enum(["anthropic", "openai"]).default("anthropic").describe("AI provider"),
-  model: exports_external.string().optional().describe("Specific model to use"),
-  max_steps: exports_external.number().default(50).describe("Maximum steps before stopping"),
-  save_screenshots: exports_external.boolean().default(false).describe("Save screenshots to disk"),
-  dry_run: exports_external.boolean().default(false).describe("Plan actions without executing them")
-}, async (params) => {
-  const session = await runTask({
-    task: params.task,
-    provider: params.provider,
-    model: params.model,
-    maxSteps: params.max_steps,
-    saveScreenshots: params.save_screenshots,
-    dryRun: params.dry_run
+// src/mcp/server.ts
+function buildServer() {
+  const server = new McpServer({
+    name: "computer",
+    version: "0.1.0"
   });
-  return {
-    content: [
-      {
-        type: "text",
-        text: JSON.stringify(session, null, 2)
-      }
-    ]
-  };
-});
-server.tool("computer_screenshot", "Capture a screenshot of the current screen", {
-  save_to: exports_external.string().optional().describe("Optional file path to save the screenshot")
-}, async (params) => {
-  const ss = await captureScreenshot();
-  if (params.save_to) {
-    const dir = params.save_to.substring(0, params.save_to.lastIndexOf("/"));
-    const file = params.save_to.substring(params.save_to.lastIndexOf("/") + 1);
-    await saveScreenshotToFile(ss, dir, file);
-  }
-  return {
-    content: [
-      {
-        type: "image",
-        data: ss.base64,
-        mimeType: "image/png"
-      },
-      {
-        type: "text",
-        text: `Screen: ${ss.size.width}x${ss.size.height}`
-      }
-    ]
-  };
-});
-server.tool("computer_click", "Click at a specific screen coordinate", {
-  x: exports_external.number().describe("X coordinate"),
-  y: exports_external.number().describe("Y coordinate"),
-  button: exports_external.enum(["left", "right", "middle"]).default("left").describe("Mouse button"),
-  count: exports_external.number().default(1).describe("Click count (1=single, 2=double, 3=triple)")
-}, async (params) => {
-  const result = await executeAction({
-    type: "click",
-    point: { x: params.x, y: params.y },
-    button: params.button,
-    count: params.count
+  server.tool("computer_run_task", "Run a computer use task \u2014 the AI sees your screen and controls mouse/keyboard to complete it", {
+    task: exports_external.string().describe("Natural language description of what to do"),
+    provider: exports_external.enum(["anthropic", "openai"]).default("anthropic").describe("AI provider"),
+    model: exports_external.string().optional().describe("Specific model to use"),
+    max_steps: exports_external.number().default(50).describe("Maximum steps before stopping"),
+    save_screenshots: exports_external.boolean().default(false).describe("Save screenshots to disk"),
+    dry_run: exports_external.boolean().default(false).describe("Plan actions without executing them")
+  }, async (params) => {
+    const session = await runTask({
+      task: params.task,
+      provider: params.provider,
+      model: params.model,
+      maxSteps: params.max_steps,
+      saveScreenshots: params.save_screenshots,
+      dryRun: params.dry_run
+    });
+    return {
+      content: [
+        {
+          type: "text",
+          text: JSON.stringify(session, null, 2)
+        }
+      ]
+    };
+  });
+  server.tool("computer_screenshot", "Capture a screenshot of the current screen", {
+    save_to: exports_external.string().optional().describe("Optional file path to save the screenshot")
+  }, async (params) => {
+    const ss = await captureScreenshot();
+    if (params.save_to) {
+      const dir = params.save_to.substring(0, params.save_to.lastIndexOf("/"));
+      const file = params.save_to.substring(params.save_to.lastIndexOf("/") + 1);
+      await saveScreenshotToFile(ss, dir, file);
+    }
+    return {
+      content: [
+        {
+          type: "image",
+          data: ss.base64,
+          mimeType: "image/png"
+        },
+        {
+          type: "text",
+          text: `Screen: ${ss.size.width}x${ss.size.height}`
+        }
+      ]
+    };
+  });
+  server.tool("computer_click", "Click at a specific screen coordinate", {
+    x: exports_external.number().describe("X coordinate"),
+    y: exports_external.number().describe("Y coordinate"),
+    button: exports_external.enum(["left", "right", "middle"]).default("left").describe("Mouse button"),
+    count: exports_external.number().default(1).describe("Click count (1=single, 2=double, 3=triple)")
+  }, async (params) => {
+    const result = await executeAction({
+      type: "click",
+      point: { x: params.x, y: params.y },
+      button: params.button,
+      count: params.count
+    });
+    const content = [{ type: "text", text: result.success ? "Click executed" : `Click failed: ${result.error}` }];
+    if (result.screenshot) {
+      content.push({ type: "image", data: result.screenshot.base64, mimeType: "image/png" });
+    }
+    return { content };
+  });
+  server.tool("computer_type", "Type text using the keyboard", {
+    text: exports_external.string().describe("Text to type")
+  }, async (params) => {
+    const result = await executeAction({ type: "type", text: params.text });
+    const content = [{ type: "text", text: result.success ? "Text typed" : `Type failed: ${result.error}` }];
+    if (result.screenshot) {
+      content.push({ type: "image", data: result.screenshot.base64, mimeType: "image/png" });
+    }
+    return { content };
+  });
+  server.tool("computer_key", "Press a key or key combination (e.g. 'enter', 'cmd+c', 'ctrl+shift+a')", {
+    keys: exports_external.string().describe("Key or combination to press")
+  }, async (params) => {
+    const result = await executeAction({ type: "key", keys: params.keys });
+    const content = [{ type: "text", text: result.success ? "Key pressed" : `Key failed: ${result.error}` }];
+    if (result.screenshot) {
+      content.push({ type: "image", data: result.screenshot.base64, mimeType: "image/png" });
+    }
+    return { content };
+  });
+  server.tool("computer_scroll", "Scroll at a specific position", {
+    x: exports_external.number().describe("X coordinate"),
+    y: exports_external.number().describe("Y coordinate"),
+    direction: exports_external.enum(["up", "down"]).describe("Scroll direction"),
+    amount: exports_external.number().default(3).describe("Scroll amount")
+  }, async (params) => {
+    const dy = params.direction === "down" ? params.amount : -params.amount;
+    const result = await executeAction({
+      type: "scroll",
+      point: { x: params.x, y: params.y },
+      deltaX: 0,
+      deltaY: dy
+    });
+    const content = [{ type: "text", text: result.success ? "Scrolled" : `Scroll failed: ${result.error}` }];
+    if (result.screenshot) {
+      content.push({ type: "image", data: result.screenshot.base64, mimeType: "image/png" });
+    }
+    return { content };
+  });
+  server.tool("computer_mouse_move", "Move the mouse to a position", {
+    x: exports_external.number().describe("X coordinate"),
+    y: exports_external.number().describe("Y coordinate")
+  }, async (params) => {
+    const result = await executeAction({ type: "mouse_move", point: { x: params.x, y: params.y } });
+    return { content: [{ type: "text", text: result.success ? "Mouse moved" : `Move failed: ${result.error}` }] };
+  });
+  server.tool("computer_open_url", "Open a URL in the default browser", {
+    url: exports_external.string().describe("URL to open")
+  }, async (params) => {
+    const result = await executeAction({ type: "open_url", url: params.url });
+    const content = [{ type: "text", text: result.success ? "URL opened" : `Open failed: ${result.error}` }];
+    if (result.screenshot) {
+      content.push({ type: "image", data: result.screenshot.base64, mimeType: "image/png" });
+    }
+    return { content };
+  });
+  server.tool("computer_open_app", "Open a macOS application by name", {
+    name: exports_external.string().describe("Application name (e.g. 'Safari', 'Terminal', 'Slack')")
+  }, async (params) => {
+    const result = await executeAction({ type: "open_app", name: params.name });
+    const content = [{ type: "text", text: result.success ? `Opened ${params.name}` : `Open failed: ${result.error}` }];
+    if (result.screenshot) {
+      content.push({ type: "image", data: result.screenshot.base64, mimeType: "image/png" });
+    }
+    return { content };
+  });
+  server.tool("computer_screen_size", "Get the current screen resolution", {}, async () => {
+    const size = await getScreenSize();
+    return { content: [{ type: "text", text: `${size.width}x${size.height}` }] };
+  });
+  server.tool("computer_list_sessions", "List past computer use sessions", {
+    limit: exports_external.number().default(20).describe("Max sessions to return"),
+    status: exports_external.enum(["running", "paused", "completed", "failed", "cancelled"]).optional().describe("Filter by status")
+  }, async (params) => {
+    const sessions = listSessions({ limit: params.limit, status: params.status });
+    return { content: [{ type: "text", text: JSON.stringify(sessions, null, 2) }] };
+  });
+  server.tool("computer_get_session", "Get details of a specific session including action log", {
+    id: exports_external.string().describe("Session ID")
+  }, async (params) => {
+    const session = getSession(params.id);
+    if (!session)
+      return { content: [{ type: "text", text: "Session not found" }] };
+    const logs = getActionLogs(params.id);
+    return {
+      content: [
+        { type: "text", text: JSON.stringify({ session, action_logs: logs }, null, 2) }
+      ]
+    };
+  });
+  server.tool("computer_delete_session", "Delete a session and its action logs", {
+    id: exports_external.string().describe("Session ID")
+  }, async (params) => {
+    const deleted = deleteSession(params.id);
+    return { content: [{ type: "text", text: deleted ? "Session deleted" : "Session not found" }] };
+  });
+  server.tool("computer_search", "Full-text search across sessions (by task) and action logs (by reasoning)", {
+    query: exports_external.string().describe("Search query"),
+    scope: exports_external.enum(["sessions", "actions", "both"]).default("both").describe("Where to search"),
+    limit: exports_external.number().default(20).describe("Max results")
+  }, async (params) => {
+    const results = {};
+    if (params.scope === "sessions" || params.scope === "both") {
+      results.sessions = searchSessions(params.query, params.limit);
+    }
+    if (params.scope === "actions" || params.scope === "both") {
+      results.action_logs = searchActionLogs(params.query, params.limit);
+    }
+    return { content: [{ type: "text", text: JSON.stringify(results, null, 2) }] };
+  });
+  server.tool("computer_stats", "Get usage statistics for computer use", {}, async () => {
+    const stats = getStats();
+    return { content: [{ type: "text", text: JSON.stringify(stats, null, 2) }] };
+  });
+  server.tool("computer_accessibility", "Query the macOS accessibility tree \u2014 get structured UI elements (buttons, fields, labels) with positions. Much more precise than pixel-guessing from screenshots.", {
+    app: exports_external.string().optional().describe("App name to query (default: frontmost)"),
+    focused_only: exports_external.boolean().default(false).describe("Only get focused element's subtree"),
+    depth: exports_external.number().default(3).describe("Max tree traversal depth"),
+    format: exports_external.enum(["json", "summary"]).default("summary").describe("Output format")
+  }, async (params) => {
+    try {
+      const elements = await queryAccessibilityTree({
+        app: params.app,
+        focusedOnly: params.focused_only,
+        depth: params.depth
+      });
+      const text = params.format === "json" ? JSON.stringify(elements, null, 2) : summarizeAccessibilityTree(elements);
+      return { content: [{ type: "text", text }] };
+    } catch (err) {
+      return { content: [{ type: "text", text: `Accessibility query failed: ${err instanceof Error ? err.message : err}` }] };
+    }
+  });
+  server.tool("computer_register_agent", "Register an agent for multi-agent coordination", {
+    name: exports_external.string().describe("Agent name"),
+    description: exports_external.string().optional().describe("Agent description"),
+    capabilities: exports_external.array(exports_external.string()).optional().describe("Agent capabilities")
+  }, async (params) => {
+    const agent = registerAgent(params);
+    return { content: [{ type: "text", text: JSON.stringify(agent, null, 2) }] };
+  });
+  server.tool("computer_heartbeat", "Send a heartbeat to mark an agent as active", {
+    agent_id: exports_external.string().describe("Agent ID")
+  }, async (params) => {
+    const ok = heartbeat(params.agent_id);
+    return { content: [{ type: "text", text: ok ? "Heartbeat received" : "Agent not found" }] };
+  });
+  server.tool("computer_set_focus", "Set what an agent is currently focused on", {
+    agent_id: exports_external.string().describe("Agent ID"),
+    focus: exports_external.string().describe("Current focus description")
+  }, async (params) => {
+    const ok = setFocus(params.agent_id, params.focus);
+    return { content: [{ type: "text", text: ok ? "Focus updated" : "Agent not found" }] };
+  });
+  server.tool("computer_list_agents", "List all registered agents", {}, async () => {
+    const agents = listAgents();
+    return { content: [{ type: "text", text: JSON.stringify(agents, null, 2) }] };
   });
-  const content = [{ type: "text", text: result.success ? "Click executed" : `Click failed: ${result.error}` }];
-  if (result.screenshot) {
-    content.push({ type: "image", data: result.screenshot.base64, mimeType: "image/png" });
+  registerCloudTools(server, "computer");
+  return server;
+}
+
+// src/mcp/http.ts
+import { WebStandardStreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js";
+var MCP_HTTP_PORT = 8806;
+var MCP_NAME = "computer";
+function isHttpMode(argv) {
+  return argv.includes("--http") || process.env.MCP_HTTP === "1";
+}
+function resolveHttpPort(argv) {
+  const eqArg = argv.find((a) => a.startsWith("--port="));
+  if (eqArg) {
+    const parsed = Number.parseInt(eqArg.slice("--port=".length), 10);
+    if (!Number.isNaN(parsed))
+      return parsed;
   }
-  return { content };
-});
-server.tool("computer_type", "Type text using the keyboard", {
-  text: exports_external.string().describe("Text to type")
-}, async (params) => {
-  const result = await executeAction({ type: "type", text: params.text });
-  const content = [{ type: "text", text: result.success ? "Text typed" : `Type failed: ${result.error}` }];
-  if (result.screenshot) {
-    content.push({ type: "image", data: result.screenshot.base64, mimeType: "image/png" });
-  }
-  return { content };
-});
-server.tool("computer_key", "Press a key or key combination (e.g. 'enter', 'cmd+c', 'ctrl+shift+a')", {
-  keys: exports_external.string().describe("Key or combination to press")
-}, async (params) => {
-  const result = await executeAction({ type: "key", keys: params.keys });
-  const content = [{ type: "text", text: result.success ? "Key pressed" : `Key failed: ${result.error}` }];
-  if (result.screenshot) {
-    content.push({ type: "image", data: result.screenshot.base64, mimeType: "image/png" });
-  }
-  return { content };
-});
-server.tool("computer_scroll", "Scroll at a specific position", {
-  x: exports_external.number().describe("X coordinate"),
-  y: exports_external.number().describe("Y coordinate"),
-  direction: exports_external.enum(["up", "down"]).describe("Scroll direction"),
-  amount: exports_external.number().default(3).describe("Scroll amount")
-}, async (params) => {
-  const dy = params.direction === "down" ? params.amount : -params.amount;
-  const result = await executeAction({
-    type: "scroll",
-    point: { x: params.x, y: params.y },
-    deltaX: 0,
-    deltaY: dy
+  const idx = argv.indexOf("--port");
+  if (idx >= 0) {
+    const parsed = Number.parseInt(argv[idx + 1] ?? "", 10);
+    if (!Number.isNaN(parsed))
+      return parsed;
+  }
+  const envPort = process.env.MCP_HTTP_PORT;
+  if (envPort) {
+    const parsed = Number.parseInt(envPort, 10);
+    if (!Number.isNaN(parsed))
+      return parsed;
+  }
+  return MCP_HTTP_PORT;
+}
+function healthPayload() {
+  return { status: "ok", name: MCP_NAME };
+}
+async function handleMcpRequest(req) {
+  const server = buildServer();
+  const transport = new WebStandardStreamableHTTPServerTransport({
+    sessionIdGenerator: undefined,
+    enableJsonResponse: true
   });
-  const content = [{ type: "text", text: result.success ? "Scrolled" : `Scroll failed: ${result.error}` }];
-  if (result.screenshot) {
-    content.push({ type: "image", data: result.screenshot.base64, mimeType: "image/png" });
+  await server.connect(transport);
+  return transport.handleRequest(req);
+}
+async function handleMcpHttpRequest(req) {
+  const url = new URL(req.url);
+  if (url.pathname === "/health" && req.method === "GET") {
+    return Response.json(healthPayload());
   }
-  return { content };
-});
-server.tool("computer_mouse_move", "Move the mouse to a position", {
-  x: exports_external.number().describe("X coordinate"),
-  y: exports_external.number().describe("Y coordinate")
-}, async (params) => {
-  const result = await executeAction({ type: "mouse_move", point: { x: params.x, y: params.y } });
-  return { content: [{ type: "text", text: result.success ? "Mouse moved" : `Move failed: ${result.error}` }] };
-});
-server.tool("computer_open_url", "Open a URL in the default browser", {
-  url: exports_external.string().describe("URL to open")
-}, async (params) => {
-  const result = await executeAction({ type: "open_url", url: params.url });
-  const content = [{ type: "text", text: result.success ? "URL opened" : `Open failed: ${result.error}` }];
-  if (result.screenshot) {
-    content.push({ type: "image", data: result.screenshot.base64, mimeType: "image/png" });
-  }
-  return { content };
-});
-server.tool("computer_open_app", "Open a macOS application by name", {
-  name: exports_external.string().describe("Application name (e.g. 'Safari', 'Terminal', 'Slack')")
-}, async (params) => {
-  const result = await executeAction({ type: "open_app", name: params.name });
-  const content = [{ type: "text", text: result.success ? `Opened ${params.name}` : `Open failed: ${result.error}` }];
-  if (result.screenshot) {
-    content.push({ type: "image", data: result.screenshot.base64, mimeType: "image/png" });
-  }
-  return { content };
-});
-server.tool("computer_screen_size", "Get the current screen resolution", {}, async () => {
-  const size = await getScreenSize();
-  return { content: [{ type: "text", text: `${size.width}x${size.height}` }] };
-});
-server.tool("computer_list_sessions", "List past computer use sessions", {
-  limit: exports_external.number().default(20).describe("Max sessions to return"),
-  status: exports_external.enum(["running", "paused", "completed", "failed", "cancelled"]).optional().describe("Filter by status")
-}, async (params) => {
-  const sessions = listSessions({ limit: params.limit, status: params.status });
-  return { content: [{ type: "text", text: JSON.stringify(sessions, null, 2) }] };
-});
-server.tool("computer_get_session", "Get details of a specific session including action log", {
-  id: exports_external.string().describe("Session ID")
-}, async (params) => {
-  const session = getSession(params.id);
-  if (!session)
-    return { content: [{ type: "text", text: "Session not found" }] };
-  const logs = getActionLogs(params.id);
-  return {
-    content: [
-      { type: "text", text: JSON.stringify({ session, action_logs: logs }, null, 2) }
-    ]
-  };
-});
-server.tool("computer_delete_session", "Delete a session and its action logs", {
-  id: exports_external.string().describe("Session ID")
-}, async (params) => {
-  const deleted = deleteSession(params.id);
-  return { content: [{ type: "text", text: deleted ? "Session deleted" : "Session not found" }] };
-});
-server.tool("computer_search", "Full-text search across sessions (by task) and action logs (by reasoning)", {
-  query: exports_external.string().describe("Search query"),
-  scope: exports_external.enum(["sessions", "actions", "both"]).default("both").describe("Where to search"),
-  limit: exports_external.number().default(20).describe("Max results")
-}, async (params) => {
-  const results = {};
-  if (params.scope === "sessions" || params.scope === "both") {
-    results.sessions = searchSessions(params.query, params.limit);
-  }
-  if (params.scope === "actions" || params.scope === "both") {
-    results.action_logs = searchActionLogs(params.query, params.limit);
-  }
-  return { content: [{ type: "text", text: JSON.stringify(results, null, 2) }] };
-});
-server.tool("computer_stats", "Get usage statistics for computer use", {}, async () => {
-  const stats = getStats();
-  return { content: [{ type: "text", text: JSON.stringify(stats, null, 2) }] };
-});
-server.tool("computer_accessibility", "Query the macOS accessibility tree \u2014 get structured UI elements (buttons, fields, labels) with positions. Much more precise than pixel-guessing from screenshots.", {
-  app: exports_external.string().optional().describe("App name to query (default: frontmost)"),
-  focused_only: exports_external.boolean().default(false).describe("Only get focused element's subtree"),
-  depth: exports_external.number().default(3).describe("Max tree traversal depth"),
-  format: exports_external.enum(["json", "summary"]).default("summary").describe("Output format")
-}, async (params) => {
-  try {
-    const elements = await queryAccessibilityTree({
-      app: params.app,
-      focusedOnly: params.focused_only,
-      depth: params.depth
-    });
-    const text = params.format === "json" ? JSON.stringify(elements, null, 2) : summarizeAccessibilityTree(elements);
-    return { content: [{ type: "text", text }] };
-  } catch (err) {
-    return { content: [{ type: "text", text: `Accessibility query failed: ${err instanceof Error ? err.message : err}` }] };
+  if (url.pathname === "/mcp") {
+    return handleMcpRequest(req);
   }
-});
-server.tool("computer_register_agent", "Register an agent for multi-agent coordination", {
-  name: exports_external.string().describe("Agent name"),
-  description: exports_external.string().optional().describe("Agent description"),
-  capabilities: exports_external.array(exports_external.string()).optional().describe("Agent capabilities")
-}, async (params) => {
-  const agent = registerAgent(params);
-  return { content: [{ type: "text", text: JSON.stringify(agent, null, 2) }] };
-});
-server.tool("computer_heartbeat", "Send a heartbeat to mark an agent as active", {
-  agent_id: exports_external.string().describe("Agent ID")
-}, async (params) => {
-  const ok = heartbeat(params.agent_id);
-  return { content: [{ type: "text", text: ok ? "Heartbeat received" : "Agent not found" }] };
-});
-server.tool("computer_set_focus", "Set what an agent is currently focused on", {
-  agent_id: exports_external.string().describe("Agent ID"),
-  focus: exports_external.string().describe("Current focus description")
-}, async (params) => {
-  const ok = setFocus(params.agent_id, params.focus);
-  return { content: [{ type: "text", text: ok ? "Focus updated" : "Agent not found" }] };
-});
-server.tool("computer_list_agents", "List all registered agents", {}, async () => {
-  const agents = listAgents();
-  return { content: [{ type: "text", text: JSON.stringify(agents, null, 2) }] };
-});
-registerCloudTools(server, "computer");
+  return null;
+}
+async function startMcpHttpServer(port) {
+  const httpServer = Bun.serve({
+    hostname: "127.0.0.1",
+    port,
+    async fetch(req) {
+      const handled = await handleMcpHttpRequest(req);
+      if (handled)
+        return handled;
+      return Response.json({ error: "Not found" }, { status: 404 });
+    }
+  });
+  return { port: httpServer.port, stop: () => httpServer.stop() };
+}
+
+// src/mcp/index.ts
 async function main() {
+  const argv = process.argv.slice(2);
+  if (isHttpMode(argv)) {
+    const port = resolveHttpPort(argv);
+    const { port: boundPort } = await startMcpHttpServer(port);
+    console.error(`computer-mcp HTTP listening on http://127.0.0.1:${boundPort}/mcp`);
+    return;
+  }
+  const server = buildServer();
   const transport = new StdioServerTransport;
   await server.connect(transport);
 }
-main().catch((err) => {
-  console.error("MCP server error:", err);
-  process.exit(1);
-});
+if (import.meta.main) {
+  main().catch((err) => {
+    console.error("MCP server error:", err);
+    process.exit(1);
+  });
+}
+export {
+  buildServer
+};