@auto-ai/agent 2.1.212 → 2.1.213

package/mcps-runtime/claude-ws-channel/server/gateway.bundle.mjs

@@ -299490,8 +299490,12 @@ var init_wsSubprocess = __esm(() => {
 
 // src/server/session/wsTeammateDispatcher.ts
 import { randomUUID as randomUUID12 } from "crypto";
-function setWsPermissionRequestSink(sink) {
-  emitPermissionRequestEvent = sink;
+function clearPendingTeammatePermissionsForRun(runId) {
+  for (const [requestId, pending] of pendingTeammatePermissionByRequestId) {
+    if (pending.runId === runId) {
+      pendingTeammatePermissionByRequestId.delete(requestId);
+    }
+  }
 }
 function emit2(event) {
   emitWsAgentEvent?.(event);
@@ -299632,6 +299636,7 @@ function abortTeammateRunOnIdleTimeout(correlationId) {
     return;
   }
   state.stopped = true;
+  clearPendingTeammatePermissionsForRun(task.runId);
   state.permissionRelay.rejectAll(task.runId, "idle_timeout");
   state.channel?.destroy();
   state.channel = null;
@@ -299783,9 +299788,6 @@ async function dispatchWsTeammateTask(params) {
     stopped: false,
     permissionRelay: createWsPermissionRelay()
   };
-  setWsPermissionRequestSink((event) => {
-    emitPermissionRequestEvent?.(event);
-  });
   let latestFinalAssistantText = "";
   let emittedTerminal = false;
   const emitTerminal = (status, reason, resultText) => {
@@ -299822,6 +299824,7 @@ async function dispatchWsTeammateTask(params) {
       return;
     }
     state.stopped = true;
+    clearPendingTeammatePermissionsForRun(runId);
     state.permissionRelay.rejectAll(runId, "subprocess_stopped");
     state.channel?.destroy();
     state.channel = null;
@@ -299840,7 +299843,11 @@ async function dispatchWsTeammateTask(params) {
     touchTaskActivity(correlationId);
     if (parsed.type === "permission.request") {
       const req = parsed;
-      if (typeof req.requestId === "string" && typeof req.toolName === "string") {
+      if (typeof req.requestId === "string" && typeof req.toolName === "string" && state.channel) {
+        pendingTeammatePermissionByRequestId.set(req.requestId, {
+          runId: state.runId,
+          channel: state.channel
+        });
         const event = {
           runId: state.runId,
           payload: {
@@ -299987,7 +299994,7 @@ async function dispatchWsTeammateTask(params) {
   logForDebugging(`[wsTeammateDispatcher] dispatch started corr=${correlationId} run=${runId} sourceAgent=${sourceAgent} sessionId=${sessionId ?? ""} promptLen=${prompt.length}`);
   return { runId, correlationId };
 }
-var activeRuns, taskByCorrelationId, taskByDedupeKey, taskAwaiters, DEFAULT_IDLE_TIMEOUT_MS = 60000, IDLE_CHECK_INTERVAL_MS = 1000, emitWsAgentEvent, emitPermissionRequestEvent;
+var activeRuns, taskByCorrelationId, taskByDedupeKey, taskAwaiters, pendingTeammatePermissionByRequestId, DEFAULT_IDLE_TIMEOUT_MS = 60000, IDLE_CHECK_INTERVAL_MS = 1000, emitWsAgentEvent, emitPermissionRequestEvent;
 var init_wsTeammateDispatcher = __esm(() => {
   init_wsSessionOverrides();
   init_wsAgentWorkspace();
@@ -299998,6 +300005,7 @@ var init_wsTeammateDispatcher = __esm(() => {
   taskByCorrelationId = new Map;
   taskByDedupeKey = new Map;
   taskAwaiters = new Map;
+  pendingTeammatePermissionByRequestId = new Map;
 });
 
 // src/server/session/wsSpawnTeammate.ts
@@ -405620,7 +405628,7 @@ var init_wsAgentScheduleRun = __esm(() => {
 
 // src/server/wsMcp/httpGateway.ts
 import { existsSync as existsSync15 } from "fs";
-import { join as join121 } from "path";
+import { join as join122 } from "path";
 
 // src/server/api/modelsController.ts
 init_llmProviders();
@@ -407682,6 +407690,9 @@ var activeChannelManagerService = null;
 function getChannelManagerService() {
   return activeChannelManagerService;
 }
+function reloadAgentConfigForAgent(agentId) {
+  activeChannelManagerService?.reloadAgentConfigForAgent(agentId);
+}
 
 class ChannelManagerService {
   sessionRuntimes = new Map;
@@ -407704,6 +407715,23 @@ class ChannelManagerService {
   getChannelManager() {
     return this.channelManager;
   }
+  reloadAgentConfigForAgent(agentId) {
+    const trimmed = agentId.trim();
+    if (!trimmed) {
+      return;
+    }
+    for (const runtime of this.sessionRuntimes.values()) {
+      if (runtime.agent !== trimmed || !runtime.sessionChannel) {
+        continue;
+      }
+      this.writeChildMessage(runtime.sessionChannel, {
+        jsonrpc: "2.0",
+        id: null,
+        method: "reloadAgentConfig",
+        params: {}
+      });
+    }
+  }
   async start() {
     startWsScheduleDispatcher();
     configureWsScheduleWsBridge(createMainProcessWsBrowserPush({
@@ -408172,6 +408200,7 @@ class ChannelManagerService {
       this.unregisterBrowserSession(agent, sessionId);
       const cfg = await readWsAgentConfigFile(workspaceDir);
       const browserData = {
+        kind: "session",
         agent: rawAgent,
         sessionId: nextSid,
         workspaceDir,
@@ -408206,6 +408235,13 @@ class ChannelManagerService {
         method: "reloadAgentPrompt",
         params: {}
       });
+    } else if (type === "reloadAgentConfig") {
+      this.writeChildMessage(runtime.sessionChannel, {
+        jsonrpc: "2.0",
+        id: null,
+        method: "reloadAgentConfig",
+        params: {}
+      });
     } else if (type === "reloadSessionOverrides") {
       this.writeChildMessage(runtime.sessionChannel, {
         jsonrpc: "2.0",
@@ -408614,6 +408650,7 @@ class ChannelManagerService {
 }
 
 // src/server/api/agentController.ts
+init_wsAgentTeamsValidation();
 function agentsCors() {
   return {
     "Access-Control-Allow-Origin": "*",
@@ -408781,6 +408818,9 @@ async function handleAgentsApi(req, url3) {
       }
       try {
         const { config: config7, added } = await addAgentTeamMember(agentCwd, leaderId, agentType);
+        if (added) {
+          reloadAgentConfigForAgent(leaderId);
+        }
         const row = await withAgentTeamListFields({
           id: leaderId,
           cwd: agentCwd
@@ -408806,6 +408846,7 @@ async function handleAgentsApi(req, url3) {
       }
       try {
         const config7 = await removeAgentTeamMember(agentCwd, agentType);
+        reloadAgentConfigForAgent(leaderId);
         const row = await withAgentTeamListFields({
           id: leaderId,
           cwd: agentCwd
@@ -408917,6 +408958,7 @@ async function handleAgentsApi(req, url3) {
           nextCfg.llmProviders = mergedProviders.providers;
         }
         const mcpServersChanged = oldCfg.mcpServers.join("\x00") !== nextCfg.mcpServers.join("\x00");
+        const agentTeamsChanged = normalizeWsAgentTeamTypes(oldCfg.agentTeams).join("\x00") !== normalizeWsAgentTeamTypes(nextCfg.agentTeams).join("\x00");
         await writeWsAgentConfigFile(agentCwd, nextCfg);
         if (mcpServersChanged) {
           const channelManager = getChannelManagerService();
@@ -408924,6 +408966,9 @@ async function handleAgentsApi(req, url3) {
             channelManager.reconcileChannelPairSessions();
           }
         }
+        if (agentTeamsChanged) {
+          reloadAgentConfigForAgent(singleName);
+        }
       }
       let st;
       try {
@@ -412430,6 +412475,155 @@ async function handleRepoApi(req, url3) {
   return;
 }
 
+// src/server/api/terminalController.ts
+init_wsAgentWorkspace();
+import { join as join119 } from "path";
+var AGENT_WORKSPACE_SUBDIR2 = "workspace";
+var DEFAULT_COLS = 80;
+var DEFAULT_ROWS = 24;
+var terminalSessions = new WeakMap;
+function isTerminalWs(ws) {
+  return ws.data.kind === "terminal";
+}
+function pushTerminalExit(ws, code) {
+  if (ws.readyState !== WebSocket.OPEN) {
+    return;
+  }
+  try {
+    ws.send(JSON.stringify({ type: "exit", code }));
+  } catch {}
+}
+function teardownTerminalSession(ws) {
+  const session2 = terminalSessions.get(ws);
+  if (!session2 || session2.closed) {
+    return;
+  }
+  session2.closed = true;
+  terminalSessions.delete(ws);
+  try {
+    session2.proc.kill();
+  } catch {}
+  try {
+    session2.proc.terminal?.close();
+  } catch {}
+}
+async function handleTerminalWsUpgrade(req, server) {
+  const url3 = new URL(req.url);
+  const agentParam = url3.searchParams.get("agent");
+  let cwd2;
+  let agent;
+  try {
+    const r4 = resolveWsAgentWorkspace({ agentParam });
+    agent = r4.agent;
+    await requireAgentWorkspaceExists(r4.agentDir, agent);
+    await ensureAgentOperWorkspaceDir(r4.agentDir);
+    cwd2 = join119(r4.operWorkspaceDir, AGENT_WORKSPACE_SUBDIR2);
+  } catch (e5) {
+    return new Response(JSON.stringify({ error: true, message: String(e5) }), {
+      status: 400,
+      headers: { "content-type": "application/json; charset=utf-8" }
+    });
+  }
+  const ok = server.upgrade(req, {
+    data: {
+      kind: "terminal",
+      agent,
+      cwd: cwd2
+    }
+  });
+  if (!ok) {
+    return new Response("WebSocket upgrade failed", { status: 400 });
+  }
+  return;
+}
+function handleTerminalWsOpen(ws) {
+  if (!isTerminalWs(ws)) {
+    return;
+  }
+  const { cwd: cwd2 } = ws.data;
+  const cols = DEFAULT_COLS;
+  const rows = DEFAULT_ROWS;
+  const bashPath = Bun.which("bash");
+  if (!bashPath) {
+    try {
+      ws.send(JSON.stringify({ type: "error", message: "bash not found in PATH" }));
+      ws.close();
+    } catch {}
+    return;
+  }
+  let proc;
+  try {
+    proc = Bun.spawn([bashPath], {
+      cwd: cwd2,
+      env: {
+        ...process.env,
+        TERM: "xterm-256color"
+      },
+      terminal: {
+        cols,
+        rows,
+        data(_term, data) {
+          if (ws.readyState !== WebSocket.OPEN) {
+            return;
+          }
+          try {
+            ws.send(data);
+          } catch {}
+        }
+      }
+    });
+  } catch (e5) {
+    try {
+      ws.send(JSON.stringify({ type: "error", message: String(e5) }));
+      ws.close();
+    } catch {}
+    return;
+  }
+  terminalSessions.set(ws, { proc, closed: false });
+  proc.exited.then((code) => {
+    pushTerminalExit(ws, code);
+    teardownTerminalSession(ws);
+    try {
+      ws.close();
+    } catch {}
+  });
+}
+function handleTerminalWsMessage(ws, message) {
+  if (!isTerminalWs(ws)) {
+    return;
+  }
+  const session2 = terminalSessions.get(ws);
+  if (!session2 || session2.closed) {
+    return;
+  }
+  const term = session2.proc.terminal;
+  if (!term) {
+    return;
+  }
+  if (typeof message !== "string") {
+    term.write(message);
+    return;
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(message);
+  } catch {
+    return;
+  }
+  if (parsed.type !== "resize") {
+    return;
+  }
+  const cols = Number(parsed.cols);
+  const rows = Number(parsed.rows);
+  if (!Number.isFinite(cols) || !Number.isFinite(rows) || cols < 1 || rows < 1) {
+    return;
+  }
+  term.resize(Math.floor(cols), Math.floor(rows));
+}
+function handleTerminalWsClose(ws) {
+  teardownTerminalSession(ws);
+}
+
 // src/server/api/runtimePackage/mcpItemConfigController.ts
 init_wsAgentMcpOverlay();
 
@@ -412549,7 +412743,7 @@ init_zip();
 init_wsRuntimeCompiled();
 init_wsRuntimeLayout();
 import { mkdir as mkdir35, readdir as readdir33, readFile as readFile49, rm as rm11, stat as stat38, writeFile as writeFile36 } from "fs/promises";
-import { extname as extname11, join as join119 } from "path";
+import { extname as extname11, join as join120 } from "path";
 import { pathToFileURL as pathToFileURL6 } from "url";
 var TOOL_ALLOWED_EXT = new Set([".js", ".mjs", ".cjs"]);
 var MCP_COMPILED_FILES = [".mcp.json", "index.js"];
@@ -412593,7 +412787,7 @@ function extractToolNamesFromModule(moduleValue) {
   return [...new Set(collected)];
 }
 async function collectToolPackageFiles(rootAbs, relativeDir) {
-  const current2 = relativeDir ? join119(rootAbs, relativeDir) : rootAbs;
+  const current2 = relativeDir ? join120(rootAbs, relativeDir) : rootAbs;
   let entries;
   try {
     entries = await readdir33(current2, { withFileTypes: true });
@@ -412617,7 +412811,7 @@ async function collectToolPackageFiles(rootAbs, relativeDir) {
   return out;
 }
 async function readMcpServerNames(packageRoot) {
-  const filePath = join119(packageRoot, ".mcp.json");
+  const filePath = join120(packageRoot, ".mcp.json");
   const { config: config7, errors: errors8 } = parseMcpConfigFromFilePath({
     filePath,
     expandVars: true,
@@ -412631,7 +412825,7 @@ async function readMcpServerNames(packageRoot) {
 async function collectMcpExportRels(rootAbs) {
   const out = [];
   for (const fileName of MCP_COMPILED_FILES) {
-    const st = await stat38(join119(rootAbs, fileName)).catch(() => null);
+    const st = await stat38(join120(rootAbs, fileName)).catch(() => null);
     if (st?.isFile()) {
       out.push(fileName);
     }
@@ -412679,7 +412873,7 @@ async function listMcpsRuntimePackages() {
   return items;
 }
 async function collectToolsExportEntries(packageId) {
-  const entryAbs = join119(agentRuntimeDir("tools"), packageId);
+  const entryAbs = join120(agentRuntimeDir("tools"), packageId);
   const entrySt = await stat38(entryAbs).catch(() => null);
   if (!entrySt?.isDirectory()) {
     return null;
@@ -412690,13 +412884,13 @@ async function collectToolsExportEntries(packageId) {
   }
   const zipEntries = {};
   for (const rel of rels) {
-    const buf = await readFile49(join119(entryAbs, rel));
+    const buf = await readFile49(join120(entryAbs, rel));
     zipEntries[`${packageId}/${rel}`] = new Uint8Array(buf);
   }
   return zipEntries;
 }
 async function collectMcpsExportEntries(packageId) {
-  const entryAbs = join119(agentRuntimeDir("mcps"), packageId);
+  const entryAbs = join120(agentRuntimeDir("mcps"), packageId);
   const entrySt = await stat38(entryAbs).catch(() => null);
   if (!entrySt?.isDirectory()) {
     return null;
@@ -412707,7 +412901,7 @@ async function collectMcpsExportEntries(packageId) {
   }
   const zipEntries = {};
   for (const rel of rels) {
-    const buf = await readFile49(join119(entryAbs, rel));
+    const buf = await readFile49(join120(entryAbs, rel));
     zipEntries[`${packageId}/${rel}`] = new Uint8Array(buf);
   }
   return zipEntries;
@@ -412718,7 +412912,7 @@ async function deleteToolsRuntimePackage(packageId) {
   if (pkg?.layer === "system") {
     return { ok: false, message: "system runtime package cannot be deleted" };
   }
-  const target = join119(agentRuntimeDir("tools"), packageId);
+  const target = join120(agentRuntimeDir("tools"), packageId);
   try {
     const st = await stat38(target);
     if (!st.isDirectory()) {
@@ -412739,7 +412933,7 @@ async function resolveMcpPackageIdByServerName(serverName) {
       return pkg.packageId;
     }
   }
-  const direct = join119(dir, serverName);
+  const direct = join120(dir, serverName);
   const st = await stat38(direct).catch(() => null);
   if (st?.isDirectory()) {
     return serverName;
@@ -412749,13 +412943,13 @@ async function resolveMcpPackageIdByServerName(serverName) {
 async function deleteMcpsRuntimePackage(packageIdOrServer) {
   const runtimeDir = agentRuntimeDir("mcps");
   let targetName = packageIdOrServer;
-  let target = join119(runtimeDir, targetName);
+  let target = join120(runtimeDir, targetName);
   let st = await stat38(target).catch(() => null);
   if (!st?.isDirectory()) {
     const byServer = await resolveMcpPackageIdByServerName(packageIdOrServer);
     if (byServer) {
       targetName = byServer;
-      target = join119(runtimeDir, targetName);
+      target = join120(runtimeDir, targetName);
       st = await stat38(target).catch(() => null);
     }
   }
@@ -412832,8 +413026,8 @@ async function importToolsRuntimeZip(zipBuffer) {
       continue;
     }
     const relativeTarget = [rootDir, ...rest].join("/");
-    const target = join119(dir, relativeTarget);
-    await mkdir35(join119(dir, rootDir, ...mid), { recursive: true });
+    const target = join120(dir, relativeTarget);
+    await mkdir35(join120(dir, rootDir, ...mid), { recursive: true });
     let existed = false;
     try {
       await readFile49(target);
@@ -412903,8 +413097,8 @@ async function importMcpsRuntimeZip(zipBuffer) {
       continue;
     }
     const relativeTarget = [rootDir, ...rest].join("/");
-    const target = join119(dir, relativeTarget);
-    await mkdir35(join119(dir, rootDir, ...rest.slice(0, -1)), { recursive: true });
+    const target = join120(dir, relativeTarget);
+    await mkdir35(join120(dir, rootDir, ...rest.slice(0, -1)), { recursive: true });
     let existed = false;
     try {
       await readFile49(target);
@@ -413112,9 +413306,17 @@ init_wsSessionId();
 init_wsSessionOverrides();
 init_wsAgentWorkspace();
 
+// src/server/wsMcp/wsBrowserTypes.ts
+function isSessionGatewayData(data) {
+  return data.kind === "session";
+}
+
 // src/server/wsMcp/wsBrowserProtocol.ts
 import { randomUUID as randomUUID38 } from "crypto";
 function emitBootstrapSessionMeta(ws) {
+  if (!isSessionGatewayData(ws.data)) {
+    return;
+  }
   const sid = ws.data.sessionId?.trim();
   if (!sid) {
     return;
@@ -413148,26 +413350,26 @@ function pushBrowserJson(ws, payload) {
 
 // src/server/wsMcp/staticAssets.ts
 import { existsSync as existsSync14 } from "fs";
-import { join as join120, relative as relative21, resolve as resolve37 } from "path";
+import { join as join121, relative as relative21, resolve as resolve37 } from "path";
 import { stat as stat39 } from "fs/promises";
 var SAFE_A_DIST_SUBDIR = "safe-a";
 var WS_TEST_DIST_SUBDIR = "ws-test";
 function resolveSafeADistDir() {
   const fromDistDir = process.env.WS_DIST_DIR?.trim();
-  if (fromDistDir && existsSync14(join120(fromDistDir, "index.html"))) {
+  if (fromDistDir && existsSync14(join121(fromDistDir, "index.html"))) {
     return fromDistDir;
   }
   const projectRoot = process.env.WS_PROJECT_ROOT?.trim();
   if (projectRoot) {
-    const candidate = join120(projectRoot, "dist", SAFE_A_DIST_SUBDIR);
-    if (existsSync14(join120(candidate, "index.html"))) {
+    const candidate = join121(projectRoot, "dist", SAFE_A_DIST_SUBDIR);
+    if (existsSync14(join121(candidate, "index.html"))) {
       return candidate;
     }
   }
   let dir = resolve37(import.meta.dir, "../..");
   for (let depth = 0;depth < 8; depth += 1) {
-    const safeADir = join120(dir, "dist", SAFE_A_DIST_SUBDIR);
-    if (existsSync14(join120(safeADir, "index.html"))) {
+    const safeADir = join121(dir, "dist", SAFE_A_DIST_SUBDIR);
+    if (existsSync14(join121(safeADir, "index.html"))) {
       return safeADir;
     }
     const parent = resolve37(dir, "..");
@@ -413176,24 +413378,24 @@ function resolveSafeADistDir() {
     }
     dir = parent;
   }
-  return join120(import.meta.dir, "../../..", "dist", SAFE_A_DIST_SUBDIR);
+  return join121(import.meta.dir, "../../..", "dist", SAFE_A_DIST_SUBDIR);
 }
 function resolveWsTestDistDir() {
   const fromDir = process.env.WS_WS_TEST_DIR?.trim();
-  if (fromDir && existsSync14(join120(fromDir, "ws-test.html"))) {
+  if (fromDir && existsSync14(join121(fromDir, "ws-test.html"))) {
     return fromDir;
   }
   const projectRoot = process.env.WS_PROJECT_ROOT?.trim();
   if (projectRoot) {
-    const candidate = join120(projectRoot, "dist", WS_TEST_DIST_SUBDIR);
-    if (existsSync14(join120(candidate, "ws-test.html"))) {
+    const candidate = join121(projectRoot, "dist", WS_TEST_DIST_SUBDIR);
+    if (existsSync14(join121(candidate, "ws-test.html"))) {
       return candidate;
     }
   }
   let dir = resolve37(import.meta.dir, "../..");
   for (let depth = 0;depth < 8; depth += 1) {
-    const wsTestDir = join120(dir, "dist", WS_TEST_DIST_SUBDIR);
-    if (existsSync14(join120(wsTestDir, "ws-test.html"))) {
+    const wsTestDir = join121(dir, "dist", WS_TEST_DIST_SUBDIR);
+    if (existsSync14(join121(wsTestDir, "ws-test.html"))) {
       return wsTestDir;
     }
     const parent = resolve37(dir, "..");
@@ -413202,7 +413404,7 @@ function resolveWsTestDistDir() {
     }
     dir = parent;
   }
-  return join120(import.meta.dir, "../../..", "dist", WS_TEST_DIST_SUBDIR);
+  return join121(import.meta.dir, "../../..", "dist", WS_TEST_DIST_SUBDIR);
 }
 var safeADistDir = resolveSafeADistDir();
 var wsTestDistDir = resolveWsTestDistDir();
@@ -413254,7 +413456,7 @@ function decodeDistRel(rel) {
   return decoded;
 }
 function safeResolveDistAbs(decodedRel) {
-  const abs = resolve37(join120(safeADistDir, decodedRel));
+  const abs = resolve37(join121(safeADistDir, decodedRel));
   const root3 = resolve37(safeADistDir);
   const relToRoot = relative21(root3, abs);
   if (relToRoot.startsWith("..") || relToRoot === "") {
@@ -413307,7 +413509,7 @@ async function resolvedDistAsset(pathname) {
 var SLASH_CMD_PATCH_JS = "slash-command-ui-patch.js";
 var SLASH_CMD_PATCH_CSS = "slash-command-ui-patch.css";
 function slashCommandPatchAssetPath(name3) {
-  return join120(safeADistDir, name3);
+  return join121(safeADistDir, name3);
 }
 async function trySlashCommandUiPatchStatic(req, pathname) {
   if (req.method !== "GET" && req.method !== "HEAD")
@@ -413328,14 +413530,19 @@ async function trySlashCommandUiPatchStatic(req, pathname) {
 async function tryWsTestAssetStatic(req, pathname) {
   if (req.method !== "GET" && req.method !== "HEAD")
     return;
-  if (pathname !== "/ws-test.css" && pathname !== "/ws-test.js")
+  let rel = null;
+  if (pathname === "/ws-test.css" || pathname === "/ws-test.js") {
+    rel = pathname.slice(1);
+  } else if (pathname.startsWith("/vendor/")) {
+    rel = pathname.slice(1);
+  }
+  if (!rel)
     return;
-  const fileName = pathname === "/ws-test.css" ? "ws-test.css" : "ws-test.js";
-  const abs = join120(wsTestDistDir, fileName);
+  const abs = join121(wsTestDistDir, rel);
   if (!existsSync14(abs))
     return;
   const file2 = Bun.file(abs);
-  const mime = fileName.endsWith(".css") ? "text/css; charset=utf-8" : "application/javascript; charset=utf-8";
+  const mime = rel.endsWith(".css") ? "text/css; charset=utf-8" : "application/javascript; charset=utf-8";
   return new Response(req.method === "HEAD" ? null : file2, {
     headers: { "content-type": mime }
   });
@@ -413388,7 +413595,7 @@ async function tryStaticHtmlResponse(pathname) {
   const fileName = STATIC_HTML_ROUTES[pathname];
   if (!fileName)
     return;
-  const abs = join120(wsTestDistDir, fileName);
+  const abs = join121(wsTestDistDir, fileName);
   const file2 = Bun.file(abs);
   if (!await file2.exists())
     return;
@@ -413431,7 +413638,7 @@ function startWsMcpGateway(opts) {
       if (staticHtml !== undefined) {
         return staticHtml;
       }
-      if ((req.method === "GET" || req.method === "HEAD") && url3.pathname === wsDistHttpPrefix && existsSync15(join121(safeADistDir, "index.html"))) {
+      if ((req.method === "GET" || req.method === "HEAD") && url3.pathname === wsDistHttpPrefix && existsSync15(join122(safeADistDir, "index.html"))) {
         return Response.redirect(new URL(`${wsDistHttpPrefix}/`, url3).href, 302);
       }
       const distRes = await tryDistStatic(req, url3.pathname);
@@ -413504,6 +413711,9 @@ function startWsMcpGateway(opts) {
       const repoRes = await handleRepoApi(req, url3);
       if (repoRes !== undefined)
         return repoRes;
+      if (url3.pathname === "/ws/terminal") {
+        return handleTerminalWsUpgrade(req, bunServer);
+      }
       if (url3.pathname === "/ws") {
         return handleWsUpgrade(req, bunServer);
       }
@@ -413512,6 +413722,10 @@ function startWsMcpGateway(opts) {
     },
     websocket: {
       open(ws) {
+        if (ws.data.kind === "terminal") {
+          handleTerminalWsOpen(ws);
+          return;
+        }
         emitBootstrapSessionMeta(ws);
         const sid = ws.data.sessionId?.trim();
         if (sid) {
@@ -413520,9 +413734,17 @@ function startWsMcpGateway(opts) {
         hooks2.onControl({ type: "open", data: { ...ws.data } });
       },
       message(ws, message) {
+        if (ws.data.kind === "terminal") {
+          handleTerminalWsMessage(ws, message);
+          return;
+        }
         handleWsMessage(ws, message, hooks2, sessionSockets);
       },
       close(ws) {
+        if (ws.data.kind === "terminal") {
+          handleTerminalWsClose(ws);
+          return;
+        }
         const sid = ws.data.sessionId?.trim();
         if (sid) {
           sessionSockets.delete(sid);
@@ -413600,6 +413822,7 @@ async function handleWsUpgrade(req, server) {
   }
   const ok = server.upgrade(req, {
     data: {
+      kind: "session",
       workspaceDir,
       sessionId,
       agent,
@@ -413615,6 +413838,9 @@ async function handleWsUpgrade(req, server) {
   return;
 }
 async function rebindBrowserWsSession(ws, sessionSockets, parsed) {
+  if (!isSessionGatewayData(ws.data)) {
+    return;
+  }
   const rawAgent = typeof parsed.agent === "string" && parsed.agent.trim().length > 0 ? parsed.agent.trim() : ws.data.agent;
   const rawSid = typeof parsed.sessionId === "string" ? parsed.sessionId.trim() : "";
   const nextSid = rawSid.length > 0 ? rawSid : createWsUserSessionId();
@@ -413642,6 +413868,7 @@ async function rebindBrowserWsSession(ws, sessionSockets, parsed) {
     sessionSockets.delete(oldSid);
   }
   ws.data = {
+    kind: "session",
     workspaceDir: r4.agentDir,
     sessionId: nextSid,
     agent: r4.agent,
@@ -413655,6 +413882,9 @@ async function rebindBrowserWsSession(ws, sessionSockets, parsed) {
   return oldSid;
 }
 async function handleWsMessage(ws, message, hooks2, sessionSockets) {
+  if (!isSessionGatewayData(ws.data)) {
+    return;
+  }
   let parsed;
   try {
     parsed = typeof message === "string" ? JSON.parse(message) : message;