@gethmy/agent 1.10.2 → 1.10.4

package/dist/cli.js

@@ -397,8 +397,17 @@ var init_types = __esm(() => {
     },
     claude: {
       model: "opus",
+      escalateModel: "claude-fable-5",
+      escalateAfterAttempts: 2,
+      tiers: {
+        simple: "claude-haiku-4-5",
+        advanced: "claude-sonnet-4-6",
+        research: "claude-opus-4-8"
+      },
       reviewModel: "sonnet",
-      maxTurns: 200,
+      maxTurns: 80,
+      reviewMaxTurns: 60,
+      leanSettingSources: "local,user",
       additionalArgs: []
     },
     worktree: {
@@ -2007,6 +2016,54 @@ function parseNumstat(raw, maxFiles = MAX_CHANGED_FILES2) {
   }
   return { files, insertions, deletions };
 }
+function summarizeUnifiedDiff(diff) {
+  const files = [];
+  let current = null;
+  let totalAdded = 0;
+  let totalRemoved = 0;
+  for (const line of diff.split(`
+`)) {
+    if (line.startsWith("diff --git")) {
+      const m = line.match(/ b\/(.+)$/);
+      current = {
+        path: m ? m[1] : line.slice("diff --git ".length),
+        added: 0,
+        removed: 0
+      };
+      files.push(current);
+      continue;
+    }
+    if (!current)
+      continue;
+    if (line.startsWith("+++") || line.startsWith("---"))
+      continue;
+    if (line.startsWith("+")) {
+      current.added++;
+      totalAdded++;
+    } else if (line.startsWith("-")) {
+      current.removed++;
+      totalRemoved++;
+    }
+  }
+  return { files, totalAdded, totalRemoved };
+}
+function formatDiffSummary(diff, maxFiles = 100) {
+  const trimmed = diff.trim();
+  if (!trimmed || diff === "(unable to retrieve diff)") {
+    return trimmed ? diff : "(no diff available)";
+  }
+  const { files, totalAdded, totalRemoved } = summarizeUnifiedDiff(diff);
+  if (files.length === 0)
+    return "(no file changes detected in diff)";
+  const shown = files.slice(0, maxFiles);
+  const lines = shown.map((f) => ` ${f.path} | +${f.added} -${f.removed}`);
+  if (files.length > maxFiles) {
+    lines.push(` ... and ${files.length - maxFiles} more file(s)`);
+  }
+  lines.push(` ${files.length} file(s) changed, ${totalAdded} insertion(s)(+), ${totalRemoved} deletion(s)(-)`);
+  return lines.join(`
+`);
+}
 function captureDiffStat(worktreePath, baseBranch, maxFiles = MAX_CHANGED_FILES2) {
   try {
     const raw = execFileSync5("git", ["diff", "--numstat", `${baseBranch}...HEAD`], { cwd: worktreePath, encoding: "utf-8", timeout: 30000 });
@@ -2123,7 +2180,17 @@ async function runDeepReview(worktreePath, config, workerId) {
       "```"
     ].join(`
 `);
-    const output = execFileSync6("claude", ["--print", "--model", "sonnet", "--max-turns", "10", "--", reviewPrompt], {
+    const leanSources = config.claude.leanSettingSources;
+    const output = execFileSync6("claude", [
+      "--print",
+      "--model",
+      "sonnet",
+      "--max-turns",
+      "10",
+      ...leanSources ? ["--setting-sources", leanSources] : [],
+      "--",
+      reviewPrompt
+    ], {
       cwd: worktreePath,
       encoding: "utf-8",
       timeout: config.verification.timeout,
@@ -2154,6 +2221,7 @@ function attemptAutoFix(worktreePath, config, errors) {
     "```"
   ].join(`
 `);
+  const leanSources = config.claude.leanSettingSources;
   const args = [
     "--print",
     "--model",
@@ -2162,6 +2230,7 @@ function attemptAutoFix(worktreePath, config, errors) {
     "50",
     "--allowedTools",
     "Bash,Read,Write,Edit,Glob,Grep",
+    ...leanSources ? ["--setting-sources", leanSources] : [],
     "--",
     fixPrompt
   ];
@@ -3368,7 +3437,133 @@ var init_review_completion = __esm(() => {
   init_worktree();
 });
 
-// src/review-knowledge.ts
+// ../harmony-shared/dist/cardLinks.js
+var init_cardLinks = () => {};
+// ../harmony-shared/dist/classification.js
+function escalateTier(tier) {
+  const i = MODEL_TIERS.indexOf(tier);
+  return MODEL_TIERS[Math.min(i + 1, MODEL_TIERS.length - 1)];
+}
+function isModelTier(v) {
+  return typeof v === "string" && MODEL_TIERS.includes(v);
+}
+var MODEL_TIERS;
+var init_classification = __esm(() => {
+  MODEL_TIERS = ["simple", "advanced", "research"];
+});
+
+// ../harmony-shared/dist/commentSerializer.js
+function sanitizeHeaderField(value) {
+  return value.replace(/[\]\r\n|<>]/g, " ").trim() || "—";
+}
+function authorLabel(c) {
+  if (c.author_type === "agent")
+    return "AI agent";
+  const raw = c.author?.full_name || "teammate";
+  return sanitizeHeaderField(raw);
+}
+function criticalIds(comments) {
+  const keep = new Set;
+  for (const c of comments) {
+    if (c.comment_type === "decision")
+      keep.add(c.id);
+    if (c.supersedes_id) {
+      keep.add(c.id);
+      keep.add(c.supersedes_id);
+    }
+    if (c.confirms_id) {
+      keep.add(c.id);
+      keep.add(c.confirms_id);
+    }
+  }
+  return keep;
+}
+function serializeCommentThread(comments, options = {}) {
+  const { heading = "Conversation", includeInstructions = true, activity = [], maxComments } = options;
+  const visible = comments.filter((c) => !c.deleted_at).slice().sort((a, b) => a.created_at.localeCompare(b.created_at));
+  if (visible.length === 0)
+    return "";
+  const indexById = new Map;
+  visible.forEach((c, i) => {
+    indexById.set(c.id, i + 1);
+  });
+  let rendered = visible;
+  let elidedCount = 0;
+  if (maxComments && visible.length > maxComments) {
+    const keep = criticalIds(visible);
+    const recentThreshold = visible.length - maxComments;
+    rendered = visible.filter((c, i) => i >= recentThreshold || keep.has(c.id));
+    elidedCount = visible.length - rendered.length;
+  }
+  const ref = (id) => {
+    const n = indexById.get(id);
+    return n ? `#${n}` : `#${id.slice(0, 8)}`;
+  };
+  const lines = [];
+  if (elidedCount > 0) {
+    lines.push({
+      at: visible[0]?.created_at ?? "",
+      text: `(${elidedCount} earlier comment(s) omitted for brevity)`
+    });
+  }
+  for (const c of rendered) {
+    const tags = [];
+    if (c.edited_at)
+      tags.push("edited");
+    if (c.supersedes_id)
+      tags.push(`supersedes ${ref(c.supersedes_id)}`);
+    if (c.confirms_id)
+      tags.push(`confirms ${ref(c.confirms_id)}`);
+    if (c.resolved_at)
+      tags.push("resolved");
+    const tagStr = tags.length ? ` | ${tags.join(" | ")}` : "";
+    const header = `[${sanitizeHeaderField(ref(c.id))} | ${sanitizeHeaderField(c.author_type)} | ${authorLabel(c)} | ${sanitizeHeaderField(c.comment_type)} | ${sanitizeHeaderField(c.created_at)}${tagStr}]`;
+    const fencedBody = c.body.trim().replaceAll("<", "&lt;").replaceAll(">", "&gt;");
+    lines.push({
+      at: c.created_at,
+      text: `${header}
+<comment-body>
+${fencedBody}
+</comment-body>`
+    });
+  }
+  for (const a of activity) {
+    const actor = a.actor ? `${a.actor} ` : "";
+    lines.push({ at: a.at, text: `· (system) ${a.at} — ${actor}${a.text}` });
+  }
+  lines.sort((a, b) => a.at.localeCompare(b.at));
+  const body = lines.map((l) => l.text).join(`
+
+`);
+  const instruction = includeInstructions ? `
+
+${CONFLICT_INSTRUCTION}` : "";
+  return `## ${heading} (oldest → newest)
+
+${body}${instruction}`;
+}
+var CONFLICT_INSTRUCTION;
+var init_commentSerializer = __esm(() => {
+  CONFLICT_INSTRUCTION = "When two comments conflict, prefer the latest created_at, UNLESS a later " + "comment explicitly confirms or restates the earlier finding. Evaluate " + "substance, not just recency. Cite the comment id(s) you relied on.";
+});
+
+// ../harmony-shared/dist/constants.js
+var TIMINGS;
+var init_constants = __esm(() => {
+  TIMINGS = {
+    SEARCH_DEBOUNCE: 300,
+    AUTOSAVE_DEBOUNCE: 1000,
+    TOAST_DURATION: 3000,
+    QUERY_STALE_TIME: 1000 * 60 * 5,
+    QUERY_GC_TIME: 1000 * 60 * 60 * 24
+  };
+});
+// ../harmony-shared/dist/logger.js
+var init_logger = () => {};
+// ../harmony-shared/dist/projectTemplates.js
+var init_projectTemplates = () => {};
+
+// ../harmony-shared/dist/reviewMethodology.js
 var REVIEW_SYSTEM_PROMPT = `You are a senior code reviewer. Follow this two-pass methodology strictly.
 Report findings; do NOT fix them. This is a read-only review.
 
@@ -3444,7 +3639,42 @@ For each page affected by the changes:
 - Use snapshot for navigation — client-side routes may not appear in link lists.
 - Check for stale state: navigate away and back — does data refresh correctly?
 - Test browser back/forward — does the app handle history correctly?
-- Watch for hydration errors or layout shifts after dynamic content loads.`;
+- Watch for hydration errors or layout shifts after dynamic content loads.`, REVIEW_VERDICT_SCHEMA = `{
+  "verdict": "approved" | "rejected",
+  "summary": "Brief overall assessment",
+  "scopeCheck": {
+    "status": "clean" | "drift" | "missing",
+    "notes": "Optional explanation of scope issues"
+  },
+  "findings": [
+    {
+      "severity": "critical" | "major" | "minor",
+      "category": "sql-safety | race-condition | llm-trust | enum-completeness | visual | functional | ux | console | scope | other",
+      "title": "Short title",
+      "description": "Detailed description of the issue",
+      "location": "file:line (if applicable)"
+    }
+  ]
+}`, REVIEW_DECISION_RULES = `- **rejected**: Any \`critical\` finding, unaddressed requirements, or 2+ \`major\` findings.
+- **approved**: No critical findings, at most 1 major finding with minor findings OK.`;
+// ../harmony-shared/dist/types.js
+var init_types2 = () => {};
+
+// ../harmony-shared/dist/index.js
+var init_dist = __esm(() => {
+  init_cardLinks();
+  init_classification();
+  init_commentSerializer();
+  init_constants();
+  init_logger();
+  init_projectTemplates();
+  init_types2();
+});
+
+// src/review-knowledge.ts
+var init_review_knowledge = __esm(() => {
+  init_dist();
+});
 
 // src/review-prompt.ts
 function buildReviewSystemPrompt() {
@@ -3455,15 +3685,13 @@ ${REVIEW_SYSTEM_PROMPT}
 
 ${QA_VISUAL_CHECKLIST}`;
 }
-function buildReviewUserPrompt(enriched, branchName, worktreePath, previewUrl, diff, baseBranch) {
+function buildReviewUserPrompt(enriched, branchName, worktreePath, previewUrl, diffSummary, baseBranch) {
   const { card, labels, subtasks } = enriched;
   const labelStr = labels.length > 0 ? labels.map((l) => l.name).join(", ") : "none";
   const subtaskStr = subtasks.length > 0 ? subtasks.map((s) => `- [${s.completed ? "x" : " "}] ${s.title}`).join(`
 `) : "No subtasks defined.";
   const description = card.description?.trim() || "No description provided.";
-  const truncatedDiff = diff.length > 80000 ? `${diff.slice(0, 80000)}
-
-... (diff truncated at 80K characters)` : diff;
+  const diffRange = branchName ? `origin/${baseBranch}..HEAD` : "HEAD";
   const branchLine = branchName ? `**Branch**: ${branchName}` : `**Mode**: Local review (no branch — reviewing working tree changes)`;
   return `## Card: #${card.short_id} - ${card.title}
 **Labels**: ${labelStr}
@@ -3475,10 +3703,15 @@ ${description}
 ## Subtasks (Acceptance Criteria)
 ${subtaskStr}
 
-## Diff ${branchName ? `(origin/${baseBranch}..HEAD)` : "(local changes)"}
-\`\`\`diff
-${truncatedDiff}
+## Changed Files (git diff --stat ${diffRange})
 \`\`\`
+${diffSummary}
+\`\`\`
+
+The full diff is intentionally NOT inlined here. Inspect the changes yourself —
+you have Read, Grep, Glob, and read-only Bash:
+- Run \`git diff ${diffRange}\` (or \`git diff ${diffRange} -- <file>\`) for the full hunks.
+- Read / Grep the changed files above and trace new values through their consumers.
 
 ## Review Steps
 
@@ -3509,33 +3742,18 @@ Use the \`/browse\` skill to navigate to ${previewUrl} and apply the visual QA c
 After completing all steps, output EXACTLY one JSON block (and nothing else after it):
 
 \`\`\`json
-{
-  "verdict": "approved" | "rejected",
-  "summary": "Brief overall assessment",
-  "scopeCheck": {
-    "status": "clean" | "drift" | "missing",
-    "notes": "Optional explanation of scope issues"
-  },
-  "findings": [
-    {
-      "severity": "critical" | "major" | "minor",
-      "category": "sql-safety | race-condition | llm-trust | enum-completeness | visual | functional | ux | console | scope | other",
-      "title": "Short title",
-      "description": "Detailed description of the issue",
-      "location": "file:line (if applicable)"
-    }
-  ]
-}
+${REVIEW_VERDICT_SCHEMA}
 \`\`\`
 
 **Decision rules:**
-- **rejected**: Any \`critical\` finding, unaddressed requirements, or 2+ \`major\` findings.
-- **approved**: No critical findings, at most 1 major finding with minor findings OK.
+${REVIEW_DECISION_RULES}
 
 **Do NOT modify any code.** This is a read-only review.
 ${branchName ? `You are reviewing code in a git worktree at \`${worktreePath}\` on branch \`${branchName}\`.` : `You are reviewing local changes in the repository at \`${worktreePath}\`.`}`;
 }
-var init_review_prompt = () => {};
+var init_review_prompt = __esm(() => {
+  init_review_knowledge();
+});
 
 // src/run-log.ts
 import { createWriteStream, mkdirSync } from "node:fs";
@@ -4239,6 +4457,7 @@ class ReviewWorker {
       } catch {
         diff = "(unable to retrieve diff)";
       }
+      const diffSummary = formatDiffSummary(diff);
       const previewUrl = `http://localhost:${port}`;
       const enriched = {
         card,
@@ -4248,7 +4467,7 @@ class ReviewWorker {
         mode: "review"
       };
       const systemPrompt = buildReviewSystemPrompt();
-      const userPrompt = buildReviewUserPrompt(enriched, this.branchName, cwd, previewUrl, diff, this.config.worktree.baseBranch);
+      const userPrompt = buildReviewUserPrompt(enriched, this.branchName, cwd, previewUrl, diffSummary, this.config.worktree.baseBranch);
       try {
         await this.client.recordPromptHistory({
           cardId: card.id,
@@ -4425,6 +4644,7 @@ class ReviewWorker {
   }
   spawnClaude(prompt, systemPrompt, tracker, shortId) {
     return new Promise((resolve3, reject) => {
+      const leanSources = this.config.claude.leanSettingSources;
       const args = [
         "--output-format",
         "stream-json",
@@ -4432,9 +4652,10 @@ class ReviewWorker {
         "--model",
         this.config.claude.reviewModel,
         "--max-turns",
-        String(this.config.claude.maxTurns),
+        String(this.config.claude.reviewMaxTurns),
         "--allowedTools",
         "Bash(readonly),Read,Glob,Grep,Agent,mcp__harmony__*",
+        ...leanSources ? ["--setting-sources", leanSources] : [],
         ...systemPrompt ? ["--append-system-prompt", systemPrompt] : [],
         ...this.config.claude.additionalArgs,
         "--",
@@ -4580,6 +4801,7 @@ var TAG19 = "review-worker", CANCEL_SIGINT_TIMEOUT = 30000, CANCEL_SIGTERM_TIMEO
 var init_review_worker = __esm(() => {
   init_board_helpers();
   init_completion();
+  init_git_diff_stat();
   init_log();
   init_process_group();
   init_progress_tracker();
@@ -4726,129 +4948,31 @@ var init_unblock = __esm(() => {
   init_log();
 });
 
-// ../harmony-shared/dist/cardLinks.js
-var init_cardLinks = () => {};
-// ../harmony-shared/dist/commentSerializer.js
-function sanitizeHeaderField(value) {
-  return value.replace(/[\]\r\n|<>]/g, " ").trim() || "—";
-}
-function authorLabel(c) {
-  if (c.author_type === "agent")
-    return "AI agent";
-  const raw = c.author?.full_name || "teammate";
-  return sanitizeHeaderField(raw);
-}
-function criticalIds(comments) {
-  const keep = new Set;
-  for (const c of comments) {
-    if (c.comment_type === "decision")
-      keep.add(c.id);
-    if (c.supersedes_id) {
-      keep.add(c.id);
-      keep.add(c.supersedes_id);
-    }
-    if (c.confirms_id) {
-      keep.add(c.id);
-      keep.add(c.confirms_id);
-    }
+// src/model-tier.ts
+function chooseImplementModel(claude, card, attempts) {
+  if (card.model_override) {
+    return { model: card.model_override, escalated: false, source: "override" };
   }
-  return keep;
-}
-function serializeCommentThread(comments, options = {}) {
-  const { heading = "Conversation", includeInstructions = true, activity = [], maxComments } = options;
-  const visible = comments.filter((c) => !c.deleted_at).slice().sort((a, b) => a.created_at.localeCompare(b.created_at));
-  if (visible.length === 0)
-    return "";
-  const indexById = new Map;
-  visible.forEach((c, i) => {
-    indexById.set(c.id, i + 1);
-  });
-  let rendered = visible;
-  let elidedCount = 0;
-  if (maxComments && visible.length > maxComments) {
-    const keep = criticalIds(visible);
-    const recentThreshold = visible.length - maxComments;
-    rendered = visible.filter((c, i) => i >= recentThreshold || keep.has(c.id));
-    elidedCount = visible.length - rendered.length;
+  if (isModelTier(card.model_tier)) {
+    const retry = attempts >= claude.escalateAfterAttempts;
+    const tier = retry ? escalateTier(card.model_tier) : card.model_tier;
+    const mapped = claude.tiers?.[tier];
+    return {
+      model: mapped && mapped.length > 0 ? mapped : claude.model,
+      escalated: retry,
+      source: "tier"
+    };
   }
-  const ref = (id) => {
-    const n = indexById.get(id);
-    return n ? `#${n}` : `#${id.slice(0, 8)}`;
+  const highPriority = card.priority === "high" || card.priority === "urgent";
+  const escalated = highPriority || attempts >= claude.escalateAfterAttempts;
+  return {
+    model: escalated ? claude.escalateModel : claude.model,
+    escalated,
+    source: "policy"
   };
-  const lines = [];
-  if (elidedCount > 0) {
-    lines.push({
-      at: visible[0]?.created_at ?? "",
-      text: `(${elidedCount} earlier comment(s) omitted for brevity)`
-    });
-  }
-  for (const c of rendered) {
-    const tags = [];
-    if (c.edited_at)
-      tags.push("edited");
-    if (c.supersedes_id)
-      tags.push(`supersedes ${ref(c.supersedes_id)}`);
-    if (c.confirms_id)
-      tags.push(`confirms ${ref(c.confirms_id)}`);
-    if (c.resolved_at)
-      tags.push("resolved");
-    const tagStr = tags.length ? ` | ${tags.join(" | ")}` : "";
-    const header = `[${sanitizeHeaderField(ref(c.id))} | ${sanitizeHeaderField(c.author_type)} | ${authorLabel(c)} | ${sanitizeHeaderField(c.comment_type)} | ${sanitizeHeaderField(c.created_at)}${tagStr}]`;
-    const fencedBody = c.body.trim().replaceAll("<", "&lt;").replaceAll(">", "&gt;");
-    lines.push({
-      at: c.created_at,
-      text: `${header}
-<comment-body>
-${fencedBody}
-</comment-body>`
-    });
-  }
-  for (const a of activity) {
-    const actor = a.actor ? `${a.actor} ` : "";
-    lines.push({ at: a.at, text: `· (system) ${a.at} — ${actor}${a.text}` });
-  }
-  lines.sort((a, b) => a.at.localeCompare(b.at));
-  const body = lines.map((l) => l.text).join(`
-
-`);
-  const instruction = includeInstructions ? `
-
-${CONFLICT_INSTRUCTION}` : "";
-  return `## ${heading} (oldest → newest)
-
-${body}${instruction}`;
 }
-var CONFLICT_INSTRUCTION;
-var init_commentSerializer = __esm(() => {
-  CONFLICT_INSTRUCTION = "When two comments conflict, prefer the latest created_at, UNLESS a later " + "comment explicitly confirms or restates the earlier finding. Evaluate " + "substance, not just recency. Cite the comment id(s) you relied on.";
-});
-
-// ../harmony-shared/dist/constants.js
-var TIMINGS;
-var init_constants = __esm(() => {
-  TIMINGS = {
-    SEARCH_DEBOUNCE: 300,
-    AUTOSAVE_DEBOUNCE: 1000,
-    TOAST_DURATION: 3000,
-    QUERY_STALE_TIME: 1000 * 60 * 5,
-    QUERY_GC_TIME: 1000 * 60 * 60 * 24
-  };
-});
-// ../harmony-shared/dist/logger.js
-var init_logger = () => {};
-// ../harmony-shared/dist/projectTemplates.js
-var init_projectTemplates = () => {};
-// ../harmony-shared/dist/types.js
-var init_types2 = () => {};
-
-// ../harmony-shared/dist/index.js
-var init_dist = __esm(() => {
-  init_cardLinks();
-  init_commentSerializer();
-  init_constants();
-  init_logger();
-  init_projectTemplates();
-  init_types2();
+var init_model_tier = __esm(() => {
+  init_dist();
 });
 
 // src/prompt.ts
@@ -5162,7 +5286,9 @@ class Worker {
         this.timedOut = true;
         this.cancel();
       }, this.config.maxTimeout);
-      await this.spawnClaude(prompt, card, subtasks);
+      await this.spawnClaude(prompt, card, subtasks, {
+        model: this.selectImplementModel(card)
+      });
       if (this.aborted)
         return;
       if (this.timeoutTimer) {
@@ -5288,6 +5414,14 @@ class Worker {
       this.onDone(this);
     }
   }
+  selectImplementModel(card) {
+    const attempts = this.stateStore.getCard(card.id)?.attempts ?? 1;
+    const { model, escalated, source } = chooseImplementModel(this.config.claude, card, attempts);
+    if (source !== "policy" || escalated) {
+      log.info(this.tag, `Implement model "${model}" (source=${source}, escalated=${escalated}, attempts=${attempts}, priority=${card.priority ?? "none"}, tier=${card.model_tier ?? "none"})`);
+    }
+    return model;
+  }
   async recordOutcome(cardId, outcome) {
     try {
       const cost = this.lastSessionStats?.cost;
@@ -5620,6 +5754,7 @@ var init_worker = __esm(() => {
   init_completion();
   init_error_classifier();
   init_log();
+  init_model_tier();
   init_plan_phase();
   init_process_group();
   init_progress_tracker();
@@ -6396,9 +6531,11 @@ function configRows(config, projectName, gitProvider, httpPort) {
   const reviewEnabled = config.agent.review.enabled;
   const poolDesc = reviewEnabled ? `Pool ${config.agent.poolSize} impl + ${config.agent.review.poolSize} review` : `Pool ${config.agent.poolSize} impl`;
   const flowDesc = reviewEnabled ? `Pickup ${config.agent.pickupColumns[0]} → ${config.agent.completion.moveToColumn} → ${config.agent.review.moveToColumn}` : `Pickup ${config.agent.pickupColumns.join(", ")}`;
+  const { model, escalateModel, reviewModel } = config.agent.claude;
+  const modelDesc = model === escalateModel ? model : `${model} → ${escalateModel} on retry/high · review ${reviewModel}`;
   rows.push({
     label: "Model",
-    value: `${config.agent.claude.model}  ·  ${poolDesc}  ·  ${flowDesc}`
+    value: `${modelDesc}  ·  ${poolDesc}  ·  ${flowDesc}`
   });
   const tail = [];
   if (gitProvider)
@@ -6669,11 +6806,23 @@ var exports_worktree_gc = {};
 __export(exports_worktree_gc, {
   runWorktreeGc: () => runWorktreeGc,
   pruneFailedRemoteBranches: () => pruneFailedRemoteBranches,
+  isTransientGitNetworkError: () => isTransientGitNetworkError,
   WorktreeGc: () => WorktreeGc
 });
 import { execFileSync as execFileSync9 } from "node:child_process";
 import { readdirSync, statSync as statSync2 } from "node:fs";
 import { resolve as resolve3 } from "node:path";
+function isTransientGitNetworkError(message) {
+  return TRANSIENT_GIT_NETWORK_ERROR.test(message);
+}
+function gitErrorDetail(err) {
+  if (err && typeof err === "object" && "stderr" in err) {
+    const stderr = String(err.stderr ?? "").trim();
+    if (stderr)
+      return stderr;
+  }
+  return err instanceof Error ? err.message : String(err);
+}
 function runWorktreeGc(basePath, store, opts = {}) {
   const minAgeMs = opts.minAgeMs ?? 60 * 60 * 1000;
   const now = (opts.now ?? Date.now)();
@@ -6761,13 +6910,16 @@ function pruneFailedRemoteBranches(opts) {
   try {
     execFileSync9("git", ["fetch", "--prune", "origin"], {
       cwd: repoRoot,
-      stdio: "pipe"
+      stdio: "pipe",
+      ...GIT_NETWORK_EXEC
     });
   } catch (err) {
-    result.errors.push({
-      ref: "fetch",
-      error: err instanceof Error ? err.message : String(err)
-    });
+    const detail = gitErrorDetail(err);
+    if (isTransientGitNetworkError(detail)) {
+      log.debug(TAG30, `Remote branch GC skipped — remote unreachable: ${detail}`);
+      return result;
+    }
+    result.errors.push({ ref: "fetch", error: detail });
   }
   const refPattern = `refs/remotes/origin/${opts.prefix}*`;
   let listing = "";
@@ -6784,7 +6936,9 @@ function pruneFailedRemoteBranches(opts) {
     });
     return result;
   }
-  const cutoffSecs = (opts.now ?? Date.now)() / 1000 - opts.retentionDays * 24 * 60 * 60;
+  const clock = opts.now ?? Date.now;
+  const cutoffSecs = clock() / 1000 - opts.retentionDays * 24 * 60 * 60;
+  const sweepDeadline = clock() + GIT_PRUNE_SWEEP_BUDGET_MS;
   for (const line of listing.split(`
 `)) {
     const trimmed = line.trim();
@@ -6800,17 +6954,24 @@ function pruneFailedRemoteBranches(opts) {
       result.skipped.push(ref);
       continue;
     }
+    if (clock() > sweepDeadline) {
+      log.debug(TAG30, `Remote branch GC budget spent — removed ${result.removed.length}, remaining deferred to next tick`);
+      break;
+    }
     try {
       execFileSync9("git", ["push", "origin", `:refs/heads/${ref}`], {
         cwd: repoRoot,
-        stdio: "pipe"
+        stdio: "pipe",
+        ...GIT_NETWORK_EXEC
       });
       result.removed.push(ref);
     } catch (err) {
-      result.errors.push({
-        ref,
-        error: err instanceof Error ? err.message : String(err)
-      });
+      const detail = gitErrorDetail(err);
+      if (isTransientGitNetworkError(detail)) {
+        log.debug(TAG30, `Remote branch GC interrupted — remote unreachable: ${detail}`);
+        break;
+      }
+      result.errors.push({ ref, error: detail });
     }
   }
   if (result.removed.length > 0) {
@@ -6868,10 +7029,32 @@ function getRepoRoot2() {
     return null;
   }
 }
-var TAG30 = "worktree-gc";
+var TAG30 = "worktree-gc", GIT_NETWORK_TIMEOUT_MS = 30000, GIT_SSH_CONNECT_TIMEOUT_SECS = 10, GIT_PRUNE_SWEEP_BUDGET_MS = 60000, GIT_NETWORK_EXEC, TRANSIENT_GIT_NETWORK_ERROR;
 var init_worktree_gc = __esm(() => {
   init_log();
   init_worktree();
+  GIT_NETWORK_EXEC = {
+    timeout: GIT_NETWORK_TIMEOUT_MS,
+    killSignal: "SIGKILL",
+    env: {
+      ...process.env,
+      GIT_SSH_COMMAND: `${process.env.GIT_SSH_COMMAND ?? "ssh"} -o ConnectTimeout=${GIT_SSH_CONNECT_TIMEOUT_SECS} -o BatchMode=yes`,
+      GIT_TERMINAL_PROMPT: "0"
+    }
+  };
+  TRANSIENT_GIT_NETWORK_ERROR = new RegExp([
+    "timed out",
+    "connection refused",
+    "connection reset",
+    "could not resolve host",
+    "temporary failure in name resolution",
+    "ssh: connect to host",
+    "kex_exchange_identification",
+    "network is unreachable",
+    "etimedout",
+    "enotfound",
+    "enetunreach"
+  ].join("|"), "i");
 });
 
 // src/index.ts