episoda 0.2.123 → 0.2.125

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.122",
+      version: "0.2.124",
       description: "CLI tool for Episoda local development workflow orchestration",
       main: "dist/index.js",
       types: "dist/index.d.ts",
@@ -4210,6 +4210,7 @@ var WorktreeManager = class _WorktreeManager {
       };
     }
     const worktreePath = path7.join(this.projectRoot, moduleUid);
+    const normalizedWorktreePath = path7.resolve(worktreePath);
     const lockAcquired = await this.acquireLock();
     if (!lockAcquired) {
       return {
@@ -4226,6 +4227,47 @@ var WorktreeManager = class _WorktreeManager {
           worktreeInfo: existing
         };
       }
+      if (fs6.existsSync(worktreePath)) {
+        const listResult = await this.gitExecutor.execute({
+          action: "worktree_list"
+        }, { cwd: this.bareRepoPath });
+        const worktrees = listResult.details?.worktrees || [];
+        const matching = worktrees.find((w) => path7.resolve(w.path) === normalizedWorktreePath);
+        if (matching) {
+          const adoptedWorktree = {
+            moduleUid,
+            branchName: matching.branch && matching.branch !== "unknown" ? matching.branch : branchName,
+            worktreePath,
+            createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+            lastAccessed: (/* @__PURE__ */ new Date()).toISOString()
+          };
+          const config2 = this.readConfig();
+          if (config2) {
+            config2.worktrees = config2.worktrees.filter((w) => w.moduleUid !== moduleUid);
+            config2.worktrees.push(adoptedWorktree);
+            this.writeConfig(config2);
+          }
+          return {
+            success: true,
+            worktreePath: adoptedWorktree.worktreePath,
+            worktreeInfo: adoptedWorktree
+          };
+        }
+        if (process.env.EPISODA_MODE !== "cloud") {
+          return {
+            success: false,
+            error: `Worktree already exists at path: ${worktreePath}`
+          };
+        }
+        console.warn(`[WorktreeManager] EP1265: Removing stale worktree path at ${worktreePath}`);
+        fs6.rmSync(worktreePath, { recursive: true, force: true });
+        const pruneResult = await this.gitExecutor.execute({
+          action: "worktree_prune"
+        }, { cwd: this.bareRepoPath });
+        if (!pruneResult.success) {
+          console.warn("[WorktreeManager] EP1265: Failed to prune worktrees (continuing):", pruneResult.output);
+        }
+      }
       const fetchResult = await this.gitExecutor.execute({
         action: "fetch",
         remote: "origin",
@@ -7535,6 +7577,7 @@ async function handleWorktreeCreate(request2) {
   try {
     const projectPath = getProjectPath(workspaceSlug, projectSlug);
     const bareRepoPath = path16.join(projectPath, ".bare");
+    const gitEnv = projectId ? { ...process.env, EPISODA_PROJECT_ID: projectId } : process.env;
     if (!fs15.existsSync(bareRepoPath)) {
       console.log(`[Worktree] K1273: Project not found, cloning lazily...`);
       console.log(`[Worktree]   Repo URL: ${repoUrl.replace(/\/\/[^@]*@/, "//***@")}`);
@@ -7542,9 +7585,9 @@ async function handleWorktreeCreate(request2) {
       fs15.mkdirSync(episodaDir, { recursive: true });
       try {
         console.log(`[Worktree] K1273: Starting git clone...`);
-        await execAsync(`git clone --bare "${repoUrl}" "${bareRepoPath}"`);
+        await execAsync(`git clone --bare "${repoUrl}" "${bareRepoPath}"`, { env: gitEnv });
         console.log(`[Worktree] K1273: Clone successful`);
-        await execAsync(`git -C "${bareRepoPath}" config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"`);
+        await execAsync(`git -C "${bareRepoPath}" config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"`, { env: gitEnv });
         const configPath = path16.join(episodaDir, "config.json");
         const config2 = {
           projectId,
@@ -7566,7 +7609,7 @@ async function handleWorktreeCreate(request2) {
     } else {
       console.log(`[Worktree] K1273: Project exists, fetching latest...`);
       try {
-        await execAsync(`git -C "${bareRepoPath}" fetch origin --prune`);
+        await execAsync(`git -C "${bareRepoPath}" fetch origin --prune`, { env: gitEnv });
       } catch (fetchError) {
         console.warn(`[Worktree] K1273: Fetch failed (continuing anyway): ${fetchError.message}`);
       }