@runfusion/fusion 0.36.0 → 0.38.0

package/dist/extension.js

@@ -4672,7 +4672,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 = 92;
+    SCHEMA_VERSION = 99;
     SCHEMA_SQL = `
 -- Tasks table with JSON columns for nested data
 CREATE TABLE IF NOT EXISTS tasks (
@@ -4694,6 +4694,7 @@ CREATE TABLE IF NOT EXISTS tasks (
   pausedReason TEXT,
   baseBranch TEXT,
   branch TEXT,
+  autoMerge INTEGER,
   executionStartBranch TEXT,
   baseCommitSha TEXT,
   modelPresetId TEXT,
@@ -4705,12 +4706,16 @@ CREATE TABLE IF NOT EXISTS tasks (
   planningModelId TEXT,
   mergeRetries INTEGER,
   workflowStepRetries INTEGER,
+  resumeLimboCount INTEGER DEFAULT 0,
+  resumeLimboTipSha TEXT,
+  resumeLimboStepSignature TEXT,
   recoveryRetryCount INTEGER,
   taskDoneRetryCount INTEGER DEFAULT 0,
   worktreeSessionRetryCount INTEGER DEFAULT 0,
   completionHandoffLimboRecoveryCount INTEGER DEFAULT 0,
   mergeConflictBounceCount INTEGER DEFAULT 0,
   mergeAuditBounceCount INTEGER DEFAULT 0,
+  mergeTransientRetryCount INTEGER DEFAULT 0,
   nextRecoveryAt TEXT,
   error TEXT,
   summary TEXT,
@@ -5220,11 +5225,31 @@ CREATE TABLE IF NOT EXISTS missions (
   status TEXT NOT NULL,
   interviewState TEXT NOT NULL,
   baseBranch TEXT,
+  branchStrategy TEXT,
   autoAdvance INTEGER DEFAULT 0,
+  autoMerge INTEGER,
   createdAt TEXT NOT NULL,
   updatedAt TEXT NOT NULL
 );
 
+CREATE TABLE IF NOT EXISTS branch_groups (
+  id TEXT PRIMARY KEY,
+  sourceType TEXT NOT NULL CHECK (sourceType IN ('mission','planning')),
+  sourceId TEXT NOT NULL,
+  branchName TEXT NOT NULL UNIQUE,
+  worktreePath TEXT,
+  autoMerge INTEGER NOT NULL DEFAULT 0,
+  prState TEXT NOT NULL DEFAULT 'none' CHECK (prState IN ('none','open','merged','closed')),
+  prUrl TEXT,
+  prNumber INTEGER,
+  status TEXT NOT NULL DEFAULT 'open' CHECK (status IN ('open','finalized','abandoned')),
+  createdAt INTEGER NOT NULL,
+  updatedAt INTEGER NOT NULL,
+  closedAt INTEGER
+);
+CREATE INDEX IF NOT EXISTS idxBranchGroupsSource ON branch_groups(sourceType, sourceId);
+CREATE INDEX IF NOT EXISTS idxBranchGroupsBranchName ON branch_groups(branchName);
+
 -- Goals table (strategic intent across mission timelines)
 CREATE TABLE IF NOT EXISTS goals (
   id TEXT PRIMARY KEY,
@@ -5236,6 +5261,22 @@ CREATE TABLE IF NOT EXISTS goals (
 );
 CREATE INDEX IF NOT EXISTS idxGoalsStatus ON goals(status);
 
+CREATE TABLE IF NOT EXISTS goal_citations (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  goalId TEXT NOT NULL,
+  agentId TEXT NOT NULL,
+  taskId TEXT,
+  surface TEXT NOT NULL,
+  sourceRef TEXT NOT NULL,
+  snippet TEXT NOT NULL,
+  timestamp TEXT NOT NULL
+);
+CREATE INDEX IF NOT EXISTS idxGoalCitationsGoalId ON goal_citations(goalId);
+CREATE INDEX IF NOT EXISTS idxGoalCitationsAgentId ON goal_citations(agentId);
+CREATE INDEX IF NOT EXISTS idxGoalCitationsTimestamp ON goal_citations(timestamp);
+CREATE UNIQUE INDEX IF NOT EXISTS uxGoalCitationsDedup
+  ON goal_citations(goalId, surface, sourceRef);
+
 -- Milestones table (phases within a mission)
 CREATE TABLE IF NOT EXISTS milestones (
   id TEXT PRIMARY KEY,
@@ -5532,6 +5573,7 @@ CREATE INDEX IF NOT EXISTS idxTodoItemsSortOrder ON todo_items(listId, sortOrder
         assertion: "TEXT NOT NULL",
         status: "TEXT NOT NULL DEFAULT 'pending'",
         orderIndex: "INTEGER NOT NULL DEFAULT 0",
+        sourceFeatureId: "TEXT",
         createdAt: "TEXT NOT NULL",
         updatedAt: "TEXT NOT NULL"
       },
@@ -7335,6 +7377,11 @@ This means a caller passed a .fusion directory where a project root was expected
         }
         if (version < 75) {
           this.applyMigration(75, () => {
+            this.addColumnIfMissing("tasks", "mergeTransientRetryCount", "INTEGER DEFAULT 0");
+          });
+        }
+        if (version < 76) {
+          this.applyMigration(76, () => {
             this.db.exec(`
           CREATE TABLE IF NOT EXISTS experiment_sessions (
             id TEXT PRIMARY KEY,
@@ -7375,38 +7422,38 @@ This means a caller passed a .fusion directory where a project root was expected
             this.db.exec(`CREATE INDEX IF NOT EXISTS idxExperimentRecordsType ON experiment_session_records(sessionId, type)`);
           });
         }
