episoda 0.2.121 → 0.2.123

package/dist/daemon/daemon-process.js

@@ -2815,7 +2815,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "episoda",
-      version: "0.2.120",
+      version: "0.2.122",
       description: "CLI tool for Episoda local development workflow orchestration",
       main: "dist/index.js",
       types: "dist/index.d.ts",
@@ -8959,23 +8959,32 @@ If changes are needed, explain what needs to be done.`;
         const mcpServersToRegister = this.getMcpServersForSession(session);
         if (mcpServersToRegister.length > 0) {
           const mcpConfig = {};
+          const baseEnv = {};
+          for (const [key, value] of Object.entries(process.env)) {
+            if (value !== void 0) {
+              baseEnv[key] = value;
+            }
+          }
           const sessionToken = process.env.EPISODA_ACCESS_TOKEN || process.env.EPISODA_SESSION_TOKEN || "";
           const devEnvId = process.env.EPISODA_CONTAINER_ID || process.env.EPISODA_MACHINE_ID || "";
           const episodaMcpEnv = {
+            ...baseEnv,
             EPISODA_API_URL: process.env.EPISODA_API_URL || "https://episoda.dev",
             EPISODA_SESSION_TOKEN: sessionToken,
             MODULE_UID: session.moduleUid,
             DEV_ENVIRONMENT_ID: devEnvId
           };
+          const githubMcpEnv = {
+            ...baseEnv,
+            GITHUB_PERSONAL_ACCESS_TOKEN: session.credentials.githubToken || ""
+          };
           for (const mcpServer of mcpServersToRegister) {
             const parts = mcpServer.command.split(" ");
             if (mcpServer.name === "github") {
               mcpConfig[mcpServer.name] = {
                 command: parts[0],
                 args: parts.slice(1),
-                env: {
-                  GITHUB_PERSONAL_ACCESS_TOKEN: session.credentials.githubToken || ""
-                }
+                env: githubMcpEnv
               };
             } else {
               mcpConfig[mcpServer.name] = {
@@ -8984,7 +8993,7 @@ If changes are needed, explain what needs to be done.`;
                 env: episodaMcpEnv
               };
             }
-            console.log(`[AgentManager] EP1253: Registering MCP server: ${mcpServer.name} with explicit env`);
+            console.log(`[AgentManager] EP1253: Registering MCP server: ${mcpServer.name} with full env (${Object.keys(mcpServer.name === "github" ? githubMcpEnv : episodaMcpEnv).length} vars)`);
           }
           const mcpConfigJson = JSON.stringify({ mcpServers: mcpConfig });
           args.push("--mcp-config", mcpConfigJson);
@@ -9005,12 +9014,12 @@ If changes are needed, explain what needs to be done.`;
       }
       const useOAuth = !!session.credentials.oauthToken;
       const useApiKey = !useOAuth && !!session.credentials.apiKey;
+      const sessionCodexDir = path20.join(os6.homedir(), ".codex", "sessions", sessionId);
+      const sessionClaudeDir = path20.join(os6.homedir(), ".claude", "sessions", sessionId);
       if (provider === "codex") {
         await this.withConfigLock(async () => {
-          const codexDir = path20.join(os6.homedir(), ".codex");
-          if (!fs19.existsSync(codexDir)) {
-            fs19.mkdirSync(codexDir, { recursive: true });
-          }
+          fs19.mkdirSync(sessionCodexDir, { recursive: true });
+          console.log(`[AgentManager] EP1260: Created session-specific Codex dir: ${sessionCodexDir}`);
           if (useOAuth) {
             const codexConfig = generateCodexConfig({
               accessToken: session.credentials.oauthToken,
@@ -9019,23 +9028,13 @@ If changes are needed, explain what needs to be done.`;
               accountId: session.credentials.accountId,
               expiresAt: session.credentials.expiresAt
             }, session.projectPath);
-            const authJsonPath = path20.join(codexDir, "auth.json");
+            const authJsonPath = path20.join(sessionCodexDir, "auth.json");
             fs19.writeFileSync(authJsonPath, codexConfig["auth.json"], { mode: 384 });
