@gethmy/agent 1.22.3 → 1.22.4

package/dist/cli.js

@@ -258,6 +258,25 @@ function extractBranchRef(description) {
   }
   return null;
 }
+function hasReviewableBranch(description) {
+  return extractBranchRef(description) !== null;
+}
+function hasReviewablePrLink(description) {
+  if (!description)
+    return false;
+  const m = description.match(PR_LINK_PATTERN);
+  if (!m)
+    return false;
+  try {
+    new URL(m[1]);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function qualifiesForReview(description) {
+  return hasReviewableBranch(description) || hasReviewablePrLink(description);
+}
 function hasUnsafeDaemonBranchLine(description) {
   if (!description)
     return false;
@@ -267,11 +286,12 @@ function hasUnsafeDaemonBranchLine(description) {
   }
   return false;
 }
-var BRANCH_REF_PATTERN, DAEMON_BRANCH_LINE_PATTERN, SAFE_GIT_REF_PATTERN;
+var BRANCH_REF_PATTERN, DAEMON_BRANCH_LINE_PATTERN, SAFE_GIT_REF_PATTERN, PR_LINK_PATTERN;
 var init_branchRef = __esm(() => {
   BRANCH_REF_PATTERN = /Branch:\s*`([^`]+)`/g;
   DAEMON_BRANCH_LINE_PATTERN = /^[ \t]*Branch:\s*`([^`]+)`/gm;
   SAFE_GIT_REF_PATTERN = /^[a-zA-Z0-9/_.+-]+$/;
+  PR_LINK_PATTERN = /PR:\s*(https?:\/\/[^\s)]+)/;
 });
 
 // ../harmony-shared/dist/cardLinks.js
@@ -2627,6 +2647,7 @@ function createWorktree(basePath, baseBranch, branchName, opts = {}) {
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     log.warn(TAG6, `worktree add failed, attempting forced recovery: ${msg}`);
+    removeWorktreeHoldingBranch(repoRoot, branchName, worktreeDir);
     try {
       execFileSync3("git", ["worktree", "remove", worktreeDir, "--force"], {
         cwd: repoRoot,
@@ -2699,6 +2720,54 @@ function cleanupWorktree(worktreePath, branchName) {
     } catch {}
   }
 }
+function removeWorktreeHoldingBranch(repoRoot, branchName, exceptDir) {
+  let listing;
+  try {
+    listing = execFileSync3("git", ["worktree", "list", "--porcelain"], {
+      cwd: repoRoot,
+      encoding: "utf-8",
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+  } catch {
+    return null;
+  }
+  const target = `refs/heads/${branchName}`;
+  let currentPath = null;
+  let holderPath = null;
+  for (const line of listing.split(`
+`)) {
+    if (line.startsWith("worktree ")) {
+      currentPath = line.slice("worktree ".length).trim();
+    } else if (line.startsWith("branch ")) {
+      const ref = line.slice("branch ".length).trim();
+      if (ref === target && currentPath) {
+        holderPath = currentPath;
+        break;
+      }
+    }
+  }
+  if (!holderPath)
+    return null;
+  if (exceptDir && resolve(holderPath) === resolve(exceptDir))
+    return null;
+  try {
+    execFileSync3("git", ["worktree", "remove", holderPath, "--force"], {
+      cwd: repoRoot,
+      stdio: "pipe"
+    });
+    log.warn(TAG6, `Evicted worktree ${holderPath} holding branch ${branchName} so it can be reused (#732)`);
+  } catch (err) {
+    log.warn(TAG6, `Failed to evict worktree ${holderPath} holding ${branchName}: ${err instanceof Error ? err.message : err}`);
+    return null;
+  }
+  try {
+    execFileSync3("git", ["worktree", "prune", "--expire=now"], {
+      cwd: repoRoot,
+      stdio: "pipe"
+    });
+  } catch {}
+  return holderPath;
+}
 function resolveRepoRoot() {
   return execFileSync3("git", ["rev-parse", "--show-toplevel"], {
     encoding: "utf-8"
@@ -2814,6 +2883,7 @@ function checkoutExistingBranch(basePath, branchName) {
   } catch (err) {
     throw new Error(`Failed to fetch remote branch ${branchName}: ${gitErrorDetail(err)}`);
   }
+  removeWorktreeHoldingBranch(repoRoot, branchName, worktreeDir);
   try {
     execFileSync4("git", ["branch", "-D", branchName], {
       cwd: repoRoot,
@@ -2854,7 +2924,7 @@ function extractBranchFromDescription(description) {
   return branch;
 }
 function qualifiesForAutoReview(description) {
-  return Boolean(extractBranchFromDescription(description) || extractPrUrl(description ?? null));
+  return qualifiesForReview(description);
 }
 async function resolveReviewBranch(description, cwd) {
   const fromLine = extractBranchFromDescription(description);
@@ -6404,8 +6474,16 @@ class StateStore {
       const raw = readFileSync4(this.path, "utf-8");
       const parsed = JSON.parse(raw);
       if (parsed?.version !== SCHEMA_VERSION) {
-        log.warn(TAG21, `state file has version ${parsed?.version}, expected ${SCHEMA_VERSION} — starting fresh`);
-        return emptyState();
+        log.warn(TAG21, `state file has version ${parsed?.version}, expected ${SCHEMA_VERSION} — migrating (preserving card budget/attempts, dropping in-flight runs)`);
+        return {
+          version: SCHEMA_VERSION,
+          daemonId: null,
+          daemonPid: null,
+          daemonStartedAt: null,
+          runs: [],
+          cards: parsed.cards ?? [],
+          daily: parsed.daily ?? []
+        };
       }
       return {
         version: SCHEMA_VERSION,
@@ -7749,6 +7827,20 @@ var init_cli_agent_runner = __esm(() => {
 });
 
 // src/prompt.ts
+function renderPreviousAttemptsSection(failures) {
+  if (failures.length === 0)
+    return "";
+  const lines = failures.map((f) => {
+    const tag = f.reason ? `[${f.reason}] ` : "";
+    return `- ${tag}${f.summary}`;
+  });
+  return [
+    "## Previous attempt feedback",
+    "This is a re-attempt on the branch your last run already pushed — build on that existing work and FIX the issues below. Do NOT reimplement from scratch or revert the prior commits.",
+    ...lines
+  ].join(`
+`);
+}
 async function buildPrompt(enriched, branchName, worktreePath, client, workspaceId, projectId) {
   const { card } = enriched;
   const pastEpisodesSection = await renderPastEpisodesSection(client, card.title, card.description ?? "", workspaceId, projectId);
@@ -8257,6 +8349,14 @@ class Worker {
       this.heartbeatTimer = null;
     }
   }
+  captureCliSessionId(sessionId) {
+    if (!sessionId || sessionId === this.cliSessionId)
+      return;
+    this.cliSessionId = sessionId;
+    if (this.runId) {
+      this.stateStore.updateRun(this.runId, { cliSessionId: sessionId }).catch(() => {});
+    }
+  }
   async recordPhase(phase) {
     if (!this.runId)
       return;
@@ -8308,7 +8408,8 @@ class Worker {
       this.state = "preparing";
       this.branchName = makeBranchName(card.short_id, card.title, this.config.worktree.failedBranchPrefix);
       log.info(this.tag, `Preparing #${card.short_id} "${card.title}"`);
-      await this.stateStore.incrementAttempt(card.id);
+      const attemptCount = await this.stateStore.incrementAttempt(card.id);
+      const isRework = attemptCount > 1;
       this.startHeartbeat();
       await this.stateStore.insertRun({
         runId: this.runId,
@@ -8361,7 +8462,7 @@ class Worker {
         await this.holdStageCard(card, stageCtx.reason);
         return;
       }
-      this.worktreePath = createWorktree(this.config.worktree.basePath, this.config.worktree.baseBranch, this.branchName, { continueExisting: stageCtx.kind === "run" });
+      this.worktreePath = createWorktree(this.config.worktree.basePath, this.config.worktree.baseBranch, this.branchName, { continueExisting: stageCtx.kind === "run" || isRework });
       if (this.aborted)
         return;
       const enriched = {
@@ -8413,6 +8514,12 @@ class Worker {
             mode: loop.mode
           });
         }
+      } else if (isRework) {
+        const digest = renderPreviousAttemptsSection(this.stateStore.getRecentFailures(card.id, 3));
+        if (digest)
+          prompt = `${digest}
+
+${basePrompt}`;
       }
       await this.client.updateAgentProgress(card.id, {
         agentIdentifier: agentIdentifier(this.id),
@@ -9214,6 +9321,7 @@ class Worker {
       }
       parser.on("text", (content) => {
         this.lastRunText += content;
+        this.captureCliSessionId(parser.sessionId);
       });
       parser.on("parse_error", (msg) => {
         log.debug(this.tag, `Stream parse error (non-fatal): ${msg}`);
@@ -9232,8 +9340,7 @@ class Worker {
       this.process.on("close", (code) => {
         const leaderPid = this.process?.pid;
         this.process = null;
-        if (parser.sessionId)
-          this.cliSessionId = parser.sessionId;
+        this.captureCliSessionId(parser.sessionId);
         this.lastSessionStats = this.progressTracker?.stats;
         const spawnCost = this.lastSessionStats?.cost;
         if (spawnCost) {
@@ -9325,7 +9432,7 @@ class Worker {
 `);
       }
     } finally {
-      this.cliSessionId = runner.sessionId ?? this.cliSessionId;
+      this.captureCliSessionId(runner.sessionId);
       this.lastSessionStats = this.progressTracker?.stats;
       const spawnCost = this.lastSessionStats?.cost;
       if (spawnCost) {
@@ -9815,11 +9922,13 @@ async function recoverOrphans(store, client, config) {
       continue;
     }
     log.info(TAG33, `recovering ${run.pipeline} run ${run.runId} for card #${run.cardShortId}`);
-    await recoverRun(run, store, client, config, outcome);
+    await recoverRun(run, store, client, config, outcome, {
+      rollbackAttempt: true
+    });
   }
   return outcomes;
 }
-async function recoverRun(run, store, client, config, outcome) {
+async function recoverRun(run, store, client, config, outcome, opts = {}) {
   try {
     await client.endAgentSession(run.cardId, {
       status: "failed",
@@ -9875,6 +9984,15 @@ async function recoverRun(run, store, client, config, outcome) {
     const msg = err instanceof Error ? err.message : String(err);
     outcome.errors.push(`endRun: ${msg}`);
   }
+  if (opts.rollbackAttempt && run.pipeline === "implement") {
+    try {
+      await store.decrementAttempt(run.cardId);
+      outcome.actions.push("rolled back give-up attempt (daemon restart)");
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      outcome.errors.push(`decrementAttempt: ${msg}`);
+    }
+  }
   log.info(TAG33, `recovered run ${run.runId} (card #${run.cardShortId}): ${outcome.actions.join(", ")}${outcome.errors.length ? ` | errors: ${outcome.errors.join("; ")}` : ""}`);
 }
 var TAG33 = "recovery", RECOVERED_LABEL = "agent-recovered", RECOVERED_LABEL_COLOR = "#f59e0b";
@@ -10040,7 +10158,7 @@ class Reconciler {
         pipeline: run.pipeline,
         actions: [],
         errors: []
-      });
+      }, { rollbackAttempt: daemonDead });
     }
   }
   async recoverStrandedInProgress(cards, columns, knownCardIds) {

package/dist/index.js

@@ -257,6 +257,25 @@ function extractBranchRef(description) {
   }
   return null;
 }
+function hasReviewableBranch(description) {
+  return extractBranchRef(description) !== null;
+}
+function hasReviewablePrLink(description) {
+  if (!description)
+    return false;
+  const m = description.match(PR_LINK_PATTERN);
+  if (!m)
+    return false;
+  try {
+    new URL(m[1]);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function qualifiesForReview(description) {
+  return hasReviewableBranch(description) || hasReviewablePrLink(description);
+}
 function hasUnsafeDaemonBranchLine(description) {
   if (!description)
     return false;
@@ -266,11 +285,12 @@ function hasUnsafeDaemonBranchLine(description) {
   }
   return false;
 }
-var BRANCH_REF_PATTERN, DAEMON_BRANCH_LINE_PATTERN, SAFE_GIT_REF_PATTERN;
+var BRANCH_REF_PATTERN, DAEMON_BRANCH_LINE_PATTERN, SAFE_GIT_REF_PATTERN, PR_LINK_PATTERN;
 var init_branchRef = __esm(() => {
   BRANCH_REF_PATTERN = /Branch:\s*`([^`]+)`/g;
   DAEMON_BRANCH_LINE_PATTERN = /^[ \t]*Branch:\s*`([^`]+)`/gm;
   SAFE_GIT_REF_PATTERN = /^[a-zA-Z0-9/_.+-]+$/;
+  PR_LINK_PATTERN = /PR:\s*(https?:\/\/[^\s)]+)/;
 });
 
 // ../harmony-shared/dist/cardLinks.js
@@ -2626,6 +2646,7 @@ function createWorktree(basePath, baseBranch, branchName, opts = {}) {
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     log.warn(TAG6, `worktree add failed, attempting forced recovery: ${msg}`);
+    removeWorktreeHoldingBranch(repoRoot, branchName, worktreeDir);
     try {
       execFileSync3("git", ["worktree", "remove", worktreeDir, "--force"], {
         cwd: repoRoot,
@@ -2698,6 +2719,54 @@ function cleanupWorktree(worktreePath, branchName) {
     } catch {}
   }
 }
+function removeWorktreeHoldingBranch(repoRoot, branchName, exceptDir) {
+  let listing;
+  try {
+    listing = execFileSync3("git", ["worktree", "list", "--porcelain"], {
+      cwd: repoRoot,
+      encoding: "utf-8",
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+  } catch {
+    return null;
+  }
+  const target = `refs/heads/${branchName}`;
+  let currentPath = null;
+  let holderPath = null;
+  for (const line of listing.split(`
+`)) {
+    if (line.startsWith("worktree ")) {
+      currentPath = line.slice("worktree ".length).trim();
+    } else if (line.startsWith("branch ")) {
+      const ref = line.slice("branch ".length).trim();
+      if (ref === target && currentPath) {
+        holderPath = currentPath;
+        break;
+      }
+    }
+  }
+  if (!holderPath)
+    return null;
+  if (exceptDir && resolve(holderPath) === resolve(exceptDir))
+    return null;
+  try {
+    execFileSync3("git", ["worktree", "remove", holderPath, "--force"], {
+      cwd: repoRoot,
+      stdio: "pipe"
+    });
+    log.warn(TAG6, `Evicted worktree ${holderPath} holding branch ${branchName} so it can be reused (#732)`);
+  } catch (err) {
+    log.warn(TAG6, `Failed to evict worktree ${holderPath} holding ${branchName}: ${err instanceof Error ? err.message : err}`);
+    return null;
+  }
+  try {
+    execFileSync3("git", ["worktree", "prune", "--expire=now"], {
+      cwd: repoRoot,
+      stdio: "pipe"
+    });
+  } catch {}
+  return holderPath;
+}
 function resolveRepoRoot() {
   return execFileSync3("git", ["rev-parse", "--show-toplevel"], {
     encoding: "utf-8"
@@ -2813,6 +2882,7 @@ function checkoutExistingBranch(basePath, branchName) {
   } catch (err) {
     throw new Error(`Failed to fetch remote branch ${branchName}: ${gitErrorDetail(err)}`);
   }
+  removeWorktreeHoldingBranch(repoRoot, branchName, worktreeDir);
   try {
     execFileSync4("git", ["branch", "-D", branchName], {
       cwd: repoRoot,
@@ -2853,7 +2923,7 @@ function extractBranchFromDescription(description) {
   return branch;
 }
 function qualifiesForAutoReview(description) {
-  return Boolean(extractBranchFromDescription(description) || extractPrUrl(description ?? null));
+  return qualifiesForReview(description);
 }
 async function resolveReviewBranch(description, cwd) {
   const fromLine = extractBranchFromDescription(description);
@@ -6403,8 +6473,16 @@ class StateStore {
       const raw = readFileSync4(this.path, "utf-8");
       const parsed = JSON.parse(raw);
       if (parsed?.version !== SCHEMA_VERSION) {
-        log.warn(TAG21, `state file has version ${parsed?.version}, expected ${SCHEMA_VERSION} — starting fresh`);
-        return emptyState();
+        log.warn(TAG21, `state file has version ${parsed?.version}, expected ${SCHEMA_VERSION} — migrating (preserving card budget/attempts, dropping in-flight runs)`);
+        return {
+          version: SCHEMA_VERSION,
+          daemonId: null,
+          daemonPid: null,
+          daemonStartedAt: null,
+          runs: [],
+          cards: parsed.cards ?? [],
+          daily: parsed.daily ?? []
+        };
       }
       return {
         version: SCHEMA_VERSION,
@@ -7748,6 +7826,20 @@ var init_cli_agent_runner = __esm(() => {
 });
 
 // src/prompt.ts
+function renderPreviousAttemptsSection(failures) {
+  if (failures.length === 0)
+    return "";
+  const lines = failures.map((f) => {
+    const tag = f.reason ? `[${f.reason}] ` : "";
+    return `- ${tag}${f.summary}`;
+  });
+  return [
+    "## Previous attempt feedback",
+    "This is a re-attempt on the branch your last run already pushed — build on that existing work and FIX the issues below. Do NOT reimplement from scratch or revert the prior commits.",
+    ...lines
+  ].join(`
+`);
+}
 async function buildPrompt(enriched, branchName, worktreePath, client, workspaceId, projectId) {
   const { card } = enriched;
   const pastEpisodesSection = await renderPastEpisodesSection(client, card.title, card.description ?? "", workspaceId, projectId);
@@ -8256,6 +8348,14 @@ class Worker {
       this.heartbeatTimer = null;
     }
   }
+  captureCliSessionId(sessionId) {
+    if (!sessionId || sessionId === this.cliSessionId)
+      return;
+    this.cliSessionId = sessionId;
+    if (this.runId) {
+      this.stateStore.updateRun(this.runId, { cliSessionId: sessionId }).catch(() => {});
+    }
+  }
   async recordPhase(phase) {
     if (!this.runId)
       return;
@@ -8307,7 +8407,8 @@ class Worker {
       this.state = "preparing";
       this.branchName = makeBranchName(card.short_id, card.title, this.config.worktree.failedBranchPrefix);
       log.info(this.tag, `Preparing #${card.short_id} "${card.title}"`);
-      await this.stateStore.incrementAttempt(card.id);
+      const attemptCount = await this.stateStore.incrementAttempt(card.id);
+      const isRework = attemptCount > 1;
       this.startHeartbeat();
       await this.stateStore.insertRun({
         runId: this.runId,
@@ -8360,7 +8461,7 @@ class Worker {
         await this.holdStageCard(card, stageCtx.reason);
         return;
       }
-      this.worktreePath = createWorktree(this.config.worktree.basePath, this.config.worktree.baseBranch, this.branchName, { continueExisting: stageCtx.kind === "run" });
+      this.worktreePath = createWorktree(this.config.worktree.basePath, this.config.worktree.baseBranch, this.branchName, { continueExisting: stageCtx.kind === "run" || isRework });
       if (this.aborted)
         return;
       const enriched = {
@@ -8412,6 +8513,12 @@ class Worker {
             mode: loop.mode
           });
         }
+      } else if (isRework) {
+        const digest = renderPreviousAttemptsSection(this.stateStore.getRecentFailures(card.id, 3));
+        if (digest)
+          prompt = `${digest}
+
+${basePrompt}`;
       }
       await this.client.updateAgentProgress(card.id, {
         agentIdentifier: agentIdentifier(this.id),
@@ -9213,6 +9320,7 @@ class Worker {
       }
       parser.on("text", (content) => {
         this.lastRunText += content;
+        this.captureCliSessionId(parser.sessionId);
       });
       parser.on("parse_error", (msg) => {
         log.debug(this.tag, `Stream parse error (non-fatal): ${msg}`);
@@ -9231,8 +9339,7 @@ class Worker {
       this.process.on("close", (code) => {
         const leaderPid = this.process?.pid;
         this.process = null;
-        if (parser.sessionId)
-          this.cliSessionId = parser.sessionId;
+        this.captureCliSessionId(parser.sessionId);
         this.lastSessionStats = this.progressTracker?.stats;
         const spawnCost = this.lastSessionStats?.cost;
         if (spawnCost) {
@@ -9324,7 +9431,7 @@ class Worker {
 `);
       }
     } finally {
-      this.cliSessionId = runner.sessionId ?? this.cliSessionId;
+      this.captureCliSessionId(runner.sessionId);
       this.lastSessionStats = this.progressTracker?.stats;
       const spawnCost = this.lastSessionStats?.cost;
       if (spawnCost) {
@@ -9814,11 +9921,13 @@ async function recoverOrphans(store, client, config) {
       continue;
     }
     log.info(TAG33, `recovering ${run.pipeline} run ${run.runId} for card #${run.cardShortId}`);
-    await recoverRun(run, store, client, config, outcome);
+    await recoverRun(run, store, client, config, outcome, {
+      rollbackAttempt: true
+    });
   }
   return outcomes;
 }
-async function recoverRun(run, store, client, config, outcome) {
+async function recoverRun(run, store, client, config, outcome, opts = {}) {
   try {
     await client.endAgentSession(run.cardId, {
       status: "failed",
@@ -9874,6 +9983,15 @@ async function recoverRun(run, store, client, config, outcome) {
     const msg = err instanceof Error ? err.message : String(err);
     outcome.errors.push(`endRun: ${msg}`);
   }
+  if (opts.rollbackAttempt && run.pipeline === "implement") {
+    try {
+      await store.decrementAttempt(run.cardId);
+      outcome.actions.push("rolled back give-up attempt (daemon restart)");
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      outcome.errors.push(`decrementAttempt: ${msg}`);
+    }
+  }
   log.info(TAG33, `recovered run ${run.runId} (card #${run.cardShortId}): ${outcome.actions.join(", ")}${outcome.errors.length ? ` | errors: ${outcome.errors.join("; ")}` : ""}`);
 }
 var TAG33 = "recovery", RECOVERED_LABEL = "agent-recovered", RECOVERED_LABEL_COLOR = "#f59e0b";
@@ -10039,7 +10157,7 @@ class Reconciler {
         pipeline: run.pipeline,
         actions: [],
         errors: []
-      });
+      }, { rollbackAttempt: daemonDead });
     }
   }
   async recoverStrandedInProgress(cards, columns, knownCardIds) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethmy/agent",
-  "version": "1.22.3",
+  "version": "1.22.4",
   "description": "Push-based agent daemon for Harmony — watches board assignments and spawns Claude CLI workers",
   "type": "module",
   "main": "dist/index.js",
@@ -46,7 +46,7 @@
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.3.178",
     "@supabase/supabase-js": "2.95.3",
-    "@gethmy/mcp": "2.19.0"
+    "@gethmy/mcp": "2.20.0"
   },
   "devDependencies": {
     "@harmony/shared": "workspace:*",