@ai-development-environment/control-agent 0.0.61 → 0.0.63

package/dist/control-agent.js

@@ -5062,7 +5062,7 @@ var RUN_COMMAND_FIELDS = `
   run {
     id kind displayNumber status phase origin provider worktreeId agentId
     worktree { id folder branch }
-    model effort webSearchEnabled initialPrompt finalOutput
+    model effort webSearchEnabled mcpToolNames initialPrompt finalOutput
     inputs { id sequence kind prompt attachments { id filename contentType size sha256 downloadPath } }
     attempts { id generation nativeId status }
     sourcePlan { id provider attempts { id generation nativeId status } }
@@ -5093,6 +5093,16 @@ var AgentGraphQLClient = class {
     this.requestTimeoutMs = requestTimeoutMs;
     this.headers = { ...headers };
   }
+  mcpServerDescriptor(runId) {
+    if (!this.credential) return null;
+    return {
+      name: "ai-development-environment",
+      url: `${this.server}/api/mcp?run=${encodeURIComponent(runId)}`,
+      headers: mergeHeaders(this.headers, {
+        authorization: `Bearer ${this.credential}`
+      })
+    };
+  }
   async request(query, variables) {
     const response = await fetch(`${this.server}/api/graphql`, {
       method: "POST",
@@ -42490,6 +42500,15 @@ function claudeEnvironment() {
     CLAUDE_CODE_DISABLE_BACKGROUND_TASKS: "1"
   };
 }
+function claudeMcpServers(server) {
+  return server ? {
+    [server.name]: {
+      type: "http",
+      url: server.url,
+      headers: server.headers
+    }
+  } : void 0;
+}
 function claudeModelUsages(record, fallbackModel) {
   const toolCallCount = Number(record.num_turns ?? 0);
   const entries = Object.entries(asRecord(record.modelUsage)).filter(
@@ -42589,6 +42608,7 @@ var ClaudeAdapter = class {
         includePartialMessages: true,
         env: claudeEnvironment(),
         disallowedTools: input.run.webSearchEnabled ? [] : ["WebSearch"],
+        ...input.mcpServer ? { mcpServers: claudeMcpServers(input.mcpServer) } : {},
         canUseTool: async (toolName, toolInput, options) => {
           if (toolName !== "AskUserQuestion") {
             return { behavior: "allow", updatedInput: toolInput };
@@ -42766,6 +42786,19 @@ function supportedCodexVersion(version) {
     )
   );
 }
+function codexRunConfig(input) {
+  return {
+    web_search: input.run.webSearchEnabled ? "live" : "disabled",
+    ...input.mcpServer ? {
+      mcp_servers: {
+        [input.mcpServer.name]: {
+          url: input.mcpServer.url,
+          http_headers: input.mcpServer.headers
+        }
+      }
+    } : {}
+  };
+}
 function codexTokenUsage(value, model2) {
   const total = asRecord(value);
   const inputTokens = Number(total.inputTokens ?? total.input_tokens ?? 0);
@@ -43066,18 +43099,14 @@ var CodexAdapter = class {
           model: input.run.model === "default" ? null : input.run.model,
           approvalPolicy: "never",
           sandbox,
-          config: {
-            web_search: input.run.webSearchEnabled ? "live" : "disabled"
-          }
+          config: codexRunConfig(input)
         }
       ) : await this.server.request("thread/start", {
         cwd,
         model: input.run.model === "default" ? null : input.run.model,
         approvalPolicy: "never",
         sandbox,
-        config: {
-          web_search: input.run.webSearchEnabled ? "live" : "disabled"
-        },
+        config: codexRunConfig(input),
         ephemeral: false,
         experimentalRawEvents: false
       })
@@ -49007,33 +49036,51 @@ var OpenCodeAdapter = class {
     };
   }
   async start(input, callbacks) {
-    const client2 = await this.client();
+    const isolatedRuntime = input.mcpServer ? await createOpencode({
+      port: 0,
+      config: {
+        mcp: {
+          [input.mcpServer.name]: {
+            type: "remote",
+            url: input.mcpServer.url,
+            headers: input.mcpServer.headers,
+            oauth: false
+          }
+        }
+      }
+    }) : void 0;
+    const client2 = isolatedRuntime?.client ?? await this.client();
     const cwd = input.run.worktree.folder;
     let nativeId;
-    if (input.resumeNativeId && input.fork !== false) {
-      const forked = resultData(
-        await client2.session.fork({
-          sessionID: input.resumeNativeId,
-          directory: cwd
-        })
-      );
-      nativeId = String(asRecord(forked).id);
-    } else if (input.resumeNativeId) {
-      nativeId = input.resumeNativeId;
-    } else {
-      const created = resultData(
-        await client2.session.create({
-          directory: cwd,
-          agent: input.run.kind === "PLAN" ? "plan" : "build",
-          permission: input.run.kind === "SESSION" ? [{ permission: "*", pattern: "*", action: "allow" }] : void 0
-        })
-      );
-      nativeId = String(asRecord(created).id);
-    }
-    if (!nativeId || nativeId === "undefined") {
-      throw new Error("OpenCode did not return a session ID");
+    try {
+      if (input.resumeNativeId && input.fork !== false) {
+        const forked = resultData(
+          await client2.session.fork({
+            sessionID: input.resumeNativeId,
+            directory: cwd
+          })
+        );
+        nativeId = String(asRecord(forked).id);
+      } else if (input.resumeNativeId) {
+        nativeId = input.resumeNativeId;
+      } else {
+        const created = resultData(
+          await client2.session.create({
+            directory: cwd,
+            agent: input.run.kind === "PLAN" ? "plan" : "build",
+            permission: input.run.kind === "SESSION" ? [{ permission: "*", pattern: "*", action: "allow" }] : void 0
+          })
+        );
+        nativeId = String(asRecord(created).id);
+      }
+      if (!nativeId || nativeId === "undefined") {
+        throw new Error("OpenCode did not return a session ID");
+      }
+      await callbacks.onNativeId(nativeId, "1.18.4");
+    } catch (error) {
+      isolatedRuntime?.server.close();
+      throw error;
     }
-    await callbacks.onNativeId(nativeId, "1.18.4");
     let stopReason = null;
     const streamController = new AbortController();
     const questionSurfaces = /* @__PURE__ */ new Map();
@@ -49213,6 +49260,7 @@ var OpenCodeAdapter = class {
           legacyQuestionReconciliationTask,
           v2QuestionReconciliationTask
         ]);
+        isolatedRuntime?.server.close();
       }
     })();
     return {
@@ -49651,7 +49699,8 @@ var RunManager = class {
           prompt: initialInput.prompt,
           attachments,
           resumeNativeId: resumeNativeId || void 0,
-          fork: command3.type !== "CONTINUE"
+          fork: command3.type !== "CONTINUE",
+          mcpServer: run.mcpToolNames?.length ? this.client.mcpServerDescriptor(run.id) ?? void 0 : void 0
         },
         callbacks
       );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-development-environment/control-agent",
-  "version": "0.0.61",
+  "version": "0.0.63",
   "description": "Control agent for the AI Development Environment",
   "license": "MIT",
   "repository": {