@episoda/cli 0.2.159 → 0.2.161

package/dist/daemon/daemon-process.js

@@ -2909,7 +2909,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@episoda/cli",
-      version: "0.2.159",
+      version: "0.2.161",
       description: "CLI tool for Episoda local development workflow orchestration",
       main: "dist/index.js",
       types: "dist/index.d.ts",
@@ -6410,6 +6410,24 @@ var path10 = __toESM(require("path"));
 var fs9 = __toESM(require("fs"));
 var os4 = __toESM(require("os"));
 var import_core8 = __toESM(require_dist());
+
+// src/utils/github-token.ts
+var INVALID_GITHUB_TOKEN_LITERALS = /* @__PURE__ */ new Set([
+  "${GITHUB_PERSONAL_ACCESS_TOKEN}",
+  "undefined",
+  "null",
+  '""',
+  "''"
+]);
+function sanitizeGithubToken(token) {
+  if (token === void 0) return "";
+  const trimmed = token.trim();
+  if (!trimmed) return "";
+  if (INVALID_GITHUB_TOKEN_LITERALS.has(trimmed)) return "";
+  return trimmed;
+}
+
+// src/agent/mcp-server-configurator.ts
 var McpServerConfigurator = class {
   // ---------------------------------------------------------------------------
   // MCP Auth Resolution
@@ -6479,10 +6497,10 @@ var McpServerConfigurator = class {
     }
     servers.push({
       name: "github",
-      command: "npx -y @modelcontextprotocol/server-github"
+      command: "bash scripts/github-mcp-server.sh"
     });
-    if (!session.credentials.githubToken) {
-      console.warn("[McpServerConfigurator] EP1296: GitHub MCP registered without token (githubToken missing)");
+    if (!sanitizeGithubToken(session.credentials.githubToken)) {
+      console.warn('[McpServerConfigurator] EP1377: GitHub MCP registered without token \u2014 GitHub tools may fail with "Requires authentication"');
     } else {
       console.log("[McpServerConfigurator] EP1251: GitHub MCP server registered");
     }
@@ -7369,9 +7387,10 @@ ${message}`;
           if (sessionToken) {
             episodaMcpEnv.EPISODA_SESSION_TOKEN = sessionToken;
           }
+          const githubToken = sanitizeGithubToken(session.credentials.githubToken);
           const githubMcpEnv = {
             ...baseEnv,
-            GITHUB_PERSONAL_ACCESS_TOKEN: session.credentials.githubToken || ""
+            GITHUB_PERSONAL_ACCESS_TOKEN: githubToken
           };
           for (const mcpServer of mcpServersToRegister) {
             const parts = mcpServer.command.split(" ");
@@ -7506,10 +7525,7 @@ ${message}`;
               const args2 = parts.slice(1);
               let env;
               if (server.name === "github") {
-                env = {
-                  ...baseEnv,
-                  GITHUB_PERSONAL_ACCESS_TOKEN: session.credentials.githubToken || ""
-                };
+                env = { ...baseEnv };
               } else {
                 env = {
                   ...baseEnv,
@@ -7629,9 +7645,10 @@ ${message}`;
           console.warn("[AgentManager] EP1287: No session token available for MCP servers");
         }
       }
-      if (session.credentials.githubToken) {
-        envVars.GITHUB_PERSONAL_ACCESS_TOKEN = session.credentials.githubToken;
-        console.log("[AgentManager] EP1251: Set GITHUB_PERSONAL_ACCESS_TOKEN for GitHub MCP");
+      const processGithubToken = sanitizeGithubToken(session.credentials.githubToken);
+      if (processGithubToken) {
+        envVars.GITHUB_PERSONAL_ACCESS_TOKEN = processGithubToken;
+        console.log("[AgentManager] EP1377: Set GITHUB_PERSONAL_ACCESS_TOKEN for GitHub MCP");
       }
       if (useApiKey && session.credentials.apiKey) {
         if (provider === "codex") {
@@ -11497,45 +11514,6 @@ function getPreviewManager() {
 var import_core13 = __toESM(require_dist());
 
 // src/api/worktree-api.ts
-async function updateWorktree(config, request2) {
-  const machineUuid = config.machine_uuid || config.device_id;
-  if (!machineUuid || !config.access_token) {
-    console.debug("[WorktreeAPI] updateWorktree: no machineUuid or access_token");
-    return false;
-  }
-  const serverUrl = config.api_url || "https://episoda.dev";
-  const url = `${serverUrl}/api/dev/worktrees`;
-  try {
-    const response = await fetch(url, {
-      method: "POST",
-      headers: {
-        "Authorization": `Bearer ${config.access_token}`,
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify({
-        module_id: request2.moduleId,
-        // EP1143: For cloud containers, use container_id; for local, use machine_id
-        local_machine_id: process.env.EPISODA_MODE === "cloud" ? void 0 : machineUuid,
-        cloud_container_id: process.env.EPISODA_MODE === "cloud" ? process.env.EPISODA_CONTAINER_ID : void 0,
-        worktree_path: request2.worktreePath,
-        branch_name: request2.branchName,
-        status: request2.status,
-        port: request2.port,
-        preview_url: request2.previewUrl,
-        error: request2.error
-      })
-    });
-    if (!response.ok) {
-      const text = await response.text();
-      console.debug(`[WorktreeAPI] updateWorktree failed: ${response.status} ${text}`);
-      return false;
-    }
-    return true;
-  } catch (error) {
-    console.debug(`[WorktreeAPI] updateWorktree network error:`, error);
-    return false;
-  }
-}
 async function deleteWorktree(config, moduleUid) {
   const machineUuid = config.machine_uuid || config.device_id;
   if (!machineUuid || !config.access_token) {
@@ -11826,7 +11804,7 @@ async function handleWorktreeCreate(request2) {
         console.log(`[Worktree] K1273: Clone successful`);
         await execAsync2(`git -C "${bareRepoPath}" config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"`, { env: gitEnv });
         const configPath = path23.join(episodaDir, "config.json");
-        const config2 = {
+        const config = {
           projectId,
           workspaceSlug,
           projectSlug,
@@ -11834,7 +11812,7 @@ async function handleWorktreeCreate(request2) {
           createdAt: (/* @__PURE__ */ new Date()).toISOString(),
           worktrees: []
         };
-        fs22.writeFileSync(configPath, JSON.stringify(config2, null, 2), "utf-8");
+        fs22.writeFileSync(configPath, JSON.stringify(config, null, 2), "utf-8");
         console.log(`[Worktree] K1273: Project initialized at ${projectPath}`);
       } catch (cloneError) {
         console.error(`[Worktree] K1273: Git clone failed: ${cloneError.message}`);
@@ -11865,18 +11843,8 @@ async function handleWorktreeCreate(request2) {
     const worktreePath = result.worktreePath;
     console.log(`[Worktree] EP1373: worktree_add phase=worktree_add durationMs=${Date.now() - worktreeAddStartMs} moduleUid=${moduleUid} correlationId=${correlationId || "none"}`);
     console.log(`[Worktree] EP1143: Worktree created at ${worktreePath}`);
-    const config = await getConfigForApi();
     let finalStatus = "ready";
     let finalError;
-    if (config?.access_token) {
-      await updateWorktree(config, {
-        moduleId,
-        worktreePath,
-        branchName,
-        status: "pending"
-      }).catch(() => {
-      });
-    }
     if (envVars && Object.keys(envVars).length > 0) {
       const envContent = Object.entries(envVars).map(([key, value]) => `${key}=${value}`).join("\n");
       const envPath = path23.join(worktreePath, ".env");
@@ -11897,15 +11865,6 @@ ${buildCmd}` : buildCmd;
     if (effectiveSetupScript) {
       const setupStartMs = Date.now();
       await manager.updateWorktreeStatus(moduleUid, "setup");
-      if (config?.access_token) {
-        await updateWorktree(config, {
-          moduleId,
-          worktreePath,
-          branchName,
-          status: "setup"
-        }).catch(() => {
-        });
-      }
       console.log(`[Worktree] EP1143: Running setup script...`);
       const scriptResult = await manager.runSetupScript(moduleUid, effectiveSetupScript);
       console.log(`[Worktree] EP1373: setup_script phase=worktree_setup durationMs=${Date.now() - setupStartMs} moduleUid=${moduleUid} correlationId=${correlationId || "none"} success=${scriptResult.success}`);
@@ -11948,33 +11907,15 @@ ${buildCmd}` : buildCmd;
     } else if (finalStatus === "ready" && isCloud) {
       console.log(`[Worktree] EP1262: Skipping preview start in cloud mode (server orchestrates)`);
     }
-    if (config?.access_token) {
-      try {
-        const updated = await updateWorktree(config, {
-          moduleId,
-          worktreePath,
-          branchName,
-          status: finalStatus,
-          port,
-          previewUrl,
-          error: finalError
-        });
-        if (updated) {
-          console.log(`[Worktree] EP1143: Updated worktrees table with status '${finalStatus}'`);
-        } else {
-          console.warn(`[Worktree] EP1143: Failed to update worktrees table`);
-        }
-      } catch (apiError) {
-        console.error(`[Worktree] EP1143: Failed to update worktrees table: ${apiError.message}`);
-      }
-    }
     console.log(`[Worktree] EP1373: worktree_create_total phase=worktree_create_total durationMs=${Date.now() - worktreeStartMs} moduleUid=${moduleUid} correlationId=${correlationId || "none"} status=${finalStatus}`);
     console.log(`[Worktree] EP1143: Worktree ready for ${moduleUid}`);
     return {
       success: true,
       worktreePath,
       previewUrl,
-      port
+      port,
+      status: finalStatus,
+      error: finalError
     };
   } catch (error) {
     console.error(`[Worktree] EP1143: Create failed: ${error.message}`);
@@ -14349,9 +14290,9 @@ var Daemon = class _Daemon {
     });
     if (!process.env.EPISODA_CONTAINER_ID) {
       if (process.env.GITHUB_PERSONAL_ACCESS_TOKEN) {
-        console.log("[Daemon] EP1365: GITHUB_PERSONAL_ACCESS_TOKEN is set in environment");
+        console.log("[Daemon] EP1377: GITHUB_PERSONAL_ACCESS_TOKEN is set in environment");
       } else {
-        console.warn("[Daemon] EP1365: GITHUB_PERSONAL_ACCESS_TOKEN not set - GitHub MCP tools in local dev may fail");
+        console.log("[Daemon] EP1377: GITHUB_PERSONAL_ACCESS_TOKEN not set in daemon env (OK - daemon sessions inject token via credentials, local CLI uses scripts/github-mcp-server.sh)");
       }
     }
     this.updateManager.checkOnStartup();