fix: use vscode runtime for mcp launcher

Author: goodguy1963

package-lock.json

@@ -2,7 +2,7 @@
   "name": "copilot-cockpit",
   "displayName": "Copilot Cockpit",
   "description": "VS Code-native orchestration for AI agents with controlled workflows, scheduling, and human-in-the-loop execution",
-  "version": "1.1.140",
+  "version": "1.1.141",
   "publisher": "local-dev",
   "license": "MIT",
   "icon": "images/icon.png",

package.json

@@ -6,11 +6,13 @@ export type McpServerEntry = {
   type: "stdio";
   command: string;
   args: string[];
+  env?: Record<string, string>;
 };
 
 type NodeLaunchCommand = {
   command: string;
   argsPrefix: string[];
+  env?: Record<string, string>;
 };
 
 type NodeResolutionRuntime = {
@@ -228,6 +230,16 @@ export function resolveNodeLaunchCommand(
     };
   }
 
+  if (runtime.fileExists(runtime.execPath)) {
+    return {
+      command: runtime.execPath,
+      argsPrefix: [],
+      env: {
+        ELECTRON_RUN_AS_NODE: "1",
+      },
+    };
+  }
+
   const pathResolvedNode = resolveNodeFromPath(runtime);
   if (pathResolvedNode) {
     return {
@@ -266,6 +278,7 @@ export function buildSchedulerMcpServerEntry(
   return {
     type: "stdio",
     command: nodeLaunch.command,
+    ...(nodeLaunch.env ? { env: nodeLaunch.env } : {}),
     args:
       nodeLaunch.argsPrefix.length > 0
         ? [...nodeLaunch.argsPrefix, buildNodeShellExecutionCommand(launcherPath)]
@@ -302,6 +315,13 @@ function buildSchedulerCodexServerTable(workspaceRoot: string): string {
     "[mcp_servers.scheduler]",
     `command = "${escapeTomlString(nodeLaunch.command)}"`,
     `args = [${args.map((value) => `"${escapeTomlString(value)}"`).join(", ")}]`,
+    ...(nodeLaunch.env
+      ? [
+        `env = { ${Object.entries(nodeLaunch.env)
+          .map(([key, value]) => `${key} = "${escapeTomlString(value)}"`)
+          .join(", ")} }`,
+      ]
+      : []),
     "enabled = true",
     "startup_timeout_sec = 30",
   ].join("\n");
@@ -442,19 +462,28 @@ export function getSchedulerMcpSetupState(
     const actualType = scheduler.type;
     const actualCommand = scheduler.command;
     const actualArgs = Array.isArray(scheduler.args) ? scheduler.args : undefined;
+    const actualEnv = isPlainObject(scheduler.env)
+      ? Object.fromEntries(
+        Object.entries(scheduler.env)
+          .filter((entry): entry is [string, string] => typeof entry[1] === "string"),
+      )
+      : undefined;
+    const expectedEnv = expected.env;
 
     if (
       actualType === expected.type &&
       actualCommand === expected.command &&
       actualArgs &&
       actualArgs.length === expected.args.length &&
-      actualArgs.every((value, index) => value === expected.args[index])
+      actualArgs.every((value, index) => value === expected.args[index]) &&
+      JSON.stringify(actualEnv ?? {}) === JSON.stringify(expectedEnv ?? {})
     ) {
-      if (!fs.existsSync(expected.args[0])) {
+      const launcherPath = getWorkspaceMcpLauncherPath(workspaceRoot);
+      if (!fs.existsSync(launcherPath)) {
         return {
           status: "stale",
           configPath,
-          reason: `Configured server path does not exist: ${expected.args[0]}`,
+          reason: `Configured launcher path does not exist: ${launcherPath}`,
         };
       }
 
@@ -478,6 +507,7 @@ export function getSchedulerMcpSetupState(
           type: actualType,
           command: actualCommand,
           args: actualArgs,
+          env: actualEnv,
         })} instead of ${JSON.stringify(expected)}.`,
     };
   } catch (error) {

src/mcpConfigManager.ts

@@ -42,9 +42,10 @@ suite("MCP Config Manager Tests", () => {
       assert.strictEqual(fs.existsSync(configPath), true);
 
       const saved = JSON.parse(fs.readFileSync(configPath, "utf8")) as {
-        servers?: Record<string, { command?: string; args?: string[] }>;
+        servers?: Record<string, { command?: string; args?: string[]; env?: Record<string, string> }>;
       };
       assert.strictEqual(saved.servers?.scheduler?.command, expectedEntry.command);
+      assert.deepStrictEqual(saved.servers?.scheduler?.env ?? {}, expectedEntry.env ?? {});
       assert.strictEqual(
         fs.existsSync(getWorkspaceMcpLauncherPath(workspaceRoot)),
         true,
@@ -101,12 +102,13 @@ suite("MCP Config Manager Tests", () => {
       const expectedEntry = buildSchedulerMcpServerEntry(workspaceRoot);
 
       const saved = JSON.parse(fs.readFileSync(configPath, "utf8")) as {
-        servers?: Record<string, { command?: string; args?: string[] }>;
+        servers?: Record<string, { command?: string; args?: string[]; env?: Record<string, string> }>;
         metadata?: { owner?: string };
       };
       assert.strictEqual(saved.metadata?.owner, "tests");
       assert.strictEqual(saved.servers?.existing?.args?.[0], "existing-server.js");
       assert.strictEqual(saved.servers?.scheduler?.command, expectedEntry.command);
+      assert.deepStrictEqual(saved.servers?.scheduler?.env ?? {}, expectedEntry.env ?? {});
       assert.strictEqual(
         saved.servers?.scheduler?.args?.[0],
         getWorkspaceMcpLauncherPath(workspaceRoot),
@@ -225,9 +227,10 @@ suite("MCP Config Manager Tests", () => {
       const expectedEntry = buildSchedulerMcpServerEntry(workspaceRoot);
 
       const repaired = JSON.parse(fs.readFileSync(configPath, "utf8")) as {
-        servers?: Record<string, { command?: string; args?: string[] }>;
+        servers?: Record<string, { command?: string; args?: string[]; env?: Record<string, string> }>;
       };
       assert.strictEqual(repaired.servers?.scheduler?.command, expectedEntry.command);
+      assert.deepStrictEqual(repaired.servers?.scheduler?.env ?? {}, expectedEntry.env ?? {});
       assert.strictEqual(
         repaired.servers?.scheduler?.args?.[0],
         getWorkspaceMcpLauncherPath(workspaceRoot),
@@ -240,19 +243,20 @@ suite("MCP Config Manager Tests", () => {
     }
   });
 
-  test("falls back to the user's interactive login shell on macOS when node is not directly discoverable", () => {
+  test("prefers the VS Code runtime with ELECTRON_RUN_AS_NODE when the extension host is not plain node", () => {
     const launch = resolveNodeLaunchCommand({
       platform: "darwin",
       execPath: "/Applications/Visual Studio Code.app/Contents/Frameworks/Code Helper.app/Contents/MacOS/Code Helper",
       env: {
         PATH: "",
         SHELL: "/bin/zsh",
       },
-      fileExists: (filePath: string) => filePath === "/bin/zsh",
+      fileExists: (filePath: string) => filePath === "/Applications/Visual Studio Code.app/Contents/Frameworks/Code Helper.app/Contents/MacOS/Code Helper",
     });
 
-    assert.strictEqual(launch.command, "/bin/zsh");
-    assert.deepStrictEqual(launch.argsPrefix, ["-ilc"]);
+    assert.strictEqual(launch.command, "/Applications/Visual Studio Code.app/Contents/Frameworks/Code Helper.app/Contents/MacOS/Code Helper");
+    assert.deepStrictEqual(launch.argsPrefix, []);
+    assert.deepStrictEqual(launch.env ?? {}, { ELECTRON_RUN_AS_NODE: "1" });
   });
 
   test("prefers an absolute node executable when one is available on macOS", () => {
@@ -267,6 +271,7 @@ suite("MCP Config Manager Tests", () => {
 
     assert.strictEqual(launch.command, "/opt/homebrew/bin/node");
     assert.deepStrictEqual(launch.argsPrefix, []);
+    assert.strictEqual(launch.env, undefined);
   });
 
   test("builds a shell command that resolves node before launching the MCP server", () => {