@gethmy/agent 1.20.0 → 1.20.1

package/dist/cli.js

@@ -2459,17 +2459,26 @@ function cleanupWorktree(worktreePath, branchName) {
   const repoRoot = execFileSync3("git", ["rev-parse", "--show-toplevel"], {
     encoding: "utf-8"
   }).trim();
-  try {
-    execFileSync3("git", ["worktree", "remove", worktreePath, "--force"], {
-      cwd: repoRoot,
-      stdio: "pipe"
-    });
-    log.info(TAG6, `Removed worktree: ${worktreePath}`);
-  } catch (err) {
-    log.warn(TAG6, `Failed to remove worktree cleanly: ${err instanceof Error ? err.message : err}`);
-    if (existsSync2(worktreePath)) {
-      rmSync(worktreePath, { recursive: true, force: true });
+  if (existsSync2(worktreePath)) {
+    try {
+      execFileSync3("git", ["worktree", "remove", worktreePath, "--force"], {
+        cwd: repoRoot,
+        stdio: "pipe"
+      });
+      log.info(TAG6, `Removed worktree: ${worktreePath}`);
+    } catch (err) {
+      log.warn(TAG6, `Failed to remove worktree cleanly: ${err instanceof Error ? err.message : err}`);
+      if (existsSync2(worktreePath)) {
+        rmSync(worktreePath, { recursive: true, force: true });
+      }
+      try {
+        execFileSync3("git", ["worktree", "prune", "--expire=now"], {
+          cwd: repoRoot,
+          stdio: "pipe"
+        });
+      } catch {}
     }
+  } else {
     try {
       execFileSync3("git", ["worktree", "prune", "--expire=now"], {
         cwd: repoRoot,
@@ -2491,9 +2500,19 @@ function resolveRepoRoot() {
     encoding: "utf-8"
   }).trim();
 }
+function localBranchExists(branchName, repoRoot) {
+  try {
+    execFileSync3("git", ["show-ref", "--verify", "--quiet", `refs/heads/${branchName}`], { cwd: repoRoot, stdio: "ignore" });
+    return true;
+  } catch {
+    return false;
+  }
+}
 function branchAheadOfItsRemote(branchName, repoRoot = resolveRepoRoot()) {
+  if (!localBranchExists(branchName, repoRoot))
+    return false;
   try {
-    const out = execFileSync3("git", ["rev-list", branchName, "--not", "--remotes=origin"], { cwd: repoRoot, encoding: "utf-8" }).trim();
+    const out = execFileSync3("git", ["rev-list", branchName, "--not", "--remotes=origin"], { cwd: repoRoot, encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"] }).trim();
     return out.length > 0;
   } catch {
     return false;
@@ -8003,6 +8022,7 @@ class Worker {
         stageGateEvaluation = await this.collectStageGateEvidence(card, stageRun.stage, worktreePath, subtasks);
       } : undefined;
       const completed = await runCompletion(this.client, card, this.branchName, this.worktreePath, this.config, this.id, this.lastSessionStats, this.workspaceId, this.sessionId, this.stateStore, this.onCardCompleted, onBeforeWorktreeCleanup);
+      this.worktreePath = null;
       this.verificationFailed = !completed;
       if (completed && stageRun) {
         const outcome = await this.advanceFromGateEvaluation(card, stageRun.stage, stageRun.index, stageRun.def, stageGateEvaluation);

package/dist/index.js

@@ -2458,17 +2458,26 @@ function cleanupWorktree(worktreePath, branchName) {
   const repoRoot = execFileSync3("git", ["rev-parse", "--show-toplevel"], {
     encoding: "utf-8"
   }).trim();
-  try {
-    execFileSync3("git", ["worktree", "remove", worktreePath, "--force"], {
-      cwd: repoRoot,
-      stdio: "pipe"
-    });
-    log.info(TAG6, `Removed worktree: ${worktreePath}`);
-  } catch (err) {
-    log.warn(TAG6, `Failed to remove worktree cleanly: ${err instanceof Error ? err.message : err}`);
-    if (existsSync2(worktreePath)) {
-      rmSync(worktreePath, { recursive: true, force: true });
+  if (existsSync2(worktreePath)) {
+    try {
+      execFileSync3("git", ["worktree", "remove", worktreePath, "--force"], {
+        cwd: repoRoot,
+        stdio: "pipe"
+      });
+      log.info(TAG6, `Removed worktree: ${worktreePath}`);
+    } catch (err) {
+      log.warn(TAG6, `Failed to remove worktree cleanly: ${err instanceof Error ? err.message : err}`);
+      if (existsSync2(worktreePath)) {
+        rmSync(worktreePath, { recursive: true, force: true });
+      }
+      try {
+        execFileSync3("git", ["worktree", "prune", "--expire=now"], {
+          cwd: repoRoot,
+          stdio: "pipe"
+        });
+      } catch {}
     }
+  } else {
     try {
       execFileSync3("git", ["worktree", "prune", "--expire=now"], {
         cwd: repoRoot,
@@ -2490,9 +2499,19 @@ function resolveRepoRoot() {
     encoding: "utf-8"
   }).trim();
 }
+function localBranchExists(branchName, repoRoot) {
+  try {
+    execFileSync3("git", ["show-ref", "--verify", "--quiet", `refs/heads/${branchName}`], { cwd: repoRoot, stdio: "ignore" });
+    return true;
+  } catch {
+    return false;
+  }
+}
 function branchAheadOfItsRemote(branchName, repoRoot = resolveRepoRoot()) {
+  if (!localBranchExists(branchName, repoRoot))
+    return false;
   try {
-    const out = execFileSync3("git", ["rev-list", branchName, "--not", "--remotes=origin"], { cwd: repoRoot, encoding: "utf-8" }).trim();
+    const out = execFileSync3("git", ["rev-list", branchName, "--not", "--remotes=origin"], { cwd: repoRoot, encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"] }).trim();
     return out.length > 0;
   } catch {
     return false;
@@ -8002,6 +8021,7 @@ class Worker {
         stageGateEvaluation = await this.collectStageGateEvidence(card, stageRun.stage, worktreePath, subtasks);
       } : undefined;
       const completed = await runCompletion(this.client, card, this.branchName, this.worktreePath, this.config, this.id, this.lastSessionStats, this.workspaceId, this.sessionId, this.stateStore, this.onCardCompleted, onBeforeWorktreeCleanup);
+      this.worktreePath = null;
       this.verificationFailed = !completed;
       if (completed && stageRun) {
         const outcome = await this.advanceFromGateEvaluation(card, stageRun.stage, stageRun.index, stageRun.def, stageGateEvaluation);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethmy/agent",
-  "version": "1.20.0",
+  "version": "1.20.1",
   "description": "Push-based agent daemon for Harmony — watches board assignments and spawns Claude CLI workers",
   "type": "module",
   "main": "dist/index.js",