-            console.log("[AgentManager] EP1133: Wrote Codex auth.json to ~/.codex/auth.json");
+            console.log(`[AgentManager] EP1260: Wrote Codex auth.json to ${authJsonPath}`);
             if (codexConfig["config.toml"]) {
-              const configTomlPath = path20.join(codexDir, "config.toml");
-              let existingConfig = "";
-              try {
-                existingConfig = fs19.readFileSync(configTomlPath, "utf-8");
-              } catch {
-              }
-              const escapedPathForRegex = session.projectPath.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-              const projectKeyPattern = new RegExp(`\\[projects\\."${escapedPathForRegex}"\\]`);
-              const projectAlreadyTrusted = projectKeyPattern.test(existingConfig);
-              if (!projectAlreadyTrusted) {
-                fs19.writeFileSync(configTomlPath, existingConfig + "\n" + codexConfig["config.toml"], { mode: 420 });
-                console.log("[AgentManager] EP1133: Updated Codex config.toml with project trust");
-              }
+              const configTomlPath = path20.join(sessionCodexDir, "config.toml");
+              fs19.writeFileSync(configTomlPath, codexConfig["config.toml"], { mode: 420 });
+              console.log(`[AgentManager] EP1260: Wrote Codex config.toml to ${configTomlPath}`);
             }
           } else if (useApiKey) {
             console.log("[AgentManager] EP1133: Using Codex with API key (OPENAI_API_KEY)");
@@ -9043,16 +9042,11 @@ If changes are needed, explain what needs to be done.`;
         });
       } else {
         await this.withConfigLock(async () => {
-          const claudeDir = path20.join(os6.homedir(), ".claude");
-          const credentialsPath = path20.join(claudeDir, ".credentials.json");
-          const statsigDir = path20.join(claudeDir, "statsig");
-          if (!fs19.existsSync(claudeDir)) {
-            fs19.mkdirSync(claudeDir, { recursive: true });
-          }
-          if (!fs19.existsSync(statsigDir)) {
-            fs19.mkdirSync(statsigDir, { recursive: true });
-          }
+          const statsigDir = path20.join(sessionClaudeDir, "statsig");
+          fs19.mkdirSync(statsigDir, { recursive: true });
+          console.log(`[AgentManager] EP1260: Created session-specific Claude dir: ${sessionClaudeDir}`);
           if (useOAuth) {
+            const credentialsPath = path20.join(sessionClaudeDir, ".credentials.json");
             const oauthCredentials = {
               accessToken: session.credentials.oauthToken
             };
@@ -9069,7 +9063,7 @@ If changes are needed, explain what needs to be done.`;
               claudeAiOauth: oauthCredentials
             }, null, 2);
             fs19.writeFileSync(credentialsPath, credentialsContent, { mode: 384 });
-            console.log("[AgentManager] Wrote OAuth credentials to ~/.claude/.credentials.json");
+            console.log(`[AgentManager] EP1260: Wrote OAuth credentials to ${credentialsPath}`);
             try {
               const claudeConfig = generateClaudeConfig({
                 githubToken: session.credentials.githubToken
@@ -9080,13 +9074,13 @@ If changes are needed, explain what needs to be done.`;
               if (!hasEvaluations || !hasStableId) {
                 throw new Error(`Invalid statsig config: missing required files`);
               }
-              const settingsPath = path20.join(claudeDir, "settings.json");
+              const settingsPath = path20.join(sessionClaudeDir, "settings.json");
               fs19.writeFileSync(settingsPath, claudeConfig["settings.json"], { mode: 384 });
               for (const [filename, content] of Object.entries(claudeConfig.statsig)) {
                 const filePath = path20.join(statsigDir, filename);
                 fs19.writeFileSync(filePath, content, { mode: 420 });
               }
-              console.log("[AgentManager] Wrote Claude config files");
+              console.log("[AgentManager] EP1260: Wrote Claude config files to session directory");
             } catch (configError) {
               console.warn("[AgentManager] Failed to write Claude config files:", configError instanceof Error ? configError.message : configError);
             }
@@ -9104,6 +9098,13 @@ If changes are needed, explain what needs to be done.`;
         // MCP servers inherit these from the Claude Code process
         MODULE_UID: session.moduleUid
       };
+      if (provider === "codex") {
+        envVars.CODEX_HOME = sessionCodexDir;
+        console.log(`[AgentManager] EP1260: Set CODEX_HOME=${sessionCodexDir}`);
+      } else {
+        envVars.CLAUDE_CONFIG_DIR = sessionClaudeDir;
+        console.log(`[AgentManager] EP1260: Set CLAUDE_CONFIG_DIR=${sessionClaudeDir}`);
+      }
       if (!envVars.DEV_ENVIRONMENT_ID) {
         envVars.DEV_ENVIRONMENT_ID = process.env.EPISODA_CONTAINER_ID || process.env.EPISODA_MACHINE_ID || "";
         if (envVars.DEV_ENVIRONMENT_ID) {
@@ -9352,6 +9353,25 @@ If changes are needed, explain what needs to be done.`;
     this.removePidFile(sessionId);
     console.log(`[AgentManager] Session ${sessionId} stopped`);
   }
+  /**
+   * EP1260: Clean up session-specific credential directories
+   * Call this when a session is truly ended (not just paused/stopped)
+   * e.g., module state transition, explicit session close, etc.
+   */
+  cleanupSessionCredentials(sessionId, provider) {
+    const providers = provider ? [provider] : ["claude", "codex"];
+    for (const p of providers) {
+      const sessionDir = p === "codex" ? path20.join(os6.homedir(), ".codex", "sessions", sessionId) : path20.join(os6.homedir(), ".claude", "sessions", sessionId);
+      try {
+        if (fs19.existsSync(sessionDir)) {
+          fs19.rmSync(sessionDir, { recursive: true, force: true });
+          console.log(`[AgentManager] EP1260: Cleaned up ${p} session credentials: ${sessionDir}`);
+        }
+      } catch (error) {
+        console.warn(`[AgentManager] EP1260: Failed to clean up ${p} session credentials:`, error);
+      }
+    }
+  }
   /**
    * Stop all active sessions
    */