@runfusion/fusion 0.35.0 → 0.37.0

package/dist/extension.js

@@ -328,6 +328,7 @@ var init_settings_schema = __esm({
       ],
       prerebaseDivergenceThreshold: 50,
       mergeConflictStrategy: "smart-prefer-main",
+      merger: { mode: "ai", maxReviewPasses: 3 },
       mergeDiffVolumeMinLines: void 0,
       mergeDiffVolumeThreshold: void 0,
       mergeDiffVolumeAllowlist: void 0,
@@ -407,6 +408,7 @@ var init_settings_schema = __esm({
       autoUpdatePrStatus: false,
       githubCommentOnDone: false,
       githubCommentTemplate: void 0,
+      githubCloseSourceIssueOnDone: false,
       githubTrackingEnabledByDefault: false,
       githubTrackingDefaultRepo: void 0,
       githubTrackingDedupEnabled: true,
@@ -1271,6 +1273,9 @@ function normalizePostMergeAuditMode(value) {
 function normalizeMergeAuditAutoRecovery(value) {
   return typeof value === "string" && MERGE_AUDIT_AUTO_RECOVERY_MODES.includes(value) ? value : "ai-assisted";
 }
+function normalizeMergerMode(value) {
+  return typeof value === "string" && MERGER_MODES.includes(value) ? value : "ai";
+}
 function normalizeAutoRecovery(value) {
   const fallback = { mode: "deterministic-only", maxRetries: 3 };
   if (!value || typeof value !== "object") return fallback;
@@ -1577,7 +1582,7 @@ function validateMessageMetadata(metadata) {
     throw new Error("metadata.wakeRecipient must be a boolean");
   }
 }
-var THINKING_LEVELS, COLUMNS, DEFAULT_COLUMN, TASK_PRIORITIES, DEFAULT_TASK_PRIORITY, HIGH_FANOUT_BLOCKER_TODO_THRESHOLD, STALE_HIGH_FANOUT_BLOCKER_AGE_THRESHOLD_MS, EXECUTION_MODES, DEFAULT_EXECUTION_MODE, THEME_MODES, COLOR_THEMES, warnedLegacyCwdMain, MERGE_ADVANCE_AUTO_SYNC_MODES, MERGE_STRATEGY_OVERLAP_BEHAVIORS, POST_MERGE_AUDIT_MODES, MERGE_AUDIT_AUTO_RECOVERY_MODES, AUTO_RECOVERY_MODES, NOTIFICATION_EVENTS, WORKFLOW_STEP_TEMPLATES, DOCUMENT_KEY_RE, REPO_OVERRIDE_RE, CheckoutConflictError, DUPLICATE_OF_METADATA_KEY, SHARED_STATE_SNAPSHOT_VERSION, COLUMN_LABELS, COLUMN_DESCRIPTIONS, VALID_TRANSITIONS, AGENT_VALID_TRANSITIONS, AGENT_PERMISSIONS, PERMANENT_AGENT_ACTION_CATEGORIES, AGENT_PERMISSION_POLICY_ACTION_CATEGORIES, AGENT_PERMISSION_POLICY_CATEGORY_TOOL_EXAMPLES, AGENT_PERMISSION_POLICY_EXEMPT_TOOL_EXAMPLES, AGENT_PROVISIONING_APPROVAL_MODES, SECRET_ACCESS_POLICIES, SANDBOX_PROVISIONING_APPROVAL_MODES, AGENT_PERMISSION_POLICY_PRESET_IDS, APPROVAL_REQUEST_STATUSES, APPROVAL_REQUEST_AUDIT_EVENT_TYPES, LEGACY_AGENT_PERMISSION_POLICY_ACTION_CATEGORY_ALIASES, DEFAULT_HEARTBEAT_PROCEDURE_PATH, DASHBOARD_USER_ID, DASHBOARD_USER_ALIASES;
+var THINKING_LEVELS, COLUMNS, DEFAULT_COLUMN, TASK_PRIORITIES, DEFAULT_TASK_PRIORITY, HIGH_FANOUT_BLOCKER_TODO_THRESHOLD, STALE_HIGH_FANOUT_BLOCKER_AGE_THRESHOLD_MS, EXECUTION_MODES, DEFAULT_EXECUTION_MODE, THEME_MODES, COLOR_THEMES, warnedLegacyCwdMain, MERGE_ADVANCE_AUTO_SYNC_MODES, MERGE_STRATEGY_OVERLAP_BEHAVIORS, POST_MERGE_AUDIT_MODES, MERGE_AUDIT_AUTO_RECOVERY_MODES, MERGER_MODES, AUTO_RECOVERY_MODES, NOTIFICATION_EVENTS, WORKFLOW_STEP_TEMPLATES, DOCUMENT_KEY_RE, REPO_OVERRIDE_RE, CheckoutConflictError, DUPLICATE_OF_METADATA_KEY, SHARED_STATE_SNAPSHOT_VERSION, COLUMN_LABELS, COLUMN_DESCRIPTIONS, VALID_TRANSITIONS, AGENT_VALID_TRANSITIONS, AGENT_PERMISSIONS, PERMANENT_AGENT_ACTION_CATEGORIES, AGENT_PERMISSION_POLICY_ACTION_CATEGORIES, AGENT_PERMISSION_POLICY_CATEGORY_TOOL_EXAMPLES, AGENT_PERMISSION_POLICY_EXEMPT_TOOL_EXAMPLES, AGENT_PROVISIONING_APPROVAL_MODES, SECRET_ACCESS_POLICIES, SANDBOX_PROVISIONING_APPROVAL_MODES, AGENT_PERMISSION_POLICY_PRESET_IDS, APPROVAL_REQUEST_STATUSES, APPROVAL_REQUEST_AUDIT_EVENT_TYPES, LEGACY_AGENT_PERMISSION_POLICY_ACTION_CATEGORY_ALIASES, DEFAULT_HEARTBEAT_PROCEDURE_PATH, DASHBOARD_USER_ID, DASHBOARD_USER_ALIASES;
 var init_types = __esm({
   "../core/src/types.ts"() {
     "use strict";
@@ -1662,6 +1667,7 @@ var init_types = __esm({
     ];
     POST_MERGE_AUDIT_MODES = ["block", "warn", "off"];
     MERGE_AUDIT_AUTO_RECOVERY_MODES = ["deterministic-only", "programmatic", "ai-assisted", "off"];
+    MERGER_MODES = ["ai", "deterministic"];
     AUTO_RECOVERY_MODES = ["off", "deterministic-only", "programmatic", "ai-assisted"];
     NOTIFICATION_EVENTS = [
       "in-review",
@@ -4666,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 = 91;
+    SCHEMA_VERSION = 92;
     SCHEMA_SQL = `
 -- Tasks table with JSON columns for nested data
 CREATE TABLE IF NOT EXISTS tasks (
@@ -5219,6 +5225,17 @@ CREATE TABLE IF NOT EXISTS missions (
   updatedAt TEXT NOT NULL
 );
 
+-- Goals table (strategic intent across mission timelines)
+CREATE TABLE IF NOT EXISTS goals (
+  id TEXT PRIMARY KEY,
+  title TEXT NOT NULL,
+  description TEXT,
+  status TEXT NOT NULL,
+  createdAt TEXT NOT NULL,
+  updatedAt TEXT NOT NULL
+);
+CREATE INDEX IF NOT EXISTS idxGoalsStatus ON goals(status);
+
 -- Milestones table (phases within a mission)
 CREATE TABLE IF NOT EXISTS milestones (
   id TEXT PRIMARY KEY,
@@ -7531,6 +7548,24 @@ This means a caller passed a .fusion directory where a project root was expected
             this.addColumnIfMissing("missions", "baseBranch", "TEXT");
           });
         }
+        if (version < 92) {
+          this.applyMigration(92, () => {
+            this.db.exec(`
+          CREATE TABLE IF NOT EXISTS goals (
+            id TEXT PRIMARY KEY,
+            title TEXT NOT NULL,
+            description TEXT,
+            status TEXT NOT NULL,
+            createdAt TEXT NOT NULL,
+            updatedAt TEXT NOT NULL
+          )
+        `);
+            this.db.exec(`
+          CREATE INDEX IF NOT EXISTS idxGoalsStatus
+            ON goals(status)
+        `);
+          });
+        }
       }
       /**
        * Run a single migration step inside a transaction and bump the version.
@@ -18654,6 +18689,158 @@ var init_todo_store = __esm({
   }
 });
 
+// ../core/src/goal-types.ts
+var ACTIVE_GOAL_LIMIT, ActiveGoalLimitExceededError;
+var init_goal_types = __esm({
+  "../core/src/goal-types.ts"() {
+    "use strict";
+    ACTIVE_GOAL_LIMIT = 5;
+    ActiveGoalLimitExceededError = class extends Error {
+      constructor(limit, currentActive) {
+        super(`Active goal limit exceeded: ${currentActive}/${limit}`);
+        this.limit = limit;
+        this.currentActive = currentActive;
+        this.name = "ActiveGoalLimitExceededError";
+      }
+      code = "ACTIVE_GOAL_LIMIT_EXCEEDED";
+    };
+  }
+});
+
+// ../core/src/goal-store.ts
+import { EventEmitter as EventEmitter10 } from "node:events";
+var GoalStore;
+var init_goal_store = __esm({
+  "../core/src/goal-store.ts"() {
+    "use strict";
+    init_goal_types();
+    GoalStore = class extends EventEmitter10 {
+      constructor(_fusionDir, db) {
+        super();
+        this.db = db;
+      }
+      idSequence = 0;
+      createGoal(input) {
+        const now = (/* @__PURE__ */ new Date()).toISOString();
+        const goal = this.db.transactionImmediate(() => {
+          const activeCountRow = this.db.prepare("SELECT COUNT(*) as count FROM goals WHERE status = 'active'").get();
+          const currentActive = activeCountRow?.count ?? 0;
+          if (currentActive >= ACTIVE_GOAL_LIMIT) {
+            throw new ActiveGoalLimitExceededError(ACTIVE_GOAL_LIMIT, currentActive);
+          }
+          const created = {
+            id: this.generateGoalId(),
+            title: input.title,
+            description: input.description,
+            status: "active",
+            createdAt: now,
+            updatedAt: now
+          };
+          this.db.prepare(
+            "INSERT INTO goals (id, title, description, status, createdAt, updatedAt) VALUES (?, ?, ?, ?, ?, ?)"
+          ).run(created.id, created.title, created.description ?? null, created.status, created.createdAt, created.updatedAt);
+          return created;
+        });
+        this.db.bumpLastModified();
+        this.emit("goal:created", goal);
+        return goal;
+      }
+      updateGoal(id, input) {
+        const existing = this.getGoal(id);
+        if (!existing) {
+          throw new Error(`Goal ${id} not found`);
+        }
+        const updated = {
+          ...existing,
+          title: input.title ?? existing.title,
+          description: input.description ?? existing.description,
+          updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+        };
+        this.db.prepare("UPDATE goals SET title = ?, description = ?, updatedAt = ? WHERE id = ?").run(updated.title, updated.description ?? null, updated.updatedAt, id);
+        this.db.bumpLastModified();
+        this.emit("goal:updated", updated);
+        return updated;
+      }
+      archiveGoal(id) {
+        const existing = this.getGoal(id);
+        if (!existing) {
+          throw new Error(`Goal ${id} not found`);
+        }
+        if (existing.status === "archived") {
+          this.emit("goal:updated", existing);
+          return existing;
+        }
+        const updated = {
+          ...existing,
+          status: "archived",
+          updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+        };
+        this.db.prepare("UPDATE goals SET status = 'archived', updatedAt = ? WHERE id = ?").run(updated.updatedAt, id);
+        this.db.bumpLastModified();
+        this.emit("goal:updated", updated);
+        return updated;
+      }
+      unarchiveGoal(id) {
+        const { goal, changed } = this.db.transactionImmediate(() => {
+          const existing = this.getGoal(id);
+          if (!existing) {
+            throw new Error(`Goal ${id} not found`);
+          }
+          if (existing.status === "active") {
+            return { goal: existing, changed: false };
+          }
+          const activeCountRow = this.db.prepare("SELECT COUNT(*) as count FROM goals WHERE status = 'active'").get();
+          const currentActive = activeCountRow?.count ?? 0;
+          if (currentActive >= ACTIVE_GOAL_LIMIT) {
+            throw new ActiveGoalLimitExceededError(ACTIVE_GOAL_LIMIT, currentActive);
+          }
+          const updated = {
+            ...existing,
+            status: "active",
+            updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+          };
+          this.db.prepare("UPDATE goals SET status = 'active', updatedAt = ? WHERE id = ?").run(updated.updatedAt, id);
+          return { goal: updated, changed: true };
+        });
+        if (!changed) {
+          return goal;
+        }
+        this.db.bumpLastModified();
+        this.emit("goal:updated", goal);
+        return goal;
+      }
+      listGoals(filter) {
+        const rows = filter?.status ? this.db.prepare("SELECT id, title, description, status, createdAt, updatedAt FROM goals WHERE status = ? ORDER BY createdAt ASC").all(filter.status) : this.db.prepare("SELECT id, title, description, status, createdAt, updatedAt FROM goals ORDER BY createdAt ASC").all();
+        return rows.map((row) => this.toGoal(row));
+      }
+      getGoal(id) {
+        const row = this.db.prepare("SELECT id, title, description, status, createdAt, updatedAt FROM goals WHERE id = ?").get(id);
+        if (!row) {
+          return null;
+        }
+        return this.toGoal(row);
+      }
+      toGoal(row) {
+        return {
+          id: row.id,
+          title: row.title,
+          description: row.description ?? void 0,
+          status: row.status,
+          createdAt: row.createdAt,
+          updatedAt: row.updatedAt
+        };
+      }
+      generateGoalId() {
+        const timestamp = Date.now().toString(36).toUpperCase();
+        this.idSequence += 1;
+        const sequence = this.idSequence.toString(36).toUpperCase().padStart(4, "0");
+        const random = Math.random().toString(36).substring(2, 6).toUpperCase();
+        return `G-${timestamp}-${sequence}-${random}`;
+      }
+    };
+  }
+});
+
 // ../core/src/eval-types.ts
 function normalizeEvalFollowUpText(value) {
   return value.toLowerCase().replace(/\s+/g, " ").replace(/[^a-z0-9 ]/g, "").trim();
@@ -18732,7 +18919,7 @@ var init_eval_types = __esm({
 });
 
 // ../core/src/eval-store.ts
-import { EventEmitter as EventEmitter10 } from "node:events";
+import { EventEmitter as EventEmitter11 } from "node:events";
 import { randomUUID as randomUUID9 } from "node:crypto";
 function generateRunId3() {
   return `ER-${Date.now().toString(36).toUpperCase()}-${Math.random().toString(36).slice(2, 7).toUpperCase()}`;
@@ -18828,7 +19015,7 @@ var init_eval_store = __esm({
         this.name = "EvalLifecycleError";
       }
     };
-    EvalStore = class extends EventEmitter10 {
+    EvalStore = class extends EventEmitter11 {
       constructor(db) {
         super();
         this.db = db;
@@ -19788,7 +19975,7 @@ var require_registry = __commonJS({
         setTimeout(send, Math.random() * 250);
       }
       announce(server, service) {
-        var delay4 = 1e3;
+        var delay5 = 1e3;
         var packet = service.records();
         server.register(packet);
         const broadcast = () => {
@@ -19800,9 +19987,9 @@ var require_registry = __commonJS({
               service.published = true;
               service.emit("up");
             }
-            delay4 = delay4 * REANNOUNCE_FACTOR;
-            if (delay4 < REANNOUNCE_MAX_MS && !service.destroyed) {
-              setTimeout(broadcast, delay4).unref();
+            delay5 = delay5 * REANNOUNCE_FACTOR;
+            if (delay5 < REANNOUNCE_MAX_MS && !service.destroyed) {
+              setTimeout(broadcast, delay5).unref();
             }
           });
         };
@@ -22628,7 +22815,7 @@ var require_dist = __commonJS({
 });
 
 // ../core/src/node-discovery.ts
-import { EventEmitter as EventEmitter11 } from "node:events";
+import { EventEmitter as EventEmitter12 } from "node:events";
 import os from "node:os";
 var import_bonjour_service, DEFAULT_DISCOVERY_CONFIG, STALE_CLEANUP_INTERVAL_MS, FUSION_VERSION, NodeDiscovery;
 var init_node_discovery = __esm({
@@ -22644,7 +22831,7 @@ var init_node_discovery = __esm({
     };
     STALE_CLEANUP_INTERVAL_MS = 6e4;
     FUSION_VERSION = "0.1.0";
-    NodeDiscovery = class extends EventEmitter11 {
+    NodeDiscovery = class extends EventEmitter12 {
       config;
       bonjour = null;
       broadcastService = null;
@@ -23180,7 +23367,7 @@ var init_project_identity = __esm({
 });
 
 // ../core/src/central-core.ts
-import { EventEmitter as EventEmitter12 } from "node:events";
+import { EventEmitter as EventEmitter13 } from "node:events";
 import { createHash as createHash5, randomUUID as randomUUID10 } from "node:crypto";
 import { existsSync as existsSync9, statSync as statSync2 } from "node:fs";
 import { mkdir as mkdir4 } from "node:fs/promises";
@@ -23198,7 +23385,7 @@ var init_central_core = __esm({
     init_system_metrics();
     init_shared_mesh_state();
     init_project_identity();
-    CentralCore = class extends EventEmitter12 {
+    CentralCore = class extends EventEmitter13 {
       db = null;
       globalDir;
       initialized = false;
@@ -25369,10 +25556,10 @@ var init_central_core = __esm({
        */
       async generateProjectName(projectPath) {
         try {
-          const { execFile: execFile19 } = await import("node:child_process");
-          const { promisify: promisify50 } = await import("node:util");
-          const execFileAsync14 = promisify50(execFile19);
-          const { stdout } = await execFileAsync14(
+          const { execFile: execFile20 } = await import("node:child_process");
+          const { promisify: promisify51 } = await import("node:util");
+          const execFileAsync15 = promisify51(execFile20);
+          const { stdout } = await execFileAsync15(
             "git",
             ["remote", "get-url", "origin"],
             { cwd: projectPath, timeout: 5e3 }
@@ -26076,10 +26263,10 @@ var init_migration = __esm({
           return basename5(projectPath);
         }
         try {
-          const { execFile: execFile19 } = await import("node:child_process");
-          const { promisify: promisify50 } = await import("node:util");
-          const execFileAsync14 = promisify50(execFile19);
-          const { stdout } = await execFileAsync14(
+          const { execFile: execFile20 } = await import("node:child_process");
+          const { promisify: promisify51 } = await import("node:util");
+          const execFileAsync15 = promisify51(execFile20);
+          const { stdout } = await execFileAsync15(
             "git",
             ["remote", "get-url", "origin"],
             { cwd: projectPath, timeout: 1e3 }
@@ -36723,7 +36910,7 @@ var automation_store_exports = {};
 __export(automation_store_exports, {
   AutomationStore: () => AutomationStore
 });
-import { EventEmitter as EventEmitter13 } from "node:events";
+import { EventEmitter as EventEmitter14 } from "node:events";
 import { join as join16 } from "node:path";
 import { randomUUID as randomUUID12 } from "node:crypto";
 var import_cron_parser, CRON_TIMEZONE, AutomationStore;
@@ -36735,7 +36922,7 @@ var init_automation_store = __esm({
     init_db();
     init_project_root_guard();
     CRON_TIMEZONE = "UTC";
-    AutomationStore = class _AutomationStore extends EventEmitter13 {
+    AutomationStore = class _AutomationStore extends EventEmitter14 {
       constructor(rootDir, options) {
         super();
         this.rootDir = rootDir;
@@ -37827,13 +38014,13 @@ async function searchWithQmd(rootDir, options) {
   const command = "qmd";
   const limit = Math.max(1, Math.min(options.limit ?? 5, 20));
   try {
-    const { execFile: execFile19 } = await import("node:child_process");
-    const { promisify: promisify50 } = await import("node:util");
-    const execFileAsync14 = promisify50(execFile19);
-    await ensureQmdProjectMemoryCollection(rootDir, execFileAsync14);
+    const { execFile: execFile20 } = await import("node:child_process");
+    const { promisify: promisify51 } = await import("node:util");
+    const execFileAsync15 = promisify51(execFile20);
+    await ensureQmdProjectMemoryCollection(rootDir, execFileAsync15);
     scheduleQmdProjectMemoryRefresh(rootDir);
     const args = buildQmdSearchArgs(rootDir, options);
-    const { stdout } = await execFileAsync14(command, args, {
+    const { stdout } = await execFileAsync15(command, args, {
       cwd: rootDir,
       timeout: 4e3,
       maxBuffer: 1024 * 1024
@@ -37858,12 +38045,12 @@ async function searchWithQmd(rootDir, options) {
     return [];
   }
 }
-async function ensureQmdProjectMemoryCollection(rootDir, execFileAsync14) {
+async function ensureQmdProjectMemoryCollection(rootDir, execFileAsync15) {
   const collectionName = qmdMemoryCollectionName(rootDir);
   const memoryDir = memoryWorkspacePath(rootDir);
   await mkdir6(memoryDir, { recursive: true });
   try {
-    await execFileAsync14("qmd", buildQmdCollectionAddArgs(rootDir), {
+    await execFileAsync15("qmd", buildQmdCollectionAddArgs(rootDir), {
       cwd: rootDir,
       timeout: 4e3,
       maxBuffer: 512 * 1024
@@ -37879,9 +38066,9 @@ ${stderr}`)) {
   return collectionName;
 }
 async function getDefaultExecFileAsync() {
-  const { execFile: execFile19 } = await import("node:child_process");
-  const { promisify: promisify50 } = await import("node:util");
-  return promisify50(execFile19);
+  const { execFile: execFile20 } = await import("node:child_process");
+  const { promisify: promisify51 } = await import("node:util");
+  return promisify51(execFile20);
 }
 async function refreshQmdProjectMemoryIndex(rootDir, options) {
   const key = resolve8(rootDir);
@@ -37896,14 +38083,14 @@ async function refreshQmdProjectMemoryIndex(rootDir, options) {
     }
   }
   const promise = (async () => {
-    const execFileAsync14 = options?.execFileAsync ?? await getDefaultExecFileAsync();
-    await ensureQmdProjectMemoryCollection(rootDir, execFileAsync14);
-    await execFileAsync14("qmd", ["update"], {
+    const execFileAsync15 = options?.execFileAsync ?? await getDefaultExecFileAsync();
+    await ensureQmdProjectMemoryCollection(rootDir, execFileAsync15);
+    await execFileAsync15("qmd", ["update"], {
       cwd: rootDir,
       timeout: 3e4,
       maxBuffer: 1024 * 1024
     });
-    await execFileAsync14("qmd", ["embed"], {
+    await execFileAsync15("qmd", ["embed"], {
       cwd: rootDir,
       timeout: 12e4,
       maxBuffer: 1024 * 1024
@@ -37939,12 +38126,12 @@ async function refreshQmdAgentMemoryIndex(rootDir, agentId, options) {
     }
   }
   const promise = (async () => {
-    const execFileAsync14 = options?.execFileAsync ?? await getDefaultExecFileAsync();
+    const execFileAsync15 = options?.execFileAsync ?? await getDefaultExecFileAsync();
     const { agentMemoryWorkspacePath: agentMemoryWorkspacePath2 } = await Promise.resolve().then(() => (init_memory_dreams(), memory_dreams_exports));
     const workspacePath = agentMemoryWorkspacePath2(rootDir, agentId);
     await mkdir6(workspacePath, { recursive: true });
     try {
-      await execFileAsync14("qmd", ["collection", "add", workspacePath, "--name", qmdAgentMemoryCollectionName(rootDir, agentId), "--mask", "**/*.md"], {
+      await execFileAsync15("qmd", ["collection", "add", workspacePath, "--name", qmdAgentMemoryCollectionName(rootDir, agentId), "--mask", "**/*.md"], {
         cwd: rootDir,
         timeout: 4e3,
         maxBuffer: 512 * 1024
@@ -37957,8 +38144,8 @@ ${stderr}`)) {
         throw err;
       }
     }
-    await execFileAsync14("qmd", ["update"], { cwd: rootDir, timeout: 3e4, maxBuffer: 1024 * 1024 });
-    await execFileAsync14("qmd", ["embed"], { cwd: rootDir, timeout: 12e4, maxBuffer: 1024 * 1024 });
+    await execFileAsync15("qmd", ["update"], { cwd: rootDir, timeout: 3e4, maxBuffer: 1024 * 1024 });
+    await execFileAsync15("qmd", ["embed"], { cwd: rootDir, timeout: 12e4, maxBuffer: 1024 * 1024 });
   })();
   qmdAgentRefreshState.set(key, { lastStartedAt: now, inFlight: promise });
   try {
@@ -37979,8 +38166,8 @@ function scheduleQmdAgentMemoryRefresh(rootDir, agentId) {
 }
 async function isQmdAvailable() {
   try {
-    const execFileAsync14 = await getDefaultExecFileAsync();
-    await execFileAsync14("qmd", ["--help"], {
+    const execFileAsync15 = await getDefaultExecFileAsync();
+    await execFileAsync15("qmd", ["--help"], {
       timeout: 3e3,
       maxBuffer: 128 * 1024
     });
@@ -37990,12 +38177,12 @@ async function isQmdAvailable() {
   }
 }
 async function installQmd(options) {
-  const execFileAsync14 = options?.execFileAsync ?? await getDefaultExecFileAsync();
+  const execFileAsync15 = options?.execFileAsync ?? await getDefaultExecFileAsync();
   const [command, ...args] = QMD_INSTALL_COMMAND.split(" ");
   if (!command || args.length === 0) {
     throw new MemoryBackendError("BACKEND_UNAVAILABLE", "qmd install command is not configured", "qmd");
   }
-  await execFileAsync14(command, args, {
+  await execFileAsync15(command, args, {
     timeout: 12e4,
     maxBuffer: 1024 * 1024
   });
@@ -39646,7 +39833,7 @@ var init_task_id_integrity = __esm({
 });
 
 // ../core/src/store.ts
-import { EventEmitter as EventEmitter14 } from "node:events";
+import { EventEmitter as EventEmitter15 } from "node:events";
 import { randomUUID as randomUUID15 } from "node:crypto";
 import { mkdir as mkdir7, readdir as readdir5, readFile as readFile8, writeFile as writeFile6, rename as rename4, unlink as unlink3 } from "node:fs/promises";
 import { join as join19 } from "node:path";
@@ -39978,6 +40165,7 @@ var init_store = __esm({
     init_research_store();
     init_experiment_session_store();
     init_todo_store();
+    init_goal_store();
     init_eval_store();
     init_migration();
     init_central_core();
@@ -40171,7 +40359,7 @@ var init_store = __esm({
         this.name = "HandoffInvariantViolationError";
       }
     };
-    TaskStore = class _TaskStore extends EventEmitter14 {
+    TaskStore = class _TaskStore extends EventEmitter15 {
       constructor(rootDir, globalSettingsDir, options) {
         super();
         this.rootDir = rootDir;
@@ -40303,6 +40491,8 @@ var init_store = __esm({
       experimentSessionStore = null;
       /** Cached TodoStore instance */
       todoStore = null;
+      /** Cached GoalStore instance */
+      goalStore = null;
       /** Cached EvalStore instance */
       evalStore = null;
       /** Cached SecretsStore instance */
@@ -42686,9 +42876,9 @@ ${outcome}`;
         if (validation.invalid.length > 0) {
           if (this.isWatching) this.taskCache.delete(id);
           this.deleteTaskById(id);
-          const { rm: rm9 } = await import("node:fs/promises");
+          const { rm: rm10 } = await import("node:fs/promises");
           if (existsSync15(dir)) {
-            await rm9(dir, { recursive: true, force: true });
+            await rm10(dir, { recursive: true, force: true });
           }
           throw new InvalidFileScopeError(id, validation.invalid);
         }
@@ -42783,10 +42973,10 @@ ${outcome}`;
             });
             if (this.isWatching) this.taskCache.delete(task.id);
             this.deleteTaskById(task.id);
-            const { rm: rm9 } = await import("node:fs/promises");
+            const { rm: rm10 } = await import("node:fs/promises");
             const taskDir = this.taskDir(task.id);
             if (existsSync15(taskDir)) {
-              await rm9(taskDir, { recursive: true, force: true });
+              await rm10(taskDir, { recursive: true, force: true });
             }
             throw new TombstonedTaskResurrectionError(
               tombstonedMatch.id,
@@ -45803,8 +45993,8 @@ ${newTask.description}
             this.db.prepare("DELETE FROM tasks WHERE id = ?").run(id);
             this.db.bumpLastModified();
           });
-          const { rm: rm9 } = await import("node:fs/promises");
-          await rm9(dir, { recursive: true, force: true });
+          const { rm: rm10 } = await import("node:fs/promises");
+          await rm10(dir, { recursive: true, force: true });
           if (this.isWatching) {
             this.taskCache.delete(id);
           }
@@ -47213,14 +47403,14 @@ ${newTask.description}
         if (rows.length === 0) {
           return;
         }
-        const { rm: rm9 } = await import("node:fs/promises");
+        const { rm: rm10 } = await import("node:fs/promises");
         for (const row of rows) {
           const task = this.rowToTask(row);
           const archivedAt = task.columnMovedAt ?? task.updatedAt ?? (/* @__PURE__ */ new Date()).toISOString();
           const entry = await this.taskToArchiveEntry(task, archivedAt);
           this.archiveDb.upsert(entry);
           this.db.prepare("DELETE FROM tasks WHERE id = ?").run(task.id);
-          await rm9(this.taskDir(task.id), { recursive: true, force: true });
+          await rm10(this.taskDir(task.id), { recursive: true, force: true });
           if (this.isWatching) {
             this.taskCache.delete(task.id);
           }
@@ -47247,8 +47437,8 @@ ${newTask.description}
           this.archiveDb.upsert(entry);
           this.db.prepare("DELETE FROM tasks WHERE id = ?").run(task.id);
           this.db.bumpLastModified();
-          const { rm: rm9 } = await import("node:fs/promises");
-          await rm9(dir, { recursive: true, force: true });
+          const { rm: rm10 } = await import("node:fs/promises");
+          await rm10(dir, { recursive: true, force: true });
           if (this.isWatching) {
             this.taskCache.delete(task.id);
           }
@@ -47982,6 +48172,16 @@ ${notificationsSection}`;
         }
         return this.todoStore;
       }
+      /**
+       * Get the GoalStore instance for project-scoped goals operations.
+       * Lazily initializes the GoalStore on first access.
+       */
+      getGoalStore() {
+        if (!this.goalStore) {
+          this.goalStore = new GoalStore(this.fusionDir, this.db);
+        }
+        return this.goalStore;
+      }
       /**
        * Get the EvalStore instance for eval run and task result operations.
        * Lazily initializes the EvalStore on first access.
@@ -49179,8 +49379,11 @@ function describeAbortReason(reason) {
   if (typeof reason === "string") return reason;
   return "aborted";
 }
+function shouldAutoAppendJsonFlag(args) {
+  return args[0] !== "api" && !args.includes("--json");
+}
 function runGhJson(args, cwd) {
-  const jsonArgs = args.includes("--json") ? args : [...args, "--json"];
+  const jsonArgs = shouldAutoAppendJsonFlag(args) ? [...args, "--json"] : args;
   const output = runGh(jsonArgs, cwd);
   try {
     return JSON.parse(output);
@@ -49189,7 +49392,7 @@ function runGhJson(args, cwd) {
   }
 }
 async function runGhJsonAsync(args, cwdOrOptions) {
-  const jsonArgs = args.includes("--json") ? args : [...args, "--json"];
+  const jsonArgs = shouldAutoAppendJsonFlag(args) ? [...args, "--json"] : args;
   const output = await runGhAsync(jsonArgs, cwdOrOptions);
   try {
     return JSON.parse(output);
@@ -49789,7 +49992,7 @@ var routine_store_exports = {};
 __export(routine_store_exports, {
   RoutineStore: () => RoutineStore
 });
-import { EventEmitter as EventEmitter15 } from "node:events";
+import { EventEmitter as EventEmitter16 } from "node:events";
 import { randomUUID as randomUUID16 } from "node:crypto";
 var import_cron_parser2, CRON_TIMEZONE2, RoutineStore;
 var init_routine_store = __esm({
@@ -49800,7 +50003,7 @@ var init_routine_store = __esm({
     init_routine();
     init_project_root_guard();
     CRON_TIMEZONE2 = "UTC";
-    RoutineStore = class _RoutineStore extends EventEmitter15 {
+    RoutineStore = class _RoutineStore extends EventEmitter16 {
       constructor(rootDir, options) {
         super();
         this.rootDir = rootDir;
@@ -50402,7 +50605,7 @@ import { basename as basename8, dirname as dirname7, extname, isAbsolute as isAb
 import { stat as stat3 } from "node:fs/promises";
 import { copyFile } from "node:fs/promises";
 import { pathToFileURL } from "node:url";
-import { EventEmitter as EventEmitter16 } from "node:events";
+import { EventEmitter as EventEmitter17 } from "node:events";
 var MINIMUM_FUSION_VERSION, moduleImportVersion, PluginLoader;
 var init_plugin_loader = __esm({
   "../core/src/plugin-loader.ts"() {
@@ -50413,7 +50616,7 @@ var init_plugin_loader = __esm({
     init_plugin_security_scan();
     MINIMUM_FUSION_VERSION = "0.1.0";
     moduleImportVersion = 0;
-    PluginLoader = class extends EventEmitter16 {
+    PluginLoader = class extends EventEmitter17 {
       constructor(options) {
         super();
         this.options = options;
@@ -55965,15 +56168,15 @@ var require_fd_slicer = __commonJS({
     var Writable = stream.Writable;
     var PassThrough = stream.PassThrough;
     var Pend = require_pend();
-    var EventEmitter34 = __require("events").EventEmitter;
+    var EventEmitter35 = __require("events").EventEmitter;
     exports.createFromBuffer = createFromBuffer;
     exports.createFromFd = createFromFd;
     exports.BufferSlicer = BufferSlicer;
     exports.FdSlicer = FdSlicer;
-    util.inherits(FdSlicer, EventEmitter34);
+    util.inherits(FdSlicer, EventEmitter35);
     function FdSlicer(fd, options) {
       options = options || {};
-      EventEmitter34.call(this);
+      EventEmitter35.call(this);
       this.fd = fd;
       this.pend = new Pend();
       this.pend.max = 1;
@@ -56117,9 +56320,9 @@ var require_fd_slicer = __commonJS({
       this.destroyed = true;
       this.context.unref();
     };
-    util.inherits(BufferSlicer, EventEmitter34);
+    util.inherits(BufferSlicer, EventEmitter35);
     function BufferSlicer(buffer, options) {
-      EventEmitter34.call(this);
+      EventEmitter35.call(this);
       options = options || {};
       this.refCount = 0;
       this.buffer = buffer;
@@ -56531,7 +56734,7 @@ var require_yauzl = __commonJS({
     var fd_slicer = require_fd_slicer();
     var crc32 = require_buffer_crc32();
     var util = __require("util");
-    var EventEmitter34 = __require("events").EventEmitter;
+    var EventEmitter35 = __require("events").EventEmitter;
     var Transform = __require("stream").Transform;
     var PassThrough = __require("stream").PassThrough;
     var Writable = __require("stream").Writable;
@@ -56663,10 +56866,10 @@ var require_yauzl = __commonJS({
         callback(new Error("end of central directory record signature not found"));
       });
     }
-    util.inherits(ZipFile, EventEmitter34);
+    util.inherits(ZipFile, EventEmitter35);
     function ZipFile(reader, centralDirectoryOffset, fileSize, entryCount, comment, autoClose, lazyEntries, decodeStrings, validateEntrySizes, strictFileNames) {
       var self = this;
-      EventEmitter34.call(self);
+      EventEmitter35.call(self);
       self.reader = reader;
       self.reader.on("error", function(err) {
         emitError(self, err);
@@ -57027,9 +57230,9 @@ var require_yauzl = __commonJS({
       }
       cb();
     };
-    util.inherits(RandomAccessReader, EventEmitter34);
+    util.inherits(RandomAccessReader, EventEmitter35);
     function RandomAccessReader() {
-      EventEmitter34.call(this);
+      EventEmitter35.call(this);
       this.refCount = 0;
     }
     RandomAccessReader.prototype.ref = function() {
@@ -57160,11 +57363,11 @@ var require_extract_zip = __commonJS({
     var { createWriteStream, promises: fs6 } = __require("fs");
     var getStream = require_get_stream();
     var path6 = __require("path");
-    var { promisify: promisify50 } = __require("util");
+    var { promisify: promisify51 } = __require("util");
     var stream = __require("stream");
     var yauzl = require_yauzl();
-    var openZip = promisify50(yauzl.open);
-    var pipeline = promisify50(stream.pipeline);
+    var openZip = promisify51(yauzl.open);
+    var pipeline = promisify51(stream.pipeline);
     var Extractor = class {
       constructor(zipPath, opts) {
         this.zipPath = zipPath;
@@ -57246,7 +57449,7 @@ var require_extract_zip = __commonJS({
         await fs6.mkdir(destDir, mkdirOptions);
         if (isDir) return;
         debug("opening read stream", dest);
-        const readStream = await promisify50(this.zipfile.openReadStream.bind(this.zipfile))(entry);
+        const readStream = await promisify51(this.zipfile.openReadStream.bind(this.zipfile))(entry);
         if (symlink) {
           const link = await getStream(readStream);
           debug("creating symlink", link, dest);
@@ -68267,14 +68470,14 @@ var init_agent_companies_exporter = __esm({
 });
 
 // ../core/src/chat-store.ts
-import { EventEmitter as EventEmitter17 } from "node:events";
+import { EventEmitter as EventEmitter18 } from "node:events";
 import { randomUUID as randomUUID19 } from "node:crypto";
 var ChatStore;
 var init_chat_store = __esm({
   "../core/src/chat-store.ts"() {
     "use strict";
     init_db();
-    ChatStore = class extends EventEmitter17 {
+    ChatStore = class extends EventEmitter18 {
       constructor(fusionDir, db) {
         super();
         this.fusionDir = fusionDir;
@@ -69366,6 +69569,7 @@ var init_secrets_sync = __esm({
 // ../core/src/index.ts
 var src_exports = {};
 __export(src_exports, {
+  ACTIVE_GOAL_LIMIT: () => ACTIVE_GOAL_LIMIT,
   AGENT_PERMISSIONS: () => AGENT_PERMISSIONS,
   AGENT_PERMISSION_POLICY_ACTION_CATEGORIES: () => AGENT_PERMISSION_POLICY_ACTION_CATEGORIES,
   AGENT_PERMISSION_POLICY_CATEGORY_TOOL_EXAMPLES: () => AGENT_PERMISSION_POLICY_CATEGORY_TOOL_EXAMPLES,
@@ -69379,6 +69583,7 @@ __export(src_exports, {
   AUTOPILOT_STATES: () => AUTOPILOT_STATES,
   AUTO_RECOVERY_MODES: () => AUTO_RECOVERY_MODES,
   AUTO_SUMMARIZE_SCHEDULE_NAME: () => AUTO_SUMMARIZE_SCHEDULE_NAME,
+  ActiveGoalLimitExceededError: () => ActiveGoalLimitExceededError,
   AgentCompaniesParseError: () => AgentCompaniesParseError,
   AgentStore: () => AgentStore,
   AiServiceError: () => AiServiceError,
@@ -69472,6 +69677,7 @@ __export(src_exports, {
   FirstRunDetector: () => FirstRunDetector,
   GLOBAL_SETTINGS_KEYS: () => GLOBAL_SETTINGS_KEYS,
   GlobalSettingsStore: () => GlobalSettingsStore,
+  GoalStore: () => GoalStore,
   HIGH_FANOUT_BLOCKER_TODO_THRESHOLD: () => HIGH_FANOUT_BLOCKER_TODO_THRESHOLD,
   HandoffInvariantViolationError: () => HandoffInvariantViolationError,
   INSIGHT_EXTRACTION_SCHEDULE_NAME: () => INSIGHT_EXTRACTION_SCHEDULE_NAME,
@@ -69506,6 +69712,7 @@ __export(src_exports, {
   MEMORY_LONG_TERM_FILENAME: () => MEMORY_LONG_TERM_FILENAME,
   MEMORY_WORKING_PATH: () => MEMORY_WORKING_PATH,
   MEMORY_WORKSPACE_PATH: () => MEMORY_WORKSPACE_PATH,
+  MERGER_MODES: () => MERGER_MODES,
   MERGE_ADVANCE_AUTO_SYNC_MODES: () => MERGE_ADVANCE_AUTO_SYNC_MODES,
   MERGE_AUDIT_AUTO_RECOVERY_MODES: () => MERGE_AUDIT_AUTO_RECOVERY_MODES,
   MERGE_COMMIT_SUMMARIZE_SYSTEM_PROMPT: () => MERGE_COMMIT_SUMMARIZE_SYSTEM_PROMPT,
@@ -69853,6 +70060,7 @@ __export(src_exports, {
   normalizeMergeConflictStrategy: () => normalizeMergeConflictStrategy,
   normalizeMergeIntegrationWorktreeMode: () => normalizeMergeIntegrationWorktreeMode,
   normalizeMergeStrategyOverlapBehavior: () => normalizeMergeStrategyOverlapBehavior,
+  normalizeMergerMode: () => normalizeMergerMode,
   normalizeMessageParticipant: () => normalizeMessageParticipant,
   normalizePermissions: () => normalizePermissions,
   normalizePluginUiContributionDefinition: () => normalizePluginUiContributionDefinition,
@@ -70110,6 +70318,8 @@ var init_src = __esm({
     init_task_priority();
     init_mission_types();
     init_mission_store();
+    init_goal_types();
+    init_goal_store();
     init_central_core();
     init_central_db();
     init_node_connection();
@@ -70623,6 +70833,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",
@@ -70740,15 +70952,15 @@ function evaluateAgentActionGate(params) {
   let resourceId;
   if (params.toolName === "bash") {
     const command = extractShellCommand(args);
-    const git2 = classifyGitCommand(command);
-    if (git2?.write) {
+    const git3 = classifyGitCommand(command);
+    if (git3?.write) {
       category = "git_write";
-      operation = git2.operation;
+      operation = git3.operation;
       resourceType = "git";
     } else {
       category = "command_execution";
-      operation = git2?.operation ?? "shell command";
-      resourceType = git2 ? "git" : "command";
+      operation = git3?.operation ?? "shell command";
+      resourceType = git3 ? "git" : "command";
     }
   } else if (params.toolName === "write" || params.toolName === "edit") {
     category = "file_write_delete";
@@ -71988,8 +72200,8 @@ var init_context_limit_detector = __esm({
 import { existsSync as existsSync24, readFileSync as readFileSync8 } from "node:fs";
 import { homedir as homedir5 } from "node:os";
 import { join as join29 } from "node:path";
-import { AuthStorage } from "@mariozechner/pi-coding-agent";
-import { getOAuthProvider } from "@mariozechner/pi-ai/oauth";
+import { AuthStorage } from "@earendil-works/pi-coding-agent";
+import { getOAuthProvider } from "@earendil-works/pi-ai/oauth";
 function getHomeDir5() {
   return process.env.HOME || process.env.USERPROFILE || homedir5();
 }
@@ -72398,7 +72610,7 @@ import {
   ModelRegistry,
   SessionManager,
   SettingsManager
-} from "@mariozechner/pi-coding-agent";
+} from "@earendil-works/pi-coding-agent";
 function normalizeRtkRewriteOptions(options) {
   const modeEnv = process.env.FUSION_RTK_REWRITE?.toLowerCase();
   const envMode = modeEnv === "1" || modeEnv === "true" || modeEnv === "rewrite" ? "rewrite" : "off";
@@ -74928,9 +75140,9 @@ var init_web_search_provider = __esm({
             if (!isRetryableHttp || attempt >= RETRY_MAX_ATTEMPTS) {
               break;
             }
-            const delay4 = Math.min(RETRY_BASE_DELAY_MS * 2 ** (attempt - 1), RETRY_MAX_DELAY_MS);
-            const jitter = delay4 * (Math.random() * 0.2 - 0.1);
-            const totalDelay = Math.max(0, delay4 + jitter);
+            const delay5 = Math.min(RETRY_BASE_DELAY_MS * 2 ** (attempt - 1), RETRY_MAX_DELAY_MS);
+            const jitter = delay5 * (Math.random() * 0.2 - 0.1);
+            const totalDelay = Math.max(0, delay5 + jitter);
             log9.warn(`retrying ${backend} search`, { attempt, totalDelay });
             await sleep2(totalDelay, signal);
           }
@@ -75384,7 +75596,7 @@ import { appendFile as appendFile3, mkdir as mkdir12, readFile as readFile14, re
 import { existsSync as existsSync26 } from "node:fs";
 import { createHash as createHash8 } from "node:crypto";
 import { join as join33, relative as relative6, resolve as resolve17 } from "node:path";
-import { Type } from "@mariozechner/pi-ai";
+import { Type } from "@earendil-works/pi-ai";
 function sanitizeAgentMemoryId(agentId) {
   return agentId.trim().replace(/[^a-zA-Z0-9._-]+/g, "-").replace(/^-+|-+$/g, "") || "agent";
 }
@@ -75554,11 +75766,11 @@ async function refreshAgentMemoryQmdIndex(rootDir, agentMemory) {
     return;
   }
   const promise = (async () => {
-    const { execFile: execFile19 } = await import("node:child_process");
-    const { promisify: promisify50 } = await import("node:util");
-    const execFileAsync14 = promisify50(execFile19);
+    const { execFile: execFile20 } = await import("node:child_process");
+    const { promisify: promisify51 } = await import("node:util");
+    const execFileAsync15 = promisify51(execFile20);
     try {
-      await execFileAsync14("qmd", buildQmdAgentMemoryCollectionAddArgs(rootDir, agentMemory.agentId), {
+      await execFileAsync15("qmd", buildQmdAgentMemoryCollectionAddArgs(rootDir, agentMemory.agentId), {
         cwd: rootDir,
         timeout: 4e3,
         maxBuffer: 512 * 1024
@@ -75571,8 +75783,8 @@ ${stderr}`)) {
         throw error;
       }
     }
-    await execFileAsync14("qmd", ["update"], { cwd: rootDir, timeout: 3e4, maxBuffer: 1024 * 1024 });
-    await execFileAsync14("qmd", ["embed"], { cwd: rootDir, timeout: 12e4, maxBuffer: 1024 * 1024 });
+    await execFileAsync15("qmd", ["update"], { cwd: rootDir, timeout: 3e4, maxBuffer: 1024 * 1024 });
+    await execFileAsync15("qmd", ["embed"], { cwd: rootDir, timeout: 12e4, maxBuffer: 1024 * 1024 });
   })();
   agentQmdRefreshState.set(key, { lastStartedAt: now, inFlight: promise });
   try {
@@ -75627,10 +75839,10 @@ async function searchAgentMemoryWithQmd(rootDir, agentMemory, query, limit) {
   }
   try {
     await refreshAgentMemoryQmdIndex(rootDir, agentMemory);
-    const { execFile: execFile19 } = await import("node:child_process");
-    const { promisify: promisify50 } = await import("node:util");
-    const execFileAsync14 = promisify50(execFile19);
-    const { stdout } = await execFileAsync14("qmd", buildQmdAgentMemorySearchArgs(rootDir, agentMemory.agentId, query, limit), {
+    const { execFile: execFile20 } = await import("node:child_process");
+    const { promisify: promisify51 } = await import("node:util");
+    const execFileAsync15 = promisify51(execFile20);
+    const { stdout } = await execFileAsync15("qmd", buildQmdAgentMemorySearchArgs(rootDir, agentMemory.agentId, query, limit), {
       cwd: rootDir,
       timeout: 4e3,
       maxBuffer: 1024 * 1024
@@ -79134,6 +79346,24 @@ var init_webhook_provider = __esm({
   }
 });
 
+// ../engine/src/transient-merge-error-classifier.ts
+function classifyTransientMergeError(error) {
+  if (!error) return null;
+  if (/lease-handoff-failed[^a-z]+target-not-queued/i.test(error)) {
+    return "lease-handoff-target-not-queued";
+  }
+  const sameSha = error.match(/advanced concurrently \(expected ([0-9a-f]{7,40}),\s+observed ([0-9a-f]{7,40})\)/i);
+  if (sameSha && sameSha[1].toLowerCase() === sameSha[2].toLowerCase()) {
+    return "spurious-concurrent-advance-same-sha";
+  }
+  return null;
+}
+var init_transient_merge_error_classifier = __esm({
+  "../engine/src/transient-merge-error-classifier.ts"() {
+    "use strict";
+  }
+});
+
 // ../engine/src/notification/notification-service.ts
 var NotificationService;
 var init_notification_service = __esm({
@@ -79142,6 +79372,7 @@ var init_notification_service = __esm({
     init_src();
     init_notifier();
     init_logger2();
+    init_transient_merge_error_classifier();
     init_ntfy_provider();
     init_webhook_provider();
     NotificationService = class {
@@ -79243,6 +79474,14 @@ var init_notification_service = __esm({
           return;
         }
         if (task.status === "failed") {
+          const transientClass = classifyTransientMergeError(task.error);
+          if (transientClass) {
+            this.failureNotificationSuppressedCount += 1;
+            schedulerLog.log(
+              `[notify] ${task.id} transient merge failure (${transientClass}) \u2014 suppressed notification (self-heal in flight)`
+            );
+            return;
+          }
           if (this.failureNotificationMode === "all") {
             this.maybeNotify(task.id, "failed", this.createTaskPayload(task, "failed"));
           } else {
@@ -79559,6 +79798,14 @@ var init_notification_service = __esm({
           schedulerLog.log(`[notify] ${taskId} no longer failed at dispatch time \u2014 suppressed notification`);
           return;
         }
+        const transientClassAtDispatch = classifyTransientMergeError(task.error);
+        if (transientClassAtDispatch) {
+          this.failureNotificationSuppressedCount += 1;
+          schedulerLog.log(
+            `[notify] ${taskId} transient merge failure (${transientClassAtDispatch}) at dispatch time \u2014 suppressed notification (self-heal in flight)`
+          );
+          return;
+        }
         const isTerminal = task.paused === true || task.column === "in-review";
         if (this.failureNotificationMode === "terminal-only" && !isTerminal) {
           this.failureNotificationSuppressedCount += 1;
@@ -79811,6 +80058,19 @@ function truncateNtfyMessage(message) {
   }
   return best;
 }
+function ntfyPriorityToInt(priority) {
+  switch (priority) {
+    case "low":
+      return 2;
+    case "high":
+      return 4;
+    case "urgent":
+      return 5;
+    case "default":
+    default:
+      return 3;
+  }
+}
 function resolveNtfyEvents(events) {
   return events ? [...events] : [...DEFAULT_NTFY_EVENTS];
 }
@@ -79860,10 +80120,10 @@ async function sendNtfyNotificationWithResult({
     const truncatedMessage = truncateNtfyMessage(message);
     const latin1Safe = isLatin1Safe(truncatedTitle) && isLatin1Safe(truncatedMessage);
     const headers = {
-      Priority: priority,
       "Content-Type": latin1Safe ? "text/plain" : "application/json"
     };
     if (latin1Safe) {
+      headers.Priority = priority;
       headers.Title = truncatedTitle;
       if (clickUrl) {
         headers.Click = clickUrl;
@@ -79879,7 +80139,7 @@ async function sendNtfyNotificationWithResult({
         topic,
         title: truncatedTitle,
         message: truncatedMessage,
-        priority,
+        priority: ntfyPriorityToInt(priority),
         ...clickUrl ? { click: clickUrl } : {}
       }),
       signal
@@ -85151,11 +85411,11 @@ var init_step_session_executor = __esm({
             }
             if (attempt > 0) {
               retries++;
-              const delay4 = RETRY_DELAYS_MS[attempt - 1] ?? 15e3;
+              const delay5 = RETRY_DELAYS_MS[attempt - 1] ?? 15e3;
               stepExecLog.log(
-                `Step ${stepIndex} retry ${attempt}/${MAX_STEP_RETRIES} (delay=${delay4}ms) for task ${taskDetail.id}`
+                `Step ${stepIndex} retry ${attempt}/${MAX_STEP_RETRIES} (delay=${delay5}ms) for task ${taskDetail.id}`
               );
-              await sleep3(delay4);
+              await sleep3(delay5);
             }
             const agentLogger = new AgentLogger({
               store: this.store,
@@ -85921,9 +86181,9 @@ async function withRateLimitRetry(fn2, options = {}) {
       }
       const rawDelay = Math.min(baseDelayMs * 2 ** attempt, maxDelayMs);
       const jitter = rawDelay * 0.1 * (2 * Math.random() - 1);
-      const delay4 = Math.max(0, Math.round(rawDelay + jitter));
-      onRetry?.(attempt + 1, delay4, error);
-      await sleep4(delay4, signal);
+      const delay5 = Math.max(0, Math.round(rawDelay + jitter));
+      onRetry?.(attempt + 1, delay5, error);
+      await sleep4(delay5, signal);
     }
   }
   throw lastError ?? new Error("withRateLimitRetry: unexpected state");
@@ -88993,10 +89253,13 @@ function decideAutoPrerebase(input) {
   if (hotMatches.length > 0) {
     return { fire: true, reason: "hot-file", commitsBehind, hotMatches };
   }
-  const threshold = input.settings.prerebaseDivergenceThreshold ?? 0;
-  if (threshold > 0 && commitsBehind > threshold) {
+  const threshold = input.settings.prerebaseDivergenceThreshold ?? 1;
+  if (threshold > 0 && commitsBehind >= threshold) {
     return { fire: true, reason: "divergence-threshold", commitsBehind, hotMatches: [] };
   }
+  if (commitsBehind > 0) {
+    return { fire: true, reason: "safety-fallback-any-divergence", commitsBehind, hotMatches: [] };
+  }
   return { fire: false, reason: "no-divergence", commitsBehind, hotMatches: [] };
 }
 async function runAutoPrerebase(deps) {
@@ -90914,12 +91177,22 @@ async function advanceIntegrationBranchRef(args) {
     return { advanced: true, previousSha: expectedCurrentSha, newSha };
   } catch (error) {
     const diagnostic = error instanceof Error ? error.message : String(error);
-    const lower = diagnostic.toLowerCase();
-    const isConcurrent = lower.includes("cannot lock ref") || lower.includes("is at") || lower.includes("expected");
-    const reason = isConcurrent ? "concurrent-advance" : "ref-update-refused";
+    let postFailureCurrentSha;
+    try {
+      const { stdout: postStdout } = await testHooks.runGit(
+        ["rev-parse", "--verify", ref],
+        rootDir
+      );
+      postFailureCurrentSha = postStdout.trim() || void 0;
+    } catch {
+      postFailureCurrentSha = observedCurrentSha;
+    }
+    const effectiveObserved = postFailureCurrentSha || observedCurrentSha;
+    const refMoved = !!effectiveObserved && effectiveObserved !== expectedCurrentSha;
+    const reason = refMoved ? "concurrent-advance" : "ref-update-refused";
     await emitRefAdvance({
       succeeded: false,
-      fromSha: observedCurrentSha || expectedCurrentSha,
+      fromSha: effectiveObserved || expectedCurrentSha,
       toSha: newSha,
       error: `${reason}: ${diagnostic}`
     });
@@ -90927,7 +91200,7 @@ async function advanceIntegrationBranchRef(args) {
       advanced: false,
       reason,
       diagnostic,
-      observedCurrentSha
+      observedCurrentSha: effectiveObserved
     };
   }
 }
@@ -91404,6 +91677,7 @@ __export(merger_exports, {
   VERIFICATION_LOG_MAX_CHARS: () => VERIFICATION_LOG_MAX_CHARS,
   VerificationError: () => VerificationError,
   __executePostMergeScriptStepForTests: () => __executePostMergeScriptStepForTests,
+  __testOnlyBuildDeterministicMergeMessage: () => buildDeterministicMergeMessage,
   __test__: () => __test__,
   aiMergeTask: () => aiMergeTask,
   applyAutostashBySha: () => applyAutostashBySha,
@@ -91417,6 +91691,7 @@ __export(merger_exports, {
   classifyConflict: () => classifyConflict,
   classifyOwnedLandedEvidence: () => classifyOwnedLandedEvidence,
   commitOrAmendMergeWithFixes: () => commitOrAmendMergeWithFixes,
+  composeMergeCommitBody: () => composeMergeCommitBody,
   deriveDeterministicSubjectSummary: () => deriveDeterministicSubjectSummary,
   deriveScopedPnpmTestCommand: () => deriveScopedPnpmTestCommand,
   detectResolvableConflicts: () => detectResolvableConflicts,
@@ -93906,6 +94181,23 @@ async function generateAiMergeSummary(commitLog, diffStat, settings, rootDir) {
     return null;
   }
 }
+async function generateAiMergeBody(commitLog, diffStat, settings, rootDir, branch, taskId, signal) {
+  const cleanStat = diffStat.trim();
+  if (!cleanStat) return null;
+  try {
+    const resolved = resolveTitleSummarizerSettingsModel(settings);
+    return await summarizeCommitBody(cleanStat, rootDir, resolved.provider, resolved.modelId, {
+      branch,
+      taskId,
+      commitLog,
+      signal
+    });
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    mergerLog.warn(`AI merge body failed; using deterministic fallback (${message})`);
+    return null;
+  }
+}
 async function generateAiMergeSubject(commitLog, diffStat, settings, rootDir, branch, taskId, signal) {
   try {
     const resolved = resolveTitleSummarizerSettingsModel(settings);
@@ -93973,22 +94265,43 @@ function deriveDeterministicSubjectSummary(commitLog) {
   const summary = extras > 0 ? `${headline} (+${extras} more)` : headline;
   return summary;
 }
-async function buildDeterministicMergeMessage(params) {
-  const { taskId, branch, commitLog, diffStat, includeTaskId, aiSummary, aiSubject } = params;
-  const prefix = includeTaskId ? `feat(${taskId})` : "feat";
-  const trimmedAiSubject = aiSubject?.trim() ?? "";
-  const derived = trimmedAiSubject.length === 0 ? deriveDeterministicSubjectSummary(commitLog ?? "") : null;
-  const subjectSummary = trimmedAiSubject.length > 0 ? trimmedAiSubject : derived ?? `merge ${branch}`;
-  const subject = `${prefix}: ${subjectSummary}`;
+function composeMergeCommitBody(params) {
+  const { branch, commitLog, diffStat, aiSummary, aiBody } = params;
+  const trimmedSummary = aiSummary?.trim() ?? "";
+  const trimmedAiBody = aiBody?.trim() ?? "";
   const trimmedCommitLog = commitLog?.trim() ?? "";
   const trimmedDiffStat = diffStat?.trim() ?? "";
   const commitsSection = trimmedCommitLog.length > 0 ? trimmedCommitLog : `- merge ${branch}`;
-  const body = aiSummary?.trim().length ? aiSummary.trim() : [
+  const parts = [];
+  if (trimmedSummary.length > 0) parts.push(trimmedSummary);
+  if (trimmedAiBody.length > 0) parts.push(trimmedAiBody);
+  const deterministicFallback = [
     `Commits merged:
 ${commitsSection}`,
     trimmedDiffStat.length > 0 ? `Files changed:
 ${trimmedDiffStat}` : ""
   ].filter(Boolean).join("\n\n");
+  if (parts.length === 0) return deterministicFallback;
+  if (trimmedDiffStat.length > 0) {
+    parts.push(`Files changed:
+${trimmedDiffStat}`);
+  }
+  return parts.join("\n\n");
+}
+async function buildDeterministicMergeMessage(params) {
+  const { taskId, branch, commitLog, diffStat, includeTaskId, aiSummary, aiBody, aiSubject } = params;
+  const prefix = includeTaskId ? `feat(${taskId})` : "feat";
+  const trimmedAiSubject = aiSubject?.trim() ?? "";
+  const derived = trimmedAiSubject.length === 0 ? deriveDeterministicSubjectSummary(commitLog ?? "") : null;
+  const subjectSummary = trimmedAiSubject.length > 0 ? trimmedAiSubject : derived ?? `merge ${branch}`;
+  const subject = `${prefix}: ${subjectSummary}`;
+  const body = composeMergeCommitBody({
+    branch,
+    commitLog,
+    diffStat,
+    aiSummary,
+    aiBody
+  });
   const escape = (s3) => s3.replace(/(["\\$`])/g, "\\$1");
   return {
     subjectArg: `-m "${escape(subject)}"`,
@@ -94100,7 +94413,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,
@@ -94400,6 +94713,7 @@ ${msg}`;
       diffStat: messageDiffStat,
       includeTaskId,
       aiSummary,
+      aiBody,
       aiSubject
     });
     let lineageId;
@@ -97593,8 +97907,11 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
       mergerLog.log(`${taskId}: ${routeMessage}`);
       await store.appendAgentLog(taskId, routeMessage, "text", void 0, "merger");
     }
-    const aiMergeSummary = settings.useAiMergeCommitSummary ? await generateAiMergeSummary(commitLog, diffStat, settings, rootDir) : null;
-    const aiMergeSubject = settings.useAiMergeCommitSummary ? await generateAiMergeSubject(commitLog, diffStat, settings, rootDir, branch, taskId, options.signal) : null;
+    const [aiMergeSummary, aiMergeBody, aiMergeSubject] = settings.useAiMergeCommitSummary ? await Promise.all([
+      generateAiMergeSummary(commitLog, diffStat, settings, rootDir),
+      generateAiMergeBody(commitLog, diffStat, settings, rootDir, branch, taskId, options.signal),
+      generateAiMergeSubject(commitLog, diffStat, settings, rootDir, branch, taskId, options.signal)
+    ]) : [null, null, null];
     try {
       const scopeResult = await validateDiffScope(store, taskId, diffStat, settings.strictScopeEnforcement);
       for (const warning of scopeResult.warnings) {
@@ -97670,6 +97987,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
           commitLog,
           diffStat,
           aiSummary: aiMergeSummary,
+          aiBody: aiMergeBody,
           aiSubject: aiMergeSubject,
           includeTaskId,
           sourceIssueRef,
@@ -97827,6 +98145,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
                   settings,
                   options.signal,
                   aiMergeSummary,
+                  aiMergeBody,
                   aiMergeSubject,
                   verificationFixModifiedFiles,
                   store,
@@ -97958,6 +98277,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
                 settings,
                 options.signal,
                 aiMergeSummary,
+                aiMergeBody,
                 aiMergeSubject,
                 buildFixModifiedFiles,
                 store,
@@ -98268,6 +98588,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
       const recordedFilesChanged = mergeWasEmpty ? 0 : filesChanged;
       const recordedInsertions = mergeWasEmpty ? 0 : insertions;
       const recordedDeletions = mergeWasEmpty ? 0 : deletions;
+      const mergeConfirmedAtThisPoint = !reuseTaskWorktreeMerge;
       const mergeDetails = {
         commitSha: recordedSha,
         rebaseBaseSha: !mergeWasEmpty && rebaseMergeBaseSha ? rebaseMergeBaseSha : void 0,
@@ -98278,9 +98599,11 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
         noOpVerifiedShortCircuit,
         landedFilesAttributionRestricted,
         landedFilesCaptureFallback,
+        // Keep mergeDetails headline-only for dashboard cards; rich bullet body
+        // is used in the actual git commit message composition path.
         mergeCommitMessage: aiMergeSummary || commitLog,
         mergedAt: (/* @__PURE__ */ new Date()).toISOString(),
-        mergeConfirmed: true,
+        mergeConfirmed: mergeConfirmedAtThisPoint,
         mergeTargetBranch: mergeTarget.branch,
         mergeTargetSource: mergeTarget.source,
         resolutionStrategy: result.resolutionStrategy,
@@ -98374,6 +98697,19 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
           mergerLog.log(
             `${taskId}: ${integrationBranch2} advanced to ${worktreeHeadSha.slice(0, 8)} via update-ref; your checked-out worktree at ${projectRootDir} is now behind`
           );
+          try {
+            const currentTask = await store.getTask(taskId).catch(() => null);
+            const currentMergeDetails = currentTask?.mergeDetails;
+            if (currentMergeDetails && !currentMergeDetails.mergeConfirmed) {
+              await store.updateTask(taskId, {
+                mergeDetails: { ...currentMergeDetails, mergeConfirmed: true }
+              });
+            }
+          } catch (promoteErr) {
+            mergerLog.warn(
+              `${taskId}: failed to promote mergeConfirmed post-ref-advance: ${promoteErr instanceof Error ? promoteErr.message : String(promoteErr)}`
+            );
+          }
           const autoSyncMode = normalizeMergeAdvanceAutoSyncMode(settings.mergeAdvanceAutoSync);
           if (autoSyncMode !== "off") {
             try {
@@ -98738,6 +99074,7 @@ async function executeMergeAttempt(params, aiTracker) {
     commitLog,
     diffStat,
     aiSummary,
+    aiBody,
     aiSubject,
     includeTaskId,
     sourceIssueRef,
@@ -98855,6 +99192,7 @@ async function executeMergeAttempt(params, aiTracker) {
               diffStat,
               includeTaskId,
               aiSummary: safeBody,
+              aiBody: aiBody?.trim().length ? aiBody : safeBody,
               aiSubject
             });
             await enforceSquashFileScopeInvariant({
@@ -98996,6 +99334,7 @@ async function executeMergeAttempt(params, aiTracker) {
       commitLog,
       diffStat,
       aiSummary,
+      aiBody,
       aiSubject,
       includeTaskId,
       hasConflicts,
@@ -99048,6 +99387,7 @@ async function executeMergeAttempt(params, aiTracker) {
         diffStat: actualContext.diffStat || diffStat,
         includeTaskId,
         aiSummary,
+        aiBody,
         aiSubject
       });
       const trailerArg = buildTaskTrailerArgs(taskId);
@@ -99142,7 +99482,7 @@ async function attemptWithMixedSideStrategy(params, strategy, aiTracker) {
   }
 }
 async function finalizeSideStrategyAttempt(params, side, aiTracker) {
-  const { rootDir, branch, commitLog, diffStat, aiSummary, aiSubject, includeTaskId, sourceIssueRef, taskId, store, settings, testCommand, buildCommand: buildCommand2, testSource, buildSource } = params;
+  const { rootDir, branch, commitLog, diffStat, aiSummary, aiBody, aiSubject, includeTaskId, sourceIssueRef, taskId, store, settings, testCommand, buildCommand: buildCommand2, testSource, buildSource } = params;
   const staged = execSyncText("git diff --cached --quiet 2>&1; echo $?", {
     cwd: rootDir,
     encoding: "utf-8"
@@ -99183,7 +99523,8 @@ async function finalizeSideStrategyAttempt(params, side, aiTracker) {
     commitLog,
     diffStat,
     includeTaskId,
-    aiSummary: aiSummary?.trim().length ? aiSummary : safeBody,
+    aiSummary,
+    aiBody: aiBody?.trim().length ? aiBody : safeBody,
     aiSubject
   });
   await enforceSquashFileScopeInvariant({
@@ -99241,6 +99582,7 @@ async function runAiAgentForCommit(params) {
     commitLog,
     diffStat,
     aiSummary,
+    aiBody,
     aiSubject,
     includeTaskId,
     hasConflicts,
@@ -99462,7 +99804,8 @@ async function runAiAgentForCommit(params) {
           commitLog,
           diffStat,
           includeTaskId,
-          aiSummary: aiSummary?.trim().length ? aiSummary : safeBody,
+          aiSummary,
+          aiBody: aiBody?.trim().length ? aiBody : safeBody,
           aiSubject
         });
         await runDiffVolumeGate({
@@ -100287,7 +100630,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_STARVATION_DROPS, DEADLOCK_RECOVERY_COOLDOWN_MS, DEFAULT_STALE_MERGING_STATUS_MIN_AGE_MS, DEFAULT_STALE_MERGING_FANOUT_MIN_AGE_MS, DEFAULT_UNBACKED_MERGING_FANOUT_GRACE_MS, DURABLE_ERROR_RECOVERY_MAX_RETRIES, DURABLE_ERROR_RECOVERY_BASE_COOLDOWN_MS, DURABLE_ERROR_RECOVERY_MAX_COOLDOWN_MS, RUNNING_ON_INACTIVE_TASK_STALE_RUN_MS, SelfHealingManager;
+var log20, worktreeMetadataReconcileLog, execAsync27, yieldEventLoop2, DONE_TASK_INTEGRITY_SWEEP_LIMIT, BOARD_STALL_NOTIFICATION_COOLDOWN_MS, DB_CORRUPTION_NOTIFICATION_COOLDOWN_MS, STALE_ACTIVE_BRANCH_EXECUTION_GRACE_MS, COMPLETION_HANDOFF_LIMBO_GRACE_MS, MAX_COMPLETION_HANDOFF_LIMBO_RECOVERIES, APPROVED_TRIAGE_RECOVERY_GRACE_MS, STARVED_REFINEMENT_RECOVERY_GRACE_MS, STARVED_PEER_PROGRESS_THRESHOLD, STARVED_REFINEMENT_ESCALATION_COOLDOWN_MS, ORPHANED_EXECUTION_RECOVERY_GRACE_MS, ACTIVE_MERGE_STATUSES2, NON_TERMINAL_STEP_STATUSES2, STRANDED_COMPLETED_TODO_ACTIVE_STATUSES, GHOST_REVIEW_PRESERVED_STATUSES, ORPHANED_WITH_WORKTREE_GRACE_MS, MAX_TASK_DONE_RETRIES, MAX_WORKTREE_SESSION_RETRIES, MAX_AUTO_MERGE_RETRIES, MAX_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";
@@ -100308,6 +100651,8 @@ var init_self_healing = __esm({
     init_foreign_only_contamination();
     init_notifier();
     init_dependency_blocked_todo_reporter();
+    init_transient_merge_error_classifier();
+    init_transient_merge_error_classifier();
     log20 = createLogger2("self-healing");
     worktreeMetadataReconcileLog = createLogger2("worktree-metadata-reconcile");
     execAsync27 = promisify35(exec29);
@@ -100346,6 +100691,7 @@ var init_self_healing = __esm({
     MAX_TASK_DONE_RETRIES = 3;
     MAX_WORKTREE_SESSION_RETRIES = 3;
     MAX_AUTO_MERGE_RETRIES = 3;
+    MAX_TRANSIENT_MERGE_RECOVERIES = 2;
     MAX_STARVATION_DROPS = 3;
     DEADLOCK_RECOVERY_COOLDOWN_MS = 15 * 6e4;
     DEFAULT_STALE_MERGING_STATUS_MIN_AGE_MS = 5 * 6e4;
@@ -100543,6 +100889,7 @@ var init_self_healing = __esm({
           { name: "stale-incomplete-review", fn: () => this.recoverStaleIncompleteReviewTasks().then(() => void 0) },
           { name: "failed-pre-merge-steps", fn: () => this.recoverReviewTasksWithFailedPreMergeSteps().then(() => void 0) },
           { name: "interrupted-merging", fn: () => this.recoverInterruptedMergingTasks().then(() => void 0) },
+          { name: "transient-merge-failures", fn: () => this.recoverTransientMergeFailures().then(() => void 0) },
           { name: "done-merge-metadata", fn: () => this.recoverDoneTaskMergeMetadata().then(() => void 0) },
           { name: "reconcile-done-task-integrity", fn: () => this.reconcileDoneTaskIntegrity().then(() => void 0) },
           // FN-5092: must run BEFORE any merger pickup path so the merger queue is
@@ -100637,8 +100984,8 @@ var init_self_healing = __esm({
           this.lastPauseTriggeredAt = Date.now();
           const baseDelay = settings.autoUnpauseBaseDelayMs ?? 3e5;
           const maxDelay = settings.autoUnpauseMaxDelayMs ?? 36e5;
-          const delay4 = Math.min(baseDelay * Math.pow(2, this.unpauseAttempt), maxDelay);
-          this.scheduleUnpause(delay4);
+          const delay5 = Math.min(baseDelay * Math.pow(2, this.unpauseAttempt), maxDelay);
+          this.scheduleUnpause(delay5);
         }
         if (previous.globalPause && !settings.globalPause) {
           this.cancelUnpauseTimer();
@@ -101072,6 +101419,7 @@ var init_self_healing = __esm({
               { name: "recover-stale-incomplete-review", fn: () => this.recoverStaleIncompleteReviewTasks() },
               { name: "recover-failed-pre-merge-steps", fn: () => this.recoverReviewTasksWithFailedPreMergeSteps() },
               { name: "recover-interrupted-merging", fn: () => this.recoverInterruptedMergingTasks() },
+              { name: "recover-transient-merge-failures", fn: () => this.recoverTransientMergeFailures() },
               { name: "recover-done-merge-metadata", fn: () => this.recoverDoneTaskMergeMetadata() },
               { name: "recover-stale-merging-status", fn: () => this.recoverStaleMergingStatus() },
               { name: "finalize-noop-review", fn: () => this.finalizeNoOpReviewTasks() },
@@ -104244,6 +104592,142 @@ var init_self_healing = __esm({
        * No-op when `settings.autoMerge === false` — PR-based review flow owns lifecycle until human merge.
        * @returns Number of tasks finalized or unblocked
        */
+      /**
+       * FN-5627 follow-up: recover in-review tasks that are stuck with
+       * `mergeRetries >= MAX_AUTO_MERGE_RETRIES` and `status='failed'` due to a
+       * TRANSIENT merge failure class (e.g., `target-not-queued` lease handoff
+       * race, legacy same-SHA spurious concurrent-advance). These tasks are
+       * NOT really stuck — they just hit a race or a misclassified ref-update
+       * failure that would have cleared on a fresh attempt. Without this sweep,
+       * the only path forward is manual intervention (the
+       * `AUTO_MERGE_COOLDOWN_MS`-based reset takes hours).
+       *
+       * For each matching task:
+       *  - Reset `mergeRetries=0`, clear `status` and `error`.
+       *  - Increment `mergeDetails.transientRecoveryCount`.
+       *  - Re-enqueue via `requeueForAutoMerge`.
+       *  - Bounded by `MAX_TRANSIENT_MERGE_RECOVERIES`; exhausted tasks stay
+       *    parked as failed and emit `merger:transient-failure-budget-exhausted`
+       *    once for diagnostic visibility.
+       *
+       * No-op when `settings.autoMerge === false`, no `requeueForAutoMerge`
+       * callback is wired, or global/engine pause is active.
+       *
+       * @returns Number of tasks recovered
+       */
+      async recoverTransientMergeFailures() {
+        const requeue = this.options.requeueForAutoMerge;
+        if (!requeue) return 0;
+        try {
+          const settings = await this.store.getSettings();
+          if (settings.autoMerge === false) return 0;
+          if (settings.globalPause || settings.enginePaused) return 0;
+          const slim = await this.store.listTasks({ column: "in-review", slim: true });
+          const candidates = slim.filter(
+            (t) => t.column === "in-review" && t.status === "failed" && (t.mergeRetries ?? 0) >= MAX_AUTO_MERGE_RETRIES && typeof t.error === "string" && t.error.length > 0 && classifyTransientMergeError(t.error) !== null
+          );
+          if (candidates.length === 0) return 0;
+          log20.warn(
+            `Found ${candidates.length} in-review task(s) with transient merge failures stuck at mergeRetries=${MAX_AUTO_MERGE_RETRIES}; attempting auto-recovery`
+          );
+          let recovered = 0;
+          for (const slimTask of candidates) {
+            const task = await this.store.getTask(slimTask.id).catch(() => null);
+            if (!task) continue;
+            if (task.column !== "in-review" || task.status !== "failed" || (task.mergeRetries ?? 0) < MAX_AUTO_MERGE_RETRIES) {
+              continue;
+            }
+            const errorText = task.error ?? "";
+            const transientClass = classifyTransientMergeError(errorText);
+            if (!transientClass) continue;
+            const currentCount = task.mergeDetails?.transientRecoveryCount ?? 0;
+            const errorSnippet = errorText.slice(0, 200);
+            const audit = createRunAuditor(this.store, {
+              runId: generateSyntheticRunId("self-heal-transient-merge-recovery", task.id),
+              agentId: "self-healing",
+              taskId: task.id,
+              phase: "recover-transient-merge-failures"
+            });
+            if (currentCount >= MAX_TRANSIENT_MERGE_RECOVERIES) {
+              if (!errorText.includes("[transient-recovery-budget-exhausted]")) {
+                await this.store.logEntry(
+                  task.id,
+                  `[FN-5627] Transient merge failure auto-recovery budget exhausted (${transientClass}, ${currentCount}/${MAX_TRANSIENT_MERGE_RECOVERIES}). Task remains parked in in-review for manual review.`
+                );
+                await this.store.updateTask(task.id, {
+                  error: `${errorText} [transient-recovery-budget-exhausted]`
+                });
+                try {
+                  await audit.database({
+                    type: "merger:transient-failure-budget-exhausted",
+                    target: task.id,
+                    metadata: {
+                      taskId: task.id,
+                      transientClass,
+                      recoveryCount: currentCount,
+                      maxRecoveries: MAX_TRANSIENT_MERGE_RECOVERIES,
+                      errorSnippet
+                    }
+                  });
+                } catch (auditErr) {
+                  log20.warn(
+                    `recoverTransientMergeFailures: audit emit failed for ${task.id}: ${auditErr instanceof Error ? auditErr.message : String(auditErr)}`
+                  );
+                }
+              }
+              continue;
+            }
+            const nextCount = currentCount + 1;
+            await this.store.logEntry(
+              task.id,
+              `Auto-recovered: transient merge failure (${transientClass}); resetting mergeRetries=0 and re-enqueueing (recovery ${nextCount}/${MAX_TRANSIENT_MERGE_RECOVERIES}) [FN-5627]`
+            );
+            await this.store.updateTask(task.id, {
+              mergeRetries: 0,
+              status: null,
+              error: null,
+              mergeDetails: {
+                ...task.mergeDetails,
+                transientRecoveryCount: nextCount
+              }
+            });
+            try {
+              await audit.database({
+                type: "merger:transient-failure-auto-recovered",
+                target: task.id,
+                metadata: {
+                  taskId: task.id,
+                  transientClass,
+                  mergeRetries: task.mergeRetries ?? 0,
+                  recoveryCount: nextCount,
+                  errorSnippet
+                }
+              });
+            } catch (auditErr) {
+              log20.warn(
+                `recoverTransientMergeFailures: audit emit failed for ${task.id}: ${auditErr instanceof Error ? auditErr.message : String(auditErr)}`
+              );
+            }
+            try {
+              await requeue(task.id);
+              recovered++;
+            } catch (requeueErr) {
+              log20.warn(
+                `recoverTransientMergeFailures: requeue failed for ${task.id}: ${requeueErr instanceof Error ? requeueErr.message : String(requeueErr)}`
+              );
+            }
+          }
+          if (recovered > 0) {
+            log20.log(`recoverTransientMergeFailures: re-enqueued ${recovered} stuck in-review task(s)`);
+          }
+          return recovered;
+        } catch (err) {
+          log20.warn(
+            `recoverTransientMergeFailures sweep failed: ${err instanceof Error ? err.message : String(err)}`
+          );
+          return 0;
+        }
+      }
       async recoverInterruptedMergingTasks() {
         try {
           const settings = await this.store.getSettings();
@@ -106545,7 +107029,7 @@ var init_self_healing = __esm({
 });
 
 // ../engine/src/triage.ts
-import { Type as Type3 } from "@mariozechner/pi-ai";
+import { Type as Type3 } from "@earendil-works/pi-ai";
 import { exec as exec30 } from "node:child_process";
 import { readFile as readFile21 } from "node:fs/promises";
 import { join as join44 } from "node:path";
@@ -106604,9 +107088,9 @@ async function readAttachmentContents(rootDir, taskId, attachments) {
     return { attachmentContents, imageContents };
   }
   const { readFile: readFile29 } = await import("node:fs/promises");
-  const { join: join58 } = await import("node:path");
+  const { join: join59 } = await import("node:path");
   for (const att of attachments) {
-    const filePath = join58(
+    const filePath = join59(
       rootDir,
       ".fusion",
       "tasks",
@@ -108079,8 +108563,8 @@ You are ${assignedAgent.name}${assignedAgent.title?.trim() ? `, ${assignedAgent.
                 });
                 if (decision.shouldRetry) {
                   const attempt = decision.nextState.recoveryRetryCount;
-                  const delay4 = formatDelay(decision.delayMs);
-                  const retryMessage = `Spec review not approved (${verdictDesc}) \u2014 retry ${attempt}/${MAX_RECOVERY_RETRIES} in ${delay4}.`;
+                  const delay5 = formatDelay(decision.delayMs);
+                  const retryMessage = `Spec review not approved (${verdictDesc}) \u2014 retry ${attempt}/${MAX_RECOVERY_RETRIES} in ${delay5}.`;
                   planLog.warn(`${task.id} ${retryMessage}`);
                   await this.store.logEntry(task.id, retryMessage);
                   const restoreStatus = task.status === "needs-replan" ? "needs-replan" : null;
@@ -108186,10 +108670,10 @@ You are ${assignedAgent.name}${assignedAgent.title?.trim() ? `, ${assignedAgent.
               });
               if (decision.shouldRetry) {
                 const attempt = decision.nextState.recoveryRetryCount;
-                const delay4 = formatDelay(decision.delayMs);
+                const delay5 = formatDelay(decision.delayMs);
                 if (!isSilentTransientError(errorMessage)) {
-                  planLog.warn(`\u26A1 ${task.id} transient error during triage \u2014 retry ${attempt}/${MAX_RECOVERY_RETRIES} in ${delay4}: ${errorMessage}`);
-                  await this.store.logEntry(task.id, `Transient error during specification (retry ${attempt}/${MAX_RECOVERY_RETRIES} in ${delay4}): ${errorMessage}`).catch((err2) => {
+                  planLog.warn(`\u26A1 ${task.id} transient error during triage \u2014 retry ${attempt}/${MAX_RECOVERY_RETRIES} in ${delay5}: ${errorMessage}`);
+                  await this.store.logEntry(task.id, `Transient error during specification (retry ${attempt}/${MAX_RECOVERY_RETRIES} in ${delay5}): ${errorMessage}`).catch((err2) => {
                     const msg = err2 instanceof Error ? err2.message : String(err2);
                     planLog.warn(`${task.id}: failed to log transient-error retry entry: ${msg}`);
                   });
@@ -108488,9 +108972,9 @@ Remove or replace these ids and call fn_task_create again.`
             }
             try {
               const { readFile: readFile29 } = await import("node:fs/promises");
-              const { join: join58 } = await import("node:path");
+              const { join: join59 } = await import("node:path");
               const promptContent = await readFile29(
-                join58(rootDir, promptPath),
+                join59(rootDir, promptPath),
                 "utf-8"
               ).catch((err) => {
                 const msg = err instanceof Error ? err.message : String(err);
@@ -109636,7 +110120,7 @@ var init_task_completion = __esm({
 import { spawn as spawn6 } from "node:child_process";
 import { existsSync as existsSync40 } from "node:fs";
 import { isAbsolute as isAbsolute13, join as join46 } from "node:path";
-import { Type as Type4 } from "@mariozechner/pi-ai";
+import { Type as Type4 } from "@earendil-works/pi-ai";
 function createBuffer() {
   return { headChunks: [], headBytes: 0, tailChunks: [], tailBytes: 0, totalBytes: 0 };
 }
@@ -109945,8 +110429,8 @@ import { setImmediate as setImmediateCb3 } from "node:timers";
 import { delimiter, isAbsolute as isAbsolute14, join as join47, relative as relative11, resolve as resolvePath } from "node:path";
 import { existsSync as existsSync41, realpathSync as realpathSync6 } from "node:fs";
 import { readFile as readFile22, rm as rm5, writeFile as writeFile16 } from "node:fs/promises";
-import { Type as Type5 } from "@mariozechner/pi-ai";
-import { ModelRegistry as ModelRegistry2, SessionManager as SessionManager2 } from "@mariozechner/pi-coding-agent";
+import { Type as Type5 } from "@earendil-works/pi-ai";
+import { ModelRegistry as ModelRegistry2, SessionManager as SessionManager2 } from "@earendil-works/pi-coding-agent";
 function getResumeOrphanDelayMs() {
   const raw = process.env.FUSION_RESUME_ORPHAN_DELAY_MS;
   if (raw !== void 0) {
@@ -109963,6 +110447,26 @@ function canonicalizePath2(path6) {
     return resolvePath(path6);
   }
 }
+function isTransientMissingTaskJsonError(error, task) {
+  if (error instanceof TaskDeletedError) {
+    return false;
+  }
+  const message = typeof error === "string" ? error : error instanceof Error ? error.message : "";
+  const match = TRANSIENT_WORKTREE_TASK_JSON_ENOENT_PATTERN.exec(message);
+  if (!match) {
+    return false;
+  }
+  const [, filePath, taskIdFromPath] = match;
+  if (taskIdFromPath !== task.id) {
+    return false;
+  }
+  if (typeof task.worktree !== "string" || task.worktree.length === 0) {
+    return false;
+  }
+  const normalizedWorktree = resolvePath(task.worktree);
+  const normalizedTaskJsonPath = resolvePath(filePath);
+  return normalizedTaskJsonPath.startsWith(`${normalizedWorktree}/`);
+}
 function detectPendingReviewBlock(task, codeReviewVerdicts) {
   const inProgressStepIndices = [];
   for (let stepIndex = 0; stepIndex < task.steps.length; stepIndex++) {
@@ -110498,7 +111002,7 @@ function detectReviewHandoffIntent(commentText) {
   ];
   return handoffPhrases.some((phrase) => text.includes(phrase));
 }
-var execAsync30, yieldEventLoop3, tokenCacheMetricsLog, STEP_STATUSES, MAX_WORKFLOW_STEP_RETRIES, MAX_TASK_DONE_SESSION_RETRIES, MAX_TASK_DONE_REQUEUE_RETRIES, COMPLETED_TASK_WATCHDOG_MS, WORKFLOW_RERUN_WATCHDOG_MS, TASK_DONE_REFUSAL_SUFFIX, DISSENT_PATTERNS, WORKFLOW_SCRIPT_OUTPUT_MAX_CHARS2, WORKFLOW_FEEDBACK_PATH_REGEX, NonRetryableWorktreeError, taskUpdateParams, taskAddDepParams, spawnAgentParams, WORKFLOW_STEP_VERDICTS, reviewStepParams, EXECUTOR_SYSTEM_PROMPT, TaskExecutor;
+var execAsync30, yieldEventLoop3, tokenCacheMetricsLog, STEP_STATUSES, MAX_WORKFLOW_STEP_RETRIES, MAX_TASK_DONE_SESSION_RETRIES, MAX_TASK_DONE_REQUEUE_RETRIES, COMPLETED_TASK_WATCHDOG_MS, WORKFLOW_RERUN_WATCHDOG_MS, TASK_DONE_REFUSAL_SUFFIX, TRANSIENT_WORKTREE_TASK_JSON_ENOENT_PATTERN, DISSENT_PATTERNS, WORKFLOW_SCRIPT_OUTPUT_MAX_CHARS2, WORKFLOW_FEEDBACK_PATH_REGEX, NonRetryableWorktreeError, taskUpdateParams, taskAddDepParams, spawnAgentParams, WORKFLOW_STEP_VERDICTS, reviewStepParams, EXECUTOR_SYSTEM_PROMPT, TaskExecutor;
 var init_executor = __esm({
   "../engine/src/executor.ts"() {
     "use strict";
@@ -110566,6 +111070,7 @@ var init_executor = __esm({
     COMPLETED_TASK_WATCHDOG_MS = 6e4;
     WORKFLOW_RERUN_WATCHDOG_MS = 15e3;
     TASK_DONE_REFUSAL_SUFFIX = "Either finish the work and resubmit, or do not call fn_task_done \u2014 exit the session and the engine will requeue.";
+    TRANSIENT_WORKTREE_TASK_JSON_ENOENT_PATTERN = /ENOENT:\s+no such file or directory,\s+open\s+'([^']+\/\.fusion\/tasks\/([^/]+)\/task\.json)'/;
     DISSENT_PATTERNS = [
       /\btask (is|was)(?: not|n['’]?t) complete\b/i,
       /\b(?:i (?:could|can)(?:not|n['’]?t)|unable to|failed to) (?:complete|finish|implement)\b/i,
@@ -113057,10 +113562,10 @@ ${summary}`,
                 });
                 if (decision.shouldRetry) {
                   const attempt = decision.nextState.recoveryRetryCount;
-                  const delay4 = formatDelay(decision.delayMs);
+                  const delay5 = formatDelay(decision.delayMs);
                   if (!isSilentTransientError(errorMessage)) {
-                    executorLog.warn(`\u26A1 ${task.id} transient error \u2014 retry ${attempt}/${MAX_RECOVERY_RETRIES} in ${delay4}: ${errorMessage}`);
-                    await this.store.logEntry(task.id, `Transient error (retry ${attempt}/${MAX_RECOVERY_RETRIES} in ${delay4}): ${errorMessage}`, void 0, this.getRunContextFor(task.id));
+                    executorLog.warn(`\u26A1 ${task.id} transient error \u2014 retry ${attempt}/${MAX_RECOVERY_RETRIES} in ${delay5}: ${errorMessage}`);
+                    await this.store.logEntry(task.id, `Transient error (retry ${attempt}/${MAX_RECOVERY_RETRIES} in ${delay5}): ${errorMessage}`, void 0, this.getRunContextFor(task.id));
                   }
                   if (worktreePath && existsSync41(worktreePath)) {
                     try {
@@ -113616,12 +114121,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;
                   }
@@ -114022,9 +114522,9 @@ ${summary}`,
               });
               if (decision.shouldRetry) {
                 const attempt = decision.nextState.recoveryRetryCount;
-                const delay4 = formatDelay(decision.delayMs);
-                executorLog.warn(`\u26A1 ${task.id} context-overflow fresh-session requeue ${attempt}/${MAX_RECOVERY_RETRIES} in ${delay4}`);
-                await this.store.logEntry(task.id, `Context-overflow fresh-session requeue (${attempt}/${MAX_RECOVERY_RETRIES} in ${delay4}): ${errorMessage}`, void 0, this.getRunContextFor(task.id));
+                const delay5 = formatDelay(decision.delayMs);
+                executorLog.warn(`\u26A1 ${task.id} context-overflow fresh-session requeue ${attempt}/${MAX_RECOVERY_RETRIES} in ${delay5}`);
+                await this.store.logEntry(task.id, `Context-overflow fresh-session requeue (${attempt}/${MAX_RECOVERY_RETRIES} in ${delay5}): ${errorMessage}`, void 0, this.getRunContextFor(task.id));
                 await this.store.updateTask(task.id, {
                   recoveryRetryCount: decision.nextState.recoveryRetryCount,
                   nextRecoveryAt: decision.nextState.nextRecoveryAt,
@@ -114312,10 +114812,10 @@ ${summary}`,
               });
               if (decision.shouldRetry) {
                 const attempt = decision.nextState.recoveryRetryCount;
-                const delay4 = formatDelay(decision.delayMs);
+                const delay5 = formatDelay(decision.delayMs);
                 if (!isSilentTransientError(errorMessage)) {
-                  executorLog.warn(`\u26A1 ${task.id} transient error \u2014 retry ${attempt}/${MAX_RECOVERY_RETRIES} in ${delay4}: ${errorMessage}`);
-                  await this.store.logEntry(task.id, `Transient error (retry ${attempt}/${MAX_RECOVERY_RETRIES} in ${delay4}): ${errorMessage}`, void 0, this.getRunContextFor(task.id));
+                  executorLog.warn(`\u26A1 ${task.id} transient error \u2014 retry ${attempt}/${MAX_RECOVERY_RETRIES} in ${delay5}: ${errorMessage}`);
+                  await this.store.logEntry(task.id, `Transient error (retry ${attempt}/${MAX_RECOVERY_RETRIES} in ${delay5}): ${errorMessage}`, void 0, this.getRunContextFor(task.id));
                 }
                 if (worktreePath && existsSync41(worktreePath)) {
                   try {
@@ -117017,8 +117517,8 @@ Review the work done in this worktree and evaluate it against the criteria in yo
                 `Failed to create worktree after ${this.MAX_WORKTREE_RETRIES} attempts: ${errorMessage}`
               );
             }
-            const delay4 = this.WORKTREE_RETRY_DELAYS[attempt] || 1e3;
-            await new Promise((resolve32) => setTimeout(resolve32, delay4));
+            const delay5 = this.WORKTREE_RETRY_DELAYS[attempt] || 1e3;
+            await new Promise((resolve32) => setTimeout(resolve32, delay5));
           }
         }
         throw new Error("Unexpected exit from worktree creation retry loop");
@@ -117256,9 +117756,15 @@ Review the work done in this worktree and evaluate it against the criteria in yo
       }
       async recoverMissingWorktreeSessionStartFailure(task, worktreePath, error, audit) {
         const errorText = error instanceof Error ? error.message : String(error);
-        if (!isMissingWorktreeSessionStartFailure(errorText)) return false;
+        const missingWorktreeFailure = isMissingWorktreeSessionStartFailure(errorText);
+        const missingTaskJsonFailure = isTransientMissingTaskJsonError(error, task);
+        if (!missingWorktreeFailure && !missingTaskJsonFailure) return false;
         const classification = classifyMissingWorktreeSessionStartFailure(errorText);
-        const staleWorktreePath = extractMissingWorktreePathFromSessionStartFailure(errorText) ?? worktreePath;
+        const missingTaskJsonPath = errorText.match(TRANSIENT_WORKTREE_TASK_JSON_ENOENT_PATTERN)?.[1] ?? null;
+        const staleWorktreePath = extractMissingWorktreePathFromSessionStartFailure(errorText) ?? (missingTaskJsonPath ? resolvePath(missingTaskJsonPath, "..", "..", "..") : null) ?? worktreePath;
+        if (missingTaskJsonFailure) {
+          executorLog.log(`[transient-task-json-suppressed] taskId=${task.id} elapsedMs=0 reason=missing-task-json-under-worktree path=${missingTaskJsonPath ?? "unknown"}`);
+        }
         await audit.git({
           type: "worktree:incomplete-detected",
           target: staleWorktreePath,
@@ -120414,6 +120920,12 @@ var init_scheduler = __esm({
           }
           const sliceIdBeforeUpdate = feature.sliceId;
           if (this.options.missionExecutionLoop) {
+            if (!this.options.missionExecutionLoop.isRunning()) {
+              schedulerLog.warn(
+                `MissionExecutionLoop was not running during task completion for ${taskId}; starting loop before processing outcome`
+              );
+              this.options.missionExecutionLoop.start();
+            }
             void this.options.missionExecutionLoop.processTaskOutcome(taskId).catch((err) => {
               schedulerLog.error(`Error in missionExecutionLoop.processTaskOutcome for ${taskId}:`, err);
             });
@@ -120876,19 +121388,19 @@ var init_mission_autopilot = __esm({
           autopilotLog.error(`Error advancing slice for mission ${missionId}:`, err);
           state.retryCount++;
           if (state.retryCount <= MAX_RETRY_ATTEMPTS) {
-            const delay4 = RETRY_BASE_DELAY_MS2 * Math.pow(3, state.retryCount - 1);
+            const delay5 = RETRY_BASE_DELAY_MS2 * Math.pow(3, state.retryCount - 1);
             this.logMissionEventSafe(
               missionId,
               "autopilot_retry",
               `Retrying slice activation after error (attempt ${state.retryCount}/${MAX_RETRY_ATTEMPTS})`,
-              { retryCount: state.retryCount, maxRetries: MAX_RETRY_ATTEMPTS, delayMs: delay4 }
+              { retryCount: state.retryCount, maxRetries: MAX_RETRY_ATTEMPTS, delayMs: delay5 }
             );
-            autopilotLog.log(`Retrying slice activation for mission ${missionId} (attempt ${state.retryCount}/${MAX_RETRY_ATTEMPTS}, delay ${delay4}ms)`);
+            autopilotLog.log(`Retrying slice activation for mission ${missionId} (attempt ${state.retryCount}/${MAX_RETRY_ATTEMPTS}, delay ${delay5}ms)`);
             setTimeout(() => {
               if (this.isWatching(missionId)) {
                 void this.advanceToNextSlice(missionId);
               }
-            }, delay4);
+            }, delay5);
           } else {
             this.logMissionEventSafe(
               missionId,
@@ -121335,7 +121847,7 @@ var init_mission_autopilot = __esm({
 });
 
 // ../engine/src/mission-execution-loop.ts
-import { EventEmitter as EventEmitter18 } from "node:events";
+import { EventEmitter as EventEmitter19 } from "node:events";
 var loopLog, VALIDATION_TIMEOUT_MS, MissionExecutionLoop;
 var init_mission_execution_loop = __esm({
   "../engine/src/mission-execution-loop.ts"() {
@@ -121347,7 +121859,7 @@ var init_mission_execution_loop = __esm({
     init_run_audit();
     loopLog = createLogger2("mission-loop");
     VALIDATION_TIMEOUT_MS = 10 * 60 * 1e3;
-    MissionExecutionLoop = class extends EventEmitter18 {
+    MissionExecutionLoop = class extends EventEmitter19 {
       running = false;
       taskStore;
       missionStore;
@@ -121432,7 +121944,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) {
@@ -121443,7 +121958,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);
@@ -121485,6 +122003,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);
@@ -121875,6 +122404,10 @@ ${taskContext}` : ""}`;
           if (runId) {
             this.missionStore.completeValidatorRun(runId, "passed", summary);
           }
+          const feature = this.missionStore.getFeature(featureId);
+          if (feature && feature.status !== "done") {
+            this.missionStore.updateFeatureStatus(featureId, "done");
+          }
           loopLog.log(`Feature ${featureId} passed validation`);
           if (this.missionAutopilot?.notifyValidationComplete) {
             await this.missionAutopilot.notifyValidationComplete(featureId, "passed");
@@ -121948,6 +122481,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");
           }
@@ -121965,6 +122502,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");
           }
@@ -121973,6 +122514,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);
+        }
+      }
     };
   }
 });
@@ -123085,7 +123651,7 @@ var init_room_coordination = __esm({
 });
 
 // ../engine/src/agent-heartbeat.ts
-import { Type as Type6 } from "@mariozechner/pi-ai";
+import { Type as Type6 } from "@earendil-works/pi-ai";
 import { createHash as createHash12 } from "node:crypto";
 function adjustHeartbeatMemoryPrimer(basePrompt, mode) {
   if (mode === "full") return basePrompt;
@@ -126435,6 +127001,78 @@ var init_error_classifier = __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/experiment/benchmark-runner.ts
 import { spawn as spawn7 } from "node:child_process";
 import { mkdtemp, writeFile as writeFile17 } from "node:fs/promises";
@@ -130216,7 +130854,7 @@ var init_stuck_task_detector = __esm({
 });
 
 // ../engine/src/plugin-runner.ts
-import { Type as Type7 } from "@mariozechner/pi-ai";
+import { Type as Type7 } from "@earendil-works/pi-ai";
 import { isAbsolute as isAbsolute16 } from "node:path";
 var DEFAULT_HOOK_TIMEOUT_MS, PluginRunner;
 var init_plugin_runner = __esm({
@@ -131367,7 +132005,7 @@ var init_task_agent_sync = __esm({
 });
 
 // ../engine/src/runtimes/in-process-runtime.ts
-import { EventEmitter as EventEmitter19 } from "node:events";
+import { EventEmitter as EventEmitter20 } from "node:events";
 import { setImmediate as setImmediateCb4 } from "node:timers";
 var yieldEventLoop4, InProcessRuntime;
 var init_in_process_runtime = __esm({
@@ -131397,7 +132035,7 @@ var init_in_process_runtime = __esm({
     init_task_agent_sync();
     init_run_audit();
     yieldEventLoop4 = () => new Promise((resolve32) => setImmediateCb4(resolve32));
-    InProcessRuntime = class extends EventEmitter19 {
+    InProcessRuntime = class extends EventEmitter20 {
       /**
        * @param config - Runtime configuration
        * @param centralCore - CentralCore reference for global coordination
@@ -131568,9 +132206,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,
@@ -132427,14 +133075,14 @@ var init_ipc_protocol = __esm({
 });
 
 // ../engine/src/ipc/ipc-host.ts
-import { EventEmitter as EventEmitter20 } from "node:events";
+import { EventEmitter as EventEmitter21 } from "node:events";
 var IpcHost;
 var init_ipc_host = __esm({
   "../engine/src/ipc/ipc-host.ts"() {
     "use strict";
     init_ipc_protocol();
     init_logger2();
-    IpcHost = class extends EventEmitter20 {
+    IpcHost = class extends EventEmitter21 {
       /**
        * @param childProcess - The forked child process to communicate with
        * @param options - Optional configuration
@@ -132624,7 +133272,7 @@ var child_process_runtime_exports = {};
 __export(child_process_runtime_exports, {
   ChildProcessRuntime: () => ChildProcessRuntime
 });
-import { EventEmitter as EventEmitter21 } from "node:events";
+import { EventEmitter as EventEmitter22 } from "node:events";
 import { fork } from "node:child_process";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 import { dirname as dirname18, join as join49 } from "node:path";
@@ -132681,8 +133329,8 @@ var init_child_process_runtime = __esm({
         runtimeLog.log("Health monitor stopped");
       }
       getRestartDelay() {
-        const delay4 = this.restartDelays[this.restartAttempts] ?? this.restartDelays[this.restartDelays.length - 1];
-        return delay4;
+        const delay5 = this.restartDelays[this.restartAttempts] ?? this.restartDelays[this.restartDelays.length - 1];
+        return delay5;
       }
       incrementRestartAttempts() {
         this.restartAttempts++;
@@ -132694,7 +133342,7 @@ var init_child_process_runtime = __esm({
         return this.missedHeartbeats;
       }
     };
-    ChildProcessRuntime = class extends EventEmitter21 {
+    ChildProcessRuntime = class extends EventEmitter22 {
       /**
        * @param config - Runtime configuration
        * @param centralCore - CentralCore reference for global coordination
@@ -132963,9 +133611,9 @@ var init_child_process_runtime = __esm({
           this.emit("error", new Error("Child process failed after max restart attempts"));
           return;
         }
-        const delay4 = this.healthMonitor.getRestartDelay();
+        const delay5 = this.healthMonitor.getRestartDelay();
         this.healthMonitor.incrementRestartAttempts();
-        runtimeLog.log(`Attempting restart ${this.healthMonitor.getRestartAttempts()}/${maxRestarts} after ${delay4}ms`);
+        runtimeLog.log(`Attempting restart ${this.healthMonitor.getRestartAttempts()}/${maxRestarts} after ${delay5}ms`);
         const gen = this.generation;
         this.restartTimer = setTimeout(async () => {
           this.restartTimer = null;
@@ -132984,7 +133632,7 @@ var init_child_process_runtime = __esm({
             this.setStatus("errored");
             this.emit("error", error instanceof Error ? error : new Error(String(error)));
           }
-        }, delay4);
+        }, delay5);
       }
       /**
        * Handle child process exit.
@@ -133379,14 +134027,14 @@ var init_remote_node_client = __esm({
 });
 
 // ../engine/src/runtimes/remote-node-runtime.ts
-import { EventEmitter as EventEmitter22 } from "node:events";
+import { EventEmitter as EventEmitter23 } from "node:events";
 var RemoteNodeRuntime;
 var init_remote_node_runtime = __esm({
   "../engine/src/runtimes/remote-node-runtime.ts"() {
     "use strict";
     init_logger2();
     init_remote_node_client();
-    RemoteNodeRuntime = class extends EventEmitter22 {
+    RemoteNodeRuntime = class extends EventEmitter23 {
       constructor(config) {
         super();
         this.config = config;
@@ -133696,7 +134344,7 @@ var init_remote_node_runtime = __esm({
 });
 
 // ../engine/src/project-manager.ts
-import { EventEmitter as EventEmitter23 } from "node:events";
+import { EventEmitter as EventEmitter24 } from "node:events";
 var ProjectManager;
 var init_project_manager = __esm({
   "../engine/src/project-manager.ts"() {
@@ -133706,7 +134354,7 @@ var init_project_manager = __esm({
     init_remote_node_runtime();
     init_concurrency();
     init_logger2();
-    ProjectManager = class extends EventEmitter23 {
+    ProjectManager = class extends EventEmitter24 {
       /**
        * @param centralCore - CentralCore reference for global coordination
        */
@@ -134173,6 +134821,661 @@ var init_gridlock_detector = __esm({
   }
 });
 
+// ../engine/src/merger-ai.ts
+import { execFile as execFile15 } from "node:child_process";
+import { promisify as promisify43 } from "node:util";
+import { mkdtemp as mkdtemp2, rm as rm6 } from "node:fs/promises";
+import { tmpdir as tmpdir5 } from "node:os";
+import { join as join50 } from "node:path";
+async function git2(args, cwd, opts = {}) {
+  const { stdout } = await execFileAsync10("git", args, {
+    cwd,
+    encoding: "utf-8",
+    timeout: opts.timeout ?? 12e4,
+    maxBuffer: 16 * 1024 * 1024
+  });
+  return stdout.trim();
+}
+async function gitOk(args, cwd) {
+  try {
+    await git2(args, cwd);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function taskTrailers(taskId, lineageId) {
+  const trailers = [`${FUSION_TASK_ID_TRAILER_KEY3}: ${taskId}`];
+  if (lineageId) trailers.push(buildTaskLineageTrailer(lineageId));
+  return trailers;
+}
+async function ensureCommitTaskMetadata(mergeRoot, taskId, includeTaskId, trailers) {
+  const fullMessage = await git2(["log", "-1", "--pretty=%B"], mergeRoot).catch(() => "");
+  if (!fullMessage) return;
+  const subject = (fullMessage.split("\n")[0] ?? "").trim();
+  const body = await git2(["log", "-1", "--pretty=%b"], mergeRoot).catch(() => "");
+  const needsPrefix = includeTaskId && !subject.toLowerCase().startsWith(taskId.toLowerCase());
+  const missingTrailers = trailers.filter((t) => !fullMessage.includes(t));
+  if (!needsPrefix && missingTrailers.length === 0) return;
+  const args = ["-c", "trailer.ifExists=addIfDifferent", "commit", "--amend"];
+  if (needsPrefix) {
+    args.push("-m", `${taskId}: ${subject}`);
+    if (body.trim()) args.push("-m", body);
+  } else {
+    args.push("--no-edit");
+  }
+  for (const t of missingTrailers) args.push("--trailer", t);
+  await git2(args, mergeRoot).catch((err) => {
+    aiMergeLog.warn(`failed to amend task metadata onto squash (${err instanceof Error ? err.message : String(err)})`);
+  });
+}
+function parseReviewVerdict(agentText) {
+  const text = (agentText ?? "").trim();
+  if (!text) return { verdict: "reject", reasons: ["reviewer produced no output"], severity: "blocking" };
+  const lines = text.split(/\r?\n/);
+  let verdictLineIndex = -1;
+  let decision = null;
+  for (let i = lines.length - 1; i >= 0; i--) {
+    const m2 = lines[i].match(VERDICT_LINE_RE);
+    if (m2) {
+      decision = m2[1].toLowerCase();
+      verdictLineIndex = i;
+      break;
+    }
+  }
+  if (!decision) {
+    return {
+      verdict: "reject",
+      reasons: [`reviewer did not emit a "${REVIEW_VERDICT_MARKER} approve|reject" line`],
+      severity: "blocking"
+    };
+  }
+  if (decision === "approve") return { verdict: "approve", reasons: [] };
+  const severity = SEVERITY_LINE_RE.test(text) ? text.match(SEVERITY_LINE_RE)[1].toLowerCase() : "blocking";
+  return { verdict: "reject", reasons: extractRejectReasons(lines, verdictLineIndex), severity };
+}
+function extractRejectReasons(lines, verdictLineIndex) {
+  const reasons = [];
+  const inline = lines[verdictLineIndex].replace(VERDICT_LINE_RE, "").replace(/^[\s:–—-]+/, "").trim();
+  if (inline) reasons.push(inline);
+  for (let i = verdictLineIndex + 1; i < lines.length; i++) {
+    if (SEVERITY_LINE_RE.test(lines[i])) continue;
+    const cleaned = lines[i].replace(/^\s*(?:[-*•]|\d+[.)])\s+/, "").trim();
+    if (cleaned) reasons.push(cleaned);
+  }
+  if (reasons.length === 0) reasons.push("reviewer rejected the merge without a stated reason");
+  return reasons;
+}
+function buildMergeSystemPrompt2(agentPrompts) {
+  const base = resolveAgentPrompt("merger", agentPrompts).trim();
+  return [
+    base,
+    base ? "" : void 0,
+    "## AI merge \u2014 clean room",
+    "You are on a CLEAN, detached checkout at the integration branch's current",
+    "tip. Land the task branch's work as a single commit.",
+    "",
+    "Constraints:",
+    "  - Resolve every conflict in favor of the task branch's intent; never drop",
+    "    the task's changes to make a conflict go away.",
+    "  - Do not make edits unrelated to reconciling the two branches.",
+    "  - Do NOT push, force-push, or run `git update-ref` / `git reset --hard`",
+    "    on any other branch. Only commit on this detached HEAD.",
+    "  - Finish with exactly ONE new commit on HEAD containing the task's work.",
+    "",
+    "Verify before committing:",
+    "  - After resolving the merge, run the project's checks \u2014 tests, type-check,",
+    "    and lint (discover them from the project config / package.json scripts,",
+    "    e.g. test / typecheck / lint / build).",
+    "  - FIX any NEW failure the merge or conflict resolution introduced (a check",
+    "    that passed on the task branch or the integration tip but fails on the",
+    "    merged tree). You do not need to fix failures that were already broken on",
+    "    the integration branch beforehand, but never commit a merge that adds new",
+    "    test, type-check, or lint failures.",
+    "",
+    "Commit message:",
+    "  - 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");
+}
+function buildMergePrompt2(input) {
+  const subjectShape = input.includeTaskId ? `"${input.taskId}: <concise imperative summary of the squashed changes>"` : `"<concise imperative summary of the squashed changes>"`;
+  const trailerArgs = input.trailers.map((t) => ` -m ${JSON.stringify(t)}`).join("");
+  const lines = [
+    `Merge branch "${input.branch}" into "${input.integrationBranch}" (HEAD is detached at ${short(input.tipSha)}).`,
+    "",
+    "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. 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.",
+    "  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."
+  ];
+  if (input.correctiveReasons && input.correctiveReasons.length > 0) {
+    lines.push(
+      "",
+      "A prior attempt was REJECTED by review. Redo the merge from the clean tip",
+      "and address each of these problems:",
+      ...input.correctiveReasons.map((r) => `  - ${r}`)
+    );
+  }
+  return lines.join("\n");
+}
+function buildReviewSystemPrompt() {
+  return [
+    "You are an adversarial, read-only merge reviewer. Do NOT edit, stage, commit,",
+    "or run any mutating git command. Audit the squash commit that is about to be",
+    "merged into the integration branch and decide whether it is safe to land.",
+    "",
+    "Investigate with read-only commands (git show, git diff, git log, cat, grep).",
+    "Judge on four axes:",
+    "  1. Completeness \u2014 does the squash contain ALL of the task branch's intended",
+    "     changes? Flag any hunk silently dropped during conflict resolution.",
+    "  2. No collateral \u2014 does it touch only files within the task's footprint?",
+    "  3. Conflict soundness \u2014 were conflicts resolved coherently (both sides'",
+    "     intent preserved), not by blindly discarding one side?",
+    "  4. Commit message \u2014 read `git show`'s message: the subject must concisely",
+    "     and ACCURATELY summarize the actual changes (not vague, not a mere",
+    "     restatement of the task title, not misleading). A poor/inaccurate",
+    "     message is an ADVISORY concern (it should be rewritten on retry, but",
+    "     must not block the merge).",
+    "",
+    "Bias toward rejection when uncertain.",
+    "",
+    `End with a single decision line: "${REVIEW_VERDICT_MARKER} approve" or`,
+    `"${REVIEW_VERDICT_MARKER} reject". When rejecting, add a "SEVERITY:" line:`,
+    "  - SEVERITY: blocking \u2014 a correctness problem (dropped/lost task changes,",
+    "    incomplete squash, or a conflict resolution that discards intent). The",
+    "    merge must NOT land if this is unfixable.",
+    "  - SEVERITY: advisory \u2014 a quality/style concern that does not risk",
+    "    correctness; acceptable to land if unresolved.",
+    "Then list each concrete reason as a bullet."
+  ].join("\n");
+}
+function buildReviewPrompt(input) {
+  const lines = [
+    `Review the squash merge for task ${input.taskId} (branch ${input.branch} \u2192 ${input.integrationBranch}).`,
+    "",
+    `Integration tip: ${short(input.tipSha)}`,
+    `Squash commit:   ${short(input.squashSha)}`,
+    "",
+    "Inspect with:",
+    `  git show ${input.squashSha}`,
+    `  git diff ${input.tipSha}..${input.squashSha}`,
+    "",
+    "Files changed (git diff --stat):",
+    input.diffStat.trim() || "(none reported)"
+  ];
+  if (input.priorReasons && input.priorReasons.length > 0) {
+    lines.push(
+      "",
+      "A prior pass rejected an earlier attempt for these reasons \u2014 confirm they",
+      "are now resolved:",
+      ...input.priorReasons.map((r) => `  - ${r}`)
+    );
+  }
+  return lines.join("\n");
+}
+function buildStashResolveSystemPrompt() {
+  return [
+    "You are resolving a conflict between the user's restored local working-tree",
+    "edits and the freshly-merged integration branch. The user's uncommitted work",
+    "was stashed, the checkout fast-forwarded to the new tip, and re-applying the",
+    "stash produced conflicts.",
+    "",
+    "Resolve every conflict marker so BOTH sides are preserved: keep the user's",
+    "local intent AND the upstream changes that just landed. Stage each resolved",
+    "file with `git add`.",
+    "",
+    "Do NOT commit, stash, reset, checkout a different branch, or run update-ref.",
+    "Leave the resolved changes in the working tree as the user's uncommitted edits."
+  ].join("\n");
+}
+function buildStashResolvePrompt(conflictedFiles) {
+  return [
+    "Re-applying your stashed local changes onto the updated branch conflicted.",
+    "",
+    "Conflicted files:",
+    ...conflictedFiles.map((f2) => `  - ${f2}`),
+    "",
+    "Resolve each file's conflict markers (preserve both the local edits and the",
+    "upstream changes), then `git add` it. Do not commit."
+  ].join("\n");
+}
+function short(sha) {
+  return /^[0-9a-f]{7,40}$/i.test(sha) ? sha.slice(0, 8) : sha;
+}
+function makeMutatingAgent(store, settings, taskId, options, audit, systemPrompt) {
+  return async (cwd, prompt) => {
+    const model = resolveMergerSessionModel(settings);
+    const { session } = await createResolvedAgentSession({
+      sessionPurpose: "merger",
+      pluginRunner: options.pluginRunner,
+      cwd,
+      systemPrompt,
+      tools: "coding",
+      onText: options.onAgentText ? (delta) => options.onAgentText?.(delta) : void 0,
+      defaultProvider: model.provider,
+      defaultModelId: model.modelId,
+      fallbackProvider: settings.fallbackProvider,
+      fallbackModelId: settings.fallbackModelId,
+      defaultThinkingLevel: settings.defaultThinkingLevel,
+      runAuditor: audit,
+      settings,
+      taskId
+    });
+    options.onSession?.(session);
+    try {
+      await withRateLimitRetry(async () => {
+        await promptWithFallback(session, prompt);
+        checkSessionError(session);
+      }, { signal: options.signal });
+      await accumulateSessionTokenUsage(store, taskId, session);
+    } finally {
+      session.dispose();
+    }
+  };
+}
+function makeReviewAgent(store, settings, taskId, options, audit) {
+  return async (cwd, prompt) => {
+    const validator = resolveValidatorSettingsModel(settings);
+    const model = validator.provider && validator.modelId ? validator : resolveMergerSessionModel(settings);
+    let captured = "";
+    const { session } = await createResolvedAgentSession({
+      sessionPurpose: "merger",
+      pluginRunner: options.pluginRunner,
+      cwd,
+      systemPrompt: buildReviewSystemPrompt(),
+      tools: "coding",
+      onText: (delta) => {
+        captured += delta;
+        options.onAgentText?.(delta);
+      },
+      defaultProvider: model.provider,
+      defaultModelId: model.modelId,
+      fallbackProvider: settings.fallbackProvider,
+      fallbackModelId: settings.fallbackModelId,
+      defaultThinkingLevel: settings.defaultThinkingLevel,
+      runAuditor: audit,
+      settings,
+      taskId
+    });
+    options.onSession?.(session);
+    try {
+      await withRateLimitRetry(async () => {
+        await promptWithFallback(session, prompt);
+        checkSessionError(session);
+      }, { signal: options.signal });
+      await accumulateSessionTokenUsage(store, taskId, session);
+    } finally {
+      session.dispose();
+    }
+    return captured;
+  };
+}
+async function hasUnresolvedConflicts(cwd) {
+  return (await git2(["ls-files", "-u"], cwd)).length > 0;
+}
+async function landSquash(input) {
+  const { projectRootDir, mergeRoot, integrationBranch, tipSha, squashSha, taskId, audit, resolveConflicts: resolveConflicts2 } = input;
+  const emit2 = (outcome, extra = {}) => audit.git({ type: "merge:ai-local-sync", target: integrationBranch, metadata: { taskId, outcome, squashSha, ...extra } }).catch(() => void 0);
+  const currentBranch2 = await git2(["rev-parse", "--abbrev-ref", "HEAD"], projectRootDir).catch(() => "");
+  if (currentBranch2 !== integrationBranch) {
+    const adv = await advanceIntegrationBranchRef({
+      rootDir: mergeRoot,
+      projectRootDir,
+      integrationBranch,
+      newSha: squashSha,
+      expectedCurrentSha: tipSha,
+      taskId,
+      audit
+    });
+    if (!adv.advanced) {
+      if (adv.reason === "concurrent-advance" || adv.reason === "non-fast-forward-advance") {
+        return { outcome: "concurrent", localSync: "skipped-other-branch" };
+      }
+      throw new Error(`AI merge could not advance ${integrationBranch} for ${taskId}: ${adv.reason} (${adv.diagnostic})`);
+    }
+    await emit2("skipped-other-branch", { currentBranch: currentBranch2 });
+    return { outcome: "advanced", localSync: "skipped-other-branch" };
+  }
+  const head = await git2(["rev-parse", "HEAD"], projectRootDir).catch(() => "");
+  if (head !== tipSha) {
+    return { outcome: "concurrent", localSync: "skipped-other-branch" };
+  }
+  const dirty = (await git2(["status", "--porcelain"], projectRootDir)).length > 0;
+  const stashed = dirty ? await gitOk(["stash", "push", "--include-untracked", "-m", `fusion-ai-merge-sync-${taskId}`], projectRootDir) : false;
+  if (dirty && !stashed) {
+    const adv = await advanceIntegrationBranchRef({
+      rootDir: mergeRoot,
+      projectRootDir,
+      integrationBranch,
+      newSha: squashSha,
+      expectedCurrentSha: tipSha,
+      taskId,
+      audit
+    });
+    if (!adv.advanced) {
+      if (adv.reason === "concurrent-advance" || adv.reason === "non-fast-forward-advance") {
+        return { outcome: "concurrent", localSync: "skipped-dirty-unstashable" };
+      }
+      throw new Error(`AI merge could not advance ${integrationBranch} for ${taskId}: ${adv.reason} (${adv.diagnostic})`);
+    }
+    aiMergeLog.warn(`${taskId}: local checkout has un-stashable dirty state \u2014 advanced ${integrationBranch} without syncing your working tree; pull manually.`);
+    await emit2("skipped-dirty-unstashable");
+    return { outcome: "advanced", localSync: "skipped-dirty-unstashable" };
+  }
+  if (!await gitOk(["merge", "--ff-only", squashSha], projectRootDir)) {
+    if (stashed) await gitOk(["stash", "pop"], projectRootDir);
+    return { outcome: "concurrent", localSync: "skipped-other-branch" };
+  }
+  if (!stashed) {
+    await emit2("ff");
+    return { outcome: "advanced", localSync: "ff" };
+  }
+  if (await gitOk(["stash", "pop"], projectRootDir)) {
+    await emit2("stash-ff-restore");
+    return { outcome: "advanced", localSync: "stash-ff-restore" };
+  }
+  if (resolveConflicts2) {
+    const conflicted = (await git2(["diff", "--name-only", "--diff-filter=U"], projectRootDir)).split("\n").map((l) => l.trim()).filter(Boolean);
+    try {
+      await resolveConflicts2(projectRootDir, buildStashResolvePrompt(conflicted));
+    } catch (err) {
+      aiMergeLog.warn(`${taskId}: AI stash-conflict resolver threw: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    if (!await hasUnresolvedConflicts(projectRootDir)) {
+      await gitOk(["reset"], projectRootDir);
+      aiMergeLog.log(`${taskId}: reconciled your local edits with the new tip; original pre-merge edits also kept in a stash as a backup (\`git stash list\`).`);
+      await emit2("stash-ff-airesolved", { conflicted, stashRetained: true });
+      return { outcome: "advanced", localSync: "stash-ff-airesolved" };
+    }
+  }
+  aiMergeLog.warn(`${taskId}: restoring your local changes onto the new tip conflicted and could not be auto-resolved. Your work is preserved in the stash (\`git stash list\`); re-apply with \`git stash pop\` and resolve manually.`);
+  await emit2("stash-ff-conflict");
+  return { outcome: "advanced", localSync: "stash-ff-conflict" };
+}
+function noOpResult(task, branch, reason) {
+  return {
+    task,
+    branch,
+    merged: false,
+    noOp: true,
+    ok: true,
+    reason,
+    worktreeRemoved: false,
+    branchDeleted: false
+  };
+}
+async function runAiMerge(store, projectRootDir, taskId, options = {}, deps = {}) {
+  const task = await store.getTask(taskId);
+  const branch = task.branch || canonicalFusionBranchName(taskId);
+  if (task.column === "done" || task.column === "archived") {
+    return noOpResult(task, branch, "already-finalized");
+  }
+  const blocker = getTaskMergeBlocker(task, { manual: options.manual === true });
+  if (blocker) throw new Error(`Cannot merge ${taskId}: ${blocker}`);
+  const settings = await store.getSettings();
+  const projectDefaultBranch = await resolveIntegrationBranch(projectRootDir, settings);
+  const mergeTarget = resolveTaskMergeTarget(task, { projectDefaultBranch });
+  const integrationBranch = mergeTarget.branch;
+  const audit = createRunAuditor(store, {
+    runId: generateSyntheticRunId("ai-merge", taskId),
+    agentId: "merger",
+    taskId,
+    phase: "merge"
+  });
+  const log25 = async (message) => {
+    await store.logEntry(taskId, message, "AiMerge").catch(() => void 0);
+    await store.appendAgentLog(taskId, message, "text", void 0, "merger").catch(() => void 0);
+  };
+  const setStatus = (status) => store.updateTask(taskId, { status }).catch(() => void 0);
+  if (!await gitOk(["rev-parse", "--verify", `refs/heads/${branch}`], projectRootDir)) {
+    const wasExecuted = !!task.baseCommitSha;
+    const alreadyMerged = task.mergeDetails?.mergeConfirmed === true || !!task.mergeDetails?.commitSha;
+    if (wasExecuted && !alreadyMerged) {
+      await audit.git({
+        type: "merge:ai-no-branch",
+        target: branch,
+        metadata: { taskId, kind: "executed-branch-missing", baseCommitSha: task.baseCommitSha }
+      });
+      throw new Error(
+        `AI merge for ${taskId}: branch "${branch}" is missing, but the task was executed (baseCommitSha ${String(task.baseCommitSha).slice(0, 8)}) and has no recorded merge \u2014 its work appears lost. Not finalizing; investigate.`
+      );
+    }
+    await audit.git({
+      type: "merge:ai-no-branch",
+      target: branch,
+      metadata: { taskId, kind: alreadyMerged ? "already-merged" : "never-executed" }
+    });
+    return await finalizeTask(store, taskId, noOpResult(task, branch, alreadyMerged ? "already-merged" : "no-branch"));
+  }
+  if (!await gitOk(["rev-parse", "--verify", `refs/heads/${integrationBranch}`], projectRootDir)) {
+    await audit.git({ type: "merge:ai-no-branch", target: integrationBranch, metadata: { taskId, kind: "integration-branch-missing" } });
+    throw new Error(`AI merge for ${taskId}: target branch "${integrationBranch}" has no local ref (refs/heads/${integrationBranch}). Create or check out the branch locally before merging.`);
+  }
+  const maxPasses = Math.max(0, Math.trunc(settings.merger?.maxReviewPasses ?? 3));
+  const mergeAgent = deps.mergeAgent ?? makeMutatingAgent(store, settings, taskId, options, audit, buildMergeSystemPrompt2(settings.agentPrompts));
+  const reviewAgent = deps.reviewAgent ?? makeReviewAgent(store, settings, taskId, options, audit);
+  const stashResolveAgent = deps.stashResolveAgent ?? makeMutatingAgent(store, settings, taskId, options, audit, buildStashResolveSystemPrompt());
+  const includeTaskId = settings.includeTaskIdInCommit !== false;
+  const trailers = taskTrailers(taskId, task.lineageId);
+  const taskTitle = task.title?.trim() ? task.title.split("\n")[0] : void 0;
+  await setStatus("merging");
+  let advanceRetries = 0;
+  while (true) {
+    throwIfAborted2(options.signal, taskId);
+    const tipSha = await git2(["rev-parse", "--verify", `refs/heads/${integrationBranch}`], projectRootDir);
+    const mergeRoot = await mkdtemp2(join50(tmpdir5(), `fusion-ai-merge-${taskId.toLowerCase()}-`));
+    let worktreeAdded = false;
+    try {
+      await git2(["worktree", "add", "--detach", mergeRoot, tipSha], projectRootDir);
+      worktreeAdded = true;
+      await audit.git({ type: "merge:ai-clean-room", target: integrationBranch, metadata: { taskId, tipSha, mergeRoot } });
+      await log25(`AI merge: merging ${branch} into ${integrationBranch} (clean room at ${short(tipSha)})${advanceRetries ? ` \u2014 retry ${advanceRetries} after concurrent advance` : ""}`);
+      const squashSha = await mergeAndReview({
+        mergeRoot,
+        branch,
+        integrationBranch,
+        tipSha,
+        taskTitle,
+        includeTaskId,
+        trailers,
+        taskId,
+        maxPasses,
+        mergeAgent,
+        reviewAgent,
+        audit,
+        log: log25,
+        setStatus,
+        signal: options.signal
+      });
+      if (!squashSha) {
+        await audit.git({ type: "merge:ai-empty", target: integrationBranch, metadata: { taskId, tipSha } });
+        await log25(`AI merge: ${branch} had no net changes vs ${integrationBranch} \u2014 finalizing as no-op`);
+        return await finalizeMerged(store, projectRootDir, taskId, task, branch, integrationBranch, tipSha, audit, log25, { empty: true });
+      }
+      await setStatus("landing");
+      const landed = await landSquash({
+        projectRootDir,
+        mergeRoot,
+        integrationBranch,
+        tipSha,
+        squashSha,
+        taskId,
+        audit,
+        resolveConflicts: stashResolveAgent
+      });
+      if (landed.outcome === "concurrent") {
+        if (advanceRetries < MAX_CONCURRENT_ADVANCE_RETRIES) {
+          advanceRetries++;
+          await log25(`AI merge: ${integrationBranch} moved during merge \u2014 rebuilding on new tip (retry ${advanceRetries})`);
+          continue;
+        }
+        throw new Error(`AI merge could not advance ${integrationBranch} for ${taskId} after ${advanceRetries} retries (concurrent advances)`);
+      }
+      await log25(`AI merge: advanced ${integrationBranch} \u2192 ${short(squashSha)} (local checkout: ${landed.localSync})`);
+      return await finalizeMerged(store, projectRootDir, taskId, task, branch, integrationBranch, squashSha, audit, log25, { empty: false });
+    } finally {
+      if (worktreeAdded) {
+        await gitOk(["worktree", "remove", "--force", mergeRoot], projectRootDir);
+      }
+      await rm6(mergeRoot, { recursive: true, force: true }).catch(() => void 0);
+    }
+  }
+}
+async function mergeAndReview(input) {
+  const { mergeRoot, branch, integrationBranch, tipSha, taskTitle, includeTaskId, trailers, taskId, maxPasses, mergeAgent, reviewAgent, audit, log: log25, setStatus, signal } = input;
+  let priorReasons = [];
+  for (let attempt = 0; ; attempt++) {
+    throwIfAborted2(signal, taskId);
+    await git2(["reset", "--hard", tipSha], mergeRoot);
+    await git2(["clean", "-fd"], mergeRoot);
+    if (attempt > 0) {
+      await setStatus("merging");
+      await log25(`AI merge: corrective re-merge (pass ${attempt}/${maxPasses}) addressing: ${priorReasons.join("; ")}`);
+    }
+    await mergeAgent(mergeRoot, buildMergePrompt2({
+      taskId,
+      branch,
+      integrationBranch,
+      tipSha,
+      taskTitle,
+      includeTaskId,
+      trailers,
+      correctiveReasons: priorReasons.length ? priorReasons : void 0
+    }));
+    let head = await git2(["rev-parse", "HEAD"], mergeRoot);
+    if (head === tipSha) return null;
+    await ensureCommitTaskMetadata(mergeRoot, taskId, includeTaskId, trailers);
+    head = await git2(["rev-parse", "HEAD"], mergeRoot);
+    await setStatus("reviewing");
+    const diffStat = await git2(["diff", "--stat", `${tipSha}..${head}`], mergeRoot);
+    const verdict = parseReviewVerdict(await reviewAgent(mergeRoot, buildReviewPrompt({
+      taskId,
+      branch,
+      integrationBranch,
+      tipSha,
+      squashSha: head,
+      diffStat,
+      priorReasons
+    })));
+    await audit.git({
+      type: "merge:ai-review-verdict",
+      target: integrationBranch,
+      metadata: { taskId, attempt, verdict: verdict.verdict, severity: verdict.severity, reasons: verdict.reasons, squashSha: head }
+    });
+    if (verdict.verdict === "approve") {
+      await log25(`AI merge review (pass ${attempt + 1}): approved`);
+      return head;
+    }
+    const budgetExhausted = attempt >= maxPasses;
+    if (budgetExhausted) {
+      if (verdict.severity === "blocking") {
+        await audit.git({ type: "merge:ai-review-blocked", target: integrationBranch, metadata: { taskId, attempt, reasons: verdict.reasons } });
+        await log25(`AI merge BLOCKED after ${attempt} corrective pass(es) \u2014 unresolved correctness concern: ${verdict.reasons.join("; ")}`);
+        throw new AiMergeBlockedError(taskId, verdict.reasons);
+      }
+      await audit.git({ type: "merge:ai-review-landed-with-concerns", target: integrationBranch, metadata: { taskId, attempt, reasons: verdict.reasons, squashSha: head } });
+      await log25(`AI merge: landing with unresolved advisory concern(s): ${verdict.reasons.join("; ")}`);
+      return head;
+    }
+    priorReasons = verdict.reasons;
+    await log25(`AI merge review (pass ${attempt + 1}): rejected (${verdict.severity}) \u2014 ${verdict.reasons.join("; ")}`);
+  }
+}
+async function finalizeMerged(store, projectRootDir, taskId, task, branch, integrationBranch, landedSha, audit, log25, opts) {
+  let branchDeleted = false;
+  if (branch !== integrationBranch && await gitOk(["branch", "-D", branch], projectRootDir)) {
+    branchDeleted = true;
+    await audit.git({ type: "branch:delete", target: branch, metadata: { taskId, force: true } }).catch(() => void 0);
+  }
+  let worktreeRemoved = false;
+  if (task.worktree) {
+    worktreeRemoved = await gitOk(["worktree", "remove", "--force", task.worktree], projectRootDir);
+    await store.updateTask(taskId, { worktree: null }).catch(() => void 0);
+  }
+  const result = {
+    task,
+    branch,
+    merged: !opts.empty,
+    noOp: opts.empty,
+    ok: true,
+    reason: opts.empty ? "no-net-changes" : void 0,
+    commitSha: opts.empty ? void 0 : landedSha,
+    mergeConfirmed: !opts.empty,
+    worktreeRemoved,
+    branchDeleted
+  };
+  await audit.git({ type: "merge:ai-landed", target: integrationBranch, metadata: { taskId, landedSha, empty: opts.empty } }).catch(() => void 0);
+  await log25(opts.empty ? `AI merge: finalized ${taskId} (no-op) \u2192 done` : `AI merge: landed ${short(landedSha)}, task \u2192 done`);
+  return await finalizeTask(store, taskId, result);
+}
+async function finalizeTask(store, taskId, result) {
+  await store.updateTask(taskId, { status: null }).catch(() => void 0);
+  const task = await store.moveTask(taskId, "done");
+  result.task = task;
+  store.emit("task:merged", result);
+  return result;
+}
+function throwIfAborted2(signal, taskId) {
+  if (signal?.aborted) {
+    const err = new Error(`AI merge aborted for ${taskId}`);
+    err.name = "MergeAbortedError";
+    throw err;
+  }
+}
+var execFileAsync10, aiMergeLog, MAX_CONCURRENT_ADVANCE_RETRIES, FUSION_TASK_ID_TRAILER_KEY3, REVIEW_VERDICT_MARKER, VERDICT_LINE_RE, SEVERITY_LINE_RE, AiMergeBlockedError;
+var init_merger_ai = __esm({
+  "../engine/src/merger-ai.ts"() {
+    "use strict";
+    init_src();
+    init_worktree_names();
+    init_integration_branch();
+    init_merger_ref_update_advance();
+    init_agent_session_helpers();
+    init_pi();
+    init_rate_limit_retry();
+    init_usage_limit_detector();
+    init_session_token_usage();
+    init_run_audit();
+    init_logger2();
+    execFileAsync10 = promisify43(execFile15);
+    aiMergeLog = createLogger2("merger-ai");
+    MAX_CONCURRENT_ADVANCE_RETRIES = 3;
+    FUSION_TASK_ID_TRAILER_KEY3 = "Fusion-Task-Id";
+    REVIEW_VERDICT_MARKER = "REVIEW_VERDICT:";
+    VERDICT_LINE_RE = /REVIEW_VERDICT:\s*(approve|reject)\b/i;
+    SEVERITY_LINE_RE = /SEVERITY:\s*(blocking|advisory)\b/i;
+    AiMergeBlockedError = class extends Error {
+      taskId;
+      reasons;
+      constructor(taskId, reasons) {
+        super(`AI merge blocked ${taskId} (unresolved correctness concern): ${reasons.join("; ") || "no reason given"}`);
+        this.name = "AiMergeBlockedError";
+        this.taskId = taskId;
+        this.reasons = reasons;
+      }
+    };
+  }
+});
+
 // ../engine/src/research-dispatcher.ts
 var log24, ResearchRunDispatcher;
 var init_research_dispatcher = __esm({
@@ -134415,9 +135718,9 @@ var init_provider_adapters = __esm({
 });
 
 // ../engine/src/remote-access/tunnel-process-manager.ts
-import { EventEmitter as EventEmitter24 } from "node:events";
-import { exec as exec36, execFile as execFile15, spawn as spawn8 } from "node:child_process";
-import { promisify as promisify43 } from "node:util";
+import { EventEmitter as EventEmitter25 } from "node:events";
+import { exec as exec36, execFile as execFile16, spawn as spawn8 } from "node:child_process";
+import { promisify as promisify44 } from "node:util";
 function nowIso2() {
   return (/* @__PURE__ */ new Date()).toISOString();
 }
@@ -134457,7 +135760,7 @@ function toStateError(code, err) {
     at: nowIso2()
   };
 }
-var DEFAULT_MAX_LOG_ENTRIES, DEFAULT_STOP_TIMEOUT_MS2, execFileAsync10, execAsync32, LineBuffer, TunnelProcessManager;
+var DEFAULT_MAX_LOG_ENTRIES, DEFAULT_STOP_TIMEOUT_MS2, execFileAsync11, execAsync32, LineBuffer, TunnelProcessManager;
 var init_tunnel_process_manager = __esm({
   "../engine/src/remote-access/tunnel-process-manager.ts"() {
     "use strict";
@@ -134466,8 +135769,8 @@ var init_tunnel_process_manager = __esm({
     init_provider_adapters();
     DEFAULT_MAX_LOG_ENTRIES = 400;
     DEFAULT_STOP_TIMEOUT_MS2 = 5e3;
-    execFileAsync10 = promisify43(execFile15);
-    execAsync32 = promisify43(exec36);
+    execFileAsync11 = promisify44(execFile16);
+    execAsync32 = promisify44(exec36);
     LineBuffer = class {
       pending = "";
       push(chunk) {
@@ -134482,7 +135785,7 @@ var init_tunnel_process_manager = __esm({
         return tail ? [tail] : [];
       }
     };
-    TunnelProcessManager = class extends EventEmitter24 {
+    TunnelProcessManager = class extends EventEmitter25 {
       maxLogEntries;
       defaultStopTimeoutMs;
       spawnImpl;
@@ -134544,7 +135847,7 @@ var init_tunnel_process_manager = __esm({
           return null;
         }
         try {
-          const { stdout } = await execFileAsync10("tailscale", ["status", "--json"], { timeout: 3e3 });
+          const { stdout } = await execFileAsync11("tailscale", ["status", "--json"], { timeout: 3e3 });
           const data = JSON.parse(String(stdout));
           const dnsName = data.Self?.DNSName?.replace(/\.$/, "");
           if (!dnsName) {
@@ -134567,7 +135870,7 @@ var init_tunnel_process_manager = __esm({
         ];
         for (const resetCommand of resetCommands) {
           try {
-            await execFileAsync10(resetCommand.command, resetCommand.args, { timeout: 5e3 });
+            await execFileAsync11(resetCommand.command, resetCommand.args, { timeout: 5e3 });
             return;
           } catch {
           }
@@ -134868,8 +136171,8 @@ var init_tunnel_process_manager = __esm({
 });
 
 // ../engine/src/project-engine.ts
-import { execFile as execFile16 } from "node:child_process";
-import { promisify as promisify44 } from "node:util";
+import { execFile as execFile17 } from "node:child_process";
+import { promisify as promisify45 } from "node:util";
 function formatErrorDetails(error) {
   if (error instanceof Error) {
     return {
@@ -134884,6 +136187,40 @@ function isInvalidDoneTransitionError(error) {
   const message = error instanceof Error ? error.message : String(error);
   return message.includes("Invalid transition:") && message.includes("\u2192 'done'");
 }
+async function verifyMergeConfirmedReachability(args) {
+  const { commitSha, integrationBranch, cwd } = args;
+  if (!commitSha || !commitSha.trim()) {
+    return { reachable: true, skipped: "no-commit-sha" };
+  }
+  if (!integrationBranch || !integrationBranch.trim()) {
+    return { reachable: true, skipped: "no-integration-branch" };
+  }
+  try {
+    await execFileAsync12("git", ["cat-file", "-e", `${commitSha}^{commit}`], {
+      cwd,
+      timeout: 1e4
+    });
+  } catch (error) {
+    const diagnostic = error instanceof Error ? error.message : String(error);
+    return { reachable: false, reason: "commit-missing", diagnostic };
+  }
+  try {
+    await execFileAsync12(
+      "git",
+      ["merge-base", "--is-ancestor", commitSha, `refs/heads/${integrationBranch}`],
+      { cwd, timeout: 1e4 }
+    );
+    return { reachable: true };
+  } catch (error) {
+    const err = error;
+    const code = typeof err.code === "number" ? err.code : void 0;
+    const diagnostic = err.message ?? String(error);
+    if (code === 1) {
+      return { reachable: false, reason: "not-ancestor", diagnostic };
+    }
+    return { reachable: false, reason: "git-error", diagnostic };
+  }
+}
 function buildVerificationFailureSignature(error) {
   const commandResult = error.verificationResult.testResult ?? error.verificationResult.buildResult;
   const lane = commandResult?.command?.trim() || error.verificationResult.failedCommand?.trim() || "verification-failure";
@@ -134894,7 +136231,7 @@ function buildVerificationFailureSignature(error) {
     failedCommand: commandResult?.command ?? error.verificationResult.failedCommand ?? null
   }).signature;
 }
-var execFileAsync11, MERGE_HANDOFF_GRACE_MS, isRemoteActive, ProjectEngine;
+var execFileAsync12, MERGE_HANDOFF_GRACE_MS, isRemoteActive, ProjectEngine;
 var init_project_engine = __esm({
   "../engine/src/project-engine.ts"() {
     "use strict";
@@ -134908,6 +136245,7 @@ var init_project_engine = __esm({
     init_auth_storage();
     init_cron_runner();
     init_merger();
+    init_merger_ai();
     init_concurrency();
     init_logger2();
     init_research_orchestrator();
@@ -134916,7 +136254,7 @@ var init_project_engine = __esm({
     init_run_audit();
     init_verification_followup_dedup();
     init_tunnel_process_manager();
-    execFileAsync11 = promisify44(execFile16);
+    execFileAsync12 = promisify45(execFile17);
     MERGE_HANDOFF_GRACE_MS = 300;
     isRemoteActive = (ra) => ra?.activeProvider != null && (ra.providers[ra.activeProvider]?.enabled ?? false);
     ProjectEngine = class _ProjectEngine {
@@ -135661,7 +136999,7 @@ ${detail}`
       async checkExecutableAvailable(command) {
         const checker = process.platform === "win32" ? "where" : "which";
         try {
-          await execFileAsync11(checker, [command]);
+          await execFileAsync12(checker, [command]);
           return { available: true };
         } catch {
           return {
@@ -135861,6 +137199,112 @@ ${detail}`
                   continue;
                 }
                 if (task.mergeDetails?.mergeConfirmed) {
+                  const integrationBranchForGate = task.mergeDetails.mergeTargetBranch || task.baseBranch || "main";
+                  const reachability = await verifyMergeConfirmedReachability({
+                    commitSha: task.mergeDetails.commitSha,
+                    integrationBranch: integrationBranchForGate,
+                    cwd
+                  });
+                  if (!reachability.reachable) {
+                    const sha = task.mergeDetails.commitSha || "";
+                    const shortSha = sha ? sha.slice(0, 8) : "<no-sha>";
+                    const currentRetries = task.mergeRetries ?? 0;
+                    const budgetExhausted = currentRetries >= _ProjectEngine.MAX_AUTO_MERGE_RETRIES;
+                    const cleanedMergeDetails = {
+                      ...task.mergeDetails,
+                      mergeConfirmed: false,
+                      commitSha: void 0,
+                      mergedAt: void 0,
+                      landedFiles: void 0,
+                      filesChanged: void 0,
+                      insertions: void 0,
+                      deletions: void 0,
+                      noOpVerifiedShortCircuit: void 0,
+                      landedFilesAttributionRestricted: void 0
+                    };
+                    if (budgetExhausted) {
+                      const errorMsg = `Auto-merge fast-path refused after ${currentRetries} attempts: commit ${shortSha} is not reachable from ${integrationBranchForGate} (${reachability.reason}). Manual review required.`;
+                      runtimeLog.warn(
+                        `Auto-merge: ${taskId} fast-path REFUSED + budget exhausted \u2014 ${reachability.reason}: ${reachability.diagnostic}`
+                      );
+                      await store.logEntry(
+                        taskId,
+                        `[FN-5627] Auto-merge fast-path refused (retry budget exhausted) \u2014 ${errorMsg}`
+                      );
+                      await store.updateTask(taskId, {
+                        mergeDetails: cleanedMergeDetails,
+                        status: "failed",
+                        error: errorMsg
+                      });
+                      try {
+                        const auditor = createRunAuditor(store, {
+                          runId: generateSyntheticRunId("merger-fast-path-refused", taskId),
+                          agentId: "merger",
+                          taskId,
+                          phase: "auto-merge-fast-path-gate"
+                        });
+                        await auditor.database({
+                          type: "merger:fast-path-blocked-foreign-commit",
+                          target: taskId,
+                          metadata: {
+                            taskId,
+                            commitSha: sha,
+                            integrationBranch: integrationBranchForGate,
+                            reason: reachability.reason,
+                            diagnostic: reachability.diagnostic,
+                            mergeRetries: currentRetries,
+                            budgetExhausted: true
+                          }
+                        });
+                      } catch (auditErr) {
+                        runtimeLog.warn(
+                          `Auto-merge: ${taskId} fast-path audit emit failed: ${auditErr instanceof Error ? auditErr.message : String(auditErr)}`
+                        );
+                      }
+                      continue;
+                    }
+                    const nextRetries = currentRetries + 1;
+                    runtimeLog.warn(
+                      `Auto-merge: ${taskId} fast-path REFUSED \u2014 auto-recovering (attempt ${nextRetries}/${_ProjectEngine.MAX_AUTO_MERGE_RETRIES}): ${reachability.reason}: ${reachability.diagnostic}`
+                    );
+                    await store.logEntry(
+                      taskId,
+                      `Auto-recovered: fast-path refused \u2014 cleared poisoned mergeDetails (commit ${shortSha} not reachable from ${integrationBranchForGate}, ${reachability.reason}). Re-enqueueing for fresh merge attempt ${nextRetries}/${_ProjectEngine.MAX_AUTO_MERGE_RETRIES} [FN-5627].`
+                    );
+                    await store.updateTask(taskId, {
+                      mergeDetails: cleanedMergeDetails,
+                      mergeRetries: nextRetries,
+                      status: null,
+                      error: null
+                    });
+                    try {
+                      const auditor = createRunAuditor(store, {
+                        runId: generateSyntheticRunId("merger-fast-path-auto-recovered", taskId),
+                        agentId: "merger",
+                        taskId,
+                        phase: "auto-merge-fast-path-gate"
+                      });
+                      await auditor.database({
+                        type: "merger:fast-path-auto-recovered",
+                        target: taskId,
+                        metadata: {
+                          taskId,
+                          commitSha: sha,
+                          integrationBranch: integrationBranchForGate,
+                          reason: reachability.reason,
+                          diagnostic: reachability.diagnostic,
+                          mergeRetries: nextRetries,
+                          maxRetries: _ProjectEngine.MAX_AUTO_MERGE_RETRIES
+                        }
+                      });
+                    } catch (auditErr) {
+                      runtimeLog.warn(
+                        `Auto-merge: ${taskId} fast-path audit emit failed: ${auditErr instanceof Error ? auditErr.message : String(auditErr)}`
+                      );
+                    }
+                    this.internalEnqueueMerge(taskId);
+                    continue;
+                  }
                   const blockerReason = getTaskHardMergeBlocker(task);
                   if (blockerReason) {
                     await store.updateTask(taskId, {
@@ -135996,10 +137440,10 @@ ${detail}`
                 const pool = this.runtime.worktreePool;
                 const agentStore = this.runtime.agentStore;
                 const usageLimitPauser = this.runtime.usageLimitPauser;
-                const rawMerge = () => {
+                const rawMerge = async () => {
                   this.activeMergeTaskId = taskId;
                   this.mergeAbortController = new AbortController();
-                  return aiMergeTask(store, cwd, taskId, {
+                  const mergerOptions = {
                     manual: !!manualResolver,
                     pool,
                     usageLimitPauser,
@@ -136008,7 +137452,9 @@ ${detail}`
                     onSession: (session) => {
                       this.activeMergeSession = session;
                     }
-                  });
+                  };
+                  const mergerMode = normalizeMergerMode((await store.getSettings().catch(() => ({}))).merger?.mode);
+                  return mergerMode === "ai" ? runAiMerge(store, cwd, taskId, mergerOptions) : aiMergeTask(store, cwd, taskId, mergerOptions);
                 };
                 let result;
                 if (semaphore) {
@@ -138564,8 +140010,8 @@ var require_proper_lockfile = __commonJS({
 import { mkdirSync as mkdirSync10 } from "node:fs";
 import { access as access7, unlink as unlink7, writeFile as writeFile18 } from "node:fs/promises";
 import net from "node:net";
-import { platform as platform3, tmpdir as tmpdir5 } from "node:os";
-import { join as join50 } from "node:path";
+import { platform as platform3, tmpdir as tmpdir6 } from "node:os";
+import { join as join51 } from "node:path";
 import { createHash as createHash14 } from "node:crypto";
 function projectHash(projectId) {
   return createHash14("sha1").update(projectId).digest("hex").slice(0, 16);
@@ -138575,10 +140021,10 @@ function computeEngineSocketPath(projectId) {
   if (platform3() === "win32") {
     return `\\\\.\\pipe\\fusion-engine-${hash}`;
   }
-  return join50(tmpdir5(), `fusion-engine-${hash}.sock`);
+  return join51(tmpdir6(), `fusion-engine-${hash}.sock`);
 }
 function computeEngineLockFilePath(workingDir) {
-  return join50(workingDir, ".fusion", "engine.lock");
+  return join51(workingDir, ".fusion", "engine.lock");
 }
 async function ensureLockTargetExists(lockPath) {
   try {
@@ -138588,7 +140034,7 @@ async function ensureLockTargetExists(lockPath) {
   }
 }
 async function acquireLockfile(workingDir, onCompromised) {
-  const dir = join50(workingDir, ".fusion");
+  const dir = join51(workingDir, ".fusion");
   mkdirSync10(dir, { recursive: true });
   const path6 = computeEngineLockFilePath(workingDir);
   await ensureLockTargetExists(path6);
@@ -139204,7 +140650,7 @@ var init_node_health_monitor = __esm({
 });
 
 // ../engine/src/hybrid-executor.ts
-import { EventEmitter as EventEmitter25 } from "node:events";
+import { EventEmitter as EventEmitter26 } from "node:events";
 var HybridExecutor;
 var init_hybrid_executor = __esm({
   "../engine/src/hybrid-executor.ts"() {
@@ -139212,7 +140658,7 @@ var init_hybrid_executor = __esm({
     init_project_manager();
     init_node_health_monitor();
     init_logger2();
-    HybridExecutor = class extends EventEmitter25 {
+    HybridExecutor = class extends EventEmitter26 {
       /**
        * @param centralCore - CentralCore reference for global coordination
        * @param options - Optional configuration callbacks
@@ -139980,6 +141426,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,
@@ -140004,6 +141451,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,
@@ -140079,6 +141527,7 @@ __export(src_exports2, {
   assertSafeUrl: () => assertSafeUrl,
   auditSquashMerge: () => auditSquashMerge,
   buildAgentChatPrompt: () => buildAgentChatPrompt,
+  buildGoalContextSection: () => buildGoalContextSection,
   buildNtfyClickUrl: () => buildNtfyClickUrl,
   buildRuntimeResolutionContext: () => buildRuntimeResolutionContext,
   buildSystemPromptWithInstructions: () => buildSystemPromptWithInstructions,
@@ -140221,6 +141670,7 @@ var init_src2 = __esm({
     init_external_integrations();
     init_web_fetch();
     init_error_classifier();
+    init_goal_context_injector();
     init_worktrunk_installer();
     init_worktrunk_failure_handler();
     init_usage_limit_detector();
@@ -140522,7 +141972,7 @@ var init_planning_board_tools = __esm({
 
 // ../dashboard/src/planning.ts
 import { randomUUID as randomUUID22 } from "node:crypto";
-import { EventEmitter as EventEmitter26 } from "node:events";
+import { EventEmitter as EventEmitter27 } from "node:events";
 function ensureEngineReady() {
   return Promise.resolve();
 }
@@ -141546,7 +142996,7 @@ For completion:
     process.on("beforeExit", () => {
       clearInterval(cleanupInterval2);
     });
-    PlanningStreamManager = class extends EventEmitter26 {
+    PlanningStreamManager = class extends EventEmitter27 {
       constructor(bufferSize = 100) {
         super();
         this.bufferSize = bufferSize;
@@ -141761,7 +143211,7 @@ var init_ai_session_timeout = __esm({
 });
 
 // ../dashboard/src/subtask-breakdown.ts
-import { EventEmitter as EventEmitter27 } from "node:events";
+import { EventEmitter as EventEmitter28 } from "node:events";
 function cleanupInMemorySubtaskSession(sessionId) {
   const session = sessions2.get(sessionId);
   if (!session) {
@@ -141803,7 +143253,7 @@ var init_subtask_breakdown = __esm({
     process.on("beforeExit", () => {
       clearInterval(cleanupInterval3);
     });
-    SubtaskStreamManager = class extends EventEmitter27 {
+    SubtaskStreamManager = class extends EventEmitter28 {
       constructor(bufferSize = 100) {
         super();
         this.bufferSize = bufferSize;
@@ -141865,7 +143315,7 @@ var init_subtask_breakdown = __esm({
 });
 
 // ../dashboard/src/mission-interview.ts
-import { EventEmitter as EventEmitter28 } from "node:events";
+import { EventEmitter as EventEmitter29 } from "node:events";
 function cleanupInMemoryMissionSession(sessionId) {
   const session = sessions3.get(sessionId);
   if (!session) {
@@ -141916,7 +143366,7 @@ var init_mission_interview = __esm({
     cleanupInterval4 = setInterval(cleanupExpiredSessions3, CLEANUP_INTERVAL_MS4);
     cleanupInterval4.unref?.();
     process.on("beforeExit", () => clearInterval(cleanupInterval4));
-    MissionInterviewStreamManager = class extends EventEmitter28 {
+    MissionInterviewStreamManager = class extends EventEmitter29 {
       constructor(bufferSize = 100) {
         super();
         this.bufferSize = bufferSize;
@@ -141984,7 +143434,7 @@ var init_mission_interview = __esm({
 });
 
 // ../dashboard/src/milestone-slice-interview.ts
-import { EventEmitter as EventEmitter29 } from "node:events";
+import { EventEmitter as EventEmitter30 } from "node:events";
 function cleanupInMemorySession2(sessionId) {
   const session = sessions4.get(sessionId);
   if (!session) {
@@ -142036,7 +143486,7 @@ var init_milestone_slice_interview = __esm({
     cleanupInterval5 = setInterval(cleanupExpiredSessions4, CLEANUP_INTERVAL_MS5);
     cleanupInterval5.unref?.();
     process.on("beforeExit", () => clearInterval(cleanupInterval5));
-    MilestoneSliceInterviewStreamManager = class extends EventEmitter29 {
+    MilestoneSliceInterviewStreamManager = class extends EventEmitter30 {
       constructor(bufferSize = 100) {
         super();
         this.bufferSize = bufferSize;
@@ -142351,13 +143801,13 @@ var init_cli_spawn = __esm({
 // ../../plugins/fusion-plugin-hermes-runtime/dist/fusion-skill-install.js
 import { cpSync, existsSync as existsSync43, lstatSync as lstatSync2, mkdirSync as mkdirSync11, readFileSync as readFileSync14, readlinkSync, rmSync as rmSync5, symlinkSync, unlinkSync as unlinkSync2 } from "node:fs";
 import { homedir as homedir8 } from "node:os";
-import { basename as basename14, dirname as dirname19, join as join51, resolve as resolve29 } from "node:path";
+import { basename as basename14, dirname as dirname19, join as join52, resolve as resolve29 } from "node:path";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 function resolveHermesHome(profile) {
-  const base = process.env.HERMES_HOME ?? join51(homedir8(), ".hermes");
+  const base = process.env.HERMES_HOME ?? join52(homedir8(), ".hermes");
   if (!profile || profile === "default")
     return base;
-  return join51(base, "profiles", profile);
+  return join52(base, "profiles", profile);
 }
 function getFusionSkillSourceCandidates(moduleUrl = import.meta.url) {
   const here = fileURLToPath4(moduleUrl);
@@ -142372,14 +143822,14 @@ function getFusionSkillSourceCandidates(moduleUrl = import.meta.url) {
 function resolveBundledFusionSkillSource() {
   const candidates = getFusionSkillSourceCandidates();
   for (const candidate of candidates) {
-    if (existsSync43(join51(candidate, "SKILL.md")))
+    if (existsSync43(join52(candidate, "SKILL.md")))
       return candidate;
   }
   return null;
 }
 function installFusionSkillIntoHermesHome(options = {}) {
   const sourceDir = options.sourceDir ?? resolveBundledFusionSkillSource();
-  const targetDir = join51(resolveHermesHome(options.profile), "skills", FUSION_SKILL_NAME);
+  const targetDir = join52(resolveHermesHome(options.profile), "skills", FUSION_SKILL_NAME);
   if (!sourceDir) {
     return {
       outcome: "warning",
@@ -142468,7 +143918,7 @@ function isBrokenSymlink(path6) {
   }
 }
 function looksLikePriorFusionInstall(path6) {
-  const skillMd = join51(path6, "SKILL.md");
+  const skillMd = join52(path6, "SKILL.md");
   if (!existsSync43(skillMd))
     return false;
   try {
@@ -142483,7 +143933,7 @@ function looksLikeFusionSkillTarget(path6) {
     return false;
   if (basename14(path6).toLowerCase() === FUSION_SKILL_NAME)
     return true;
-  return existsSync43(join51(path6, "SKILL.md"));
+  return existsSync43(join52(path6, "SKILL.md"));
 }
 var FUSION_SKILL_NAME;
 var init_fusion_skill_install = __esm({
@@ -142861,8 +144311,8 @@ var init_pi_module = __esm({
 
 // ../../plugins/fusion-plugin-openclaw-runtime/dist/mcp-config.js
 import { writeFileSync as writeFileSync5 } from "node:fs";
-import { tmpdir as tmpdir6 } from "node:os";
-import { join as join52 } from "node:path";
+import { tmpdir as tmpdir7 } from "node:os";
+import { join as join53 } from "node:path";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 import { dirname as dirname20 } from "node:path";
 function toolsToMcpToolDefs(tools) {
@@ -142876,16 +144326,16 @@ function toolsToMcpToolDefs(tools) {
 }
 function writeOpenClawMcpBridgeFiles(toolDefs, cacheKey) {
   const suffix = cacheKey ? `${process.pid}-${cacheKey}` : `${process.pid}`;
-  const schemaPath = join52(tmpdir6(), `openclaw-runtime-mcp-schemas-${suffix}.json`);
+  const schemaPath = join53(tmpdir7(), `openclaw-runtime-mcp-schemas-${suffix}.json`);
   writeFileSync5(schemaPath, JSON.stringify(toolDefs));
   const __filename = fileURLToPath5(import.meta.url);
   const __dirname2 = dirname20(__filename);
-  const serverPath = join52(__dirname2, "mcp-schema-server.cjs");
+  const serverPath = join53(__dirname2, "mcp-schema-server.cjs");
   const serverConfig = {
     command: "node",
     args: [serverPath, schemaPath]
   };
-  const serverConfigPath = join52(tmpdir6(), `openclaw-runtime-mcp-server-${suffix}.json`);
+  const serverConfigPath = join53(tmpdir7(), `openclaw-runtime-mcp-server-${suffix}.json`);
   writeFileSync5(serverConfigPath, JSON.stringify(serverConfig));
   return {
     schemaPath,
@@ -143130,10 +144580,10 @@ var init_context = __esm({
 
 // ../dashboard/src/github.ts
 import { exec as exec37 } from "node:child_process";
-import { mkdtemp as mkdtemp2, rm as rm6 } from "node:fs/promises";
-import { tmpdir as tmpdir7 } from "node:os";
-import { join as join53 } from "node:path";
-import { promisify as promisify45 } from "node:util";
+import { mkdtemp as mkdtemp3, rm as rm7 } from "node:fs/promises";
+import { tmpdir as tmpdir8 } from "node:os";
+import { join as join54 } from "node:path";
+import { promisify as promisify46 } from "node:util";
 function quoteGitArg(value) {
   return `'${value.replaceAll("'", "'\\''")}'`;
 }
@@ -143391,7 +144841,7 @@ var init_github = __esm({
   "../dashboard/src/github.ts"() {
     "use strict";
     init_src();
-    execAsync33 = promisify45(exec37);
+    execAsync33 = promisify46(exec37);
     PR_REVIEW_PAGE_SIZE = 100;
     MAX_PR_REVIEW_PAGES = 10;
     MAX_BADGE_BATCH_SIZE = 100;
@@ -144059,8 +145509,8 @@ var init_github = __esm({
               { timeout: 3e4, maxBuffer: 10 * 1024 * 1024 }
             );
             const mergeBase = mergeBaseStdout.trim();
-            const indexDir = await mkdtemp2(join53(tmpdir7(), "fn-pr-conflict-"));
-            const indexPath = join53(indexDir, "index");
+            const indexDir = await mkdtemp3(join54(tmpdir8(), "fn-pr-conflict-"));
+            const indexPath = join54(indexDir, "index");
             const gitEnv = { ...process.env, GIT_INDEX_FILE: indexPath };
             try {
               await execAsync33(`git -C ${quoteGitArg(opts.repoRoot)} read-tree -m ${quoteGitArg(mergeBase)} ${quoteGitArg(baseRef)} ${quoteGitArg(headRef)}`, {
@@ -144079,7 +145529,7 @@ var init_github = __esm({
                 )
               ];
             } finally {
-              await rm6(indexDir, { recursive: true, force: true });
+              await rm7(indexDir, { recursive: true, force: true });
             }
           } catch {
             conflictingFiles = [];
@@ -146111,8 +147561,18 @@ var init_github_tracking_reconciler = __esm({
   }
 });
 
+// ../dashboard/src/github-source-issue-close.ts
+var init_github_source_issue_close = __esm({
+  "../dashboard/src/github-source-issue-close.ts"() {
+    "use strict";
+    init_github_auth();
+    init_github();
+    init_github_tracking_state();
+  }
+});
+
 // ../dashboard/src/github-poll.ts
-import { EventEmitter as EventEmitter30 } from "node:events";
+import { EventEmitter as EventEmitter31 } from "node:events";
 function toAlias(type, number) {
   return `${type}_${number}`;
 }
@@ -146158,7 +147618,7 @@ var init_github_poll = __esm({
       }
     };
     githubRateLimiter = new GitHubRateLimiter();
-    GitHubPollingService = class extends EventEmitter30 {
+    GitHubPollingService = class extends EventEmitter31 {
       watches = /* @__PURE__ */ new Map();
       rateLimiter;
       pollingIntervalMs;
@@ -146403,10 +147863,10 @@ var init_github_poll = __esm({
 });
 
 // ../dashboard/src/pr-metadata-generator.ts
-import { promisify as promisify46 } from "node:util";
+import { promisify as promisify47 } from "node:util";
 import { exec as execCb } from "node:child_process";
 import { access as access8, readFile as readFile26 } from "node:fs/promises";
-import { join as join54 } from "node:path";
+import { join as join55 } from "node:path";
 function buildFallback(task) {
   return {
     title: task.title ?? task.id,
@@ -146539,12 +147999,12 @@ async function generatePrMetadata(input) {
   ]);
   let promptContent = "";
   try {
-    const promptPath = join54(repoRoot, ".fusion", "tasks", task.id, "PROMPT.md");
+    const promptPath = join55(repoRoot, ".fusion", "tasks", task.id, "PROMPT.md");
     promptContent = (await readFile26(promptPath, "utf8")).trim();
   } catch {
     promptContent = "";
   }
-  const templatePath = join54(repoRoot, ".github", "pull_request_template.md");
+  const templatePath = join55(repoRoot, ".github", "pull_request_template.md");
   const templateExists = await access8(templatePath).then(() => true).catch(() => false);
   const template = templateExists ? await readFile26(templatePath, "utf8") : "";
   const model = resolveTaskPlanningModel(task, settings);
@@ -146603,24 +148063,24 @@ var init_pr_metadata_generator = __esm({
     "use strict";
     init_src();
     init_src2();
-    execAsync34 = promisify46(execCb);
+    execAsync34 = promisify47(execCb);
   }
 });
 
 // ../dashboard/src/routes/resolve-diff-base.ts
-import { execFile as execFile17 } from "node:child_process";
-import { promisify as promisify47 } from "node:util";
-var execFileAsync12;
+import { execFile as execFile18 } from "node:child_process";
+import { promisify as promisify48 } from "node:util";
+var execFileAsync13;
 var init_resolve_diff_base = __esm({
   "../dashboard/src/routes/resolve-diff-base.ts"() {
     "use strict";
-    execFileAsync12 = promisify47(execFile17);
+    execFileAsync13 = promisify48(execFile18);
   }
 });
 
 // ../dashboard/src/routes/register-git-github.ts
 import { exec as execCb2, spawn as spawn12 } from "node:child_process";
-import { promisify as promisify48 } from "node:util";
+import { promisify as promisify49 } from "node:util";
 var execAsync35, PR_ROUTE_MAX_BUFFER_BYTES;
 var init_register_git_github = __esm({
   "../dashboard/src/routes/register-git-github.ts"() {
@@ -146633,12 +148093,13 @@ var init_register_git_github = __esm({
     init_github_tracking_comments();
     init_github_tracking_state();
     init_github_tracking_reconciler();
+    init_github_source_issue_close();
     init_github_poll();
     init_project_store_resolver();
     init_pr_metadata_generator();
     init_github_webhooks();
     init_resolve_diff_base();
-    execAsync35 = promisify48(execCb2);
+    execAsync35 = promisify49(execCb2);
     PR_ROUTE_MAX_BUFFER_BYTES = 10 * 1024 * 1024;
   }
 });
@@ -146677,8 +148138,8 @@ var init_register_planning_subtask_routes = __esm({
 });
 
 // ../dashboard/src/chat.ts
-import { EventEmitter as EventEmitter31 } from "node:events";
-import { SessionManager as SessionManager3 } from "@mariozechner/pi-coding-agent";
+import { EventEmitter as EventEmitter32 } from "node:events";
+import { SessionManager as SessionManager3 } from "@earendil-works/pi-coding-agent";
 var defaultDiagnostics, _diagnostics, diagnostics6, RATE_LIMIT_WINDOW_MS5, MAX_REFERENCED_FILE_SIZE, ChatStreamManager, chatStreamManager;
 var init_chat = __esm({
   "../dashboard/src/chat.ts"() {
@@ -146712,7 +148173,7 @@ var init_chat = __esm({
     };
     RATE_LIMIT_WINDOW_MS5 = 60 * 1e3;
     MAX_REFERENCED_FILE_SIZE = 50 * 1024;
-    ChatStreamManager = class extends EventEmitter31 {
+    ChatStreamManager = class extends EventEmitter32 {
       constructor(bufferSize = 100) {
         super();
         this.bufferSize = bufferSize;
@@ -151496,7 +152957,7 @@ var init_register_messaging_scripts = __esm({
 // ../dashboard/src/terminal.ts
 import { spawn as spawn13 } from "node:child_process";
 import { randomUUID as randomUUID25 } from "node:crypto";
-import { EventEmitter as EventEmitter32 } from "node:events";
+import { EventEmitter as EventEmitter33 } from "node:events";
 function extractBaseCommand(command) {
   let trimmed = command.trim();
   while (/^[A-Za-z_][A-Za-z0-9_]*=/.test(trimmed)) {
@@ -151642,7 +153103,7 @@ var init_terminal = __esm({
       // >(...)  — process substitution (bash)
     ];
     CHAIN_OPERATORS = /&&|\|\||;|(?<!\|)\|(?!\|)/;
-    TerminalSessionManager = class extends EventEmitter32 {
+    TerminalSessionManager = class extends EventEmitter33 {
       sessions = /* @__PURE__ */ new Map();
       defaultTimeout = 3e4;
       // 30 seconds
@@ -151850,19 +153311,19 @@ var init_register_agents_projects_nodes = __esm({
 });
 
 // ../dashboard/src/exec-file.ts
-import { execFile as execFile18 } from "node:child_process";
-import { promisify as promisify49 } from "node:util";
-var execFileAsync13;
+import { execFile as execFile19 } from "node:child_process";
+import { promisify as promisify50 } from "node:util";
+var execFileAsync14;
 var init_exec_file = __esm({
   "../dashboard/src/exec-file.ts"() {
     "use strict";
-    execFileAsync13 = promisify49(execFile18);
+    execFileAsync14 = promisify50(execFile19);
   }
 });
 
 // ../dashboard/src/routes/register-project-routes.ts
 import * as fsPromises from "node:fs/promises";
-var access9, stat9, mkdir16, readdir9, rm7;
+var access9, stat9, mkdir16, readdir9, rm8;
 var init_register_project_routes = __esm({
   "../dashboard/src/routes/register-project-routes.ts"() {
     "use strict";
@@ -151875,7 +153336,7 @@ var init_register_project_routes = __esm({
       stat: stat9,
       mkdir: mkdir16,
       readdir: readdir9,
-      rm: rm7
+      rm: rm8
     } = fsPromises);
   }
 });
@@ -152071,7 +153532,7 @@ var init_agent_generation = __esm({
 
 // ../dashboard/src/routes/register-agent-import-export-generation-routes.ts
 import * as fsPromises2 from "node:fs/promises";
-var mkdtemp3, access10, stat10, mkdir17, rm8, fsWriteFile;
+var mkdtemp4, access10, stat10, mkdir17, rm9, fsWriteFile;
 var init_register_agent_import_export_generation_routes = __esm({
   "../dashboard/src/routes/register-agent-import-export-generation-routes.ts"() {
     "use strict";
@@ -152079,7 +153540,7 @@ var init_register_agent_import_export_generation_routes = __esm({
     init_ai_session_diagnostics();
     init_sse_buffer();
     init_agent_generation();
-    ({ mkdtemp: mkdtemp3, access: access10, stat: stat10, mkdir: mkdir17, rm: rm8, writeFile: fsWriteFile } = fsPromises2);
+    ({ mkdtemp: mkdtemp4, access: access10, stat: stat10, mkdir: mkdir17, rm: rm9, writeFile: fsWriteFile } = fsPromises2);
   }
 });
 
@@ -153349,6 +154810,16 @@ var init_todo_routes = __esm({
   }
 });
 
+// ../dashboard/src/goals-routes.ts
+import { Router as Router9 } from "express";
+var init_goals_routes = __esm({
+  "../dashboard/src/goals-routes.ts"() {
+    "use strict";
+    init_api_error();
+    init_project_store_resolver();
+  }
+});
+
 // ../../plugins/fusion-plugin-roadmap/src/store/roadmap-ordering.js
 function compareOrderedEntities(a, b2) {
   if (a.orderIndex !== b2.orderIndex) {
@@ -153514,13 +154985,13 @@ var init_roadmap_ordering = __esm({
 });
 
 // ../../plugins/fusion-plugin-roadmap/src/store/roadmap-store.js
-import { EventEmitter as EventEmitter33 } from "node:events";
+import { EventEmitter as EventEmitter34 } from "node:events";
 var RoadmapStore;
 var init_roadmap_store = __esm({
   "../../plugins/fusion-plugin-roadmap/src/store/roadmap-store.js"() {
     "use strict";
     init_roadmap_ordering();
-    RoadmapStore = class extends EventEmitter33 {
+    RoadmapStore = class extends EventEmitter34 {
       db;
       /**
        * Creates a new RoadmapStore instance.
@@ -155024,7 +156495,7 @@ var init_src5 = __esm({
 });
 
 // ../dashboard/src/roadmap-routes.ts
-import { Router as Router9 } from "express";
+import { Router as Router10 } from "express";
 var init_roadmap_routes3 = __esm({
   "../dashboard/src/roadmap-routes.ts"() {
     "use strict";
@@ -155068,7 +156539,7 @@ var init_dev_server_process = __esm({
 });
 
 // ../dashboard/src/dev-server-routes.ts
-import { Router as Router10 } from "express";
+import { Router as Router11 } from "express";
 var init_dev_server_routes = __esm({
   "../dashboard/src/dev-server-routes.ts"() {
     "use strict";
@@ -155080,7 +156551,7 @@ var init_dev_server_routes = __esm({
 });
 
 // ../dashboard/src/routes/register-stash-recovery-routes.ts
-import { Router as Router11 } from "express";
+import { Router as Router12 } from "express";
 var init_register_stash_recovery_routes = __esm({
   "../dashboard/src/routes/register-stash-recovery-routes.ts"() {
     "use strict";
@@ -155099,6 +156570,7 @@ var init_register_integrated_routers = __esm({
     init_research_routes();
     init_experiment_routes();
     init_todo_routes();
+    init_goals_routes();
     init_roadmap_routes3();
     init_dev_server_routes();
     init_register_stash_recovery_routes();
@@ -157463,7 +158935,7 @@ var require_extension = __commonJS({
 var require_websocket = __commonJS({
   "../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/websocket.js"(exports, module) {
     "use strict";
-    var EventEmitter34 = __require("events");
+    var EventEmitter35 = __require("events");
     var https = __require("https");
     var http = __require("http");
     var net2 = __require("net");
@@ -157495,7 +158967,7 @@ var require_websocket = __commonJS({
     var protocolVersions = [8, 13];
     var readyStates = ["CONNECTING", "OPEN", "CLOSING", "CLOSED"];
     var subprotocolRegex = /^[!#$%&'*+\-.0-9A-Z^_`|a-z~]+$/;
-    var WebSocket2 = class _WebSocket extends EventEmitter34 {
+    var WebSocket2 = class _WebSocket extends EventEmitter35 {
       /**
        * Create a new `WebSocket`.
        *
@@ -158492,7 +159964,7 @@ var require_subprotocol = __commonJS({
 var require_websocket_server = __commonJS({
   "../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/websocket-server.js"(exports, module) {
     "use strict";
-    var EventEmitter34 = __require("events");
+    var EventEmitter35 = __require("events");
     var http = __require("http");
     var { Duplex } = __require("stream");
     var { createHash: createHash15 } = __require("crypto");
@@ -158505,7 +159977,7 @@ var require_websocket_server = __commonJS({
     var RUNNING = 0;
     var CLOSING = 1;
     var CLOSED = 2;
-    var WebSocketServer2 = class extends EventEmitter34 {
+    var WebSocketServer2 = class extends EventEmitter35 {
       /**
        * Create a `WebSocketServer` instance.
        *
@@ -158943,7 +160415,7 @@ var init_view_chunk_manifest = __esm({
 
 // ../dashboard/src/server.ts
 import express from "express";
-import { join as join55, dirname as dirname21 } from "node:path";
+import { join as join56, dirname as dirname21 } from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 function clearAiSessionCleanupInterval() {
   if (!aiSessionCleanupIntervalHandle) {
@@ -159052,6 +160524,7 @@ var init_src6 = __esm({
     init_rate_limit();
     init_github_poll();
     init_github_issue_comment();
+    init_github_source_issue_close();
     init_github_tracking_comments();
     init_github_tracking_state();
     init_github_tracking_reconciler();
@@ -159248,7 +160721,7 @@ __export(task_exports, {
 });
 import { createInterface as createInterface2 } from "node:readline/promises";
 import { watchFile, unwatchFile, statSync as statSync7, existsSync as existsSync44, readFileSync as readFileSync15 } from "node:fs";
-import { basename as basename16, join as join56 } from "node:path";
+import { basename as basename16, join as join57 } from "node:path";
 function formatGhErrorForCli(err) {
   const structured = classifyGhError(err);
   const lines = [`GitHub error: ${structured.message}`];
@@ -159709,7 +161182,7 @@ async function runTaskLogs(id, options = {}, projectName) {
   printEntries(filteredEntries);
   if (options.follow) {
     const projectPath = projectContext?.projectPath ?? process.cwd();
-    const logPath = join56(projectPath, ".fusion", "tasks", id, "agent.log");
+    const logPath = join57(projectPath, ".fusion", "tasks", id, "agent.log");
     if (!existsSync44(logPath)) {
       console.log(`
   Waiting for log file to be created...`);
@@ -160887,8 +162360,8 @@ init_gh_cli();
 init_src2();
 init_src6();
 import { Type as Type8 } from "typebox";
-import { StringEnum } from "@mariozechner/pi-ai";
-import { resolve as resolve31, basename as basename17, extname as extname3, join as join57 } from "node:path";
+import { StringEnum } from "@earendil-works/pi-ai";
+import { resolve as resolve31, basename as basename17, extname as extname3, join as join58 } from "node:path";
 import { readFile as readFile28 } from "node:fs/promises";
 import { existsSync as existsSync45 } from "node:fs";
 import { spawn as spawn16 } from "node:child_process";
@@ -160914,12 +162387,12 @@ function resolveProjectRoot2(cwd) {
     warnedMissingProjectRootResolver = true;
     console.warn("[fusion-extension] @fusion/core.getProjectRootFromWorktree is unavailable; using filesystem fallback resolution.");
   }
-  if (worktreeProjectRoot && existsSync45(join57(worktreeProjectRoot, ".fusion"))) {
+  if (worktreeProjectRoot && existsSync45(join58(worktreeProjectRoot, ".fusion"))) {
     return worktreeProjectRoot;
   }
   let current = resolve31(cwd);
   while (true) {
-    if (existsSync45(join57(current, ".fusion"))) {
+    if (existsSync45(join58(current, ".fusion"))) {
       return current;
     }
     const parent = resolve31(current, "..");
@@ -160940,7 +162413,7 @@ async function getStore2(cwd) {
   return store;
 }
 function getFusionDir(cwd) {
-  return join57(resolveProjectRoot2(cwd), ".fusion");
+  return join58(resolveProjectRoot2(cwd), ".fusion");
 }
 function emitSecretAudit(store, ctx, mutationType, target, metadata) {
   if (!ctx.runId || !ctx.agentId) return;
@@ -162804,6 +164277,174 @@ Status: ${createdMission.status}${createdMission.autoAdvance ? "\nAuto-advance:
       };
     }
   });
+  pi2.registerTool({
+    name: "fn_goal_list",
+    label: "fn: List Goals",
+    description: "List goals by status with active-goal warning details.",
+    promptSnippet: "List project goals",
+    promptGuidelines: [
+      "Use to inspect current goals before creating or archiving",
+      "Default status is active; pass archived/all when needed",
+      "Soft warning begins at 3 active goals and hard cap is 5"
+    ],
+    parameters: Type8.Object({
+      status: Type8.Optional(
+        Type8.Union([
+          Type8.Literal("active"),
+          Type8.Literal("archived"),
+          Type8.Literal("all")
+        ], { description: "Filter by goal status (default: active)" })
+      )
+    }),
+    async execute(_toolCallId, params, _signal, _onUpdate, 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;
+      const lines = [];
+      lines.push(`Goals (${goals.length}) [filter: ${status}]`);
+      lines.push(`Active: ${activeCount}/5`);
+      if (softWarning) {
+        lines.push("\u26A0  3/5 active goals \u2014 soft warning at 3, hard cap at 5");
+      }
+      lines.push("");
+      if (goals.length === 0) {
+        lines.push("No goals found.");
+      } else {
+        for (const goal of goals) {
+          const description = goal.description ? ` \u2014 ${goal.description}` : "";
+          lines.push(`- ${goal.id} [${goal.status}] ${goal.title}${description}`);
+        }
+      }
+      return {
+        content: [{ type: "text", text: lines.join("\n") }],
+        details: { goals, activeCount, softWarning, hardLimit: 5 }
+      };
+    }
+  });
+  pi2.registerTool({
+    name: "fn_goal_create",
+    label: "fn: Create Goal",
+    description: "Create a new project goal.",
+    promptSnippet: "Create a new goal",
+    promptGuidelines: [
+      "Use clear titles and optional context-rich descriptions",
+      "Goal creation counts toward the 5 active-goal hard cap",
+      "Archive older goals when the active cap is reached"
+    ],
+    parameters: Type8.Object({
+      title: Type8.String({ description: "Goal title \u2014 brief but descriptive" }),
+      description: Type8.Optional(
+        Type8.String({ description: "Long-form goal description (free-text markdown)" })
+      )
+    }),
+    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      const store = await getStore2(ctx.cwd);
+      const goalStore = store.getGoalStore();
+      try {
+        const goal = goalStore.createGoal({
+          title: params.title.trim(),
+          description: params.description?.trim() || void 0
+        });
+        const activeCount = goalStore.listGoals({ status: "active" }).length;
+        const softWarning = activeCount >= 3;
+        return {
+          content: [{ type: "text", text: `Created ${goal.id}: ${goal.title}
+Status: ${goal.status}${softWarning ? `
+\u26A0  ${activeCount}/5 active goals \u2014 approaching hard cap` : ""}` }],
+          details: { goalId: goal.id, title: goal.title, status: goal.status, softWarning }
+        };
+      } catch (err) {
+        if (typeof err === "object" && err !== null && "code" in err && err.code === "ACTIVE_GOAL_LIMIT_EXCEEDED") {
+          const limit = err.limit ?? 5;
+          const currentActive = err.currentActive ?? 5;
+          return {
+            isError: true,
+            content: [{ type: "text", text: `Cannot create goal \u2014 already at the hard cap of 5 active goals (currently ${currentActive}). Archive one first.` }],
+            details: { code: "ACTIVE_GOAL_LIMIT_EXCEEDED", limit, currentActive }
+          };
+        }
+        throw err;
+      }
+    }
+  });
+  pi2.registerTool({
+    name: "fn_goal_archive",
+    label: "fn: Archive Goal",
+    description: "Archive a goal by ID.",
+    promptSnippet: "Archive a goal by ID",
+    promptGuidelines: [
+      "Use when a goal is complete or no longer active",
+      "Archiving frees active-goal capacity",
+      "Returns success for already archived goals"
+    ],
+    parameters: Type8.Object({
+      id: Type8.String({ description: "Goal ID (G-\u2026) to archive" })
+    }),
+    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      const store = await getStore2(ctx.cwd);
+      const goalStore = store.getGoalStore();
+      const goal = goalStore.getGoal(params.id);
+      if (!goal) {
+        return {
+          isError: true,
+          content: [{ type: "text", text: `Goal ${params.id} not found` }],
+          details: { code: "GOAL_NOT_FOUND", goalId: params.id }
+        };
+      }
+      if (goal.status === "archived") {
+        return {
+          content: [{ type: "text", text: `Goal ${params.id} is already archived` }],
+          details: { goalId: params.id, status: "archived" }
+        };
+      }
+      const archived = goalStore.archiveGoal(params.id);
+      return {
+        content: [{ type: "text", text: `Archived ${archived.id}: ${archived.title}` }],
+        details: { goalId: archived.id, status: "archived" }
+      };
+    }
+  });
+  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 store = await getStore2(ctx.cwd);
+      const goalStore = store.getGoalStore();
+      const goal = goalStore.getGoal(params.id);
+      if (!goal) {
+        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}`);
+      }
+      return {
+        content: [{ type: "text", text: lines.join("\n") }],
+        details: { goal }
+      };
+    }
+  });
   pi2.registerTool({
     name: "fn_mission_show",
     label: "fn: Show Mission",