Merge branch 'fix-sentry-skill-project-loading' into dev

src/features/skill-mcp-manager/manager.test.ts

@@ -106,4 +106,54 @@ describe("SkillMcpManager", () => {
       expect(manager.getConnectedServers()).toEqual([])
     })
   })
+
+  describe("environment variable handling", () => {
+    it("always inherits process.env even when config.env is undefined", async () => {
+      // #given
+      const info: SkillMcpClientInfo = {
+        serverName: "test-server",
+        skillName: "test-skill",
+        sessionID: "session-1",
+      }
+      const configWithoutEnv: ClaudeCodeMcpServer = {
+        command: "node",
+        args: ["-e", "process.exit(0)"],
+      }
+
+      // #when - attempt connection (will fail but exercises env merging code path)
+      // #then - should not throw "undefined" related errors for env
+      try {
+        await manager.getOrCreateClient(info, configWithoutEnv)
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error)
+        expect(message).not.toContain("env")
+        expect(message).not.toContain("undefined")
+      }
+    })
+
+    it("overlays config.env on top of inherited process.env", async () => {
+      // #given
+      const info: SkillMcpClientInfo = {
+        serverName: "test-server",
+        skillName: "test-skill",
+        sessionID: "session-2",
+      }
+      const configWithEnv: ClaudeCodeMcpServer = {
+        command: "node",
+        args: ["-e", "process.exit(0)"],
+        env: {
+          CUSTOM_VAR: "custom_value",
+        },
+      }
+
+      // #when - attempt connection
+      // #then - should not throw, env merging should work
+      try {
+        await manager.getOrCreateClient(info, configWithEnv)
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error)
+        expect(message).toContain("Failed to connect")
+      }
+    })
+  })
 })

src/features/skill-mcp-manager/manager.ts

@@ -55,18 +55,20 @@ export class SkillMcpManager {
     const command = config.command
     const args = config.args || []
 
+    // Always inherit parent process environment
     const mergedEnv: Record<string, string> = {}
-    if (config.env) {
     for (const [key, value] of Object.entries(process.env)) {
       if (value !== undefined) mergedEnv[key] = value
     }
+    // Overlay with skill-specific env vars if present
+    if (config.env) {
       Object.assign(mergedEnv, config.env)
     }
 
     const transport = new StdioClientTransport({
       command,
       args,
-      env: config.env ? mergedEnv : undefined,
+      env: mergedEnv,
     })
 
     const client = new Client(