@gethmy/agent 1.11.0 → 1.11.2

package/dist/cli.js

@@ -1228,7 +1228,8 @@ function fetchBaseBranch(repoRoot, baseBranch, attempts = 3, fetchImpl = (root,
       log.warn(TAG5, `fetch origin ${baseBranch} failed (attempt ${attempt}/${attempts})`);
     }
   }
-  const detail = lastErr instanceof Error ? lastErr.message : String(lastErr);
+  const e = lastErr;
+  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) {
@@ -1350,6 +1351,16 @@ var init_worktree = __esm(() => {
 import { execFileSync as execFileSync4, execSync as execSync3 } from "node:child_process";
 import { existsSync as existsSync3 } from "node:fs";
 import { resolve as resolve2 } from "node:path";
+function gitErrorDetail(err) {
+  const e = err;
+  const stderr = e?.stderr?.toString?.().trim();
+  if (stderr)
+    return stderr;
+  const stdout = e?.stdout?.toString?.().trim();
+  if (stdout)
+    return stdout;
+  return err instanceof Error ? err.message : String(err);
+}
 function checkoutExistingBranch(basePath, branchName) {
   const repoRoot = execFileSync4("git", ["rev-parse", "--show-toplevel"], {
     encoding: "utf-8"
@@ -1370,8 +1381,8 @@ function checkoutExistingBranch(basePath, branchName) {
       cwd: repoRoot,
       stdio: "pipe"
     });
-  } catch {
-    throw new Error(`Failed to fetch remote branch: ${branchName}`);
+  } catch (err) {
+    throw new Error(`Failed to fetch remote branch ${branchName}: ${gitErrorDetail(err)}`);
   }
   try {
     execFileSync4("git", ["branch", "-D", branchName], {
@@ -1380,15 +1391,19 @@ function checkoutExistingBranch(basePath, branchName) {
     });
   } catch {}
   log.info(TAG6, `Creating review worktree: ${worktreeDir} (branch: ${branchName})`);
-  execFileSync4("git", [
-    "worktree",
-    "add",
-    "--track",
-    "-b",
-    branchName,
-    worktreeDir,
-    `origin/${branchName}`
-  ], { cwd: repoRoot, stdio: "pipe" });
+  try {
+    execFileSync4("git", [
+      "worktree",
+      "add",
+      "--track",
+      "-b",
+      branchName,
+      worktreeDir,
+      `origin/${branchName}`
+    ], { cwd: repoRoot, stdio: "pipe" });
+  } catch (err) {
+    throw new Error(`Failed to create review worktree for ${branchName}: ${gitErrorDetail(err)}`);
+  }
   log.info(TAG6, "Installing dependencies in review worktree...");
   try {
     execSync3(installCommand(), {
@@ -2613,6 +2628,7 @@ async function runCompletion(client, card, branchName, worktreePath, config, wor
     reviewFindings: [],
     revertWarnings: []
   };
+  commitUncommittedChanges(worktreePath, card);
   const hasCommits = checkHasCommits(worktreePath, config.worktree.baseBranch);
   if (!hasCommits) {
     const { maxTurnsExhausted, failureSummary } = describeNoCommitFailure(sessionStats?.cost?.numTurns ?? 0, config.claude.maxTurns);
@@ -2787,6 +2803,37 @@ function readHeadSha(worktreePath) {
     return null;
   }
 }
+function commitUncommittedChanges(worktreePath, card) {
+  let status = "";
+  try {
+    status = execFileSync9("git", ["status", "--porcelain"], {
+      cwd: worktreePath,
+      encoding: "utf-8"
+    }).trim();
+  } catch (err) {
+    log.warn(TAG14, `git status failed in ${worktreePath}: ${err instanceof Error ? err.message : err}`);
+    return false;
+  }
+  if (status.length === 0)
+    return false;
+  const title = card.title?.trim() || "agent changes";
+  const message = `#${card.short_id} ${title}`;
+  try {
+    execFileSync9("git", ["add", "-A"], {
+      cwd: worktreePath,
+      encoding: "utf-8"
+    });
+    execFileSync9("git", ["commit", "-m", message], {
+      cwd: worktreePath,
+      encoding: "utf-8"
+    });
+    log.warn(TAG14, `Auto-committed uncommitted worktree changes for #${card.short_id} — agent ended without committing`);
+    return true;
+  } catch (err) {
+    log.error(TAG14, `auto-commit failed for #${card.short_id}: ${err instanceof Error ? err.message : err}`);
+    return false;
+  }
+}
 function checkHasCommits(worktreePath, baseBranch) {
   try {
     const count = execFileSync9("git", ["rev-list", "--count", `origin/${baseBranch}..HEAD`], { cwd: worktreePath, encoding: "utf-8" }).trim();
@@ -6164,6 +6211,16 @@ class Worker {
         } catch {}
         await this.recordOutcome(card.id, "failure");
       } else if (this.runId && this.aborted) {
+        try {
+          await this.client.updateCard(card.id, { assignedAgentId: null });
+        } catch (err) {
+          log.warn(this.tag, `failed to release card after stop: ${err instanceof Error ? err.message : err}`);
+        }
+        try {
+          await runTransition(this.client, card, { removeLabels: ["agent"] });
+        } catch (tErr) {
+          log.warn(this.tag, `stop label cleanup failed on #${card.short_id}: ${tErr instanceof TransitionError ? tErr.detail : tErr}`);
+        }
         try {
           await this.stateStore.endRun(this.runId, "paused", {
             errorMessage: "cancelled",
@@ -7748,7 +7805,7 @@ import { resolve as resolve3 } from "node:path";
 function isTransientGitNetworkError(message) {
   return TRANSIENT_GIT_NETWORK_ERROR.test(message);
 }
-function gitErrorDetail(err) {
+function gitErrorDetail2(err) {
   if (err && typeof err === "object" && "stderr" in err) {
     const stderr = String(err.stderr ?? "").trim();
     if (stderr)
@@ -7847,7 +7904,7 @@ function pruneFailedRemoteBranches(opts) {
       ...GIT_NETWORK_EXEC
     });
   } catch (err) {
-    const detail = gitErrorDetail(err);
+    const detail = gitErrorDetail2(err);
     if (isTransientGitNetworkError(detail)) {
       log.debug(TAG33, `Remote branch GC skipped — remote unreachable: ${detail}`);
       return result;
@@ -7899,7 +7956,7 @@ function pruneFailedRemoteBranches(opts) {
       });
       result.removed.push(ref);
     } catch (err) {
-      const detail = gitErrorDetail(err);
+      const detail = gitErrorDetail2(err);
       if (isTransientGitNetworkError(detail)) {
         log.debug(TAG33, `Remote branch GC interrupted — remote unreachable: ${detail}`);
         break;

package/dist/index.js

@@ -1227,7 +1227,8 @@ function fetchBaseBranch(repoRoot, baseBranch, attempts = 3, fetchImpl = (root,
       log.warn(TAG5, `fetch origin ${baseBranch} failed (attempt ${attempt}/${attempts})`);
     }
   }
-  const detail = lastErr instanceof Error ? lastErr.message : String(lastErr);
+  const e = lastErr;
+  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) {
@@ -1349,6 +1350,16 @@ var init_worktree = __esm(() => {
 import { execFileSync as execFileSync4, execSync as execSync3 } from "node:child_process";
 import { existsSync as existsSync3 } from "node:fs";
 import { resolve as resolve2 } from "node:path";
+function gitErrorDetail(err) {
+  const e = err;
+  const stderr = e?.stderr?.toString?.().trim();
+  if (stderr)
+    return stderr;
+  const stdout = e?.stdout?.toString?.().trim();
+  if (stdout)
+    return stdout;
+  return err instanceof Error ? err.message : String(err);
+}
 function checkoutExistingBranch(basePath, branchName) {
   const repoRoot = execFileSync4("git", ["rev-parse", "--show-toplevel"], {
     encoding: "utf-8"
@@ -1369,8 +1380,8 @@ function checkoutExistingBranch(basePath, branchName) {
       cwd: repoRoot,
       stdio: "pipe"
     });
-  } catch {
-    throw new Error(`Failed to fetch remote branch: ${branchName}`);
+  } catch (err) {
+    throw new Error(`Failed to fetch remote branch ${branchName}: ${gitErrorDetail(err)}`);
   }
   try {
     execFileSync4("git", ["branch", "-D", branchName], {
@@ -1379,15 +1390,19 @@ function checkoutExistingBranch(basePath, branchName) {
     });
   } catch {}
   log.info(TAG6, `Creating review worktree: ${worktreeDir} (branch: ${branchName})`);
-  execFileSync4("git", [
-    "worktree",
-    "add",
-    "--track",
-    "-b",
-    branchName,
-    worktreeDir,
-    `origin/${branchName}`
-  ], { cwd: repoRoot, stdio: "pipe" });
+  try {
+    execFileSync4("git", [
+      "worktree",
+      "add",
+      "--track",
+      "-b",
+      branchName,
+      worktreeDir,
+      `origin/${branchName}`
+    ], { cwd: repoRoot, stdio: "pipe" });
+  } catch (err) {
+    throw new Error(`Failed to create review worktree for ${branchName}: ${gitErrorDetail(err)}`);
+  }
   log.info(TAG6, "Installing dependencies in review worktree...");
   try {
     execSync3(installCommand(), {
@@ -2612,6 +2627,7 @@ async function runCompletion(client, card, branchName, worktreePath, config, wor
     reviewFindings: [],
     revertWarnings: []
   };
+  commitUncommittedChanges(worktreePath, card);
   const hasCommits = checkHasCommits(worktreePath, config.worktree.baseBranch);
   if (!hasCommits) {
     const { maxTurnsExhausted, failureSummary } = describeNoCommitFailure(sessionStats?.cost?.numTurns ?? 0, config.claude.maxTurns);
@@ -2786,6 +2802,37 @@ function readHeadSha(worktreePath) {
     return null;
   }
 }
+function commitUncommittedChanges(worktreePath, card) {
+  let status = "";
+  try {
+    status = execFileSync9("git", ["status", "--porcelain"], {
+      cwd: worktreePath,
+      encoding: "utf-8"
+    }).trim();
+  } catch (err) {
+    log.warn(TAG14, `git status failed in ${worktreePath}: ${err instanceof Error ? err.message : err}`);
+    return false;
+  }
+  if (status.length === 0)
+    return false;
+  const title = card.title?.trim() || "agent changes";
+  const message = `#${card.short_id} ${title}`;
+  try {
+    execFileSync9("git", ["add", "-A"], {
+      cwd: worktreePath,
+      encoding: "utf-8"
+    });
+    execFileSync9("git", ["commit", "-m", message], {
+      cwd: worktreePath,
+      encoding: "utf-8"
+    });
+    log.warn(TAG14, `Auto-committed uncommitted worktree changes for #${card.short_id} — agent ended without committing`);
+    return true;
+  } catch (err) {
+    log.error(TAG14, `auto-commit failed for #${card.short_id}: ${err instanceof Error ? err.message : err}`);
+    return false;
+  }
+}
 function checkHasCommits(worktreePath, baseBranch) {
   try {
     const count = execFileSync9("git", ["rev-list", "--count", `origin/${baseBranch}..HEAD`], { cwd: worktreePath, encoding: "utf-8" }).trim();
@@ -6163,6 +6210,16 @@ class Worker {
         } catch {}
         await this.recordOutcome(card.id, "failure");
       } else if (this.runId && this.aborted) {
+        try {
+          await this.client.updateCard(card.id, { assignedAgentId: null });
+        } catch (err) {
+          log.warn(this.tag, `failed to release card after stop: ${err instanceof Error ? err.message : err}`);
+        }
+        try {
+          await runTransition(this.client, card, { removeLabels: ["agent"] });
+        } catch (tErr) {
+          log.warn(this.tag, `stop label cleanup failed on #${card.short_id}: ${tErr instanceof TransitionError ? tErr.detail : tErr}`);
+        }
         try {
           await this.stateStore.endRun(this.runId, "paused", {
             errorMessage: "cancelled",
@@ -7747,7 +7804,7 @@ import { resolve as resolve3 } from "node:path";
 function isTransientGitNetworkError(message) {
   return TRANSIENT_GIT_NETWORK_ERROR.test(message);
 }
-function gitErrorDetail(err) {
+function gitErrorDetail2(err) {
   if (err && typeof err === "object" && "stderr" in err) {
     const stderr = String(err.stderr ?? "").trim();
     if (stderr)
@@ -7846,7 +7903,7 @@ function pruneFailedRemoteBranches(opts) {
       ...GIT_NETWORK_EXEC
     });
   } catch (err) {
-    const detail = gitErrorDetail(err);
+    const detail = gitErrorDetail2(err);
     if (isTransientGitNetworkError(detail)) {
       log.debug(TAG33, `Remote branch GC skipped — remote unreachable: ${detail}`);
       return result;
@@ -7898,7 +7955,7 @@ function pruneFailedRemoteBranches(opts) {
       });
       result.removed.push(ref);
     } catch (err) {
-      const detail = gitErrorDetail(err);
+      const detail = gitErrorDetail2(err);
       if (isTransientGitNetworkError(detail)) {
         log.debug(TAG33, `Remote branch GC interrupted — remote unreachable: ${detail}`);
         break;

package/package.json

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