@northflare/runner 0.0.34 → 0.0.36

package/dist/index.d.ts

@@ -244,6 +244,7 @@ declare class EnhancedRepositoryManager extends RepositoryManager {
     private parseRepoKey;
     private findTaskStateEntry;
     private withRepoLock;
+    private isUsableTaskWorktree;
     /**
      * Ensure control repository exists
      */

package/dist/index.js

@@ -7079,6 +7079,19 @@ var EnhancedRepositoryManager = class extends RepositoryManager {
       }
     }
   }
+  async isUsableTaskWorktree(worktreePath) {
+    const gitEntryExists = await fs6.access(path7.join(worktreePath, ".git")).then(() => true).catch(() => false);
+    if (!gitEntryExists) {
+      return false;
+    }
+    try {
+      const git = simpleGit5(worktreePath);
+      const isWorktree = await git.raw(["rev-parse", "--is-inside-work-tree"]);
+      return isWorktree.trim() === "true";
+    } catch {
+      return false;
+    }
+  }
   /**
    * Ensure control repository exists
    */
@@ -7153,33 +7166,7 @@ var EnhancedRepositoryManager = class extends RepositoryManager {
         existing.taskState.updatedAt = /* @__PURE__ */ new Date();
         await this.updateTaskStateByTaskId(taskId, existing.taskState);
       }
-      try {
-        await fs6.access(worktreePath);
-        return {
-          taskId,
-          worktreePath,
-          branch: existing.taskState.branch,
-          baseBranch: existing.taskState.baseBranch
-        };
-      } catch {
-        const git = simpleGit5(existing.repo.controlPath);
-        await this.ensureDirectory(path7.dirname(worktreePath));
-        try {
-          await git.raw(["worktree", "add", worktreePath, existing.taskState.branch]);
-        } catch (error) {
-          console6.error(`Failed to recreate worktree for task ${taskId}:`, error);
-          await this.cleanupDirectory(worktreePath);
-          throw error;
-        }
-        const worktreeGit = simpleGit5(worktreePath);
-        await worktreeGit.addConfig("user.name", "Northflare");
-        await worktreeGit.addConfig("user.email", "runner@northflare.ai");
-        existing.taskState.worktreePath = worktreePath;
-        existing.taskState.workspaceId = workspaceId;
-        existing.taskState.baseBranch = baseBranch;
-        existing.taskState.status = "active";
-        existing.taskState.updatedAt = /* @__PURE__ */ new Date();
-        await this.updateTaskState(existing.repoKey, existing.taskState);
+      if (await this.isUsableTaskWorktree(worktreePath)) {
         return {
           taskId,
           worktreePath,
@@ -7187,6 +7174,31 @@ var EnhancedRepositoryManager = class extends RepositoryManager {
           baseBranch: existing.taskState.baseBranch
         };
       }
+      const git = simpleGit5(existing.repo.controlPath);
+      await this.cleanupDirectory(worktreePath);
+      await this.ensureDirectory(path7.dirname(worktreePath));
+      try {
+        await git.raw(["worktree", "add", worktreePath, existing.taskState.branch]);
+      } catch (error) {
+        console6.error(`Failed to recreate worktree for task ${taskId}:`, error);
+        await this.cleanupDirectory(worktreePath);
+        throw error;
+      }
+      const worktreeGit = simpleGit5(worktreePath);
+      await worktreeGit.addConfig("user.name", "Northflare");
+      await worktreeGit.addConfig("user.email", "runner@northflare.ai");
+      existing.taskState.worktreePath = worktreePath;
+      existing.taskState.workspaceId = workspaceId;
+      existing.taskState.baseBranch = baseBranch;
+      existing.taskState.status = "active";
+      existing.taskState.updatedAt = /* @__PURE__ */ new Date();
+      await this.updateTaskState(existing.repoKey, existing.taskState);
+      return {
+        taskId,
+        worktreePath,
+        branch: existing.taskState.branch,
+        baseBranch: existing.taskState.baseBranch
+      };
     }
     const isLocalRepo = repoUrl.startsWith("file://");
     let controlPath;