@runfusion/fusion 0.33.0 → 0.34.0

package/dist/extension.js

@@ -4642,7 +4642,7 @@ var init_db = __esm({
     DEFAULT_SQLITE_BUSY_TIMEOUT_MS = 5e3;
     DEFAULT_SQLITE_LOCK_RECOVERY_WINDOW_MS = 1e3;
     DEFAULT_SQLITE_LOCK_RECOVERY_DELAY_MS = 50;
-    SCHEMA_VERSION = 90;
+    SCHEMA_VERSION = 91;
     SCHEMA_SQL = `
 -- Tasks table with JSON columns for nested data
 CREATE TABLE IF NOT EXISTS tasks (
@@ -5189,6 +5189,7 @@ CREATE TABLE IF NOT EXISTS missions (
   description TEXT,
   status TEXT NOT NULL,
   interviewState TEXT NOT NULL,
+  baseBranch TEXT,
   autoAdvance INTEGER DEFAULT 0,
   createdAt TEXT NOT NULL,
   updatedAt TEXT NOT NULL
@@ -7501,6 +7502,11 @@ This means a caller passed a .fusion directory where a project root was expected
             this.addColumnIfMissing("tasks", "scopeAutoWiden", "TEXT DEFAULT '[]'");
           });
         }
+        if (version < 91) {
+          this.applyMigration(91, () => {
+            this.addColumnIfMissing("missions", "baseBranch", "TEXT");
+          });
+        }
       }
       /**
        * Run a single migration step inside a transaction and bump the version.
@@ -7643,7 +7649,7 @@ This means a caller passed a .fusion directory where a project root was expected
             );
           }
           _Database.sharedIntegrityChecks.delete(this.dbPath);
-        }, 3e3);
+        }, 6e4);
         _Database.sharedIntegrityChecks.set(this.dbPath, shared);
       }
       /**
@@ -12547,6 +12553,7 @@ var init_mission_store = __esm({
           description: row.description || void 0,
           status: row.status,
           interviewState: row.interviewState,
+          baseBranch: row.baseBranch || void 0,
           autoAdvance: Boolean(row.autoAdvance),
           autopilotEnabled: Boolean(row.autopilotEnabled),
           autopilotState: row.autopilotState || "inactive",
@@ -12724,6 +12731,7 @@ var init_mission_store = __esm({
           description: input.description,
           status: "planning",
           interviewState: "not_started",
+          baseBranch: input.baseBranch,
           autoAdvance: false,
           autopilotEnabled: input.autopilotEnabled ?? false,
           autopilotState: "inactive",
@@ -12731,14 +12739,15 @@ var init_mission_store = __esm({
           updatedAt: now
         };
         this.db.prepare(`
-      INSERT INTO missions (id, title, description, status, interviewState, autoAdvance, autopilotEnabled, autopilotState, createdAt, updatedAt)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      INSERT INTO missions (id, title, description, status, interviewState, baseBranch, autoAdvance, autopilotEnabled, autopilotState, createdAt, updatedAt)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     `).run(
           mission.id,
           mission.title,
           mission.description ?? null,
           mission.status,
           mission.interviewState,
+          mission.baseBranch ?? null,
           mission.autoAdvance ? 1 : 0,
           mission.autopilotEnabled ? 1 : 0,
           mission.autopilotState ?? "inactive",
@@ -13204,6 +13213,7 @@ var init_mission_store = __esm({
         description = ?,
         status = ?,
         interviewState = ?,
+        baseBranch = ?,
         autoAdvance = ?,
         autopilotEnabled = ?,
         autopilotState = ?,
@@ -13215,6 +13225,7 @@ var init_mission_store = __esm({
           updated.description ?? null,
           updated.status,
           updated.interviewState,
+          updated.baseBranch ?? null,
           updated.autoAdvance ? 1 : 0,
           updated.autopilotEnabled ? 1 : 0,
           updated.autopilotState ?? "inactive",
@@ -14883,6 +14894,8 @@ ${feature.acceptanceCriteria}`);
         const slice = this.getSlice(feature.sliceId);
         const milestone = slice ? this.getMilestone(slice.milestoneId) : void 0;
         const missionId = milestone?.missionId;
+        const mission = missionId ? this.getMission(missionId) : void 0;
+        const resolvedBaseBranch = branchOptions?.baseBranch ?? mission?.baseBranch;
         const lockScope = missionId ? `mission:${missionId}` : `mission-store:${this.taskStore.getRootDir()}`;
         const guard = await runDeterministicDuplicateGuard(this.taskStore, {
           title: taskTitle || feature.title,
@@ -14897,13 +14910,13 @@ ${feature.acceptanceCriteria}`);
               title: taskTitle || feature.title,
               description,
               branch: branchOptions?.branch,
-              baseBranch: branchOptions?.baseBranch,
+              baseBranch: resolvedBaseBranch,
               ...missionId ? {
                 branchContext: {
                   groupId: `mission:${missionId}`,
                   source: "mission",
                   assignmentMode: branchOptions?.assignmentMode ?? "shared",
-                  inheritedBaseBranch: branchOptions?.baseBranch
+                  inheritedBaseBranch: resolvedBaseBranch
                 }
               } : {}
             });
@@ -14945,12 +14958,16 @@ ${feature.acceptanceCriteria}`);
         }
         const features = this.listFeatures(sliceId);
         const definedFeatures = features.filter((f2) => f2.status === "defined");
+        const milestone = this.getMilestone(slice.milestoneId);
+        const mission = milestone ? this.getMission(milestone.missionId) : void 0;
+        const resolvedBaseBranch = branchOptions?.baseBranch ?? mission?.baseBranch;
         const triaged = [];
         for (const feature of definedFeatures) {
           const branch = branchOptions?.assignmentMode === "per-task-derived" ? branchOptions?.branch ? `${branchOptions.branch}/${feature.id.toLowerCase()}` : void 0 : branchOptions?.branch;
           const updated = await this.triageFeature(feature.id, void 0, void 0, {
             ...branchOptions,
-            branch
+            branch,
+            baseBranch: resolvedBaseBranch
           });
           triaged.push(updated);
         }
@@ -25329,8 +25346,8 @@ var init_central_core = __esm({
       async generateProjectName(projectPath) {
         try {
           const { execFile: execFile18 } = await import("node:child_process");
-          const { promisify: promisify49 } = await import("node:util");
-          const execFileAsync14 = promisify49(execFile18);
+          const { promisify: promisify50 } = await import("node:util");
+          const execFileAsync14 = promisify50(execFile18);
           const { stdout } = await execFileAsync14(
             "git",
             ["remote", "get-url", "origin"],
@@ -26036,8 +26053,8 @@ var init_migration = __esm({
         }
         try {
           const { execFile: execFile18 } = await import("node:child_process");
-          const { promisify: promisify49 } = await import("node:util");
-          const execFileAsync14 = promisify49(execFile18);
+          const { promisify: promisify50 } = await import("node:util");
+          const execFileAsync14 = promisify50(execFile18);
           const { stdout } = await execFileAsync14(
             "git",
             ["remote", "get-url", "origin"],
@@ -37787,8 +37804,8 @@ async function searchWithQmd(rootDir, options) {
   const limit = Math.max(1, Math.min(options.limit ?? 5, 20));
   try {
     const { execFile: execFile18 } = await import("node:child_process");
-    const { promisify: promisify49 } = await import("node:util");
-    const execFileAsync14 = promisify49(execFile18);
+    const { promisify: promisify50 } = await import("node:util");
+    const execFileAsync14 = promisify50(execFile18);
     await ensureQmdProjectMemoryCollection(rootDir, execFileAsync14);
     scheduleQmdProjectMemoryRefresh(rootDir);
     const args = buildQmdSearchArgs(rootDir, options);
@@ -37839,8 +37856,8 @@ ${stderr}`)) {
 }
 async function getDefaultExecFileAsync() {
   const { execFile: execFile18 } = await import("node:child_process");
-  const { promisify: promisify49 } = await import("node:util");
-  return promisify49(execFile18);
+  const { promisify: promisify50 } = await import("node:util");
+  return promisify50(execFile18);
 }
 async function refreshQmdProjectMemoryIndex(rootDir, options) {
   const key = resolve8(rootDir);
@@ -49012,27 +49029,43 @@ function normalizeRunGhOptions(opts) {
   if (typeof opts === "string") return { cwd: opts };
   return opts ?? {};
 }
+function resetGhAvailabilityCache() {
+  cachedAvailable = void 0;
+  cachedAuthenticated = void 0;
+}
 function isGhAvailable() {
+  if (cachedAvailable && Date.now() - cachedAvailable.at < GH_CHECK_TTL_MS) {
+    return cachedAvailable.value;
+  }
+  let value = false;
   try {
     execFileSync("gh", ["--version"], {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "ignore"]
     });
-    return true;
+    value = true;
   } catch {
-    return false;
+    value = false;
   }
+  cachedAvailable = { value, at: Date.now() };
+  return value;
 }
 function isGhAuthenticated() {
+  if (cachedAuthenticated && Date.now() - cachedAuthenticated.at < GH_CHECK_TTL_MS) {
+    return cachedAuthenticated.value;
+  }
+  let value = false;
   try {
     const result = execFileSync("gh", ["auth", "status"], {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "ignore"]
     });
-    return result.includes("Logged in") || result.includes("Authenticated");
+    value = result.includes("Logged in") || result.includes("Authenticated");
   } catch {
-    return false;
+    value = false;
   }
+  cachedAuthenticated = { value, at: Date.now() };
+  return value;
 }
 function runGh(args, cwd) {
   try {
@@ -49300,11 +49333,12 @@ function getCurrentRepo(cwd) {
     return null;
   }
 }
-var DEFAULT_GH_TIMEOUT_MS;
+var DEFAULT_GH_TIMEOUT_MS, GH_CHECK_TTL_MS, cachedAvailable, cachedAuthenticated;
 var init_gh_cli = __esm({
   "../core/src/gh-cli.ts"() {
     "use strict";
     DEFAULT_GH_TIMEOUT_MS = 3e4;
+    GH_CHECK_TTL_MS = 6e4;
   }
 });
 
@@ -57102,11 +57136,11 @@ var require_extract_zip = __commonJS({
     var { createWriteStream, promises: fs6 } = __require("fs");
     var getStream = require_get_stream();
     var path6 = __require("path");
-    var { promisify: promisify49 } = __require("util");
+    var { promisify: promisify50 } = __require("util");
     var stream = __require("stream");
     var yauzl = require_yauzl();
-    var openZip = promisify49(yauzl.open);
-    var pipeline = promisify49(stream.pipeline);
+    var openZip = promisify50(yauzl.open);
+    var pipeline = promisify50(stream.pipeline);
     var Extractor = class {
       constructor(zipPath, opts) {
         this.zipPath = zipPath;
@@ -57188,7 +57222,7 @@ var require_extract_zip = __commonJS({
         await fs6.mkdir(destDir, mkdirOptions);
         if (isDir) return;
         debug("opening read stream", dest);
-        const readStream = await promisify49(this.zipfile.openReadStream.bind(this.zipfile))(entry);
+        const readStream = await promisify50(this.zipfile.openReadStream.bind(this.zipfile))(entry);
         if (symlink) {
           const link = await getStream(readStream);
           debug("creating symlink", link, dest);
@@ -69845,6 +69879,7 @@ __export(src_exports, {
   renderMemoryAuditMarkdown: () => renderMemoryAuditMarkdown,
   replicationCollisionError: () => replicationCollisionError,
   requiresWorktrunkInstallVerification: () => requiresWorktrunkInstallVerification,
+  resetGhAvailabilityCache: () => resetGhAvailabilityCache,
   resolveAgentMemoryInclusionMode: () => resolveAgentMemoryInclusionMode,
   resolveAgentPermissionPolicyPreset: () => resolveAgentPermissionPolicyPreset,
   resolveAgentPrompt: () => resolveAgentPrompt,
@@ -71437,7 +71472,7 @@ var init_github_provider = __esm({
                 "repos",
                 query,
                 "--json",
-                "fullName,description,htmlUrl,stargazersCount,language,updatedAt",
+                "fullName,description,url,stargazersCount,language,updatedAt",
                 "--limit",
                 String(maxResults)
               ],
@@ -71445,9 +71480,9 @@ var init_github_provider = __esm({
             );
             sources.push(
               ...repos.slice(0, maxResults).map((repo, idx) => ({
-                id: `github-repo-${idx}-${repo.htmlUrl}`,
+                id: `github-repo-${idx}-${repo.url}`,
                 type: "github",
-                reference: repo.htmlUrl,
+                reference: repo.url,
                 title: repo.fullName,
                 excerpt: repo.description ?? "",
                 status: "completed",
@@ -71468,7 +71503,7 @@ var init_github_provider = __esm({
                 "issues",
                 query,
                 "--json",
-                "title,body,htmlUrl,state,labels",
+                "title,body,url,state,labels",
                 "--limit",
                 String(maxResults)
               ],
@@ -71476,9 +71511,9 @@ var init_github_provider = __esm({
             );
             sources.push(
               ...issues.slice(0, maxResults).map((issue, idx) => ({
-                id: `github-issue-${idx}-${issue.htmlUrl}`,
+                id: `github-issue-${idx}-${issue.url}`,
                 type: "github",
-                reference: issue.htmlUrl,
+                reference: issue.url,
                 title: issue.title,
                 excerpt: issue.body?.slice(0, 280) ?? "",
                 status: "completed",
@@ -72479,6 +72514,16 @@ async function promptSessionAndCheck(session, prompt, options) {
   }
 }
 async function promptWithFallback(session, prompt, options) {
+  const sessionWithDispatch = session;
+  if (typeof sessionWithDispatch.promptWithFallback === "function" && !promptWithFallbackInFlight.has(session)) {
+    promptWithFallbackInFlight.add(session);
+    try {
+      await sessionWithDispatch.promptWithFallback(prompt, options);
+      return;
+    } finally {
+      promptWithFallbackInFlight.delete(session);
+    }
+  }
   piLog.log(`promptWithFallback: calling session.prompt (prompt length=${prompt.length})`);
   try {
     await promptSessionAndCheck(session, prompt, options);
@@ -73773,7 +73818,7 @@ async function createFnAgent2(options) {
   });
   return { session: promptableSession, sessionFile: promptableSession.sessionFile };
 }
-var execAsync, hostExtensionPaths, FN_MEMORY_APPEND_TOOL_NAME, FUSION_SHUTDOWN_WRAP_FLAG, COMPACTION_FALLBACK_INSTRUCTIONS, MAX_COMPACTED_PROMPT_MEMORY_CHARS, MAX_COMPACTED_SUBTASK_GUIDANCE_CHARS, MAX_COMPACTED_ATTACHMENTS_CHARS, MAX_COMPACTED_EXISTING_SPEC_CHARS, MAX_COMPACTED_TASK_PROMPT_CHARS, MAX_COMPACTED_USER_COMMENTS_CHARS, GATE_BYPASS_TOOL_NAMES;
+var execAsync, hostExtensionPaths, FN_MEMORY_APPEND_TOOL_NAME, FUSION_SHUTDOWN_WRAP_FLAG, promptWithFallbackInFlight, COMPACTION_FALLBACK_INSTRUCTIONS, MAX_COMPACTED_PROMPT_MEMORY_CHARS, MAX_COMPACTED_SUBTASK_GUIDANCE_CHARS, MAX_COMPACTED_ATTACHMENTS_CHARS, MAX_COMPACTED_EXISTING_SPEC_CHARS, MAX_COMPACTED_TASK_PROMPT_CHARS, MAX_COMPACTED_USER_COMMENTS_CHARS, GATE_BYPASS_TOOL_NAMES;
 var init_pi = __esm({
   "../engine/src/pi.ts"() {
     "use strict";
@@ -73790,6 +73835,7 @@ var init_pi = __esm({
     hostExtensionPaths = [];
     FN_MEMORY_APPEND_TOOL_NAME = "fn_memory_append";
     FUSION_SHUTDOWN_WRAP_FLAG = "__fusionSessionShutdownDisposeWrapped";
+    promptWithFallbackInFlight = /* @__PURE__ */ new WeakSet();
     COMPACTION_FALLBACK_INSTRUCTIONS = [
       "Summarize all completed steps concisely.",
       "Preserve the current step number and any in-progress work details.",
@@ -75390,8 +75436,8 @@ async function refreshAgentMemoryQmdIndex(rootDir, agentMemory) {
   }
   const promise = (async () => {
     const { execFile: execFile18 } = await import("node:child_process");
-    const { promisify: promisify49 } = await import("node:util");
-    const execFileAsync14 = promisify49(execFile18);
+    const { promisify: promisify50 } = await import("node:util");
+    const execFileAsync14 = promisify50(execFile18);
     try {
       await execFileAsync14("qmd", buildQmdAgentMemoryCollectionAddArgs(rootDir, agentMemory.agentId), {
         cwd: rootDir,
@@ -75463,8 +75509,8 @@ async function searchAgentMemoryWithQmd(rootDir, agentMemory, query, limit) {
   try {
     await refreshAgentMemoryQmdIndex(rootDir, agentMemory);
     const { execFile: execFile18 } = await import("node:child_process");
-    const { promisify: promisify49 } = await import("node:util");
-    const execFileAsync14 = promisify49(execFile18);
+    const { promisify: promisify50 } = await import("node:util");
+    const execFileAsync14 = promisify50(execFile18);
     const { stdout } = await execFileAsync14("qmd", buildQmdAgentMemorySearchArgs(rootDir, agentMemory.agentId, query, limit), {
       cwd: rootDir,
       timeout: 4e3,
@@ -85918,6 +85964,7 @@ var init_triage_preflight = __esm({
 });
 
 // ../engine/src/restart-recovery-coordinator.ts
+import { setImmediate as setImmediateCb } from "node:timers";
 function hasStepProgress(task) {
   const steps = Array.isArray(task.steps) ? task.steps : [];
   return steps.some((step) => step.status === "done" || step.status === "in-progress" || step.status === "skipped");
@@ -85960,12 +86007,13 @@ function isRecoverableMissingWorktreeReviewFailureWithProgress(task) {
 function isRecoverableMissingWorktreeReviewFailureNoProgress(task) {
   return task.column === "in-review" && !task.paused && task.status === "failed" && isMissingWorktreeSessionStartFailure(task.error) && !hasStepProgress(task);
 }
-var log15, MISSING_WORKTREE_SESSION_PREFIXES, RestartRecoveryCoordinator;
+var log15, yieldEventLoop, MISSING_WORKTREE_SESSION_PREFIXES, RestartRecoveryCoordinator;
 var init_restart_recovery_coordinator = __esm({
   "../engine/src/restart-recovery-coordinator.ts"() {
     "use strict";
     init_logger2();
     log15 = createLogger2("restart-recovery");
+    yieldEventLoop = () => new Promise((resolve32) => setImmediateCb(resolve32));
     MISSING_WORKTREE_SESSION_PREFIXES = [
       "Refusing to start coding agent in missing worktree:",
       "Refusing to start coding agent in incomplete worktree:",
@@ -85985,6 +86033,7 @@ var init_restart_recovery_coordinator = __esm({
           if (!this.mustSafeRetry(task)) continue;
           await this.safeRequeue(task);
           requeued++;
+          await yieldEventLoop();
         }
         if (requeued > 0) {
           log15.log(`Restart recovery requeued ${requeued} interrupted task(s) for safe retry`);
@@ -86323,10 +86372,57 @@ var init_already_merged_detector = __esm({
   }
 });
 
-// ../engine/src/recovery/foreign-only-contamination.ts
+// ../engine/src/merger-bare-subject.ts
 import { exec as exec14 } from "node:child_process";
-import { existsSync as existsSync33 } from "node:fs";
 import { promisify as promisify15 } from "node:util";
+function quoteArg(value) {
+  return `'${value.replace(/'/g, "'\\''")}'`;
+}
+async function regenerateBareMergeSubject(params) {
+  const { subject, commitSha, branch, taskId, rootDir, settings } = params;
+  if (!subject || !BARE_MERGE_SUBJECT_RE.test(subject)) return subject;
+  if (!settings.useAiMergeCommitSummary) return subject;
+  if (!commitSha) return subject;
+  try {
+    const { stdout: diffStat } = await execAsync13(
+      `git show ${quoteArg(commitSha)} --stat --format=`,
+      { cwd: rootDir, encoding: "utf-8" }
+    );
+    const trimmedStat = diffStat.trim();
+    if (trimmedStat.length === 0) return subject;
+    const resolved = resolveTitleSummarizerSettingsModel(settings);
+    const regenerated = await summarizeCommitSubject(
+      trimmedStat,
+      rootDir,
+      resolved.provider,
+      resolved.modelId,
+      { branch, taskId }
+    );
+    if (!regenerated) return subject;
+    const prefixMatch = subject.match(/^([a-z]+(?:\([^)]+\))?!?:)/i);
+    const prefix = prefixMatch ? prefixMatch[1] : `feat(${taskId}):`;
+    return `${prefix} ${regenerated}`;
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    mergerLog.warn(`${taskId}: bare-merge-subject regeneration failed (${message})`);
+    return subject;
+  }
+}
+var execAsync13, BARE_MERGE_SUBJECT_RE;
+var init_merger_bare_subject = __esm({
+  "../engine/src/merger-bare-subject.ts"() {
+    "use strict";
+    init_src();
+    init_logger2();
+    execAsync13 = promisify15(exec14);
+    BARE_MERGE_SUBJECT_RE = /^[a-z]+(?:\([^)]+\))?!?:\s*merge\s+\S+\s*$/i;
+  }
+});
+
+// ../engine/src/recovery/foreign-only-contamination.ts
+import { exec as exec15 } from "node:child_process";
+import { existsSync as existsSync33 } from "node:fs";
+import { promisify as promisify16 } from "node:util";
 function quote2(value) {
   return `'${value.replace(/'/g, `'\\''`)}'`;
 }
@@ -86391,8 +86487,8 @@ async function recoverForeignOnlyContamination(task, deps) {
     });
     return { recovered: false, reason: "active-session" };
   }
-  await execAsync13("git worktree prune", { cwd: deps.repoDir, timeout: GIT_TIMEOUT_MS4, maxBuffer: GIT_MAX_BUFFER2 }).catch(() => void 0);
-  await execAsync13(`git branch -D ${quote2(task.branch)}`, { cwd: deps.repoDir, timeout: GIT_TIMEOUT_MS4, maxBuffer: GIT_MAX_BUFFER2 }).catch(() => void 0);
+  await execAsync14("git worktree prune", { cwd: deps.repoDir, timeout: GIT_TIMEOUT_MS4, maxBuffer: GIT_MAX_BUFFER2 }).catch(() => void 0);
+  await execAsync14(`git branch -D ${quote2(task.branch)}`, { cwd: deps.repoDir, timeout: GIT_TIMEOUT_MS4, maxBuffer: GIT_MAX_BUFFER2 }).catch(() => void 0);
   await deps.taskStore.moveTask(task.id, "todo", {
     moveSource: "engine",
     preserveResumeState: true,
@@ -86422,14 +86518,14 @@ async function recoverForeignOnlyContamination(task, deps) {
   });
   return { recovered: true, subtype: "branch-discard" };
 }
-var execAsync13, GIT_TIMEOUT_MS4, GIT_MAX_BUFFER2;
+var execAsync14, GIT_TIMEOUT_MS4, GIT_MAX_BUFFER2;
 var init_foreign_only_contamination = __esm({
   "../engine/src/recovery/foreign-only-contamination.ts"() {
     "use strict";
     init_active_session_registry();
     init_branch_conflicts();
     init_worktree_pool();
-    execAsync13 = promisify15(exec14);
+    execAsync14 = promisify16(exec15);
     GIT_TIMEOUT_MS4 = 3e4;
     GIT_MAX_BUFFER2 = 10 * 1024 * 1024;
   }
@@ -86561,8 +86657,8 @@ var init_dependency_blocked_todo_reporter = __esm({
 });
 
 // ../engine/src/sandbox/bubblewrap-detect.ts
-import { exec as exec15 } from "node:child_process";
-import { promisify as promisify16 } from "node:util";
+import { exec as exec16 } from "node:child_process";
+import { promisify as promisify17 } from "node:util";
 function parseVersion(raw) {
   const match = raw.match(/(\d+\.\d+(?:\.\d+)?)/);
   return match?.[1];
@@ -86572,7 +86668,7 @@ async function detectBwrapUncached() {
     return { available: false, reason: "not-linux" };
   }
   try {
-    const { stdout, stderr } = await execAsync14("command -v bwrap && bwrap --version", {
+    const { stdout, stderr } = await execAsync15("command -v bwrap && bwrap --version", {
       timeout: 5e3,
       maxBuffer: 256 * 1024,
       encoding: "utf-8",
@@ -86602,11 +86698,11 @@ async function detectBwrap() {
   }
   return detectPromise;
 }
-var execAsync14, detectPromise;
+var execAsync15, detectPromise;
 var init_bubblewrap_detect = __esm({
   "../engine/src/sandbox/bubblewrap-detect.ts"() {
     "use strict";
-    execAsync14 = promisify16(exec15);
+    execAsync15 = promisify17(exec16);
     detectPromise = null;
   }
 });
@@ -86693,14 +86789,14 @@ var init_bubblewrap_policy = __esm({
 });
 
 // ../engine/src/sandbox/native.ts
-import { exec as exec16 } from "node:child_process";
-import { promisify as promisify17 } from "node:util";
-var execAsync15, NativeSandboxBackend;
+import { exec as exec17 } from "node:child_process";
+import { promisify as promisify18 } from "node:util";
+var execAsync16, NativeSandboxBackend;
 var init_native = __esm({
   "../engine/src/sandbox/native.ts"() {
     "use strict";
     init_src();
-    execAsync15 = promisify17(exec16);
+    execAsync16 = promisify18(exec17);
     NativeSandboxBackend = class {
       capabilities() {
         return {
@@ -86725,7 +86821,7 @@ var init_native = __esm({
             ...options.env !== void 0 && { env: options.env },
             ...options.signal !== void 0 && { signal: options.signal }
           };
-          const { stdout, stderr } = await execAsync15(command, execOptions);
+          const { stdout, stderr } = await execAsync16(command, execOptions);
           return {
             stdout: stdout?.toString?.() ?? "",
             stderr: stderr?.toString?.() ?? "",
@@ -86865,16 +86961,16 @@ var init_native = __esm({
 });
 
 // ../engine/src/sandbox/bubblewrap-backend.ts
-import { exec as exec17, spawn as spawn3 } from "node:child_process";
-import { promisify as promisify18 } from "node:util";
-var execAsync16, SandboxUnavailableError, BubblewrapBackend;
+import { exec as exec18, spawn as spawn3 } from "node:child_process";
+import { promisify as promisify19 } from "node:util";
+var execAsync17, SandboxUnavailableError, BubblewrapBackend;
 var init_bubblewrap_backend = __esm({
   "../engine/src/sandbox/bubblewrap-backend.ts"() {
     "use strict";
     init_bubblewrap_detect();
     init_bubblewrap_policy();
     init_native();
-    execAsync16 = promisify18(exec17);
+    execAsync17 = promisify19(exec18);
     SandboxUnavailableError = class extends Error {
       constructor(message) {
         super(message);
@@ -86949,7 +87045,7 @@ var init_bubblewrap_backend = __esm({
         if (cached) return cached;
         let resolved = `${process.env.HOME ?? ""}/.local/share/pnpm`;
         try {
-          const { stdout } = await execAsync16("pnpm store path --silent", {
+          const { stdout } = await execAsync17("pnpm store path --silent", {
             cwd,
             timeout: 1e4,
             maxBuffer: 256 * 1024,
@@ -87058,12 +87154,12 @@ var init_container_argv = __esm({
 
 // ../engine/src/sandbox/container.ts
 import * as childProcess from "node:child_process";
-import { promisify as promisify19 } from "node:util";
+import { promisify as promisify20 } from "node:util";
 function getExecAsync() {
-  return promisify19(childProcess.exec);
+  return promisify20(childProcess.exec);
 }
 function getExecFileAsync() {
-  return promisify19(childProcess.execFile);
+  return promisify20(childProcess.execFile);
 }
 var ContainerSandboxBackend;
 var init_container = __esm({
@@ -87270,14 +87366,14 @@ var init_container = __esm({
 });
 
 // ../engine/src/sandbox/sandbox-exec-detect.ts
-import { exec as exec19 } from "node:child_process";
-import { promisify as promisify20 } from "node:util";
+import { exec as exec20 } from "node:child_process";
+import { promisify as promisify21 } from "node:util";
 async function detectSandboxExecUncached() {
   if (process.platform !== "darwin") {
     return { available: false, reason: "not-darwin" };
   }
   try {
-    const { stdout } = await execAsync17("command -v sandbox-exec && sandbox-exec -p '(version 1)(allow default)' /usr/bin/true", {
+    const { stdout } = await execAsync18("command -v sandbox-exec && sandbox-exec -p '(version 1)(allow default)' /usr/bin/true", {
       timeout: 5e3,
       maxBuffer: 256 * 1024,
       encoding: "utf-8",
@@ -87302,11 +87398,11 @@ async function detectSandboxExec() {
   }
   return detectPromise2;
 }
-var execAsync17, detectPromise2;
+var execAsync18, detectPromise2;
 var init_sandbox_exec_detect = __esm({
   "../engine/src/sandbox/sandbox-exec-detect.ts"() {
     "use strict";
-    execAsync17 = promisify20(exec19);
+    execAsync18 = promisify21(exec20);
     detectPromise2 = null;
   }
 });
@@ -87428,14 +87524,14 @@ var init_sandbox_exec_policy = __esm({
 });
 
 // ../engine/src/sandbox/sandbox-exec-backend.ts
-import { exec as exec20 } from "node:child_process";
+import { exec as exec21 } from "node:child_process";
 import os4 from "node:os";
 import path3 from "node:path";
-import { promisify as promisify21 } from "node:util";
+import { promisify as promisify22 } from "node:util";
 function shEscape(value) {
   return `'${value.replace(/'/g, `'\\''`)}'`;
 }
-var execAsync18, log16, SandboxUnavailableError2, SandboxExecBackend;
+var execAsync19, log16, SandboxUnavailableError2, SandboxExecBackend;
 var init_sandbox_exec_backend = __esm({
   "../engine/src/sandbox/sandbox-exec-backend.ts"() {
     "use strict";
@@ -87443,7 +87539,7 @@ var init_sandbox_exec_backend = __esm({
     init_sandbox_exec_policy();
     init_native();
     init_logger2();
-    execAsync18 = promisify21(exec20);
+    execAsync19 = promisify22(exec21);
     log16 = createLogger2("sandbox-exec");
     SandboxUnavailableError2 = class extends Error {
       constructor(message) {
@@ -87495,7 +87591,7 @@ var init_sandbox_exec_backend = __esm({
         const repoRootPath = process.cwd();
         let pnpmStorePath = path3.join(os4.homedir(), "Library/pnpm/store");
         try {
-          const { stdout } = await execAsync18("pnpm store path --silent", {
+          const { stdout } = await execAsync19("pnpm store path --silent", {
             cwd: worktreePath,
             timeout: 1e4,
             maxBuffer: 256 * 1024,
@@ -87543,7 +87639,7 @@ var init_sandbox_exec_backend = __esm({
             ...options.encoding !== void 0 && { encoding: options.encoding },
             ...typeof options.shell === "string" && { shell: options.shell }
           };
-          const { stdout, stderr } = await execAsync18(wrappedCommand, execOptions);
+          const { stdout, stderr } = await execAsync19(wrappedCommand, execOptions);
           const result = {
             stdout: stdout?.toString?.() ?? "",
             stderr: stderr?.toString?.() ?? "",
@@ -88034,8 +88130,8 @@ var init_verification_utils = __esm({
 });
 
 // ../engine/src/branch-attribution.ts
-import { exec as exec21 } from "node:child_process";
-import { promisify as promisify22 } from "node:util";
+import { exec as exec22 } from "node:child_process";
+import { promisify as promisify23 } from "node:util";
 function quoteShellArg4(value) {
   return `'${value.replace(/'/g, `'\\''`)}'`;
 }
@@ -88073,7 +88169,7 @@ function taskIdsMatch(a, b2) {
   return a.toUpperCase() === b2.toUpperCase();
 }
 async function collectOwnTaskCommitsForRange(opts) {
-  const execImpl = opts.execAsyncImpl ?? execAsync19;
+  const execImpl = opts.execAsyncImpl ?? execAsync20;
   let logOutput;
   try {
     const result = await execImpl(
@@ -88114,7 +88210,7 @@ async function collectOwnTaskCommitsForRange(opts) {
   return { ownCommitCount: ownCommitShas.length, ownCommitShas };
 }
 async function filterFilesToOwnTaskCommits(opts) {
-  const execImpl = opts.execAsyncImpl ?? execAsync19;
+  const execImpl = opts.execAsyncImpl ?? execAsync20;
   const runGit8 = async (command) => {
     try {
       const { stdout } = await execImpl(command, {
@@ -88180,11 +88276,11 @@ async function filterFilesToOwnTaskCommits(opts) {
     commitAttributions
   };
 }
-var execAsync19, GIT_TIMEOUT_MS5, GIT_MAX_BUFFER3, BranchAttributionError, SilentNoOpAttributionMismatchError;
+var execAsync20, GIT_TIMEOUT_MS5, GIT_MAX_BUFFER3, BranchAttributionError, SilentNoOpAttributionMismatchError;
 var init_branch_attribution = __esm({
   "../engine/src/branch-attribution.ts"() {
     "use strict";
-    execAsync19 = promisify22(exec21);
+    execAsync20 = promisify23(exec22);
     GIT_TIMEOUT_MS5 = 3e4;
     GIT_MAX_BUFFER3 = 10 * 1024 * 1024;
     BranchAttributionError = class extends Error {
@@ -88303,7 +88399,7 @@ var init_session_token_usage = __esm({
 
 // ../engine/src/merger-squash-audit.ts
 import { execFile as execFile5 } from "node:child_process";
-import { promisify as promisify23 } from "node:util";
+import { promisify as promisify24 } from "node:util";
 async function auditSquashMerge(input) {
   const normalizedLookback = normalizeMergeOverlapLookback(input.lookback);
   if (input.strategy === "rebase") {
@@ -88458,7 +88554,7 @@ var execFileAsync, MERGER_MAIN_OVERLAP_LOOKBACK_COMMITS, GIT_OUTPUT_MAX_BUFFER;
 var init_merger_squash_audit = __esm({
   "../engine/src/merger-squash-audit.ts"() {
     "use strict";
-    execFileAsync = promisify23(execFile5);
+    execFileAsync = promisify24(execFile5);
     MERGER_MAIN_OVERLAP_LOOKBACK_COMMITS = 30;
     GIT_OUTPUT_MAX_BUFFER = 10 * 1024 * 1024;
   }
@@ -88466,7 +88562,7 @@ var init_merger_squash_audit = __esm({
 
 // ../engine/src/merger-overlap-guard.ts
 import { execFile as execFile6 } from "node:child_process";
-import { promisify as promisify24 } from "node:util";
+import { promisify as promisify25 } from "node:util";
 async function getBranchTouchedFiles({
   rootDir,
   branch,
@@ -88591,14 +88687,14 @@ var init_merger_overlap_guard = __esm({
     "use strict";
     init_logger2();
     init_merger_squash_audit();
-    execFileAsync2 = promisify24(execFile6);
+    execFileAsync2 = promisify25(execFile6);
     GIT_OUTPUT_MAX_BUFFER2 = 10 * 1024 * 1024;
   }
 });
 
 // ../engine/src/merger-diff-volume-gate.ts
 import { execFile as execFile7 } from "node:child_process";
-import { promisify as promisify25 } from "node:util";
+import { promisify as promisify26 } from "node:util";
 function buildMessage(findings) {
   const details = findings.map((finding) => `${finding.file} (branch_net=${finding.branchNet}, staged=${finding.staged}, ratio=${finding.ratio.toFixed(3)})`).join(", ");
   return `Per-file diff-volume regression detected: ${details}`;
@@ -88659,7 +88755,7 @@ var init_merger_diff_volume_gate = __esm({
   "../engine/src/merger-diff-volume-gate.ts"() {
     "use strict";
     init_merger();
-    execFileAsync3 = promisify25(execFile7);
+    execFileAsync3 = promisify26(execFile7);
     DiffVolumeRegressionError = class extends Error {
       constructor(findings) {
         super(buildMessage(findings));
@@ -88671,19 +88767,19 @@ var init_merger_diff_volume_gate = __esm({
 });
 
 // ../engine/src/merger-auto-prerebase.ts
-import { exec as exec22 } from "node:child_process";
-import { promisify as promisify26 } from "node:util";
+import { exec as exec23 } from "node:child_process";
+import { promisify as promisify27 } from "node:util";
 async function probeDivergence(opts) {
   const mainRef = opts.mainRef ?? "HEAD";
   const range = `${opts.baseCommitSha}..${mainRef}`;
   const [{ stdout: countOut }, { stdout: diffOut }] = await Promise.all([
-    execAsync20(`git rev-list --count ${range}`, {
+    execAsync21(`git rev-list --count ${range}`, {
       cwd: opts.rootDir,
       encoding: "utf-8",
       timeout: 6e4,
       maxBuffer: 10 * 1024 * 1024
     }),
-    execAsync20(`git diff --name-only ${range}`, {
+    execAsync21(`git diff --name-only ${range}`, {
       cwd: opts.rootDir,
       encoding: "utf-8",
       timeout: 6e4,
@@ -88721,14 +88817,14 @@ function decideAutoPrerebase(input) {
   return { fire: false, reason: "no-divergence", commitsBehind, hotMatches: [] };
 }
 async function runAutoPrerebase(deps) {
-  const mainHead = deps.mainHead?.trim() || (await execAsync20("git rev-parse HEAD", {
+  const mainHead = deps.mainHead?.trim() || (await execAsync21("git rev-parse HEAD", {
     cwd: deps.rootDir,
     encoding: "utf-8",
     timeout: 6e4,
     maxBuffer: 10 * 1024 * 1024
   })).stdout.trim();
   try {
-    await execAsync20(`git rebase "${mainHead}"`, {
+    await execAsync21(`git rebase "${mainHead}"`, {
       cwd: deps.worktreePath,
       encoding: "utf-8",
       timeout: 6e4,
@@ -88740,7 +88836,7 @@ async function runAutoPrerebase(deps) {
     const message = error instanceof Error ? error.message : String(error);
     deps.logger.warn(`${deps.taskId}: auto-prerebase failed (${message}) \u2014 aborting`);
     try {
-      await execAsync20("git rebase --abort", {
+      await execAsync21("git rebase --abort", {
         cwd: deps.worktreePath,
         encoding: "utf-8",
         timeout: 6e4,
@@ -88752,23 +88848,23 @@ async function runAutoPrerebase(deps) {
     return { ok: false, mainHead, error: message };
   }
 }
-var execAsync20;
+var execAsync21;
 var init_merger_auto_prerebase = __esm({
   "../engine/src/merger-auto-prerebase.ts"() {
     "use strict";
-    execAsync20 = promisify26(exec22);
+    execAsync21 = promisify27(exec23);
   }
 });
 
 // ../engine/src/branch-autocorrect.ts
-import { exec as exec23 } from "node:child_process";
-import { promisify as promisify27 } from "node:util";
+import { exec as exec24 } from "node:child_process";
+import { promisify as promisify28 } from "node:util";
 function quoteShellArg5(value) {
   return `'${value.replace(/'/g, `'\\''`)}'`;
 }
 async function runGit2(command, worktreePath) {
   try {
-    const { stdout } = await execAsync21(command, {
+    const { stdout } = await execAsync22(command, {
       cwd: worktreePath,
       timeout: GIT_TIMEOUT_MS6,
       maxBuffer: GIT_MAX_BUFFER4
@@ -88827,11 +88923,11 @@ async function attemptBranchAutocorrect({
   }
   return { status: "failed", reason: checkout.reason };
 }
-var execAsync21, GIT_TIMEOUT_MS6, GIT_MAX_BUFFER4;
+var execAsync22, GIT_TIMEOUT_MS6, GIT_MAX_BUFFER4;
 var init_branch_autocorrect = __esm({
   "../engine/src/branch-autocorrect.ts"() {
     "use strict";
-    execAsync21 = promisify27(exec23);
+    execAsync22 = promisify28(exec24);
     GIT_TIMEOUT_MS6 = 1e4;
     GIT_MAX_BUFFER4 = 1024 * 1024;
   }
@@ -89320,8 +89416,8 @@ var init_mesh_lease_manager = __esm({
 
 // ../engine/src/merger-integration-worktree.ts
 import { createHash as createHash10 } from "node:crypto";
-import { exec as exec24, execFile as execFile8 } from "node:child_process";
-import { promisify as promisify28 } from "node:util";
+import { exec as exec25, execFile as execFile8 } from "node:child_process";
+import { promisify as promisify29 } from "node:util";
 function quoteAutostashArg(value) {
   return `"${value.replace(/(["\\$`])/g, "\\$1")}"`;
 }
@@ -89343,7 +89439,7 @@ async function resolveIntegrationRemote(input) {
     return configured;
   }
   try {
-    const { stdout } = await execAsync22(
+    const { stdout } = await execAsync23(
       `git config --get branch.${input.integrationBranch}.remote`,
       { cwd: input.rootDir, encoding: "utf-8" }
     );
@@ -89354,7 +89450,7 @@ async function resolveIntegrationRemote(input) {
   } catch {
   }
   try {
-    const { stdout } = await execAsync22("git remote", {
+    const { stdout } = await execAsync23("git remote", {
       cwd: input.rootDir,
       encoding: "utf-8"
     });
@@ -89488,26 +89584,26 @@ async function acquireReuseHandoff(input) {
     let stashSha = null;
     let stashError = null;
     try {
-      await execAsync22("git add -A", { cwd: worktreePath });
-      const { stdout: createOut } = await execAsync22("git stash create", {
+      await execAsync23("git add -A", { cwd: worktreePath });
+      const { stdout: createOut } = await execAsync23("git stash create", {
         cwd: worktreePath,
         encoding: "utf-8"
       });
       stashSha = String(createOut).trim() || null;
       if (stashSha) {
-        await execAsync22(
+        await execAsync23(
           `git stash store -m ${quoteAutostashArg(stashLabel)} ${stashSha}`,
           { cwd: worktreePath }
         );
-        await execAsync22("git reset --hard HEAD", { cwd: worktreePath });
-        await execAsync22("git clean -fd", { cwd: worktreePath });
+        await execAsync23("git reset --hard HEAD", { cwd: worktreePath });
+        await execAsync23("git clean -fd", { cwd: worktreePath });
       }
     } catch (err) {
       stashError = err instanceof Error ? err.message : String(err);
     }
     if (!stashSha || stashError) {
       try {
-        await execAsync22("git reset", { cwd: worktreePath });
+        await execAsync23("git reset", { cwd: worktreePath });
       } catch {
       }
       throw new MergeHandoffRefusedError("working-tree-dirty", "dirty-worktree-autostash-failed", {
@@ -89532,7 +89628,7 @@ async function acquireReuseHandoff(input) {
       }
     });
   }
-  const { stdout: headStdout } = await execAsync22("git rev-parse --abbrev-ref HEAD", {
+  const { stdout: headStdout } = await execAsync23("git rev-parse --abbrev-ref HEAD", {
     cwd: worktreePath,
     encoding: "utf-8",
     timeout: 1e4,
@@ -89558,7 +89654,7 @@ async function acquireReuseHandoff(input) {
           mode: autocorrectResult.status
         }
       });
-      const { stdout: correctedHead } = await execAsync22("git rev-parse --abbrev-ref HEAD", {
+      const { stdout: correctedHead } = await execAsync23("git rev-parse --abbrev-ref HEAD", {
         cwd: worktreePath,
         encoding: "utf-8",
         timeout: 1e4,
@@ -89574,7 +89670,7 @@ async function acquireReuseHandoff(input) {
       input.task.id
     );
     if (authority.ok) {
-      const reattach = await execAsync22(`git checkout ${expectedBranch}`, {
+      const reattach = await execAsync23(`git checkout ${expectedBranch}`, {
         cwd: worktreePath,
         encoding: "utf-8",
         timeout: 3e4,
@@ -89584,7 +89680,7 @@ async function acquireReuseHandoff(input) {
         (err) => ({ ok: false, reason: err instanceof Error ? err.message : String(err) })
       );
       if (reattach.ok) {
-        const { stdout: reattachedHead } = await execAsync22("git rev-parse --abbrev-ref HEAD", {
+        const { stdout: reattachedHead } = await execAsync23("git rev-parse --abbrev-ref HEAD", {
           cwd: worktreePath,
           encoding: "utf-8",
           timeout: 1e4,
@@ -89787,7 +89883,7 @@ async function releaseReuseHandoff(input) {
     }
   });
 }
-var execAsync22, execFileAsync4, MERGE_HANDOFF_WORKER_ID, MergeHandoffRefusedError;
+var execAsync23, execFileAsync4, MERGE_HANDOFF_WORKER_ID, MergeHandoffRefusedError;
 var init_merger_integration_worktree = __esm({
   "../engine/src/merger-integration-worktree.ts"() {
     "use strict";
@@ -89798,8 +89894,8 @@ var init_merger_integration_worktree = __esm({
     init_mesh_lease_manager();
     init_worktree_pool();
     init_worktree_names();
-    execAsync22 = promisify28(exec24);
-    execFileAsync4 = promisify28(execFile8);
+    execAsync23 = promisify29(exec25);
+    execFileAsync4 = promisify29(execFile8);
     MERGE_HANDOFF_WORKER_ID = "merger-reuse-handoff";
     MergeHandoffRefusedError = class extends Error {
       reason;
@@ -90068,8 +90164,8 @@ var init_worktrunk_failure_handler = __esm({
 
 // ../engine/src/worktree-acquisition.ts
 import { existsSync as existsSync35 } from "node:fs";
-import { exec as exec25 } from "node:child_process";
-import { promisify as promisify29 } from "node:util";
+import { exec as exec26 } from "node:child_process";
+import { promisify as promisify30 } from "node:util";
 function configuredCommandErrorMessage(result) {
   if (result.spawnError) return `Failed to start command: ${result.spawnError}`;
   if (result.timedOut) return "Command timed out";
@@ -90101,8 +90197,8 @@ async function maybeWarnForeignTaskStartPoint(input) {
   const { baseBranch, rootDir, worktreePath, taskId, logger: logger3, store, runContext } = input;
   if (!baseBranch || !/^fusion\/fn-\d+$/i.test(baseBranch)) return;
   try {
-    const tipSha = (await execAsync23(`git rev-parse --verify ${JSON.stringify(`${baseBranch}^{commit}`)}`, { cwd: rootDir, encoding: "utf-8" })).stdout.trim();
-    const details = (await execAsync23(`git log -1 --format=%s%x1f%b ${JSON.stringify(tipSha)}`, { cwd: worktreePath, encoding: "utf-8" })).stdout.trim();
+    const tipSha = (await execAsync24(`git rev-parse --verify ${JSON.stringify(`${baseBranch}^{commit}`)}`, { cwd: rootDir, encoding: "utf-8" })).stdout.trim();
+    const details = (await execAsync24(`git log -1 --format=%s%x1f%b ${JSON.stringify(tipSha)}`, { cwd: worktreePath, encoding: "utf-8" })).stdout.trim();
     const [subject = "", body = ""] = details.split("");
     const subjectMatch = subject.match(/^(?:feat|fix|test|chore|docs|refactor|perf|build)\((FN-\d+)\):/i);
     const trailerMatch = body.match(/(?:^|\n)Fusion-Task-Id:\s*(FN-\d+)\s*(?:\n|$)/i);
@@ -90440,7 +90536,7 @@ async function verifyResumeBranchNotMisbound(input) {
   const { worktreePath, branchName, taskId, rootDir, store, audit, logger: logger3, runContext } = input;
   let baseSha = "";
   try {
-    const { stdout } = await execAsync23(
+    const { stdout } = await execAsync24(
       "git merge-base HEAD main 2>/dev/null || git merge-base HEAD origin/main",
       { cwd: worktreePath, encoding: "utf-8" }
     );
@@ -90491,7 +90587,7 @@ async function verifyResumeBranchNotMisbound(input) {
     logger3?.warn?.(`${taskId}: resume re-anchor failed (continuing \u2014 executor preflight will handle): ${formatError(err)}`);
   }
 }
-var execAsync23, INIT_OUTCOME_MAX_CHARS;
+var execAsync24, INIT_OUTCOME_MAX_CHARS;
 var init_worktree_acquisition = __esm({
   "../engine/src/worktree-acquisition.ts"() {
     "use strict";
@@ -90506,14 +90602,14 @@ var init_worktree_acquisition = __esm({
     init_worktrunk_failure_handler();
     init_secrets_env_writer();
     init_worktree_desktop_artifacts();
-    execAsync23 = promisify29(exec25);
+    execAsync24 = promisify30(exec26);
     INIT_OUTCOME_MAX_CHARS = 2e3;
   }
 });
 
 // ../engine/src/merger-ref-update-advance.ts
 import { execFile as execFile9 } from "node:child_process";
-import { promisify as promisify30 } from "node:util";
+import { promisify as promisify31 } from "node:util";
 async function runGit3(args, cwd) {
   return await execFileAsync5("git", args, {
     cwd,
@@ -90656,7 +90752,7 @@ var execFileAsync5, testHooks, IntegrationBranchConcurrentAdvanceError;
 var init_merger_ref_update_advance = __esm({
   "../engine/src/merger-ref-update-advance.ts"() {
     "use strict";
-    execFileAsync5 = promisify30(execFile9);
+    execFileAsync5 = promisify31(execFile9);
     testHooks = {
       runGit: runGit3
     };
@@ -90684,7 +90780,7 @@ var init_merger_ref_update_advance = __esm({
 
 // ../engine/src/worktree-ref-sync.ts
 import { execFile as execFile10, spawn as spawn5 } from "node:child_process";
-import { promisify as promisify31 } from "node:util";
+import { promisify as promisify32 } from "node:util";
 import { copyFileSync, existsSync as existsSync36, mkdirSync as mkdirSync8, mkdtempSync as mkdtempSync2, readFileSync as readFileSync11, rmSync as rmSync3, writeFileSync as writeFileSync2 } from "node:fs";
 import { dirname as dirname17, join as join40 } from "node:path";
 import { tmpdir as tmpdir4 } from "node:os";
@@ -90927,16 +91023,16 @@ var execFileAsync6;
 var init_worktree_ref_sync = __esm({
   "../engine/src/worktree-ref-sync.ts"() {
     "use strict";
-    execFileAsync6 = promisify31(execFile10);
+    execFileAsync6 = promisify32(execFile10);
   }
 });
 
 // ../engine/src/merger-scope-auto-widen.ts
-import { exec as exec26 } from "node:child_process";
+import { exec as exec27 } from "node:child_process";
 import { readFile as readFile20, writeFile as writeFile15 } from "node:fs/promises";
 import { join as join41 } from "node:path";
-import { promisify as promisify32 } from "node:util";
-function quoteArg(value) {
+import { promisify as promisify33 } from "node:util";
+function quoteArg2(value) {
   return `'${value.replace(/'/g, `'\\''`)}'`;
 }
 function attributedBySubjectPrefix(subject, taskToken) {
@@ -90968,7 +91064,7 @@ function classifyCommitAttribution(subject, body, taskToken) {
 }
 async function isGitIgnored(file, rootDir, execImpl) {
   try {
-    await execImpl(`git check-ignore -- ${quoteArg(file)}`, {
+    await execImpl(`git check-ignore -- ${quoteArg2(file)}`, {
       cwd: rootDir,
       encoding: "utf-8",
       maxBuffer: GIT_MAX_BUFFER5
@@ -90987,7 +91083,7 @@ function scopeContainsPath(scope, file) {
 }
 async function evaluateScopeAutoWiden(params) {
   const { store, task, taskId, rootDir, branch, baseRef, candidateFiles } = params;
-  const execImpl = params.execAsyncImpl ?? execAsync24;
+  const execImpl = params.execAsyncImpl ?? execAsync25;
   const widened = [];
   const refused = [];
   const taskToken = toTaskToken(task.id || taskId);
@@ -91016,7 +91112,7 @@ async function evaluateScopeAutoWiden(params) {
     }
     if (claimed) continue;
     const { stdout } = await execImpl(
-      `git log ${quoteArg(`${baseRef}..${branch}`)} --format=%H%x00%s%x00%B%x1e -- ${quoteArg(file)}`,
+      `git log ${quoteArg2(`${baseRef}..${branch}`)} --format=%H%x00%s%x00%B%x1e -- ${quoteArg2(file)}`,
       {
         cwd: rootDir,
         encoding: "utf-8",
@@ -91090,12 +91186,12 @@ ${insertion}
   await writeFile15(promptPath, `${before}${normalizedSection}${after}`, "utf-8");
   return toAdd;
 }
-var execAsync24, GIT_MAX_BUFFER5, ScopeAutoWidenPersistError;
+var execAsync25, GIT_MAX_BUFFER5, ScopeAutoWidenPersistError;
 var init_merger_scope_auto_widen = __esm({
   "../engine/src/merger-scope-auto-widen.ts"() {
     "use strict";
     init_merger();
-    execAsync24 = promisify32(exec26);
+    execAsync25 = promisify33(exec27);
     GIT_MAX_BUFFER5 = 10 * 1024 * 1024;
     ScopeAutoWidenPersistError = class extends Error {
       constructor(message) {
@@ -91110,6 +91206,7 @@ var init_merger_scope_auto_widen = __esm({
 var merger_exports = {};
 __export(merger_exports, {
   AutostashCreationFailedError: () => AutostashCreationFailedError,
+  BARE_MERGE_SUBJECT_RE: () => BARE_MERGE_SUBJECT_RE,
   DiffVolumeRegressionError: () => DiffVolumeRegressionError,
   FUSION_TASK_ID_TRAILER_KEY: () => FUSION_TASK_ID_TRAILER_KEY2,
   FileScopeViolationError: () => FileScopeViolationError,
@@ -91174,6 +91271,7 @@ __export(merger_exports, {
   partitionConflictsByFileScope: () => partitionConflictsByFileScope,
   pushToRemoteAfterMerge: () => pushToRemoteAfterMerge,
   readActiveMergerStatus: () => readActiveMergerStatus,
+  regenerateBareMergeSubject: () => regenerateBareMergeSubject,
   resolveConflicts: () => resolveConflicts,
   resolvePostMergeAuditAction: () => resolvePostMergeAuditAction,
   resolvePostMergeAuditInvocation: () => resolvePostMergeAuditInvocation,
@@ -91196,8 +91294,8 @@ __export(merger_exports, {
   tryFastForwardFromOrigin: () => tryFastForwardFromOrigin,
   validateDiffScope: () => validateDiffScope
 });
-import { execSync as execSync4, exec as exec27, execFile as execFile11 } from "node:child_process";
-import { promisify as promisify33 } from "node:util";
+import { execSync as execSync4, exec as exec28, execFile as execFile11 } from "node:child_process";
+import { promisify as promisify34 } from "node:util";
 import { existsSync as existsSync37, readFileSync as readFileSync12, readdirSync as readdirSync5, writeFileSync as writeFileSync3, unlinkSync, renameSync as renameSync2 } from "node:fs";
 import { createHash as createHash11 } from "node:crypto";
 import { join as join42 } from "node:path";
@@ -91352,11 +91450,11 @@ function formatDiffVolumeFindings(findings) {
   return findings.map((finding) => `${finding.file} (branchNet=${finding.branchNet}, staged=${finding.staged}, ratio=${finding.ratio.toFixed(3)})`).join("\n");
 }
 async function resetToIntegrationTarget(rootDir, integrationTargetSha) {
-  await execAsync25(`git reset --hard ${quoteArg2(integrationTargetSha)}`, {
+  await execAsync26(`git reset --hard ${quoteArg3(integrationTargetSha)}`, {
     cwd: rootDir,
     encoding: "utf-8"
   });
-  await execAsync25("git clean -fd", {
+  await execAsync26("git clean -fd", {
     cwd: rootDir,
     encoding: "utf-8"
   });
@@ -91391,7 +91489,7 @@ async function runDiffVolumeGate(params) {
 }
 async function getStagedFiles(cwd) {
   try {
-    const { stdout } = await execAsync25("git diff --cached --name-only", {
+    const { stdout } = await execAsync26("git diff --cached --name-only", {
       cwd,
       encoding: "utf-8"
     });
@@ -91462,7 +91560,7 @@ async function syncDependenciesForMerge(store, rootDir, taskId, signal) {
   mergerLog.log(`${taskId}: syncing dependencies before merge verification`);
   await store.logEntry(taskId, `Syncing dependencies before merge verification: ${installCommand}`);
   try {
-    await execAsync25(installCommand, {
+    await execAsync26(installCommand, {
       cwd: rootDir,
       encoding: "utf-8",
       maxBuffer: 10 * 1024 * 1024,
@@ -91805,7 +91903,7 @@ function deriveScopedPnpmTestCommand(rootDir, baseBranch, branch) {
   let changedFilesOutput;
   try {
     changedFilesOutput = execSync4(
-      `git diff --name-only ${quoteArg2(baseBranch)}...${quoteArg2(branch)}`,
+      `git diff --name-only ${quoteArg3(baseBranch)}...${quoteArg3(branch)}`,
       { cwd: rootDir, stdio: "pipe", encoding: "utf-8" }
     ).toString();
   } catch {
@@ -91817,7 +91915,7 @@ function deriveScopedPnpmTestCommand(rootDir, baseBranch, branch) {
   if (packageNames.length === 0) {
     return null;
   }
-  const filters = packageNames.map((name) => `--filter ${quoteArg2(`${name}...^`)}`).join(" ");
+  const filters = packageNames.map((name) => `--filter ${quoteArg3(`${name}...^`)}`).join(" ");
   return `pnpm ${filters} test`;
 }
 function inferDefaultTestCommand(rootDir, explicitTestCommand, explicitBuildCommand, baseBranch, branch) {
@@ -91886,8 +91984,8 @@ function parseFailingFilesFromOutput(output) {
 }
 function getBranchChangedFiles(rootDir, baseBranch, branch) {
   try {
-    const baseRef = quoteArg2(baseBranch);
-    const headRef = branch === "HEAD" ? "HEAD" : quoteArg2(branch);
+    const baseRef = quoteArg3(baseBranch);
+    const headRef = branch === "HEAD" ? "HEAD" : quoteArg3(branch);
     const output = execSync4(
       `git diff --name-only ${baseRef}...${headRef}`,
       { cwd: rootDir, stdio: "pipe", encoding: "utf-8" }
@@ -92022,7 +92120,7 @@ async function runDeterministicVerification(store, rootDir, taskId, testCommand,
       await store.appendAgentLog(taskId, "[verification:bootstrap] running bootstrap preamble", "tool", bootstrapCommand, "merger");
       try {
         throwIfAborted(signal, taskId);
-        await execAsync25(bootstrapCommand, {
+        await execAsync26(bootstrapCommand, {
           cwd: rootDir,
           timeout: 3e5,
           maxBuffer: 10 * 1024 * 1024,
@@ -92083,7 +92181,7 @@ async function runDeterministicVerification(store, rootDir, taskId, testCommand,
     await store.appendAgentLog(taskId, "[verification:retry] bootstrap-built", "tool", rebuildCommand, "merger");
     try {
       throwIfAborted(signal, taskId);
-      await execAsync25(rebuildCommand, {
+      await execAsync26(rebuildCommand, {
         cwd: rootDir,
         timeout: 3e5,
         maxBuffer: 10 * 1024 * 1024,
@@ -92447,8 +92545,8 @@ function resetMergeWithWarn(rootDir, taskId, label) {
 async function listStashChangedPaths(rootDir, stashSha) {
   const out = /* @__PURE__ */ new Set();
   try {
-    const { stdout } = await execAsync25(
-      `git stash show -z --name-only ${quoteArg2(stashSha)}`,
+    const { stdout } = await execAsync26(
+      `git stash show -z --name-only ${quoteArg3(stashSha)}`,
       { cwd: rootDir, encoding: "utf-8" }
     );
     for (const entry of stdout.split("\0")) {
@@ -92462,8 +92560,8 @@ async function listStashChangedPaths(rootDir, stashSha) {
 async function stashTreesEqual(rootDir, aSha, bSha) {
   try {
     const [a, b2] = await Promise.all([
-      execAsync25(`git rev-parse ${quoteArg2(aSha)}^{tree}`, { cwd: rootDir, encoding: "utf-8" }),
-      execAsync25(`git rev-parse ${quoteArg2(bSha)}^{tree}`, { cwd: rootDir, encoding: "utf-8" })
+      execAsync26(`git rev-parse ${quoteArg3(aSha)}^{tree}`, { cwd: rootDir, encoding: "utf-8" }),
+      execAsync26(`git rev-parse ${quoteArg3(bSha)}^{tree}`, { cwd: rootDir, encoding: "utf-8" })
     ]);
     return a.stdout.trim() === b2.stdout.trim();
   } catch {
@@ -92556,7 +92654,7 @@ function parsePorcelainZ(raw) {
 }
 async function listOrphanedAutostashes(rootDir) {
   try {
-    const { stdout } = await execAsync25(
+    const { stdout } = await execAsync26(
       `git stash list --format="%H %gd %s"`,
       { cwd: rootDir, encoding: "utf-8" }
     );
@@ -92599,9 +92697,9 @@ async function classifyAutostashOrphan(rootDir, sha) {
   try {
     const stashFiles = await listStashChangedPaths(rootDir, sha);
     if (stashFiles.size === 0) return "subsumed";
-    const pathsArg = [...stashFiles].map(quoteArg2).join(" ");
-    const { stdout: pathDiffOut } = await execAsync25(
-      `git diff --name-only HEAD ${quoteArg2(sha)} -- ${pathsArg}`,
+    const pathsArg = [...stashFiles].map(quoteArg3).join(" ");
+    const { stdout: pathDiffOut } = await execAsync26(
+      `git diff --name-only HEAD ${quoteArg3(sha)} -- ${pathsArg}`,
       { cwd: rootDir, encoding: "utf-8" }
     );
     return pathDiffOut.trim() === "" ? "subsumed" : "live";
@@ -92641,7 +92739,7 @@ async function notifyAutostashOrphans(store, rootDir, options) {
 }
 async function applyAutostashBySha(rootDir, sha) {
   try {
-    await execAsync25(`git stash apply ${quoteArg2(sha)}`, { cwd: rootDir, encoding: "utf-8" });
+    await execAsync26(`git stash apply ${quoteArg3(sha)}`, { cwd: rootDir, encoding: "utf-8" });
     return { ok: true };
   } catch (err) {
     const stderr = err && typeof err === "object" && "stderr" in err ? String(err.stderr ?? "") : "";
@@ -92658,7 +92756,7 @@ ${message}`;
 }
 async function getAutostashDiff(rootDir, sha) {
   const maxBytes = 64 * 1024;
-  const { stdout } = await execAsync25(`git stash show -p ${quoteArg2(sha)}`, {
+  const { stdout } = await execAsync26(`git stash show -p ${quoteArg3(sha)}`, {
     cwd: rootDir,
     encoding: "utf-8",
     maxBuffer: 5 * 1024 * 1024
@@ -92690,9 +92788,9 @@ async function sweepAutostashOrphans(rootDir, taskId, store) {
         subsumed.push(orphan);
         continue;
       }
-      const pathsArg = [...stashFiles].map(quoteArg2).join(" ");
-      const { stdout: pathDiffOut } = await execAsync25(
-        `git diff --name-only HEAD ${quoteArg2(orphan.sha)} -- ${pathsArg}`,
+      const pathsArg = [...stashFiles].map(quoteArg3).join(" ");
+      const { stdout: pathDiffOut } = await execAsync26(
+        `git diff --name-only HEAD ${quoteArg3(orphan.sha)} -- ${pathsArg}`,
         { cwd: rootDir, encoding: "utf-8" }
       );
       const isPathSubsumed = pathDiffOut.trim() === "";
@@ -92717,8 +92815,8 @@ async function sweepAutostashOrphans(rootDir, taskId, store) {
         continue;
       }
       try {
-        const { stdout: netDiffOut } = await execAsync25(
-          `git diff HEAD ${quoteArg2(orphan.sha)}`,
+        const { stdout: netDiffOut } = await execAsync26(
+          `git diff HEAD ${quoteArg3(orphan.sha)}`,
           { cwd: rootDir, encoding: "utf-8" }
         );
         if (netDiffOut.trim() === "") {
@@ -92802,18 +92900,18 @@ async function stashUnrelatedRootDirChanges(rootDir, taskId) {
     const dirty = await snapshotDirtyFiles(rootDir);
     if (dirty.size === 0) return null;
     const label = `${AUTOSTASH_LABEL_PREFIX}${taskId}:${Date.now()}`;
-    await execAsync25("git add -A", { cwd: rootDir });
-    const { stdout: createOut } = await execAsync25("git stash create", {
+    await execAsync26("git add -A", { cwd: rootDir });
+    const { stdout: createOut } = await execAsync26("git stash create", {
       cwd: rootDir,
       encoding: "utf-8"
     });
     const sha = String(createOut).trim();
     if (!sha) {
-      await execAsync25("git reset", { cwd: rootDir }).catch(() => void 0);
+      await execAsync26("git reset", { cwd: rootDir }).catch(() => void 0);
       return null;
     }
-    await execAsync25(
-      `git stash store -m ${quoteArg2(label)} ${sha}`,
+    await execAsync26(
+      `git stash store -m ${quoteArg3(label)} ${sha}`,
       { cwd: rootDir }
     );
     const primaryStashPaths = await listStashChangedPaths(rootDir, sha);
@@ -92823,9 +92921,9 @@ async function stashUnrelatedRootDirChanges(rootDir, taskId) {
       const newlyDirty = [...currentDirty].filter((p2) => !primaryStashPaths.has(p2));
       if (newlyDirty.length === 0) break;
       const rescueLabel = `${AUTOSTASH_LABEL_PREFIX}${taskId}:race-rescue-${attempt}:${Date.now()}`;
-      await execAsync25("git reset", { cwd: rootDir }).catch(() => void 0);
-      await execAsync25("git add -A", { cwd: rootDir });
-      const { stdout: rescueOut } = await execAsync25("git stash create", {
+      await execAsync26("git reset", { cwd: rootDir }).catch(() => void 0);
+      await execAsync26("git add -A", { cwd: rootDir });
+      const { stdout: rescueOut } = await execAsync26("git stash create", {
         cwd: rootDir,
         encoding: "utf-8"
       });
@@ -92833,8 +92931,8 @@ async function stashUnrelatedRootDirChanges(rootDir, taskId) {
       if (!rescueSha) break;
       const rescueTreeSame = await stashTreesEqual(rootDir, sha, rescueSha);
       if (rescueTreeSame) break;
-      await execAsync25(
-        `git stash store -m ${quoteArg2(rescueLabel)} ${rescueSha}`,
+      await execAsync26(
+        `git stash store -m ${quoteArg3(rescueLabel)} ${rescueSha}`,
         { cwd: rootDir }
       );
       rescueShas.push({ sha: rescueSha, label: rescueLabel });
@@ -92843,8 +92941,8 @@ async function stashUnrelatedRootDirChanges(rootDir, taskId) {
       );
       for (const p2 of newlyDirty) primaryStashPaths.add(p2);
     }
-    await execAsync25("git reset --hard HEAD", { cwd: rootDir });
-    await execAsync25("git clean -fd", { cwd: rootDir });
+    await execAsync26("git reset --hard HEAD", { cwd: rootDir });
+    await execAsync26("git clean -fd", { cwd: rootDir });
     const rescueSuffix = rescueShas.length > 0 ? ` + ${rescueShas.length} race-rescue stash(es): ${rescueShas.map((r) => r.sha.slice(0, 7)).join(", ")}` : "";
     mergerLog.log(
       `${taskId}: stashed ${dirty.size} unrelated dirty path(s) in rootDir as ${sha.slice(0, 7)} (${label})${rescueSuffix}`
@@ -92853,7 +92951,7 @@ async function stashUnrelatedRootDirChanges(rootDir, taskId) {
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     try {
-      await execAsync25("git reset", { cwd: rootDir });
+      await execAsync26("git reset", { cwd: rootDir });
     } catch {
     }
     mergerLog.warn(
@@ -92864,7 +92962,7 @@ async function stashUnrelatedRootDirChanges(rootDir, taskId) {
 }
 async function findStashRefBySha(rootDir, sha) {
   try {
-    const { stdout } = await execAsync25(
+    const { stdout } = await execAsync26(
       `git stash list --format="%H %gd"`,
       { cwd: rootDir, encoding: "utf-8" }
     );
@@ -92888,7 +92986,7 @@ async function dropAutostashBySha(rootDir, taskId, sha) {
     }
     let refSha = "";
     try {
-      const { stdout } = await execAsync25(`git rev-parse ${ref}`, { cwd: rootDir, encoding: "utf-8" });
+      const { stdout } = await execAsync26(`git rev-parse ${ref}`, { cwd: rootDir, encoding: "utf-8" });
       refSha = String(stdout).trim();
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
@@ -92900,7 +92998,7 @@ async function dropAutostashBySha(rootDir, taskId, sha) {
       continue;
     }
     try {
-      await execAsync25(`git stash drop ${ref}`, { cwd: rootDir });
+      await execAsync26(`git stash drop ${ref}`, { cwd: rootDir });
       return { dropped: true };
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
@@ -92917,9 +93015,9 @@ async function isAutostashLive(rootDir, sha) {
   try {
     const stashFiles = await listStashChangedPaths(rootDir, sha);
     if (stashFiles.size === 0) return false;
-    const pathsArg = [...stashFiles].map(quoteArg2).join(" ");
-    const { stdout: pathDiffOut } = await execAsync25(
-      `git diff --name-only HEAD ${quoteArg2(sha)} -- ${pathsArg}`,
+    const pathsArg = [...stashFiles].map(quoteArg3).join(" ");
+    const { stdout: pathDiffOut } = await execAsync26(
+      `git diff --name-only HEAD ${quoteArg3(sha)} -- ${pathsArg}`,
       { cwd: rootDir, encoding: "utf-8" }
     );
     return pathDiffOut.trim().length > 0;
@@ -93098,8 +93196,8 @@ async function findFilesWithConflictMarkers(rootDir, files) {
     try {
       const fullPath = join42(rootDir, file);
       if (!existsSync37(fullPath)) continue;
-      const { stdout } = await execAsync25(
-        `git grep -l -e "^<<<<<<< " -e "^=======$" -e "^>>>>>>> " --no-index -- ${quoteArg2(fullPath)}`,
+      const { stdout } = await execAsync26(
+        `git grep -l -e "^<<<<<<< " -e "^=======$" -e "^>>>>>>> " --no-index -- ${quoteArg3(fullPath)}`,
         { cwd: rootDir, encoding: "utf-8" }
       ).catch(() => ({ stdout: "" }));
       if (String(stdout).trim()) stillConflicted.push(file);
@@ -93115,7 +93213,7 @@ async function tryRecoverHardFailApply(params) {
   let threeWayConflicted = [];
   let threeWayApplied = false;
   try {
-    const { stdout: patchOut } = await execAsync25(
+    const { stdout: patchOut } = await execAsync26(
       `git stash show -p --binary ${sha}`,
       { cwd: rootDir, encoding: "utf-8", maxBuffer: 32 * 1024 * 1024 }
     );
@@ -93126,7 +93224,7 @@ async function tryRecoverHardFailApply(params) {
       const patchPath = join42(rootDir, ".git", `fusion-autostash-${sha.slice(0, 7)}.patch`);
       writeFileSync3(patchPath, patchText, "utf-8");
       try {
-        await execAsync25(`git apply --3way --whitespace=nowarn ${quoteArg2(patchPath)}`, { cwd: rootDir });
+        await execAsync26(`git apply --3way --whitespace=nowarn ${quoteArg3(patchPath)}`, { cwd: rootDir });
         threeWayApplied = true;
         mergerLog.log(`${taskId}: autostash ${sha.slice(0, 7)} recovered via git apply --3way`);
       } catch (threeWayErr) {
@@ -93432,7 +93530,7 @@ async function restoreRescueAutostashes(rootDir, taskId, handle, ctx) {
   let unresolvedCount = 0;
   for (const rescue of rescueShas) {
     try {
-      await execAsync25(`git stash apply ${rescue.sha}`, { cwd: rootDir });
+      await execAsync26(`git stash apply ${rescue.sha}`, { cwd: rootDir });
       const dropResult = await dropAutostashBySha(rootDir, taskId, rescue.sha);
       if (dropResult.dropped) {
         mergerLog.log(`${taskId}: restored and dropped race-rescue autostash ${rescue.sha.slice(0, 7)} (${rescue.label})`);
@@ -93459,7 +93557,7 @@ async function restoreUnrelatedRootDirChanges(rootDir, taskId, handle, ctx) {
   let applyStderr = "";
   let applyErrorMsg = "";
   try {
-    await execAsync25(`git stash apply ${sha}`, { cwd: rootDir });
+    await execAsync26(`git stash apply ${sha}`, { cwd: rootDir });
   } catch (err) {
     const errAsRecord = err;
     applyErrorMsg = err instanceof Error ? err.message : String(err);
@@ -93641,6 +93739,35 @@ async function generateAiMergeSubject(commitLog, diffStat, settings, rootDir, br
     return null;
   }
 }
+async function recordCommitAssociationFromHead(store, rootDir, taskId, lineageId) {
+  let sha = "";
+  let subject = "";
+  let authoredAt = "";
+  try {
+    sha = (await execAsync26("git rev-parse HEAD", { cwd: rootDir })).stdout.trim();
+    subject = (await execAsync26("git log -1 --format=%s HEAD", { cwd: rootDir })).stdout.trim();
+    authoredAt = (await execAsync26("git log -1 --format=%aI HEAD", { cwd: rootDir })).stdout.trim();
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    mergerLog.warn(`${taskId}: skipped commit-association write \u2014 git inspection failed (${message})`);
+    return;
+  }
+  if (!sha || !subject || !authoredAt) {
+    mergerLog.warn(
+      `${taskId}: skipped commit-association write \u2014 empty git output (sha=${sha.length}, subject=${subject.length}, authoredAt=${authoredAt.length})`
+    );
+    return;
+  }
+  await store.upsertTaskCommitAssociation({
+    taskLineageId: lineageId,
+    taskIdSnapshot: taskId,
+    commitSha: sha,
+    commitSubject: subject,
+    authoredAt,
+    matchedBy: "canonical-lineage-trailer",
+    confidence: "canonical"
+  });
+}
 function deriveDeterministicSubjectSummary(commitLog) {
   const lines = commitLog.split(/\r?\n/).map((l) => l.trim()).filter((l) => l.length > 0);
   if (lines.length === 0) return null;
@@ -93689,16 +93816,16 @@ async function persistFinalizeResetLeftovers(rootDir, taskId, store) {
   try {
     const dirtyPaths = [...await snapshotDirtyFiles(rootDir)];
     if (dirtyPaths.length === 0) return;
-    await execAsync25("git add -A", { cwd: rootDir });
-    const { stdout: createOut } = await execAsync25("git stash create", { cwd: rootDir, encoding: "utf-8" });
+    await execAsync26("git add -A", { cwd: rootDir });
+    const { stdout: createOut } = await execAsync26("git stash create", { cwd: rootDir, encoding: "utf-8" });
     const sha = String(createOut).trim();
     if (!sha) {
-      await execAsync25("git reset", { cwd: rootDir }).catch(() => void 0);
+      await execAsync26("git reset", { cwd: rootDir }).catch(() => void 0);
       return;
     }
     const label = `${AUTOSTASH_LABEL_PREFIX}${taskId}:finalize-reset:${Date.now()}`;
-    await execAsync25(`git stash store -m ${quoteArg2(label)} ${sha}`, { cwd: rootDir });
-    await execAsync25("git reset", { cwd: rootDir }).catch(() => void 0);
+    await execAsync26(`git stash store -m ${quoteArg3(label)} ${sha}`, { cwd: rootDir });
+    await execAsync26("git reset", { cwd: rootDir }).catch(() => void 0);
     mergerLog.warn(
       `${taskId}: persisted ${dirtyPaths.length} dirty rootDir path(s) before finalize reset as ${sha.slice(0, 7)} (${label})`
     );
@@ -93792,12 +93919,12 @@ async function filterStagedGitignoredPaths(rootDir, taskId) {
 }
 async function commitOrAmendMergeWithFixes(rootDir, taskId, branch, commitLog, includeTaskId, preAttemptHeadSha, authorArg, diffStat, settings, signal, aiSummary, aiSubject, fixModifiedFiles = /* @__PURE__ */ new Set(), store, auditor) {
   try {
-    const { stdout: squashStagedOut } = await execAsync25("git diff --cached --name-only", {
+    const { stdout: squashStagedOut } = await execAsync26("git diff --cached --name-only", {
       cwd: rootDir,
       encoding: "utf-8"
     });
     const squashStaged = new Set(squashStagedOut.split("\n").map((l) => l.trim()).filter(Boolean));
-    const { stdout: unstagedOut } = await execAsync25("git diff --name-only", {
+    const { stdout: unstagedOut } = await execAsync26("git diff --name-only", {
       cwd: rootDir,
       encoding: "utf-8"
     });
@@ -93842,7 +93969,7 @@ async function commitOrAmendMergeWithFixes(rootDir, taskId, branch, commitLog, i
     mergerLog.log(
       `${taskId}: staging allowlist \u2014 squash: [${cap([...squashStaged])}], fixModified: [${cap([...fixModifiedFiles])}]`
     );
-    const { stdout: staged } = await execAsync25("git diff --cached --raw", {
+    const { stdout: staged } = await execAsync26("git diff --cached --raw", {
       cwd: rootDir,
       encoding: "utf-8"
     });
@@ -93852,53 +93979,53 @@ async function commitOrAmendMergeWithFixes(rootDir, taskId, branch, commitLog, i
       const path6 = match[1];
       mergerLog.warn(`${taskId}: refusing to stage gitlink "${path6}" (project uses no submodules \u2014 likely a nested worktree). Unstaging.`);
       try {
-        await execAsync25(`git reset HEAD -- "${path6}"`, { cwd: rootDir });
+        await execAsync26(`git reset HEAD -- "${path6}"`, { cwd: rootDir });
       } catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
         mergerLog.warn(`${taskId}: failed to unstage gitlink "${path6}": ${msg}`);
       }
     }
     await filterStagedGitignoredPaths(rootDir, taskId);
-    const { stdout: finalStaged } = await execAsync25("git diff --cached --name-only", {
+    const { stdout: finalStaged } = await execAsync26("git diff --cached --name-only", {
       cwd: rootDir,
       encoding: "utf-8"
     });
     const hasStaged = finalStaged.trim().length > 0;
-    const { stdout: currentHeadOut } = await execAsync25("git rev-parse HEAD", {
+    const { stdout: currentHeadOut } = await execAsync26("git rev-parse HEAD", {
       cwd: rootDir,
       encoding: "utf-8"
     });
     const currentHead = currentHeadOut.trim();
     const headMoved = currentHead !== preAttemptHeadSha;
     if (!hasStaged && !headMoved) {
-      const { stdout: branchTipOut } = await execAsync25(`git rev-parse ${quoteArg2(branch)}`, {
+      const { stdout: branchTipOut } = await execAsync26(`git rev-parse ${quoteArg3(branch)}`, {
         cwd: rootDir,
         encoding: "utf-8"
       });
       const branchTip = branchTipOut.trim();
       const trailerOnHead = await headCarriesTaskIdTrailer(rootDir, taskId);
-      const { stdout: mergeBaseOut } = await execAsync25(
-        `git merge-base ${quoteArg2(branchTip)} ${quoteArg2(preAttemptHeadSha)}`,
+      const { stdout: mergeBaseOut } = await execAsync26(
+        `git merge-base ${quoteArg3(branchTip)} ${quoteArg3(preAttemptHeadSha)}`,
         {
           cwd: rootDir,
           encoding: "utf-8"
         }
       );
       const mergeBase = mergeBaseOut.trim();
-      const { stdout: diffStatOut } = await execAsync25(`git diff --stat ${preAttemptHeadSha}..${branch}`, {
+      const { stdout: diffStatOut } = await execAsync26(`git diff --stat ${preAttemptHeadSha}..${branch}`, {
         cwd: rootDir,
         encoding: "utf-8"
       });
       const diffStatSummary = diffStatOut.split("\n").slice(0, 20).join("\n");
-      const { stdout: stagedCountOut } = await execAsync25("git diff --cached --name-only", {
+      const { stdout: stagedCountOut } = await execAsync26("git diff --cached --name-only", {
         cwd: rootDir,
         encoding: "utf-8"
       });
-      const { stdout: unstagedCountOut } = await execAsync25("git diff --name-only", {
+      const { stdout: unstagedCountOut } = await execAsync26("git diff --name-only", {
         cwd: rootDir,
         encoding: "utf-8"
       });
-      const { stdout: untrackedCountOut } = await execAsync25("git ls-files --others --exclude-standard", {
+      const { stdout: untrackedCountOut } = await execAsync26("git ls-files --others --exclude-standard", {
         cwd: rootDir,
         encoding: "utf-8"
       });
@@ -93927,8 +94054,8 @@ ${diffStatSummary || "  <empty>"}`;
       const branchTipCarriesTaskTrailer = await commitCarriesTaskIdTrailer(rootDir, taskId, branchTip);
       let branchAlreadyOnIntegrationTarget = false;
       try {
-        await execAsync25(
-          `git merge-base --is-ancestor ${quoteArg2(branchTip)} ${quoteArg2(preAttemptHeadSha)}`,
+        await execAsync26(
+          `git merge-base --is-ancestor ${quoteArg3(branchTip)} ${quoteArg3(preAttemptHeadSha)}`,
           {
             cwd: rootDir,
             encoding: "utf-8",
@@ -93950,8 +94077,8 @@ ${diffStatSummary || "  <empty>"}`;
         return { ok: true, reason: "branch-already-merged" };
       }
       try {
-        const { stdout: mergeBaseForPatchOut } = await execAsync25(
-          `git merge-base ${quoteArg2(branchTip)} ${quoteArg2(preAttemptHeadSha)}`,
+        const { stdout: mergeBaseForPatchOut } = await execAsync26(
+          `git merge-base ${quoteArg3(branchTip)} ${quoteArg3(preAttemptHeadSha)}`,
           {
             cwd: rootDir,
             encoding: "utf-8",
@@ -93960,8 +94087,8 @@ ${diffStatSummary || "  <empty>"}`;
         );
         const mergeBaseForPatch = mergeBaseForPatchOut.trim();
         if (mergeBaseForPatch) {
-          const { stdout: branchPatchIdOut } = await execAsync25(
-            `git diff ${quoteArg2(mergeBaseForPatch)}..${quoteArg2(branchTip)} | git patch-id --stable`,
+          const { stdout: branchPatchIdOut } = await execAsync26(
+            `git diff ${quoteArg3(mergeBaseForPatch)}..${quoteArg3(branchTip)} | git patch-id --stable`,
             {
               cwd: rootDir,
               encoding: "utf-8",
@@ -93970,8 +94097,8 @@ ${diffStatSummary || "  <empty>"}`;
           );
           const branchPatchId = branchPatchIdOut.trim().split(/\s+/)[0] || "";
           if (branchPatchId && branchTipCarriesTaskTrailer) {
-            const { stdout: recentShaOut } = await execAsync25(
-              `git log ${quoteArg2(preAttemptHeadSha)} -n 20 --format=%H`,
+            const { stdout: recentShaOut } = await execAsync26(
+              `git log ${quoteArg3(preAttemptHeadSha)} -n 20 --format=%H`,
               {
                 cwd: rootDir,
                 encoding: "utf-8",
@@ -93999,15 +94126,15 @@ ${diffStatSummary || "  <empty>"}`;
       let squashRestoreReportedUpToDate = false;
       try {
         await persistFinalizeResetLeftovers(rootDir, taskId, store);
-        await execAsync25(`git reset --hard ${preAttemptHeadSha}`, {
+        await execAsync26(`git reset --hard ${preAttemptHeadSha}`, {
           cwd: rootDir,
           encoding: "utf-8"
         });
-        await execAsync25("git clean -fd", {
+        await execAsync26("git clean -fd", {
           cwd: rootDir,
           encoding: "utf-8"
         });
-        const { stdout: squashRestoreOut, stderr: squashRestoreErr } = await execAsync25(`git merge --squash ${branch}`, {
+        const { stdout: squashRestoreOut, stderr: squashRestoreErr } = await execAsync26(`git merge --squash ${branch}`, {
           cwd: rootDir,
           encoding: "utf-8"
         });
@@ -94028,7 +94155,7 @@ ${msg}`;
         mergerLog.warn(`${taskId}: failed to restore squash state before finalize: ${msg}; stderr=${stderr.trim() || "<empty>"}`);
       }
       await filterStagedGitignoredPaths(rootDir, taskId);
-      const { stdout: restoredStagedOut } = await execAsync25("git diff --cached --name-only", {
+      const { stdout: restoredStagedOut } = await execAsync26("git diff --cached --name-only", {
         cwd: rootDir,
         encoding: "utf-8"
       });
@@ -94117,23 +94244,12 @@ ${msg}`;
         settings,
         store
       });
-      await execAsync25(
+      await execAsync26(
         `git commit ${subjectArg} ${bodyArg}${trailerArg}${authorArg}`,
         { cwd: rootDir, env: mergerCommitEnv() }
       );
       if (store && lineageId) {
-        const sha = (await execAsync25("git rev-parse HEAD", { cwd: rootDir })).stdout.trim();
-        const subject = (await execAsync25("git log -1 --format=%s HEAD", { cwd: rootDir })).stdout.trim();
-        const authoredAt = (await execAsync25("git log -1 --format=%aI HEAD", { cwd: rootDir })).stdout.trim();
-        await store.upsertTaskCommitAssociation({
-          taskLineageId: lineageId,
-          taskIdSnapshot: taskId,
-          commitSha: sha,
-          commitSubject: subject,
-          authoredAt,
-          matchedBy: "canonical-lineage-trailer",
-          confidence: "canonical"
-        });
+        await recordCommitAssociationFromHead(store, rootDir, taskId, lineageId);
       }
       mergerLog.log(`${taskId}: created fresh merge commit after verification fix (no prior commit to amend)`);
       return { ok: true, reason: "committed" };
@@ -94156,23 +94272,12 @@ ${msg}`;
       settings,
       store
     });
-    await execAsync25(
+    await execAsync26(
       `git commit --amend ${subjectArg} ${bodyArg}${trailerArg}${authorArg}`,
       { cwd: rootDir, env: mergerCommitEnv() }
     );
     if (store && lineageId) {
-      const sha = (await execAsync25("git rev-parse HEAD", { cwd: rootDir })).stdout.trim();
-      const subject = (await execAsync25("git log -1 --format=%s HEAD", { cwd: rootDir })).stdout.trim();
-      const authoredAt = (await execAsync25("git log -1 --format=%aI HEAD", { cwd: rootDir })).stdout.trim();
-      await store.upsertTaskCommitAssociation({
-        taskLineageId: lineageId,
-        taskIdSnapshot: taskId,
-        commitSha: sha,
-        commitSubject: subject,
-        authoredAt,
-        matchedBy: "canonical-lineage-trailer",
-        confidence: "canonical"
-      });
+      await recordCommitAssociationFromHead(store, rootDir, taskId, lineageId);
     }
     mergerLog.log(`${taskId}: amended merge commit with verification fixes (deterministic message)`);
     return { ok: true, reason: "committed" };
@@ -94187,8 +94292,8 @@ ${msg}`;
     );
     if (authority.ok) {
       try {
-        await execAsync25(`git reset --hard ${preAttemptHeadSha}`, { cwd: rootDir, encoding: "utf-8" });
-        await execAsync25("git clean -fd", { cwd: rootDir, encoding: "utf-8" });
+        await execAsync26(`git reset --hard ${preAttemptHeadSha}`, { cwd: rootDir, encoding: "utf-8" });
+        await execAsync26("git clean -fd", { cwd: rootDir, encoding: "utf-8" });
         mergerLog.warn(
           `${taskId}: finalize threw but branch ref is authoritative (tip carries Fusion-Task-Id, no foreign commits since base) \u2014 reset HEAD to ${preAttemptHeadSha.slice(0, 8)} for clean retry`
         );
@@ -94356,9 +94461,9 @@ async function applyLayer3ConflictScopePartition(params) {
   const { inScope } = partitionConflictsByFileScope({ conflictFiles, declaredScope: effectiveDeclaredScope });
   for (const file of outOfScope) {
     await resolveWithOurs(file, rootDir);
-    await execAsync25(`git reset HEAD -- ${quoteArg2(file)}`, { cwd: rootDir });
+    await execAsync26(`git reset HEAD -- ${quoteArg3(file)}`, { cwd: rootDir });
   }
-  const { stdout: stagedOut } = await execAsync25("git diff --cached --name-only", { cwd: rootDir, encoding: "utf-8" });
+  const { stdout: stagedOut } = await execAsync26("git diff --cached --name-only", { cwd: rootDir, encoding: "utf-8" });
   const stagedAfterPartition = stagedOut.split("\n").map((line) => line.trim()).filter(Boolean);
   const outOfScopeStillStaged = stagedAfterPartition.filter((file) => outOfScope.includes(file));
   if (outOfScopeStillStaged.length > 0) {
@@ -94406,7 +94511,7 @@ async function assertSquashOverlapsFileScope(params) {
   if (declaredScope.length === 0) {
     return;
   }
-  const { stdout } = await execAsync25("git diff --cached --name-only", {
+  const { stdout } = await execAsync26("git diff --cached --name-only", {
     cwd: rootDir,
     encoding: "utf-8"
   });
@@ -94513,12 +94618,12 @@ async function resolveTaskDiffBaseRef({
   const fallbackBranch = integrationBranchFallback?.trim() || void 0;
   const fallbackRemote = integrationRemoteFallback?.trim() || void 0;
   const resolvedBaseBranch = baseBranch?.trim() || (baseCommitSha ? void 0 : fallbackBranch);
-  const quotedHeadRef = quoteArg2(headRef);
+  const quotedHeadRef = quoteArg3(headRef);
   let mergeBase;
   if (resolvedBaseBranch) {
     try {
       try {
-        const { stdout } = await execAsync25(`git merge-base ${quotedHeadRef} ${quoteArg2(resolvedBaseBranch)}`, {
+        const { stdout } = await execAsync26(`git merge-base ${quotedHeadRef} ${quoteArg3(resolvedBaseBranch)}`, {
           cwd,
           encoding: "utf-8"
         });
@@ -94527,7 +94632,7 @@ async function resolveTaskDiffBaseRef({
         if (!fallbackRemote) {
           throw new Error("missing integration remote fallback");
         }
-        const { stdout } = await execAsync25(`git merge-base ${quotedHeadRef} ${quoteArg2(`${fallbackRemote}/${resolvedBaseBranch}`)}`, {
+        const { stdout } = await execAsync26(`git merge-base ${quotedHeadRef} ${quoteArg3(`${fallbackRemote}/${resolvedBaseBranch}`)}`, {
           cwd,
           encoding: "utf-8"
         });
@@ -94538,7 +94643,7 @@ async function resolveTaskDiffBaseRef({
   }
   if (mergeBase) {
     try {
-      const { stdout } = await execAsync25(`git rev-parse ${quotedHeadRef}`, {
+      const { stdout } = await execAsync26(`git rev-parse ${quotedHeadRef}`, {
         cwd,
         encoding: "utf-8"
       });
@@ -94551,7 +94656,7 @@ async function resolveTaskDiffBaseRef({
   let recoveredBase;
   if (!baseBranch?.trim() && fallbackBranch) {
     try {
-      const { stdout } = await execAsync25(`git merge-base ${quotedHeadRef} ${quoteArg2(fallbackBranch)}`, {
+      const { stdout } = await execAsync26(`git merge-base ${quotedHeadRef} ${quoteArg3(fallbackBranch)}`, {
         cwd,
         encoding: "utf-8"
       });
@@ -94559,7 +94664,7 @@ async function resolveTaskDiffBaseRef({
     } catch {
       if (fallbackRemote) {
         try {
-          const { stdout } = await execAsync25(`git merge-base ${quotedHeadRef} ${quoteArg2(`${fallbackRemote}/${fallbackBranch}`)}`, {
+          const { stdout } = await execAsync26(`git merge-base ${quotedHeadRef} ${quoteArg3(`${fallbackRemote}/${fallbackBranch}`)}`, {
             cwd,
             encoding: "utf-8"
           });
@@ -94571,13 +94676,13 @@ async function resolveTaskDiffBaseRef({
   }
   if (baseCommitSha) {
     try {
-      await execAsync25(`git merge-base --is-ancestor ${quoteArg2(baseCommitSha)} ${quotedHeadRef}`, {
+      await execAsync26(`git merge-base --is-ancestor ${quoteArg3(baseCommitSha)} ${quotedHeadRef}`, {
         cwd,
         encoding: "utf-8"
       });
       if (recoveredBase && recoveredBase !== baseCommitSha) {
         try {
-          await execAsync25(`git merge-base --is-ancestor ${quoteArg2(baseCommitSha)} ${quoteArg2(recoveredBase)}`, {
+          await execAsync26(`git merge-base --is-ancestor ${quoteArg3(baseCommitSha)} ${quoteArg3(recoveredBase)}`, {
             cwd,
             encoding: "utf-8"
           });
@@ -94591,7 +94696,7 @@ async function resolveTaskDiffBaseRef({
   }
   if (recoveredBase) return recoveredBase;
   try {
-    const { stdout } = await execAsync25(`git rev-parse ${quoteArg2(`${headRef}~1`)}`, {
+    const { stdout } = await execAsync26(`git rev-parse ${quoteArg3(`${headRef}~1`)}`, {
       cwd,
       encoding: "utf-8"
     });
@@ -94602,7 +94707,7 @@ async function resolveTaskDiffBaseRef({
 }
 async function getConflictedFiles(cwd) {
   try {
-    const { stdout } = await execAsync25("git diff --name-only --diff-filter=U", {
+    const { stdout } = await execAsync26("git diff --name-only --diff-filter=U", {
       cwd,
       encoding: "utf-8"
     });
@@ -94615,7 +94720,7 @@ async function getConflictedFiles(cwd) {
 }
 async function isTrivialWhitespaceConflict(filePath, cwd) {
   try {
-    const { stdout } = await execAsync25(
+    const { stdout } = await execAsync26(
       `git diff-tree -p -w -- :2:"${filePath}" :3:"${filePath}"`,
       { cwd, encoding: "utf-8" }
     );
@@ -94720,7 +94825,7 @@ function buildTaskTrailerArgs(taskId, lineageId) {
 }
 async function commitCarriesTaskIdTrailer(rootDir, taskId, commitish) {
   try {
-    const { stdout } = await execAsync25(`git log -1 --pretty=%B ${quoteArg2(commitish)}`, {
+    const { stdout } = await execAsync26(`git log -1 --pretty=%B ${quoteArg3(commitish)}`, {
       cwd: rootDir,
       encoding: "utf-8"
     });
@@ -94736,7 +94841,7 @@ async function headCarriesTaskIdTrailer(rootDir, taskId) {
 }
 async function ensureTaskTrailersOnHead(rootDir, task) {
   try {
-    const { stdout: existingMessage } = await execAsync25("git log -1 --pretty=%B", {
+    const { stdout: existingMessage } = await execAsync26("git log -1 --pretty=%B", {
       cwd: rootDir,
       encoding: "utf-8"
     });
@@ -94752,7 +94857,7 @@ async function ensureTaskTrailersOnHead(rootDir, task) {
     for (const trailer of trailersToAdd) {
       amendCommand += ` --trailer "${trailer}"`;
     }
-    await execAsync25(amendCommand, { cwd: rootDir, env: mergerCommitEnv() });
+    await execAsync26(amendCommand, { cwd: rootDir, env: mergerCommitEnv() });
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     mergerLog.warn(`${task.id}: failed to add merge trailers to HEAD (${msg}) \u2014 relying on fallback ownership signals`);
@@ -94760,21 +94865,21 @@ async function ensureTaskTrailersOnHead(rootDir, task) {
 }
 async function runCherryPickWithEmptySkip(rootDir, args) {
   try {
-    await execAsync25(`git cherry-pick ${args}`, { cwd: rootDir });
+    await execAsync26(`git cherry-pick ${args}`, { cwd: rootDir });
     return { kind: "landed" };
   } catch (error) {
     if (!isEmptyCherryPickError(error)) {
       throw error;
     }
     try {
-      await execAsync25("git cherry-pick --skip", { cwd: rootDir });
+      await execAsync26("git cherry-pick --skip", { cwd: rootDir });
       return { kind: "empty", recovery: "skip" };
     } catch {
       try {
-        await execAsync25("git cherry-pick --abort", { cwd: rootDir });
+        await execAsync26("git cherry-pick --abort", { cwd: rootDir });
       } catch {
       }
-      await execAsync25("git reset --hard HEAD", { cwd: rootDir });
+      await execAsync26("git reset --hard HEAD", { cwd: rootDir });
       return { kind: "empty", recovery: "abort-reset" };
     }
   }
@@ -94792,13 +94897,13 @@ ${message}`;
 }
 async function isCherryPickInProgress(rootDir) {
   try {
-    const { stdout: cherryPickHeadPathOut } = await execAsync25("git rev-parse --git-path CHERRY_PICK_HEAD", {
+    const { stdout: cherryPickHeadPathOut } = await execAsync26("git rev-parse --git-path CHERRY_PICK_HEAD", {
       cwd: rootDir,
       encoding: "utf-8"
     });
     const cherryPickHeadPath = join42(rootDir, cherryPickHeadPathOut.trim());
     if (existsSync37(cherryPickHeadPath)) return true;
-    const { stdout: sequencerPathOut } = await execAsync25("git rev-parse --git-path sequencer", {
+    const { stdout: sequencerPathOut } = await execAsync26("git rev-parse --git-path sequencer", {
       cwd: rootDir,
       encoding: "utf-8"
     });
@@ -94810,7 +94915,7 @@ async function isCherryPickInProgress(rootDir) {
 }
 async function cherryPickCommitPreservingTaskTrailers(rootDir, commitSha, task, mergeConflictStrategy, smartConflictResolution, result) {
   try {
-    const initialPick = await runCherryPickWithEmptySkip(rootDir, quoteArg2(commitSha));
+    const initialPick = await runCherryPickWithEmptySkip(rootDir, quoteArg3(commitSha));
     if (initialPick.kind === "empty") {
       return { landed: false, reason: "empty" };
     }
@@ -94837,22 +94942,22 @@ async function cherryPickCommitPreservingTaskTrailers(rootDir, commitSha, task,
         }
       }
       if (unresolvedComplex === 0) {
-        await execAsync25("git cherry-pick --continue", { cwd: rootDir });
+        await execAsync26("git cherry-pick --continue", { cwd: rootDir });
         await ensureTaskTrailersOnHead(rootDir, task);
         return { landed: true };
       }
     }
     try {
-      await execAsync25("git cherry-pick --abort", { cwd: rootDir });
+      await execAsync26("git cherry-pick --abort", { cwd: rootDir });
     } catch {
     }
     if (mergeConflictStrategy === "smart-prefer-main") {
-      const fallbackPick = await runCherryPickWithEmptySkip(rootDir, `-X ours ${quoteArg2(commitSha)}`);
+      const fallbackPick = await runCherryPickWithEmptySkip(rootDir, `-X ours ${quoteArg3(commitSha)}`);
       if (fallbackPick.kind === "empty") {
         return { landed: false, reason: "empty" };
       }
     } else if (mergeConflictStrategy === "smart-prefer-branch") {
-      const fallbackPick = await runCherryPickWithEmptySkip(rootDir, `-X theirs ${quoteArg2(commitSha)}`);
+      const fallbackPick = await runCherryPickWithEmptySkip(rootDir, `-X theirs ${quoteArg3(commitSha)}`);
       if (fallbackPick.kind === "empty") {
         return { landed: false, reason: "empty" };
       }
@@ -94865,11 +94970,11 @@ async function cherryPickCommitPreservingTaskTrailers(rootDir, commitSha, task,
 }
 async function applyBranchCommitsPreservingHistory(params) {
   const { rootDir, baseRef, branch, task, taskId, store, mergeConflictStrategy, smartConflictResolution, result, testCommand, buildCommand: buildCommand2, testSource, buildSource, signal } = params;
-  const { stdout: baseShaStdout } = await execAsync25(`git rev-parse ${quoteArg2(baseRef)}`, { cwd: rootDir, encoding: "utf-8" });
+  const { stdout: baseShaStdout } = await execAsync26(`git rev-parse ${quoteArg3(baseRef)}`, { cwd: rootDir, encoding: "utf-8" });
   const baseSha = baseShaStdout.trim();
-  const { stdout: originalBranchShaOut } = await execAsync25("git rev-parse HEAD", { cwd: rootDir, encoding: "utf-8" });
+  const { stdout: originalBranchShaOut } = await execAsync26("git rev-parse HEAD", { cwd: rootDir, encoding: "utf-8" });
   const originalBranchSha = originalBranchShaOut.trim();
-  const { stdout: commitStdout } = await execAsync25(`git rev-list --reverse ${quoteArg2(`${baseSha}..${branch}`)}`, {
+  const { stdout: commitStdout } = await execAsync26(`git rev-list --reverse ${quoteArg3(`${baseSha}..${branch}`)}`, {
     cwd: rootDir,
     encoding: "utf-8"
   });
@@ -94890,7 +94995,7 @@ async function applyBranchCommitsPreservingHistory(params) {
       skippedEmptyCount += 1;
       continue;
     }
-    const { stdout: landedShaOut } = await execAsync25("git rev-parse HEAD", { cwd: rootDir, encoding: "utf-8" });
+    const { stdout: landedShaOut } = await execAsync26("git rev-parse HEAD", { cwd: rootDir, encoding: "utf-8" });
     landedCommitShas.push(landedShaOut.trim());
   }
   const fullySubsumedByMain = landedCommitShas.length === 0 && skippedEmptyCount === commitShas.length && commitShas.length > 0;
@@ -94900,26 +95005,26 @@ async function applyBranchCommitsPreservingHistory(params) {
     await store.logEntry(taskId, `Auto-merge skipped ${skippedEmptyCount} empty cherry-pick(s); proceeded with ${landedCommitShas.length} non-empty commit(s)`);
   }
   try {
-    const { stdout: statusOut } = await execAsync25("git status --porcelain", { cwd: rootDir, encoding: "utf-8" });
+    const { stdout: statusOut } = await execAsync26("git status --porcelain", { cwd: rootDir, encoding: "utf-8" });
     const statusClean = statusOut.trim().length === 0;
     const cherryPickActive = await isCherryPickInProgress(rootDir);
     if (!statusClean || cherryPickActive) {
       mergerLog.warn(`${taskId}: cherry-pick cleanup invariant violated (statusClean=${statusClean}, cherryPickActive=${cherryPickActive}); attempting defensive recovery`);
       try {
-        await execAsync25("git cherry-pick --abort", { cwd: rootDir });
+        await execAsync26("git cherry-pick --abort", { cwd: rootDir });
       } catch {
       }
-      await execAsync25(`git reset --hard ${quoteArg2(originalBranchSha)}`, { cwd: rootDir });
+      await execAsync26(`git reset --hard ${quoteArg3(originalBranchSha)}`, { cwd: rootDir });
     }
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     mergerLog.warn(`${taskId}: failed while validating cherry-pick cleanup invariant (${message}); attempting defensive recovery`);
     try {
-      await execAsync25("git cherry-pick --abort", { cwd: rootDir });
+      await execAsync26("git cherry-pick --abort", { cwd: rootDir });
     } catch {
     }
     try {
-      await execAsync25(`git reset --hard ${quoteArg2(originalBranchSha)}`, { cwd: rootDir });
+      await execAsync26(`git reset --hard ${quoteArg3(originalBranchSha)}`, { cwd: rootDir });
     } catch {
     }
   }
@@ -95084,7 +95189,7 @@ async function findWorktreeUser(store, worktreePath, excludeTaskId) {
   }
   return null;
 }
-function quoteArg2(value) {
+function quoteArg3(value) {
   return `"${value.replace(/(["\\$`])/g, "\\$1")}"`;
 }
 function parseShortstatSummary(statsOutput) {
@@ -95102,7 +95207,7 @@ async function sumShortstatsForCommits(rootDir, ownCommitShas) {
   let insertions = 0;
   let deletions = 0;
   for (const sha of ownCommitShas) {
-    const { stdout } = await execAsync25(`git show --shortstat --format= ${quoteArg2(sha)}`, {
+    const { stdout } = await execAsync26(`git show --shortstat --format= ${quoteArg3(sha)}`, {
       cwd: rootDir,
       encoding: "utf-8",
       maxBuffer: 2 * 1024 * 1024
@@ -95184,12 +95289,12 @@ async function captureRebaseLandedFilesForTask(params) {
     if (onAttributionFailure) {
       await onAttributionFailure(message);
     }
-    const { stdout: landedFilesOutput } = await execAsync25(
-      `git diff --name-only ${quoteArg2(`${rebaseMergeBaseSha}..${recordedSha}`)}`,
+    const { stdout: landedFilesOutput } = await execAsync26(
+      `git diff --name-only ${quoteArg3(`${rebaseMergeBaseSha}..${recordedSha}`)}`,
       { cwd: rootDir, encoding: "utf-8", maxBuffer: 2 * 1024 * 1024 }
     );
     const landedFiles = landedFilesOutput.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
-    const { stdout: statsOutput } = await execAsync25(`git diff --shortstat ${quoteArg2(`${rebaseMergeBaseSha}..HEAD`)}`, {
+    const { stdout: statsOutput } = await execAsync26(`git diff --shortstat ${quoteArg3(`${rebaseMergeBaseSha}..HEAD`)}`, {
       cwd: rootDir,
       encoding: "utf-8"
     });
@@ -95228,7 +95333,7 @@ function isNonSubstantiveCommitChange(change) {
   return isGeneratedOnlyPath(change.filePath);
 }
 async function classifyBranchCommitsForDirectMerge(rootDir, baseRef, branch) {
-  const { stdout: commitStdout } = await execAsync25(`git rev-list --reverse ${quoteArg2(`${baseRef}..${branch}`)}`, {
+  const { stdout: commitStdout } = await execAsync26(`git rev-list --reverse ${quoteArg3(`${baseRef}..${branch}`)}`, {
     cwd: rootDir,
     encoding: "utf-8"
   });
@@ -95237,7 +95342,7 @@ async function classifyBranchCommitsForDirectMerge(rootDir, baseRef, branch) {
   for (const sha of commitShas) {
     let subject = sha;
     try {
-      const { stdout } = await execAsync25(`git log -1 --format=%s ${quoteArg2(sha)}`, {
+      const { stdout } = await execAsync26(`git log -1 --format=%s ${quoteArg3(sha)}`, {
         cwd: rootDir,
         encoding: "utf-8"
       });
@@ -95246,7 +95351,7 @@ async function classifyBranchCommitsForDirectMerge(rootDir, baseRef, branch) {
     }
     let substantive = true;
     try {
-      const { stdout } = await execAsync25(`git diff-tree --root --no-commit-id --name-status -r ${quoteArg2(sha)}`, {
+      const { stdout } = await execAsync26(`git diff-tree --root --no-commit-id --name-status -r ${quoteArg3(sha)}`, {
         cwd: rootDir,
         encoding: "utf-8"
       });
@@ -95278,7 +95383,7 @@ async function resolveAuditRangeBaseCandidate(opts) {
   const candidateRef = opts.candidateRef.trim();
   if (!candidateRef) return void 0;
   try {
-    const { stdout: resolvedOut } = await execAsync25(`git rev-parse --verify ${quoteArg2(`${candidateRef}^{commit}`)}`, {
+    const { stdout: resolvedOut } = await execAsync26(`git rev-parse --verify ${quoteArg3(`${candidateRef}^{commit}`)}`, {
       cwd: opts.rootDir,
       encoding: "utf-8"
     });
@@ -95286,7 +95391,7 @@ async function resolveAuditRangeBaseCandidate(opts) {
     if (!resolvedSha || resolvedSha === opts.auditSha) {
       return void 0;
     }
-    await execAsync25(`git merge-base --is-ancestor ${quoteArg2(resolvedSha)} ${quoteArg2(opts.auditSha)}`, {
+    await execAsync26(`git merge-base --is-ancestor ${quoteArg3(resolvedSha)} ${quoteArg3(opts.auditSha)}`, {
       cwd: opts.rootDir,
       encoding: "utf-8"
     });
@@ -95335,7 +95440,7 @@ async function resolvePostMergeAuditInvocation(opts) {
   }
   let mergeBaseSha;
   try {
-    const { stdout } = await execAsync25(`git merge-base ${quoteArg2(opts.auditSha)} ${quoteArg2(opts.mergeTargetBranch)}`, {
+    const { stdout } = await execAsync26(`git merge-base ${quoteArg3(opts.auditSha)} ${quoteArg3(opts.mergeTargetBranch)}`, {
       cwd: opts.rootDir,
       encoding: "utf-8"
     });
@@ -95489,8 +95594,8 @@ ${cleanStat}`;
 }
 async function commitPatchId(rootDir, sha) {
   try {
-    const { stdout } = await execAsync25(
-      `git diff-tree -p ${quoteArg2(sha)} | git patch-id --stable`,
+    const { stdout } = await execAsync26(
+      `git diff-tree -p ${quoteArg3(sha)} | git patch-id --stable`,
       { cwd: rootDir, encoding: "utf-8" }
     );
     const line = stdout.trim();
@@ -95504,8 +95609,8 @@ async function commitPatchId(rootDir, sha) {
 async function collectPatchIds(rootDir, target, windowSize) {
   const ids = /* @__PURE__ */ new Set();
   try {
-    const { stdout } = await execAsync25(
-      `git log -n ${Math.max(1, windowSize)} --format=%H ${quoteArg2(target)}`,
+    const { stdout } = await execAsync26(
+      `git log -n ${Math.max(1, windowSize)} --format=%H ${quoteArg3(target)}`,
       { cwd: rootDir, encoding: "utf-8" }
     );
     const shas = stdout.trim().split("\n").filter(Boolean);
@@ -95519,16 +95624,16 @@ async function collectPatchIds(rootDir, target, windowSize) {
 }
 async function computeActualMergeCommitContext(params) {
   const { rootDir, integrationTargetSha, branch } = params;
-  const targetArg = quoteArg2(integrationTargetSha);
+  const targetArg = quoteArg3(integrationTargetSha);
   let diffStat = "";
   try {
-    const { stdout: stagedStat } = await execAsync25(
+    const { stdout: stagedStat } = await execAsync26(
       `git diff --cached ${targetArg} --stat`,
       { cwd: rootDir, encoding: "utf-8" }
     );
     diffStat = stagedStat.trim();
     if (diffStat.length === 0) {
-      const { stdout: headStat } = await execAsync25(
+      const { stdout: headStat } = await execAsync26(
         `git diff ${targetArg} HEAD --stat`,
         { cwd: rootDir, encoding: "utf-8" }
       );
@@ -95539,8 +95644,8 @@ async function computeActualMergeCommitContext(params) {
   let commitLog = "";
   try {
     const targetPatchIds = await collectPatchIds(rootDir, integrationTargetSha, 200);
-    const { stdout: branchShas } = await execAsync25(
-      `git log ${targetArg}..${quoteArg2(branch)} --format=%H`,
+    const { stdout: branchShas } = await execAsync26(
+      `git log ${targetArg}..${quoteArg3(branch)} --format=%H`,
       { cwd: rootDir, encoding: "utf-8" }
     );
     const shas = branchShas.trim().split("\n").filter(Boolean);
@@ -95549,8 +95654,8 @@ async function computeActualMergeCommitContext(params) {
       const pid = await commitPatchId(rootDir, sha);
       if (pid && targetPatchIds.has(pid)) continue;
       try {
-        const { stdout: subj } = await execAsync25(
-          `git log -1 ${quoteArg2(sha)} --format=%s`,
+        const { stdout: subj } = await execAsync26(
+          `git log -1 ${quoteArg3(sha)} --format=%s`,
           { cwd: rootDir, encoding: "utf-8" }
         );
         const s3 = subj.trim();
@@ -95565,8 +95670,8 @@ async function computeActualMergeCommitContext(params) {
 }
 async function listBranchCommits(rootDir, target, branch) {
   try {
-    const { stdout } = await execAsync25(
-      `git log --reverse --format=%H ${quoteArg2(target)}..${quoteArg2(branch)}`,
+    const { stdout } = await execAsync26(
+      `git log --reverse --format=%H ${quoteArg3(target)}..${quoteArg3(branch)}`,
       { cwd: rootDir, encoding: "utf-8" }
     );
     return stdout.trim().split("\n").filter(Boolean);
@@ -95728,10 +95833,10 @@ async function resolveRebaseConflictSet(store, rootDir, taskId, settings, option
   }
 }
 async function pullWithRebaseAndResolveConflicts(store, rootDir, taskId, settings, remote, branch, options) {
-  const pullCommand = `git pull --rebase ${quoteArg2(remote)} ${quoteArg2(branch)}`;
+  const pullCommand = `git pull --rebase ${quoteArg3(remote)} ${quoteArg3(branch)}`;
   try {
     throwIfAborted(options?.signal, taskId);
-    await execAsync25(pullCommand, {
+    await execAsync26(pullCommand, {
       cwd: rootDir,
       timeout: PULL_REBASE_TIMEOUT_MS,
       maxBuffer: VERIFICATION_COMMAND_MAX_BUFFER,
@@ -95757,7 +95862,7 @@ async function pullWithRebaseAndResolveConflicts(store, rootDir, taskId, setting
         }
         try {
           throwIfAborted(options?.signal, taskId);
-          await execAsync25("GIT_EDITOR=true git rebase --continue", {
+          await execAsync26("GIT_EDITOR=true git rebase --continue", {
             cwd: rootDir,
             timeout: PULL_REBASE_TIMEOUT_MS,
             maxBuffer: VERIFICATION_COMMAND_MAX_BUFFER,
@@ -95784,7 +95889,7 @@ async function pullWithRebaseAndResolveConflicts(store, rootDir, taskId, setting
     } catch (resolutionError) {
       if (isRebaseInProgress(rootDir)) {
         try {
-          await execAsync25("git rebase --abort", {
+          await execAsync26("git rebase --abort", {
             cwd: rootDir,
             timeout: PUSH_TIMEOUT_MS,
             maxBuffer: VERIFICATION_COMMAND_MAX_BUFFER,
@@ -95822,10 +95927,10 @@ async function pushToRemoteAfterMerge(store, rootDir, taskId, settings, options)
     mergerLog.error(`${taskId}: pull --rebase before push failed: ${message}`);
     return { pushed: false, error: message };
   }
-  const pushCommand = `git push ${quoteArg2(remote)} ${quoteArg2(branch)}`;
+  const pushCommand = `git push ${quoteArg3(remote)} ${quoteArg3(branch)}`;
   try {
     throwIfAborted(options?.signal, taskId);
-    await execAsync25(pushCommand, {
+    await execAsync26(pushCommand, {
       cwd: rootDir,
       timeout: PUSH_TIMEOUT_MS,
       maxBuffer: VERIFICATION_COMMAND_MAX_BUFFER,
@@ -95844,7 +95949,7 @@ async function pushToRemoteAfterMerge(store, rootDir, taskId, settings, options)
       throwIfAborted(options?.signal, taskId);
       await pullWithRebaseAndResolveConflicts(store, rootDir, taskId, settings, remote, branch, options);
       throwIfAborted(options?.signal, taskId);
-      await execAsync25(pushCommand, {
+      await execAsync26(pushCommand, {
         cwd: rootDir,
         timeout: PUSH_TIMEOUT_MS,
         maxBuffer: VERIFICATION_COMMAND_MAX_BUFFER,
@@ -95864,7 +95969,7 @@ async function createPostMergeWorktree(rootDir, taskId, settings) {
   const randomSuffix = Math.random().toString(36).slice(2, 10);
   const postMergeWorktree = resolveTaskWorktreePath(rootDir, settings, `post-merge-${taskId}-${randomSuffix}`);
   try {
-    await execAsync25(`git worktree add ${quoteArg2(postMergeWorktree)} HEAD`, { cwd: rootDir });
+    await execAsync26(`git worktree add ${quoteArg3(postMergeWorktree)} HEAD`, { cwd: rootDir });
     return postMergeWorktree;
   } catch (err) {
     mergerLog.warn(`${taskId}: failed to create post-merge worktree: ${getCommandErrorMessage(err)}`);
@@ -95888,8 +95993,8 @@ async function tryEarlyEmptyOwnDiffFinalize(input) {
   const { task, taskId, store, audit, log: log25, projectRootDir, mergeTargetBranch } = input;
   const branch = task.branch || canonicalFusionBranchName(taskId);
   try {
-    await execAsync25(
-      `git show-ref --verify --quiet ${quoteArg2(`refs/heads/${branch}`)}`,
+    await execAsync26(
+      `git show-ref --verify --quiet ${quoteArg3(`refs/heads/${branch}`)}`,
       { cwd: projectRootDir, timeout: 3e4 }
     );
   } catch {
@@ -95897,8 +96002,8 @@ async function tryEarlyEmptyOwnDiffFinalize(input) {
   }
   let aheadCount;
   try {
-    const { stdout } = await execAsync25(
-      `git rev-list --count ${quoteArg2(`${mergeTargetBranch}..${branch}`)}`,
+    const { stdout } = await execAsync26(
+      `git rev-list --count ${quoteArg3(`${mergeTargetBranch}..${branch}`)}`,
       { cwd: projectRootDir, encoding: "utf-8", timeout: 3e4 }
     );
     const parsed = Number.parseInt(stdout.trim(), 10);
@@ -95909,8 +96014,8 @@ async function tryEarlyEmptyOwnDiffFinalize(input) {
   }
   let mergeBase;
   try {
-    const { stdout } = await execAsync25(
-      `git merge-base ${quoteArg2(mergeTargetBranch)} ${quoteArg2(branch)}`,
+    const { stdout } = await execAsync26(
+      `git merge-base ${quoteArg3(mergeTargetBranch)} ${quoteArg3(branch)}`,
       { cwd: projectRootDir, encoding: "utf-8", timeout: 3e4 }
     );
     mergeBase = stdout.trim();
@@ -95919,8 +96024,8 @@ async function tryEarlyEmptyOwnDiffFinalize(input) {
     return null;
   }
   try {
-    await execAsync25(
-      `git diff --quiet ${quoteArg2(`${mergeBase}..${branch}`)}`,
+    await execAsync26(
+      `git diff --quiet ${quoteArg3(`${mergeBase}..${branch}`)}`,
       { cwd: projectRootDir, timeout: 3e4 }
     );
   } catch {
@@ -95975,7 +96080,7 @@ async function tryEarlyEmptyOwnDiffFinalize(input) {
       let dirty = false;
       let dirtyDiagnostic;
       try {
-        const { stdout } = await execAsync25(
+        const { stdout } = await execAsync26(
           `git status --porcelain --untracked-files=no`,
           { cwd: stranded, encoding: "utf-8", timeout: 15e3 }
         );
@@ -95996,8 +96101,8 @@ async function tryEarlyEmptyOwnDiffFinalize(input) {
         );
       } else {
         try {
-          await execAsync25(
-            `git worktree remove --force ${quoteArg2(stranded)}`,
+          await execAsync26(
+            `git worktree remove --force ${quoteArg3(stranded)}`,
             { cwd: projectRootDir, timeout: 3e4 }
           );
           worktreeRemoved = true;
@@ -96011,8 +96116,8 @@ async function tryEarlyEmptyOwnDiffFinalize(input) {
   }
   if (ownedBranchOnEntry) {
     try {
-      await execAsync25(
-        `git branch -D ${quoteArg2(ownedBranchOnEntry)}`,
+      await execAsync26(
+        `git branch -D ${quoteArg3(ownedBranchOnEntry)}`,
         { cwd: projectRootDir, timeout: 3e4 }
       );
       branchDeleted = true;
@@ -96166,7 +96271,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
     const directReuseEligible = !(options.pool && settings.recycleWorktrees);
     if (directReuseEligible) {
       try {
-        const { stdout: porcelain } = await execAsync25(
+        const { stdout: porcelain } = await execAsync26(
           `git worktree list --porcelain`,
           { cwd: projectRootDir, encoding: "utf-8", timeout: 3e4 }
         );
@@ -96212,7 +96317,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
         }
         if (prunedAnyStaleRegistration) {
           try {
-            await execAsync25(`git worktree prune`, { cwd: projectRootDir, encoding: "utf-8", timeout: 3e4 });
+            await execAsync26(`git worktree prune`, { cwd: projectRootDir, encoding: "utf-8", timeout: 3e4 });
             await emitReuseHandoffAuditEvent(
               "merge:reuse-fallback-pruned-stale-registration",
               {
@@ -96302,7 +96407,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
       runContext: engineRunContext,
       runInitCommand: false,
       createWorktree: async (branch2, path6, _taskId, _startPoint, _allowSiblingBranchRename) => {
-        await execAsync25(`git worktree add -f ${quoteArg2(path6)} ${quoteArg2(branch2)}`, {
+        await execAsync26(`git worktree add -f ${quoteArg3(path6)} ${quoteArg3(branch2)}`, {
           cwd: projectRootDir,
           encoding: "utf-8",
           timeout: 12e4,
@@ -96513,28 +96618,28 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
   };
   const resolveAheadCount = async () => {
     try {
-      await execAsync25(`git rev-parse --verify ${quoteArg2(branch)}`, { cwd: rootDir, timeout: 3e4 });
+      await execAsync26(`git rev-parse --verify ${quoteArg3(branch)}`, { cwd: rootDir, timeout: 3e4 });
     } catch {
       return null;
     }
     let baseRef = requestedBaseRef;
     try {
-      await execAsync25(`git rev-parse --verify ${quoteArg2(baseRef)}`, { cwd: rootDir, timeout: 3e4 });
+      await execAsync26(`git rev-parse --verify ${quoteArg3(baseRef)}`, { cwd: rootDir, timeout: 3e4 });
     } catch {
       if (!integrationRemote) {
         return null;
       }
       const remoteRef = `${integrationRemote}/${requestedBaseRef}`;
       try {
-        await execAsync25(`git rev-parse --verify ${quoteArg2(remoteRef)}`, { cwd: rootDir, timeout: 3e4 });
+        await execAsync26(`git rev-parse --verify ${quoteArg3(remoteRef)}`, { cwd: rootDir, timeout: 3e4 });
         baseRef = remoteRef;
       } catch {
         return null;
       }
     }
     try {
-      const { stdout } = await execAsync25(
-        `git rev-list --count ${quoteArg2(baseRef)}..${quoteArg2(branch)}`,
+      const { stdout } = await execAsync26(
+        `git rev-list --count ${quoteArg3(baseRef)}..${quoteArg3(branch)}`,
         { cwd: rootDir, timeout: 3e4 }
       );
       const aheadCount = Number.parseInt(stdout.trim(), 10);
@@ -96550,13 +96655,21 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
   if (aheadInfo?.aheadCount === 0) {
     const classification = await classifyOwnedLandedEvidence(rootDir, task, { mergeTargetBranch: aheadInfo.baseRef });
     if (classification.kind === "owned-commit") {
+      const mergeCommitMessage = await regenerateBareMergeSubject({
+        subject: classification.commit.subject,
+        commitSha: classification.commit.sha,
+        branch,
+        taskId,
+        rootDir,
+        settings
+      });
       const mergeDetails = {
         ...task.mergeDetails || {},
         commitSha: classification.commit.sha,
         filesChanged: classification.commit.filesChanged,
         insertions: classification.commit.insertions,
         deletions: classification.commit.deletions,
-        mergeCommitMessage: classification.commit.subject,
+        mergeCommitMessage,
         mergeConfirmed: true,
         mergedAt: (/* @__PURE__ */ new Date()).toISOString(),
         prNumber: task.prInfo?.number,
@@ -96755,13 +96868,21 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
       }
       if (classification.kind === "owned-commit") {
         const mergedAt = (/* @__PURE__ */ new Date()).toISOString();
+        const mergeCommitMessage = await regenerateBareMergeSubject({
+          subject: classification.commit.subject,
+          commitSha: classification.commit.sha,
+          branch,
+          taskId,
+          rootDir,
+          settings
+        });
         await store.updateTask(taskId, {
           mergeDetails: {
             commitSha: classification.commit.sha,
             filesChanged: classification.commit.filesChanged,
             insertions: classification.commit.insertions,
             deletions: classification.commit.deletions,
-            mergeCommitMessage: classification.commit.subject,
+            mergeCommitMessage,
             mergedAt,
             mergeConfirmed: true,
             prNumber: task.prInfo?.number,
@@ -96775,7 +96896,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
         result.filesChanged = classification.commit.filesChanged;
         result.insertions = classification.commit.insertions;
         result.deletions = classification.commit.deletions;
-        result.mergeCommitMessage = classification.commit.subject;
+        result.mergeCommitMessage = mergeCommitMessage;
         result.mergedAt = mergedAt;
         result.mergeTargetBranch = mergeTarget.branch;
         result.mergeTargetSource = mergeTarget.source;
@@ -96822,13 +96943,13 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
         mergerLog.log(
           `${taskId}: reusing task worktree \u2014 detaching HEAD at '${mergeTarget.branch}' before merge (${mergeTarget.source})`
         );
-        await execAsync25(`git checkout --detach "${mergeTarget.branch}"`, {
+        await execAsync26(`git checkout --detach "${mergeTarget.branch}"`, {
           cwd: rootDir
         });
         await audit.git({ type: "branch:checkout", target: mergeTarget.branch });
       } else if (currentBranch2 !== mergeTarget.branch) {
         mergerLog.log(`${taskId}: rootDir on '${currentBranch2}', checking out '${mergeTarget.branch}' before merge (${mergeTarget.source})`);
-        await execAsync25(`git checkout "${mergeTarget.branch}"`, {
+        await execAsync26(`git checkout "${mergeTarget.branch}"`, {
           cwd: rootDir
         });
         await audit.git({ type: "branch:checkout", target: mergeTarget.branch });
@@ -96843,7 +96964,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
       try {
         throwIfAborted(options.signal, taskId);
         const refName = `refs/heads/${mergeTarget.branch}`;
-        const { stdout: mainHeadOut } = await execAsync25(
+        const { stdout: mainHeadOut } = await execAsync26(
           `git rev-parse --verify ${refName}`,
           { cwd: rootDir, encoding: "utf-8" }
         );
@@ -96938,7 +97059,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
     async function runLocalBaseRebase(label) {
       if (!worktreePath) return;
       try {
-        const { stdout: localHeadOut } = await execAsync25("git rev-parse HEAD", {
+        const { stdout: localHeadOut } = await execAsync26("git rev-parse HEAD", {
           cwd: rootDir,
           encoding: "utf-8"
         });
@@ -96946,7 +97067,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
         if (!localHead) return;
         let alreadyContains = false;
         try {
-          await execAsync25(`git merge-base --is-ancestor "${localHead}" HEAD`, { cwd: worktreePath });
+          await execAsync26(`git merge-base --is-ancestor "${localHead}" HEAD`, { cwd: worktreePath });
           alreadyContains = true;
         } catch {
         }
@@ -96955,7 +97076,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
           return;
         }
         throwIfAborted(options.signal, taskId);
-        await execAsync25(`git rebase "${localHead}"`, { cwd: worktreePath });
+        await execAsync26(`git rebase "${localHead}"`, { cwd: worktreePath });
         rebaseHappened = true;
         mergerLog.log(`${taskId}: rebased ${branch} onto local HEAD ${localHead.slice(0, 8)}${label ? ` (${label})` : ""}`);
         await store.appendAgentLog(
@@ -96970,7 +97091,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
         const lmsg = localRebaseErr instanceof Error ? localRebaseErr.message : String(localRebaseErr);
         mergerLog.warn(`${taskId}: pre-merge rebase onto local HEAD failed (${lmsg}) \u2014 aborting and falling through`);
         try {
-          await execAsync25("git rebase --abort", { cwd: worktreePath });
+          await execAsync26("git rebase --abort", { cwd: worktreePath });
         } catch (abortError) {
           mergerLog.warn(`${taskId}: failed to abort local-HEAD rebase: ${getCommandErrorMessage(abortError)}`);
         }
@@ -96988,11 +97109,11 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
         } else {
           throwIfAborted(options.signal, taskId);
           mergerLog.log(`${taskId}: fetching ${integrationRemote} before merge`);
-          await execAsync25(`git fetch ${quoteArg2(integrationRemote)}`, { cwd: rootDir });
+          await execAsync26(`git fetch ${quoteArg3(integrationRemote)}`, { cwd: rootDir });
           try {
             const remoteRef = `${integrationRemote}/${mergeTarget.branch}`;
             throwIfAborted(options.signal, taskId);
-            await execAsync25(`git rebase ${quoteArg2(remoteRef)}`, { cwd: worktreePath });
+            await execAsync26(`git rebase ${quoteArg3(remoteRef)}`, { cwd: worktreePath });
             rebaseHappened = true;
             mergerLog.log(`${taskId}: rebased ${branch} onto ${remoteRef}`);
             await store.appendAgentLog(
@@ -97008,7 +97129,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
             mergerLog.warn(`${taskId}: pre-merge rebase failed (${msg}) \u2014 aborting rebase and falling through`);
             if (worktreePath) {
               try {
-                await execAsync25("git rebase --abort", { cwd: worktreePath });
+                await execAsync26("git rebase --abort", { cwd: worktreePath });
               } catch (abortError) {
                 mergerLog.warn(`${taskId}: failed to abort pre-merge rebase: ${getCommandErrorMessage(abortError)}`);
               }
@@ -97033,7 +97154,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
     if (preferMainRebaseFailureMessage && worktreePath) {
       let rebaseTarget = "";
       try {
-        const { stdout } = await execAsync25("git rev-parse HEAD", {
+        const { stdout } = await execAsync26("git rev-parse HEAD", {
           cwd: rootDir,
           encoding: "utf-8"
         });
@@ -97044,7 +97165,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
       if (rebaseTarget && task.executionStartBranch && task.executionStartBranch !== mergeTarget.branch) {
         let depTip;
         try {
-          const { stdout } = await execAsync25(
+          const { stdout } = await execAsync26(
             `git rev-parse --verify "${task.executionStartBranch}^{commit}"`,
             { cwd: rootDir, encoding: "utf-8" }
           );
@@ -97054,7 +97175,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
         }
         if (!depTip && task.baseCommitSha) {
           try {
-            const { stdout } = await execAsync25(
+            const { stdout } = await execAsync26(
               `git rev-parse --verify "${task.baseCommitSha}^{commit}"`,
               { cwd: rootDir, encoding: "utf-8" }
             );
@@ -97066,10 +97187,10 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
         if (depTip && depTip !== rebaseTarget) {
           try {
             throwIfAborted(options.signal, taskId);
-            await execAsync25("git rebase --abort", { cwd: worktreePath }).catch(
+            await execAsync26("git rebase --abort", { cwd: worktreePath }).catch(
               () => void 0
             );
-            await execAsync25(
+            await execAsync26(
               `git rebase --onto "${rebaseTarget}" "${depTip}" "${branch}"`,
               { cwd: worktreePath }
             );
@@ -97087,7 +97208,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
             mergerLog.warn(
               `${taskId}: Layer 1 (dep-drop) recovery failed: ${layer1Err instanceof Error ? layer1Err.message : String(layer1Err)}`
             );
-            await execAsync25("git rebase --abort", { cwd: worktreePath }).catch(
+            await execAsync26("git rebase --abort", { cwd: worktreePath }).catch(
               () => void 0
             );
           }
@@ -97117,7 +97238,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
             } else if (dropped > 0) {
               let originalBranchSha = "";
               try {
-                const { stdout } = await execAsync25(
+                const { stdout } = await execAsync26(
                   `git rev-parse --verify "${branch}^{commit}"`,
                   { cwd: worktreePath, encoding: "utf-8" }
                 );
@@ -97127,33 +97248,33 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
               }
               const restoreOriginalBranch = async () => {
                 if (!originalBranchSha) return;
-                await execAsync25(`git reset --hard "${originalBranchSha}"`, {
+                await execAsync26(`git reset --hard "${originalBranchSha}"`, {
                   cwd: worktreePath
                 }).catch(() => void 0);
-                await execAsync25(`git checkout -f "${branch}"`, { cwd: worktreePath }).catch(
+                await execAsync26(`git checkout -f "${branch}"`, { cwd: worktreePath }).catch(
                   () => void 0
                 );
-                await execAsync25(`git reset --hard "${originalBranchSha}"`, {
+                await execAsync26(`git reset --hard "${originalBranchSha}"`, {
                   cwd: worktreePath
                 }).catch(() => void 0);
               };
               try {
-                await execAsync25("git rebase --abort", { cwd: worktreePath }).catch(
+                await execAsync26("git rebase --abort", { cwd: worktreePath }).catch(
                   () => void 0
                 );
-                await execAsync25(`git checkout "${branch}"`, { cwd: worktreePath });
-                await execAsync25(`git reset --hard "${rebaseTarget}"`, {
+                await execAsync26(`git checkout "${branch}"`, { cwd: worktreePath });
+                await execAsync26(`git reset --hard "${rebaseTarget}"`, {
                   cwd: worktreePath
                 });
                 for (const sha of surviving) {
                   throwIfAborted(options.signal, taskId);
                   try {
-                    await execAsync25(`git cherry-pick --allow-empty "${sha}"`, {
+                    await execAsync26(`git cherry-pick --allow-empty "${sha}"`, {
                       cwd: worktreePath
                     });
                   } catch (pickErr) {
                     rethrowIfMergeAborted(pickErr);
-                    await execAsync25("git cherry-pick --abort", { cwd: worktreePath }).catch(
+                    await execAsync26("git cherry-pick --abort", { cwd: worktreePath }).catch(
                       () => void 0
                     );
                     await restoreOriginalBranch();
@@ -97247,7 +97368,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
     let commitLog = "";
     let diffStat = "";
     try {
-      const { stdout: logOutput } = await execAsync25(`git log ${contextDiffRange} --format="- %s"`, {
+      const { stdout: logOutput } = await execAsync26(`git log ${contextDiffRange} --format="- %s"`, {
         cwd: rootDir,
         encoding: "utf-8"
       });
@@ -97256,7 +97377,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
       commitLog = "(unable to read commit log)";
     }
     try {
-      const { stdout: diffOutput } = await execAsync25(`git diff ${contextDiffRange} --stat`, {
+      const { stdout: diffOutput } = await execAsync26(`git diff ${contextDiffRange} --stat`, {
         cwd: rootDir,
         encoding: "utf-8"
       });
@@ -97348,7 +97469,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
       });
       let preAttemptHeadSha = "";
       try {
-        const { stdout } = await execAsync25("git rev-parse HEAD", {
+        const { stdout } = await execAsync26("git rev-parse HEAD", {
           cwd: rootDir,
           encoding: "utf-8"
         });
@@ -97509,7 +97630,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
               }
               if (fixSuccess) {
                 const authorArg = getCommitAuthorArg(settings);
-                const { stdout: finalizeHeadOut } = await execAsync25("git rev-parse HEAD", { cwd: rootDir, encoding: "utf-8" });
+                const { stdout: finalizeHeadOut } = await execAsync26("git rev-parse HEAD", { cwd: rootDir, encoding: "utf-8" });
                 mergerLog.log(`${taskId}: in-merge fix entering with preAttemptHeadSha=${preAttemptHeadSha}, currentHead=${finalizeHeadOut.trim()}`);
                 const finalized = await commitOrAmendMergeWithFixes(
                   rootDir,
@@ -97548,8 +97669,8 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
                     mergeWasEmpty = true;
                     return true;
                   }
-                  const { stdout: currentHeadOut } = await execAsync25("git rev-parse HEAD", { cwd: rootDir, encoding: "utf-8" });
-                  const { stdout: branchTipOut } = await execAsync25(`git rev-parse ${branch}`, { cwd: rootDir, encoding: "utf-8" });
+                  const { stdout: currentHeadOut } = await execAsync26("git rev-parse HEAD", { cwd: rootDir, encoding: "utf-8" });
+                  const { stdout: branchTipOut } = await execAsync26(`git rev-parse ${branch}`, { cwd: rootDir, encoding: "utf-8" });
                   resetMergeWithWarn(rootDir, taskId, "verification-fix finalize");
                   const classification = finalized.reason === "fix-produced-no-content" ? "fix produced no content" : finalized.reason === "branch-ref-ahead-reset" ? "branch-ref ahead of integration target (reset for retry)" : "unknown phantom";
                   const originalErrorSuffix = finalized.originalError ? ` originalError="${finalized.originalError}";` : "";
@@ -97640,7 +97761,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
             }
             if (fixSuccess) {
               const authorArg = getCommitAuthorArg(settings);
-              const { stdout: finalizeHeadOut } = await execAsync25("git rev-parse HEAD", { cwd: rootDir, encoding: "utf-8" });
+              const { stdout: finalizeHeadOut } = await execAsync26("git rev-parse HEAD", { cwd: rootDir, encoding: "utf-8" });
               mergerLog.log(`${taskId}: in-merge fix entering with preAttemptHeadSha=${preAttemptHeadSha}, currentHead=${finalizeHeadOut.trim()}`);
               const finalized = await commitOrAmendMergeWithFixes(
                 rootDir,
@@ -97679,8 +97800,8 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
                   mergeWasEmpty = true;
                   return true;
                 }
-                const { stdout: currentHeadOut } = await execAsync25("git rev-parse HEAD", { cwd: rootDir, encoding: "utf-8" });
-                const { stdout: branchTipOut } = await execAsync25(`git rev-parse ${branch}`, { cwd: rootDir, encoding: "utf-8" });
+                const { stdout: currentHeadOut } = await execAsync26("git rev-parse HEAD", { cwd: rootDir, encoding: "utf-8" });
+                const { stdout: branchTipOut } = await execAsync26(`git rev-parse ${branch}`, { cwd: rootDir, encoding: "utf-8" });
                 resetMergeWithWarn(rootDir, taskId, "build-verification fix finalize");
                 const classification = finalized.reason === "fix-produced-no-content" ? "fix produced no content" : finalized.reason === "branch-ref-ahead-reset" ? "branch-ref ahead of integration target (reset for retry)" : "unknown phantom";
                 const originalErrorSuffix = finalized.originalError ? ` originalError="${finalized.originalError}";` : "";
@@ -97800,7 +97921,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
       let landedFiles;
       try {
         if (!rebaseMergeBaseSha) {
-          const { stdout: statsOutput } = await execAsync25("git show --shortstat --format= HEAD", {
+          const { stdout: statsOutput } = await execAsync26("git show --shortstat --format= HEAD", {
             cwd: rootDir,
             encoding: "utf-8"
           });
@@ -97836,7 +97957,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
           const verificationCandidateRefs = [auditSha, task.branch].filter((ref) => Boolean(ref));
           for (const candidateRef of verificationCandidateRefs) {
             try {
-              const { stdout: treeOut } = await execAsync25(`git rev-parse ${quoteArg2(candidateRef)}^{tree}`, {
+              const { stdout: treeOut } = await execAsync26(`git rev-parse ${quoteArg3(candidateRef)}^{tree}`, {
                 cwd: rootDir,
                 encoding: "utf-8"
               });
@@ -97926,7 +98047,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
               mergerLog.log(`${taskId}: rebase-strategy landed-files capture: zero own commits \u2014 verified-short-circuit`);
             }
           } else {
-            const { stdout: landedFilesOutput } = await execAsync25(`git show --name-only --format= ${quoteArg2(recordedSha)}`, {
+            const { stdout: landedFilesOutput } = await execAsync26(`git show --name-only --format= ${quoteArg3(recordedSha)}`, {
               cwd: rootDir,
               encoding: "utf-8",
               maxBuffer: 2 * 1024 * 1024
@@ -98041,7 +98162,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
         }).trim();
         if (worktreeHeadSha) {
           const integrationBranch2 = mergeTarget.branch || await resolveIntegrationBranch(projectRootDir, settings);
-          const expectedCurrentSha = execSyncText(`git rev-parse --verify ${quoteArg2(`refs/heads/${integrationBranch2}`)}`, {
+          const expectedCurrentSha = execSyncText(`git rev-parse --verify ${quoteArg3(`refs/heads/${integrationBranch2}`)}`, {
             cwd: rootDir,
             stdio: "pipe",
             encoding: "utf-8"
@@ -98100,12 +98221,12 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
       }
     }
     try {
-      await execAsync25(`git branch -d "${branch}"`, { cwd: rootDir });
+      await execAsync26(`git branch -d "${branch}"`, { cwd: rootDir });
       result.branchDeleted = true;
       await audit.git({ type: "branch:delete", target: branch });
     } catch {
       try {
-        await execAsync25(`git branch -D "${branch}"`, { cwd: rootDir });
+        await execAsync26(`git branch -D "${branch}"`, { cwd: rootDir });
         result.branchDeleted = true;
         await audit.git({ type: "branch:delete", target: branch, metadata: { force: true } });
       } catch {
@@ -98160,9 +98281,9 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
           result.worktreeRemoved = false;
         } else {
           try {
-            const onBranch = await execAsync25("git symbolic-ref --quiet HEAD", { cwd: worktreePath, timeout: 5e3, encoding: "utf-8" }).then(() => true).catch(() => false);
+            const onBranch = await execAsync26("git symbolic-ref --quiet HEAD", { cwd: worktreePath, timeout: 5e3, encoding: "utf-8" }).then(() => true).catch(() => false);
             if (onBranch) {
-              await execAsync25("git checkout --detach HEAD", { cwd: worktreePath, timeout: 1e4, encoding: "utf-8" });
+              await execAsync26("git checkout --detach HEAD", { cwd: worktreePath, timeout: 1e4, encoding: "utf-8" });
             }
           } catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
@@ -98243,8 +98364,8 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
                   deletions: existingDetails.deletions
                 };
                 try {
-                  const { stdout: postPushStatsOutput } = await execAsync25(
-                    `git show --shortstat --format= ${quoteArg2(postPushSha)}`,
+                  const { stdout: postPushStatsOutput } = await execAsync26(
+                    `git show --shortstat --format= ${quoteArg3(postPushSha)}`,
                     { cwd: pushRootDir, encoding: "utf-8" }
                   );
                   const normalized = postPushStatsOutput.trim().replace(/\n/g, " ");
@@ -98361,7 +98482,7 @@ async function tryFastForwardFromOrigin(rootDir, taskId, integrationBranch, inte
   const remote = integrationRemote?.trim();
   if (!currentBranch2 || !remote) return;
   try {
-    await execAsync25(`git fetch ${quoteArg2(remote)} ${quoteArg2(currentBranch2)}`, { cwd: rootDir });
+    await execAsync26(`git fetch ${quoteArg3(remote)} ${quoteArg3(currentBranch2)}`, { cwd: rootDir });
   } catch (err) {
     mergerLog.log(`${taskId}: pre-merge fetch failed (continuing): ${err instanceof Error ? err.message : String(err)}`);
     return;
@@ -98370,7 +98491,7 @@ async function tryFastForwardFromOrigin(rootDir, taskId, integrationBranch, inte
   let ahead = 0;
   const remoteRef = `${remote}/${currentBranch2}`;
   try {
-    const counts = execSyncText(`git rev-list --left-right --count ${quoteArg2(`${remoteRef}...HEAD`)}`, {
+    const counts = execSyncText(`git rev-list --left-right --count ${quoteArg3(`${remoteRef}...HEAD`)}`, {
       cwd: rootDir,
       encoding: "utf-8",
       stdio: "pipe"
@@ -98387,7 +98508,7 @@ async function tryFastForwardFromOrigin(rootDir, taskId, integrationBranch, inte
     return;
   }
   try {
-    await execAsync25(`git merge --ff-only ${quoteArg2(remoteRef)}`, { cwd: rootDir });
+    await execAsync26(`git merge --ff-only ${quoteArg3(remoteRef)}`, { cwd: rootDir });
     mergerLog.log(`${taskId}: fast-forwarded ${currentBranch2} by ${behind} commit(s) from ${remote}`);
   } catch (err) {
     mergerLog.log(`${taskId}: fast-forward failed (continuing): ${err instanceof Error ? err.message : String(err)}`);
@@ -98465,7 +98586,7 @@ async function executeMergeAttempt(params, aiTracker) {
     if (attemptNum === 2 && smartConflictResolution) {
       let mergeError;
       try {
-        await execAsync25(`git merge --squash "${branch}"`, {
+        await execAsync26(`git merge --squash "${branch}"`, {
           cwd: rootDir
         });
         throwIfAborted(options.signal, taskId);
@@ -98569,7 +98690,7 @@ async function executeMergeAttempt(params, aiTracker) {
               settings,
               store
             });
-            await execAsync25(
+            await execAsync26(
               `git commit ${subjectArg} ${bodyArg}${trailerArg}${authorArg}`,
               { cwd: rootDir, env: mergerCommitEnv() }
             );
@@ -98618,7 +98739,7 @@ async function executeMergeAttempt(params, aiTracker) {
         }
       }
     } else {
-      await execAsync25(`git merge --squash "${branch}"`, {
+      await execAsync26(`git merge --squash "${branch}"`, {
         cwd: rootDir
       });
       throwIfAborted(options.signal, taskId);
@@ -98725,7 +98846,7 @@ async function executeMergeAttempt(params, aiTracker) {
       const authorArg = getCommitAuthorArg(params.settings);
       let integrationTargetSha;
       try {
-        const { stdout } = await execAsync25("git rev-parse HEAD~1", {
+        const { stdout } = await execAsync26("git rev-parse HEAD~1", {
           cwd: rootDir,
           encoding: "utf-8"
         });
@@ -98747,7 +98868,7 @@ async function executeMergeAttempt(params, aiTracker) {
         aiSubject
       });
       const trailerArg = buildTaskTrailerArgs(taskId);
-      await execAsync25(
+      await execAsync26(
         `git commit --amend ${subjectArg} ${bodyArg}${trailerArg}${authorArg}`,
         { cwd: rootDir, env: mergerCommitEnv() }
       );
@@ -98785,7 +98906,7 @@ async function attemptWithSideStrategy(params, side = "theirs", aiTracker) {
   mergerLog.log(`${taskId}: attempting merge with -X ${side} strategy`);
   try {
     throwIfAborted(params.options.signal, taskId);
-    await execAsync25(`git merge -X ${side} --squash "${branch}"`, {
+    await execAsync26(`git merge -X ${side} --squash "${branch}"`, {
       cwd: rootDir
     });
     const conflictedOutput = execSyncText("git diff --name-only --diff-filter=U", {
@@ -98812,7 +98933,7 @@ async function attemptWithMixedSideStrategy(params, strategy, aiTracker) {
   );
   try {
     throwIfAborted(params.options.signal, taskId);
-    await execAsync25(`git merge -X ${strategy.defaultSide} --squash "${branch}"`, {
+    await execAsync26(`git merge -X ${strategy.defaultSide} --squash "${branch}"`, {
       cwd: rootDir
     });
     const conflictedOutput = execSyncText("git diff --name-only --diff-filter=U", {
@@ -98898,7 +99019,7 @@ async function finalizeSideStrategyAttempt(params, side, aiTracker) {
     settings,
     store
   });
-  await execAsync25(
+  await execAsync26(
     `git commit ${subjectArg} ${bodyArg}${issueRefBodyArg}${trailerArg}${authorArg}`,
     { cwd: rootDir, env: mergerCommitEnv() }
   );
@@ -99169,7 +99290,7 @@ async function runAiAgentForCommit(params) {
           settings,
           store
         });
-        await execAsync25(
+        await execAsync26(
           `git commit ${subjectArg} ${bodyArg}${issueRefBodyArg}${trailerArg}${authorArg2}`,
           { cwd: rootDir, env: mergerCommitEnv() }
         );
@@ -99568,7 +99689,7 @@ async function completeTask(store, taskId, result) {
   result.task = task;
   store.emit("task:merged", result);
 }
-var execAsync25, execFileAsync7, LOCKFILE_PATTERNS, GENERATED_PATTERNS, DEPENDENCY_SYNC_TRIGGER_PATTERNS, WORKFLOW_SCRIPT_OUTPUT_MAX_CHARS, PULL_REBASE_TIMEOUT_MS, PUSH_TIMEOUT_MS, MERGE_COMMIT_LOG_MAX_CHARS, MERGE_DIFF_STAT_MAX_CHARS, summarizeVerificationOutputLocal, INSTALL_MARKER_RELPATH, LOCKFILE_CANDIDATES, VerificationError, MergeAbortedError, OutOfScopeVerificationError, SquashAuditError, VERIFICATION_EXTRA_ENV, AUTOSTASH_LABEL_PREFIX, AUTOSTASH_TIMESTAMP_RE, ACTIVE_MERGER_STATUS_FILENAME, __test__, AutostashCreationFailedError, NUL, FileScopeViolationError, FUSION_TASK_ID_TRAILER_KEY2, mergerTestHooks;
+var execAsync26, execFileAsync7, LOCKFILE_PATTERNS, GENERATED_PATTERNS, DEPENDENCY_SYNC_TRIGGER_PATTERNS, WORKFLOW_SCRIPT_OUTPUT_MAX_CHARS, PULL_REBASE_TIMEOUT_MS, PUSH_TIMEOUT_MS, MERGE_COMMIT_LOG_MAX_CHARS, MERGE_DIFF_STAT_MAX_CHARS, summarizeVerificationOutputLocal, INSTALL_MARKER_RELPATH, LOCKFILE_CANDIDATES, VerificationError, MergeAbortedError, OutOfScopeVerificationError, SquashAuditError, VERIFICATION_EXTRA_ENV, AUTOSTASH_LABEL_PREFIX, AUTOSTASH_TIMESTAMP_RE, ACTIVE_MERGER_STATUS_FILENAME, __test__, AutostashCreationFailedError, NUL, FileScopeViolationError, FUSION_TASK_ID_TRAILER_KEY2, mergerTestHooks;
 var init_merger = __esm({
   "../engine/src/merger.ts"() {
     "use strict";
@@ -99590,6 +99711,8 @@ var init_merger = __esm({
     init_active_session_registry();
     init_agent_logger();
     init_logger2();
+    init_merger_bare_subject();
+    init_merger_bare_subject();
     init_usage_limit_detector();
     init_context_limit_detector();
     init_rate_limit_retry();
@@ -99610,8 +99733,8 @@ var init_merger = __esm({
     init_merger_scope_auto_widen();
     init_merger_diff_volume_gate();
     init_merger_ref_update_advance();
-    execAsync25 = promisify33(exec27);
-    execFileAsync7 = promisify33(execFile11);
+    execAsync26 = promisify34(exec28);
+    execFileAsync7 = promisify34(execFile11);
     LOCKFILE_PATTERNS = [
       "package-lock.json",
       "pnpm-lock.yaml",
@@ -99740,8 +99863,9 @@ var init_merger = __esm({
 });
 
 // ../engine/src/self-healing.ts
-import { exec as exec28, execSync as execSync5 } from "node:child_process";
-import { promisify as promisify34 } from "node:util";
+import { exec as exec29, execSync as execSync5 } from "node:child_process";
+import { promisify as promisify35 } from "node:util";
+import { setImmediate as setImmediateCb2 } from "node:timers";
 import { existsSync as existsSync38, mkdirSync as mkdirSync9, readdirSync as readdirSync6, readFileSync as readFileSync13, realpathSync as realpathSync5, rmSync as rmSync4, statSync as statSync6, writeFileSync as writeFileSync4 } from "node:fs";
 import { isAbsolute as isAbsolute12, join as join43, relative as relative10, resolve as resolve27 } from "node:path";
 async function archiveAsGhostBug(store, taskId, taskTitle, decision) {
@@ -99772,11 +99896,11 @@ function formatRecoveryTimestamp(date = /* @__PURE__ */ new Date()) {
 }
 async function preserveWorktreeChanges(repoDir, worktreePath, taskId) {
   try {
-    const status = (await execAsync26("git status --porcelain", { cwd: worktreePath, encoding: "utf-8" })).stdout.trim();
+    const status = (await execAsync27("git status --porcelain", { cwd: worktreePath, encoding: "utf-8" })).stdout.trim();
     if (!status) {
       return null;
     }
-    const diff = (await execAsync26("git diff HEAD --binary", { cwd: worktreePath, encoding: "utf-8", maxBuffer: 10 * 1024 * 1024 })).stdout;
+    const diff = (await execAsync27("git diff HEAD --binary", { cwd: worktreePath, encoding: "utf-8", maxBuffer: 10 * 1024 * 1024 })).stdout;
     const recoveryDir = join43(repoDir, ".fusion", "recovery");
     mkdirSync9(recoveryDir, { recursive: true });
     const patchPath = join43(recoveryDir, `${taskId.toLowerCase()}-${formatRecoveryTimestamp()}.patch`);
@@ -99901,7 +100025,7 @@ function shellQuote2(value) {
 async function isBranchAheadOfBase(task, rootDir, preferredBaseRef) {
   const branchName = task.branch || canonicalFusionBranchName(task.id);
   try {
-    await execAsync26(`git rev-parse --verify ${shellQuote2(branchName)}`, {
+    await execAsync27(`git rev-parse --verify ${shellQuote2(branchName)}`, {
       cwd: rootDir,
       timeout: 3e4
     });
@@ -99911,14 +100035,14 @@ async function isBranchAheadOfBase(task, rootDir, preferredBaseRef) {
   const requestedBaseRef = preferredBaseRef || task.mergeDetails?.mergeTargetBranch || await resolveIntegrationBranch(rootDir, void 0);
   let resolvedBaseRef = requestedBaseRef;
   try {
-    await execAsync26(`git rev-parse --verify ${shellQuote2(requestedBaseRef)}`, {
+    await execAsync27(`git rev-parse --verify ${shellQuote2(requestedBaseRef)}`, {
       cwd: rootDir,
       timeout: 3e4
     });
   } catch {
     const remoteRef = `origin/${requestedBaseRef}`;
     try {
-      await execAsync26(`git rev-parse --verify ${shellQuote2(remoteRef)}`, {
+      await execAsync27(`git rev-parse --verify ${shellQuote2(remoteRef)}`, {
         cwd: rootDir,
         timeout: 3e4
       });
@@ -99928,7 +100052,7 @@ async function isBranchAheadOfBase(task, rootDir, preferredBaseRef) {
     }
   }
   try {
-    const { stdout } = await execAsync26(
+    const { stdout } = await execAsync27(
       `git rev-list --count ${shellQuote2(resolvedBaseRef)}..${shellQuote2(branchName)}`,
       { cwd: rootDir, timeout: 3e4 }
     );
@@ -99980,7 +100104,7 @@ function isNoTaskDoneFailure2(task) {
 function hasStepProgress2(task) {
   return task.steps.some((step) => step.status !== "pending");
 }
-var log20, worktreeMetadataReconcileLog, execAsync26, DONE_TASK_INTEGRITY_SWEEP_LIMIT, BOARD_STALL_NOTIFICATION_COOLDOWN_MS, DB_CORRUPTION_NOTIFICATION_COOLDOWN_MS, STALE_ACTIVE_BRANCH_EXECUTION_GRACE_MS, COMPLETION_HANDOFF_LIMBO_GRACE_MS, MAX_COMPLETION_HANDOFF_LIMBO_RECOVERIES, APPROVED_TRIAGE_RECOVERY_GRACE_MS, STARVED_REFINEMENT_RECOVERY_GRACE_MS, STARVED_PEER_PROGRESS_THRESHOLD, STARVED_REFINEMENT_ESCALATION_COOLDOWN_MS, ORPHANED_EXECUTION_RECOVERY_GRACE_MS, ACTIVE_MERGE_STATUSES2, NON_TERMINAL_STEP_STATUSES2, STRANDED_COMPLETED_TODO_ACTIVE_STATUSES, GHOST_REVIEW_PRESERVED_STATUSES, ORPHANED_WITH_WORKTREE_GRACE_MS, MAX_TASK_DONE_RETRIES, MAX_WORKTREE_SESSION_RETRIES, MAX_AUTO_MERGE_RETRIES, MAX_STARVATION_DROPS, DEADLOCK_RECOVERY_COOLDOWN_MS, DEFAULT_STALE_MERGING_STATUS_MIN_AGE_MS, DEFAULT_STALE_MERGING_FANOUT_MIN_AGE_MS, DEFAULT_UNBACKED_MERGING_FANOUT_GRACE_MS, DURABLE_ERROR_RECOVERY_MAX_RETRIES, DURABLE_ERROR_RECOVERY_BASE_COOLDOWN_MS, DURABLE_ERROR_RECOVERY_MAX_COOLDOWN_MS, RUNNING_ON_INACTIVE_TASK_STALE_RUN_MS, SelfHealingManager;
+var log20, worktreeMetadataReconcileLog, execAsync27, yieldEventLoop2, DONE_TASK_INTEGRITY_SWEEP_LIMIT, BOARD_STALL_NOTIFICATION_COOLDOWN_MS, DB_CORRUPTION_NOTIFICATION_COOLDOWN_MS, STALE_ACTIVE_BRANCH_EXECUTION_GRACE_MS, COMPLETION_HANDOFF_LIMBO_GRACE_MS, MAX_COMPLETION_HANDOFF_LIMBO_RECOVERIES, APPROVED_TRIAGE_RECOVERY_GRACE_MS, STARVED_REFINEMENT_RECOVERY_GRACE_MS, STARVED_PEER_PROGRESS_THRESHOLD, STARVED_REFINEMENT_ESCALATION_COOLDOWN_MS, ORPHANED_EXECUTION_RECOVERY_GRACE_MS, ACTIVE_MERGE_STATUSES2, NON_TERMINAL_STEP_STATUSES2, STRANDED_COMPLETED_TODO_ACTIVE_STATUSES, GHOST_REVIEW_PRESERVED_STATUSES, ORPHANED_WITH_WORKTREE_GRACE_MS, MAX_TASK_DONE_RETRIES, MAX_WORKTREE_SESSION_RETRIES, MAX_AUTO_MERGE_RETRIES, MAX_STARVATION_DROPS, DEADLOCK_RECOVERY_COOLDOWN_MS, DEFAULT_STALE_MERGING_STATUS_MIN_AGE_MS, DEFAULT_STALE_MERGING_FANOUT_MIN_AGE_MS, DEFAULT_UNBACKED_MERGING_FANOUT_GRACE_MS, DURABLE_ERROR_RECOVERY_MAX_RETRIES, DURABLE_ERROR_RECOVERY_BASE_COOLDOWN_MS, DURABLE_ERROR_RECOVERY_MAX_COOLDOWN_MS, RUNNING_ON_INACTIVE_TASK_STALE_RUN_MS, SelfHealingManager;
 var init_self_healing = __esm({
   "../engine/src/self-healing.ts"() {
     "use strict";
@@ -99997,12 +100121,14 @@ var init_self_healing = __esm({
     init_worktree_paths();
     init_worktree_names();
     init_integration_branch();
+    init_merger_bare_subject();
     init_foreign_only_contamination();
     init_notifier();
     init_dependency_blocked_todo_reporter();
     log20 = createLogger2("self-healing");
     worktreeMetadataReconcileLog = createLogger2("worktree-metadata-reconcile");
-    execAsync26 = promisify34(exec28);
+    execAsync27 = promisify35(exec29);
+    yieldEventLoop2 = () => new Promise((resolve32) => setImmediateCb2(resolve32));
     DONE_TASK_INTEGRITY_SWEEP_LIMIT = 50;
     BOARD_STALL_NOTIFICATION_COOLDOWN_MS = 60 * 6e4;
     DB_CORRUPTION_NOTIFICATION_COOLDOWN_MS = 60 * 60 * 1e3;
@@ -100281,6 +100407,7 @@ var init_self_healing = __esm({
             const stepErrMessage = stepErr instanceof Error ? stepErr.message : String(stepErr);
             log20.error(`Startup recovery step "${step.name}" failed: ${stepErrMessage} \u2014 continuing with remaining steps`);
           }
+          await yieldEventLoop2();
         }
       }
       stop() {
@@ -100476,12 +100603,12 @@ var init_self_healing = __esm({
         if (completedSteps.length === 0) return;
         const branchName = task.branch || canonicalFusionBranchName(task.id);
         try {
-          const { stdout: mergeBaseOut } = await execAsync26(
+          const { stdout: mergeBaseOut } = await execAsync27(
             `git merge-base "${branchName}" HEAD`,
             { cwd: this.options.rootDir, encoding: "utf-8", timeout: 3e4 }
           );
           const mergeBase = mergeBaseOut.trim();
-          const { stdout: branchHeadOut } = await execAsync26(
+          const { stdout: branchHeadOut } = await execAsync27(
             `git rev-parse "${branchName}"`,
             { cwd: this.options.rootDir, encoding: "utf-8", timeout: 3e4 }
           );
@@ -100530,11 +100657,11 @@ var init_self_healing = __esm({
         const storedSha = task.mergeDetails?.commitSha;
         if (storedSha) {
           try {
-            await execAsync26(
+            await execAsync27(
               `git merge-base --is-ancestor ${shellQuote2(storedSha)} HEAD`,
               { cwd: this.options.rootDir }
             );
-            const { stdout: stdout2 } = await execAsync26(
+            const { stdout: stdout2 } = await execAsync27(
               `git log -1 --format=%H%x1f%s%x1f%b ${shellQuote2(storedSha)}`,
               { cwd: this.options.rootDir, maxBuffer: 1024 * 1024 }
             );
@@ -100563,7 +100690,7 @@ var init_self_healing = __esm({
             `--grep=${grepArg}`,
             shellQuote2(range)
           ].join(" ");
-          return execAsync26(command, {
+          return execAsync27(command, {
             cwd: this.options.rootDir,
             maxBuffer: 1024 * 1024
           });
@@ -100611,7 +100738,7 @@ var init_self_healing = __esm({
           const [candidateSha, candidateSubject = ""] = line.split("");
           if (!candidateSha) continue;
           try {
-            const { stdout: bodyOut } = await execAsync26(
+            const { stdout: bodyOut } = await execAsync27(
               `git log -1 --format=%b ${shellQuote2(candidateSha)}`,
               { cwd: this.options.rootDir, maxBuffer: 1024 * 1024 }
             );
@@ -100680,7 +100807,7 @@ var init_self_healing = __esm({
         }
         const branch = task.branch || canonicalFusionBranchName(task.id);
         try {
-          await execAsync26(`git branch -D ${shellQuote2(branch)}`, {
+          await execAsync27(`git branch -D ${shellQuote2(branch)}`, {
             cwd: this.options.rootDir,
             timeout: 12e4
           });
@@ -100748,6 +100875,7 @@ var init_self_healing = __esm({
             } catch (stepErr) {
               log20.error(`Maintenance batch 1 step "${fn2.name}" failed: ${stepErr instanceof Error ? stepErr.message : String(stepErr)}`);
             }
+            await yieldEventLoop2();
           }
           const recoverySettings = await this.store.getSettings();
           if (recoverySettings.globalPause || recoverySettings.enginePaused) {
@@ -100817,6 +100945,7 @@ var init_self_healing = __esm({
               } catch (stepErr) {
                 log20.error(`Maintenance batch 2 step "${fn2.name}" failed: ${stepErr instanceof Error ? stepErr.message : String(stepErr)}`);
               }
+              await yieldEventLoop2();
             }
           }
           const batch3Fns = [
@@ -100829,6 +100958,7 @@ var init_self_healing = __esm({
             } catch (stepErr) {
               log20.error(`Maintenance batch 3 step "${fn2.name}" failed: ${stepErr instanceof Error ? stepErr.message : String(stepErr)}`);
             }
+            await yieldEventLoop2();
           }
           const elapsedMs = Date.now() - startMs;
           log20.log(`Maintenance cycle completed in ${elapsedMs}ms`);
@@ -101132,8 +101262,8 @@ var init_self_healing = __esm({
             const canAutoReclaimLiveZero = branchOwnerTaskId !== null && branchOwnerTaskId === taskIdUpper && !ownedByOtherInProgressTask;
             if (canAutoReclaimLiveZero) {
               await removeWorktree({ rootDir: this.options.rootDir, worktreePath: inspection.livePath, settings, taskId: task.id, reason: RemovalReason.SelfHealingBranchConflict });
-              await execAsync26("git worktree prune", { cwd: this.options.rootDir, timeout: 12e4, maxBuffer: 10 * 1024 * 1024 });
-              await execAsync26(`git branch -D ${JSON.stringify(task.branch)}`, { cwd: this.options.rootDir, timeout: 12e4, maxBuffer: 10 * 1024 * 1024 });
+              await execAsync27("git worktree prune", { cwd: this.options.rootDir, timeout: 12e4, maxBuffer: 10 * 1024 * 1024 });
+              await execAsync27(`git branch -D ${JSON.stringify(task.branch)}`, { cwd: this.options.rootDir, timeout: 12e4, maxBuffer: 10 * 1024 * 1024 });
               await this.store.updateTask(task.id, { worktree: null, branch: null, paused: false, pausedReason: void 0, status: null, error: null });
               await auditor.database({ type: "task:pr-conflict-reclaim", target: task.id, metadata: { outcome: "reclaimed", mode: "fully-subsumed", recoveredFromPaused: wasPausedBranchConflict } });
               return withPerPr({ outcome: "reclaimed" });
@@ -101357,12 +101487,12 @@ var init_self_healing = __esm({
                       reason: RemovalReason.SelfHealingBranchConflict
                     });
                   }
-                  await execAsync26("git worktree prune", {
+                  await execAsync27("git worktree prune", {
                     cwd: this.options.rootDir,
                     timeout: 12e4,
                     maxBuffer: 10 * 1024 * 1024
                   });
-                  await execAsync26(`git branch -D ${JSON.stringify(branchName)}`, {
+                  await execAsync27(`git branch -D ${JSON.stringify(branchName)}`, {
                     cwd: this.options.rootDir,
                     timeout: 12e4,
                     maxBuffer: 10 * 1024 * 1024
@@ -101446,12 +101576,12 @@ var init_self_healing = __esm({
                       taskId: task.id,
                       reason: RemovalReason.SelfHealingBranchConflict
                     });
-                    await execAsync26("git worktree prune", {
+                    await execAsync27("git worktree prune", {
                       cwd: this.options.rootDir,
                       timeout: 12e4,
                       maxBuffer: 10 * 1024 * 1024
                     });
-                    await execAsync26(`git branch -D ${JSON.stringify(task.branch)}`, {
+                    await execAsync27(`git branch -D ${JSON.stringify(task.branch)}`, {
                       cwd: this.options.rootDir,
                       timeout: 12e4,
                       maxBuffer: 10 * 1024 * 1024
@@ -101724,7 +101854,7 @@ var init_self_healing = __esm({
             if (task.worktree && existsSync38(task.worktree)) {
               try {
                 if (statSync6(task.worktree).isDirectory()) {
-                  const { stdout } = await execAsync26(`git -C ${JSON.stringify(task.worktree)} status --porcelain`, {
+                  const { stdout } = await execAsync27(`git -C ${JSON.stringify(task.worktree)} status --porcelain`, {
                     cwd: this.options.rootDir,
                     timeout: 3e4,
                     maxBuffer: 10 * 1024 * 1024
@@ -101745,12 +101875,12 @@ var init_self_healing = __esm({
               log20.warn(`[recovery] stale-active-branch-rescue-needed ${task.id} branch=${branch} unique=${inspection.uniqueCommitCount} tip=${inspection.tipSha.slice(0, 12)}`);
               continue;
             }
-            await execAsync26(`git branch -D ${JSON.stringify(branch)}`, {
+            await execAsync27(`git branch -D ${JSON.stringify(branch)}`, {
               cwd: this.options.rootDir,
               timeout: 12e4,
               maxBuffer: 10 * 1024 * 1024
             });
-            await execAsync26("git worktree prune", {
+            await execAsync27("git worktree prune", {
               cwd: this.options.rootDir,
               timeout: 12e4,
               maxBuffer: 10 * 1024 * 1024
@@ -101817,7 +101947,7 @@ var init_self_healing = __esm({
        */
       async findWorktreePathForBranch(branchName) {
         try {
-          const { stdout } = await execAsync26("git worktree list --porcelain", {
+          const { stdout } = await execAsync27("git worktree list --porcelain", {
             cwd: this.options.rootDir,
             timeout: 3e4
           });
@@ -101850,7 +101980,7 @@ var init_self_healing = __esm({
       }
       async clearCompletionBranchIfSubsumed(task, branchName) {
         try {
-          await execAsync26(`git rev-parse --verify ${shellQuote2(branchName)}`, {
+          await execAsync27(`git rev-parse --verify ${shellQuote2(branchName)}`, {
             cwd: this.options.rootDir,
             timeout: 3e4
           });
@@ -101866,7 +101996,7 @@ var init_self_healing = __esm({
           return false;
         }
         try {
-          await execAsync26(`git branch -D ${shellQuote2(branchName)}`, {
+          await execAsync27(`git branch -D ${shellQuote2(branchName)}`, {
             cwd: this.options.rootDir,
             timeout: 3e4
           });
@@ -102063,7 +102193,7 @@ var init_self_healing = __esm({
           if (settings.globalPause || settings.enginePaused) return result;
           const allTasks = await this.store.listTasks({ slim: true, includeArchived: false });
           const tasks = allTasks.filter((task) => task.column === "in-review");
-          const fusionRefOutput = await execAsync26("git for-each-ref --format='%(refname:short)' refs/heads/fusion/", {
+          const fusionRefOutput = await execAsync27("git for-each-ref --format='%(refname:short)' refs/heads/fusion/", {
             cwd: this.options.rootDir,
             timeout: 3e4
           }).catch(() => ({ stdout: "" }));
@@ -102073,7 +102203,7 @@ var init_self_healing = __esm({
             const existingBinding = task.branch;
             if (existingBinding) {
               try {
-                await execAsync26(`git show-ref --verify --quiet ${shellQuote2(`refs/heads/${existingBinding}`)}`, {
+                await execAsync27(`git show-ref --verify --quiet ${shellQuote2(`refs/heads/${existingBinding}`)}`, {
                   cwd: this.options.rootDir,
                   timeout: 3e4
                 });
@@ -102089,50 +102219,52 @@ var init_self_healing = __esm({
               if (stem.toLowerCase() === normalizedId) candidates.add(branch);
             }
             const integrationBase = task.baseBranch || await resolveIntegrationBranch(this.options.rootDir, void 0);
-            const existingCandidatesByRef = /* @__PURE__ */ new Map();
+            const candidateByRefSha = /* @__PURE__ */ new Map();
+            const normalizedCandidate = canonicalFusionBranchName(task.id);
             for (const branch of candidates) {
+              let branchSha;
               try {
-                await execAsync26(`git show-ref --verify --quiet ${shellQuote2(`refs/heads/${branch}`)}`, {
+                const { stdout } = await execAsync27(`git rev-parse --verify ${shellQuote2(`refs/heads/${branch}`)}`, {
                   cwd: this.options.rootDir,
                   timeout: 3e4
                 });
+                branchSha = stdout.trim();
               } catch {
                 continue;
               }
+              if (!branchSha) continue;
               let comparisonBase = integrationBase;
               try {
-                await execAsync26(`git rev-parse --verify ${shellQuote2(comparisonBase)}`, {
+                await execAsync27(`git rev-parse --verify ${shellQuote2(comparisonBase)}`, {
                   cwd: this.options.rootDir,
                   timeout: 3e4
                 });
               } catch {
                 const originBase = `origin/${comparisonBase}`;
-                await execAsync26(`git rev-parse --verify ${shellQuote2(originBase)}`, {
+                await execAsync27(`git rev-parse --verify ${shellQuote2(originBase)}`, {
                   cwd: this.options.rootDir,
                   timeout: 3e4
                 });
                 comparisonBase = originBase;
               }
-              const mergeBase = (await execAsync26(`git merge-base ${shellQuote2(comparisonBase)} ${shellQuote2(branch)}`, {
+              const mergeBase = (await execAsync27(`git merge-base ${shellQuote2(comparisonBase)} ${shellQuote2(branch)}`, {
                 cwd: this.options.rootDir,
                 timeout: 3e4
               })).stdout.trim();
-              const aheadCountRaw = await execAsync26(`git rev-list --count ${shellQuote2(mergeBase)}..${shellQuote2(branch)}`, {
+              const aheadCountRaw = await execAsync27(`git rev-list --count ${shellQuote2(mergeBase)}..${shellQuote2(branch)}`, {
                 cwd: this.options.rootDir,
                 timeout: 3e4
               });
               const aheadCount = Number.parseInt(aheadCountRaw.stdout.trim(), 10);
-              const normalizedBranchRef = branch.toLowerCase();
-              const existingCandidate = existingCandidatesByRef.get(normalizedBranchRef);
-              const normalizedCandidate = canonicalFusionBranchName(task.id);
-              if (!existingCandidate || branch === normalizedCandidate) {
-                existingCandidatesByRef.set(normalizedBranchRef, {
+              const existing = candidateByRefSha.get(branchSha);
+              if (!existing || branch === normalizedCandidate) {
+                candidateByRefSha.set(branchSha, {
                   branch,
                   aheadCount: Number.isFinite(aheadCount) ? aheadCount : 0
                 });
               }
             }
-            const existingCandidates = [...existingCandidatesByRef.values()];
+            const existingCandidates = [...candidateByRefSha.values()];
             if (existingCandidates.length === 0) {
               await this.emitBranchRebindAuditEvent({
                 taskId: task.id,
@@ -102147,7 +102279,7 @@ var init_self_healing = __esm({
               const selected = withUniqueWork[0];
               const patch = { branch: selected.branch, worktree: null };
               if (!task.baseCommitSha) {
-                const derivedBaseCommit = (await execAsync26(
+                const derivedBaseCommit = (await execAsync27(
                   `git merge-base ${shellQuote2(integrationBase)} ${shellQuote2(selected.branch)}`,
                   { cwd: this.options.rootDir, timeout: 3e4 }
                 )).stdout.trim();
@@ -103166,13 +103298,21 @@ var init_self_healing = __esm({
             }
             const mergedAt = (/* @__PURE__ */ new Date()).toISOString();
             if (classification.kind === "owned-commit") {
+              const mergeCommitMessage = await regenerateBareMergeSubject({
+                subject: classification.commit.subject,
+                commitSha: classification.commit.sha,
+                branch: task.branch ?? "",
+                taskId: task.id,
+                rootDir: this.options.rootDir,
+                settings
+              });
               const mergeDetails = {
                 ...task.mergeDetails || {},
                 commitSha: classification.commit.sha,
                 filesChanged: classification.commit.filesChanged,
                 insertions: classification.commit.insertions,
                 deletions: classification.commit.deletions,
-                mergeCommitMessage: classification.commit.subject,
+                mergeCommitMessage,
                 mergeConfirmed: true,
                 mergedAt,
                 mergeTargetBranch: ahead.baseRef
@@ -103243,6 +103383,14 @@ var init_self_healing = __esm({
           for (const task of candidates) {
             const classification = await classifyOwnedLandedEvidenceForSelfHealing(this.options.rootDir, task, mergeTargetBranch);
             if (classification.kind === "owned-commit") {
+              const mergeCommitMessage = await regenerateBareMergeSubject({
+                subject: classification.commit.subject,
+                commitSha: classification.commit.sha,
+                branch: task.branch ?? "",
+                taskId: task.id,
+                rootDir: this.options.rootDir,
+                settings
+              });
               await this.store.updateTask(task.id, {
                 mergeDetails: {
                   ...task.mergeDetails || {},
@@ -103250,7 +103398,7 @@ var init_self_healing = __esm({
                   filesChanged: classification.commit.filesChanged,
                   insertions: classification.commit.insertions,
                   deletions: classification.commit.deletions,
-                  mergeCommitMessage: classification.commit.subject
+                  mergeCommitMessage
                 }
               });
               await this.recordIntegrityAudit(task.id, "task:integrity-reconcile-modified-files", {
@@ -103931,13 +104079,21 @@ var init_self_healing = __esm({
             try {
               const landedCommit = await this.findLandedTaskCommit(task);
               if (landedCommit) {
+                const mergeCommitMessage = await regenerateBareMergeSubject({
+                  subject: landedCommit.subject,
+                  commitSha: landedCommit.sha,
+                  branch: task.branch ?? "",
+                  taskId: task.id,
+                  rootDir: this.options.rootDir,
+                  settings
+                });
                 const mergeDetails = {
                   commitSha: landedCommit.sha,
                   rebaseBaseSha: landedCommit.rebaseBaseSha,
                   filesChanged: landedCommit.filesChanged,
                   insertions: landedCommit.insertions,
                   deletions: landedCommit.deletions,
-                  mergeCommitMessage: landedCommit.subject,
+                  mergeCommitMessage,
                   mergedAt: (/* @__PURE__ */ new Date()).toISOString(),
                   mergeConfirmed: true,
                   prNumber: getPrimaryPrInfo(task)?.number
@@ -103991,7 +104147,7 @@ var init_self_healing = __esm({
       async readShortstatForSha(sha, rebaseBaseSha) {
         try {
           const command = rebaseBaseSha ? `git diff --shortstat ${shellQuote2(`${rebaseBaseSha}..${sha}`)}` : `git show --shortstat --format= ${shellQuote2(sha)}`;
-          const stats = await execAsync26(command, {
+          const stats = await execAsync27(command, {
             cwd: this.options.rootDir,
             maxBuffer: 1024 * 1024
           });
@@ -104008,7 +104164,7 @@ var init_self_healing = __esm({
       async readLandedFilesForSha(sha, rebaseBaseSha) {
         try {
           const command = rebaseBaseSha ? `git diff --name-only ${shellQuote2(`${rebaseBaseSha}..${sha}`)}` : `git show --name-only --format= ${shellQuote2(sha)}`;
-          const result = await execAsync26(command, {
+          const result = await execAsync27(command, {
             cwd: this.options.rootDir,
             maxBuffer: 1024 * 1024
           });
@@ -104263,13 +104419,21 @@ var init_self_healing = __esm({
             try {
               const landedCommit = await this.findLandedTaskCommit(task);
               if (landedCommit) {
+                const mergeCommitMessage = await regenerateBareMergeSubject({
+                  subject: landedCommit.subject,
+                  commitSha: landedCommit.sha,
+                  branch: task.branch ?? "",
+                  taskId: task.id,
+                  rootDir: this.options.rootDir,
+                  settings
+                });
                 const mergeDetails = {
                   commitSha: landedCommit.sha,
                   rebaseBaseSha: landedCommit.rebaseBaseSha,
                   filesChanged: landedCommit.filesChanged,
                   insertions: landedCommit.insertions,
                   deletions: landedCommit.deletions,
-                  mergeCommitMessage: landedCommit.subject,
+                  mergeCommitMessage,
                   mergedAt: (/* @__PURE__ */ new Date()).toISOString(),
                   mergeConfirmed: true,
                   prNumber: getPrimaryPrInfo(task)?.number
@@ -104685,7 +104849,7 @@ var init_self_healing = __esm({
       }
       async isBranchTipMisboundToTask(input) {
         const { branch, taskId, lineageId, baseBranch } = input;
-        const { stdout: bodyOut } = await execAsync26(`git log -1 --format=%B ${shellQuote2(branch)}`, {
+        const { stdout: bodyOut } = await execAsync27(`git log -1 --format=%B ${shellQuote2(branch)}`, {
           cwd: this.options.rootDir,
           timeout: 3e4,
           maxBuffer: 1024 * 1024
@@ -104693,7 +104857,7 @@ var init_self_healing = __esm({
         const body = bodyOut;
         const hasTaskId = body.includes(`Fusion-Task-Id: ${taskId}`);
         const hasLineage = lineageId ? body.includes(`Fusion-Task-Lineage: ${lineageId}`) : false;
-        const { stdout: tipOut } = await execAsync26(`git rev-parse ${shellQuote2(branch)}`, {
+        const { stdout: tipOut } = await execAsync27(`git rev-parse ${shellQuote2(branch)}`, {
           cwd: this.options.rootDir,
           timeout: 3e4,
           maxBuffer: 1024 * 1024
@@ -105659,7 +105823,7 @@ var init_self_healing = __esm({
       async hasRecoverableGitWork(task) {
         if (task.worktree && existsSync38(task.worktree)) {
           try {
-            const { stdout: status } = await execAsync26("git status --porcelain", {
+            const { stdout: status } = await execAsync27("git status --porcelain", {
               cwd: task.worktree,
               timeout: 3e4
             });
@@ -105674,7 +105838,7 @@ var init_self_healing = __esm({
         }
         const branchName = task.branch || canonicalFusionBranchName(task.id);
         try {
-          await execAsync26(`git rev-parse --verify "${branchName}"`, {
+          await execAsync27(`git rev-parse --verify "${branchName}"`, {
             cwd: this.options.rootDir,
             timeout: 3e4
           });
@@ -105682,7 +105846,7 @@ var init_self_healing = __esm({
           return false;
         }
         try {
-          const { stdout: uniqueCommits } = await execAsync26(
+          const { stdout: uniqueCommits } = await execAsync27(
             `git rev-list --count HEAD.."${branchName}"`,
             { cwd: this.options.rootDir, timeout: 3e4 }
           );
@@ -105955,7 +106119,7 @@ var init_self_healing = __esm({
               }
             }
           }
-          await execAsync26("git worktree prune", {
+          await execAsync27("git worktree prune", {
             cwd: this.options.rootDir,
             timeout: 3e4
           });
@@ -106199,10 +106363,10 @@ var init_self_healing = __esm({
 
 // ../engine/src/triage.ts
 import { Type as Type3 } from "@mariozechner/pi-ai";
-import { exec as exec29 } from "node:child_process";
+import { exec as exec30 } from "node:child_process";
 import { readFile as readFile21 } from "node:fs/promises";
 import { join as join44 } from "node:path";
-import { promisify as promisify35 } from "node:util";
+import { promisify as promisify36 } from "node:util";
 function parseFileScopeFromPrompt(text) {
   const match = text.match(/^##\s+File Scope\s*\n([\s\S]*?)(?=^##\s+|$)/m);
   if (!match) return [];
@@ -108462,7 +108626,7 @@ Take a completely different approach to writing this specification. Do NOT repea
               written,
               {
                 cwd: this.rootDir,
-                exec: promisify35(exec29)
+                exec: promisify36(exec30)
               }
             ),
             new Promise((resolve32) => setTimeout(() => resolve32(null), 15e3))
@@ -108619,7 +108783,7 @@ Take a completely different approach to writing this specification. Do NOT repea
 
 // ../engine/src/merger-orphan-rehome.ts
 import { execFile as execFile12 } from "node:child_process";
-import { promisify as promisify36 } from "node:util";
+import { promisify as promisify37 } from "node:util";
 async function runGit5(args, cwd) {
   const { stdout } = await execFileAsync8("git", args, {
     cwd,
@@ -108724,7 +108888,7 @@ var init_merger_orphan_rehome = __esm({
   "../engine/src/merger-orphan-rehome.ts"() {
     "use strict";
     init_merger_ref_update_advance();
-    execFileAsync8 = promisify36(execFile12);
+    execFileAsync8 = promisify37(execFile12);
   }
 });
 
@@ -108773,10 +108937,10 @@ var init_token_cap_detector = __esm({
 });
 
 // ../engine/src/auto-recovery-handlers/branch-worktree.ts
-import { exec as exec30 } from "node:child_process";
+import { exec as exec31 } from "node:child_process";
 import { existsSync as existsSync39 } from "node:fs";
-import { promisify as promisify37 } from "node:util";
-var execAsync27, baseLog2, GIT_TIMEOUT_MS7, GIT_MAX_BUFFER6, BranchWorktreeAutoRecoveryHandler;
+import { promisify as promisify38 } from "node:util";
+var execAsync28, baseLog2, GIT_TIMEOUT_MS7, GIT_MAX_BUFFER6, BranchWorktreeAutoRecoveryHandler;
 var init_branch_worktree = __esm({
   "../engine/src/auto-recovery-handlers/branch-worktree.ts"() {
     "use strict";
@@ -108784,7 +108948,7 @@ var init_branch_worktree = __esm({
     init_active_session_registry();
     init_integration_branch();
     init_logger2();
-    execAsync27 = promisify37(exec30);
+    execAsync28 = promisify38(exec31);
     baseLog2 = createLogger2("auto-recovery:branch-worktree");
     GIT_TIMEOUT_MS7 = 3e4;
     GIT_MAX_BUFFER6 = 10 * 1024 * 1024;
@@ -108796,7 +108960,7 @@ var init_branch_worktree = __esm({
         return this.deps.logger ?? baseLog2;
       }
       async runGit(repoDir, command) {
-        const { stdout } = await execAsync27(command, {
+        const { stdout } = await execAsync28(command, {
           cwd: repoDir,
           timeout: GIT_TIMEOUT_MS7,
           maxBuffer: GIT_MAX_BUFFER6,
@@ -108994,7 +109158,7 @@ var init_branch_worktree = __esm({
           if (!isLiveOwned) {
             if (existsSync39(conflictingWorktreePath)) {
               try {
-                await execAsync27(`git worktree remove --force ${this.quote(conflictingWorktreePath)}`, {
+                await execAsync28(`git worktree remove --force ${this.quote(conflictingWorktreePath)}`, {
                   cwd: repoDir,
                   timeout: GIT_TIMEOUT_MS7,
                   maxBuffer: GIT_MAX_BUFFER6
@@ -109005,7 +109169,7 @@ var init_branch_worktree = __esm({
               }
             }
             try {
-              await execAsync27("git worktree prune", {
+              await execAsync28("git worktree prune", {
                 cwd: repoDir,
                 timeout: GIT_TIMEOUT_MS7,
                 maxBuffer: GIT_MAX_BUFFER6
@@ -109013,7 +109177,7 @@ var init_branch_worktree = __esm({
             } catch {
             }
             try {
-              await execAsync27(`git branch -D ${this.quote(branchName)}`, {
+              await execAsync28(`git branch -D ${this.quote(branchName)}`, {
                 cwd: repoDir,
                 timeout: GIT_TIMEOUT_MS7,
                 maxBuffer: GIT_MAX_BUFFER6
@@ -109187,19 +109351,19 @@ var init_contamination = __esm({
 });
 
 // ../engine/src/auto-recovery-handlers/file-scope.ts
-import { exec as exec31 } from "node:child_process";
-import { promisify as promisify38 } from "node:util";
+import { exec as exec32 } from "node:child_process";
+import { promisify as promisify39 } from "node:util";
 function createFileScopeAutoRecoveryHandler(deps) {
   return new FileScopeAutoRecoveryHandler({
     ...deps,
-    exec: deps.exec ?? execAsync28
+    exec: deps.exec ?? execAsync29
   });
 }
-var execAsync28, FileScopeAutoRecoveryHandler;
+var execAsync29, FileScopeAutoRecoveryHandler;
 var init_file_scope = __esm({
   "../engine/src/auto-recovery-handlers/file-scope.ts"() {
     "use strict";
-    execAsync28 = promisify38(exec31);
+    execAsync29 = promisify39(exec32);
     FileScopeAutoRecoveryHandler = class {
       constructor(deps) {
         this.deps = deps;
@@ -109592,13 +109756,23 @@ var init_run_verification_tool = __esm({
 });
 
 // ../engine/src/executor.ts
-import { exec as exec32, execSync as execSync6 } from "node:child_process";
-import { promisify as promisify39 } from "node:util";
+import { exec as exec33, execSync as execSync6 } from "node:child_process";
+import { promisify as promisify40 } from "node:util";
+import { setImmediate as setImmediateCb3 } from "node:timers";
 import { delimiter, isAbsolute as isAbsolute14, join as join47, relative as relative11, resolve as resolvePath } from "node:path";
 import { existsSync as existsSync41, realpathSync as realpathSync6 } from "node:fs";
 import { readFile as readFile22, rm as rm5, writeFile as writeFile16 } from "node:fs/promises";
 import { Type as Type5 } from "@mariozechner/pi-ai";
 import { ModelRegistry as ModelRegistry2, SessionManager as SessionManager2 } from "@mariozechner/pi-coding-agent";
+function getResumeOrphanDelayMs() {
+  const raw = process.env.FUSION_RESUME_ORPHAN_DELAY_MS;
+  if (raw !== void 0) {
+    const parsed = Number.parseInt(raw, 10);
+    if (Number.isFinite(parsed) && parsed >= 0) return parsed;
+  }
+  if (process.env.VITEST || process.env.NODE_ENV === "test") return 0;
+  return 3e4;
+}
 function canonicalizePath2(path6) {
   try {
     return realpathSync6(path6);
@@ -110141,7 +110315,7 @@ function detectReviewHandoffIntent(commentText) {
   ];
   return handoffPhrases.some((phrase) => text.includes(phrase));
 }
-var execAsync29, tokenCacheMetricsLog, STEP_STATUSES, MAX_WORKFLOW_STEP_RETRIES, MAX_TASK_DONE_SESSION_RETRIES, MAX_TASK_DONE_REQUEUE_RETRIES, COMPLETED_TASK_WATCHDOG_MS, WORKFLOW_RERUN_WATCHDOG_MS, TASK_DONE_REFUSAL_SUFFIX, DISSENT_PATTERNS, WORKFLOW_SCRIPT_OUTPUT_MAX_CHARS2, WORKFLOW_FEEDBACK_PATH_REGEX, NonRetryableWorktreeError, taskUpdateParams, taskAddDepParams, spawnAgentParams, WORKFLOW_STEP_VERDICTS, reviewStepParams, EXECUTOR_SYSTEM_PROMPT, TaskExecutor;
+var execAsync30, yieldEventLoop3, tokenCacheMetricsLog, STEP_STATUSES, MAX_WORKFLOW_STEP_RETRIES, MAX_TASK_DONE_SESSION_RETRIES, MAX_TASK_DONE_REQUEUE_RETRIES, COMPLETED_TASK_WATCHDOG_MS, WORKFLOW_RERUN_WATCHDOG_MS, TASK_DONE_REFUSAL_SUFFIX, DISSENT_PATTERNS, WORKFLOW_SCRIPT_OUTPUT_MAX_CHARS2, WORKFLOW_FEEDBACK_PATH_REGEX, NonRetryableWorktreeError, taskUpdateParams, taskAddDepParams, spawnAgentParams, WORKFLOW_STEP_VERDICTS, reviewStepParams, EXECUTOR_SYSTEM_PROMPT, TaskExecutor;
 var init_executor = __esm({
   "../engine/src/executor.ts"() {
     "use strict";
@@ -110199,7 +110373,8 @@ var init_executor = __esm({
     init_retry_burned_logger();
     init_agent_logger();
     init_agent_tools();
-    execAsync29 = promisify39(exec32);
+    execAsync30 = promisify40(exec33);
+    yieldEventLoop3 = () => new Promise((resolve32) => setImmediateCb3(resolve32));
     tokenCacheMetricsLog = createLogger2("token-cache-metrics");
     STEP_STATUSES = ["pending", "in-progress", "done", "skipped"];
     MAX_WORKFLOW_STEP_RETRIES = 3;
@@ -110225,7 +110400,10 @@ var init_executor = __esm({
       status: Type5.Union(
         STEP_STATUSES.map((s3) => Type5.Literal(s3)),
         { description: "New status: pending, in-progress, done, or skipped" }
-      )
+      ),
+      dependencies: Type5.Optional(Type5.Array(Type5.String(), {
+        description: "Optional task dependency array. Replaces existing dependencies. Pass ['FN-001', 'FN-002'] to set dependencies. Pass [] to clear all dependencies. Omit parameter to preserve existing dependencies."
+      }))
     });
     taskAddDepParams = Type5.Object({
       task_id: Type5.String({ description: 'The ID of the task to depend on (e.g. "KB-001")' }),
@@ -111956,7 +112134,21 @@ The tool prevents your session from being killed by the inactivity watchdog duri
         );
         if (inProgress.length === 0) return;
         executorLog.log(`Found ${inProgress.length} orphaned in-progress task(s)`);
+        const resumeDelayMs = getResumeOrphanDelayMs();
+        if (resumeDelayMs > 0) {
+          executorLog.log(
+            `Deferring orphan task resumption for ${resumeDelayMs}ms to keep dashboard responsive during cold start`
+          );
+        }
+        const scheduleResume = resumeDelayMs > 0 ? (fn2) => {
+          setTimeout(fn2, resumeDelayMs);
+        } : (fn2) => {
+          fn2();
+        };
+        let yieldNext = false;
         for (const task of inProgress) {
+          if (yieldNext) await yieldEventLoop3();
+          yieldNext = true;
           if (this.isTaskWorkComplete(task) && !task.mergeDetails) {
             if (this.recoveringCompleted.has(task.id)) {
               executorLog.log(`${task.id} completed-task recovery already running - skipping duplicate startup recovery`);
@@ -111964,10 +112156,12 @@ The tool prevents your session from being killed by the inactivity watchdog duri
             }
             executorLog.log(`${task.id} is already complete \u2014 fast-pathing to in-review`);
             this.recoveringCompleted.add(task.id);
-            void this.recoverCompletedTask(task).catch(
-              (err) => executorLog.error(`Failed to recover completed orphan ${task.id}:`, err)
-            ).finally(() => {
-              this.recoveringCompleted.delete(task.id);
+            scheduleResume(() => {
+              void this.recoverCompletedTask(task).catch(
+                (err) => executorLog.error(`Failed to recover completed orphan ${task.id}:`, err)
+              ).finally(() => {
+                this.recoveringCompleted.delete(task.id);
+              });
             });
             continue;
           }
@@ -111983,9 +112177,11 @@ The tool prevents your session from being killed by the inactivity watchdog duri
           } catch (err) {
             executorLog.error(`Failed to write resume log for ${task.id}:`, err);
           }
-          this.execute(task).catch(
-            (err) => executorLog.error(`Failed to resume ${task.id}:`, err)
-          );
+          scheduleResume(() => {
+            this.execute(task).catch(
+              (err) => executorLog.error(`Failed to resume ${task.id}:`, err)
+            );
+          });
         }
       }
       /**
@@ -113681,7 +113877,7 @@ ${summary}`,
                     repoDir: this.rootDir,
                     sha: commit.sha,
                     commitSubject: commit.subject,
-                    commitBody: await execAsync29(`git log -1 --format=%b ${commit.sha}`, { cwd: this.rootDir, encoding: "utf-8" }).then((r) => r.stdout).catch(() => ""),
+                    commitBody: await execAsync30(`git log -1 --format=%b ${commit.sha}`, { cwd: this.rootDir, encoding: "utf-8" }).then((r) => r.stdout).catch(() => ""),
                     currentTaskId: task.id
                   });
                   if (misroutedResult.misrouted && misroutedResult.foreignTaskId) {
@@ -113694,7 +113890,7 @@ ${summary}`,
                 const genuinelyUnique = [];
                 const integrationBranchForOrphan = task.mergeDetails?.mergeTargetBranch ?? task.baseBranch ?? "main";
                 for (const commit of preOrphanUnique) {
-                  const orphanBody = await execAsync29(`git log -1 --format=%b ${commit.sha}`, { cwd: this.rootDir, encoding: "utf-8" }).then((r) => r.stdout).catch(() => "");
+                  const orphanBody = await execAsync30(`git log -1 --format=%b ${commit.sha}`, { cwd: this.rootDir, encoding: "utf-8" }).then((r) => r.stdout).catch(() => "");
                   const orphanClass = await classifyOrphanOurAdvance({
                     repoDir: this.rootDir,
                     taskStore: this.store,
@@ -114076,10 +114272,10 @@ ${summary}`,
         return {
           name: "fn_task_update",
           label: "Update Step",
-          description: "Update a step's status. Call before starting a step (in-progress), after completing it (done), or to skip it (skipped). The board updates in real-time.",
+          description: "Update a step's status. Call before starting a step (in-progress), after completing it (done), or to skip it (skipped). Optionally update task dependencies by passing a dependencies array. The board updates in real-time.",
           parameters: taskUpdateParams,
           execute: async (_id, params) => {
-            const { step, status } = params;
+            const { step, status, dependencies } = params;
             if (status === "in-progress" || status === "done" || status === "skipped") {
               stuckDetector?.recordProgress(taskId);
             }
@@ -114117,6 +114313,35 @@ ${summary}`,
                 details: {}
               };
             }
+            if (dependencies !== void 0) {
+              if (dependencies.includes(taskId)) {
+                return {
+                  content: [{
+                    type: "text",
+                    text: `Cannot add self-dependency: ${taskId} cannot depend on itself.`
+                  }],
+                  details: {}
+                };
+              }
+              const invalidIds = [];
+              for (const depId of dependencies) {
+                try {
+                  await store.getTask(depId);
+                } catch {
+                  invalidIds.push(depId);
+                }
+              }
+              if (invalidIds.length > 0) {
+                return {
+                  content: [{
+                    type: "text",
+                    text: `Cannot set dependencies \u2014 the following task(s) do not exist: ${invalidIds.join(", ")}`
+                  }],
+                  details: {}
+                };
+              }
+              await store.updateTask(taskId, { dependencies });
+            }
             const task = await store.updateStep(taskId, stepIndex, status);
             const stepInfo = task.steps[stepIndex];
             if (!stepInfo) {
@@ -114300,8 +114525,14 @@ ${summary}`,
             expected: `resolvable task worktree under ${resolveWorktreesDir(this.rootDir, settings)}/*`
           };
         }
+        if (!existsSync41(worktreePath)) {
+          executorLog.log(
+            `${task.id}: worktree directory not found at ${worktreePath} \u2014 skipping git validation for task completion`
+          );
+          return { ok: true };
+        }
         try {
-          const { stdout } = await execAsync29("git rev-parse --show-toplevel", {
+          const { stdout } = await execAsync30("git rev-parse --show-toplevel", {
             cwd: worktreePath,
             encoding: "utf-8",
             timeout: 1e4,
@@ -114328,7 +114559,7 @@ ${summary}`,
           };
         }
         try {
-          const { stdout } = await execAsync29("git rev-parse --abbrev-ref HEAD", {
+          const { stdout } = await execAsync30("git rev-parse --abbrev-ref HEAD", {
             cwd: worktreePath,
             encoding: "utf-8",
             timeout: 1e4,
@@ -114386,7 +114617,7 @@ ${summary}`,
           return { ok: true };
         }
         try {
-          const { stdout } = await execAsync29(`git rev-list --count ${baseRef}..HEAD`, {
+          const { stdout } = await execAsync30(`git rev-list --count ${baseRef}..HEAD`, {
             cwd: worktreePath,
             encoding: "utf-8",
             timeout: 1e4,
@@ -114849,7 +115080,7 @@ ${result.review}`;
                 case "RETHINK": {
                   if (reviewType === "code" && baseline) {
                     try {
-                      await execAsync29(`git reset --hard ${baseline}`, { cwd: worktreePath });
+                      await execAsync30(`git reset --hard ${baseline}`, { cwd: worktreePath });
                       executorLog.log(`${taskId}: RETHINK \u2014 git reset --hard ${baseline}`);
                     } catch (gitErr) {
                       const gitErrMessage = gitErr instanceof Error ? gitErr.message : String(gitErr);
@@ -114971,7 +115202,7 @@ Take a different approach. Do NOT repeat the rejected strategy. Re-read the step
         const branch = task.branch || canonicalFusionBranchName(taskId);
         let branchDeleted = false;
         try {
-          await execAsync29(`git branch -D "${branch}"`, { cwd: this.rootDir });
+          await execAsync30(`git branch -D "${branch}"`, { cwd: this.rootDir });
           branchDeleted = true;
         } catch (err) {
           const msg = err instanceof Error ? err.message : String(err);
@@ -115524,7 +115755,7 @@ ${failureFeedback}
           }
           let baseCommitSha;
           try {
-            const { stdout } = await execAsync29(
+            const { stdout } = await execAsync30(
               "git merge-base HEAD origin/main 2>/dev/null || git merge-base HEAD main",
               { cwd: worktreePath, encoding: "utf-8" }
             );
@@ -115534,7 +115765,7 @@ ${failureFeedback}
             executorLog.warn(`${task.id}: merge-base failed, falling back to HEAD: ${errorMessage}`);
           }
           if (!baseCommitSha) {
-            const { stdout } = await execAsync29("git rev-parse HEAD", {
+            const { stdout } = await execAsync30("git rev-parse HEAD", {
               cwd: worktreePath,
               encoding: "utf-8"
             });
@@ -115563,7 +115794,7 @@ ${failureFeedback}
        */
       async resolveContaminationBaseRef(worktreePath) {
         try {
-          const { stdout } = await execAsync29(
+          const { stdout } = await execAsync30(
             "git merge-base HEAD main 2>/dev/null || git merge-base HEAD origin/main",
             { cwd: worktreePath, encoding: "utf-8" }
           );
@@ -115583,7 +115814,7 @@ ${failureFeedback}
       async resolveDiffBaseRef(worktreePath, baseCommitSha) {
         if (baseCommitSha) return baseCommitSha;
         try {
-          const { stdout } = await execAsync29(
+          const { stdout } = await execAsync30(
             "git merge-base HEAD origin/main 2>/dev/null || git merge-base HEAD main",
             { cwd: worktreePath, encoding: "utf-8" }
           );
@@ -115594,7 +115825,7 @@ ${failureFeedback}
           executorLog.warn(`Failed merge-base lookup for diff base in ${worktreePath}, trying HEAD~1 fallback: ${mergeBaseMsg}`);
         }
         try {
-          const { stdout } = await execAsync29("git rev-parse HEAD~1", {
+          const { stdout } = await execAsync30("git rev-parse HEAD~1", {
             cwd: worktreePath,
             encoding: "utf-8"
           });
@@ -115637,7 +115868,7 @@ ${failureFeedback}
           } catch (error) {
             if (error instanceof BranchAttributionError) {
               executorLog.warn(`${taskId}: branch-attribution failed (${error.message}); falling back to raw diff`);
-              const { stdout } = await execAsync29(`git diff --name-only ${baseRef}..HEAD`, {
+              const { stdout } = await execAsync30(`git diff --name-only ${baseRef}..HEAD`, {
                 cwd: worktreePath,
                 encoding: "utf-8"
               });
@@ -115655,8 +115886,8 @@ ${failureFeedback}
       async captureUncommittedModifiedFiles(worktreePath) {
         try {
           const [unstaged, staged] = await Promise.all([
-            execAsync29("git diff --name-only", { cwd: worktreePath, encoding: "utf-8" }),
-            execAsync29("git diff --name-only --cached", { cwd: worktreePath, encoding: "utf-8" })
+            execAsync30("git diff --name-only", { cwd: worktreePath, encoding: "utf-8" }),
+            execAsync30("git diff --name-only --cached", { cwd: worktreePath, encoding: "utf-8" })
           ]);
           const files = [...unstaged.stdout.split("\n"), ...staged.stdout.split("\n")].map((entry) => entry.trim()).filter(Boolean);
           return [...new Set(files)];
@@ -116067,7 +116298,7 @@ ${failureFeedback}
         try {
           const baseRef = await this.resolveDiffBaseRef(worktreePath, task.baseCommitSha);
           if (baseRef) {
-            const { stdout } = await execAsync29(`git diff --shortstat ${baseRef}..HEAD`, {
+            const { stdout } = await execAsync30(`git diff --shortstat ${baseRef}..HEAD`, {
               cwd: worktreePath,
               encoding: "utf-8"
             });
@@ -116460,7 +116691,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
             await this.cleanupConflictingWorktree(inspection.livePath, error.branchName, task.id);
           }
           try {
-            await execAsync29("git worktree prune", {
+            await execAsync30("git worktree prune", {
               cwd: this.rootDir,
               timeout: 12e4,
               maxBuffer: 10 * 1024 * 1024
@@ -116468,7 +116699,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
           } catch {
           }
           try {
-            await execAsync29(`git branch -D ${JSON.stringify(error.branchName)}`, {
+            await execAsync30(`git branch -D ${JSON.stringify(error.branchName)}`, {
               cwd: this.rootDir,
               timeout: 12e4,
               maxBuffer: 10 * 1024 * 1024
@@ -116493,13 +116724,13 @@ Review the work done in this worktree and evaluate it against the criteria in yo
           const cleanupSuccess = await this.cleanupConflictingWorktree(inspection.livePath, error.branchName, task.id);
           if (cleanupSuccess) {
             try {
-              await execAsync29("git worktree prune", { cwd: this.rootDir });
+              await execAsync30("git worktree prune", { cwd: this.rootDir });
             } catch {
             }
             try {
               const worktreeMap = await this.getWorktreeBranchMap();
               if (!worktreeMap.has(error.branchName)) {
-                await execAsync29(`git branch -D "${error.branchName}"`, { cwd: this.rootDir });
+                await execAsync30(`git branch -D "${error.branchName}"`, { cwd: this.rootDir });
               }
             } catch {
             }
@@ -116635,7 +116866,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
           let remote = settings.worktreeRebaseRemote?.trim() || "";
           if (!remote) {
             try {
-              const { stdout } = await execAsync29("git remote", { cwd: this.rootDir });
+              const { stdout } = await execAsync30("git remote", { cwd: this.rootDir });
               const remotes = stdout.split("\n").map((s3) => s3.trim()).filter(Boolean);
               if (remotes.includes("origin")) remote = "origin";
               else if (remotes.length === 1) remote = remotes[0];
@@ -116645,7 +116876,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
           if (remote) {
             let defaultBranch = "";
             try {
-              const { stdout } = await execAsync29(
+              const { stdout } = await execAsync30(
                 `git rev-parse --abbrev-ref ${this.quoteShellArg(remote)}/HEAD`,
                 { cwd: this.rootDir }
               );
@@ -116653,12 +116884,12 @@ Review the work done in this worktree and evaluate it against the criteria in yo
             } catch {
             }
             if (defaultBranch && defaultBranch !== "HEAD") {
-              await execAsync29(
+              await execAsync30(
                 `git fetch ${this.quoteShellArg(remote)} ${this.quoteShellArg(defaultBranch)}`,
                 { cwd: this.rootDir }
               ).catch(() => void 0);
               try {
-                const { stdout } = await execAsync29(
+                const { stdout } = await execAsync30(
                   `git rev-parse --verify "${remote}/${defaultBranch}^{commit}"`,
                   { cwd: this.rootDir, encoding: "utf-8" }
                 );
@@ -116670,7 +116901,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
         }
         if (!mainBase) {
           try {
-            const { stdout } = await execAsync29("git rev-parse HEAD", {
+            const { stdout } = await execAsync30("git rev-parse HEAD", {
               cwd: this.rootDir,
               encoding: "utf-8"
             });
@@ -116681,7 +116912,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
         }
         if (!mainBase) return null;
         try {
-          await execAsync29(
+          await execAsync30(
             `git merge-base --is-ancestor ${this.quoteShellArg(depTip)} ${this.quoteShellArg(mainBase)}`,
             { cwd: this.rootDir }
           );
@@ -116701,7 +116932,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
        */
       async squashImportDepIntoWorktree(worktreePath, taskId, depTip, label) {
         try {
-          await execAsync29(
+          await execAsync30(
             `git merge-base --is-ancestor ${this.quoteShellArg(depTip)} HEAD`,
             { cwd: worktreePath }
           );
@@ -116709,30 +116940,30 @@ Review the work done in this worktree and evaluate it against the criteria in yo
         } catch {
         }
         try {
-          await execAsync29(
+          await execAsync30(
             `git merge --squash --allow-unrelated-histories ${this.quoteShellArg(depTip)}`,
             { cwd: worktreePath }
           );
         } catch (err) {
-          await execAsync29("git reset --hard HEAD", { cwd: worktreePath }).catch(
+          await execAsync30("git reset --hard HEAD", { cwd: worktreePath }).catch(
             () => void 0
           );
           throw err;
         }
         try {
-          await execAsync29("git diff --cached --quiet", { cwd: worktreePath });
+          await execAsync30("git diff --cached --quiet", { cwd: worktreePath });
           return;
         } catch {
         }
         const subject = `chore(${taskId}): import dependency content from ${label}`;
         const body = `Squash-imported the working tree of ${label} as a single commit so this branch carries the dep's content without inheriting its individual commits. If the dep is later squash-merged to main, this commit's patch-id should match the merge and rebase cleanly.`;
         try {
-          await execAsync29(
+          await execAsync30(
             `git commit -m ${this.quoteShellArg(subject)} -m ${this.quoteShellArg(body)}`,
             { cwd: worktreePath }
           );
         } catch (commitErr) {
-          await execAsync29("git reset --hard HEAD", { cwd: worktreePath }).catch(
+          await execAsync30("git reset --hard HEAD", { cwd: worktreePath }).catch(
             () => void 0
           );
           throw commitErr;
@@ -116764,7 +116995,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
         let remote = settings.worktreeRebaseRemote?.trim() || "";
         if (!remote) {
           try {
-            const { stdout } = await execAsync29("git remote", { cwd: this.rootDir });
+            const { stdout } = await execAsync30("git remote", { cwd: this.rootDir });
             const remotes = stdout.split("\n").map((s3) => s3.trim()).filter(Boolean);
             if (remotes.includes("origin")) remote = "origin";
             else if (remotes.length === 1) remote = remotes[0];
@@ -116774,13 +117005,13 @@ Review the work done in this worktree and evaluate it against the criteria in yo
         if (!remote) return;
         let defaultBranch = "";
         try {
-          const { stdout } = await execAsync29(`git rev-parse --abbrev-ref ${remote}/HEAD`, { cwd: this.rootDir });
+          const { stdout } = await execAsync30(`git rev-parse --abbrev-ref ${remote}/HEAD`, { cwd: this.rootDir });
           defaultBranch = stdout.trim().replace(new RegExp(`^${remote}/`), "");
         } catch {
         }
         if (!defaultBranch) {
           try {
-            const { stdout } = await execAsync29("git rev-parse --abbrev-ref HEAD", { cwd: this.rootDir });
+            const { stdout } = await execAsync30("git rev-parse --abbrev-ref HEAD", { cwd: this.rootDir });
             defaultBranch = stdout.trim();
           } catch {
             return;
@@ -116789,7 +117020,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
         if (!defaultBranch || defaultBranch === "HEAD") return;
         const remoteRef = `${remote}/${defaultBranch}`;
         try {
-          await execAsync29(`git fetch ${this.quoteShellArg(remote)} ${this.quoteShellArg(defaultBranch)}`, { cwd: this.rootDir });
+          await execAsync30(`git fetch ${this.quoteShellArg(remote)} ${this.quoteShellArg(defaultBranch)}`, { cwd: this.rootDir });
         } catch (err) {
           executorLog.warn(
             `Worktree rebase: fetch ${remote} ${defaultBranch} failed for ${taskId}: ${err instanceof Error ? err.message : String(err)}`
@@ -116797,7 +117028,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
           return;
         }
         try {
-          await execAsync29(`git rebase ${this.quoteShellArg(remoteRef)}`, { cwd: worktreePath });
+          await execAsync30(`git rebase ${this.quoteShellArg(remoteRef)}`, { cwd: worktreePath });
           await this.store.logEntry(
             taskId,
             `Rebased new worktree branch ${branch} onto ${remoteRef}`
@@ -116808,7 +117039,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
             `Worktree rebase: rebase onto ${remoteRef} failed for ${taskId} \u2014 aborting and leaving local base intact: ${msg}`
           );
           try {
-            await execAsync29("git rebase --abort", { cwd: worktreePath });
+            await execAsync30("git rebase --abort", { cwd: worktreePath });
           } catch {
           }
           await this.store.logEntry(
@@ -116828,7 +117059,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
       async resolveWorktreeStartPoint(startPoint, taskId) {
         const command = isAbsolute14(startPoint) && existsSync41(startPoint) ? `git -C "${startPoint}" rev-parse --verify HEAD^{commit}` : `git rev-parse --verify "${startPoint}^{commit}"`;
         try {
-          const { stdout } = await execAsync29(command, { cwd: this.rootDir });
+          const { stdout } = await execAsync30(command, { cwd: this.rootDir });
           return stdout.trim() || startPoint;
         } catch (error) {
           const errorMessage = error instanceof Error ? error.message : String(error);
@@ -117031,7 +117262,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
         const createWithBranch = async (branchToCreate) => {
           const cmd = startPoint ? `git worktree add -b "${branchToCreate}" "${path6}" "${startPoint}"` : `git worktree add -b "${branchToCreate}" "${path6}"`;
           try {
-            await execAsync29(cmd, { cwd: this.rootDir });
+            await execAsync30(cmd, { cwd: this.rootDir });
           } catch (err) {
             try {
               await rm5(path6, { recursive: true, force: true });
@@ -117043,7 +117274,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
         };
         const createFromExistingBranch = async () => {
           try {
-            await execAsync29(`git worktree add "${path6}" "${branch}"`, { cwd: this.rootDir });
+            await execAsync30(`git worktree add "${path6}" "${branch}"`, { cwd: this.rootDir });
           } catch (err) {
             try {
               await rm5(path6, { recursive: true, force: true });
@@ -117316,7 +117547,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
        * Returns true if the conflicting worktree is used by an active task.
        */
       async getWorktreeBranchMap() {
-        const { stdout } = await execAsync29("git worktree list --porcelain", { cwd: this.rootDir, encoding: "utf-8" });
+        const { stdout } = await execAsync30("git worktree list --porcelain", { cwd: this.rootDir, encoding: "utf-8" });
         const map = /* @__PURE__ */ new Map();
         let currentWorktree = null;
         for (const line of stdout.split("\n")) {
@@ -117479,7 +117710,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
         }
         try {
           try {
-            await execAsync29(`git worktree unlock "${worktreePath}"`, {
+            await execAsync30(`git worktree unlock "${worktreePath}"`, {
               cwd: this.rootDir
             });
             await this.store.logEntry(taskId, `Unlocked worktree`, worktreePath);
@@ -117496,7 +117727,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
           });
           await this.store.logEntry(taskId, `Removed conflicting worktree`, worktreePath);
           try {
-            await execAsync29(`git branch -D "${branch}"`, {
+            await execAsync30(`git branch -D "${branch}"`, {
               cwd: this.rootDir
             });
             await this.store.logEntry(taskId, `Deleted branch`, branch);
@@ -117510,7 +117741,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
           const errorMessage = error instanceof Error ? error.message : String(error);
           if (/validation failed, cannot remove working tree/i.test(errorMessage)) {
             try {
-              await execAsync29("git worktree prune", {
+              await execAsync30("git worktree prune", {
                 cwd: this.rootDir,
                 timeout: 3e4,
                 maxBuffer: 10 * 1024 * 1024
@@ -117520,7 +117751,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
               executorLog.warn(`${taskId}: git worktree prune failed during stale-path cleanup of ${worktreePath}: ${pruneMsg}`);
             }
             try {
-              await execAsync29(`git branch -D "${branch}"`, { cwd: this.rootDir });
+              await execAsync30(`git branch -D "${branch}"`, { cwd: this.rootDir });
               this.store.clearStaleExecutionStartBranchReferences([branch], taskId);
             } catch {
             }
@@ -117554,12 +117785,12 @@ Review the work done in this worktree and evaluate it against the criteria in yo
        */
       async cleanupStaleBranch(branch, taskId) {
         try {
-          await execAsync29("git worktree prune", { cwd: this.rootDir });
+          await execAsync30("git worktree prune", { cwd: this.rootDir });
           await this.store.logEntry(taskId, `Pruned stale worktree metadata`, branch);
         } catch {
         }
         try {
-          await execAsync29(`git branch -D "${branch}"`, {
+          await execAsync30(`git branch -D "${branch}"`, {
             cwd: this.rootDir
           });
           await this.store.logEntry(taskId, `Removed stale branch`, branch);
@@ -117578,7 +117809,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
         }
         try {
           const refPath = `refs/heads/${branch}`;
-          await execAsync29(`git update-ref -d "${refPath}"`, {
+          await execAsync30(`git update-ref -d "${refPath}"`, {
             cwd: this.rootDir
           });
           await this.store.logEntry(taskId, `Force-removed stale branch reference via update-ref`, refPath);
@@ -117751,7 +117982,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
         if (pendingOrInProgressSteps.length === 0) return;
         let logOutput;
         try {
-          const { stdout } = await execAsync29(
+          const { stdout } = await execAsync30(
             `git log "${baseCommitSha}..HEAD" --oneline`,
             { cwd: worktreePath }
           );
@@ -117809,11 +118040,11 @@ Review the work done in this worktree and evaluate it against the criteria in yo
         if (completedSteps.length === 0) return;
         const branchName = task.branch || canonicalFusionBranchName(task.id);
         try {
-          const { stdout: mergeBaseStdout } = await execAsync29(
+          const { stdout: mergeBaseStdout } = await execAsync30(
             `git merge-base "${branchName}" HEAD 2>/dev/null`,
             { cwd: this.rootDir, encoding: "utf-8" }
           );
-          const { stdout: branchHeadStdout } = await execAsync29(
+          const { stdout: branchHeadStdout } = await execAsync30(
             `git rev-parse "${branchName}" 2>/dev/null`,
             { cwd: this.rootDir, encoding: "utf-8" }
           );
@@ -121565,7 +121796,7 @@ ${taskContext}` : ""}`;
 
 // ../engine/src/smart-pull.ts
 import { execFile as execFile13 } from "node:child_process";
-import { promisify as promisify40 } from "node:util";
+import { promisify as promisify41 } from "node:util";
 async function runGit6(args, cwd, timeoutMs) {
   const result = await execFileAsync9("git", args, {
     cwd,
@@ -121722,7 +121953,7 @@ var execFileAsync9;
 var init_smart_pull = __esm({
   "../engine/src/smart-pull.ts"() {
     "use strict";
-    execFileAsync9 = promisify40(execFile13);
+    execFileAsync9 = promisify41(execFile13);
   }
 });
 
@@ -126197,12 +126428,12 @@ var init_finalize_types = __esm({
 });
 
 // ../engine/src/experiment/git-ops.ts
-import { exec as exec33 } from "node:child_process";
-import { promisify as promisify41 } from "node:util";
+import { exec as exec34 } from "node:child_process";
+import { promisify as promisify42 } from "node:util";
 async function runGit7(cwd, args) {
   const command = `git ${args.join(" ")}`;
   try {
-    const { stdout } = await execAsync30(command, {
+    const { stdout } = await execAsync31(command, {
       cwd,
       timeout: GIT_TIMEOUT_MS8,
       maxBuffer: GIT_MAX_BUFFER7
@@ -126299,12 +126530,12 @@ function defaultGitOps(cwd) {
     }
   };
 }
-var execAsync30, GIT_TIMEOUT_MS8, GIT_MAX_BUFFER7;
+var execAsync31, GIT_TIMEOUT_MS8, GIT_MAX_BUFFER7;
 var init_git_ops = __esm({
   "../engine/src/experiment/git-ops.ts"() {
     "use strict";
     init_finalize_types();
-    execAsync30 = promisify41(exec33);
+    execAsync31 = promisify42(exec34);
     GIT_TIMEOUT_MS8 = 3e4;
     GIT_MAX_BUFFER7 = 10 * 1024 * 1024;
   }
@@ -128036,10 +128267,10 @@ var init_evaluator = __esm({
 });
 
 // ../engine/src/cron-runner.ts
-import { exec as exec34 } from "node:child_process";
+import { exec as exec35 } from "node:child_process";
 function execCommand(command, options) {
   return new Promise((resolve32, reject) => {
-    exec34(command, options, (error, stdout, stderr) => {
+    exec35(command, options, (error, stdout, stderr) => {
       const stdoutText = typeof stdout === "string" ? stdout : String(stdout ?? "");
       const stderrText = typeof stderr === "string" ? stderr : String(stderr ?? "");
       if (error) {
@@ -130954,7 +131185,8 @@ var init_task_agent_sync = __esm({
 
 // ../engine/src/runtimes/in-process-runtime.ts
 import { EventEmitter as EventEmitter19 } from "node:events";
-var InProcessRuntime;
+import { setImmediate as setImmediateCb4 } from "node:timers";
+var yieldEventLoop4, InProcessRuntime;
 var init_in_process_runtime = __esm({
   "../engine/src/runtimes/in-process-runtime.ts"() {
     "use strict";
@@ -130981,6 +131213,7 @@ var init_in_process_runtime = __esm({
     init_node_dispatch_validation();
     init_task_agent_sync();
     init_run_audit();
+    yieldEventLoop4 = () => new Promise((resolve32) => setImmediateCb4(resolve32));
     InProcessRuntime = class extends EventEmitter19 {
       /**
        * @param config - Runtime configuration
@@ -131073,6 +131306,7 @@ var init_in_process_runtime = __esm({
             runtimeLog.log(`TaskStore initialized for project ${this.config.projectId}`);
           }
           this.messageStore = new MessageStoreClass(this.taskStore.getDatabase());
+          await yieldEventLoop4();
           this.pluginStore = new PluginStoreClass(this.config.workingDirectory);
           await this.pluginStore.init();
           this.pluginLoader = new PluginLoaderClass({
@@ -131087,6 +131321,7 @@ var init_in_process_runtime = __esm({
           });
           await this.pluginRunner.init();
           runtimeLog.log(`PluginRunner initialized`);
+          await yieldEventLoop4();
           const { reapOrphanWorktrees: reapOrphanWorktrees2, scanIdleWorktrees: scanIdleWorktrees2 } = await Promise.resolve().then(() => (init_worktree_pool(), worktree_pool_exports));
           const settings = await this.taskStore.getSettings();
           try {
@@ -131115,6 +131350,7 @@ var init_in_process_runtime = __esm({
               `Rehydrated worktree pool with ${idleWorktrees.length} idle worktrees`
             );
           }
+          await yieldEventLoop4();
           if (this.config.globalSemaphore) {
             this.globalSemaphore = this.config.globalSemaphore;
           } else {
@@ -131128,6 +131364,7 @@ var init_in_process_runtime = __esm({
               this.centralCore.on("concurrency:changed", this.concurrencyChangedListener);
             }
           }
+          await yieldEventLoop4();
           let agentStoreForReflection;
           try {
             const { AgentStore: AgentStoreClass } = await Promise.resolve().then(() => (init_src(), src_exports));
@@ -131138,6 +131375,7 @@ var init_in_process_runtime = __esm({
             runtimeLog.warn(`AgentStore initialization failed (reflection service will be unavailable):`, agentErr instanceof Error ? agentErr.message : agentErr);
           }
           this.agentStore = agentStoreForReflection;
+          await yieldEventLoop4();
           const missionStore = this.taskStore.getMissionStore();
           this.missionAutopilot = missionStore ? new MissionAutopilot(this.taskStore, missionStore) : void 0;
           const missionAutopilot = this.missionAutopilot;
@@ -131198,6 +131436,7 @@ var init_in_process_runtime = __esm({
             },
             snapshotManager: autoClaimSnapshotManager
           });
+          await yieldEventLoop4();
           this.stuckTaskDetector = new StuckTaskDetector(this.taskStore, {
             beforeRequeue: (taskId, reason, event) => this.selfHealingManager?.checkStuckBudget(taskId, reason, event) ?? Promise.resolve(true),
             onLoopDetected: (event) => this.executor?.handleLoopDetected(event) ?? Promise.resolve(false),
@@ -131320,6 +131559,7 @@ var init_in_process_runtime = __esm({
               }
             })();
           });
+          await yieldEventLoop4();
           if (this.heartbeatMonitor) {
           }
           if (!this.heartbeatMonitor && this.agentStore) {
@@ -131389,7 +131629,9 @@ var init_in_process_runtime = __esm({
             }
             if (this.workerManager) {
               this.workerManager.attachStateChangeListener();
-              await this.workerManager.reconcileOrphaned();
+              void this.workerManager.reconcileOrphaned().catch((err) => {
+                runtimeLog.warn(`Deferred workerManager.reconcileOrphaned failed: ${err instanceof Error ? err.message : String(err)}`);
+              });
             }
             try {
               const agents = await this.agentStore.listAgents();
@@ -131470,6 +131712,7 @@ var init_in_process_runtime = __esm({
           } catch (routineErr) {
             runtimeLog.warn("RoutineScheduler initialization skipped:", routineErr instanceof Error ? routineErr.message : routineErr);
           }
+          await yieldEventLoop4();
           this.chatStore ??= new ChatStore(this.taskStore.getFusionDir(), this.taskStore.getDatabase());
           this.selfHealingManager = new SelfHealingManager(this.taskStore, {
             rootDir: this.config.workingDirectory,
@@ -131528,7 +131771,9 @@ var init_in_process_runtime = __esm({
             );
           } else {
             this.startupRecoveryDeferred = false;
-            await this.resumeStartupRecoverySequence();
+            void this.resumeStartupRecoverySequence().catch((err) => {
+              runtimeLog.error("Deferred startup recovery sequence failed:", err);
+            });
           }
           this.scheduler.start();
           this.triageProcessor?.start();
@@ -133988,8 +134233,8 @@ var init_provider_adapters = __esm({
 
 // ../engine/src/remote-access/tunnel-process-manager.ts
 import { EventEmitter as EventEmitter24 } from "node:events";
-import { exec as exec35, execFile as execFile14, spawn as spawn8 } from "node:child_process";
-import { promisify as promisify42 } from "node:util";
+import { exec as exec36, execFile as execFile14, spawn as spawn8 } from "node:child_process";
+import { promisify as promisify43 } from "node:util";
 function nowIso2() {
   return (/* @__PURE__ */ new Date()).toISOString();
 }
@@ -134029,7 +134274,7 @@ function toStateError(code, err) {
     at: nowIso2()
   };
 }
-var DEFAULT_MAX_LOG_ENTRIES, DEFAULT_STOP_TIMEOUT_MS2, execFileAsync10, execAsync31, LineBuffer, TunnelProcessManager;
+var DEFAULT_MAX_LOG_ENTRIES, DEFAULT_STOP_TIMEOUT_MS2, execFileAsync10, execAsync32, LineBuffer, TunnelProcessManager;
 var init_tunnel_process_manager = __esm({
   "../engine/src/remote-access/tunnel-process-manager.ts"() {
     "use strict";
@@ -134038,8 +134283,8 @@ var init_tunnel_process_manager = __esm({
     init_provider_adapters();
     DEFAULT_MAX_LOG_ENTRIES = 400;
     DEFAULT_STOP_TIMEOUT_MS2 = 5e3;
-    execFileAsync10 = promisify42(execFile14);
-    execAsync31 = promisify42(exec35);
+    execFileAsync10 = promisify43(execFile14);
+    execAsync32 = promisify43(exec36);
     LineBuffer = class {
       pending = "";
       push(chunk) {
@@ -134145,7 +134390,7 @@ var init_tunnel_process_manager = __esm({
           }
         }
         try {
-          const { stdout } = await execAsync31('pgrep -f "tailscale funnel"', { timeout: 5e3 });
+          const { stdout } = await execAsync32('pgrep -f "tailscale funnel"', { timeout: 5e3 });
           const pids = stdout.split(/\s+/).map((value) => Number(value.trim())).filter((value) => Number.isInteger(value) && value > 0);
           await Promise.all(pids.map(async (pid) => {
             try {
@@ -134441,7 +134686,7 @@ var init_tunnel_process_manager = __esm({
 
 // ../engine/src/project-engine.ts
 import { execFile as execFile15 } from "node:child_process";
-import { promisify as promisify43 } from "node:util";
+import { promisify as promisify44 } from "node:util";
 function formatErrorDetails(error) {
   if (error instanceof Error) {
     return {
@@ -134488,7 +134733,7 @@ var init_project_engine = __esm({
     init_run_audit();
     init_verification_followup_dedup();
     init_tunnel_process_manager();
-    execFileAsync11 = promisify43(execFile15);
+    execFileAsync11 = promisify44(execFile15);
     MERGE_HANDOFF_GRACE_MS = 300;
     isRemoteActive = (ra) => ra?.activeProvider != null && (ra.providers[ra.activeProvider]?.enabled ?? false);
     ProjectEngine = class _ProjectEngine {
@@ -139095,12 +139340,7 @@ async function shouldUseHybridExecutor(centralCore) {
     if (nodes.length > 1) {
       return { enabled: true, reason: "multi-node" };
     }
-    const projects = await centralCore.listProjects();
-    const liveProjects = projects.filter((project) => project.status === "active" || project.status === "initializing");
-    if (liveProjects.length > 1) {
-      return { enabled: true, reason: "multi-project" };
-    }
-    return { enabled: false, reason: "single-project-local-only" };
+    return { enabled: false, reason: "single-node-local-only" };
   } catch {
     return { enabled: false, reason: "central-unavailable" };
   }
@@ -142701,11 +142941,11 @@ var init_context = __esm({
 });
 
 // ../dashboard/src/github.ts
-import { exec as exec36 } from "node:child_process";
+import { exec as exec37 } from "node:child_process";
 import { mkdtemp as mkdtemp2, rm as rm6 } from "node:fs/promises";
 import { tmpdir as tmpdir7 } from "node:os";
 import { join as join53 } from "node:path";
-import { promisify as promisify44 } from "node:util";
+import { promisify as promisify45 } from "node:util";
 function quoteGitArg(value) {
   return `'${value.replaceAll("'", "'\\''")}'`;
 }
@@ -142958,12 +143198,12 @@ function mapGraphQlBatchIssueStateReason(stateReason) {
       return void 0;
   }
 }
-var execAsync32, PR_REVIEW_PAGE_SIZE, MAX_PR_REVIEW_PAGES, MAX_BADGE_BATCH_SIZE, BATCH_RETRY_DELAY_MS, MAX_BATCH_RETRIES, GitHubClient;
+var execAsync33, PR_REVIEW_PAGE_SIZE, MAX_PR_REVIEW_PAGES, MAX_BADGE_BATCH_SIZE, BATCH_RETRY_DELAY_MS, MAX_BATCH_RETRIES, GitHubClient;
 var init_github = __esm({
   "../dashboard/src/github.ts"() {
     "use strict";
     init_src();
-    execAsync32 = promisify44(exec36);
+    execAsync33 = promisify45(exec37);
     PR_REVIEW_PAGE_SIZE = 100;
     MAX_PR_REVIEW_PAGES = 10;
     MAX_BADGE_BATCH_SIZE = 100;
@@ -143616,17 +143856,17 @@ var init_github = __esm({
         let usedFallbackFiles = false;
         if (opts.repoRoot) {
           try {
-            await execAsync32(`git -C ${quoteGitArg(opts.repoRoot)} rev-parse --git-dir`, {
+            await execAsync33(`git -C ${quoteGitArg(opts.repoRoot)} rev-parse --git-dir`, {
               timeout: 3e4,
               maxBuffer: 10 * 1024 * 1024
             });
             const baseRef = `origin/${opts.baseBranch}`;
             const headRef = `origin/${opts.headBranch}`;
-            await execAsync32(`git -C ${quoteGitArg(opts.repoRoot)} fetch --no-tags --quiet origin ${quoteGitArg(opts.baseBranch)} ${quoteGitArg(opts.headBranch)}`, {
+            await execAsync33(`git -C ${quoteGitArg(opts.repoRoot)} fetch --no-tags --quiet origin ${quoteGitArg(opts.baseBranch)} ${quoteGitArg(opts.headBranch)}`, {
               timeout: 3e4,
               maxBuffer: 10 * 1024 * 1024
             }).catch(() => void 0);
-            const { stdout: mergeBaseStdout } = await execAsync32(
+            const { stdout: mergeBaseStdout } = await execAsync33(
               `git -C ${quoteGitArg(opts.repoRoot)} merge-base ${quoteGitArg(baseRef)} ${quoteGitArg(headRef)}`,
               { timeout: 3e4, maxBuffer: 10 * 1024 * 1024 }
             );
@@ -143635,12 +143875,12 @@ var init_github = __esm({
             const indexPath = join53(indexDir, "index");
             const gitEnv = { ...process.env, GIT_INDEX_FILE: indexPath };
             try {
-              await execAsync32(`git -C ${quoteGitArg(opts.repoRoot)} read-tree -m ${quoteGitArg(mergeBase)} ${quoteGitArg(baseRef)} ${quoteGitArg(headRef)}`, {
+              await execAsync33(`git -C ${quoteGitArg(opts.repoRoot)} read-tree -m ${quoteGitArg(mergeBase)} ${quoteGitArg(baseRef)} ${quoteGitArg(headRef)}`, {
                 timeout: 3e4,
                 maxBuffer: 10 * 1024 * 1024,
                 env: gitEnv
               }).catch(() => void 0);
-              const { stdout } = await execAsync32(`git -C ${quoteGitArg(opts.repoRoot)} ls-files --unmerged`, {
+              const { stdout } = await execAsync33(`git -C ${quoteGitArg(opts.repoRoot)} ls-files --unmerged`, {
                 timeout: 3e4,
                 maxBuffer: 10 * 1024 * 1024,
                 env: gitEnv
@@ -145975,7 +146215,7 @@ var init_github_poll = __esm({
 });
 
 // ../dashboard/src/pr-metadata-generator.ts
-import { promisify as promisify45 } from "node:util";
+import { promisify as promisify46 } from "node:util";
 import { exec as execCb } from "node:child_process";
 import { access as access8, readFile as readFile26 } from "node:fs/promises";
 import { join as join54 } from "node:path";
@@ -146083,7 +146323,7 @@ Closes ${taskId}`.trim()]
   return out.join("\n");
 }
 async function runCommand(command, cwd) {
-  const { stdout } = await execAsync33(command, {
+  const { stdout } = await execAsync34(command, {
     cwd,
     timeout: 15e3,
     maxBuffer: 10 * 1024 * 1024
@@ -146169,31 +146409,31 @@ async function generatePrMetadata(input) {
     templateUsed: templateExists
   };
 }
-var execAsync33;
+var execAsync34;
 var init_pr_metadata_generator = __esm({
   "../dashboard/src/pr-metadata-generator.ts"() {
     "use strict";
     init_src();
     init_src2();
-    execAsync33 = promisify45(execCb);
+    execAsync34 = promisify46(execCb);
   }
 });
 
 // ../dashboard/src/routes/resolve-diff-base.ts
 import { execFile as execFile16 } from "node:child_process";
-import { promisify as promisify46 } from "node:util";
+import { promisify as promisify47 } from "node:util";
 var execFileAsync12;
 var init_resolve_diff_base = __esm({
   "../dashboard/src/routes/resolve-diff-base.ts"() {
     "use strict";
-    execFileAsync12 = promisify46(execFile16);
+    execFileAsync12 = promisify47(execFile16);
   }
 });
 
 // ../dashboard/src/routes/register-git-github.ts
 import { exec as execCb2, spawn as spawn12 } from "node:child_process";
-import { promisify as promisify47 } from "node:util";
-var execAsync34, PR_ROUTE_MAX_BUFFER_BYTES;
+import { promisify as promisify48 } from "node:util";
+var execAsync35, PR_ROUTE_MAX_BUFFER_BYTES;
 var init_register_git_github = __esm({
   "../dashboard/src/routes/register-git-github.ts"() {
     "use strict";
@@ -146210,7 +146450,7 @@ var init_register_git_github = __esm({
     init_pr_metadata_generator();
     init_github_webhooks();
     init_resolve_diff_base();
-    execAsync34 = promisify47(execCb2);
+    execAsync35 = promisify48(execCb2);
     PR_ROUTE_MAX_BUFFER_BYTES = 10 * 1024 * 1024;
   }
 });
@@ -146248,34 +146488,6 @@ var init_register_planning_subtask_routes = __esm({
   }
 });
 
-// ../dashboard/src/routes/chat-attachment-config.ts
-var CHAT_MAX_ATTACHMENT_SIZE;
-var init_chat_attachment_config = __esm({
-  "../dashboard/src/routes/chat-attachment-config.ts"() {
-    "use strict";
-    CHAT_MAX_ATTACHMENT_SIZE = 5 * 1024 * 1024;
-  }
-});
-
-// ../dashboard/src/rate-limit.ts
-var init_rate_limit = __esm({
-  "../dashboard/src/rate-limit.ts"() {
-    "use strict";
-    init_api_error();
-  }
-});
-
-// ../dashboard/src/routes/register-chat-routes.ts
-var init_register_chat_routes = __esm({
-  "../dashboard/src/routes/register-chat-routes.ts"() {
-    "use strict";
-    init_api_error();
-    init_chat_attachment_config();
-    init_rate_limit();
-    init_sse_buffer();
-  }
-});
-
 // ../dashboard/src/chat.ts
 import { EventEmitter as EventEmitter31 } from "node:events";
 import { SessionManager as SessionManager3 } from "@mariozechner/pi-coding-agent";
@@ -146426,6 +146638,36 @@ var init_chat_project_services = __esm({
     "use strict";
     init_src();
     init_chat();
+  }
+});
+
+// ../dashboard/src/routes/chat-attachment-config.ts
+var CHAT_MAX_ATTACHMENT_SIZE;
+var init_chat_attachment_config = __esm({
+  "../dashboard/src/routes/chat-attachment-config.ts"() {
+    "use strict";
+    CHAT_MAX_ATTACHMENT_SIZE = 5 * 1024 * 1024;
+  }
+});
+
+// ../dashboard/src/rate-limit.ts
+var init_rate_limit = __esm({
+  "../dashboard/src/rate-limit.ts"() {
+    "use strict";
+    init_api_error();
+  }
+});
+
+// ../dashboard/src/routes/register-chat-routes.ts
+var init_register_chat_routes = __esm({
+  "../dashboard/src/routes/register-chat-routes.ts"() {
+    "use strict";
+    init_api_error();
+    init_chat_project_services();
+    init_chat_attachment_config();
+    init_rate_limit();
+    init_sse_buffer();
+    init_chat_project_services();
     init_project_store_resolver();
   }
 });
@@ -151421,12 +151663,12 @@ var init_register_agents_projects_nodes = __esm({
 
 // ../dashboard/src/exec-file.ts
 import { execFile as execFile17 } from "node:child_process";
-import { promisify as promisify48 } from "node:util";
+import { promisify as promisify49 } from "node:util";
 var execFileAsync13;
 var init_exec_file = __esm({
   "../dashboard/src/exec-file.ts"() {
     "use strict";
-    execFileAsync13 = promisify48(execFile17);
+    execFileAsync13 = promisify49(execFile17);
   }
 });
 
@@ -160157,7 +160399,7 @@ function wrapText(text, width) {
   }
   return lines;
 }
-async function runTaskPlan(initialPlanArg, yesFlag = false, projectName) {
+async function runTaskPlan(initialPlanArg, yesFlag = false, projectName, baseBranch) {
   let initialPlan = initialPlanArg;
   if (!initialPlan) {
     const rl = createInterface2({ input: process.stdin, output: process.stdout });
@@ -160273,6 +160515,7 @@ async function runTaskPlan(initialPlanArg, yesFlag = false, projectName) {
             description: result.data.description,
             column: "triage",
             dependencies: result.data.suggestedDependencies,
+            baseBranch: baseBranch?.trim() || void 0,
             source: { sourceType: "cli" }
           });
           console.log();
@@ -161602,7 +161845,8 @@ ${sourceUrl}`
         Type8.String({
           description: "Initial plan description (optional) \u2014 the AI will ask clarifying questions if not provided"
         })
-      )
+      ),
+      baseBranch: Type8.Optional(Type8.String({ description: "Optional base branch for the task created from this planning session" }))
     }),
     async execute(_toolCallId, params, _signal, _onUpdate, _ctx) {
       const { runTaskPlan: runTaskPlan2 } = await Promise.resolve().then(() => (init_task(), task_exports));
@@ -161621,7 +161865,7 @@ ${sourceUrl}`
       };
       let taskId;
       try {
-        taskId = await runTaskPlan2(params.description, true);
+        taskId = await runTaskPlan2(params.description, true, void 0, params.baseBranch);
       } catch (err) {
         console.error = originalError;
         console.log = originalLog;
@@ -162272,14 +162516,16 @@ Planning session completed. Task ${taskId} is now in planning and will be auto-p
       ),
       autoAdvance: Type8.Optional(
         Type8.Boolean({ description: "Automatically activate the next pending slice when the current slice completes" })
-      )
+      ),
+      baseBranch: Type8.Optional(Type8.String({ description: "Optional integration base branch for tasks triaged from this mission" }))
     }),
     async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
       const store = await getStore2(ctx.cwd);
       const missionStore = store.getMissionStore();
       const mission = missionStore.createMission({
         title: params.title.trim(),
-        description: params.description?.trim()
+        description: params.description?.trim(),
+        baseBranch: params.baseBranch?.trim() || void 0
       });
       if (params.autoAdvance !== void 0) {
         missionStore.updateMission(mission.id, { autoAdvance: params.autoAdvance });