@gethmy/agent 1.14.0 → 1.14.2

package/dist/cli.js

@@ -463,7 +463,7 @@ var init_types = __esm(() => {
       worktreeGcIntervalMs: 5 * 60000
     },
     planning: DEFAULT_PLANNING_CONFIG,
-    playbooks: { enabled: false, humanStageColumns: [] }
+    playbooks: { enabled: true, humanStageColumns: [] }
   };
 });
 
@@ -1980,7 +1980,24 @@ function fetchBaseBranch(repoRoot, baseBranch, attempts = 3, fetchImpl = (root,
   const detail = e?.stderr?.toString?.().trim() || (lastErr instanceof Error ? lastErr.message : String(lastErr));
   throw new WorktreeBaseError(`Could not fetch origin/${baseBranch} after ${attempts} attempts — ` + `refusing to build on a stale base. ${detail}`);
 }
-function createWorktree(basePath, baseBranch, branchName) {
+function resolveWorktreeStartRef(baseBranch, branchName, continueExisting, branchExistsOnRemote) {
+  if (continueExisting && branchExistsOnRemote()) {
+    return `origin/${branchName}`;
+  }
+  return `origin/${baseBranch}`;
+}
+function fetchExistingBranch(repoRoot, branchName) {
+  try {
+    execFileSync3("git", ["fetch", "origin", branchName], {
+      cwd: repoRoot,
+      stdio: "pipe"
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function createWorktree(basePath, baseBranch, branchName, opts = {}) {
   const repoRoot = execFileSync3("git", ["rev-parse", "--show-toplevel"], {
     encoding: "utf-8"
   }).trim();
@@ -1996,16 +2013,10 @@ function createWorktree(basePath, baseBranch, branchName) {
     });
   } catch {}
   fetchBaseBranch(repoRoot, baseBranch);
-  log.info(TAG5, `Creating worktree: ${worktreeDir} (branch: ${branchName})`);
+  const startRef = resolveWorktreeStartRef(baseBranch, branchName, opts.continueExisting ?? false, () => fetchExistingBranch(repoRoot, branchName));
+  log.info(TAG5, `Creating worktree: ${worktreeDir} (branch: ${branchName}, base: ${startRef})`);
   try {
-    execFileSync3("git", [
-      "worktree",
-      "add",
-      "-B",
-      branchName,
-      worktreeDir,
-      `origin/${baseBranch}`
-    ], { cwd: repoRoot, stdio: "pipe" });
+    execFileSync3("git", ["worktree", "add", "-B", branchName, worktreeDir, startRef], { cwd: repoRoot, stdio: "pipe" });
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     log.warn(TAG5, `worktree add failed, attempting forced recovery: ${msg}`);
@@ -2027,14 +2038,7 @@ function createWorktree(basePath, baseBranch, branchName) {
         stdio: "pipe"
       });
     } catch {}
-    execFileSync3("git", [
-      "worktree",
-      "add",
-      "-B",
-      branchName,
-      worktreeDir,
-      `origin/${baseBranch}`
-    ], { cwd: repoRoot, stdio: "pipe" });
+    execFileSync3("git", ["worktree", "add", "-B", branchName, worktreeDir, startRef], { cwd: repoRoot, stdio: "pipe" });
   }
   log.info(TAG5, "Installing dependencies in worktree...");
   try {
@@ -2307,6 +2311,12 @@ class MergeMonitor {
         log.warn(TAG7, `Failed to update card: ${err instanceof Error ? err.message : err}`);
       }
     }
+    try {
+      await this.client.updateCard(card.id, { assignedAgentId: null });
+      log.info(TAG7, `Cleared agent assignment on #${card.short_id}`);
+    } catch (err) {
+      log.warn(TAG7, `Failed to clear agent assignment on #${card.short_id}: ${err instanceof Error ? err.message : err}`);
+    }
     const branchName = extractBranchFromDescription(card.description);
     if (branchName) {
       try {
@@ -4600,7 +4610,7 @@ class ProgressTracker {
         this.transitionTo("testing");
       }
     } else if (name === "mcp__harmony__harmony_end_agent_session") {
-      this.transitionTo("finishing");
+      this.enterFinishingAndStop();
     }
     if (name === "mcp__harmony__harmony_toggle_subtask" && this.subtaskMode) {
       const val = this.extractString(input, "completed");
@@ -4659,6 +4669,14 @@ class ProgressTracker {
     this.lastAction = "";
     this.scheduleUpdate(PHASES[newPhase].label);
   }
+  enterFinishingAndStop() {
+    if (PHASE_ORDER.finishing > PHASE_ORDER[this.phase]) {
+      this.runEventSink?.recordPhaseChanged("finishing", this.phase);
+      this.phase = "finishing";
+      this.progress = Math.max(this.progress, PHASES.finishing.min);
+    }
+    this.stop();
+  }
   incrementProgress() {
     const config = PHASES[this.phase];
     const range = config.max - config.min;
@@ -7232,7 +7250,7 @@ class Worker {
         await this.holdStageCard(card, stageCtx.reason);
         return;
       }
-      this.worktreePath = createWorktree(this.config.worktree.basePath, this.config.worktree.baseBranch, this.branchName);
+      this.worktreePath = createWorktree(this.config.worktree.basePath, this.config.worktree.baseBranch, this.branchName, { continueExisting: stageCtx.kind === "run" });
       if (this.aborted)
         return;
       const enriched = {

package/dist/index.js

@@ -462,7 +462,7 @@ var init_types = __esm(() => {
       worktreeGcIntervalMs: 5 * 60000
     },
     planning: DEFAULT_PLANNING_CONFIG,
-    playbooks: { enabled: false, humanStageColumns: [] }
+    playbooks: { enabled: true, humanStageColumns: [] }
   };
 });
 
@@ -1979,7 +1979,24 @@ function fetchBaseBranch(repoRoot, baseBranch, attempts = 3, fetchImpl = (root,
   const detail = e?.stderr?.toString?.().trim() || (lastErr instanceof Error ? lastErr.message : String(lastErr));
   throw new WorktreeBaseError(`Could not fetch origin/${baseBranch} after ${attempts} attempts — ` + `refusing to build on a stale base. ${detail}`);
 }
-function createWorktree(basePath, baseBranch, branchName) {
+function resolveWorktreeStartRef(baseBranch, branchName, continueExisting, branchExistsOnRemote) {
+  if (continueExisting && branchExistsOnRemote()) {
+    return `origin/${branchName}`;
+  }
+  return `origin/${baseBranch}`;
+}
+function fetchExistingBranch(repoRoot, branchName) {
+  try {
+    execFileSync3("git", ["fetch", "origin", branchName], {
+      cwd: repoRoot,
+      stdio: "pipe"
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function createWorktree(basePath, baseBranch, branchName, opts = {}) {
   const repoRoot = execFileSync3("git", ["rev-parse", "--show-toplevel"], {
     encoding: "utf-8"
   }).trim();
@@ -1995,16 +2012,10 @@ function createWorktree(basePath, baseBranch, branchName) {
     });
   } catch {}
   fetchBaseBranch(repoRoot, baseBranch);
-  log.info(TAG5, `Creating worktree: ${worktreeDir} (branch: ${branchName})`);
+  const startRef = resolveWorktreeStartRef(baseBranch, branchName, opts.continueExisting ?? false, () => fetchExistingBranch(repoRoot, branchName));
+  log.info(TAG5, `Creating worktree: ${worktreeDir} (branch: ${branchName}, base: ${startRef})`);
   try {
-    execFileSync3("git", [
-      "worktree",
-      "add",
-      "-B",
-      branchName,
-      worktreeDir,
-      `origin/${baseBranch}`
-    ], { cwd: repoRoot, stdio: "pipe" });
+    execFileSync3("git", ["worktree", "add", "-B", branchName, worktreeDir, startRef], { cwd: repoRoot, stdio: "pipe" });
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     log.warn(TAG5, `worktree add failed, attempting forced recovery: ${msg}`);
@@ -2026,14 +2037,7 @@ function createWorktree(basePath, baseBranch, branchName) {
         stdio: "pipe"
       });
     } catch {}
-    execFileSync3("git", [
-      "worktree",
-      "add",
-      "-B",
-      branchName,
-      worktreeDir,
-      `origin/${baseBranch}`
-    ], { cwd: repoRoot, stdio: "pipe" });
+    execFileSync3("git", ["worktree", "add", "-B", branchName, worktreeDir, startRef], { cwd: repoRoot, stdio: "pipe" });
   }
   log.info(TAG5, "Installing dependencies in worktree...");
   try {
@@ -2306,6 +2310,12 @@ class MergeMonitor {
         log.warn(TAG7, `Failed to update card: ${err instanceof Error ? err.message : err}`);
       }
     }
+    try {
+      await this.client.updateCard(card.id, { assignedAgentId: null });
+      log.info(TAG7, `Cleared agent assignment on #${card.short_id}`);
+    } catch (err) {
+      log.warn(TAG7, `Failed to clear agent assignment on #${card.short_id}: ${err instanceof Error ? err.message : err}`);
+    }
     const branchName = extractBranchFromDescription(card.description);
     if (branchName) {
       try {
@@ -4599,7 +4609,7 @@ class ProgressTracker {
         this.transitionTo("testing");
       }
     } else if (name === "mcp__harmony__harmony_end_agent_session") {
-      this.transitionTo("finishing");
+      this.enterFinishingAndStop();
     }
     if (name === "mcp__harmony__harmony_toggle_subtask" && this.subtaskMode) {
       const val = this.extractString(input, "completed");
@@ -4658,6 +4668,14 @@ class ProgressTracker {
     this.lastAction = "";
     this.scheduleUpdate(PHASES[newPhase].label);
   }
+  enterFinishingAndStop() {
+    if (PHASE_ORDER.finishing > PHASE_ORDER[this.phase]) {
+      this.runEventSink?.recordPhaseChanged("finishing", this.phase);
+      this.phase = "finishing";
+      this.progress = Math.max(this.progress, PHASES.finishing.min);
+    }
+    this.stop();
+  }
   incrementProgress() {
     const config = PHASES[this.phase];
     const range = config.max - config.min;
@@ -7231,7 +7249,7 @@ class Worker {
         await this.holdStageCard(card, stageCtx.reason);
         return;
       }
-      this.worktreePath = createWorktree(this.config.worktree.basePath, this.config.worktree.baseBranch, this.branchName);
+      this.worktreePath = createWorktree(this.config.worktree.basePath, this.config.worktree.baseBranch, this.branchName, { continueExisting: stageCtx.kind === "run" });
       if (this.aborted)
         return;
       const enriched = {

package/package.json

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