-        if (version < 76) {
-          this.applyMigration(76, () => {
+        if (version < 77) {
+          this.applyMigration(77, () => {
             this.addColumnIfMissing("workflow_steps", "gateMode", "TEXT NOT NULL DEFAULT 'advisory'");
             this.db.exec("UPDATE workflow_steps SET gateMode = 'advisory'");
           });
         }
-        if (version < 77) {
-          this.applyMigration(77, () => {
+        if (version < 78) {
+          this.applyMigration(78, () => {
             this.addColumnIfMissing("tasks", "tokenBudgetSoftAlertedAt", "TEXT");
             this.addColumnIfMissing("tasks", "tokenBudgetHardAlertedAt", "TEXT");
             this.addColumnIfMissing("tasks", "tokenBudgetOverride", "TEXT");
           });
         }
-        if (version < 78) {
-          this.applyMigration(78, () => {
+        if (version < 79) {
+          this.applyMigration(79, () => {
             this.addColumnIfMissing("tasks", "branchConflictRecoveryCount", "INTEGER DEFAULT 0");
             this.addColumnIfMissing("tasks", "reviewerContextRetryCount", "INTEGER DEFAULT 0");
             this.addColumnIfMissing("tasks", "reviewerFallbackRetryCount", "INTEGER DEFAULT 0");
           });
         }
-        if (version < 79) {
-          this.applyMigration(79, () => {
-            this.addColumnIfMissing("tasks", "overlapBlockedBy", "TEXT");
-          });
-        }
         if (version < 80) {
           this.applyMigration(80, () => {
-            this.addColumnIfMissing("milestones", "acceptanceCriteria", "TEXT");
+            this.addColumnIfMissing("tasks", "overlapBlockedBy", "TEXT");
           });
         }
         if (version < 81) {
           this.applyMigration(81, () => {
+            this.addColumnIfMissing("milestones", "acceptanceCriteria", "TEXT");
+          });
+        }
+        if (version < 82) {
+          this.applyMigration(82, () => {
             this.addColumnIfMissing("tasks", "firstExecutionAt", "TEXT");
             this.addColumnIfMissing("tasks", "cumulativeActiveMs", "INTEGER");
             if (this.hasColumn("tasks", "executionStartedAt")) {
@@ -7419,13 +7466,13 @@ This means a caller passed a .fusion directory where a project root was expected
             }
           });
         }
-        if (version < 82) {
-          this.applyMigration(82, () => {
+        if (version < 83) {
+          this.applyMigration(83, () => {
             this.addColumnIfMissing("tasks", "worktreeSessionRetryCount", "INTEGER DEFAULT 0");
           });
         }
-        if (version < 83) {
-          this.applyMigration(83, () => {
+        if (version < 84) {
+          this.applyMigration(84, () => {
             if (!this.hasTable("secrets")) {
               this.db.exec(`
             CREATE TABLE secrets (
@@ -7449,8 +7496,8 @@ This means a caller passed a .fusion directory where a project root was expected
             }
           });
         }
-        if (version < 84) {
-          this.applyMigration(84, () => {
+        if (version < 85) {
+          this.applyMigration(85, () => {
             if (!this.hasColumn("tasks", "title")) {
               console.log("[title-id-drift] db.ts migration normalized 0 active titles");
               return;
@@ -7472,24 +7519,24 @@ This means a caller passed a .fusion directory where a project root was expected
             console.log(`[title-id-drift] db.ts migration normalized ${normalizedCount} active titles`);
           });
         }
-        if (version < 85) {
-          this.applyMigration(85, () => {
-            this.addColumnIfMissing("tasks", "completionHandoffLimboRecoveryCount", "INTEGER DEFAULT 0");
-          });
-        }
         if (version < 86) {
           this.applyMigration(86, () => {
-            this.addColumnIfMissing("tasks", "prInfos", "TEXT");
+            this.addColumnIfMissing("tasks", "completionHandoffLimboRecoveryCount", "INTEGER DEFAULT 0");
           });
         }
         if (version < 87) {
           this.applyMigration(87, () => {
-            this.addColumnIfMissing("tasks", "deletedAt", "TEXT");
-            this.db.exec("CREATE INDEX IF NOT EXISTS idx_tasks_deletedAt ON tasks(deletedAt)");
+            this.addColumnIfMissing("tasks", "prInfos", "TEXT");
           });
         }
         if (version < 88) {
           this.applyMigration(88, () => {
+            this.addColumnIfMissing("tasks", "deletedAt", "TEXT");
+            this.db.exec("CREATE INDEX IF NOT EXISTS idx_tasks_deletedAt ON tasks(deletedAt)");
+          });
+        }
+        if (version < 89) {
+          this.applyMigration(89, () => {
             this.addColumnIfMissing("tasks", "allowResurrection", "INTEGER DEFAULT 0");
             try {
               const taskColumns = this.getTableColumns("tasks");
@@ -7514,8 +7561,8 @@ This means a caller passed a .fusion directory where a project root was expected
             }
           });
         }
-        if (version < 89) {
-          this.applyMigration(89, () => {
+        if (version < 90) {
+          this.applyMigration(90, () => {
             this.db.exec(`
           CREATE TABLE IF NOT EXISTS mergeQueue (
             taskId TEXT PRIMARY KEY REFERENCES tasks(id) ON DELETE CASCADE,
@@ -7538,18 +7585,18 @@ This means a caller passed a .fusion directory where a project root was expected
         `);
           });
         }
-        if (version < 90) {
-          this.applyMigration(90, () => {
-            this.addColumnIfMissing("tasks", "scopeAutoWiden", "TEXT DEFAULT '[]'");
-          });
-        }
         if (version < 91) {
           this.applyMigration(91, () => {
-            this.addColumnIfMissing("missions", "baseBranch", "TEXT");
+            this.addColumnIfMissing("tasks", "scopeAutoWiden", "TEXT DEFAULT '[]'");
           });
         }
         if (version < 92) {
           this.applyMigration(92, () => {
+            this.addColumnIfMissing("missions", "baseBranch", "TEXT");
+          });
+        }
+        if (version < 93) {
+          this.applyMigration(93, () => {
             this.db.exec(`
           CREATE TABLE IF NOT EXISTS goals (
             id TEXT PRIMARY KEY,
@@ -7566,6 +7613,88 @@ This means a caller passed a .fusion directory where a project root was expected
         `);
           });
         }
+        if (version < 94) {
+          this.applyMigration(94, () => {
+            this.db.exec(`
+          CREATE TABLE IF NOT EXISTS goal_citations (
+            id INTEGER PRIMARY KEY AUTOINCREMENT,
+            goalId TEXT NOT NULL,
+            agentId TEXT NOT NULL,
+            taskId TEXT,
+            surface TEXT NOT NULL,
+            sourceRef TEXT NOT NULL,
+            snippet TEXT NOT NULL,
+            timestamp TEXT NOT NULL
+          )
+        `);
+            this.db.exec(`
+          CREATE INDEX IF NOT EXISTS idxGoalCitationsGoalId
+            ON goal_citations(goalId)
+        `);
+            this.db.exec(`
+          CREATE INDEX IF NOT EXISTS idxGoalCitationsAgentId
+            ON goal_citations(agentId)
+        `);
+            this.db.exec(`
+          CREATE INDEX IF NOT EXISTS idxGoalCitationsTimestamp
+            ON goal_citations(timestamp)
+        `);
+            this.db.exec(`
+          CREATE UNIQUE INDEX IF NOT EXISTS uxGoalCitationsDedup
+            ON goal_citations(goalId, surface, sourceRef)
+        `);
+          });
+        }
+        if (version < 96) {
+          this.applyMigration(96, () => {
+            this.db.exec(`
+          CREATE TABLE IF NOT EXISTS branch_groups (
+            id TEXT PRIMARY KEY,
+            sourceType TEXT NOT NULL CHECK (sourceType IN ('mission','planning')),
+            sourceId TEXT NOT NULL,
+            branchName TEXT NOT NULL UNIQUE,
+            worktreePath TEXT,
+            autoMerge INTEGER NOT NULL DEFAULT 0,
+            prState TEXT NOT NULL DEFAULT 'none' CHECK (prState IN ('none','open','merged','closed')),
+            prUrl TEXT,
+            prNumber INTEGER,
+            status TEXT NOT NULL DEFAULT 'open' CHECK (status IN ('open','finalized','abandoned')),
+            createdAt INTEGER NOT NULL,
+            updatedAt INTEGER NOT NULL,
+            closedAt INTEGER
+          )
+        `);
+            this.db.exec(`
+          CREATE INDEX IF NOT EXISTS idxBranchGroupsSource
+            ON branch_groups(sourceType, sourceId)
+        `);
+            this.db.exec(`
+          CREATE INDEX IF NOT EXISTS idxBranchGroupsBranchName
+            ON branch_groups(branchName)
+        `);
+            this.addColumnIfMissing("tasks", "autoMerge", "INTEGER");
+            this.addColumnIfMissing("missions", "autoMerge", "INTEGER");
+          });
+        }
+        if (version < 97) {
+          this.applyMigration(97, () => {
+            if (this.hasTable("mission_contract_assertions")) {
+              this.addColumnIfMissing("mission_contract_assertions", "sourceFeatureId", "TEXT");
+            }
+          });
+        }
+        if (version < 98) {
+          this.applyMigration(98, () => {
+            this.addColumnIfMissing("missions", "branchStrategy", "TEXT");
+          });
+        }
+        if (version < 99) {
+          this.applyMigration(99, () => {
+            this.addColumnIfMissing("tasks", "resumeLimboCount", "INTEGER DEFAULT 0");
+            this.addColumnIfMissing("tasks", "resumeLimboTipSha", "TEXT");
+            this.addColumnIfMissing("tasks", "resumeLimboStepSignature", "TEXT");
+          });
+        }
       }
       /**
        * Run a single migration step inside a transaction and bump the version.
@@ -12302,6 +12431,53 @@ var init_db_migrate = __esm({
   }
 });
 
+// ../core/src/goal-citation-extractor.ts
+function extractGoalCitations(text) {
+  const normalized = String(text ?? "");
+  if (normalized.length === 0) {
+    return [];
+  }
+  const matches = [];
+  const seen = /* @__PURE__ */ new Set();
+  const pattern = new RegExp(GOAL_ID_PATTERN.source, GOAL_ID_PATTERN.flags);
+  let match;
+  while ((match = pattern.exec(normalized)) !== null) {
+    const goalId = match[0];
+    if (seen.has(goalId)) {
+      continue;
+    }
+    seen.add(goalId);
+    matches.push({ goalId, index: match.index });
+  }
+  return matches;
+}
+function buildSnippet(text, index, max = GOAL_CITATION_SNIPPET_MAX) {
+  const normalized = String(text ?? "");
+  if (normalized.length === 0 || max <= 0) {
+    return "";
+  }
+  const goalMatch = normalized.slice(Math.max(0, index)).match(/^G-[0-9A-Z]+(?:-[0-9A-Z]+)*/);
+  const goalEnd = goalMatch ? index + goalMatch[0].length : index;
+  let start = Math.max(0, index - Math.floor(max / 2));
+  let end = Math.min(normalized.length, start + max);
+  if (end < goalEnd) {
+    end = Math.min(normalized.length, goalEnd);
+    start = Math.max(0, end - max);
+  } else {
+    start = Math.max(0, end - max);
+  }
+  const snippet = normalized.slice(start, end).replace(/\s+/g, " ").trim();
+  return snippet.length <= max ? snippet : snippet.slice(0, max).trim();
+}
+var GOAL_ID_PATTERN, GOAL_CITATION_SNIPPET_MAX;
+var init_goal_citation_extractor = __esm({
+  "../core/src/goal-citation-extractor.ts"() {
+    "use strict";
+    GOAL_ID_PATTERN = /\bG-[0-9A-Z]+(?:-[0-9A-Z]+)*\b/g;
+    GOAL_CITATION_SNIPPET_MAX = 200;
+  }
+});
+
 // ../core/src/duplicate-detection.ts
 import { createHash as createHash4 } from "node:crypto";
 function normalizeFingerprintPart(value) {
@@ -12558,6 +12734,18 @@ var init_duplicate_guard = __esm({
 
 // ../core/src/mission-store.ts
 import { EventEmitter as EventEmitter4 } from "node:events";
+function missionBranchStrategyDefaults(strategy) {
+  if (!strategy) {
+    return { assignmentMode: "shared" };
+  }
+  if (strategy.mode === "auto-per-task") {
+    return { assignmentMode: "per-task-derived" };
+  }
+  if ((strategy.mode === "existing" || strategy.mode === "custom-new") && strategy.branchName?.trim()) {
+    return { branch: strategy.branchName.trim(), assignmentMode: "shared" };
+  }
+  return { assignmentMode: "shared" };
+}
 function deriveMilestoneAcceptanceCriteriaFromFeatures(features) {
   const lines = features.map((feature) => {
     const acceptance = feature.acceptanceCriteria?.trim();
@@ -12606,6 +12794,14 @@ var init_mission_store = __esm({
        * Convert a database row to a Mission object.
        */
       rowToMission(row) {
+        let branchStrategy;
+        if (row.branchStrategy) {
+          try {
+            branchStrategy = JSON.parse(row.branchStrategy);
+          } catch {
+            branchStrategy = void 0;
+          }
+        }
         return {
           id: row.id,
           title: row.title,
@@ -12613,6 +12809,8 @@ var init_mission_store = __esm({
           status: row.status,
           interviewState: row.interviewState,
           baseBranch: row.baseBranch || void 0,
+          branchStrategy,
+          autoMerge: row.autoMerge === null ? void 0 : Boolean(row.autoMerge),
           autoAdvance: Boolean(row.autoAdvance),
           autopilotEnabled: Boolean(row.autopilotEnabled),
           autopilotState: row.autopilotState || "inactive",
@@ -12649,6 +12847,7 @@ var init_mission_store = __esm({
         return {
           id: row.id,
           milestoneId: row.milestoneId,
+          sourceFeatureId: row.sourceFeatureId || void 0,
           title: row.title,
           assertion: row.assertion,
           status: row.status,
@@ -12776,7 +12975,8 @@ var init_mission_store = __esm({
       // ── Mission CRUD Operations ────────────────────────────────────────
       /**
        * Create a new mission.
-       * The mission starts in "planning" status with "not_started" interview state.
+       * Missions are always created stopped (status `planning`, autopilot disabled).
+       * Autopilot is only enabled via an explicit start/update after creation.
        *
        * @param input - Mission creation input
        * @returns The created mission
@@ -12791,15 +12991,17 @@ var init_mission_store = __esm({
           status: "planning",
           interviewState: "not_started",
           baseBranch: input.baseBranch,
+          branchStrategy: input.branchStrategy,
+          autoMerge: input.autoMerge,
           autoAdvance: false,
-          autopilotEnabled: input.autopilotEnabled ?? false,
+          autopilotEnabled: false,
           autopilotState: "inactive",
           createdAt: now,
           updatedAt: now
         };
         this.db.prepare(`
-      INSERT INTO missions (id, title, description, status, interviewState, baseBranch, autoAdvance, autopilotEnabled, autopilotState, createdAt, updatedAt)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      INSERT INTO missions (id, title, description, status, interviewState, baseBranch, branchStrategy, autoMerge, autoAdvance, autopilotEnabled, autopilotState, createdAt, updatedAt)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     `).run(
           mission.id,
           mission.title,
@@ -12807,6 +13009,8 @@ var init_mission_store = __esm({
           mission.status,
           mission.interviewState,
           mission.baseBranch ?? null,
+          mission.branchStrategy ? JSON.stringify(mission.branchStrategy) : null,
+          mission.autoMerge === void 0 ? null : mission.autoMerge ? 1 : 0,
           mission.autoAdvance ? 1 : 0,
           mission.autopilotEnabled ? 1 : 0,
           mission.autopilotState ?? "inactive",
@@ -13273,6 +13477,8 @@ var init_mission_store = __esm({
         status = ?,
         interviewState = ?,
         baseBranch = ?,
+        branchStrategy = ?,
+        autoMerge = ?,
         autoAdvance = ?,
         autopilotEnabled = ?,
         autopilotState = ?,
@@ -13285,6 +13491,8 @@ var init_mission_store = __esm({
           updated.status,
           updated.interviewState,
           updated.baseBranch ?? null,
+          updated.branchStrategy ? JSON.stringify(updated.branchStrategy) : null,
+          updated.autoMerge === void 0 ? null : updated.autoMerge ? 1 : 0,
           updated.autoAdvance ? 1 : 0,
           updated.autopilotEnabled ? 1 : 0,
           updated.autopilotState ?? "inactive",
@@ -13800,7 +14008,8 @@ var init_mission_store = __esm({
         this.emit("feature:created", feature);
         this.recomputeSliceStatus(sliceId);
         this.applyDerivedMilestoneAcceptanceCriteria(slice.milestoneId);
-        return feature;
+        this.ensureFeatureAssertion(feature);
+        return this.getFeature(feature.id) ?? feature;
       }
       /**
        * Get a feature by ID.
@@ -13885,6 +14094,11 @@ var init_mission_store = __esm({
         if (taskIdChanged || statusChanged) {
           this.recomputeSliceStatus(updated.sliceId);
         }
+        const shouldSyncAssertion = updates.title !== void 0 || updates.description !== void 0 || updates.acceptanceCriteria !== void 0;
+        if (shouldSyncAssertion) {
+          this.ensureFeatureAssertion(updated);
+          return this.getFeature(updated.id) ?? updated;
+        }
         return updated;
       }
       /**
@@ -13899,11 +14113,115 @@ var init_mission_store = __esm({
           throw new Error(`Feature ${id} not found`);
         }
         const sliceId = feature.sliceId;
+        const slice = this.getSlice(sliceId);
+        const milestoneId = slice?.milestoneId;
+        if (milestoneId) {
+          const managedAssertion = this.listContractAssertions(milestoneId).find((assertion) => assertion.sourceFeatureId === feature.id);
+          if (managedAssertion) {
+            this.deleteContractAssertion(managedAssertion.id);
+          }
+        }
         this.db.prepare("DELETE FROM mission_features WHERE id = ?").run(id);
         this.db.bumpLastModified();
         this.emit("feature:deleted", id);
         this.recomputeSliceStatus(sliceId);
       }
+      deriveFeatureAssertion(feature) {
+        const acceptanceCriteria = feature.acceptanceCriteria?.trim();
+        if (acceptanceCriteria) {
+          return { assertionText: acceptanceCriteria, textSource: "acceptanceCriteria" };
+        }
+        const description = feature.description?.trim();
+        if (description) {
+          return { assertionText: description, textSource: "description" };
+        }
+        return {
+          assertionText: `Verify implementation of: ${feature.title}`,
+          textSource: "fallback"
+        };
+      }
+      ensureFeatureAssertion(feature) {
+        const slice = this.getSlice(feature.sliceId);
+        if (!slice) {
+          throw new Error(`Slice ${feature.sliceId} not found`);
+        }
+        const milestoneId = slice.milestoneId;
+        const { assertionText } = this.deriveFeatureAssertion(feature);
+        const existing = this.listContractAssertions(milestoneId).find((assertion) => assertion.sourceFeatureId === feature.id);
+        if (!existing) {
+          const created = this.addContractAssertion(milestoneId, {
+            title: feature.title,
+            assertion: assertionText,
+            status: "pending",
+            sourceFeatureId: feature.id
+          });
+          this.linkFeatureToAssertion(feature.id, created.id);
+          return;
+        }
+        if (existing.title !== feature.title || existing.assertion !== assertionText) {
+          this.updateContractAssertion(existing.id, {
+            title: feature.title,
+            assertion: assertionText
+          });
+        }
+      }
+      /**
+       * Backfill assertion links for legacy features that predate the FN-5695 creation-path fix.
+       * Reuses deriveFeatureAssertion()/ensureFeatureAssertion text-source rules so create/update
+       * and repair flows stay aligned on canonical assertion content.
+       */
+      backfillFeatureAssertions(options) {
+        const dryRun = options?.dryRun ?? true;
+        const missionFilter = options?.missionId;
+        const features = missionFilter ? this.listMilestones(missionFilter).flatMap((milestone) => this.listSlices(milestone.id)).flatMap((slice) => this.listFeatures(slice.id)) : this.listMissions().flatMap((mission) => this.listMilestones(mission.id)).flatMap((milestone) => this.listSlices(milestone.id)).flatMap((slice) => this.listFeatures(slice.id));
+        const report = {
+          scanned: features.length,
+          alreadyLinked: 0,
+          repaired: [],
+          skippedErrors: []
+        };
+        for (const feature of features) {
+          try {
+            const linkedAssertions = this.listAssertionsForFeature(feature.id);
+            if (linkedAssertions.length > 0) {
+              report.alreadyLinked += 1;
+              continue;
+            }
+            const slice = this.getSlice(feature.sliceId);
+            if (!slice) {
+              throw new Error(`Slice ${feature.sliceId} not found`);
+            }
+            const milestoneId = slice.milestoneId;
+            const { assertionText, textSource } = this.deriveFeatureAssertion(feature);
+            if (dryRun) {
+              report.repaired.push({
+                featureId: feature.id,
+                milestoneId,
+                assertionId: "(dry-run)",
+                textSource
+              });
+              continue;
+            }
+            const created = this.addContractAssertion(milestoneId, {
+              title: feature.title,
+              assertion: assertionText,
+              status: "pending",
+              sourceFeatureId: feature.id
+            });
+            this.linkFeatureToAssertion(feature.id, created.id);
+            report.repaired.push({
+              featureId: feature.id,
+              milestoneId,
+              assertionId: created.id,
+              textSource
+            });
+          } catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            report.skippedErrors.push({ featureId: feature.id, message });
+          }
+        }
+        return report;
+      }
       /**
        * Resolve the mission hierarchy for a slice.
        *
@@ -14496,6 +14814,7 @@ var init_mission_store = __esm({
         const assertion = {
           id,
           milestoneId,
+          sourceFeatureId: input.sourceFeatureId,
           title: input.title,
           assertion: input.assertion,
           status: input.status || "pending",
@@ -14504,8 +14823,8 @@ var init_mission_store = __esm({
           updatedAt: now
         };
         this.db.prepare(`
-      INSERT INTO mission_contract_assertions (id, milestoneId, title, assertion, status, orderIndex, createdAt, updatedAt)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+      INSERT INTO mission_contract_assertions (id, milestoneId, title, assertion, status, orderIndex, sourceFeatureId, createdAt, updatedAt)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
     `).run(
           assertion.id,
           assertion.milestoneId,
@@ -14513,6 +14832,7 @@ var init_mission_store = __esm({
           assertion.assertion,
           assertion.status,
           assertion.orderIndex,
+          assertion.sourceFeatureId ?? null,
           assertion.createdAt,
           assertion.updatedAt
         );
@@ -14954,7 +15274,10 @@ ${feature.acceptanceCriteria}`);
         const milestone = slice ? this.getMilestone(slice.milestoneId) : void 0;
         const missionId = milestone?.missionId;
         const mission = missionId ? this.getMission(missionId) : void 0;
+        const strategyDefaults = missionBranchStrategyDefaults(mission?.branchStrategy);
         const resolvedBaseBranch = branchOptions?.baseBranch ?? mission?.baseBranch;
+        const resolvedBranch = branchOptions?.branch ?? strategyDefaults.branch;
+        const resolvedAssignmentMode = branchOptions?.assignmentMode ?? strategyDefaults.assignmentMode;
         const lockScope = missionId ? `mission:${missionId}` : `mission-store:${this.taskStore.getRootDir()}`;
         const guard = await runDeterministicDuplicateGuard(this.taskStore, {
           title: taskTitle || feature.title,
@@ -14968,13 +15291,13 @@ ${feature.acceptanceCriteria}`);
             const createdTask = await this.taskStore.createTask({
               title: taskTitle || feature.title,
               description,
-              branch: branchOptions?.branch,
+              branch: resolvedBranch,
               baseBranch: resolvedBaseBranch,
               ...missionId ? {
                 branchContext: {
                   groupId: `mission:${missionId}`,
                   source: "mission",
-                  assignmentMode: branchOptions?.assignmentMode ?? "shared",
+                  assignmentMode: resolvedAssignmentMode,
                   inheritedBaseBranch: resolvedBaseBranch
                 }
               } : {}
@@ -15019,14 +15342,18 @@ ${feature.acceptanceCriteria}`);
         const definedFeatures = features.filter((f2) => f2.status === "defined");
         const milestone = this.getMilestone(slice.milestoneId);
         const mission = milestone ? this.getMission(milestone.missionId) : void 0;
+        const strategyDefaults = missionBranchStrategyDefaults(mission?.branchStrategy);
         const resolvedBaseBranch = branchOptions?.baseBranch ?? mission?.baseBranch;
+        const resolvedAssignmentMode = branchOptions?.assignmentMode ?? strategyDefaults.assignmentMode;
+        const resolvedBranch = branchOptions?.branch ?? strategyDefaults.branch;
         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 strategyBranch = resolvedAssignmentMode === "per-task-derived" ? resolvedBranch ? `${resolvedBranch}/${feature.id.toLowerCase()}` : void 0 : resolvedBranch;
           const updated = await this.triageFeature(feature.id, void 0, void 0, {
-            ...branchOptions,
-            branch,
-            baseBranch: resolvedBaseBranch
+            branch: strategyBranch,
+            baseBranch: resolvedBaseBranch,
+            assignmentMode: resolvedAssignmentMode,
+            ...branchOptions
           });
           triaged.push(updated);
         }
@@ -15178,17 +15505,20 @@ ${feature.acceptanceCriteria}`);
         validateSnapshotEnvelope(snapshot);
         let applied = 0;
         for (const mission of snapshot.payload.missions) {
-          this.db.prepare(`INSERT INTO missions (id, title, description, status, interviewState, autoAdvance, autopilotEnabled, autopilotState, lastAutopilotActivityAt, createdAt, updatedAt)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+          this.db.prepare(`INSERT INTO missions (id, title, description, status, interviewState, baseBranch, branchStrategy, autoMerge, autoAdvance, autopilotEnabled, autopilotState, lastAutopilotActivityAt, createdAt, updatedAt)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
         ON CONFLICT(id) DO UPDATE SET
           title=excluded.title, description=excluded.description, status=excluded.status, interviewState=excluded.interviewState,
-          autoAdvance=excluded.autoAdvance, autopilotEnabled=excluded.autopilotEnabled, autopilotState=excluded.autopilotState,
+          baseBranch=excluded.baseBranch, branchStrategy=excluded.branchStrategy, autoMerge=excluded.autoMerge, autoAdvance=excluded.autoAdvance, autopilotEnabled=excluded.autopilotEnabled, autopilotState=excluded.autopilotState,
           lastAutopilotActivityAt=excluded.lastAutopilotActivityAt, updatedAt=excluded.updatedAt`).run(
             mission.id,
             mission.title,
             mission.description ?? null,
             mission.status,
             mission.interviewState,
+            mission.baseBranch ?? null,
+            mission.branchStrategy ? JSON.stringify(mission.branchStrategy) : null,
+            mission.autoMerge === void 0 ? null : mission.autoMerge ? 1 : 0,
             mission.autoAdvance ? 1 : 0,
             mission.autopilotEnabled ? 1 : 0,
             mission.autopilotState,
@@ -15274,9 +15604,9 @@ ${feature.acceptanceCriteria}`);
         }
         for (const assertion of snapshot.payload.assertions) {
           if (!assertion.id || !assertion.milestoneId) continue;
-          this.db.prepare(`INSERT INTO mission_contract_assertions (id, milestoneId, title, assertion, status, orderIndex, createdAt, updatedAt)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-        ON CONFLICT(id) DO UPDATE SET title=excluded.title, assertion=excluded.assertion, status=excluded.status, orderIndex=excluded.orderIndex, updatedAt=excluded.updatedAt`).run(assertion.id, assertion.milestoneId, assertion.title, assertion.assertion, assertion.status, assertion.orderIndex, assertion.createdAt, assertion.updatedAt);
+          this.db.prepare(`INSERT INTO mission_contract_assertions (id, milestoneId, title, assertion, status, orderIndex, sourceFeatureId, createdAt, updatedAt)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+        ON CONFLICT(id) DO UPDATE SET title=excluded.title, assertion=excluded.assertion, status=excluded.status, orderIndex=excluded.orderIndex, sourceFeatureId=excluded.sourceFeatureId, updatedAt=excluded.updatedAt`).run(assertion.id, assertion.milestoneId, assertion.title, assertion.assertion, assertion.status, assertion.orderIndex, assertion.sourceFeatureId ?? null, assertion.createdAt, assertion.updatedAt);
         }
         for (const link of snapshot.payload.featureAssertionLinks) {
           if (!link.featureId || !link.assertionId) continue;
@@ -27237,6 +27567,9 @@ var init_secrets_sync_passphrase = __esm({
 function isFusionSiblingBranch(branch) {
   return FUSION_SIBLING_BRANCH_RE.test(branch);
 }
+function resolveEffectiveAutoMerge(task, settings) {
+  return task.autoMerge ?? settings.autoMerge;
+}
 function resolveTaskMergeTarget(task, options = {}) {
   let rejected;
   const configuredBase = task.baseBranch?.trim();
@@ -40159,6 +40492,7 @@ var init_store = __esm({
     init_db();
     init_archive_db();
     init_db_migrate();
+    init_goal_citation_extractor();
     init_mission_store();
     init_plugin_store();
     init_insight_store();
@@ -40688,6 +41022,7 @@ var init_store = __esm({
           baseBranch: row.baseBranch || void 0,
           executionStartBranch: row.executionStartBranch || void 0,
           branch: row.branch || void 0,
+          autoMerge: row.autoMerge === null ? void 0 : row.autoMerge === 1,
           baseCommitSha: row.baseCommitSha || void 0,
           scopeOverride: row.scopeOverride ? true : void 0,
           scopeOverrideReason: row.scopeOverrideReason || void 0,
@@ -40702,6 +41037,9 @@ var init_store = __esm({
           mergeRetries: row.mergeRetries ?? void 0,
           workflowStepRetries: row.workflowStepRetries ?? void 0,
           stuckKillCount: row.stuckKillCount ?? void 0,
+          resumeLimboCount: row.resumeLimboCount ?? void 0,
+          resumeLimboTipSha: row.resumeLimboTipSha || void 0,
+          resumeLimboStepSignature: row.resumeLimboStepSignature || void 0,
           postReviewFixCount: row.postReviewFixCount ?? void 0,
           recoveryRetryCount: row.recoveryRetryCount ?? void 0,
           taskDoneRetryCount: row.taskDoneRetryCount ?? void 0,
@@ -40710,6 +41048,7 @@ var init_store = __esm({
           verificationFailureCount: row.verificationFailureCount ?? void 0,
           mergeConflictBounceCount: row.mergeConflictBounceCount ?? void 0,
           mergeAuditBounceCount: row.mergeAuditBounceCount ?? void 0,
+          mergeTransientRetryCount: row.mergeTransientRetryCount ?? void 0,
           branchConflictRecoveryCount: row.branchConflictRecoveryCount ?? void 0,
           reviewerContextRetryCount: row.reviewerContextRetryCount ?? void 0,
           reviewerFallbackRetryCount: row.reviewerFallbackRetryCount ?? void 0,
@@ -40833,6 +41172,28 @@ var init_store = __esm({
           allowResurrection: row.allowResurrection ? true : void 0
         };
       }
+      rowToBranchGroup(row) {
+        return {
+          id: row.id,
+          sourceType: row.sourceType,
+          sourceId: row.sourceId,
+          branchName: row.branchName,
+          worktreePath: row.worktreePath ?? void 0,
+          autoMerge: Boolean(row.autoMerge),
+          prState: row.prState,
+          prUrl: row.prUrl ?? void 0,
+          prNumber: row.prNumber ?? void 0,
+          status: row.status,
+          createdAt: row.createdAt,
+          updatedAt: row.updatedAt,
+          closedAt: row.closedAt ?? void 0
+        };
+      }
+      generateBranchGroupId() {
+        const timestamp = Date.now().toString(36).toUpperCase();
+        const random = Math.random().toString(36).slice(2, 8).toUpperCase();
+        return `BG-${timestamp}-${random}`;
+      }
       archiveEntryToTask(entry, slim = false) {
         return {
           id: entry.id,
@@ -40872,6 +41233,8 @@ var init_store = __esm({
           planningModelId: entry.planningModelId,
           breakIntoSubtasks: entry.breakIntoSubtasks,
           noCommitsExpected: entry.noCommitsExpected,
+          branchContext: entry.branchContext,
+          autoMerge: entry.autoMerge,
           modifiedFiles: slim ? void 0 : entry.modifiedFiles,
           missionId: entry.missionId,
           sliceId: entry.sliceId,
@@ -40985,6 +41348,8 @@ ${recentText}` : void 0
           noCommitsExpected: task.noCommitsExpected,
           baseBranch: task.baseBranch,
           branch: task.branch,
+          branchContext: task.branchContext,
+          autoMerge: task.autoMerge,
           baseCommitSha: task.baseCommitSha,
           mergeRetries: task.mergeRetries,
           error: task.error,
@@ -41025,6 +41390,99 @@ ${recentText}` : void 0
           createdAt: row.createdAt
         };
       }
+      rowToGoalCitation(row) {
+        return {
+          id: row.id,
+          goalId: row.goalId,
+          agentId: row.agentId,
+          ...row.taskId ? { taskId: row.taskId } : {},
+          surface: row.surface,
+          sourceRef: row.sourceRef,
+          snippet: row.snippet,
+          timestamp: row.timestamp
+        };
+      }
+      recordGoalCitations(inputs) {
+        if (inputs.length === 0) {
+          return [];
+        }
+        const now = (/* @__PURE__ */ new Date()).toISOString();
+        const stmt = this.db.prepare(`
+      INSERT OR IGNORE INTO goal_citations (goalId, agentId, taskId, surface, sourceRef, snippet, timestamp)
+      VALUES (?, ?, ?, ?, ?, ?, ?)
+      RETURNING *
+    `);
+        const inserted = [];
+        this.db.transaction(() => {
+          for (const input of inputs) {
+            const row = stmt.get(
+              input.goalId,
+              input.agentId,
+              input.taskId ?? null,
+              input.surface,
+              input.sourceRef,
+              input.snippet,
+              input.timestamp ?? now
+            );
+            if (row) {
+              inserted.push(this.rowToGoalCitation(row));
+            }
+          }
+          if (inserted.length > 0) {
+            this.db.bumpLastModified();
+          }
+        });
+        return inserted;
+      }
+      listGoalCitations(filter = {}) {
+        const clauses = [];
+        const params = [];
+        if (filter.goalId) {
+          clauses.push("goalId = ?");
+          params.push(filter.goalId);
+        }
+        if (filter.agentId) {
+          clauses.push("agentId = ?");
+          params.push(filter.agentId);
+        }
+        if (filter.taskId) {
+          clauses.push("taskId = ?");
+          params.push(filter.taskId);
+        }
+        if (filter.surface) {
+          clauses.push("surface = ?");
+          params.push(filter.surface);
+        }
+        if (filter.startTime) {
+          clauses.push("timestamp >= ?");
+          params.push(filter.startTime);
+        }
+        if (filter.endTime) {
+          clauses.push("timestamp <= ?");
+          params.push(filter.endTime);
+        }
+        const where = clauses.length > 0 ? `WHERE ${clauses.join(" AND ")}` : "";
+        const limit = Math.max(1, Math.min(filter.limit ?? 200, 1e3));
+        const rows = this.db.prepare(
+          `SELECT * FROM goal_citations ${where} ORDER BY timestamp DESC, id DESC LIMIT ?`
+        ).all(...params, limit);
+        return rows.map((row) => this.rowToGoalCitation(row));
+      }
+      scanAndRecordCitations(text, surface, sourceRef, agentId, taskId, timestamp) {
+        const matches = extractGoalCitations(text);
+        if (matches.length === 0) {
+          return [];
+        }
+        return matches.map((match) => ({
+          goalId: match.goalId,
+          agentId,
+          ...taskId ? { taskId } : {},
+          surface,
+          sourceRef,
+          snippet: buildSnippet(text, match.index),
+          ...timestamp ? { timestamp } : {}
+        }));
+      }
       getTaskSelectClause(slim, tableAlias) {
         if (!slim) {
           return tableAlias ? `${tableAlias}.*` : "*";
@@ -41049,6 +41507,7 @@ ${recentText}` : void 0
           "userPaused",
           "baseBranch",
           "branch",
+          "autoMerge",
           "executionStartBranch",
           "baseCommitSha",
           "modelPresetId",
@@ -41061,6 +41520,9 @@ ${recentText}` : void 0
           "mergeRetries",
           "workflowStepRetries",
           "stuckKillCount",
+          "resumeLimboCount",
+          "resumeLimboTipSha",
+          "resumeLimboStepSignature",
           "postReviewFixCount",
           "recoveryRetryCount",
           "taskDoneRetryCount",
@@ -41069,6 +41531,7 @@ ${recentText}` : void 0
           "verificationFailureCount",
           "mergeConflictBounceCount",
           "mergeAuditBounceCount",
+          "mergeTransientRetryCount",
           "branchConflictRecoveryCount",
           "reviewerContextRetryCount",
           "reviewerFallbackRetryCount",
@@ -41193,6 +41656,7 @@ ${outcome}`;
           "userPaused",
           "baseBranch",
           "branch",
+          "autoMerge",
           "executionStartBranch",
           "baseCommitSha",
           "modelPresetId",
@@ -41205,6 +41669,9 @@ ${outcome}`;
           "mergeRetries",
           "workflowStepRetries",
           "stuckKillCount",
+          "resumeLimboCount",
+          "resumeLimboTipSha",
+          "resumeLimboStepSignature",
           "postReviewFixCount",
           "recoveryRetryCount",
           "taskDoneRetryCount",
@@ -41213,6 +41680,7 @@ ${outcome}`;
           "verificationFailureCount",
           "mergeConflictBounceCount",
           "mergeAuditBounceCount",
+          "mergeTransientRetryCount",
           "branchConflictRecoveryCount",
           "reviewerContextRetryCount",
           "reviewerFallbackRetryCount",
@@ -41326,6 +41794,7 @@ ${outcome}`;
           task.userPaused ? 1 : 0,
           task.baseBranch ?? null,
           task.branch ?? null,
+          task.autoMerge === void 0 ? null : task.autoMerge ? 1 : 0,
           task.executionStartBranch ?? null,
           task.baseCommitSha ?? null,
           task.modelPresetId ?? null,
@@ -41338,6 +41807,9 @@ ${outcome}`;
           task.mergeRetries ?? null,
           task.workflowStepRetries ?? null,
           task.stuckKillCount ?? 0,
+          task.resumeLimboCount ?? 0,
+          task.resumeLimboTipSha ?? null,
+          task.resumeLimboStepSignature ?? null,
           task.postReviewFixCount ?? 0,
           task.recoveryRetryCount ?? null,
           task.taskDoneRetryCount ?? 0,
@@ -41346,6 +41818,7 @@ ${outcome}`;
           task.verificationFailureCount ?? 0,
           task.mergeConflictBounceCount ?? 0,
           task.mergeAuditBounceCount ?? 0,
+          task.mergeTransientRetryCount ?? 0,
           task.branchConflictRecoveryCount ?? 0,
           task.reviewerContextRetryCount ?? 0,
           task.reviewerFallbackRetryCount ?? 0,
@@ -41392,6 +41865,7 @@ ${outcome}`;
           toJsonNullable(task.mergeDetails),
           task.breakIntoSubtasks ? 1 : 0,
           task.noCommitsExpected ? 1 : 0,
+          task.autoMerge === void 0 ? null : task.autoMerge ? 1 : 0,
           toJson(task.enabledWorkflowSteps || []),
           toJson(task.modifiedFiles || []),
           task.missionId ?? null,
@@ -41432,16 +41906,16 @@ ${outcome}`;
         this.db.prepare(`
       INSERT INTO tasks (
         id, lineageId, title, description, priority, "column", status, size, reviewLevel, currentStep,
-        worktree, blockedBy, overlapBlockedBy, paused, userPaused, baseBranch, branch, executionStartBranch, baseCommitSha, modelPresetId, modelProvider,
+        worktree, blockedBy, overlapBlockedBy, paused, userPaused, baseBranch, branch, autoMerge, executionStartBranch, baseCommitSha, modelPresetId, modelProvider,
         modelId, validatorModelProvider, validatorModelId, planningModelProvider, planningModelId, mergeRetries,
-        workflowStepRetries, stuckKillCount, postReviewFixCount, recoveryRetryCount, taskDoneRetryCount, worktreeSessionRetryCount, completionHandoffLimboRecoveryCount, verificationFailureCount, mergeConflictBounceCount, mergeAuditBounceCount, branchConflictRecoveryCount, reviewerContextRetryCount, reviewerFallbackRetryCount, nextRecoveryAt, error,
+        workflowStepRetries, stuckKillCount, resumeLimboCount, resumeLimboTipSha, resumeLimboStepSignature, postReviewFixCount, recoveryRetryCount, taskDoneRetryCount, worktreeSessionRetryCount, completionHandoffLimboRecoveryCount, verificationFailureCount, mergeConflictBounceCount, mergeAuditBounceCount, mergeTransientRetryCount, branchConflictRecoveryCount, reviewerContextRetryCount, reviewerFallbackRetryCount, nextRecoveryAt, error,
         summary, thinkingLevel, executionMode, tokenUsageInputTokens, tokenUsageOutputTokens, tokenUsageCachedTokens,
         tokenUsageCacheWriteTokens, tokenUsageTotalTokens, tokenUsageFirstUsedAt, tokenUsageLastUsedAt, tokenBudgetSoftAlertedAt, tokenBudgetHardAlertedAt, tokenBudgetOverride, createdAt, updatedAt, columnMovedAt,
         firstExecutionAt, cumulativeActiveMs, executionStartedAt, executionCompletedAt,
         dependencies, steps, log, attachments, steeringComments,
         comments, review, reviewState, workflowStepResults, prInfo, prInfos, issueInfo, githubTracking,
         sourceIssueProvider, sourceIssueRepository, sourceIssueExternalIssueId, sourceIssueNumber, sourceIssueUrl,
-        mergeDetails, breakIntoSubtasks, noCommitsExpected, enabledWorkflowSteps, modifiedFiles, missionId, sliceId, scopeOverride, scopeOverrideReason, scopeAutoWiden, assignedAgentId, pausedByAgentId, assigneeUserId, nodeId, effectiveNodeId, effectiveNodeSource, sourceType, sourceAgentId, sourceRunId, sourceSessionId, sourceMessageId, sourceParentTaskId, sourceMetadata, checkedOutBy, checkedOutAt, checkoutNodeId, checkoutRunId, checkoutLeaseRenewedAt, checkoutLeaseEpoch, deletedAt, allowResurrection
+        mergeDetails, breakIntoSubtasks, noCommitsExpected, autoMerge, enabledWorkflowSteps, modifiedFiles, missionId, sliceId, scopeOverride, scopeOverrideReason, scopeAutoWiden, assignedAgentId, pausedByAgentId, assigneeUserId, nodeId, effectiveNodeId, effectiveNodeSource, sourceType, sourceAgentId, sourceRunId, sourceSessionId, sourceMessageId, sourceParentTaskId, sourceMetadata, checkedOutBy, checkedOutAt, checkoutNodeId, checkoutRunId, checkoutLeaseRenewedAt, checkoutLeaseEpoch, deletedAt, allowResurrection
       ) VALUES (${placeholders})
     `).run(...values);
         this.db.bumpLastModified();
@@ -41458,16 +41932,16 @@ ${outcome}`;
         this.db.prepare(`
       INSERT INTO tasks (
         id, lineageId, title, description, priority, "column", status, size, reviewLevel, currentStep,
-        worktree, blockedBy, overlapBlockedBy, paused, userPaused, baseBranch, branch, executionStartBranch, baseCommitSha, modelPresetId, modelProvider,
+        worktree, blockedBy, overlapBlockedBy, paused, userPaused, baseBranch, branch, autoMerge, executionStartBranch, baseCommitSha, modelPresetId, modelProvider,
         modelId, validatorModelProvider, validatorModelId, planningModelProvider, planningModelId, mergeRetries,
-        workflowStepRetries, stuckKillCount, postReviewFixCount, recoveryRetryCount, taskDoneRetryCount, worktreeSessionRetryCount, completionHandoffLimboRecoveryCount, verificationFailureCount, mergeConflictBounceCount, mergeAuditBounceCount, branchConflictRecoveryCount, reviewerContextRetryCount, reviewerFallbackRetryCount, nextRecoveryAt, error,
+        workflowStepRetries, stuckKillCount, resumeLimboCount, resumeLimboTipSha, resumeLimboStepSignature, postReviewFixCount, recoveryRetryCount, taskDoneRetryCount, worktreeSessionRetryCount, completionHandoffLimboRecoveryCount, verificationFailureCount, mergeConflictBounceCount, mergeAuditBounceCount, mergeTransientRetryCount, branchConflictRecoveryCount, reviewerContextRetryCount, reviewerFallbackRetryCount, nextRecoveryAt, error,
         summary, thinkingLevel, executionMode, tokenUsageInputTokens, tokenUsageOutputTokens, tokenUsageCachedTokens,
         tokenUsageCacheWriteTokens, tokenUsageTotalTokens, tokenUsageFirstUsedAt, tokenUsageLastUsedAt, tokenBudgetSoftAlertedAt, tokenBudgetHardAlertedAt, tokenBudgetOverride, createdAt, updatedAt, columnMovedAt,
         firstExecutionAt, cumulativeActiveMs, executionStartedAt, executionCompletedAt,
         dependencies, steps, log, attachments, steeringComments,
         comments, review, reviewState, workflowStepResults, prInfo, prInfos, issueInfo, githubTracking,
         sourceIssueProvider, sourceIssueRepository, sourceIssueExternalIssueId, sourceIssueNumber, sourceIssueUrl,
-        mergeDetails, breakIntoSubtasks, noCommitsExpected, enabledWorkflowSteps, modifiedFiles, missionId, sliceId, scopeOverride, scopeOverrideReason, scopeAutoWiden, assignedAgentId, pausedByAgentId, assigneeUserId, nodeId, effectiveNodeId, effectiveNodeSource, sourceType, sourceAgentId, sourceRunId, sourceSessionId, sourceMessageId, sourceParentTaskId, sourceMetadata, checkedOutBy, checkedOutAt, checkoutNodeId, checkoutRunId, checkoutLeaseRenewedAt, checkoutLeaseEpoch, deletedAt, allowResurrection
+        mergeDetails, breakIntoSubtasks, noCommitsExpected, autoMerge, enabledWorkflowSteps, modifiedFiles, missionId, sliceId, scopeOverride, scopeOverrideReason, scopeAutoWiden, assignedAgentId, pausedByAgentId, assigneeUserId, nodeId, effectiveNodeId, effectiveNodeSource, sourceType, sourceAgentId, sourceRunId, sourceSessionId, sourceMessageId, sourceParentTaskId, sourceMetadata, checkedOutBy, checkedOutAt, checkoutNodeId, checkoutRunId, checkoutLeaseRenewedAt, checkoutLeaseEpoch, deletedAt, allowResurrection
       ) VALUES (${placeholders})
       ON CONFLICT(id) DO UPDATE SET
         lineageId = excluded.lineageId,
@@ -41486,6 +41960,7 @@ ${outcome}`;
         userPaused = excluded.userPaused,
         baseBranch = excluded.baseBranch,
         branch = excluded.branch,
+        autoMerge = excluded.autoMerge,
         executionStartBranch = excluded.executionStartBranch,
         baseCommitSha = excluded.baseCommitSha,
         modelPresetId = excluded.modelPresetId,
@@ -41498,6 +41973,9 @@ ${outcome}`;
         mergeRetries = excluded.mergeRetries,
         workflowStepRetries = excluded.workflowStepRetries,
         stuckKillCount = excluded.stuckKillCount,
+        resumeLimboCount = excluded.resumeLimboCount,
+        resumeLimboTipSha = excluded.resumeLimboTipSha,
+        resumeLimboStepSignature = excluded.resumeLimboStepSignature,
         postReviewFixCount = excluded.postReviewFixCount,
         recoveryRetryCount = excluded.recoveryRetryCount,
         taskDoneRetryCount = excluded.taskDoneRetryCount,
@@ -41506,6 +41984,7 @@ ${outcome}`;
         verificationFailureCount = excluded.verificationFailureCount,
         mergeConflictBounceCount = excluded.mergeConflictBounceCount,
         mergeAuditBounceCount = excluded.mergeAuditBounceCount,
+        mergeTransientRetryCount = excluded.mergeTransientRetryCount,
         branchConflictRecoveryCount = excluded.branchConflictRecoveryCount,
         reviewerContextRetryCount = excluded.reviewerContextRetryCount,
         reviewerFallbackRetryCount = excluded.reviewerFallbackRetryCount,
@@ -41552,6 +42031,7 @@ ${outcome}`;
         mergeDetails = excluded.mergeDetails,
         breakIntoSubtasks = excluded.breakIntoSubtasks,
         noCommitsExpected = excluded.noCommitsExpected,
+        autoMerge = excluded.autoMerge,
         enabledWorkflowSteps = excluded.enabledWorkflowSteps,
         modifiedFiles = excluded.modifiedFiles,
         missionId = excluded.missionId,
@@ -42827,6 +43307,7 @@ ${outcome}`;
           sourceParentTaskId: input.source?.sourceParentTaskId,
           sourceMetadata: withTaskBranchContextInSourceMetadata(input.source?.sourceMetadata, input.branchContext),
           branchContext: input.branchContext,
+          autoMerge: input.autoMerge,
           column: input.column || "triage",
           dependencies: input.dependencies || [],
           breakIntoSubtasks: input.breakIntoSubtasks === true ? true : void 0,
@@ -43169,6 +43650,99 @@ ${newTask.description}
           return { ...task, prompt };
         });
       }
+      createBranchGroup(input) {
+        const now = Date.now();
+        const id = this.generateBranchGroupId();
+        this.db.prepare(`
+      INSERT INTO branch_groups (id, sourceType, sourceId, branchName, worktreePath, autoMerge, prState, prUrl, prNumber, status, createdAt, updatedAt, closedAt)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `).run(
+          id,
+          input.sourceType,
+          input.sourceId,
+          input.branchName,
+          input.worktreePath ?? null,
+          input.autoMerge ? 1 : 0,
+          input.prState ?? "none",
+          input.prUrl ?? null,
+          input.prNumber ?? null,
+          input.status ?? "open",
+          now,
+          now,
+          input.closedAt ?? null
+        );
+        this.db.bumpLastModified();
+        return this.getBranchGroup(id);
+      }
+      getBranchGroup(id) {
+        const row = this.db.prepare(`SELECT * FROM branch_groups WHERE id = ?`).get(id);
+        return row ? this.rowToBranchGroup(row) : null;
+      }
+      getBranchGroupBySource(sourceType, sourceId) {
+        const row = this.db.prepare(`SELECT * FROM branch_groups WHERE sourceType = ? AND sourceId = ?`).get(sourceType, sourceId);
+        return row ? this.rowToBranchGroup(row) : null;
+      }
+      listBranchGroups(options) {
+        const rows = options?.status ? this.db.prepare(`SELECT * FROM branch_groups WHERE status = ? ORDER BY createdAt ASC`).all(options.status) : this.db.prepare(`SELECT * FROM branch_groups ORDER BY createdAt ASC`).all();
+        return rows.map((row) => this.rowToBranchGroup(row));
+      }
+      updateBranchGroup(id, patch) {
+        const current = this.getBranchGroup(id);
+        if (!current) {
+          throw new Error(`Branch group ${id} not found`);
+        }
+        const nextStatus = patch.status ?? current.status;
+        const now = Date.now();
+        const nextClosedAt = patch.closedAt === null ? null : patch.closedAt ?? (nextStatus !== "open" && current.status === "open" ? now : current.closedAt ?? null);
+        this.db.prepare(`
+      UPDATE branch_groups
+      SET sourceId = ?, branchName = ?, worktreePath = ?, autoMerge = ?, prState = ?, prUrl = ?, prNumber = ?, status = ?, updatedAt = ?, closedAt = ?
+      WHERE id = ?
+    `).run(
+          patch.sourceId ?? current.sourceId,
+          patch.branchName ?? current.branchName,
+          patch.worktreePath === null ? null : patch.worktreePath ?? current.worktreePath ?? null,
+          patch.autoMerge === void 0 ? current.autoMerge ? 1 : 0 : patch.autoMerge ? 1 : 0,
+          patch.prState ?? current.prState,
+          patch.prUrl === null ? null : patch.prUrl ?? current.prUrl ?? null,
+          patch.prNumber === null ? null : patch.prNumber ?? current.prNumber ?? null,
+          nextStatus,
+          now,
+          nextClosedAt,
+          id
+        );
+        this.db.bumpLastModified();
+        return this.getBranchGroup(id);
+      }
+      async setTaskBranchGroup(taskId, branchGroupId) {
+        await this.withTaskLock(taskId, async () => {
+          const dir = this.taskDir(taskId);
+          const task = await this.readTaskJson(dir);
+          let branchContext;
+          if (branchGroupId) {
+            const group = this.getBranchGroup(branchGroupId);
+            if (!group) {
+              throw new Error(`Branch group ${branchGroupId} not found`);
+            }
+            branchContext = {
+              groupId: group.id,
+              source: group.sourceType,
+              assignmentMode: "shared"
+            };
+          }
+          task.branchContext = branchContext;
+          task.sourceMetadata = withTaskBranchContextInSourceMetadata(task.sourceMetadata, branchContext);
+          if (!branchContext && task.sourceMetadata) {
+            const nextSourceMetadata = { ...task.sourceMetadata };
+            delete nextSourceMetadata[TASK_BRANCH_CONTEXT_METADATA_KEY];
+            task.sourceMetadata = Object.keys(nextSourceMetadata).length > 0 ? nextSourceMetadata : void 0;
+          }
+          task.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+          await this.atomicWriteTaskJson(dir, task);
+          if (this.isWatching) this.taskCache.set(taskId, { ...task });
+          this.emit("task:updated", task);
+        });
+      }
       async getTaskColumns(ids) {
         if (ids.length === 0) {
           return /* @__PURE__ */ new Map();
@@ -43893,6 +44467,7 @@ ${newTask.description}
             throw new Error(`Cannot move ${id} to done: ${mergeBlocker}`);
           }
         }
+        const settingsForInReview = toColumn === "in-review" && task.autoMerge === void 0 ? await this.getSettingsFast() : void 0;
         const movedAt = internal.now ?? (/* @__PURE__ */ new Date()).toISOString();
         task.column = toColumn;
         task.columnMovedAt = movedAt;
@@ -43952,6 +44527,9 @@ ${newTask.description}
           }
         }
         if (toColumn === "in-review") {
+          if (task.autoMerge === void 0 && settingsForInReview) {
+            task.autoMerge = settingsForInReview.autoMerge;
+          }
           task.recoveryRetryCount = void 0;
           task.nextRecoveryAt = void 0;
           if (task.status === "queued") {
@@ -44335,11 +44913,21 @@ ${newTask.description}
           } else if (updates.baseBranch !== void 0) {
             task.baseBranch = updates.baseBranch;
           }
+          if (updates.autoMerge === null) {
+            task.autoMerge = void 0;
+          } else if (updates.autoMerge !== void 0) {
+            task.autoMerge = updates.autoMerge;
+          }
           if (updates.branch === null) {
             task.branch = void 0;
           } else if (updates.branch !== void 0) {
             task.branch = updates.branch;
           }
+          if (updates.autoMerge === null) {
+            task.autoMerge = void 0;
+          } else if (updates.autoMerge !== void 0) {
+            task.autoMerge = updates.autoMerge;
+          }
           if (updates.executionStartBranch === null) {
             task.executionStartBranch = void 0;
           } else if (updates.executionStartBranch !== void 0) {
@@ -44359,6 +44947,21 @@ ${newTask.description}
           } else if (updates.stuckKillCount !== void 0) {
             task.stuckKillCount = updates.stuckKillCount;
           }
+          if (updates.resumeLimboCount === null) {
+            task.resumeLimboCount = void 0;
+          } else if (updates.resumeLimboCount !== void 0) {
+            task.resumeLimboCount = updates.resumeLimboCount;
+          }
+          if (updates.resumeLimboTipSha === null) {
+            task.resumeLimboTipSha = void 0;
+          } else if (updates.resumeLimboTipSha !== void 0) {
+            task.resumeLimboTipSha = updates.resumeLimboTipSha;
+          }
+          if (updates.resumeLimboStepSignature === null) {
+            task.resumeLimboStepSignature = void 0;
+          } else if (updates.resumeLimboStepSignature !== void 0) {
+            task.resumeLimboStepSignature = updates.resumeLimboStepSignature;
+          }
           if (updates.postReviewFixCount === null) {
             task.postReviewFixCount = void 0;
           } else if (updates.postReviewFixCount !== void 0) {
@@ -44399,6 +45002,11 @@ ${newTask.description}
           } else if (updates.mergeAuditBounceCount !== void 0) {
             task.mergeAuditBounceCount = updates.mergeAuditBounceCount;
           }
+          if (updates.mergeTransientRetryCount === null) {
+            task.mergeTransientRetryCount = void 0;
+          } else if (updates.mergeTransientRetryCount !== void 0) {
+            task.mergeTransientRetryCount = updates.mergeTransientRetryCount;
+          }
           if (updates.branchConflictRecoveryCount === null) {
             task.branchConflictRecoveryCount = void 0;
           } else if (updates.branchConflictRecoveryCount !== void 0) {
@@ -46450,8 +47058,42 @@ ${newTask.description}
             INSERT INTO agentLogEntries (taskId, timestamp, text, type, detail, agent)
             VALUES (?, ?, ?, ?, ?, ?)
           `);
+              const citationInputs = [];
               for (const entry of validEntries) {
-                stmt.run(entry.taskId, entry.timestamp, entry.text, entry.type, entry.detail, entry.agent);
+                const insertResult = stmt.run(
+                  entry.taskId,
+                  entry.timestamp,
+                  entry.text,
+                  entry.type,
+                  entry.detail,
+                  entry.agent
+                );
+                const insertedId = insertResult.lastInsertRowid;
+                if (insertedId === void 0 || insertedId === null) {
+                  continue;
+                }
+                const sourceRef = `agentLog:${String(insertedId)}`;
+                try {
+                  citationInputs.push(
+                    ...this.scanAndRecordCitations(
+                      entry.text,
+                      "agent_log",
+                      sourceRef,
+                      entry.agent ?? "unknown",
+                      entry.taskId,
+                      entry.timestamp
+                    )
+                  );
+                } catch (err) {
+                  console.warn("[fusion] Failed to scan goal citations from agent_log:", err);
+                }
+              }
+              if (citationInputs.length > 0) {
+                try {
+                  this.recordGoalCitations(citationInputs);
+                } catch (err) {
+                  console.warn("[fusion] Failed to record goal citations from agent_log batch:", err);
+                }
               }
               this.db.bumpLastModified();
             }
@@ -46489,8 +47131,9 @@ ${newTask.description}
       VALUES (?, ?, ?, ?, ?, ?)
     `);
         this.db.transaction(() => {
+          const citationInputs = [];
           for (const entry of normalizedEntries) {
-            stmt.run(
+            const insertResult = stmt.run(
               entry.taskId,
               timestamp,
               entry.text,
@@ -46498,6 +47141,31 @@ ${newTask.description}
               entry.detail ?? null,
               entry.agent ?? null
             );
+            const insertedId = insertResult.lastInsertRowid;
+            if (insertedId === void 0 || insertedId === null) {
+              continue;
+            }
+            try {
+              citationInputs.push(
+                ...this.scanAndRecordCitations(
+                  entry.text,
+                  "agent_log",
+                  `agentLog:${String(insertedId)}`,
+                  entry.agent ?? "unknown",
+                  entry.taskId,
+                  timestamp
+                )
+              );
+            } catch (err) {
+              console.warn("[fusion] Failed to scan goal citations from agent log batch:", err);
+            }
+          }
+          if (citationInputs.length > 0) {
+            try {
+              this.recordGoalCitations(citationInputs);
+            } catch (err) {
+              console.warn("[fusion] Failed to record goal citations from appendAgentLogBatch:", err);
+            }
           }
           this.db.bumpLastModified();
         });
@@ -46892,6 +47560,21 @@ ${newTask.description}
         this.db.bumpLastModified();
         const task = await this.getTask(taskId);
         this.emit("task:updated", task);
+        try {
+          const citationInputs = this.scanAndRecordCitations(
+            input.content,
+            "task_document",
+            `document:${taskId}:${input.key}:rev${document2.revision}`,
+            input.author ?? "user",
+            taskId,
+            document2.updatedAt
+          );
+          if (citationInputs.length > 0) {
+            this.recordGoalCitations(citationInputs);
+          }
+        } catch (err) {
+          console.warn("[fusion] Failed to scan/record goal citations from task document:", err);
+        }
         return document2;
       }
       /**
@@ -48742,6 +49425,7 @@ var init_manual_retry_reset = __esm({
     "use strict";
     MANUAL_RETRY_RESET_COUNTER_KEYS = [
       "stuckKillCount",
+      "resumeLimboCount",
       "recoveryRetryCount",
       "taskDoneRetryCount",
       "worktreeSessionRetryCount",
@@ -69676,6 +70360,8 @@ __export(src_exports, {
   FileMemoryBackend: () => FileMemoryBackend,
   FirstRunDetector: () => FirstRunDetector,
   GLOBAL_SETTINGS_KEYS: () => GLOBAL_SETTINGS_KEYS,
+  GOAL_CITATION_SNIPPET_MAX: () => GOAL_CITATION_SNIPPET_MAX,
+  GOAL_ID_PATTERN: () => GOAL_ID_PATTERN,
   GlobalSettingsStore: () => GlobalSettingsStore,
   GoalStore: () => GoalStore,
   HIGH_FANOUT_BLOCKER_TODO_THRESHOLD: () => HIGH_FANOUT_BLOCKER_TODO_THRESHOLD,
@@ -69846,6 +70532,7 @@ __export(src_exports, {
   buildQmdSearchArgs: () => buildQmdSearchArgs,
   buildResearchDocumentKey: () => buildResearchDocumentKey,
   buildReviewerMemoryInstructions: () => buildReviewerMemoryInstructions,
+  buildSnippet: () => buildSnippet,
   buildTaskLineageTrailer: () => buildTaskLineageTrailer,
   buildTriageMemoryInstructions: () => buildTriageMemoryInstructions,
   buildUnblockWeightMap: () => buildUnblockWeightMap,
@@ -69927,6 +70614,7 @@ __export(src_exports, {
   extractClaudeCliStoredCredential: () => extractClaudeCliStoredCredential,
   extractCodexCliStoredCredential: () => extractCodexCliStoredCredential,
   extractDreamProcessorResult: () => extractDreamProcessorResult,
+  extractGoalCitations: () => extractGoalCitations,
   extractIntentSignature: () => extractIntentSignature,
   extractSandboxProvisioningRequest: () => extractSandboxProvisioningRequest,
   extractTaskIdTokens: () => extractTaskIdTokens,
@@ -70120,6 +70808,7 @@ __export(src_exports, {
   resolveAgentProvisioningPolicy: () => resolveAgentProvisioningPolicy,
   resolveDependencyOrder: () => resolveDependencyOrder,
   resolveEffectiveAgentPermissionPolicy: () => resolveEffectiveAgentPermissionPolicy,
+  resolveEffectiveAutoMerge: () => resolveEffectiveAutoMerge,
   resolveEvalSettings: () => resolveEvalSettings,
   resolveExecutionSettingsModel: () => resolveExecutionSettingsModel,
   resolveGlobalDir: () => resolveGlobalDir,
@@ -70320,6 +71009,7 @@ var init_src = __esm({
     init_mission_store();
     init_goal_types();
     init_goal_store();
+    init_goal_citation_extractor();
     init_central_core();
     init_central_db();
     init_node_connection();
@@ -70833,6 +71523,8 @@ var init_gating_classifications = __esm({
       "fn_insight_show",
       "fn_insight_run_list",
       "fn_insight_run_show",
+      "fn_goal_list",
+      "fn_goal_show",
       "fn_mission_list",
       "fn_mission_show",
       "fn_list_agents",
@@ -78873,12 +79565,16 @@ var init_agent_instructions = __esm({
 
 // ../engine/src/prompt-layers.ts
 function buildPromptLayers(input) {
-  const { basePrompt, agentInstructions, memorySection, pluginContributions, performanceFeedback } = input;
+  const { basePrompt, agentInstructions, memorySection, goalContext, pluginContributions, performanceFeedback } = input;
   const dynamicParts = [];
   const trimmedMemory = memorySection?.trim() ?? "";
   if (trimmedMemory) {
     dynamicParts.push(trimmedMemory);
   }
+  const trimmedGoalContext = goalContext?.trim() ?? "";
+  if (trimmedGoalContext) {
+    dynamicParts.push(trimmedGoalContext);
+  }
   const trimmedInstructions = agentInstructions?.trim() ?? "";
   if (trimmedInstructions) {
     dynamicParts.push(`## Custom Instructions
@@ -84206,7 +84902,7 @@ function isInsideWorktreesDir(rootDir, worktreePath, settings) {
   return isInsideConfiguredWorktreesDir(rootDir, settings, worktreePath);
 }
 function deriveTaskIdFromBranch(branchName) {
-  const match = branchName.match(/^fusion\/(fn-\d+)(?:-\d+)?$/i);
+  const match = branchName.match(/^fusion\/(fn-\d+)(?:-\d+)?(?:-[a-z0-9._-]+)*$/i);
   return match ? match[1].toUpperCase() : branchName.toUpperCase();
 }
 async function scanIdleWorktrees(rootDir, store, settings) {
@@ -91675,6 +92371,7 @@ __export(merger_exports, {
   VERIFICATION_LOG_MAX_CHARS: () => VERIFICATION_LOG_MAX_CHARS,
   VerificationError: () => VerificationError,
   __executePostMergeScriptStepForTests: () => __executePostMergeScriptStepForTests,
+  __testOnlyBuildDeterministicMergeMessage: () => buildDeterministicMergeMessage,
   __test__: () => __test__,
   aiMergeTask: () => aiMergeTask,
   applyAutostashBySha: () => applyAutostashBySha,
@@ -94410,7 +95107,7 @@ async function filterStagedGitignoredPaths(rootDir, taskId) {
     return { unstaged: [], remainingStaged };
   }
 }
-async function commitOrAmendMergeWithFixes(rootDir, taskId, branch, commitLog, includeTaskId, preAttemptHeadSha, authorArg, diffStat, settings, signal, aiSummary, aiSubject, fixModifiedFiles = /* @__PURE__ */ new Set(), store, auditor) {
+async function commitOrAmendMergeWithFixes(rootDir, taskId, branch, commitLog, includeTaskId, preAttemptHeadSha, authorArg, diffStat, settings, signal, aiSummary, aiBody, aiSubject, fixModifiedFiles = /* @__PURE__ */ new Set(), store, auditor) {
   try {
     const { stdout: squashStagedOut } = await execAsync26("git diff --cached --name-only", {
       cwd: rootDir,
@@ -94710,7 +95407,7 @@ ${msg}`;
       diffStat: messageDiffStat,
       includeTaskId,
       aiSummary,
-      aiBody: void 0,
+      aiBody,
       aiSubject
     });
     let lineageId;
@@ -98142,6 +98839,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
                   settings,
                   options.signal,
                   aiMergeSummary,
+                  aiMergeBody,
                   aiMergeSubject,
                   verificationFixModifiedFiles,
                   store,
@@ -98273,6 +98971,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
                 settings,
                 options.signal,
                 aiMergeSummary,
+                aiMergeBody,
                 aiMergeSubject,
                 buildFixModifiedFiles,
                 store,
@@ -99187,6 +99886,7 @@ async function executeMergeAttempt(params, aiTracker) {
               diffStat,
               includeTaskId,
               aiSummary: safeBody,
+              aiBody: aiBody?.trim().length ? aiBody : safeBody,
               aiSubject
             });
             await enforceSquashFileScopeInvariant({
@@ -99381,6 +100081,7 @@ async function executeMergeAttempt(params, aiTracker) {
         diffStat: actualContext.diffStat || diffStat,
         includeTaskId,
         aiSummary,
+        aiBody,
         aiSubject
       });
       const trailerArg = buildTaskTrailerArgs(taskId);
@@ -100409,6 +101110,12 @@ async function classifyOwnedLandedEvidenceForSelfHealing(rootDir, task, mergeTar
   const { classifyOwnedLandedEvidence: classifyOwnedLandedEvidence2 } = await Promise.resolve().then(() => (init_merger(), merger_exports));
   return classifyOwnedLandedEvidence2(rootDir, task, { mergeTargetBranch });
 }
+function buildResumeLimboStepSignature(task) {
+  return JSON.stringify({
+    currentStep: task.currentStep ?? null,
+    steps: Array.isArray(task.steps) ? task.steps.map((step) => step.status) : []
+  });
+}
 function formatRecoveryTimestamp(date = /* @__PURE__ */ new Date()) {
   const pad = (value) => String(value).padStart(2, "0");
   return `${date.getUTCFullYear()}${pad(date.getUTCMonth() + 1)}${pad(date.getUTCDate())}-${pad(date.getUTCHours())}${pad(date.getUTCMinutes())}${pad(date.getUTCSeconds())}`;
@@ -100623,7 +101330,7 @@ function isNoTaskDoneFailure2(task) {
 function hasStepProgress2(task) {
   return task.steps.some((step) => step.status !== "pending");
 }
-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_TRANSIENT_MERGE_RECOVERIES, 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, MAX_NO_PROGRESS_RESUME_ATTEMPTS, 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_TRANSIENT_MERGE_RECOVERIES, 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";
@@ -100656,6 +101363,7 @@ var init_self_healing = __esm({
     STALE_ACTIVE_BRANCH_EXECUTION_GRACE_MS = 10 * 6e4;
     COMPLETION_HANDOFF_LIMBO_GRACE_MS = 5 * 6e4;
     MAX_COMPLETION_HANDOFF_LIMBO_RECOVERIES = 3;
+    MAX_NO_PROGRESS_RESUME_ATTEMPTS = 2;
     APPROVED_TRIAGE_RECOVERY_GRACE_MS = 6e4;
     STARVED_REFINEMENT_RECOVERY_GRACE_MS = 10 * 6e4;
     STARVED_PEER_PROGRESS_THRESHOLD = 3;
@@ -102172,13 +102880,71 @@ var init_self_healing = __esm({
                 }
               }
               const preservedCommitCount = inspection.kind === "fully-subsumed" ? 0 : inspection.taskAttributedCommitCount;
+              const stepSignature = buildResumeLimboStepSignature(task);
+              const hasActiveSessionSignal = Boolean(task.checkedOutBy) || activeTaskIds.has(task.id.toUpperCase());
+              const hasPriorSnapshot = typeof task.resumeLimboTipSha === "string" && typeof task.resumeLimboStepSignature === "string";
+              const unchangedSincePriorResume = hasPriorSnapshot && task.resumeLimboTipSha === inspection.tipSha && task.resumeLimboStepSignature === stepSignature;
+              const isNoProgressResume = task.column === "in-progress" && unchangedSincePriorResume && !hasActiveSessionSignal;
+              const resumeAttemptCount = isNoProgressResume ? (task.resumeLimboCount ?? 0) + 1 : 0;
+              if (task.column === "in-progress" && isNoProgressResume && resumeAttemptCount >= MAX_NO_PROGRESS_RESUME_ATTEMPTS) {
+                const idleAnchor = task.executionStartedAt ?? task.columnMovedAt ?? task.updatedAt;
+                const idleAnchorMs = Date.parse(idleAnchor ?? "");
+                const idleMs = Number.isFinite(idleAnchorMs) ? Math.max(0, Date.now() - idleAnchorMs) : null;
+                await this.store.moveTask(task.id, "todo", {
+                  moveSource: "engine",
+                  preserveWorktree: true,
+                  preserveProgress: true,
+                  preserveResumeState: true
+                });
+                await this.store.updateTask(task.id, {
+                  resumeLimboCount: 0,
+                  resumeLimboTipSha: inspection.tipSha,
+                  resumeLimboStepSignature: stepSignature
+                });
+                await this.store.logEntry(
+                  task.id,
+                  `[recovery] resume-limbo-escalated ${task.id} moved to todo after ${resumeAttemptCount} no-progress reclaim/resume attempts`,
+                  JSON.stringify({
+                    frozenTipSha: inspection.tipSha,
+                    idleMs,
+                    resumeAttemptCount,
+                    currentStep: task.currentStep ?? null
+                  })
+                );
+                try {
+                  await createRunAuditor(this.store, {
+                    runId: generateSyntheticRunId("self-heal", task.id),
+                    agentId: "self-healing",
+                    taskId: task.id,
+                    taskLineageId: task.lineageId,
+                    phase: "reclaim-self-owned-branch-conflicts"
+                  }).database({
+                    type: "task:resume-limbo-escalated",
+                    target: task.id,
+                    metadata: {
+                      taskId: task.id,
+                      frozenTipSha: inspection.tipSha,
+                      idleMs,
+                      resumeAttemptCount,
+                      currentStep: task.currentStep ?? null
+                    }
+                  });
+                } catch (auditErr) {
+                  log20.warn(`Failed to write task:resume-limbo-escalated run-audit event for ${task.id}: ${auditErr instanceof Error ? auditErr.message : String(auditErr)}`);
+                }
+                recovered++;
+                continue;
+              }
               await this.store.updateTask(task.id, {
                 worktree: inspection.livePath,
                 branch: task.branch,
                 paused: false,
                 pausedReason: void 0,
                 status: null,
-                error: null
+                error: null,
+                resumeLimboCount: resumeAttemptCount,
+                resumeLimboTipSha: inspection.tipSha,
+                resumeLimboStepSignature: stepSignature
               });
               await this.store.logEntry(
                 task.id,
@@ -103410,7 +104176,7 @@ var init_self_healing = __esm({
             const blockerId = task.blockedBy;
             const unresolvedDeps = task.dependencies.filter((depId) => {
               const dep = taskById.get(depId);
-              return dep && dep.column !== "done" && dep.column !== "in-review" && dep.column !== "archived";
+              return dep && !dep.deletedAt && dep.column !== "done" && dep.column !== "in-review" && dep.column !== "archived";
             });
             const overlapBlocker = task.overlapBlockedBy ? taskById.get(task.overlapBlockedBy) : void 0;
             const hasActiveOverlapBlocker = Boolean(
@@ -103436,6 +104202,9 @@ var init_self_healing = __esm({
                   reasonCode = "missing-blocker";
                   reason = `blocker ${blockerId} missing`;
                 }
+              } else if (blocker.deletedAt) {
+                reasonCode = "soft-deleted-blocker";
+                reason = `blocker ${blockerId} soft-deleted at ${blocker.deletedAt}`;
               } else if (blocker.column === "done") {
                 reasonCode = "blocker-done";
                 reason = `blocker ${blockerId} is done`;
@@ -104965,6 +105734,12 @@ var init_self_healing = __esm({
             try {
               const hardBlocker = getTaskHardMergeBlocker({
                 ...task,
+                // Merge-confirmed tasks have already landed. Treat stale merge
+                // in-flight statuses as soft state to clear during finalization,
+                // not hard blockers that park an otherwise confirmed merge as failed.
+                paused: false,
+                status: task.status === "merging" || task.status === "merging-pr" ? void 0 : task.status,
+                error: void 0,
                 steps: task.steps ?? [],
                 workflowStepResults: task.workflowStepResults
               });
@@ -109596,6 +110371,258 @@ var init_token_cap_detector = __esm({
   }
 });
 
+// ../engine/src/goal-context-injector.ts
+function normalizeTitle(title) {
+  return title.replace(/\s*\n+\s*/g, " ").trim();
+}
+function renderGoalContext(goals) {
+  const lines = goals.map((goal) => `- ${goal.id}: ${normalizeTitle(goal.title)}`);
+  return `## Active Goals
+
+${lines.join("\n")}`;
+}
+function buildGoalContextSection(input) {
+  const { activeGoals, onTruncated } = input;
+  if (activeGoals.length === 0) {
+    return { text: "", emittedGoalIds: [], truncated: null };
+  }
+  const sortedGoals = [...activeGoals].sort((a, b2) => {
+    const byCreated = a.createdAt.localeCompare(b2.createdAt);
+    if (byCreated !== 0) {
+      return byCreated;
+    }
+    return a.id.localeCompare(b2.id);
+  });
+  const resolvedMaxGoals = Math.min(input.maxGoals ?? MAX_INJECTED_GOALS, MAX_INJECTED_GOALS);
+  const charBudget = input.charBudget ?? DEFAULT_GOAL_INJECTION_CHAR_BUDGET;
+  const droppedGoalIds = [];
+  let selectedGoals = sortedGoals.slice(0, resolvedMaxGoals);
+  if (sortedGoals.length > resolvedMaxGoals) {
+    droppedGoalIds.push(...sortedGoals.slice(resolvedMaxGoals).map((goal) => goal.id));
+  }
+  let text = renderGoalContext(selectedGoals);
+  let usedBudgetDrop = false;
+  while (selectedGoals.length > 1 && text.length > charBudget) {
+    const dropped = selectedGoals[selectedGoals.length - 1];
+    selectedGoals = selectedGoals.slice(0, -1);
+    droppedGoalIds.push(dropped.id);
+    text = renderGoalContext(selectedGoals);
+    usedBudgetDrop = true;
+  }
+  let truncated = null;
+  if (droppedGoalIds.length > 0) {
+    truncated = {
+      reason: usedBudgetDrop ? "budget" : "cap",
+      requested: activeGoals.length,
+      emitted: selectedGoals.length,
+      droppedGoalIds,
+      charBudget,
+      producedChars: text.length
+    };
+    onTruncated?.(truncated);
+  }
+  return {
+    text,
+    emittedGoalIds: selectedGoals.map((goal) => goal.id),
+    truncated
+  };
+}
+var MAX_INJECTED_GOALS, resolvedActiveGoalLimit, DEFAULT_GOAL_INJECTION_CHAR_BUDGET;
+var init_goal_context_injector = __esm({
+  "../engine/src/goal-context-injector.ts"() {
+    "use strict";
+    init_src();
+    MAX_INJECTED_GOALS = 5;
+    resolvedActiveGoalLimit = "ACTIVE_GOAL_LIMIT" in src_exports && typeof ACTIVE_GOAL_LIMIT === "number" ? ACTIVE_GOAL_LIMIT : MAX_INJECTED_GOALS;
+    if (MAX_INJECTED_GOALS > resolvedActiveGoalLimit) {
+      throw new Error(
+        `MAX_INJECTED_GOALS (${MAX_INJECTED_GOALS}) cannot exceed ACTIVE_GOAL_LIMIT (${resolvedActiveGoalLimit})`
+      );
+    }
+    DEFAULT_GOAL_INJECTION_CHAR_BUDGET = 600;
+  }
+});
+
+// ../engine/src/goal-injection-diagnostics.ts
+function classifyGoalInjectionResult(result) {
+  if (result.emittedGoalIds.length === 0) {
+    return {
+      outcome: "no-goals",
+      goalCount: 0,
+      goalIds: [],
+      truncated: false
+    };
+  }
+  return {
+    outcome: "applied",
+    goalCount: result.emittedGoalIds.length,
+    goalIds: result.emittedGoalIds,
+    truncated: result.truncated !== null
+  };
+}
+function classifyGoalInjectionFailure(reason, error) {
+  const resolvedErrorClass = error && typeof error === "object" && "constructor" in error && typeof error.constructor?.name === "string" ? error.constructor.name : void 0;
+  return {
+    outcome: "disabled-or-failed",
+    goalCount: 0,
+    goalIds: [],
+    truncated: false,
+    reason,
+    ...resolvedErrorClass ? { errorClass: resolvedErrorClass } : {}
+  };
+}
+function resolveGoalContextForDiagnostics(input) {
+  if (!input.listActiveGoals) {
+    return {
+      goalContext: "",
+      classification: classifyGoalInjectionFailure(input.disabledReason ?? "store-unavailable")
+    };
+  }
+  try {
+    const activeGoals = input.listActiveGoals();
+    const injector = input.injector ?? ((goals) => buildGoalContextSection({ activeGoals: goals }));
+    try {
+      const injectionResult = injector(activeGoals);
+      return {
+        goalContext: injectionResult.text,
+        classification: classifyGoalInjectionResult(injectionResult)
+      };
+    } catch (injectorError) {
+      return {
+        goalContext: "",
+        classification: classifyGoalInjectionFailure("injector-threw", injectorError)
+      };
+    }
+  } catch (listError) {
+    return {
+      goalContext: "",
+      classification: classifyGoalInjectionFailure("list-failed", listError)
+    };
+  }
+}
+function formatAgentLogLine(input) {
+  const ids = JSON.stringify(input.goalIds);
+  const reason = input.reason ? ` reason=${input.reason}` : "";
+  const errorClass = input.errorClass ? ` err=${input.errorClass}` : "";
+  return `[goal-injection] ${input.outcome} count=${input.goalCount} ids=${ids} truncated=${String(input.truncated)}${reason}${errorClass}`;
+}
+async function emitGoalInjectionDiagnostic(input) {
+  const record = {
+    lane: input.lane,
+    outcome: input.outcome,
+    goalCount: input.goalCount,
+    goalIds: [...input.goalIds],
+    truncated: input.truncated,
+    ...input.reason ? { reason: input.reason } : {},
+    ...input.errorClass ? { errorClass: input.errorClass } : {},
+    ...input.runId ? { runId: input.runId } : {},
+    ...input.agentId ? { agentId: input.agentId } : {},
+    ...input.taskId ? { taskId: input.taskId } : {},
+    timestamp: (/* @__PURE__ */ new Date()).toISOString()
+  };
+  if (input.store && record.taskId) {
+    try {
+      await input.store.logEntry(record.taskId, formatAgentLogLine(record), void 0, input.runContext ?? void 0);
+    } catch (error) {
+      diagnosticsLog.warn(
+        `failed to append goal-injection task log for ${record.taskId}: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
+  const auditStore = input.store;
+  const hasAuditWriter = Boolean(auditStore && typeof auditStore.recordRunAuditEvent === "function");
+  if (!input.runContext || !hasAuditWriter || !auditStore) {
+    diagnosticsLog.warn(
+      `goal-injection diagnostic emitted without run-audit side effect (lane=${record.lane}, hasContext=${Boolean(input.runContext)}, hasWriter=${Boolean(hasAuditWriter)})`
+    );
+    return record;
+  }
+  try {
+    await auditStore.recordRunAuditEvent({
+      taskId: input.runContext.taskId,
+      agentId: input.runContext.agentId,
+      runId: input.runContext.runId,
+      domain: "database",
+      mutationType: "prompt:goal-injection",
+      target: record.lane,
+      metadata: {
+        lane: record.lane,
+        outcome: record.outcome,
+        goalCount: record.goalCount,
+        goalIds: record.goalIds,
+        truncated: record.truncated,
+        ...record.reason ? { reason: record.reason } : {},
+        ...record.errorClass ? { errorClass: record.errorClass } : {},
+        ...record.runId ? { runId: record.runId } : {},
+        ...record.agentId ? { agentId: record.agentId } : {},
+        ...record.taskId ? { taskId: record.taskId } : {}
+      }
+    });
+  } catch (error) {
+    diagnosticsLog.warn(
+      `failed to append goal-injection run-audit event for lane=${record.lane}: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
+  return record;
+}
+var diagnosticsLog;
+var init_goal_injection_diagnostics = __esm({
+  "../engine/src/goal-injection-diagnostics.ts"() {
+    "use strict";
+    init_goal_context_injector();
+    init_logger2();
+    diagnosticsLog = createLogger2("goal-injection-diagnostics");
+  }
+});
+
+// ../engine/src/goal-anchoring-audit.ts
+async function emitGoalAnchoringAudit(auditor, input) {
+  const isApplied = input.goalsInjected > 0;
+  await auditor.database({
+    type: isApplied ? GOAL_INJECTION_APPLIED : GOAL_INJECTION_SKIPPED,
+    target: input.taskId ?? "goals",
+    metadata: {
+      lane: input.lane,
+      count: input.goalsInjected,
+      ...typeof input.truncated === "boolean" ? { truncated: input.truncated } : {},
+      ...input.reason ? { reason: input.reason } : {}
+    }
+  });
+}
+function emitGoalRetrievalAudit(store, ctx, input) {
+  if (!ctx.runId || !ctx.agentId) return;
+  try {
+    store.recordRunAuditEvent({
+      runId: ctx.runId,
+      agentId: ctx.agentId,
+      taskId: ctx.taskId,
+      domain: "database",
+      mutationType: GOAL_RETRIEVAL_INVOKED,
+      target: input.goalId ?? "goals",
+      metadata: {
+        toolName: input.toolName,
+        count: input.resultCount,
+        notFound: input.notFound ?? false
+      }
+    });
+  } catch (error) {
+    console.warn("[fusion-extension] goal retrieval audit emission skipped", error);
+  }
+}
+var GOAL_INJECTION_APPLIED, GOAL_INJECTION_SKIPPED, GOAL_RETRIEVAL_INVOKED, GOAL_AUDIT_TYPES;
+var init_goal_anchoring_audit = __esm({
+  "../engine/src/goal-anchoring-audit.ts"() {
+    "use strict";
+    GOAL_INJECTION_APPLIED = "goal:injection-applied";
+    GOAL_INJECTION_SKIPPED = "goal:injection-skipped";
+    GOAL_RETRIEVAL_INVOKED = "goal:retrieval-invoked";
+    GOAL_AUDIT_TYPES = [GOAL_INJECTION_APPLIED, GOAL_INJECTION_SKIPPED, GOAL_RETRIEVAL_INVOKED];
+    if (new Set(GOAL_AUDIT_TYPES).size !== GOAL_AUDIT_TYPES.length || GOAL_AUDIT_TYPES.some((value) => typeof value !== "string" || !value.startsWith("goal:"))) {
+      throw new Error("Goal anchoring audit mutation types must be unique goal:* strings.");
+    }
+  }
+});
+
 // ../engine/src/auto-recovery-handlers/branch-worktree.ts
 import { exec as exec31 } from "node:child_process";
 import { existsSync as existsSync39 } from "node:fs";
@@ -110460,7 +111487,7 @@ function isTransientMissingTaskJsonError(error, task) {
   const normalizedTaskJsonPath = resolvePath(filePath);
   return normalizedTaskJsonPath.startsWith(`${normalizedWorktree}/`);
 }
-function detectPendingReviewBlock(task, codeReviewVerdicts) {
+function detectPendingReviewBlock(task, _codeReviewVerdicts) {
   const inProgressStepIndices = [];
   for (let stepIndex = 0; stepIndex < task.steps.length; stepIndex++) {
     if (task.steps[stepIndex]?.status === "in-progress") {
@@ -110472,9 +111499,6 @@ function detectPendingReviewBlock(task, codeReviewVerdicts) {
   }
   const recentActions = (task.log ?? []).slice(-30).map((entry) => entry.action?.trim()).filter((action) => Boolean(action));
   for (const stepIndex of inProgressStepIndices) {
-    if (codeReviewVerdicts.get(stepIndex) === "REVISE") {
-      return { blocked: true, reason: "code-review-revise-outstanding", stepIndex };
-    }
     const stepDisplay = stepIndex + 1;
     const codeRequest = `code review requested for Step ${stepDisplay}`;
     const planRequest = `plan review requested for Step ${stepDisplay}`;
@@ -111035,6 +112059,8 @@ var init_executor = __esm({
     init_worktree_hooks();
     init_agent_instructions();
     init_prompt_layers();
+    init_goal_injection_diagnostics();
+    init_goal_anchoring_audit();
     init_run_audit();
     init_auto_recovery();
     init_restart_recovery_coordinator();
@@ -111421,6 +112447,11 @@ The tool prevents your session from being killed by the inactivity watchdog duri
                 executorLog.log(`Unpaused ${task.id} in-progress with no session \u2014 resuming execution`);
                 try {
                   await this.clearResumeFailureState(task);
+                  await this.store.updateTask(task.id, {
+                    resumeLimboCount: 0,
+                    resumeLimboTipSha: null,
+                    resumeLimboStepSignature: null
+                  });
                   await this.store.logEntry(task.id, "Resuming execution after unpause", void 0, this.getRunContextFor(task.id));
                   await this.recoverApprovedStepsOnResume(task.id);
                 } catch (clearErr) {
@@ -113796,8 +114827,30 @@ ${summary}`,
             if (executorPluginContributions) {
               executorLog.log(`${task.id}: applied plugin prompt contributions for executor-system surface`);
             }
+            const executorGoalResolution = resolveGoalContextForDiagnostics({
+              listActiveGoals: typeof this.store.getGoalStore === "function" ? () => this.store.getGoalStore().listGoals({ status: "active" }) : void 0
+            });
+            const executorGoalContext = executorGoalResolution.goalContext;
+            const executorGoalClassification = executorGoalResolution.classification;
+            await emitGoalAnchoringAudit(audit, {
+              lane: "executor",
+              taskId: task.id,
+              goalsInjected: executorGoalClassification.goalCount,
+              truncated: executorGoalClassification.truncated,
+              reason: executorGoalClassification.outcome === "no-goals" ? "no-active-goals" : void 0
+            });
+            await emitGoalInjectionDiagnostic({
+              lane: "executor",
+              ...executorGoalClassification,
+              runId: engineRunContext.runId,
+              agentId: engineRunContext.agentId,
+              taskId: task.id,
+              store: this.store,
+              runContext: engineRunContext
+            });
             const executorLayers = buildPromptLayers({
               basePrompt: getExecutorSystemPrompt(settings),
+              goalContext: executorGoalContext,
               agentInstructions: executorInstructions,
               pluginContributions: executorPluginContributions
             });
@@ -114114,12 +115167,7 @@ ${summary}`,
                     this.tokenUsageBaselines.delete(task.id);
                     session.dispose();
                     await this.persistTokenUsage(task.id);
-                    await this.store.updateTask(task.id, {
-                      status: "failed",
-                      error: "executor-exit-while-review-pending"
-                    });
                     await this.handoffTaskToReview(task, "executor-exit-while-review-pending");
-                    this.options.onError?.(task, new Error("executor-exit-while-review-pending"));
                     pendingReviewParked = true;
                     break;
                   }
@@ -119272,7 +120320,8 @@ async function collectTaskEvaluationEvidence(params) {
         taskDoneRetryCount: task.taskDoneRetryCount ?? 0,
         verificationFailureCount: task.verificationFailureCount ?? 0,
         mergeConflictBounceCount: task.mergeConflictBounceCount ?? 0,
-        mergeAuditBounceCount: task.mergeAuditBounceCount ?? 0
+        mergeAuditBounceCount: task.mergeAuditBounceCount ?? 0,
+        mergeTransientRetryCount: task.mergeTransientRetryCount ?? 0
       }
     }],
     commits: commitEvidence,
@@ -119731,6 +120780,25 @@ function filterPathsByIgnoreList(paths, ignorePaths) {
   }
   return paths.filter((path6) => !normalizedIgnorePaths.some((ignore) => isIgnoredOverlapPath(path6, ignore)));
 }
+function getUnmetSchedulingDependencies(task, tasks) {
+  return task.dependencies.filter((depId) => {
+    const dep = tasks.find((candidate) => candidate.id === depId);
+    return dep && dep.column !== "done" && dep.column !== "in-review" && dep.column !== "archived";
+  });
+}
+function isRunnableQueuedOverlapCandidate(task, tasks, now = Date.now(), activeScopes, scope = []) {
+  if (task.column !== "todo" || task.status !== "queued") return false;
+  if (task.paused || task.userPaused) return false;
+  if (task.nextRecoveryAt && new Date(task.nextRecoveryAt).getTime() > now) return false;
+  if (getUnmetSchedulingDependencies(task, tasks).length > 0) return false;
+  if (!activeScopes || activeScopes.size === 0) return true;
+  if (scope.length === 0) return true;
+  for (const activeScope of activeScopes.values()) {
+    if (!activeScope.length) continue;
+    if (pathsOverlap2(scope, activeScope)) return false;
+  }
+  return true;
+}
 function findHigherPriorityQueuedOverlap(candidate, queuedScopes, overlap) {
   let higher = null;
   for (const queued of queuedScopes) {
@@ -120405,34 +121473,47 @@ var init_scheduler = __esm({
             );
           }
           const activeScopes = /* @__PURE__ */ new Map();
+          const activeScopeColumns = /* @__PURE__ */ new Map();
+          const setActiveScopeLease = (taskId, scope, column) => {
+            activeScopes.set(taskId, scope);
+            activeScopeColumns.set(taskId, column);
+          };
           const inversionEmitted = /* @__PURE__ */ new Set();
           const queuedHigherPriorityScopes = [];
+          const queuedHigherPriorityTaskById = /* @__PURE__ */ new Map();
+          const overlapIgnorePaths = settings.overlapIgnorePaths ?? [];
+          const filteredScopeByTaskId = /* @__PURE__ */ new Map();
+          const getFilteredFileScope = async (taskId) => {
+            const cached = filteredScopeByTaskId.get(taskId);
+            if (cached) return cached;
+            const scope = await this.store.parseFileScopeFromPrompt(taskId);
+            const filteredScope = filterPathsByIgnoreList(scope, overlapIgnorePaths);
+            filteredScopeByTaskId.set(taskId, filteredScope);
+            return filteredScope;
+          };
           if (settings.groupOverlappingFiles) {
-            const overlapIgnorePaths = settings.overlapIgnorePaths ?? [];
             for (const t of inProgress) {
-              const scope = await this.store.parseFileScopeFromPrompt(t.id);
-              const filteredScope = filterPathsByIgnoreList(scope, overlapIgnorePaths);
-              if (filteredScope.length > 0) activeScopes.set(t.id, filteredScope);
+              const filteredScope = await getFilteredFileScope(t.id);
+              if (filteredScope.length > 0) setActiveScopeLease(t.id, filteredScope, "in-progress");
+            }
+            const inReviewWithWorktree = tasks.filter(
+              (t) => t.column === "in-review" && Boolean(t.worktree) && !t.paused && t.status !== "failed"
+            );
+            for (const t of inReviewWithWorktree) {
+              const filteredScope = await getFilteredFileScope(t.id);
+              if (filteredScope.length > 0) setActiveScopeLease(t.id, filteredScope, "in-review");
             }
             for (const t of todo) {
-              if (t.status !== "queued" || t.paused || t.userPaused) continue;
-              const scope = await this.store.parseFileScopeFromPrompt(t.id);
-              const filteredScope = filterPathsByIgnoreList(scope, overlapIgnorePaths);
+              const filteredScope = await getFilteredFileScope(t.id);
               if (filteredScope.length === 0) continue;
+              if (!isRunnableQueuedOverlapCandidate(t, tasks, now, activeScopes, filteredScope)) continue;
               queuedHigherPriorityScopes.push({
                 id: t.id,
                 priority: t.priority,
                 createdAt: t.createdAt,
                 scope: filteredScope
               });
-            }
-            const inReviewWithWorktree = tasks.filter(
-              (t) => t.column === "in-review" && Boolean(t.worktree) && !t.paused && t.status !== "failed"
-            );
-            for (const t of inReviewWithWorktree) {
-              const scope = await this.store.parseFileScopeFromPrompt(t.id);
-              const filteredScope = filterPathsByIgnoreList(scope, overlapIgnorePaths);
-              if (filteredScope.length > 0) activeScopes.set(t.id, filteredScope);
+              queuedHigherPriorityTaskById.set(t.id, t);
             }
           }
           const ordered = resolveDependencyOrder(todo);
@@ -120453,10 +121534,7 @@ var init_scheduler = __esm({
                 continue;
               }
             }
-            const unmetDeps = task.dependencies.filter((depId) => {
-              const dep = tasks.find((t) => t.id === depId);
-              return dep && dep.column !== "done" && dep.column !== "in-review" && dep.column !== "archived";
-            });
+            const unmetDeps = getUnmetSchedulingDependencies(task, tasks);
             if (unmetDeps.length > 0) {
               await this.store.updateTask(task.id, {
                 status: "queued",
@@ -120490,17 +121568,18 @@ var init_scheduler = __esm({
               continue;
             }
             if (settings.groupOverlappingFiles) {
-              const overlapIgnorePaths = settings.overlapIgnorePaths ?? [];
-              const taskScope = filterPathsByIgnoreList(
-                await this.store.parseFileScopeFromPrompt(task.id),
-                overlapIgnorePaths
-              );
+              const taskScope = await getFilteredFileScope(task.id);
               if (taskScope.length > 0) {
                 const activeScopeEntries = Array.from(activeScopes.entries()).sort(([aId], [bId]) => aId.localeCompare(bId));
                 const overlapBlockerId = task.overlapBlockedBy || task.blockedBy;
                 const currentBlockerScope = overlapBlockerId ? activeScopes.get(overlapBlockerId) : void 0;
                 const hasValidCurrentBlocker = Boolean(overlapBlockerId) && Boolean(currentBlockerScope) && this.pathsOverlap(taskScope, currentBlockerScope);
                 const overlappingTaskId = hasValidCurrentBlocker ? overlapBlockerId : activeScopeEntries.find(([, ipScope]) => this.pathsOverlap(taskScope, ipScope))?.[0] ?? null;
+                const runnableQueuedHigherPriorityScopes = queuedHigherPriorityScopes.filter((queuedCandidate) => {
+                  const queuedTask = queuedHigherPriorityTaskById.get(queuedCandidate.id);
+                  if (!queuedTask) return false;
+                  return isRunnableQueuedOverlapCandidate(queuedTask, tasks, now, activeScopes, queuedCandidate.scope);
+                });
                 const higherPriorityQueuedOverlap = findHigherPriorityQueuedOverlap(
                   {
                     id: task.id,
@@ -120508,7 +121587,7 @@ var init_scheduler = __esm({
                     createdAt: task.createdAt,
                     scope: taskScope
                   },
-                  queuedHigherPriorityScopes,
+                  runnableQueuedHigherPriorityScopes,
                   this.pathsOverlap.bind(this)
                 );
                 if (higherPriorityQueuedOverlap) {
@@ -120523,7 +121602,7 @@ var init_scheduler = __esm({
                   await this.rollbackRunningAgentsForQueuedTodoTask(task.id);
                   await this.logDispatchQueuedReason(
                     task.id,
-                    `queued \u2014 deferred for higher-priority queued task ${higherPriorityQueuedOverlap.id} (overlap)`
+                    `queued \u2014 deferred for higher-priority runnable queued task ${higherPriorityQueuedOverlap.id} (overlap)`
                   );
                   continue;
                 }
@@ -120555,7 +121634,7 @@ var init_scheduler = __esm({
                           blockerId: overlapBlockerTask.id,
                           blockerPriority: overlapBlockerTask.priority ?? null,
                           blockerCreatedAt: overlapBlockerTask.createdAt ?? null,
-                          blockerColumn: overlapBlockerTask.column,
+                          blockerColumn: activeScopeColumns.get(overlappingTaskId) ?? overlapBlockerTask.column,
                           source: "scheduler.overlap-priority-inversion"
                         }
                       });
@@ -120566,7 +121645,11 @@ var init_scheduler = __esm({
                     }
                   }
                   await this.rollbackRunningAgentsForQueuedTodoTask(task.id);
-                  await this.logDispatchQueuedReason(task.id, `queued \u2014 file scope overlap with ${overlappingTaskId}`);
+                  const activeLeaseColumn = activeScopeColumns.get(overlappingTaskId) ?? overlapBlockerTask?.column ?? "unknown";
+                  await this.logDispatchQueuedReason(
+                    task.id,
+                    `queued \u2014 blocked by active file-scope lease ${overlappingTaskId} (column=${activeLeaseColumn})`
+                  );
                   continue;
                 }
                 if (task.overlapBlockedBy) {
@@ -120785,11 +121868,8 @@ var init_scheduler = __esm({
             this.options.onSchedule?.(task);
             started++;
             if (settings.groupOverlappingFiles) {
-              const scope = filterPathsByIgnoreList(
-                await this.store.parseFileScopeFromPrompt(task.id),
-                settings.overlapIgnorePaths
-              );
-              if (scope.length > 0) activeScopes.set(task.id, scope);
+              const scope = await getFilteredFileScope(task.id);
+              if (scope.length > 0) setActiveScopeLease(task.id, scope, "in-progress");
             }
           }
           await this.emitHighOverlapFanoutWarnings(tasks);
@@ -121942,7 +123022,10 @@ var init_mission_execution_loop = __esm({
                     try {
                       await this.missionStore.transitionLoopState(feature.id, "implementing");
                       if (feature.taskId) {
-                        await this.processTaskOutcome(feature.taskId);
+                        const linkedTask = await this.taskStore.getTask(feature.taskId).catch(() => null);
+                        if (linkedTask && (linkedTask.column === "done" || linkedTask.column === "archived")) {
+                          await this.processTaskOutcome(feature.taskId);
+                        }
                       }
                       recoveredCount++;
                     } catch (err) {
@@ -121953,7 +123036,10 @@ var init_mission_execution_loop = __esm({
                     loopLog.log(`Recovery: feature ${feature.id} awaiting fix implementation`);
                     if (feature.taskId) {
                       try {
-                        await this.processTaskOutcome(feature.taskId);
+                        const linkedTask = await this.taskStore.getTask(feature.taskId).catch(() => null);
+                        if (linkedTask && (linkedTask.column === "done" || linkedTask.column === "archived")) {
+                          await this.processTaskOutcome(feature.taskId);
+                        }
                         recoveredCount++;
                       } catch (err) {
                         loopLog.error(`Recovery failed for needs_fix feature ${feature.id}:`, err);
@@ -121995,10 +123081,17 @@ var init_mission_execution_loop = __esm({
           }
           if (feature.loopState !== "implementing") {
             loopLog.log(`Feature ${feature.id} loopState is "${feature.loopState}"; skipping validation`);
+            this.logFeatureWarningEvent(feature.id, "validation_skipped_loop_state", `Validation skipped: feature ${feature.id} is in loopState "${feature.loopState}" (expected "implementing").`, {
+              taskId,
+              loopState: feature.loopState
+            });
             return;
           }
           if (this.activeValidations.has(feature.id)) {
             loopLog.log(`Feature ${feature.id} already has an active validation; skipping duplicate trigger`);
+            this.logFeatureWarningEvent(feature.id, "validation_deduplicated", `Validation already running for feature ${feature.id}; duplicate trigger ignored.`, {
+              taskId
+            });
             return;
           }
           const assertions = this.missionStore.listAssertionsForFeature(feature.id);
@@ -122466,6 +123559,10 @@ ${taskContext}` : ""}`;
             this.missionStore.completeValidatorRun(runId, "blocked", blockedReason);
           }
           loopLog.log(`Feature ${featureId} blocked: ${blockedReason}`);
+          this.logFeatureErrorEvent(featureId, "validation_blocked", `Validation blocked for feature ${featureId}: ${blockedReason ?? "no reason provided"}`, {
+            runId,
+            blockedReason: blockedReason ?? null
+          });
           if (this.missionAutopilot?.notifyValidationComplete) {
             await this.missionAutopilot.notifyValidationComplete(featureId, "blocked");
           }
@@ -122483,6 +123580,10 @@ ${taskContext}` : ""}`;
             this.missionStore.completeValidatorRun(runId, "error", error);
           }
           loopLog.error(`Feature ${featureId} validation error: ${error}`);
+          this.logFeatureErrorEvent(featureId, "validation_error", `Validation error for feature ${featureId}: ${error}`, {
+            runId,
+            error
+          });
           if (this.missionAutopilot?.notifyValidationComplete) {
             await this.missionAutopilot.notifyValidationComplete(featureId, "error");
           }
@@ -122491,6 +123592,31 @@ ${taskContext}` : ""}`;
           loopLog.error(`Error handling validation error for ${featureId}:`, err);
         }
       }
+      logFeatureWarningEvent(featureId, code, description, metadata) {
+        this.logFeatureMissionEvent(featureId, "warning", code, description, metadata);
+      }
+      logFeatureErrorEvent(featureId, code, description, metadata) {
+        this.logFeatureMissionEvent(featureId, "error", code, description, metadata);
+      }
+      logFeatureMissionEvent(featureId, eventType, code, description, metadata) {
+        const feature = this.missionStore.getFeature(featureId);
+        if (!feature) return;
+        const slice = this.missionStore.getSlice(feature.sliceId);
+        if (!slice) return;
+        const milestone = this.missionStore.getMilestone(slice.milestoneId);
+        if (!milestone) return;
+        try {
+          this.missionStore.logMissionEvent?.(milestone.missionId, eventType, description, {
+            code,
+            featureId,
+            sliceId: slice.id,
+            milestoneId: milestone.id,
+            ...metadata
+          });
+        } catch (err) {
+          loopLog.warn(`Failed to log mission ${eventType} event for feature ${featureId}:`, err);
+        }
+      }
     };
   }
 });
@@ -123773,6 +124899,8 @@ var init_agent_heartbeat = __esm({
     init_agent_instructions();
     init_heartbeat_procedure_resolver();
     init_prompt_layers();
+    init_goal_injection_diagnostics();
+    init_goal_anchoring_audit();
     init_logger2();
     init_worktree_acquisition();
     init_run_audit();
@@ -125164,12 +126292,16 @@ Critical: a heartbeat without observable progress (or an explicit no-op reason)
               engineRunContext.taskId = taskId;
             }
             let autoClaimCandidates = [];
+            let autoClaimSnapshotCandidateCount = 0;
+            let autoClaimRoleFilteredCount = 0;
             const autoClaimEnabled = isAutoClaimRelevantTasksEnabled(agent);
             if (!taskId && canRunNoTaskHeartbeat && autoClaimEnabled && this.snapshotManager) {
               try {
                 const snapshot = await this.snapshotManager.getSnapshot();
+                autoClaimSnapshotCandidateCount = snapshot.tasks.length;
                 const roleCompatibleCandidates = snapshot.tasks.filter((candidate) => canAgentTakeImplementationTask(agent, candidate));
                 const skippedIncompatibleCount = snapshot.tasks.length - roleCompatibleCandidates.length;
+                autoClaimRoleFilteredCount = skippedIncompatibleCount;
                 if (skippedIncompatibleCount > 0) {
                   heartbeatLog.log(
                     `Agent ${agentId} (role=${agent.role}) skipped auto-claim of ${skippedIncompatibleCount} implementation task(s) \u2014 only executor agents may claim implementation work`
@@ -125425,8 +126557,29 @@ Critical: a heartbeat without observable progress (or an explicit no-op reason)
             if (heartbeatPluginContributions) {
               heartbeatLog.log(`applied plugin prompt contributions for heartbeat surface`);
             }
+            const heartbeatGoalResolution = resolveGoalContextForDiagnostics({
+              listActiveGoals: typeof taskStore.getGoalStore === "function" ? () => taskStore.getGoalStore().listGoals({ status: "active" }) : void 0
+            });
+            const heartbeatGoalContext = heartbeatGoalResolution.goalContext;
+            const heartbeatGoalClassification = heartbeatGoalResolution.classification;
+            await emitGoalAnchoringAudit(audit, {
+              lane: "heartbeat",
+              taskId,
+              goalsInjected: heartbeatGoalClassification.goalCount,
+              truncated: heartbeatGoalClassification.truncated,
+              reason: heartbeatGoalClassification.outcome === "no-goals" ? "no-active-goals" : void 0
+            });
+            await emitGoalInjectionDiagnostic({
+              lane: "heartbeat",
+              ...heartbeatGoalClassification,
+              runId: run.id,
+              agentId,
+              store: taskStore,
+              runContext: engineRunContext
+            });
             const heartbeatLayers = buildPromptLayers({
               basePrompt: baseHeartbeatSystemPrompt,
+              goalContext: heartbeatGoalContext,
               agentInstructions: [resolvedInstructionsText, memoryInstructions, selfImprovePrompt].filter((part) => part.trim()).join("\n\n"),
               pluginContributions: heartbeatPluginContributions
             });
@@ -125701,10 +126854,15 @@ Critical: a heartbeat without observable progress (or an explicit no-op reason)
                   );
                 }
                 const promptCandidateLimit = resolveAutoClaimCandidatesInPromptLimit(agent, heartbeatModelSettings);
+                const autoClaimStatus = autoClaimEnabled ? promptCandidateLimit === 0 ? "disabled (prompt-suppressed)" : autoClaimCandidates.length === 0 && autoClaimSnapshotCandidateCount > 0 && autoClaimRoleFilteredCount > 0 ? "enabled (no role-compatible candidates; executor role required)" : "enabled" : "disabled";
+                const noRoleCompatibleCandidateLines = autoClaimCandidates.length === 0 && autoClaimSnapshotCandidateCount > 0 && autoClaimRoleFilteredCount > 0 ? [
+                  `- Snapshot found ${autoClaimSnapshotCandidateCount} eligible Todo task(s), but this agent role cannot auto-claim implementation work.`,
+                  "- Backlog auto-claim is restricted to executor-role agents; use delegation or create coordination follow-up instead of assuming the board is empty."
+                ] : [];
                 const candidateLines = promptCandidateLimit > 0 ? [
                   "",
                   "Open Task Candidates (auto-claim scan):",
-                  ...autoClaimCandidates.slice(0, promptCandidateLimit).map((candidate) => `- ${candidate.id}: ${candidate.title ?? candidate.descriptionFirstLine}`)
+                  ...autoClaimCandidates.length > 0 ? autoClaimCandidates.slice(0, promptCandidateLimit).map((candidate) => `- ${candidate.id}: ${candidate.title ?? candidate.descriptionFirstLine}`) : noRoleCompatibleCandidateLines
                 ] : [];
                 executionPrompt = [
                   `Heartbeat execution for agent "${agent.name}" (ID: ${agent.id})`,
@@ -125720,7 +126878,7 @@ Critical: a heartbeat without observable progress (or an explicit no-op reason)
                   ...wakeTriggerSourceLine ? [wakeTriggerSourceLine] : [],
                   `- pending messages: ${pendingMessages.length}`,
                   `- pending room messages: ${pendingRoomMessages.total}`,
-                  `- auto-claim relevant tasks: ${autoClaimEnabled ? promptCandidateLimit === 0 ? "disabled (prompt-suppressed)" : "enabled" : "disabled"}`,
+                  `- auto-claim relevant tasks: ${autoClaimStatus}`,
                   "",
                   "Treat this wake delta as the highest-priority change for this heartbeat.",
                   "This is an autonomous heartbeat run (manual or automatic): re-anchor on",
@@ -132086,9 +133244,19 @@ var init_in_process_runtime = __esm({
             missionAutopilot: missionAutopilot ? {
               notifyValidationComplete: async (featureId) => {
                 const feature = missionStore.getFeature(featureId);
-                if (feature?.taskId) {
-                  await missionAutopilot.handleTaskCompletion(feature.taskId);
+                if (!feature?.taskId) {
+                  return;
+                }
+                const slice = missionStore.getSlice(feature.sliceId);
+                const milestone = slice ? missionStore.getMilestone(slice.milestoneId) : void 0;
+                const missionId = milestone?.missionId;
+                if (missionId) {
+                  const mission = missionStore.getMission(missionId);
+                  if (mission?.autopilotEnabled && !missionAutopilot.isWatching(missionId)) {
+                    missionAutopilot.watchMission(missionId);
+                  }
                 }
+                await missionAutopilot.handleTaskCompletion(feature.taskId);
               }
             } : void 0,
             rootDir: this.config.workingDirectory,
@@ -132861,7 +134029,8 @@ var init_in_process_runtime = __esm({
         this.usageLimitPauser = pauser;
       }
       /**
-       * Set up event forwarding from TaskStore to runtime listeners.
+       * Set up event forwarding from TaskStore to runtime listeners
+       * for task:created, task:moved, task:updated, and task:deleted.
        */
       setupEventForwarding() {
         this.taskStore.on("task:created", (task) => {
@@ -132876,6 +134045,10 @@ var init_in_process_runtime = __esm({
           this.recordActivity();
           this.emit("task:updated", task);
         });
+        this.taskStore.on("task:deleted", (task, meta) => {
+          this.recordActivity();
+          this.emit("task:deleted", task, meta);
+        });
         runtimeLog.log("Event forwarding setup complete");
       }
       /**
@@ -132926,7 +134099,7 @@ var init_in_process_runtime = __esm({
 function generateCorrelationId() {
   return `${Date.now()}-${Math.random().toString(36).slice(2, 11)}`;
 }
-var START_RUNTIME, STOP_RUNTIME, GET_METRICS, OK, ERROR, PONG, TASK_CREATED, TASK_MOVED, TASK_UPDATED, ERROR_EVENT, HEALTH_CHANGED;
+var START_RUNTIME, STOP_RUNTIME, GET_METRICS, OK, ERROR, PONG, TASK_CREATED, TASK_MOVED, TASK_UPDATED, TASK_DELETED, ERROR_EVENT, HEALTH_CHANGED;
 var init_ipc_protocol = __esm({
   "../engine/src/ipc/ipc-protocol.ts"() {
     "use strict";
@@ -132939,6 +134112,7 @@ var init_ipc_protocol = __esm({
     TASK_CREATED = "TASK_CREATED";
     TASK_MOVED = "TASK_MOVED";
     TASK_UPDATED = "TASK_UPDATED";
+    TASK_DELETED = "TASK_DELETED";
     ERROR_EVENT = "ERROR_EVENT";
     HEALTH_CHANGED = "HEALTH_CHANGED";
   }
@@ -133323,6 +134497,9 @@ var init_child_process_runtime = __esm({
         this.ipcHost.on(TASK_UPDATED, (payload) => {
           this.emit("task:updated", payload.task);
         });
+        this.ipcHost.on(TASK_DELETED, (payload) => {
+          this.emit("task:deleted", payload.task, payload.meta);
+        });
         this.ipcHost.on(ERROR_EVENT, (payload) => {
           const error = new Error(payload.message);
           if (payload.code) {
@@ -134445,6 +135622,9 @@ var init_project_manager = __esm({
         runtime.on("task:updated", (task) => {
           this.emit("task:updated", { projectId, projectName, task });
         });
+        runtime.on("task:deleted", (task, meta) => {
+          this.emit("task:deleted", { projectId, projectName, task, meta });
+        });
         runtime.on("error", (error) => {
           this.emit("error", { projectId, projectName, error });
           this.logActivity(
@@ -134807,6 +135987,10 @@ function buildMergeSystemPrompt2(agentPrompts) {
     "  - The subject line must CONCISELY SUMMARIZE the squashed changes in",
     '    imperative mood (e.g. "add X", "fix Y") based on the actual diff \u2014 do',
     "    not just restate the task title.",
+    "  - The commit BODY must include:",
+    "      1) one short narrative summary line,",
+    "      2) a bullet list of key changes, and",
+    "      3) a `Files changed:` section populated from `git diff --stat`.",
     "  - Include the task-id prefix and the trailer lines EXACTLY as given in the",
     "    task instructions (they associate the commit with the board task)."
   ].filter((l) => l !== void 0).join("\n");
@@ -134820,11 +136004,15 @@ function buildMergePrompt2(input) {
     "Steps:",
     `  1. Run: git merge --squash ${input.branch}`,
     "  2. If there are conflicts, resolve them (favor the task's intent), then `git add` the resolved files.",
-    "  3. Commit the staged result as a SINGLE commit whose subject summarizes the",
-    `     actual changes${input.taskTitle ? ` (task title hint: ${JSON.stringify(input.taskTitle)})` : ""}, including the required trailers:`,
-    `       git commit -m ${subjectShape}${trailerArgs}`,
+    "  3. Build a merge body from the staged squash diff:",
+    "       - one short narrative summary line",
+    "       - bullet list of key changes",
+    "       - `Files changed:` + the output of `git diff --stat`",
+    "  4. Commit the staged result as a SINGLE commit whose subject summarizes the",
+    `     actual changes${input.taskTitle ? ` (task title hint: ${JSON.stringify(input.taskTitle)})` : ""}, including the body above and required trailers:`,
+    `       git commit -m ${subjectShape} -m "<narrative + bullet list + Files changed: ...>"${trailerArgs}`,
     "     Keep the trailer line(s) verbatim \u2014 they link the commit to the board task.",
-    "  4. Verify `git log --oneline ${tip}..HEAD` shows exactly one new commit and `git status` is clean.".replace("${tip}", short(input.tipSha)),
+    "  5. Verify `git log --oneline ${tip}..HEAD` shows exactly one new commit and `git status` is clean.".replace("${tip}", short(input.tipSha)),
     "",
     "If `git merge --squash` reports the branch is already up to date (nothing to",
     "merge), do nothing and leave HEAD unchanged."
@@ -136115,6 +137303,7 @@ var init_project_engine = __esm({
     init_research_step_runner();
     init_run_audit();
     init_verification_followup_dedup();
+    init_transient_error_detector();
     init_tunnel_process_manager();
     execFileAsync12 = promisify45(execFile17);
     MERGE_HANDOFF_GRACE_MS = 300;
@@ -136185,6 +137374,10 @@ var init_project_engine = __esm({
       manualMergeResolvers = /* @__PURE__ */ new Map();
       shuttingDown = false;
       static MAX_AUTO_MERGE_RETRIES = 3;
+      /** FN-5697/FN-5674: cap transient provider/network abort retries in auto-merge.
+       *  Examples: "This operation was aborted", "socket hang up", `server_error`.
+       *  After this cap, the task is parked failed for human visibility. */
+      static MAX_AUTO_MERGE_TRANSIENT_RETRIES = 3;
       /** Cap on outer in-review→in-progress bounces caused by deterministic
        *  verification failures during auto-merge. After this many failed merges
        *  for the same task, we stop bouncing it back, mark it failed, and create
@@ -137167,7 +138360,15 @@ ${detail}`
                     this.internalEnqueueMerge(taskId);
                     continue;
                   }
-                  const blockerReason = getTaskHardMergeBlocker(task);
+                  const blockerReason = getTaskHardMergeBlocker({
+                    ...task,
+                    // Merge-confirmed tasks have already landed. Treat stale merge
+                    // in-flight statuses as soft state to clear during finalization,
+                    // not hard blockers that park an otherwise confirmed merge as failed.
+                    paused: false,
+                    status: task.status === "merging" || task.status === "merging-pr" ? void 0 : task.status,
+                    error: void 0
+                  });
                   if (blockerReason) {
                     await store.updateTask(taskId, {
                       status: "failed",
@@ -137686,6 +138887,16 @@ ${detail}`
                   }
                 } else {
                   try {
+                    if (await this.maybeRetryTransientMerge(store, taskId, taskOnErr, errorMsg)) {
+                      continue;
+                    }
+                    if (this.isTransientMergeRetryExhausted(taskOnErr, errorMsg)) {
+                      await store.logEntry(
+                        taskId,
+                        `Auto-merge transient retries exhausted (${_ProjectEngine.MAX_AUTO_MERGE_TRANSIENT_RETRIES}/${_ProjectEngine.MAX_AUTO_MERGE_TRANSIENT_RETRIES}); parking task as failed: ${errorMsg}`,
+                        "MergeTransientRetryExhausted"
+                      );
+                    }
                     await store.updateTask(taskId, {
                       status: "failed",
                       mergeRetries: _ProjectEngine.MAX_AUTO_MERGE_RETRIES,
@@ -137704,6 +138915,16 @@ ${detail}`
                 }
               } else {
                 try {
+                  if (await this.maybeRetryTransientMerge(store, taskId, taskOnErr, errorMsg)) {
+                    continue;
+                  }
+                  if (this.isTransientMergeRetryExhausted(taskOnErr, errorMsg)) {
+                    await store.logEntry(
+                      taskId,
+                      `Auto-merge transient retries exhausted (${_ProjectEngine.MAX_AUTO_MERGE_TRANSIENT_RETRIES}/${_ProjectEngine.MAX_AUTO_MERGE_TRANSIENT_RETRIES}); parking task as failed: ${errorMsg}`,
+                      "MergeTransientRetryExhausted"
+                    );
+                  }
                   await store.updateTask(taskId, {
                     status: "failed",
                     mergeRetries: _ProjectEngine.MAX_AUTO_MERGE_RETRIES,
@@ -137739,6 +138960,40 @@ ${detail}`
           this.mergeRunning = false;
         }
       }
+      isTransientMergeRetryExhausted(task, errorMsg) {
+        if (!task || !isTransientError(errorMsg)) {
+          return false;
+        }
+        const current = task.mergeTransientRetryCount ?? 0;
+        return current >= _ProjectEngine.MAX_AUTO_MERGE_TRANSIENT_RETRIES;
+      }
+      async maybeRetryTransientMerge(store, taskId, taskOnErr, errorMsg) {
+        if (!taskOnErr || !isTransientError(errorMsg)) {
+          return false;
+        }
+        const currentRetries = taskOnErr.mergeTransientRetryCount ?? 0;
+        if (currentRetries >= _ProjectEngine.MAX_AUTO_MERGE_TRANSIENT_RETRIES) {
+          return false;
+        }
+        const nextRetryCount = currentRetries + 1;
+        const delayMs = 5e3 * Math.pow(2, currentRetries);
+        await store.updateTask(taskId, {
+          mergeTransientRetryCount: nextRetryCount,
+          status: null
+        });
+        await store.logEntry(
+          taskId,
+          `Auto-merge transient retry ${nextRetryCount}/${_ProjectEngine.MAX_AUTO_MERGE_TRANSIENT_RETRIES} scheduled in ${delayMs / 1e3}s: ${errorMsg}`,
+          "MergeTransientRetry"
+        );
+        runtimeLog.log(
+          `Auto-merge transient retry ${nextRetryCount}/${_ProjectEngine.MAX_AUTO_MERGE_TRANSIENT_RETRIES} for ${taskId} in ${delayMs / 1e3}s`
+        );
+        setTimeout(() => {
+          if (!this.shuttingDown) this.internalEnqueueMerge(taskId);
+        }, delayMs);
+        return true;
+      }
       wireAutoMerge(store, _cwd) {
         this.taskMovedHandler = async ({ task, to: to2 }) => {
           if (to2 !== "in-review") return;
@@ -141288,6 +142543,7 @@ __export(src_exports2, {
   BranchConflictError: () => BranchConflictError,
   BranchCrossContaminationError: () => BranchCrossContaminationError,
   CronRunner: () => CronRunner,
+  DEFAULT_GOAL_INJECTION_CHAR_BUDGET: () => DEFAULT_GOAL_INJECTION_CHAR_BUDGET,
   DEFAULT_NTFY_EVENTS: () => DEFAULT_NTFY_EVENTS,
   DiffVolumeRegressionError: () => DiffVolumeRegressionError,
   EngineAlreadyRunningError: () => EngineAlreadyRunningError,
@@ -141302,6 +142558,9 @@ __export(src_exports2, {
   ExperimentGitNotConfiguredError: () => ExperimentGitNotConfiguredError,
   ExperimentMaxIterationsError: () => ExperimentMaxIterationsError,
   ExperimentRevertConflictError: () => ExperimentRevertConflictError,
+  GOAL_INJECTION_APPLIED: () => GOAL_INJECTION_APPLIED,
+  GOAL_INJECTION_SKIPPED: () => GOAL_INJECTION_SKIPPED,
+  GOAL_RETRIEVAL_INVOKED: () => GOAL_RETRIEVAL_INVOKED,
   GitHubProvider: () => GitHubProvider,
   HEARTBEAT_NO_TASK_SYSTEM_PROMPT: () => HEARTBEAT_NO_TASK_SYSTEM_PROMPT,
   HEARTBEAT_PROCEDURE: () => HEARTBEAT_PROCEDURE,
@@ -141312,6 +142571,7 @@ __export(src_exports2, {
   KNOWN_EXTERNAL_INTEGRATIONS: () => KNOWN_EXTERNAL_INTEGRATIONS,
   LLMSynthesisProvider: () => LLMSynthesisProvider,
   LocalDocsProvider: () => LocalDocsProvider,
+  MAX_INJECTED_GOALS: () => MAX_INJECTED_GOALS,
   MOCK_PROVIDER_ID: () => MOCK_PROVIDER_ID3,
   MOCK_SYNTHETIC_TOKEN_USAGE: () => MOCK_SYNTHETIC_TOKEN_USAGE,
   MergeAbortedError: () => MergeAbortedError,
@@ -141387,10 +142647,13 @@ __export(src_exports2, {
   assertSafeUrl: () => assertSafeUrl,
   auditSquashMerge: () => auditSquashMerge,
   buildAgentChatPrompt: () => buildAgentChatPrompt,
+  buildGoalContextSection: () => buildGoalContextSection,
   buildNtfyClickUrl: () => buildNtfyClickUrl,
   buildRuntimeResolutionContext: () => buildRuntimeResolutionContext,
   buildSystemPromptWithInstructions: () => buildSystemPromptWithInstructions,
   classifyBootstrapMisbinding: () => classifyBootstrapMisbinding,
+  classifyGoalInjectionFailure: () => classifyGoalInjectionFailure,
+  classifyGoalInjectionResult: () => classifyGoalInjectionResult,
   classifyTaskError: () => classifyTaskError,
   cleanupOrphanedWorktrees: () => cleanupOrphanedWorktrees,
   cleanupSecretsEnvFile: () => cleanupSecretsEnvFile,
@@ -141415,6 +142678,9 @@ __export(src_exports2, {
   describeModel: () => describeModel,
   dropAutostashBySha: () => dropAutostashBySha,
   dropAutostashHandle: () => dropAutostashHandle,
+  emitGoalAnchoringAudit: () => emitGoalAnchoringAudit,
+  emitGoalInjectionDiagnostic: () => emitGoalInjectionDiagnostic,
+  emitGoalRetrievalAudit: () => emitGoalRetrievalAudit,
   ensureDefaultHeartbeatProcedureFile: () => ensureDefaultHeartbeatProcedureFile,
   executeApprovedAgentProvisioning: () => executeApprovedAgentProvisioning,
   executeApprovedWorktrunkInstall: () => executeApprovedWorktrunkInstall,
@@ -141529,6 +142795,9 @@ var init_src2 = __esm({
     init_external_integrations();
     init_web_fetch();
     init_error_classifier();
+    init_goal_context_injector();
+    init_goal_injection_diagnostics();
+    init_goal_anchoring_audit();
     init_worktrunk_installer();
     init_worktrunk_failure_handler();
     init_usage_limit_detector();
@@ -164155,12 +165424,17 @@ Status: ${createdMission.status}${createdMission.autoAdvance ? "\nAuto-advance:
       )
     }),
     async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      const fnCtx = ctx;
       const store = await getStore2(ctx.cwd);
       const goalStore = store.getGoalStore();
       const status = params.status ?? "active";
       const goals = status === "all" ? goalStore.listGoals() : goalStore.listGoals({ status });
       const activeCount = goalStore.listGoals({ status: "active" }).length;
       const softWarning = activeCount >= 3;
+      emitGoalRetrievalAudit(store, fnCtx, {
+        toolName: "fn_goal_list",
+        resultCount: goals.length
+      });
       const lines = [];
       lines.push(`Goals (${goals.length}) [filter: ${status}]`);
       lines.push(`Active: ${activeCount}/5`);
@@ -164265,6 +165539,56 @@ Status: ${goal.status}${softWarning ? `
       };
     }
   });
+  pi2.registerTool({
+    name: "fn_goal_show",
+    label: "fn: Show Goal",
+    description: "Show full details for a single goal by ID.",
+    promptSnippet: "Show goal details by ID",
+    promptGuidelines: [
+      "Use to inspect a specific goal after listing or referencing its ID",
+      "Cite the goal ID and status when summarizing or planning from this output",
+      "Read-only retrieval; does not mutate goals"
+    ],
+    parameters: Type8.Object({
+      id: Type8.String({ description: "Goal ID (G-\u2026)" })
+    }),
+    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      const fnCtx = ctx;
+      const store = await getStore2(ctx.cwd);
+      const goalStore = store.getGoalStore();
+      const goal = goalStore.getGoal(params.id);
+      if (!goal) {
+        emitGoalRetrievalAudit(store, fnCtx, {
+          toolName: "fn_goal_show",
+          resultCount: 0,
+          goalId: params.id,
+          notFound: true
+        });
+        return {
+          isError: true,
+          content: [{ type: "text", text: `Goal ${params.id} not found` }],
+          details: { code: "GOAL_NOT_FOUND", goalId: params.id }
+        };
+      }
+      const lines = [];
+      lines.push(`${goal.id}: ${goal.title}`);
+      lines.push(`Status: ${goal.status}`);
+      lines.push(`Created: ${goal.createdAt}`);
+      lines.push(`Updated: ${goal.updatedAt}`);
+      if (goal.description) {
+        lines.push(`Description: ${goal.description}`);
+      }
+      emitGoalRetrievalAudit(store, fnCtx, {
+        toolName: "fn_goal_show",
+        resultCount: 1,
+        goalId: params.id
+      });
+      return {
+        content: [{ type: "text", text: lines.join("\n") }],
+        details: { goal }
+      };
+    }
+  });
   pi2.registerTool({
     name: "fn_mission_show",
     label: "fn: Show Mission",