@runfusion/fusion 0.8.3 → 0.8.4

package/dist/extension.js

@@ -2432,7 +2432,7 @@ var init_db = __esm({
     "use strict";
     init_sqlite_adapter();
     init_types();
-    SCHEMA_VERSION = 51;
+    SCHEMA_VERSION = 52;
     SCHEMA_SQL = `
 -- Tasks table with JSON columns for nested data
 CREATE TABLE IF NOT EXISTS tasks (
@@ -2949,7 +2949,12 @@ CREATE INDEX IF NOT EXISTS idxTodoItemsSortOrder ON todo_items(listId, sortOrder
         if (!inMemory && !existsSync(fusionDir)) {
           mkdirSync(fusionDir, { recursive: true });
         }
-        this.db = new DatabaseSync(this.dbPath);
+        try {
+          this.db = new DatabaseSync(this.dbPath);
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error);
+          throw new Error(`Failed to open Fusion database at ${this.dbPath}: ${message}`);
+        }
         if (!inMemory) {
           this.db.exec("PRAGMA journal_mode = WAL");
         }
@@ -3972,6 +3977,11 @@ CREATE INDEX IF NOT EXISTS idxTodoItemsSortOrder ON todo_items(listId, sortOrder
             }
           });
         }
+        if (version < 52) {
+          this.applyMigration(52, () => {
+            this.addColumnIfMissing("tasks", "mergeConflictBounceCount", "INTEGER DEFAULT 0");
+          });
+        }
       }
       /**
        * Run a single migration step inside a transaction and bump the version.
@@ -6305,14 +6315,17 @@ import { homedir } from "node:os";
 import { dirname, join as join4 } from "node:path";
 import { mkdir as mkdir3, readFile as readFile3, writeFile as writeFile3, rename as rename2, chmod } from "node:fs/promises";
 import { existsSync as existsSync3, mkdirSync as mkdirSync2, renameSync } from "node:fs";
+function getHomeDir() {
+  return process.env.HOME || process.env.USERPROFILE || homedir();
+}
 function legacyGlobalDir() {
-  return join4(homedir(), ".pi", "fusion");
+  return join4(getHomeDir(), ".pi", "fusion");
 }
 function legacyGlobalDirOriginal() {
-  return join4(homedir(), ".pi", "kb");
+  return join4(getHomeDir(), ".pi", "kb");
 }
 function defaultGlobalDir() {
-  return join4(homedir(), ".fusion");
+  return join4(getHomeDir(), ".fusion");
 }
 function resolveGlobalDir(dir) {
   const hasExplicitDir = typeof dir === "string" && dir.length > 0;
@@ -6484,9 +6497,9 @@ var init_global_settings = __esm({
        * Serialize operations via promise chain to prevent lost-update races.
        */
       withLock(fn) {
-        let resolve19;
+        let resolve17;
         const next = new Promise((r) => {
-          resolve19 = r;
+          resolve17 = r;
         });
         const prev = this.lock;
         this.lock = next;
@@ -6494,7 +6507,7 @@ var init_global_settings = __esm({
           try {
             return await fn();
           } finally {
-            resolve19();
+            resolve17();
           }
         });
       }
@@ -12033,7 +12046,12 @@ CREATE INDEX IF NOT EXISTS idxSettingsSyncNode ON settingsSyncState(nodeId);
         if (!existsSync6(this.globalDir)) {
           mkdirSync4(this.globalDir, { recursive: true });
         }
-        this.db = new DatabaseSync(this.dbPath);
+        try {
+          this.db = new DatabaseSync(this.dbPath);
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error);
+          throw new Error(`Failed to open Fusion central database at ${this.dbPath}: ${message}`);
+        }
         this.db.exec("PRAGMA journal_mode = WAL");
         this.db.exec("PRAGMA busy_timeout = 5000");
         this.db.exec("PRAGMA foreign_keys = ON");
@@ -17957,6 +17975,40 @@ var init_central_core = __esm({
   }
 });
 
+// ../core/src/sqlite-validation.ts
+import { existsSync as existsSync8, statSync as statSync2 } from "node:fs";
+function isValidSqliteDatabaseFile(dbPath) {
+  if (!existsSync8(dbPath)) {
+    return false;
+  }
+  try {
+    if (!statSync2(dbPath).isFile()) {
+      return false;
+    }
+  } catch {
+    return false;
+  }
+  let db = null;
+  try {
+    db = new DatabaseSync(dbPath);
+    db.prepare("PRAGMA schema_version").get();
+    return true;
+  } catch {
+    return false;
+  } finally {
+    try {
+      db?.close();
+    } catch {
+    }
+  }
+}
+var init_sqlite_validation = __esm({
+  "../core/src/sqlite-validation.ts"() {
+    "use strict";
+    init_sqlite_adapter();
+  }
+});
+
 // ../core/src/migration.ts
 var migration_exports = {};
 __export(migration_exports, {
@@ -17965,26 +18017,25 @@ __export(migration_exports, {
   MigrationCoordinator: () => MigrationCoordinator,
   ProjectRequiredError: () => ProjectRequiredError
 });
-import { existsSync as existsSync8, statSync as statSync2 } from "node:fs";
+import { existsSync as existsSync9 } from "node:fs";
 import { homedir as homedir2, tmpdir } from "node:os";
 import { isAbsolute as isAbsolute3, join as join11, resolve as resolve4, basename as basename3, dirname as dirname3 } from "node:path";
+function getHomeDir2() {
+  return process.env.HOME || process.env.USERPROFILE || homedir2();
+}
 function hasProjectDbFile(dir, folderName, dbName) {
   const projectDir = join11(dir, folderName);
   const dbPath = join11(projectDir, dbName);
-  if (!existsSync8(projectDir)) return false;
-  if (!existsSync8(dbPath)) return false;
-  try {
-    const stat8 = statSync2(dbPath);
-    return stat8.isFile() && stat8.size > 0;
-  } catch {
-    return false;
-  }
+  if (!existsSync9(projectDir)) return false;
+  return isValidSqliteDatabaseFile(dbPath);
 }
 var ProjectRequiredError, FirstRunDetector, MigrationCoordinator, BackwardCompat;
 var init_migration = __esm({
   "../core/src/migration.ts"() {
     "use strict";
     init_central_core();
+    init_global_settings();
+    init_sqlite_validation();
     ProjectRequiredError = class extends Error {
       constructor(message, availableProjects) {
         super(message);
@@ -18045,7 +18096,7 @@ var init_migration = __esm({
        */
       hasCentralDb() {
         const centralDbPath = join11(this.globalDir, "fusion-central.db");
-        return existsSync8(centralDbPath);
+        return existsSync9(centralDbPath);
       }
       /**
        * Get the path to the central database.
@@ -18067,7 +18118,7 @@ var init_migration = __esm({
         const projects = [];
         const visited = /* @__PURE__ */ new Set();
         let current = resolve4(startDir);
-        const home = homedir2();
+        const home = getHomeDir2();
         const root = dirname3(current) === current ? current : "/";
         const systemTmp = resolve4(tmpdir());
         while (current !== home && current !== root && current !== systemTmp) {
@@ -18099,7 +18150,7 @@ var init_migration = __esm({
        * @returns Generated name
        */
       async generateProjectName(projectPath) {
-        if (!existsSync8(join11(projectPath, ".git"))) {
+        if (!existsSync9(join11(projectPath, ".git"))) {
           return basename3(projectPath);
         }
         try {
@@ -18148,7 +18199,7 @@ var init_migration = __esm({
         return hasProjectDbFile(dir, ".fusion", "fusion.db");
       }
       getDefaultGlobalDir() {
-        return join11(homedir2(), ".pi", "kb");
+        return resolveGlobalDir();
       }
     };
     MigrationCoordinator = class {
@@ -27572,8 +27623,8 @@ var require_CronFileParser = __commonJS({
        * @throws If file cannot be read
        */
       static parseFileSync(filePath) {
-        const { readFileSync: readFileSync10 } = __require("fs");
-        const data = readFileSync10(filePath, "utf8");
+        const { readFileSync: readFileSync8 } = __require("fs");
+        const data = readFileSync8(filePath, "utf8");
         return _CronFileParser.#parseContent(data);
       }
       /**
@@ -27790,9 +27841,9 @@ var init_automation_store = __esm({
        */
       withScheduleLock(id, fn) {
         const prev = this.scheduleLocks.get(id) ?? Promise.resolve();
-        let resolve19;
+        let resolve17;
         const next = new Promise((r) => {
-          resolve19 = r;
+          resolve17 = r;
         });
         this.scheduleLocks.set(id, next);
         return prev.then(async () => {
@@ -27802,7 +27853,7 @@ var init_automation_store = __esm({
             if (this.scheduleLocks.get(id) === next) {
               this.scheduleLocks.delete(id);
             }
-            resolve19();
+            resolve17();
           }
         });
       }
@@ -28061,7 +28112,7 @@ __export(memory_dreams_exports, {
   syncMemoryDreamsAutomation: () => syncMemoryDreamsAutomation
 });
 import { appendFile, mkdir as mkdir5, readFile as readFile5, readdir as readdir3, stat, writeFile as writeFile4 } from "node:fs/promises";
-import { existsSync as existsSync9 } from "node:fs";
+import { existsSync as existsSync10 } from "node:fs";
 import { join as join13 } from "node:path";
 function agentMemoryWorkspacePath(rootDir, agentId) {
   const safeAgentId = agentId.trim().replace(/[^a-zA-Z0-9._-]+/g, "-").replace(/^-+|-+$/g, "") || "agent";
@@ -28080,7 +28131,7 @@ async function ensureAgentMemoryFiles(rootDir, agent, date = /* @__PURE__ */ new
   const workspacePath = agentMemoryWorkspacePath(rootDir, agent.id);
   await mkdir5(workspacePath, { recursive: true });
   const longTermPath = agentMemoryLongTermPath(rootDir, agent.id);
-  if (!existsSync9(longTermPath)) {
+  if (!existsSync10(longTermPath)) {
     const title = agent.name?.trim() ? `# Agent Memory: ${agent.name.trim()}` : "# Agent Memory";
     await writeFile4(
       longTermPath,
@@ -28094,11 +28145,11 @@ ${agent.memory?.trim() ?? ""}
     );
   }
   const dreamsPath = agentMemoryDreamsPath(rootDir, agent.id);
-  if (!existsSync9(dreamsPath)) {
+  if (!existsSync10(dreamsPath)) {
     await writeFile4(dreamsPath, "# Agent Memory Dreams\n\n<!-- Synthesized patterns from this agent's daily notes. -->\n", "utf-8");
   }
   const dailyPath = agentDailyMemoryPath(rootDir, agent.id, date);
-  if (!existsSync9(dailyPath)) {
+  if (!existsSync10(dailyPath)) {
     await writeFile4(dailyPath, `# Agent Daily Memory ${date.toISOString().slice(0, 10)}
 
 <!-- Running observations for this agent. -->
@@ -28146,7 +28197,7 @@ function extractDreamProcessorResult(output) {
   };
 }
 async function readIfExists(path2) {
-  if (!existsSync9(path2)) {
+  if (!existsSync10(path2)) {
     return "";
   }
   return readFile5(path2, "utf-8");
@@ -28188,7 +28239,7 @@ async function readAgentDailyNotes(rootDir, agentId, date) {
   const workspacePath = agentMemoryWorkspacePath(rootDir, agentId);
   const dateKey = date.toISOString().slice(0, 10);
   const dailyPath = agentDailyMemoryPath(rootDir, agentId, date);
-  if (existsSync9(dailyPath)) {
+  if (existsSync10(dailyPath)) {
     return readFile5(dailyPath, "utf-8");
   }
   const files = await readdir3(workspacePath).catch(() => []);
@@ -28383,7 +28434,7 @@ __export(memory_backend_exports, {
   writeProjectMemoryFile: () => writeProjectMemoryFile
 });
 import { readFile as readFile6, writeFile as writeFile5, mkdir as mkdir6, access as access2, constants, readdir as readdir4, stat as stat2 } from "node:fs/promises";
-import { existsSync as existsSync10 } from "node:fs";
+import { existsSync as existsSync11 } from "node:fs";
 import { basename as basename4, dirname as dirname4, isAbsolute as isAbsolute4, join as join14, normalize as normalize2, relative, resolve as resolve5, sep as sep2 } from "node:path";
 import { createHash as createHash3 } from "node:crypto";
 function shouldSkipBackgroundQmdRefresh() {
@@ -28468,18 +28519,18 @@ async function ensureOpenClawMemoryFiles(rootDir, date = /* @__PURE__ */ new Dat
   await mkdir6(workspacePath, { recursive: true });
   const longTermPath = memoryLongTermPath(rootDir);
   let longTermCreated = false;
-  if (!existsSync10(longTermPath)) {
+  if (!existsSync11(longTermPath)) {
     await writeFile5(longTermPath, getDefaultLongTermMemoryScaffold(), "utf-8");
     longTermCreated = true;
   }
   const todayPath = dailyMemoryPath(rootDir, date);
   let dailyCreated = false;
-  if (!existsSync10(todayPath)) {
+  if (!existsSync11(todayPath)) {
     await writeFile5(todayPath, getDefaultDailyMemoryScaffold(date), "utf-8");
     dailyCreated = true;
   }
   const dreamsPath = memoryDreamsPath(rootDir);
-  if (!existsSync10(dreamsPath)) {
+  if (!existsSync11(dreamsPath)) {
     await writeFile5(dreamsPath, getDefaultDreamsScaffold(), "utf-8");
   }
   return { longTermCreated, dailyCreated };
@@ -28558,7 +28609,7 @@ async function listAgentMemoryFiles(rootDir, agentId, date = /* @__PURE__ */ new
   const workspaceDisplayPath = relative(rootDir, workspacePath).replace(/\\/g, "/");
   const files = [];
   const longTermPath = join14(workspacePath, MEMORY_LONG_TERM_FILENAME);
-  if (existsSync10(longTermPath)) {
+  if (existsSync11(longTermPath)) {
     files.push({
       absPath: longTermPath,
       displayPath: `${workspaceDisplayPath}/${MEMORY_LONG_TERM_FILENAME}`,
@@ -28566,14 +28617,14 @@ async function listAgentMemoryFiles(rootDir, agentId, date = /* @__PURE__ */ new
     });
   }
   const dreamsPath = join14(workspacePath, MEMORY_DREAMS_FILENAME);
-  if (existsSync10(dreamsPath)) {
+  if (existsSync11(dreamsPath)) {
     files.push({
       absPath: dreamsPath,
       displayPath: `${workspaceDisplayPath}/${MEMORY_DREAMS_FILENAME}`,
       fileName: MEMORY_DREAMS_FILENAME
     });
   }
-  if (existsSync10(workspacePath)) {
+  if (existsSync11(workspacePath)) {
     for (const entry of await readdir4(workspacePath)) {
       if (!DAILY_MEMORY_RE.test(entry)) continue;
       const absPath = join14(workspacePath, entry);
@@ -28739,14 +28790,14 @@ async function listMemoryFiles(rootDir) {
   const files = [];
   const workspacePath = memoryWorkspacePath(rootDir);
   const longTerm = memoryLongTermPath(rootDir);
-  if (existsSync10(longTerm)) {
+  if (existsSync11(longTerm)) {
     files.push({ absPath: longTerm, displayPath: `${MEMORY_WORKSPACE_PATH}/${MEMORY_LONG_TERM_FILENAME}` });
   }
   const dreams = memoryDreamsPath(rootDir);
-  if (existsSync10(dreams)) {
+  if (existsSync11(dreams)) {
     files.push({ absPath: dreams, displayPath: `${MEMORY_WORKSPACE_PATH}/${MEMORY_DREAMS_FILENAME}` });
   }
-  if (existsSync10(workspacePath)) {
+  if (existsSync11(workspacePath)) {
     for (const entry of await readdir4(workspacePath)) {
       if (!DAILY_MEMORY_RE.test(entry)) continue;
       const absPath = join14(workspacePath, entry);
@@ -29112,7 +29163,7 @@ var init_memory_backend = __esm({
         const filePath = this.getLongTermPath(rootDir);
         const dir = join14(rootDir, MEMORY_WORKSPACE_PATH);
         try {
-          if (!existsSync10(dir)) {
+          if (!existsSync11(dir)) {
             await mkdir6(dir, { recursive: true });
           }
           const tmpPath = filePath + ".tmp";
@@ -29255,7 +29306,7 @@ var init_memory_backend = __esm({
 
 // ../core/src/project-memory.ts
 import { readFile as readFile7 } from "node:fs/promises";
-import { existsSync as existsSync11 } from "node:fs";
+import { existsSync as existsSync12 } from "node:fs";
 function getDefaultMemoryScaffold() {
   return `# Project Memory
 
@@ -29280,7 +29331,7 @@ function getDefaultMemoryScaffold() {
 }
 async function ensureMemoryFile(rootDir) {
   const longTermPath = memoryLongTermPath(rootDir);
-  if (existsSync11(longTermPath)) {
+  if (existsSync12(longTermPath)) {
     return false;
   }
   const { longTermCreated } = await ensureOpenClawMemoryFiles(rootDir);
@@ -29575,7 +29626,7 @@ This project has a memory system that stores durable project learnings.
 }
 async function readProjectMemory(rootDir) {
   const longTermPath = memoryLongTermPath(rootDir);
-  if (!existsSync11(longTermPath)) {
+  if (!existsSync12(longTermPath)) {
     return "";
   }
   return readFile7(longTermPath, "utf-8");
@@ -29590,7 +29641,7 @@ var init_project_memory = __esm({
 // ../core/src/run-command.ts
 import { spawn } from "node:child_process";
 function runCommandAsync(command, options = {}) {
-  return new Promise((resolve19) => {
+  return new Promise((resolve17) => {
     const maxBuffer = options.maxBuffer ?? DEFAULT_MAX_BUFFER;
     let stdout = "";
     let stderr = "";
@@ -29649,7 +29700,7 @@ function runCommandAsync(command, options = {}) {
         clearTimeout(forceKillTimer);
         forceKillTimer = null;
       }
-      resolve19({
+      resolve17({
         stdout,
         stderr,
         exitCode: null,
@@ -29667,7 +29718,7 @@ function runCommandAsync(command, options = {}) {
       }
       signalProcessGroup("SIGTERM");
       scheduleForceKill(NORMAL_CLEANUP_FORCE_KILL_DELAY_MS);
-      resolve19({
+      resolve17({
         stdout,
         stderr,
         exitCode: code,
@@ -29740,15 +29791,15 @@ import { EventEmitter as EventEmitter12 } from "node:events";
 import { randomUUID as randomUUID6 } 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 join15 } from "node:path";
-import { existsSync as existsSync12, watch } from "node:fs";
+import { existsSync as existsSync13, watch } from "node:fs";
 function assertSafeGitBranchName(name) {
   if (!name || name.length > 255 || name.startsWith("-") || name.startsWith(".") || name.startsWith("/") || name.endsWith("/") || name.endsWith(".") || name.endsWith(".lock") || name.includes("..") || name.includes("@{") || !/^[A-Za-z0-9._/+-]+$/.test(name)) {
     throw new Error(`Unsafe git branch name: ${JSON.stringify(name)}`);
   }
 }
 function assertSafeAbsolutePath(path2) {
-  const isAbsolute12 = path2.startsWith("/") || /^[A-Za-z]:[\\/]/.test(path2);
-  if (!path2 || path2.length > 4096 || !isAbsolute12 || path2.startsWith("-") || // Reject shell metacharacters, quotes, control chars, and NULs.
+  const isAbsolute13 = path2.startsWith("/") || /^[A-Za-z]:[\\/]/.test(path2);
+  if (!path2 || path2.length > 4096 || !isAbsolute13 || path2.startsWith("-") || // Reject shell metacharacters, quotes, control chars, and NULs.
   /["'`$\n\r\t;&|<>()*?[\]{}\\\0]/.test(
     path2.replace(/^[A-Za-z]:/, "")
     // ignore the drive-letter colon on Windows
@@ -29972,7 +30023,7 @@ var init_store = __esm({
         }
         await this.migrateActiveArchivedTasksToArchiveDb();
         await this.importLegacyAgentLogsOnce();
-        if (!existsSync12(this.configPath)) {
+        if (!existsSync13(this.configPath)) {
           const config = await this.readConfig();
           try {
             await writeFile6(this.configPath, JSON.stringify(config, null, 2));
@@ -30034,6 +30085,7 @@ var init_store = __esm({
           recoveryRetryCount: row.recoveryRetryCount ?? void 0,
           taskDoneRetryCount: row.taskDoneRetryCount ?? void 0,
           verificationFailureCount: row.verificationFailureCount ?? void 0,
+          mergeConflictBounceCount: row.mergeConflictBounceCount ?? void 0,
           nextRecoveryAt: row.nextRecoveryAt || void 0,
           error: row.error || void 0,
           summary: row.summary || void 0,
@@ -30181,7 +30233,7 @@ ${recentText}` : void 0
       }
       async readPromptForArchive(taskId) {
         const promptPath = join15(this.taskDir(taskId), "PROMPT.md");
-        if (!existsSync12(promptPath)) {
+        if (!existsSync13(promptPath)) {
           return void 0;
         }
         return readFile8(promptPath, "utf-8");
@@ -30323,6 +30375,7 @@ ${recentText}` : void 0
           "recoveryRetryCount",
           "taskDoneRetryCount",
           "verificationFailureCount",
+          "mergeConflictBounceCount",
           "nextRecoveryAt",
           "error",
           "summary",
@@ -30425,6 +30478,7 @@ ${outcome}`;
           "recoveryRetryCount",
           "taskDoneRetryCount",
           "verificationFailureCount",
+          "mergeConflictBounceCount",
           "nextRecoveryAt",
           "error",
           "summary",
@@ -30495,7 +30549,7 @@ ${outcome}`;
         id, title, description, priority, "column", status, size, reviewLevel, currentStep,
         worktree, blockedBy, paused, baseBranch, branch, baseCommitSha, modelPresetId, modelProvider,
         modelId, validatorModelProvider, validatorModelId, planningModelProvider, planningModelId, mergeRetries,
-        workflowStepRetries, stuckKillCount, postReviewFixCount, recoveryRetryCount, taskDoneRetryCount, verificationFailureCount, nextRecoveryAt, error,
+        workflowStepRetries, stuckKillCount, postReviewFixCount, recoveryRetryCount, taskDoneRetryCount, verificationFailureCount, mergeConflictBounceCount, nextRecoveryAt, error,
         summary, thinkingLevel, executionMode, tokenUsageInputTokens, tokenUsageOutputTokens, tokenUsageCachedTokens,
         tokenUsageTotalTokens, tokenUsageFirstUsedAt, tokenUsageLastUsedAt, createdAt, updatedAt, columnMovedAt,
         dependencies, steps, log, attachments, steeringComments,
@@ -30503,7 +30557,7 @@ ${outcome}`;
         sourceIssueProvider, sourceIssueRepository, sourceIssueExternalIssueId, sourceIssueNumber, sourceIssueUrl,
         mergeDetails, breakIntoSubtasks, enabledWorkflowSteps, modifiedFiles, missionId, sliceId, assignedAgentId, assigneeUserId, nodeId, effectiveNodeId, effectiveNodeSource, checkedOutBy, checkedOutAt
       ) VALUES (
-        ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
+        ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
       )
       ON CONFLICT(id) DO UPDATE SET
         title = excluded.title,
@@ -30534,6 +30588,7 @@ ${outcome}`;
         recoveryRetryCount = excluded.recoveryRetryCount,
         taskDoneRetryCount = excluded.taskDoneRetryCount,
         verificationFailureCount = excluded.verificationFailureCount,
+        mergeConflictBounceCount = excluded.mergeConflictBounceCount,
         nextRecoveryAt = excluded.nextRecoveryAt,
         error = excluded.error,
         summary = excluded.summary,
@@ -30605,6 +30660,7 @@ ${outcome}`;
           task.recoveryRetryCount ?? null,
           task.taskDoneRetryCount ?? 0,
           task.verificationFailureCount ?? 0,
+          task.mergeConflictBounceCount ?? 0,
           task.nextRecoveryAt ?? null,
           task.error ?? null,
           task.summary ?? null,
@@ -30817,9 +30873,9 @@ ${outcome}`;
        * lost-update races on the nextId counter.
        */
       withConfigLock(fn) {
-        let resolve19;
+        let resolve17;
         const next = new Promise((r) => {
-          resolve19 = r;
+          resolve17 = r;
         });
         const prev = this.configLock;
         this.configLock = next;
@@ -30827,7 +30883,7 @@ ${outcome}`;
           try {
             return await fn();
           } finally {
-            resolve19();
+            resolve17();
           }
         });
       }
@@ -30837,9 +30893,9 @@ ${outcome}`;
        */
       withTaskLock(id, fn) {
         const prev = this.taskLocks.get(id) ?? Promise.resolve();
-        let resolve19;
+        let resolve17;
         const next = new Promise((r) => {
-          resolve19 = r;
+          resolve17 = r;
         });
         this.taskLocks.set(id, next);
         return prev.then(async () => {
@@ -30849,7 +30905,7 @@ ${outcome}`;
             if (this.taskLocks.get(id) === next) {
               this.taskLocks.delete(id);
             }
-            resolve19();
+            resolve17();
           }
         });
       }
@@ -31567,7 +31623,7 @@ ${newTask.description}
           for (const attachment of sourceTask.attachments) {
             const sourcePath = join15(sourceAttachDir, attachment.filename);
             const targetPath = join15(targetAttachDir, attachment.filename);
-            if (existsSync12(sourcePath)) {
+            if (existsSync13(sourcePath)) {
               const content = await readFile8(sourcePath);
               await writeFile6(targetPath, content);
             }
@@ -31599,7 +31655,7 @@ ${newTask.description}
           }
           let prompt = "";
           const promptPath = join15(this.taskDir(id), "PROMPT.md");
-          if (existsSync12(promptPath)) {
+          if (existsSync13(promptPath)) {
             prompt = await readFile8(promptPath, "utf-8");
           }
           return { ...task, prompt };
@@ -32002,6 +32058,11 @@ ${newTask.description}
           } else if (updates.verificationFailureCount !== void 0) {
             task.verificationFailureCount = updates.verificationFailureCount;
           }
+          if (updates.mergeConflictBounceCount === null) {
+            task.mergeConflictBounceCount = void 0;
+          } else if (updates.mergeConflictBounceCount !== void 0) {
+            task.mergeConflictBounceCount = updates.mergeConflictBounceCount;
+          }
           if (updates.nextRecoveryAt === null) {
             task.nextRecoveryAt = void 0;
           } else if (updates.nextRecoveryAt !== void 0) {
@@ -32121,7 +32182,7 @@ ${newTask.description}
           }
           if (updates.prompt === void 0 && (updates.title !== void 0 || updates.description !== void 0)) {
             const promptPath = join15(dir, "PROMPT.md");
-            if (existsSync12(promptPath)) {
+            if (existsSync13(promptPath)) {
               const existingPrompt = await readFile8(promptPath, "utf-8");
               let newPrompt;
               if (task.column === "triage") {
@@ -32422,7 +32483,7 @@ ${task.description}
       async parseStepsFromPrompt(id) {
         const dir = this.taskDir(id);
         const promptPath = join15(dir, "PROMPT.md");
-        if (!existsSync12(promptPath)) return [];
+        if (!existsSync13(promptPath)) return [];
         const content = await readFile8(promptPath, "utf-8");
         const steps = [];
         const stepRegex = /^###\s+Step\s+\d+[^:]*:\s*(.+)$/gm;
@@ -32445,7 +32506,7 @@ ${task.description}
       async parseDependenciesFromPrompt(id) {
         const dir = this.taskDir(id);
         const promptPath = join15(dir, "PROMPT.md");
-        if (!existsSync12(promptPath)) return [];
+        if (!existsSync13(promptPath)) return [];
         const content = await readFile8(promptPath, "utf-8");
         const headingMatch = content.match(/^##\s+Dependencies\s*$/m);
         if (!headingMatch) return [];
@@ -32469,7 +32530,7 @@ ${task.description}
       async parseFileScopeFromPrompt(id) {
         const dir = this.taskDir(id);
         const promptPath = join15(dir, "PROMPT.md");
-        if (!existsSync12(promptPath)) return [];
+        if (!existsSync13(promptPath)) return [];
         const content = await readFile8(promptPath, "utf-8");
         const headingMatch = content.match(/^##\s+File\s+Scope\s*$/m);
         if (!headingMatch) return [];
@@ -32506,7 +32567,7 @@ ${task.description}
           const rewrittenDependents = this.rewriteDependentsAndDeleteTask(id, dependentIds);
           if (this.isWatching) this.taskCache.delete(id);
           const dir = this.taskDir(id);
-          if (existsSync12(dir)) {
+          if (existsSync13(dir)) {
             const { rm: rm4 } = await import("node:fs/promises");
             await rm4(dir, { recursive: true });
           }
@@ -32698,7 +32759,7 @@ ${task.description}
             };
             const worktreePath2 = task.worktree;
             const changed = this.clearDoneTransientFields(task);
-            if (worktreePath2 && existsSync12(worktreePath2)) {
+            if (worktreePath2 && existsSync13(worktreePath2)) {
               assertSafeAbsolutePath(worktreePath2);
               const removeWorktree = await this.runGitCommand(`git worktree remove "${worktreePath2}" --force`, 12e4);
               if (removeWorktree.exitCode === 0) {
@@ -32765,7 +32826,7 @@ ${task.description}
   # resolve conflicts, then: fn task move ${id} done`
             );
           }
-          if (worktreePath && existsSync12(worktreePath)) {
+          if (worktreePath && existsSync13(worktreePath)) {
             assertSafeAbsolutePath(worktreePath);
             const removeWorktree = await this.runGitCommand(`git worktree remove "${worktreePath}" --force`, 12e4);
             if (removeWorktree.exitCode === 0) {
@@ -33004,7 +33065,7 @@ ${task.description}
               }
             }
           }
-          await new Promise((resolve19) => setImmediate(resolve19));
+          await new Promise((resolve17) => setImmediate(resolve17));
           const selectClause = this.getTaskSelectClause(true);
           const changedRows = this.lastPollTime ? this.db.prepare(`SELECT ${selectClause} FROM tasks WHERE updatedAt > ? OR columnMovedAt > ?`).all(this.lastPollTime, this.lastPollTime) : this.db.prepare(`SELECT ${selectClause} FROM tasks`).all();
           this.lastPollTime = (/* @__PURE__ */ new Date()).toISOString();
@@ -33024,7 +33085,7 @@ ${task.description}
               this.emit("task:updated", task);
             }
             if (i > 0 && i % 50 === 0) {
-              await new Promise((resolve19) => setImmediate(resolve19));
+              await new Promise((resolve17) => setImmediate(resolve17));
             }
           }
           const elapsed = Date.now() - startTime;
@@ -33716,7 +33777,7 @@ ${task.description}
         return rows.map((row) => this.mapAgentLogRow(row));
       }
       async importLegacyAgentLogs() {
-        if (!existsSync12(this.tasksDir)) return 0;
+        if (!existsSync13(this.tasksDir)) return 0;
         const entries = await readdir5(this.tasksDir, { withFileTypes: true });
         let imported = 0;
         const insertStmt = this.db.prepare(`
@@ -33726,7 +33787,7 @@ ${task.description}
         for (const entry of entries) {
           if (!entry.isDirectory()) continue;
           const logPath = join15(this.tasksDir, entry.name, "agent.log");
-          if (!existsSync12(logPath)) continue;
+          if (!existsSync13(logPath)) continue;
           try {
             const content = await readFile8(logPath, "utf-8");
             for (const line of content.split("\n")) {
@@ -33830,7 +33891,7 @@ ${task.description}
         const cleanedUpIds = [];
         for (const task of archivedTasks) {
           const dir = this.taskDir(task.id);
-          if (!existsSync12(dir)) {
+          if (!existsSync13(dir)) {
             continue;
           }
           const entry = await this.taskToArchiveEntry(task, (/* @__PURE__ */ new Date()).toISOString());
@@ -34564,17 +34625,17 @@ var init_daemon_token = __esm({
 });
 
 // ../core/src/pi-extensions.ts
-import { existsSync as existsSync13, mkdirSync as mkdirSync5, readdirSync, readFileSync as readFileSync2, statSync as statSync3, writeFileSync } from "node:fs";
+import { existsSync as existsSync14, mkdirSync as mkdirSync5, readdirSync, readFileSync as readFileSync2, statSync as statSync3, writeFileSync } from "node:fs";
 import { homedir as homedir3 } from "node:os";
-import { basename as basename5, join as join16, relative as relative2, resolve as resolve6, sep as sep3 } from "node:path";
-function getHomeDir(home) {
+import { basename as basename5, isAbsolute as isAbsolute5, join as join16, relative as relative2, resolve as resolve6, sep as sep3, win32 } from "node:path";
+function getHomeDir3(home) {
   return home ?? process.env.HOME ?? process.env.USERPROFILE ?? homedir3();
 }
 function getFusionAgentDir(home) {
-  return join16(getHomeDir(home), ".fusion", "agent");
+  return join16(getHomeDir3(home), ".fusion", "agent");
 }
 function getLegacyPiAgentDir(home) {
-  return join16(getHomeDir(home), ".pi", "agent");
+  return join16(getHomeDir3(home), ".pi", "agent");
 }
 function getFusionAgentSettingsPath(home) {
   return join16(getFusionAgentDir(home), "settings.json");
@@ -34582,7 +34643,7 @@ function getFusionAgentSettingsPath(home) {
 function resolvePiExtensionProjectRoot(cwd) {
   let current = resolve6(cwd);
   while (true) {
-    if (existsSync13(join16(current, ".fusion"))) {
+    if (existsSync14(join16(current, ".fusion"))) {
       return current;
     }
     const parent = resolve6(current, "..");
@@ -34619,21 +34680,21 @@ function readPiManifest(packageJsonPath) {
 }
 function resolveExtensionEntries(dir) {
   const packageJsonPath = join16(dir, "package.json");
-  if (existsSync13(packageJsonPath)) {
+  if (existsSync14(packageJsonPath)) {
     const manifest = readPiManifest(packageJsonPath);
     if (manifest?.extensions?.length) {
-      const entries = manifest.extensions.map((entry) => resolve6(dir, entry)).filter((entry) => existsSync13(entry));
+      const entries = manifest.extensions.map((entry) => resolve6(dir, entry)).filter((entry) => existsSync14(entry));
       if (entries.length > 0) return entries;
     }
   }
   const indexTs = join16(dir, "index.ts");
-  if (existsSync13(indexTs)) return [indexTs];
+  if (existsSync14(indexTs)) return [indexTs];
   const indexJs = join16(dir, "index.js");
-  if (existsSync13(indexJs)) return [indexJs];
+  if (existsSync14(indexJs)) return [indexJs];
   return null;
 }
 function discoverExtensionsInDir(dir, cwd, home) {
-  if (!existsSync13(dir)) return [];
+  if (!existsSync14(dir)) return [];
   const discovered = [];
   try {
     for (const entry of readdirSync(dir, { withFileTypes: true })) {
@@ -34753,10 +34814,24 @@ function reconcileClaudeCliPaths(paths, vendoredPath) {
   }
   return filtered;
 }
+function getDisplayPathWithinRoot(root, targetPath) {
+  const usesWindowsPaths = /^[A-Za-z]:[\\/]/.test(root) || /^[A-Za-z]:[\\/]/.test(targetPath) || root.includes("\\") || targetPath.includes("\\");
+  const pathApi = usesWindowsPaths ? win32 : { relative: relative2, isAbsolute: isAbsolute5, sep: sep3 };
+  const rel = pathApi.relative(root, targetPath);
+  if (rel === "") {
+    return "";
+  }
+  if (!rel || rel === ".." || rel.startsWith(`..${pathApi.sep}`) || pathApi.isAbsolute(rel)) {
+    return null;
+  }
+  return rel.split(pathApi.sep).join("/");
+}
 function formatPiExtensionSource(source, extensionPath, cwd, home) {
-  const homeDir = getHomeDir(home);
+  const homeDir = getHomeDir3(home);
   const projectRoot = resolvePiExtensionProjectRoot(cwd);
-  const relativePath = extensionPath.startsWith(homeDir) ? `~${extensionPath.slice(homeDir.length)}` : extensionPath.startsWith(projectRoot) ? relative2(projectRoot, extensionPath).split(sep3).join("/") : extensionPath;
+  const relativeToHome = getDisplayPathWithinRoot(homeDir, extensionPath);
+  const relativeToProject = getDisplayPathWithinRoot(projectRoot, extensionPath);
+  const relativePath = relativeToHome !== null ? relativeToHome.length > 0 ? `~/${relativeToHome}` : "~" : relativeToProject !== null ? relativeToProject || "." : extensionPath;
   return `${source}: ${relativePath}`;
 }
 var FUSION_DISABLED_EXTENSIONS_KEY;
@@ -34850,7 +34925,7 @@ function runGh(args, cwd) {
 }
 function runGhAsync(args, cwdOrOptions) {
   const { cwd, signal: externalSignal, timeoutMs = DEFAULT_GH_TIMEOUT_MS } = normalizeRunGhOptions(cwdOrOptions);
-  return new Promise((resolve19, reject) => {
+  return new Promise((resolve17, reject) => {
     if (externalSignal?.aborted) {
       reject(makeGhError(`gh command aborted: ${describeAbortReason(externalSignal.reason)}`, "ABORT_ERR"));
       return;
@@ -34901,7 +34976,7 @@ function runGhAsync(args, cwdOrOptions) {
           ghError.stderr = stderr ?? "";
           reject(ghError);
         } else {
-          resolve19(stdout ?? "");
+          resolve17(stdout ?? "");
         }
       }
     );
@@ -35189,9 +35264,9 @@ var init_routine_store = __esm({
        */
       withRoutineLock(id, fn) {
         const prev = this.routineLocks.get(id) ?? Promise.resolve();
-        let resolve19;
+        let resolve17;
         const next = new Promise((r) => {
-          resolve19 = r;
+          resolve17 = r;
         });
         this.routineLocks.set(id, next);
         return prev.then(async () => {
@@ -35201,7 +35276,7 @@ var init_routine_store = __esm({
             if (this.routineLocks.get(id) === next) {
               this.routineLocks.delete(id);
             }
-            resolve19();
+            resolve17();
           }
         });
       }
@@ -35534,7 +35609,7 @@ var init_dispatcher = __esm({
 });
 
 // ../core/src/plugin-loader.ts
-import { basename as basename6, dirname as dirname5, extname, isAbsolute as isAbsolute5, resolve as resolve7 } from "node:path";
+import { basename as basename6, dirname as dirname5, extname, isAbsolute as isAbsolute6, resolve as resolve7 } from "node:path";
 import { copyFile, rm } from "node:fs/promises";
 import { pathToFileURL } from "node:url";
 import { EventEmitter as EventEmitter14 } from "node:events";
@@ -35673,7 +35748,7 @@ var init_plugin_loader = __esm({
         }
       }
       resolvePluginPath(path2) {
-        if (isAbsolute5(path2)) {
+        if (isAbsolute6(path2)) {
           return path2;
         }
         if (path2.startsWith("@") || path2.includes("/")) {
@@ -35800,13 +35875,13 @@ var init_plugin_loader = __esm({
        * Execute a promise with a timeout.
        */
       withTimeout(promise, ms, timeoutMessage) {
-        return new Promise((resolve19, reject) => {
+        return new Promise((resolve17, reject) => {
           const timer = setTimeout(() => {
             reject(new Error(timeoutMessage));
           }, ms);
           promise.then((result) => {
             clearTimeout(timer);
-            resolve19(result);
+            resolve17(result);
           }).catch((err) => {
             clearTimeout(timer);
             reject(err);
@@ -36092,7 +36167,7 @@ var init_plugin_loader = __esm({
 
 // ../core/src/backup.ts
 import { cp, mkdir as mkdir8, readdir as readdir6, stat as stat3, unlink as unlink4 } from "node:fs/promises";
-import { existsSync as existsSync14 } from "node:fs";
+import { existsSync as existsSync15 } from "node:fs";
 import { join as join17 } from "node:path";
 function generateBackupFilename() {
   return `fusion-${formatTimestamp(/* @__PURE__ */ new Date())}.db`;
@@ -36276,7 +36351,7 @@ var init_backup = __esm({
         let filename = generateBackupFilename();
         let targetPath = join17(backupDirPath, filename);
         let counter = 1;
-        while (existsSync14(targetPath)) {
+        while (existsSync15(targetPath)) {
           const baseName = filename.replace(/\.db$/, "");
           filename = `${baseName}-${counter}.db`;
           targetPath = join17(backupDirPath, filename);
@@ -36653,10 +36728,88 @@ async function summarizeTitle(description, rootDir, provider, modelId) {
     }
   }
 }
+async function summarizeCommitBody(diffStat, rootDir, provider, modelId, opts) {
+  const trimmedStat = (diffStat ?? "").trim();
+  if (trimmedStat.length === 0) {
+    return null;
+  }
+  const truncatedStat = trimmedStat.length > MAX_COMMIT_BODY_INPUT_LENGTH ? trimmedStat.slice(0, MAX_COMMIT_BODY_INPUT_LENGTH) + "\n\u2026(truncated)" : trimmedStat;
+  const userPromptParts = [];
+  if (opts?.branch) userPromptParts.push(`Branch: ${opts.branch}`);
+  if (opts?.taskId) userPromptParts.push(`Task: ${opts.taskId}`);
+  if (userPromptParts.length > 0) userPromptParts.push("");
+  userPromptParts.push("Files changed (`git diff --stat`):");
+  userPromptParts.push(truncatedStat);
+  userPromptParts.push("");
+  userPromptParts.push("Write the commit body now.");
+  const userPrompt = userPromptParts.join("\n");
+  const timeoutMs = opts?.timeoutMs ?? DEFAULT_COMMIT_BODY_TIMEOUT_MS;
+  const aborter = new AbortController();
+  const timer = setTimeout(() => aborter.abort(), timeoutMs);
+  if (opts?.signal) {
+    if (opts.signal.aborted) aborter.abort();
+    else opts.signal.addEventListener("abort", () => aborter.abort(), { once: true });
+  }
+  let session;
+  try {
+    const createFnAgent5 = await getFnAgent();
+    if (!createFnAgent5) {
+      if (DEBUG) console.log("[ai-summarize] AI engine not available for commit body");
+      return null;
+    }
+    const agentOptions = {
+      cwd: rootDir,
+      systemPrompt: COMMIT_BODY_SYSTEM_PROMPT,
+      tools: "readonly"
+    };
+    if (provider && modelId) {
+      agentOptions.defaultProvider = provider;
+      agentOptions.defaultModelId = modelId;
+    }
+    const agentResult = await createFnAgent5(agentOptions);
+    if (!agentResult?.session) return null;
+    session = agentResult.session;
+    await session.prompt(userPrompt);
+    if (aborter.signal.aborted) return null;
+    if (session.state?.error) {
+      if (DEBUG) console.log(`[ai-summarize] Commit-body session error: ${session.state.error}`);
+      return null;
+    }
+    const messages = session.state?.messages ?? [];
+    const assistant = messages.filter((m) => m.role === "assistant").pop();
+    if (!assistant?.content) return null;
+    let body = "";
+    if (typeof assistant.content === "string") {
+      body = assistant.content;
+    } else if (Array.isArray(assistant.content)) {
+      body = assistant.content.filter(
+        (c) => c.type === "text" && typeof c.text === "string"
+      ).map((c) => c.text).join("");
+    }
+    body = body.trim();
+    if (!body) return null;
+    if (body.length > MAX_COMMIT_BODY_LENGTH) {
+      body = body.slice(0, MAX_COMMIT_BODY_LENGTH).trim();
+    }
+    return body;
+  } catch (err) {
+    if (DEBUG) {
+      const message = err instanceof Error ? err.message : String(err);
+      console.log(`[ai-summarize] Commit-body generation failed: ${message}`);
+    }
+    return null;
+  } finally {
+    clearTimeout(timer);
+    try {
+      session?.dispose?.();
+    } catch {
+    }
+  }
+}
 function __resetSummarizeState() {
   rateLimits.clear();
 }
-var SUMMARIZE_SYSTEM_PROMPT, MAX_DESCRIPTION_LENGTH, MIN_DESCRIPTION_LENGTH, MAX_TITLE_LENGTH, MAX_REQUESTS_PER_HOUR, RATE_LIMIT_WINDOW_MS, CLEANUP_INTERVAL_MS, rateLimits, cleanupInterval, ValidationError, RateLimitError, AiServiceError, DEBUG;
+var SUMMARIZE_SYSTEM_PROMPT, MAX_DESCRIPTION_LENGTH, MIN_DESCRIPTION_LENGTH, MAX_TITLE_LENGTH, MAX_REQUESTS_PER_HOUR, RATE_LIMIT_WINDOW_MS, CLEANUP_INTERVAL_MS, rateLimits, cleanupInterval, ValidationError, RateLimitError, AiServiceError, DEBUG, COMMIT_BODY_SYSTEM_PROMPT, MAX_COMMIT_BODY_INPUT_LENGTH, MAX_COMMIT_BODY_LENGTH, DEFAULT_COMMIT_BODY_TIMEOUT_MS;
 var init_ai_summarize = __esm({
   "../core/src/ai-summarize.ts"() {
     "use strict";
@@ -36701,6 +36854,19 @@ Your job is to create a concise title (max 60 characters) that summarizes the gi
       }
     };
     DEBUG = process.env.FUSION_DEBUG_AI === "true";
+    COMMIT_BODY_SYSTEM_PROMPT = `You write concise commit message bodies for merge commits.
+
+Your job is to summarize the changes described in a \`git diff --stat\` into a short, useful body.
+
+## Guidelines
+- Output ONLY the body text \u2014 no code fences, no preamble, no subject line
+- 2\u20136 short bullet points starting with "- "
+- Be specific about what changed; reference filenames where helpful
+- Keep total output under 600 characters
+- Do not invent details that aren't in the input \u2014 if uncertain, stay general`;
+    MAX_COMMIT_BODY_INPUT_LENGTH = 4e3;
+    MAX_COMMIT_BODY_LENGTH = 2e3;
+    DEFAULT_COMMIT_BODY_TIMEOUT_MS = 3e4;
   }
 });
 
@@ -37028,18 +37194,18 @@ var init_mission_types = __esm({
 
 // ../core/src/memory-insights.ts
 import { readFile as readFile10, writeFile as writeFile8, mkdir as mkdir9 } from "node:fs/promises";
-import { existsSync as existsSync15 } from "node:fs";
+import { existsSync as existsSync16 } from "node:fs";
 import { dirname as dirname6, join as join18 } from "node:path";
 async function readWorkingMemory(rootDir) {
   const filePath = join18(rootDir, MEMORY_WORKING_PATH);
-  if (!existsSync15(filePath)) {
+  if (!existsSync16(filePath)) {
     return "";
   }
   return readFile10(filePath, "utf-8");
 }
 async function readInsightsMemory(rootDir) {
   const filePath = join18(rootDir, MEMORY_INSIGHTS_PATH);
-  if (!existsSync15(filePath)) {
+  if (!existsSync16(filePath)) {
     return null;
   }
   return readFile10(filePath, "utf-8");
@@ -37047,7 +37213,7 @@ async function readInsightsMemory(rootDir) {
 async function writeInsightsMemory(rootDir, content) {
   const filePath = join18(rootDir, MEMORY_INSIGHTS_PATH);
   const dir = join18(rootDir, ".fusion");
-  if (!existsSync15(dir)) {
+  if (!existsSync16(dir)) {
     await mkdir9(dir, { recursive: true });
   }
   await writeFile8(filePath, content, "utf-8");
@@ -37055,14 +37221,14 @@ async function writeInsightsMemory(rootDir, content) {
 async function writeWorkingMemory(rootDir, content) {
   const filePath = join18(rootDir, MEMORY_WORKING_PATH);
   const dir = dirname6(filePath);
-  if (!existsSync15(dir)) {
+  if (!existsSync16(dir)) {
     await mkdir9(dir, { recursive: true });
   }
   await writeFile8(filePath, content, "utf-8");
 }
 async function readMemoryAudit(rootDir) {
   const filePath = join18(rootDir, MEMORY_AUDIT_PATH);
-  if (!existsSync15(filePath)) {
+  if (!existsSync16(filePath)) {
     return null;
   }
   return readFile10(filePath, "utf-8");
@@ -37070,14 +37236,14 @@ async function readMemoryAudit(rootDir) {
 async function writeMemoryAudit(rootDir, content) {
   const filePath = join18(rootDir, MEMORY_AUDIT_PATH);
   const dir = join18(rootDir, ".fusion");
-  if (!existsSync15(dir)) {
+  if (!existsSync16(dir)) {
     await mkdir9(dir, { recursive: true });
   }
   await writeFile8(filePath, content, "utf-8");
 }
 async function readMemoryAuditState(rootDir) {
   const filePath = join18(rootDir, MEMORY_AUDIT_STATE_PATH);
-  if (!existsSync15(filePath)) {
+  if (!existsSync16(filePath)) {
     return null;
   }
   try {
@@ -37097,7 +37263,7 @@ async function readMemoryAuditState(rootDir) {
 async function writeMemoryAuditState(rootDir, state) {
   const filePath = join18(rootDir, MEMORY_AUDIT_STATE_PATH);
   const dir = join18(rootDir, ".fusion");
-  if (!existsSync15(dir)) {
+  if (!existsSync16(dir)) {
     await mkdir9(dir, { recursive: true });
   }
   await writeFile8(filePath, JSON.stringify(state, null, 2), "utf-8");
@@ -37574,7 +37740,7 @@ async function generateMemoryAudit(rootDir, lastExtraction, pruningOutcome) {
   const effectiveExtraction = lastExtraction ?? persistedState?.extraction;
   const effectivePruning = pruningOutcome ?? persistedState?.pruning;
   const workingMemoryPath = join18(rootDir, MEMORY_WORKING_PATH);
-  const workingMemoryExists = existsSync15(workingMemoryPath);
+  const workingMemoryExists = existsSync16(workingMemoryPath);
   let workingMemorySize = 0;
   let workingMemorySectionCount = 0;
   let workingMemoryContent = "";
@@ -37629,7 +37795,7 @@ async function generateMemoryAudit(rootDir, lastExtraction, pruningOutcome) {
     });
   }
   const insightsMemoryPath = join18(rootDir, MEMORY_INSIGHTS_PATH);
-  const insightsMemoryExists = existsSync15(insightsMemoryPath);
+  const insightsMemoryExists = existsSync16(insightsMemoryPath);
   let insightsMemorySize = 0;
   let insightsMemoryContent = "";
   const categoryCounts = {
@@ -39013,7 +39179,7 @@ var require_get_stream = __commonJS({
       };
       const { maxBuffer } = options;
       let stream;
-      await new Promise((resolve19, reject) => {
+      await new Promise((resolve17, reject) => {
         const rejectPromise = (error) => {
           if (error && stream.getBufferedLength() <= BufferConstants.MAX_LENGTH) {
             error.bufferedData = stream.getBufferedValue();
@@ -39025,7 +39191,7 @@ var require_get_stream = __commonJS({
             rejectPromise(error);
             return;
           }
-          resolve19();
+          resolve17();
         });
         stream.on("data", () => {
           if (stream.getBufferedLength() > maxBuffer) {
@@ -40319,7 +40485,7 @@ var require_extract_zip = __commonJS({
         debug("opening", this.zipPath, "with opts", this.opts);
         this.zipfile = await openZip(this.zipPath, { lazyEntries: true });
         this.canceled = false;
-        return new Promise((resolve19, reject) => {
+        return new Promise((resolve17, reject) => {
           this.zipfile.on("error", (err) => {
             this.canceled = true;
             reject(err);
@@ -40328,7 +40494,7 @@ var require_extract_zip = __commonJS({
           this.zipfile.on("close", () => {
             if (!this.canceled) {
               debug("zip extraction complete");
-              resolve19();
+              resolve17();
             }
           });
           this.zipfile.on("entry", async (entry) => {
@@ -47737,7 +47903,7 @@ var require_dist3 = __commonJS({
 });
 
 // ../core/src/agent-companies-parser.ts
-import { existsSync as existsSync16, mkdtempSync, readdirSync as readdirSync2, readFileSync as readFileSync3, rmSync, statSync as statSync4 } from "node:fs";
+import { existsSync as existsSync17, mkdtempSync, readdirSync as readdirSync2, readFileSync as readFileSync3, rmSync, statSync as statSync4 } from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
 import { join as join19, resolve as resolve8 } from "node:path";
 function slugifyAgentReference(value) {
@@ -47778,10 +47944,10 @@ function pushAlias(aliases, value) {
   if (pathRef !== normalized && pathRef.length > 0) {
     aliases.add(pathRef);
   }
-  const basename9 = extractPathBasename(value);
-  if (basename9) {
-    aliases.add(basename9);
-    const basenameSlug = slugifyAgentReference(basename9);
+  const basename12 = extractPathBasename(value);
+  if (basename12) {
+    aliases.add(basename12);
+    const basenameSlug = slugifyAgentReference(basename12);
     if (basenameSlug.length > 0) {
       aliases.add(basenameSlug);
     }
@@ -47965,14 +48131,14 @@ function parseManifestFile(filePath, parser) {
 }
 function parseManifestSubdirectories(rootDir, sectionDir, filename, parser) {
   const sectionPath = join19(rootDir, sectionDir);
-  if (!existsSync16(sectionPath)) {
+  if (!existsSync17(sectionPath)) {
     return [];
   }
   const manifests = [];
   const entries = readdirSync2(sectionPath, { withFileTypes: true }).filter((entry) => entry.isDirectory()).sort((a, b) => a.name.localeCompare(b.name));
   for (const entry of entries) {
     const manifestPath = join19(sectionPath, entry.name, filename);
-    if (!existsSync16(manifestPath)) {
+    if (!existsSync17(manifestPath)) {
       continue;
     }
     manifests.push(parseManifestFile(manifestPath, parser));
@@ -48010,7 +48176,7 @@ function walkTeamIncludes(teams) {
 }
 function parseCompanyDirectory(dirPath) {
   const resolvedPath = resolve8(dirPath);
-  if (!existsSync16(resolvedPath)) {
+  if (!existsSync17(resolvedPath)) {
     throw new AgentCompaniesParseError(`Company directory does not exist: ${resolvedPath}`);
   }
   if (!statSync4(resolvedPath).isDirectory()) {
@@ -48020,7 +48186,7 @@ function parseCompanyDirectory(dirPath) {
   const teams = parseManifestSubdirectories(resolvedPath, "teams", "TEAM.md", parseTeamManifest);
   walkTeamIncludes(teams);
   return {
-    company: existsSync16(companyPath) ? parseManifestFile(companyPath, parseCompanyManifest) : void 0,
+    company: existsSync17(companyPath) ? parseManifestFile(companyPath, parseCompanyManifest) : void 0,
     agents: parseManifestSubdirectories(resolvedPath, "agents", "AGENTS.md", parseAgentManifest),
     teams,
     projects: parseManifestSubdirectories(
@@ -48034,7 +48200,7 @@ function parseCompanyDirectory(dirPath) {
   };
 }
 function resolveExtractionRoot(tempDir) {
-  if (existsSync16(join19(tempDir, "COMPANY.md"))) {
+  if (existsSync17(join19(tempDir, "COMPANY.md"))) {
     return tempDir;
   }
   const directories = readdirSync2(tempDir, { withFileTypes: true }).filter(
@@ -48042,7 +48208,7 @@ function resolveExtractionRoot(tempDir) {
   );
   for (const directory of directories) {
     const candidate = join19(tempDir, directory.name);
-    if (existsSync16(join19(candidate, "COMPANY.md"))) {
+    if (existsSync17(join19(candidate, "COMPANY.md"))) {
       return candidate;
     }
   }
@@ -48880,6 +49046,7 @@ __export(src_exports, {
   COLUMNS: () => COLUMNS,
   COLUMN_DESCRIPTIONS: () => COLUMN_DESCRIPTIONS,
   COLUMN_LABELS: () => COLUMN_LABELS,
+  COMMIT_BODY_SYSTEM_PROMPT: () => COMMIT_BODY_SYSTEM_PROMPT,
   COMPACT_MEMORY_SYSTEM_PROMPT: () => COMPACT_MEMORY_SYSTEM_PROMPT,
   CentralCore: () => CentralCore,
   CentralDatabase: () => CentralDatabase,
@@ -48889,6 +49056,7 @@ __export(src_exports, {
   DAEMON_TOKEN_PREFIX: () => DAEMON_TOKEN_PREFIX,
   DEFAULT_AGENT_HEARTBEAT_INTERVAL_MS: () => DEFAULT_AGENT_HEARTBEAT_INTERVAL_MS,
   DEFAULT_AUTO_SUMMARIZE_SCHEDULE: () => DEFAULT_AUTO_SUMMARIZE_SCHEDULE,
+  DEFAULT_COMMIT_BODY_TIMEOUT_MS: () => DEFAULT_COMMIT_BODY_TIMEOUT_MS,
   DEFAULT_EXECUTION_MODE: () => DEFAULT_EXECUTION_MODE,
   DEFAULT_GLOBAL_SETTINGS: () => DEFAULT_GLOBAL_SETTINGS,
   DEFAULT_INSIGHT_SCHEDULE: () => DEFAULT_INSIGHT_SCHEDULE,
@@ -48910,6 +49078,8 @@ __export(src_exports, {
   INSIGHT_EXTRACTION_SCHEDULE_NAME: () => INSIGHT_EXTRACTION_SCHEDULE_NAME,
   INTERVIEW_STATES: () => INTERVIEW_STATES,
   InsightStore: () => InsightStore,
+  MAX_COMMIT_BODY_INPUT_LENGTH: () => MAX_COMMIT_BODY_INPUT_LENGTH,
+  MAX_COMMIT_BODY_LENGTH: () => MAX_COMMIT_BODY_LENGTH,
   MAX_DESCRIPTION_LENGTH: () => MAX_DESCRIPTION_LENGTH,
   MAX_REQUESTS_PER_HOUR: () => MAX_REQUESTS_PER_HOUR,
   MAX_ROUTINE_RUN_HISTORY: () => MAX_ROUTINE_RUN_HISTORY,
@@ -49069,6 +49239,7 @@ __export(src_exports, {
   isValidPermission: () => isValidPermission,
   isValidPromptKey: () => isValidPromptKey,
   isValidPromptOverrideMap: () => isValidPromptOverrideMap,
+  isValidSqliteDatabaseFile: () => isValidSqliteDatabaseFile,
   isWebhookTrigger: () => isWebhookTrigger,
   listAgentMemoryFiles: () => listAgentMemoryFiles,
   listMemoryBackendTypes: () => listMemoryBackendTypes,
@@ -49153,6 +49324,7 @@ __export(src_exports, {
   shouldTriggerExtraction: () => shouldTriggerExtraction,
   slugify: () => slugify,
   sortTasksByPriorityThenAgeAndId: () => sortTasksByPriorityThenAgeAndId,
+  summarizeCommitBody: () => summarizeCommitBody,
   summarizeTitle: () => summarizeTitle,
   syncAutoSummarizeAutomation: () => syncAutoSummarizeAutomation,
   syncBackupAutomation: () => syncBackupAutomation,
@@ -49195,6 +49367,7 @@ var init_src = __esm({
     init_archive_db();
     init_db_migrate();
     init_global_settings();
+    init_sqlite_validation();
     init_daemon_token();
     init_pi_extensions();
     init_board();
@@ -49487,7 +49660,7 @@ var init_agent_logger = __esm({
 
 // ../engine/src/agent-tools.ts
 import { appendFile as appendFile2, mkdir as mkdir11, readFile as readFile11, readdir as readdir7, stat as stat4, writeFile as writeFile10 } from "node:fs/promises";
-import { existsSync as existsSync17 } from "node:fs";
+import { existsSync as existsSync18 } from "node:fs";
 import { createHash as createHash4 } from "node:crypto";
 import { join as join21 } from "node:path";
 import { Type } from "@mariozechner/pi-ai";
@@ -49546,7 +49719,7 @@ async function syncAgentMemoryFile(rootDir, agentMemory) {
   const dir = agentMemoryDirectory(rootDir, agentMemory.agentId);
   await mkdir11(dir, { recursive: true });
   const longTermPath = agentMemoryFilePath(rootDir, agentMemory.agentId);
-  if (!existsSync17(longTermPath)) {
+  if (!existsSync18(longTermPath)) {
     const title = agentMemory.agentName?.trim() ? `# Agent Memory: ${agentMemory.agentName.trim()}` : "# Agent Memory";
     const fileContent = `${title}
 
@@ -49557,11 +49730,11 @@ ${content || ""}
     await writeFile10(longTermPath, fileContent, "utf-8");
   }
   const dreamsPath = agentDreamsFilePath(rootDir, agentMemory.agentId);
-  if (!existsSync17(dreamsPath)) {
+  if (!existsSync18(dreamsPath)) {
     await writeFile10(dreamsPath, "# Agent Memory Dreams\n\n<!-- Synthesized patterns from this agent's daily notes. -->\n", "utf-8");
   }
   const dailyPath = agentDailyFilePath(rootDir, agentMemory.agentId);
-  if (!existsSync17(dailyPath)) {
+  if (!existsSync18(dailyPath)) {
     await writeFile10(dailyPath, `# Agent Daily Memory ${(/* @__PURE__ */ new Date()).toISOString().slice(0, 10)}
 
 <!-- Running observations for this agent. -->
@@ -50377,12 +50550,12 @@ var init_concurrency = __esm({
           this._active++;
           return Promise.resolve();
         }
-        return new Promise((resolve19) => {
+        return new Promise((resolve17) => {
           this._waiters.push({
             priority,
             resolve: () => {
               this._active++;
-              resolve19();
+              resolve17();
             }
           });
         });
@@ -50446,10 +50619,10 @@ var init_concurrency = __esm({
 });
 
 // ../engine/src/skill-resolver.ts
-import { existsSync as existsSync18, readFileSync as readFileSync4 } from "node:fs";
+import { existsSync as existsSync19, readFileSync as readFileSync4 } from "node:fs";
 import { join as join22 } from "node:path";
 function readJsonObject(path2) {
-  if (!existsSync18(path2)) {
+  if (!existsSync19(path2)) {
     return {};
   }
   try {
@@ -50461,7 +50634,7 @@ function readJsonObject(path2) {
 }
 function readProjectSettings(projectRootDir) {
   const fusionSettings = join22(projectRootDir, ".fusion", "settings.json");
-  if (existsSync18(fusionSettings)) {
+  if (existsSync19(fusionSettings)) {
     const parsed = readJsonObject(fusionSettings);
     return {
       skills: Array.isArray(parsed.skills) ? parsed.skills : void 0,
@@ -50682,43 +50855,43 @@ var init_context_limit_detector = __esm({
 });
 
 // ../engine/src/auth-storage.ts
-import { existsSync as existsSync19, readFileSync as readFileSync5 } from "node:fs";
+import { existsSync as existsSync20, readFileSync as readFileSync5 } from "node:fs";
 import { homedir as homedir4 } from "node:os";
 import { join as join23 } from "node:path";
 import { AuthStorage } from "@mariozechner/pi-coding-agent";
 import { getOAuthProvider } from "@mariozechner/pi-ai/oauth";
-function getHomeDir2() {
+function getHomeDir4() {
   return process.env.HOME || process.env.USERPROFILE || homedir4();
 }
-function getFusionAuthPath(home = getHomeDir2()) {
+function getFusionAuthPath(home = getHomeDir4()) {
   return join23(home, ".fusion", "agent", "auth.json");
 }
-function getFusionModelsPath(home = getHomeDir2()) {
+function getFusionModelsPath(home = getHomeDir4()) {
   return join23(home, ".fusion", "agent", "models.json");
 }
-function getLegacyAuthPaths(home = getHomeDir2()) {
+function getLegacyAuthPaths(home = getHomeDir4()) {
   return [
     join23(home, ".pi", "agent", "auth.json"),
     join23(home, ".pi", "auth.json")
   ];
 }
-function getLegacyModelsPaths(home = getHomeDir2()) {
+function getLegacyModelsPaths(home = getHomeDir4()) {
   return [
     join23(home, ".pi", "agent", "models.json"),
     join23(home, ".pi", "models.json")
   ];
 }
-function getModelRegistryModelsPath(home = getHomeDir2()) {
+function getModelRegistryModelsPath(home = getHomeDir4()) {
   const fusionModelsPath = getFusionModelsPath(home);
-  if (existsSync19(fusionModelsPath)) {
+  if (existsSync20(fusionModelsPath)) {
     return fusionModelsPath;
   }
-  return getLegacyModelsPaths(home).find((modelsPath) => existsSync19(modelsPath)) ?? fusionModelsPath;
+  return getLegacyModelsPaths(home).find((modelsPath) => existsSync20(modelsPath)) ?? fusionModelsPath;
 }
 function readLegacyCredentials(authPaths = getLegacyAuthPaths()) {
   const credentials = {};
   for (const authPath of authPaths) {
-    if (!existsSync19(authPath)) {
+    if (!existsSync20(authPath)) {
       continue;
     }
     try {
@@ -50794,11 +50967,11 @@ var init_auth_storage = __esm({
 });
 
 // ../engine/src/pi.ts
-import { existsSync as existsSync20, readFileSync as readFileSync6 } from "node:fs";
+import { existsSync as existsSync21, readFileSync as readFileSync6 } from "node:fs";
 import { exec } from "node:child_process";
 import { promisify as promisify2 } from "node:util";
 import { createRequire as createRequire2 } from "node:module";
-import { basename as basename7, dirname as dirname7, join as join24, relative as relative3, isAbsolute as isAbsolute6, resolve as resolve10 } from "node:path";
+import { basename as basename7, dirname as dirname7, join as join24, relative as relative3, isAbsolute as isAbsolute7, resolve as resolve10 } from "node:path";
 import {
   createAgentSession,
   createBashTool,
@@ -51052,7 +51225,7 @@ function isRetryableModelSelectionError(message) {
   return normalized.includes("rate limit") || normalized.includes("too many requests") || normalized.includes("429") || normalized.includes("401") || normalized.includes("403") || normalized.includes("unauthorized") || normalized.includes("forbidden") || normalized.includes("authentication") || normalized.includes("invalid api key") || normalized.includes("invalid key") || normalized.includes("api key") || normalized.includes("overloaded") || normalized.includes("quota") || normalized.includes("capacity") || normalized.includes("temporarily unavailable") || normalized.includes("invalid temperature");
 }
 function readJsonObject2(path2) {
-  if (!existsSync20(path2)) {
+  if (!existsSync21(path2)) {
     return {};
   }
   try {
@@ -51216,13 +51389,13 @@ function getPackageManagerAgentDir() {
   const legacyAgentDir = getLegacyPiAgentDir();
   const fusionSettings = readJsonObject2(join24(fusionAgentDir, "settings.json"));
   const legacySettings = readJsonObject2(join24(legacyAgentDir, "settings.json"));
-  if (hasPackageManagerSettings(fusionSettings) || !existsSync20(legacyAgentDir)) {
+  if (hasPackageManagerSettings(fusionSettings) || !existsSync21(legacyAgentDir)) {
     return fusionAgentDir;
   }
   if (hasPackageManagerSettings(legacySettings)) {
     return legacyAgentDir;
   }
-  return existsSync20(fusionAgentDir) ? fusionAgentDir : legacyAgentDir;
+  return existsSync21(fusionAgentDir) ? fusionAgentDir : legacyAgentDir;
 }
 function resolveVendoredClaudeCliEntry() {
   try {
@@ -51234,7 +51407,7 @@ function resolveVendoredClaudeCliEntry() {
     const entry = extensions[0];
     if (typeof entry !== "string" || entry.length === 0) return null;
     const path2 = resolve10(dirname7(pkgJsonPath), entry);
-    return existsSync20(path2) ? path2 : null;
+    return existsSync21(path2) ? path2 : null;
   } catch {
     return null;
   }
@@ -51280,7 +51453,7 @@ async function registerExtensionProviders(cwd, modelRegistry) {
   }
 }
 function getProjectRootFromWorktree(cwd) {
-  const match = cwd.match(/^(.+?)\/\.worktrees\/[^/]+/);
+  const match = cwd.match(/^(.+?)[\\/]\.worktrees[\\/][^\\/]+(?:[\\/]|$)/);
   if (match) {
     return match[1];
   }
@@ -51312,10 +51485,10 @@ async function isCompleteGitWorktree(worktreePath) {
   }
 }
 async function assertValidWorktreeSession(cwd, projectRoot) {
-  if (!existsSync20(cwd)) {
+  if (!existsSync21(cwd)) {
     throw new Error(`Refusing to start coding agent in missing worktree: ${cwd}`);
   }
-  if (!existsSync20(join24(cwd, ".git")) || !await isCompleteGitWorktree(cwd)) {
+  if (!existsSync21(join24(cwd, ".git")) || !await isCompleteGitWorktree(cwd)) {
     throw new Error(`Refusing to start coding agent in incomplete worktree: ${cwd}`);
   }
   if (!await isRegisteredGitWorktree(projectRoot, cwd)) {
@@ -51325,9 +51498,9 @@ async function assertValidWorktreeSession(cwd, projectRoot) {
 function isWorktreeAllowedPath(worktreePath, projectRoot, requestedPath, toolName) {
   const worktreeResolved = resolve10(worktreePath);
   const projectRootResolved = resolve10(projectRoot);
-  const requestedResolved = isAbsolute6(requestedPath) ? resolve10(requestedPath) : resolve10(worktreeResolved, requestedPath);
+  const requestedResolved = isAbsolute7(requestedPath) ? resolve10(requestedPath) : resolve10(worktreeResolved, requestedPath);
   const relToWorktree = relative3(worktreeResolved, requestedResolved);
-  if (!relToWorktree.startsWith("..") && !isAbsolute6(relToWorktree)) {
+  if (!relToWorktree.startsWith("..") && !isAbsolute7(relToWorktree)) {
     return true;
   }
   const relToProjectRoot = relative3(projectRootResolved, requestedResolved).replace(/\\/g, "/");
@@ -52057,7 +52230,7 @@ var init_usage_limit_detector = __esm({
 
 // ../engine/src/agent-instructions.ts
 import { readFile as readFile12 } from "node:fs/promises";
-import { isAbsolute as isAbsolute7, resolve as resolve11, relative as relative4, normalize as normalize3, sep as sep4 } from "node:path";
+import { isAbsolute as isAbsolute8, resolve as resolve11, relative as relative4, normalize as normalize3, sep as sep4 } from "node:path";
 function trimAndClamp(value, maxLength, label, agentId) {
   const trimmed = value.trim();
   if (!trimmed) {
@@ -52087,7 +52260,7 @@ function resolveValidatedInstructionsPath(rawPath, rootDir, agentId) {
     log4.warn(`instructionsPath must end in .md for agent ${agentId}: ${trimmed}`);
     return null;
   }
-  if (isAbsolute7(trimmed)) {
+  if (isAbsolute8(trimmed)) {
     log4.warn(`instructionsPath must be project-relative for agent ${agentId}: ${trimmed}`);
     return null;
   }
@@ -52098,7 +52271,7 @@ function resolveValidatedInstructionsPath(rawPath, rootDir, agentId) {
   }
   const resolvedPath = resolve11(rootDir, normalized);
   const rel = relative4(rootDir, resolvedPath);
-  if (!rel || rel.startsWith(`..${sep4}`) || rel === ".." || isAbsolute7(rel)) {
+  if (!rel || rel.startsWith(`..${sep4}`) || rel === ".." || isAbsolute8(rel)) {
     log4.warn(`instructionsPath escapes project root for agent ${agentId}: ${trimmed}`);
     return null;
   }
@@ -52803,20 +52976,20 @@ async function withRateLimitRetry(fn, options = {}) {
   throw lastError ?? new Error("withRateLimitRetry: unexpected state");
 }
 function sleep(ms, signal) {
-  return new Promise((resolve19, reject) => {
+  return new Promise((resolve17, reject) => {
     if (signal?.aborted) {
       reject(signal.reason ?? new Error("Aborted"));
       return;
     }
-    const timer = setTimeout(resolve19, ms);
+    const timer = setTimeout(resolve17, ms);
     if (signal) {
       const onAbort = () => {
         clearTimeout(timer);
         reject(signal.reason ?? new Error("Aborted"));
       };
       signal.addEventListener("abort", onAbort, { once: true });
-      const origResolve = resolve19;
-      resolve19 = () => {
+      const origResolve = resolve17;
+      resolve17 = () => {
         signal.removeEventListener("abort", onAbort);
         origResolve();
       };
@@ -54779,11 +54952,11 @@ var init_run_audit = __esm({
 // ../engine/src/merger.ts
 import { execSync, exec as exec2, spawn as spawn2 } from "node:child_process";
 import { promisify as promisify3 } from "node:util";
-import { existsSync as existsSync21 } from "node:fs";
+import { existsSync as existsSync22 } from "node:fs";
 import { join as join26 } from "node:path";
 import { Type as Type3 } from "typebox";
 async function execWithProcessGroup(command, options) {
-  return new Promise((resolve19, reject) => {
+  return new Promise((resolve17, reject) => {
     if (options.signal?.aborted) {
       reject(Object.assign(
         new Error(`Command aborted before start: ${command}`),
@@ -54876,7 +55049,7 @@ async function execWithProcessGroup(command, options) {
         return;
       }
       if (code === 0) {
-        resolve19({ stdout, stderr, bufferOverflow: stdoutOverflow || stderrOverflow });
+        resolve17({ stdout, stderr, bufferOverflow: stdoutOverflow || stderrOverflow });
         return;
       }
       reject(Object.assign(
@@ -55041,7 +55214,7 @@ async function getStagedFiles(cwd) {
   }
 }
 function hasInstallState(rootDir) {
-  return existsSync21(join26(rootDir, "node_modules")) || existsSync21(join26(rootDir, ".pnp.cjs"));
+  return existsSync22(join26(rootDir, "node_modules")) || existsSync22(join26(rootDir, ".pnp.cjs"));
 }
 function shouldSyncDependenciesForMerge(stagedFiles, installStatePresent) {
   if (!installStatePresent) return true;
@@ -55050,10 +55223,10 @@ function shouldSyncDependenciesForMerge(stagedFiles, installStatePresent) {
   );
 }
 function getDependencySyncCommand(rootDir) {
-  if (existsSync21(join26(rootDir, "pnpm-lock.yaml"))) return "pnpm install --frozen-lockfile";
-  if (existsSync21(join26(rootDir, "package-lock.json"))) return "npm install";
-  if (existsSync21(join26(rootDir, "yarn.lock"))) return "yarn install --frozen-lockfile";
-  if (existsSync21(join26(rootDir, "bun.lock")) || existsSync21(join26(rootDir, "bun.lockb"))) {
+  if (existsSync22(join26(rootDir, "pnpm-lock.yaml"))) return "pnpm install --frozen-lockfile";
+  if (existsSync22(join26(rootDir, "package-lock.json"))) return "npm install";
+  if (existsSync22(join26(rootDir, "yarn.lock"))) return "yarn install --frozen-lockfile";
+  if (existsSync22(join26(rootDir, "bun.lock")) || existsSync22(join26(rootDir, "bun.lockb"))) {
     return "bun install --frozen-lockfile";
   }
   return null;
@@ -55086,8 +55259,8 @@ function inferDefaultTestCommand(rootDir, explicitTestCommand, explicitBuildComm
       buildSource: explicitBuildCommand?.trim() ? "explicit" : void 0
     };
   }
-  if (existsSync21(join26(rootDir, "pnpm-lock.yaml"))) {
-    if (existsSync21(join26(rootDir, "pnpm-workspace.yaml"))) {
+  if (existsSync22(join26(rootDir, "pnpm-lock.yaml"))) {
+    if (existsSync22(join26(rootDir, "pnpm-workspace.yaml"))) {
       mergerLog.warn(
         `Inferred test command "pnpm test" in a pnpm workspace (${rootDir}). This runs the full monorepo suite on every merge. Consider setting an explicit scoped testCommand in project settings, e.g. \`pnpm -r --filter "...[main]" test\`.`
       );
@@ -55098,21 +55271,21 @@ function inferDefaultTestCommand(rootDir, explicitTestCommand, explicitBuildComm
       buildSource: explicitBuildCommand?.trim() ? "explicit" : void 0
     };
   }
-  if (existsSync21(join26(rootDir, "yarn.lock"))) {
+  if (existsSync22(join26(rootDir, "yarn.lock"))) {
     return {
       command: "yarn test",
       testSource: "inferred",
       buildSource: explicitBuildCommand?.trim() ? "explicit" : void 0
     };
   }
-  if (existsSync21(join26(rootDir, "bun.lock")) || existsSync21(join26(rootDir, "bun.lockb"))) {
+  if (existsSync22(join26(rootDir, "bun.lock")) || existsSync22(join26(rootDir, "bun.lockb"))) {
     return {
       command: "bun test",
       testSource: "inferred",
       buildSource: explicitBuildCommand?.trim() ? "explicit" : void 0
     };
   }
-  if (existsSync21(join26(rootDir, "package-lock.json"))) {
+  if (existsSync22(join26(rootDir, "package-lock.json"))) {
     return {
       command: "npm test",
       testSource: "inferred",
@@ -55901,6 +56074,68 @@ async function findWorktreeUser(store, worktreePath, excludeTaskId) {
 function quoteArg(value) {
   return `"${value.replace(/(["\\$`])/g, "\\$1")}"`;
 }
+async function resolveSafeCommitBody(opts) {
+  const cleanLog = opts.commitLog.trim();
+  if (cleanLog.length > 0) return cleanLog;
+  const cleanStat = opts.diffStat.trim();
+  if (cleanStat.length > 0) {
+    const useTitleSummarizer = !!opts.settings.titleSummarizerProvider && !!opts.settings.titleSummarizerModelId;
+    const provider = useTitleSummarizer ? opts.settings.titleSummarizerProvider : opts.settings.defaultProviderOverride && opts.settings.defaultModelIdOverride ? opts.settings.defaultProviderOverride : opts.settings.defaultProvider;
+    const modelId = useTitleSummarizer ? opts.settings.titleSummarizerModelId : opts.settings.defaultProviderOverride && opts.settings.defaultModelIdOverride ? opts.settings.defaultModelIdOverride : opts.settings.defaultModelId;
+    const ai = await summarizeCommitBody(cleanStat, opts.rootDir, provider, modelId, {
+      branch: opts.branch,
+      taskId: opts.taskId,
+      signal: opts.signal,
+      timeoutMs: opts.aiTimeoutMs
+    }).catch(() => null);
+    if (ai && ai.trim().length > 0) return ai.trim();
+    return `Files changed:
+
+${cleanStat}`;
+  }
+  return `- merge ${opts.branch}`;
+}
+async function commitPatchId(rootDir, sha) {
+  try {
+    const { stdout } = await execAsync2(
+      `git diff-tree -p ${quoteArg(sha)} | git patch-id --stable`,
+      { cwd: rootDir, encoding: "utf-8" }
+    );
+    const line = stdout.trim();
+    if (!line) return void 0;
+    const [pid] = line.split(/\s+/, 1);
+    return pid || void 0;
+  } catch {
+    return void 0;
+  }
+}
+async function collectPatchIds(rootDir, target, windowSize) {
+  const ids = /* @__PURE__ */ new Set();
+  try {
+    const { stdout } = await execAsync2(
+      `git log -n ${Math.max(1, windowSize)} --format=%H ${quoteArg(target)}`,
+      { cwd: rootDir, encoding: "utf-8" }
+    );
+    const shas = stdout.trim().split("\n").filter(Boolean);
+    for (const sha of shas) {
+      const pid = await commitPatchId(rootDir, sha);
+      if (pid) ids.add(pid);
+    }
+  } catch {
+  }
+  return ids;
+}
+async function listBranchCommits(rootDir, target, branch) {
+  try {
+    const { stdout } = await execAsync2(
+      `git log --reverse --format=%H ${quoteArg(target)}..${quoteArg(branch)}`,
+      { cwd: rootDir, encoding: "utf-8" }
+    );
+    return stdout.trim().split("\n").filter(Boolean);
+  } catch {
+    return [];
+  }
+}
 function getCommandErrorMessage(error) {
   if (error instanceof Error) {
     const stderr = error.stderr;
@@ -56417,11 +56652,182 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
       settings.worktreeRebaseBeforeMerge === false ? "remote rebase disabled" : ""
     );
   }
+  let preMergeRebaseFallthrough;
+  if (preferMainRebaseFailureMessage && worktreePath) {
+    let rebaseTarget = "";
+    try {
+      const { stdout } = await execAsync2("git rev-parse HEAD", {
+        cwd: rootDir,
+        encoding: "utf-8"
+      });
+      rebaseTarget = stdout.trim();
+    } catch {
+      rebaseTarget = "";
+    }
+    if (rebaseTarget && task.baseBranch && task.baseBranch !== "main") {
+      let depTip;
+      try {
+        const { stdout } = await execAsync2(
+          `git rev-parse --verify "${task.baseBranch}^{commit}"`,
+          { cwd: rootDir, encoding: "utf-8" }
+        );
+        depTip = stdout.trim() || void 0;
+      } catch {
+        depTip = void 0;
+      }
+      if (!depTip && task.baseCommitSha) {
+        try {
+          const { stdout } = await execAsync2(
+            `git rev-parse --verify "${task.baseCommitSha}^{commit}"`,
+            { cwd: rootDir, encoding: "utf-8" }
+          );
+          depTip = stdout.trim() || void 0;
+        } catch {
+          depTip = void 0;
+        }
+      }
+      if (depTip && depTip !== rebaseTarget) {
+        try {
+          throwIfAborted(options.signal, taskId);
+          await execAsync2("git rebase --abort", { cwd: worktreePath }).catch(
+            () => void 0
+          );
+          await execAsync2(
+            `git rebase --onto "${rebaseTarget}" "${depTip}" "${branch}"`,
+            { cwd: worktreePath }
+          );
+          preferMainRebaseFailureMessage = void 0;
+          rebaseHappened = true;
+          mergerLog.log(
+            `${taskId}: Layer 1 recovery \u2014 rebased ${branch} --onto ${rebaseTarget.slice(0, 8)} dropping commits up to dep tip ${depTip.slice(0, 8)} (baseBranch=${task.baseBranch})`
+          );
+          await store.logEntry(
+            taskId,
+            `Pre-merge recovery (Layer 1): dropped dependency commits from ${task.baseBranch} via rebase --onto ${rebaseTarget.slice(0, 8)} ${depTip.slice(0, 8)} ${branch}; the merge will proceed against the cleaned branch`
+          );
+        } catch (layer1Err) {
+          rethrowIfMergeAborted(layer1Err);
+          mergerLog.warn(
+            `${taskId}: Layer 1 (dep-drop) recovery failed: ${layer1Err instanceof Error ? layer1Err.message : String(layer1Err)}`
+          );
+          await execAsync2("git rebase --abort", { cwd: worktreePath }).catch(
+            () => void 0
+          );
+        }
+      }
+    }
+    if (preferMainRebaseFailureMessage && rebaseTarget && worktreePath) {
+      try {
+        throwIfAborted(options.signal, taskId);
+        const mainPatchIds = await collectPatchIds(rootDir, rebaseTarget, 500);
+        const branchCommits = await listBranchCommits(rootDir, rebaseTarget, branch);
+        if (branchCommits.length === 0) {
+          rebaseHappened = true;
+          preferMainRebaseFailureMessage = void 0;
+        } else {
+          const surviving = [];
+          let dropped = 0;
+          for (const sha of branchCommits) {
+            const pid = await commitPatchId(rootDir, sha);
+            if (pid && mainPatchIds.has(pid)) {
+              dropped += 1;
+            } else {
+              surviving.push(sha);
+            }
+          }
+          if (dropped > 0 && surviving.length === branchCommits.length) {
+            mergerLog.warn(`${taskId}: Layer 2 internal accounting mismatch \u2014 skipping`);
+          } else if (dropped > 0) {
+            let originalBranchSha = "";
+            try {
+              const { stdout } = await execAsync2(
+                `git rev-parse --verify "${branch}^{commit}"`,
+                { cwd: worktreePath, encoding: "utf-8" }
+              );
+              originalBranchSha = stdout.trim();
+            } catch {
+              originalBranchSha = "";
+            }
+            const restoreOriginalBranch = async () => {
+              if (!originalBranchSha) return;
+              await execAsync2(`git reset --hard "${originalBranchSha}"`, {
+                cwd: worktreePath
+              }).catch(() => void 0);
+              await execAsync2(`git checkout -f "${branch}"`, { cwd: worktreePath }).catch(
+                () => void 0
+              );
+              await execAsync2(`git reset --hard "${originalBranchSha}"`, {
+                cwd: worktreePath
+              }).catch(() => void 0);
+            };
+            try {
+              await execAsync2("git rebase --abort", { cwd: worktreePath }).catch(
+                () => void 0
+              );
+              await execAsync2(`git checkout "${branch}"`, { cwd: worktreePath });
+              await execAsync2(`git reset --hard "${rebaseTarget}"`, {
+                cwd: worktreePath
+              });
+              for (const sha of surviving) {
+                throwIfAborted(options.signal, taskId);
+                try {
+                  await execAsync2(`git cherry-pick --allow-empty "${sha}"`, {
+                    cwd: worktreePath
+                  });
+                } catch (pickErr) {
+                  rethrowIfMergeAborted(pickErr);
+                  await execAsync2("git cherry-pick --abort", { cwd: worktreePath }).catch(
+                    () => void 0
+                  );
+                  await restoreOriginalBranch();
+                  throw pickErr;
+                }
+              }
+              preferMainRebaseFailureMessage = void 0;
+              rebaseHappened = true;
+              mergerLog.log(
+                `${taskId}: Layer 2 recovery \u2014 patch-id stripped ${dropped} duplicate commit(s); replayed ${surviving.length} survivor(s) onto ${rebaseTarget.slice(0, 8)}`
+              );
+              await store.logEntry(
+                taskId,
+                `Pre-merge recovery (Layer 2): patch-id matched ${dropped} branch commit(s) against the last 500 main commits and dropped them as duplicates; cherry-picked ${surviving.length} unique commit(s) onto ${rebaseTarget.slice(0, 8)}`
+              );
+            } catch (replayErr) {
+              await restoreOriginalBranch();
+              throw replayErr;
+            }
+          } else {
+            mergerLog.log(
+              `${taskId}: Layer 2 found no duplicate-content commits to drop (window=500)`
+            );
+          }
+        }
+      } catch (layer2Err) {
+        rethrowIfMergeAborted(layer2Err);
+        mergerLog.warn(
+          `${taskId}: Layer 2 (patch-id strip) recovery failed: ${layer2Err instanceof Error ? layer2Err.message : String(layer2Err)}`
+        );
+      }
+    }
+    if (preferMainRebaseFailureMessage) {
+      preMergeRebaseFallthrough = preferMainRebaseFailureMessage;
+      preferMainRebaseFailureMessage = void 0;
+      mergerLog.warn(
+        `${taskId}: Layers 1 & 2 could not unblock the prefer-main rebase \u2014 falling through to AI arbitration (Layer 3). Deterministic verification will gate the result.`
+      );
+      await store.logEntry(
+        taskId,
+        `Pre-merge recovery (Layer 3): both surgical and patch-id recovery failed; AI arbiter takes over. SAFETY CONSTRAINT for the AI: do NOT re-introduce content that current main has deleted. If hunks are ambiguous, prefer main's version. Post-merge test/build verification will reject any resolution that breaks main's intent.`,
+        "PreMergeRebaseFallthrough"
+      );
+    }
+  }
   if (preferMainRebaseFailureMessage) {
     throw new Error(
-      `${preferMainRebaseFailureMessage} for ${taskId}. Strategy "smart-prefer-main" requires a successful rebase to preserve main's deletions; falling through to a -X ours merge would silently re-introduce branch-only content. Resolve the rebase conflict manually, or switch mergeConflictStrategy to "smart-prefer-branch" / "ai-only".`
+      `${preferMainRebaseFailureMessage} for ${taskId}. Strategy "smart-prefer-main" requires a successful rebase to preserve main's deletions; recovery layers 1\u20133 require a worktree path which is missing for this task. Resolve the rebase conflict manually, or switch mergeConflictStrategy to "smart-prefer-branch" / "ai-only".`
     );
   }
+  void preMergeRebaseFallthrough;
   if (mergeConflictStrategy === "smart-prefer-main" && !rebaseHappened) {
     mergerLog.warn(
       `${taskId}: smart-prefer-main ran without a successful pre-merge rebase (${worktreePath ? "no remote resolvable or rebase disabled" : "no worktreePath"}). Main's deletions may not be preserved if the branch re-introduces them.`
@@ -56525,7 +56931,8 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
         testCommand: effectiveTestCommand,
         buildCommand: effectiveBuildCommand,
         testSource: effectiveTestSource,
-        buildSource: effectiveBuildSource
+        buildSource: effectiveBuildSource,
+        preMergeRebaseFallthrough
       }, aiTracker);
       if (success) {
         result.attemptsMade = attemptNum;
@@ -56777,8 +57184,14 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
   if (!merged && smartConflictResolution && mergeConflictStrategy !== "abort") {
     merged = await mergeAttempt(2);
   }
-  if (!merged && smartConflictResolution && mergeConflictStrategy !== "ai-only" && mergeConflictStrategy !== "abort") {
+  if (!merged && smartConflictResolution && mergeConflictStrategy !== "ai-only" && mergeConflictStrategy !== "abort" && !preMergeRebaseFallthrough) {
     merged = await mergeAttempt(3);
+  } else if (!merged && preMergeRebaseFallthrough) {
+    await store.logEntry(
+      taskId,
+      `Attempt 3 (-X ours fallback) suppressed: pre-merge rebase recovery layers 1+2 failed under smart-prefer-main, so the unsafe ours-side fallback is skipped to honor the strategy's safety contract. Verification-gated AI Attempts 1+2 already exhausted; merge cannot complete safely without manual intervention.`,
+      "PreMergeRebaseFallthrough"
+    );
   }
   if (aiTracker.mergeWasEmpty) {
     mergeWasEmpty = true;
@@ -56916,7 +57329,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
     }
   }
   throwIfAborted(options.signal, taskId);
-  if (worktreePath && existsSync21(worktreePath)) {
+  if (worktreePath && existsSync22(worktreePath)) {
     const otherUser = await findWorktreeUser(store, worktreePath, taskId);
     if (otherUser) {
       mergerLog.log(`Worktree retained \u2014 still needed by ${otherUser}`);
@@ -57174,7 +57587,16 @@ async function executeMergeAttempt(params, aiTracker) {
           }).trim();
           if (staged !== "0") {
             throwIfAborted(options.signal, taskId);
-            const escapedLog = commitLog.replace(/"/g, '\\"');
+            const safeBody = await resolveSafeCommitBody({
+              rootDir,
+              taskId,
+              branch,
+              commitLog,
+              diffStat,
+              settings,
+              signal: options.signal
+            });
+            const escapedLog = safeBody.replace(/"/g, '\\"');
             const fallbackPrefix = includeTaskId ? `feat(${taskId})` : "feat";
             const authorArg = getCommitAuthorArg(settings);
             const trailerArg = buildTaskIdTrailerArg(taskId);
@@ -57287,7 +57709,8 @@ async function executeMergeAttempt(params, aiTracker) {
       options,
       testCommand,
       buildCommand: buildCommand2,
-      sourceIssueRef
+      sourceIssueRef,
+      preMergeRebaseFallthrough: params.preMergeRebaseFallthrough
     });
     if (!agentResult.success) {
       const errorMessage = agentResult.error || "Build verification failed";
@@ -57347,7 +57770,7 @@ async function executeMergeAttempt(params, aiTracker) {
   }
 }
 async function attemptWithSideStrategy(params, side = "theirs", aiTracker) {
-  const { rootDir, branch, commitLog, includeTaskId, sourceIssueRef, taskId, store, settings, testCommand, buildCommand: buildCommand2, testSource, buildSource } = params;
+  const { rootDir, branch, commitLog, diffStat, includeTaskId, sourceIssueRef, taskId, store, settings, testCommand, buildCommand: buildCommand2, testSource, buildSource } = params;
   mergerLog.log(`${taskId}: attempting merge with -X ${side} strategy`);
   try {
     throwIfAborted(params.options.signal, taskId);
@@ -57384,7 +57807,16 @@ async function attemptWithSideStrategy(params, side = "theirs", aiTracker) {
       return true;
     }
     throwIfAborted(params.options.signal, taskId);
-    const escapedLog = commitLog.replace(/"/g, '\\"');
+    const safeBody = await resolveSafeCommitBody({
+      rootDir,
+      taskId,
+      branch,
+      commitLog,
+      diffStat,
+      settings,
+      signal: params.options.signal
+    });
+    const escapedLog = safeBody.replace(/"/g, '\\"');
     const fallbackPrefix = includeTaskId ? `feat(${taskId})` : "feat";
     const authorArg = getCommitAuthorArg(settings);
     const trailerArg = buildTaskIdTrailerArg(taskId);
@@ -57430,7 +57862,8 @@ async function runAiAgentForCommit(params) {
     sourceIssueRef,
     options,
     testCommand,
-    buildCommand: buildCommand2
+    buildCommand: buildCommand2,
+    preMergeRebaseFallthrough
   } = params;
   const settings = await store.getSettings();
   let buildFailed = false;
@@ -57527,7 +57960,8 @@ async function runAiAgentForCommit(params) {
       testCommand,
       buildCommand: buildCommand2,
       authorArg,
-      sourceIssueRef
+      sourceIssueRef,
+      preMergeRebaseFallthrough
     });
     mergerLog.log(`${taskId}: starting fresh merge agent session`);
     try {
@@ -57560,7 +57994,8 @@ async function runAiAgentForCommit(params) {
           testCommand,
           buildCommand: buildCommand2,
           authorArg,
-          sourceIssueRef
+          sourceIssueRef,
+          preMergeRebaseFallthrough
         });
         try {
           await withRateLimitRetry(async () => {
@@ -57598,7 +58033,16 @@ async function runAiAgentForCommit(params) {
       if (!buildCommand2) {
         throwIfAborted(options.signal, taskId);
         mergerLog.log("Agent didn't commit \u2014 committing with fallback message");
-        const escapedLog = commitLog.replace(/"/g, '\\"');
+        const safeBody = await resolveSafeCommitBody({
+          rootDir,
+          taskId,
+          branch,
+          commitLog,
+          diffStat,
+          settings,
+          signal: options.signal
+        });
+        const escapedLog = safeBody.replace(/"/g, '\\"');
         const fallbackPrefix = includeTaskId ? `feat(${taskId})` : "feat";
         const authorArg2 = getCommitAuthorArg(settings);
         const trailerArg = buildTaskIdTrailerArg(taskId);
@@ -57627,17 +58071,41 @@ async function runAiAgentForCommit(params) {
   }
 }
 function buildMergePrompt(params) {
-  const { taskId, branch, commitLog, diffStat, hasConflicts, simplifiedContext, sourceIssueRef, testCommand, buildCommand: buildCommand2, authorArg } = params;
+  const { taskId, branch, commitLog, diffStat, hasConflicts, simplifiedContext, sourceIssueRef, testCommand, buildCommand: buildCommand2, authorArg, preMergeRebaseFallthrough } = params;
   const truncatedCommitLog = truncateWithEllipsis(commitLog, MERGE_COMMIT_LOG_MAX_CHARS);
   const truncatedDiffStat = truncateWithEllipsis(diffStat, MERGE_DIFF_STAT_MAX_CHARS);
-  const parts = [
+  const parts = [];
+  if (preMergeRebaseFallthrough) {
+    parts.push(
+      "## \u26A0\uFE0F Pre-merge rebase recovery exhausted \u2014 you are the final arbiter",
+      "",
+      "The pre-merge rebase against main aborted, and the surgical (Layer 1) and",
+      "patch-id (Layer 2) recovery layers could not reconcile the branch. You are",
+      "running under `smart-prefer-main` strategy, which means:",
+      "",
+      "**SAFETY CONSTRAINT \u2014 main's deletions are authoritative.**",
+      "- If a hunk shows main has deleted lines that the branch re-adds, prefer",
+      "  main's deletion. Branch-only re-additions are likely orphan content from",
+      "  a squash-merged dependency and must NOT be re-introduced.",
+      "- If a hunk is genuinely ambiguous, prefer main's version.",
+      "- The merge result MUST pass `pnpm test` and `pnpm build`. If you can't",
+      "  produce a result that does, call `fn_report_build_failure` with concrete",
+      "  output rather than committing a regression.",
+      "",
+      `Original rebase failure for context: ${preMergeRebaseFallthrough.slice(0, 800)}`,
+      "",
+      "---",
+      ""
+    );
+  }
+  parts.push(
     `Finalize the merge of branch \`${branch}\` for task ${taskId}.`,
     "",
     "## Branch commits",
     "```",
     truncatedCommitLog,
     "```"
-  ];
+  );
   if (!simplifiedContext) {
     parts.push(
       "",
@@ -58012,7 +58480,7 @@ var init_merger = __esm({
 // ../engine/src/worktree-names.ts
 import { readdirSync as readdirSync3 } from "node:fs";
 import { join as join27 } from "node:path";
-import { existsSync as existsSync22 } from "node:fs";
+import { existsSync as existsSync23 } from "node:fs";
 function slugify2(str) {
   return str.toLowerCase().replace(/[^a-z0-9\s-]/g, "").replace(/\s+/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
 }
@@ -58038,7 +58506,7 @@ function generateReservedWorktreeName(rootDir, reservedNames = /* @__PURE__ */ n
   return `${baseName}-${suffix}`;
 }
 function getExistingWorktreeNames(worktreesDir) {
-  if (!existsSync22(worktreesDir)) {
+  if (!existsSync23(worktreesDir)) {
     return /* @__PURE__ */ new Set();
   }
   try {
@@ -58175,8 +58643,8 @@ __export(worktree_pool_exports, {
 });
 import { exec as exec3 } from "node:child_process";
 import { promisify as promisify4 } from "node:util";
-import { existsSync as existsSync23, lstatSync, readdirSync as readdirSync4, rmSync as rmSync2 } from "node:fs";
-import { join as join28, relative as relative5, resolve as resolve12, isAbsolute as isAbsolute8 } from "node:path";
+import { existsSync as existsSync24, lstatSync, readdirSync as readdirSync4, rmSync as rmSync2 } from "node:fs";
+import { join as join28, relative as relative5, resolve as resolve12, isAbsolute as isAbsolute9 } from "node:path";
 async function isGitRepository(dir) {
   try {
     await execAsync3("git rev-parse --git-dir", {
@@ -58213,20 +58681,20 @@ async function isRegisteredGitWorktree2(rootDir, worktreePath) {
   return (await getRegisteredWorktreePaths(rootDir)).has(resolve12(worktreePath));
 }
 function hasRequiredWorktreeFiles(worktreePath) {
-  return existsSync23(join28(worktreePath, ".git")) && existsSync23(join28(worktreePath, "package.json"));
+  return existsSync24(join28(worktreePath, ".git")) && existsSync24(join28(worktreePath, "package.json"));
 }
 async function isUsableTaskWorktree(rootDir, worktreePath) {
-  return existsSync23(worktreePath) && await isRegisteredGitWorktree2(rootDir, worktreePath) && hasRequiredWorktreeFiles(worktreePath);
+  return existsSync24(worktreePath) && await isRegisteredGitWorktree2(rootDir, worktreePath) && hasRequiredWorktreeFiles(worktreePath);
 }
 function isInsideWorktreesDir(rootDir, worktreePath) {
   const worktreesDir = resolve12(rootDir, ".worktrees");
   const target = resolve12(worktreePath);
   const rel = relative5(worktreesDir, target);
-  return rel !== "" && !rel.startsWith("..") && !isAbsolute8(rel);
+  return rel !== "" && !rel.startsWith("..") && !isAbsolute9(rel);
 }
 async function scanIdleWorktrees(rootDir, store) {
   const worktreesDir = join28(rootDir, ".worktrees");
-  if (!existsSync23(worktreesDir)) {
+  if (!existsSync24(worktreesDir)) {
     return [];
   }
   let dirs;
@@ -58256,13 +58724,13 @@ async function scanIdleWorktrees(rootDir, store) {
 }
 async function cleanupOrphanedWorktrees(rootDir, store) {
   const worktreesDir = join28(rootDir, ".worktrees");
-  if (!existsSync23(worktreesDir)) {
+  if (!existsSync24(worktreesDir)) {
     return 0;
   }
   const orphaned = await scanIdleWorktrees(rootDir, store);
   const registeredWorktrees = await getRegisteredWorktreePaths(rootDir);
   let dirs = [];
-  if (existsSync23(worktreesDir)) {
+  if (existsSync24(worktreesDir)) {
     try {
       dirs = readdirSync4(worktreesDir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => join28(worktreesDir, e.name));
     } catch (err) {
@@ -58297,7 +58765,7 @@ async function cleanupOrphanedWorktrees(rootDir, store) {
 }
 async function reapOrphanWorktrees(projectRoot) {
   const worktreesDir = join28(projectRoot, ".worktrees");
-  if (!existsSync23(worktreesDir)) {
+  if (!existsSync24(worktreesDir)) {
     return 0;
   }
   let entries;
@@ -58321,7 +58789,7 @@ async function reapOrphanWorktrees(projectRoot) {
   for (const { name, fullPath } of entries) {
     const resolvedFull = resolve12(fullPath);
     const rel = relative5(resolve12(worktreesDir), resolvedFull);
-    if (!rel || rel.startsWith("..") || isAbsolute8(rel)) {
+    if (!rel || rel.startsWith("..") || isAbsolute9(rel)) {
       worktreePoolLog.warn(`reapOrphanWorktrees: skipping out-of-bounds path ${fullPath}`);
       continue;
     }
@@ -58329,7 +58797,7 @@ async function reapOrphanWorktrees(projectRoot) {
       continue;
     }
     const dotGit = join28(resolvedFull, ".git");
-    if (existsSync23(dotGit)) {
+    if (existsSync24(dotGit)) {
       worktreePoolLog.log(`reapOrphanWorktrees: skipping ${name} (has .git entry but not in registered list \u2014 may be partially registered)`);
       continue;
     }
@@ -58388,7 +58856,7 @@ var init_worktree_pool = __esm({
       acquire() {
         for (const path2 of this.idle) {
           this.idle.delete(path2);
-          if (existsSync23(path2)) {
+          if (existsSync24(path2)) {
             return path2;
           }
           worktreePoolLog.log(`Pruned stale entry: ${path2}`);
@@ -58435,7 +58903,7 @@ var init_worktree_pool = __esm({
        */
       rehydrate(idlePaths) {
         for (const path2 of idlePaths) {
-          if (existsSync23(path2)) {
+          if (existsSync24(path2)) {
             this.idle.add(path2);
           } else {
             worktreePoolLog.log(`Rehydrate skipped (not on disk): ${path2}`);
@@ -58491,7 +58959,7 @@ var init_worktree_pool = __esm({
             throw err;
           }
           const conflictingPath = match[1];
-          if (!existsSync23(conflictingPath)) {
+          if (!existsSync24(conflictingPath)) {
             await execAsync3("git worktree prune", { cwd: worktreePath });
             await execAsync3(checkoutCmd, { cwd: worktreePath });
             return branchName;
@@ -58567,7 +59035,7 @@ var init_token_cap_detector = __esm({
 // ../engine/src/step-session-executor.ts
 import { exec as exec4 } from "node:child_process";
 import { promisify as promisify5 } from "node:util";
-import { existsSync as existsSync24 } from "node:fs";
+import { existsSync as existsSync25 } from "node:fs";
 import { join as join29 } from "node:path";
 function parseStepFileScopes(prompt) {
   const result = /* @__PURE__ */ new Map();
@@ -58845,7 +59313,7 @@ function resolveExecutorModelPair(taskModelProvider, taskModelId, settings) {
   return { provider: void 0, modelId: void 0 };
 }
 function sleep2(ms) {
-  return new Promise((resolve19) => setTimeout(resolve19, ms));
+  return new Promise((resolve17) => setTimeout(resolve17, ms));
 }
 var execAsync4, stepExecLog, MAX_STEP_RETRIES, RETRY_DELAYS_MS, NOOP_TASK_STORE, StepSessionExecutor;
 var init_step_session_executor = __esm({
@@ -58971,7 +59439,7 @@ var init_step_session_executor = __esm({
         }
         for (const [stepIdx, worktreePath] of this.parallelWorktrees) {
           try {
-            if (existsSync24(worktreePath)) {
+            if (existsSync25(worktreePath)) {
               await execAsync4(`git worktree remove "${worktreePath}" --force`, {
                 cwd: this.options.rootDir
               });
@@ -59303,7 +59771,7 @@ var init_step_session_executor = __esm({
         for (const [stepIdx, worktreePath] of worktreePaths) {
           if (worktreePath !== this.options.worktreePath) {
             try {
-              if (existsSync24(worktreePath)) {
+              if (existsSync25(worktreePath)) {
                 await execAsync4(`git worktree remove "${worktreePath}" --force`, {
                   cwd: this.options.rootDir
                 });
@@ -59480,8 +59948,8 @@ var init_task_completion = __esm({
 // ../engine/src/executor.ts
 import { exec as exec5 } from "node:child_process";
 import { promisify as promisify6 } from "node:util";
-import { isAbsolute as isAbsolute9, join as join31, relative as relative6, resolve as resolvePath } from "node:path";
-import { existsSync as existsSync25 } from "node:fs";
+import { isAbsolute as isAbsolute10, join as join31, relative as relative6, resolve as resolvePath } from "node:path";
+import { existsSync as existsSync26 } from "node:fs";
 import { readFile as readFile14, writeFile as writeFile11 } from "node:fs/promises";
 import { Type as Type4 } from "@mariozechner/pi-ai";
 import { ModelRegistry as ModelRegistry2, SessionManager as SessionManager2 } from "@mariozechner/pi-coding-agent";
@@ -60566,7 +61034,7 @@ Lint, tests, and typecheck are also hard quality gates:
       async recoverCompletedTask(task) {
         try {
           const settings = await this.store.getSettings();
-          if (task.worktree && existsSync25(task.worktree)) {
+          if (task.worktree && existsSync26(task.worktree)) {
             const modifiedFiles = await this.captureModifiedFiles(task.worktree, task.baseCommitSha);
             if (modifiedFiles.length > 0) {
               await this.store.updateTask(task.id, { modifiedFiles });
@@ -60727,7 +61195,7 @@ Lint, tests, and typecheck are also hard quality gates:
         if (task.dependencies.length === 0) return null;
         for (const depId of task.dependencies) {
           const dep = allTasks.find((t) => t.id === depId);
-          if (dep && dep.worktree && (dep.column === "done" || dep.column === "in-review") && existsSync25(dep.worktree)) {
+          if (dep && dep.worktree && (dep.column === "done" || dep.column === "in-review") && existsSync26(dep.worktree)) {
             return dep.worktree;
           }
         }
@@ -60849,7 +61317,7 @@ Lint, tests, and typecheck are also hard quality gates:
             );
           }
           const branchName = `fusion/${task.id.toLowerCase()}`;
-          let isResume = existsSync25(worktreePath);
+          let isResume = existsSync26(worktreePath);
           let acquiredFromPool = false;
           const baseBranch = task.baseBranch || null;
           if (task.worktree && isResume && !await isUsableTaskWorktree(this.rootDir, worktreePath)) {
@@ -60863,7 +61331,7 @@ Lint, tests, and typecheck are also hard quality gates:
             );
             await this.store.updateTask(task.id, { worktree: null, branch: null });
             worktreePath = join31(this.rootDir, ".worktrees", generateWorktreeName(this.rootDir));
-            isResume = existsSync25(worktreePath);
+            isResume = existsSync26(worktreePath);
           }
           if (!isResume) {
             if (this.options.pool && settings.recycleWorktrees) {
@@ -61157,7 +61625,7 @@ Lint, tests, and typecheck are also hard quality gates:
                     executorLog.warn(`\u26A1 ${task.id} transient error \u2014 retry ${attempt}/${MAX_RECOVERY_RETRIES} in ${delay2}: ${errorMessage}`);
                     await this.store.logEntry(task.id, `Transient error (retry ${attempt}/${MAX_RECOVERY_RETRIES} in ${delay2}): ${errorMessage}`, void 0, this.currentRunContext);
                   }
-                  if (worktreePath && existsSync25(worktreePath)) {
+                  if (worktreePath && existsSync26(worktreePath)) {
                     try {
                       await execAsync5(`git worktree remove "${worktreePath}" --force`, { cwd: this.rootDir });
                       await audit.git({ type: "worktree:remove", target: worktreePath });
@@ -61216,7 +61684,7 @@ Lint, tests, and typecheck are also hard quality gates:
                 try {
                   const latestTask = await this.store.getTask(task.id);
                   await this.resetStepsIfWorkLost(latestTask);
-                  if (worktreePath && existsSync25(worktreePath)) {
+                  if (worktreePath && existsSync26(worktreePath)) {
                     try {
                       await execAsync5(`git worktree remove "${worktreePath}" --force`, { cwd: this.rootDir });
                     } catch (wtErr) {
@@ -61309,7 +61777,7 @@ Lint, tests, and typecheck are also hard quality gates:
             const executorFallbackProvider = settings.fallbackProvider;
             const executorFallbackModelId = settings.fallbackModelId;
             const executorThinkingLevel = detail.thinkingLevel ?? settings.defaultThinkingLevel;
-            const isResuming = !!task.sessionFile && existsSync25(task.sessionFile);
+            const isResuming = !!task.sessionFile && existsSync26(task.sessionFile);
             const sessionManager = isResuming ? SessionManager2.open(task.sessionFile) : SessionManager2.create(worktreePath);
             executorLog.log(`${task.id}: creating agent session (provider=${executorProvider ?? "default"}, model=${executorModelId ?? "default"}, resuming=${isResuming})`);
             const executorInstructions = await this.resolveInstructionsForRole("executor");
@@ -61692,7 +62160,7 @@ Lint, tests, and typecheck are also hard quality gates:
               this.options.onComplete?.(task);
             } else {
               executorLog.log(`${task.id} paused \u2014 moving to todo`);
-              if (worktreePath && existsSync25(worktreePath)) {
+              if (worktreePath && existsSync26(worktreePath)) {
                 try {
                   await execAsync5(`git worktree remove "${worktreePath}" --force`, { cwd: this.rootDir });
                   executorLog.log(`Removed old worktree for paused task: ${worktreePath}`);
@@ -61787,7 +62255,7 @@ Lint, tests, and typecheck are also hard quality gates:
                   executorLog.warn(`\u26A1 ${task.id} transient error \u2014 retry ${attempt}/${MAX_RECOVERY_RETRIES} in ${delay2}: ${errorMessage}`);
                   await this.store.logEntry(task.id, `Transient error (retry ${attempt}/${MAX_RECOVERY_RETRIES} in ${delay2}): ${errorMessage}`, void 0, this.currentRunContext);
                 }
-                if (worktreePath && existsSync25(worktreePath)) {
+                if (worktreePath && existsSync26(worktreePath)) {
                   try {
                     await execAsync5(`git worktree remove "${worktreePath}" --force`, { cwd: this.rootDir });
                     executorLog.log(`Removed old worktree for transient retry: ${worktreePath}`);
@@ -61842,7 +62310,7 @@ Lint, tests, and typecheck are also hard quality gates:
             try {
               const latestTask = await this.store.getTask(task.id);
               await this.resetStepsIfWorkLost(latestTask);
-              if (worktreePath && existsSync25(worktreePath)) {
+              if (worktreePath && existsSync26(worktreePath)) {
                 try {
                   await execAsync5(`git worktree remove "${worktreePath}" --force`, { cwd: this.rootDir });
                   executorLog.log(`Removed old worktree for stuck-killed retry: ${worktreePath}`);
@@ -62942,9 +63410,23 @@ Review the work done in this worktree and evaluate it against the criteria in yo
             resolvedStartPoint = resolved;
           }
         }
+        const squashImport = resolvedStartPoint ? await this.planSquashImportFromDep(taskId, resolvedStartPoint, startPoint) : null;
+        const initialStartPoint = squashImport ? squashImport.mainBase : resolvedStartPoint;
         for (let attempt = 0; attempt < this.MAX_WORKTREE_RETRIES; attempt++) {
           try {
-            const result = await this.tryCreateWorktree(branch, currentPath, taskId, resolvedStartPoint, attempt);
+            const result = await this.tryCreateWorktree(branch, currentPath, taskId, initialStartPoint, attempt);
+            if (squashImport) {
+              await this.squashImportDepIntoWorktree(
+                result.path,
+                taskId,
+                squashImport.depTip,
+                squashImport.label
+              ).catch((importErr) => {
+                executorLog.warn(
+                  `Squash-import of ${squashImport.label} into ${result.branch} failed for ${taskId} (continuing without): ${importErr instanceof Error ? importErr.message : String(importErr)}`
+                );
+              });
+            }
             await this.rebaseNewWorktreeOntoRemote(result.path, result.branch, taskId).catch((err) => {
               executorLog.warn(
                 `Post-create worktree rebase failed for ${taskId} (continuing): ${err instanceof Error ? err.message : String(err)}`
@@ -62966,7 +63448,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
               );
             }
             const delay2 = this.WORKTREE_RETRY_DELAYS[attempt] || 1e3;
-            await new Promise((resolve19) => setTimeout(resolve19, delay2));
+            await new Promise((resolve17) => setTimeout(resolve17, delay2));
           }
         }
         throw new Error("Unexpected exit from worktree creation retry loop");
@@ -62974,6 +63456,136 @@ Review the work done in this worktree and evaluate it against the criteria in yo
       quoteShellArg(value) {
         return `'${value.replace(/'/g, "'\\''")}'`;
       }
+      /**
+       * Decide whether a task's declared dep base should be squash-imported
+       * (instead of forked from). Returns the planned operation's data when the
+       * dep tip differs from the resolvable main base; returns null when no
+       * import is needed (dep is already at main) or when no main base is
+       * resolvable (caller falls back to legacy fork-from-dep).
+       *
+       * `originalStartPoint` is the user-facing label (typically the branch name
+       * like `fusion/fn-2729`) used purely for log messages. `depTip` is the
+       * resolved SHA of the dep's tip — that's what gets squash-merged.
+       */
+      async planSquashImportFromDep(taskId, depTip, originalStartPoint) {
+        let settings;
+        try {
+          settings = await this.store.getSettings();
+        } catch {
+          return null;
+        }
+        let mainBase = "";
+        if (settings.worktreeRebaseBeforeMerge !== false) {
+          let remote = settings.worktreeRebaseRemote?.trim() || "";
+          if (!remote) {
+            try {
+              const { stdout } = await execAsync5("git remote", { cwd: this.rootDir });
+              const remotes = stdout.split("\n").map((s) => s.trim()).filter(Boolean);
+              if (remotes.includes("origin")) remote = "origin";
+              else if (remotes.length === 1) remote = remotes[0];
+            } catch {
+            }
+          }
+          if (remote) {
+            let defaultBranch = "";
+            try {
+              const { stdout } = await execAsync5(
+                `git rev-parse --abbrev-ref ${this.quoteShellArg(remote)}/HEAD`,
+                { cwd: this.rootDir }
+              );
+              defaultBranch = stdout.trim().replace(new RegExp(`^${remote}/`), "");
+            } catch {
+            }
+            if (defaultBranch && defaultBranch !== "HEAD") {
+              await execAsync5(
+                `git fetch ${this.quoteShellArg(remote)} ${this.quoteShellArg(defaultBranch)}`,
+                { cwd: this.rootDir }
+              ).catch(() => void 0);
+              try {
+                const { stdout } = await execAsync5(
+                  `git rev-parse --verify "${remote}/${defaultBranch}^{commit}"`,
+                  { cwd: this.rootDir, encoding: "utf-8" }
+                );
+                mainBase = stdout.trim();
+              } catch {
+              }
+            }
+          }
+        }
+        if (!mainBase) {
+          try {
+            const { stdout } = await execAsync5("git rev-parse HEAD", {
+              cwd: this.rootDir,
+              encoding: "utf-8"
+            });
+            mainBase = stdout.trim();
+          } catch {
+            return null;
+          }
+        }
+        if (!mainBase) return null;
+        try {
+          await execAsync5(
+            `git merge-base --is-ancestor ${this.quoteShellArg(depTip)} ${this.quoteShellArg(mainBase)}`,
+            { cwd: this.rootDir }
+          );
+          if (depTip === mainBase) return null;
+          return { depTip: mainBase, mainBase, label: originalStartPoint || depTip.slice(0, 8) };
+        } catch {
+        }
+        return { depTip, mainBase, label: originalStartPoint || depTip.slice(0, 8) };
+      }
+      /**
+       * Squash-merge the dep's content into a worktree that's already branched
+       * off main. Produces one commit on the worktree branch carrying the dep's
+       * content, instead of inheriting the dep's individual commits. Best-effort:
+       * any failure (conflict, hooks, IO) leaves the worktree at main and the
+       * caller proceeds — the dependent task will then need to import the dep's
+       * content itself, but the worktree itself is still usable.
+       */
+      async squashImportDepIntoWorktree(worktreePath, taskId, depTip, label) {
+        try {
+          await execAsync5(
+            `git merge-base --is-ancestor ${this.quoteShellArg(depTip)} HEAD`,
+            { cwd: worktreePath }
+          );
+          return;
+        } catch {
+        }
+        try {
+          await execAsync5(
+            `git merge --squash --allow-unrelated-histories ${this.quoteShellArg(depTip)}`,
+            { cwd: worktreePath }
+          );
+        } catch (err) {
+          await execAsync5("git reset --hard HEAD", { cwd: worktreePath }).catch(
+            () => void 0
+          );
+          throw err;
+        }
+        try {
+          await execAsync5("git diff --cached --quiet", { cwd: worktreePath });
+          return;
+        } catch {
+        }
+        const subject = `chore(${taskId}): import dependency content from ${label}`;
+        const body = `Squash-imported the working tree of ${label} as a single commit so this branch carries the dep's content without inheriting its individual commits. If the dep is later squash-merged to main, this commit's patch-id should match the merge and rebase cleanly.`;
+        try {
+          await execAsync5(
+            `git commit -m ${this.quoteShellArg(subject)} -m ${this.quoteShellArg(body)}`,
+            { cwd: worktreePath }
+          );
+        } catch (commitErr) {
+          await execAsync5("git reset --hard HEAD", { cwd: worktreePath }).catch(
+            () => void 0
+          );
+          throw commitErr;
+        }
+        await this.store.logEntry(
+          taskId,
+          `Squash-imported dependency content from ${label} into worktree (single import commit instead of inheriting raw commits)`
+        );
+      }
       /**
        * After creating a fresh task worktree, fetch the configured remote and
        * rebase the task branch onto `<remote>/<defaultBranch>`. The result is a
@@ -63058,7 +63670,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
        * rather than fail the task permanently.
        */
       async resolveWorktreeStartPoint(startPoint, taskId) {
-        const command = isAbsolute9(startPoint) && existsSync25(startPoint) ? `git -C "${startPoint}" rev-parse --verify HEAD^{commit}` : `git rev-parse --verify "${startPoint}^{commit}"`;
+        const command = isAbsolute10(startPoint) && existsSync26(startPoint) ? `git -C "${startPoint}" rev-parse --verify HEAD^{commit}` : `git rev-parse --verify "${startPoint}^{commit}"`;
         try {
           const { stdout } = await execAsync5(command, { cwd: this.rootDir });
           return stdout.trim() || startPoint;
@@ -63078,7 +63690,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
        */
       async tryCreateWorktree(branch, path2, taskId, startPoint, attemptNumber = 0, recoveryDepth = 0) {
         await this.assertWorktreePathNotNested(path2, taskId);
-        if (existsSync25(path2)) {
+        if (existsSync26(path2)) {
           const isRegistered = await this.isRegisteredWorktree(path2);
           if (!isRegistered) {
             await this.store.logEntry(
@@ -63276,7 +63888,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
           if (wt === rootResolved) continue;
           if (wt === target) continue;
           const rel = relative6(wt, target);
-          if (rel && !rel.startsWith("..") && !isAbsolute9(rel)) {
+          if (rel && !rel.startsWith("..") && !isAbsolute10(rel)) {
             await this.store.logEntry(
               taskId,
               `Refusing to create nested worktree`,
@@ -63419,6 +64031,10 @@ Review the work done in this worktree and evaluate it against the criteria in yo
         if (alreadyUsedMatch) {
           return { type: "already-used", path: alreadyUsedMatch[1], message: output };
         }
+        const alreadyCheckedOutMatch = output.match(/is already checked out at '([^']+)'/);
+        if (alreadyCheckedOutMatch) {
+          return { type: "already-used", path: alreadyCheckedOutMatch[1], message: output };
+        }
         if (output.match(/invalid reference/i) || output.match(/unable to resolve reference/i) || output.match(/stale file handle/i) || output.match(/not a valid ref/i) || output.match(/unable to delete.*ref/i)) {
           return { type: "invalid-reference", message: output };
         }
@@ -63905,9 +64521,9 @@ var init_effective_node = __esm({
 });
 
 // ../engine/src/scheduler.ts
-import { existsSync as existsSync26 } from "node:fs";
+import { existsSync as existsSync27 } from "node:fs";
 import { readFile as readFile15 } from "node:fs/promises";
-import { join as join32 } from "node:path";
+import { basename as basename8, join as join32 } from "node:path";
 function pathsOverlap2(a, b) {
   for (const pa of a) {
     const prefixA = pa.endsWith("/*") ? pa.slice(0, -1) : null;
@@ -64075,11 +64691,11 @@ var init_scheduler = __esm({
        */
       async validateTaskFilesystem(id) {
         const taskDir = join32(this.store.getTasksDir(), id);
-        if (!existsSync26(taskDir)) {
+        if (!existsSync27(taskDir)) {
           return { valid: false, reason: "missing directory" };
         }
         const promptPath = join32(taskDir, "PROMPT.md");
-        if (!existsSync26(promptPath)) {
+        if (!existsSync27(promptPath)) {
           return { valid: false, reason: "missing or empty PROMPT.md" };
         }
         try {
@@ -64182,7 +64798,7 @@ var init_scheduler = __esm({
        */
       planWorktreePath(task, naming, reservedNames) {
         if (task.worktree) {
-          const existingName = task.worktree.split("/").pop();
+          const existingName = basename8(task.worktree);
           if (existingName) reservedNames.add(existingName);
           return task.worktree;
         }
@@ -64319,7 +64935,7 @@ var init_scheduler = __esm({
           const ordered = resolveDependencyOrder(todo);
           let started = 0;
           const reservedWorktreeNames = new Set(
-            tasks.map((task) => task.worktree?.split("/").pop()).filter((name) => Boolean(name))
+            tasks.map((task) => task.worktree ? basename8(task.worktree) : void 0).filter((name) => Boolean(name))
           );
           for (const taskId of ordered) {
             const task = tasks.find((t) => t.id === taskId);
@@ -66118,7 +66734,7 @@ __export(agent_reflection_exports, {
   AgentReflectionService: () => AgentReflectionService
 });
 import { readFile as readFile16 } from "node:fs/promises";
-import { isAbsolute as isAbsolute10, resolve as resolve13 } from "node:path";
+import { isAbsolute as isAbsolute11, resolve as resolve13 } from "node:path";
 var reflectionLog, REFLECTION_SYSTEM_PROMPT, DEFAULT_OUTCOME_LIMIT, AgentReflectionService;
 var init_agent_reflection = __esm({
   "../engine/src/agent-reflection.ts"() {
@@ -66424,7 +67040,7 @@ Rules:
           pieces.push(agent.instructionsText.trim());
         }
         if (agent.instructionsPath?.trim()) {
-          const resolvedPath = isAbsolute10(agent.instructionsPath) ? agent.instructionsPath : resolve13(this.rootDir, agent.instructionsPath);
+          const resolvedPath = isAbsolute11(agent.instructionsPath) ? agent.instructionsPath : resolve13(this.rootDir, agent.instructionsPath);
           try {
             const content = await readFile16(resolvedPath, "utf-8");
             if (content.trim()) {
@@ -70389,8 +71005,8 @@ ${taskDetail.prompt}` : "No PROMPT.md available.",
 // ../engine/src/self-healing.ts
 import { exec as exec8 } from "node:child_process";
 import { promisify as promisify9 } from "node:util";
-import { existsSync as existsSync27, readdirSync as readdirSync5, rmSync as rmSync3, statSync as statSync5 } from "node:fs";
-import { isAbsolute as isAbsolute11, join as join33, relative as relative7, resolve as resolve14 } from "node:path";
+import { existsSync as existsSync28, readdirSync as readdirSync5, rmSync as rmSync3, statSync as statSync5 } from "node:fs";
+import { isAbsolute as isAbsolute12, join as join33, relative as relative7, resolve as resolve14 } from "node:path";
 function shellQuote(value) {
   return `'${value.replace(/'/g, "'\\''")}'`;
 }
@@ -70771,7 +71387,7 @@ var init_self_healing = __esm({
         return commit;
       }
       async cleanupInterruptedMergeArtifacts(task) {
-        if (task.worktree && existsSync27(task.worktree)) {
+        if (task.worktree && existsSync28(task.worktree)) {
           try {
             await execAsync8(`git worktree remove ${shellQuote(task.worktree)} --force`, {
               cwd: this.options.rootDir,
@@ -71302,7 +71918,7 @@ var init_self_healing = __esm({
               return false;
             }
             const staleness = now - new Date(t.updatedAt).getTime();
-            const hasWorktree = t.worktree && existsSync27(t.worktree);
+            const hasWorktree = t.worktree && existsSync28(t.worktree);
             const graceMs = hasWorktree ? ORPHANED_WITH_WORKTREE_GRACE_MS : ORPHANED_EXECUTION_RECOVERY_GRACE_MS;
             return staleness >= graceMs;
           });
@@ -71311,7 +71927,7 @@ var init_self_healing = __esm({
           let recovered = 0;
           for (const task of orphaned) {
             try {
-              const hadWorktree = task.worktree && existsSync27(task.worktree);
+              const hadWorktree = task.worktree && existsSync28(task.worktree);
               const reason = hadWorktree ? "worktree exists but no active session" : "missing worktree/session";
               await this.resetStepsIfWorkLost(task);
               await this.store.updateTask(task.id, {
@@ -71457,7 +72073,7 @@ var init_self_healing = __esm({
         }
       }
       async hasRecoverableGitWork(task) {
-        if (task.worktree && existsSync27(task.worktree)) {
+        if (task.worktree && existsSync28(task.worktree)) {
           try {
             const { stdout: status } = await execAsync8("git status --porcelain", {
               cwd: task.worktree,
@@ -71643,7 +72259,7 @@ var init_self_healing = __esm({
        */
       async reapUnregisteredOrphans() {
         const worktreesDir = join33(this.options.rootDir, ".worktrees");
-        if (!existsSync27(worktreesDir)) return 0;
+        if (!existsSync28(worktreesDir)) return 0;
         let dirs;
         try {
           dirs = readdirSync5(worktreesDir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => join33(worktreesDir, e.name));
@@ -71657,7 +72273,7 @@ var init_self_healing = __esm({
         let cleaned = 0;
         for (const path2 of unregistered) {
           const rel = relative7(worktreesDir, path2);
-          if (rel === "" || rel.startsWith("..") || isAbsolute11(rel)) {
+          if (rel === "" || rel.startsWith("..") || isAbsolute12(rel)) {
             log8.warn(`Refusing to remove path outside .worktrees: ${path2}`);
             continue;
           }
@@ -71752,7 +72368,7 @@ var init_self_healing = __esm({
       /** Remove oldest idle worktrees if total count exceeds 2× maxWorktrees. */
       async enforceWorktreeCap() {
         const worktreesDir = join33(this.options.rootDir, ".worktrees");
-        if (!existsSync27(worktreesDir)) return;
+        if (!existsSync28(worktreesDir)) return;
         try {
           const settings = await this.store.getSettings();
           const cap = (settings.maxWorktrees ?? 4) * 2;
@@ -72290,13 +72906,13 @@ var init_plugin_runner = __esm({
        * Returns the result on success, throws on timeout.
        */
       withTimeout(promise, ms, timeoutMessage) {
-        return new Promise((resolve19, reject) => {
+        return new Promise((resolve17, reject) => {
           const timer = setTimeout(() => {
             reject(new Error(timeoutMessage));
           }, ms);
           promise.then((result) => {
             clearTimeout(timer);
-            resolve19(result);
+            resolve17(result);
           }).catch((err) => {
             clearTimeout(timer);
             reject(err);
@@ -72965,7 +73581,7 @@ var init_in_process_runtime = __esm({
             runtimeLog.log(
               `Waiting for ${metrics.inFlightTasks} in-flight tasks to complete...`
             );
-            await new Promise((resolve19) => setTimeout(resolve19, 1e3));
+            await new Promise((resolve17) => setTimeout(resolve17, 1e3));
           }
           const finalMetrics = this.getMetrics();
           if (finalMetrics.inFlightTasks > 0) {
@@ -73362,13 +73978,13 @@ var init_ipc_host = __esm({
         }
         const id = generateCorrelationId();
         const message = { type, id, payload };
-        return new Promise((resolve19, reject) => {
+        return new Promise((resolve17, reject) => {
           const timeout = setTimeout(() => {
             this.pendingCommands.delete(id);
             reject(new Error(`Command ${type} timed out after ${timeoutMs ?? this.commandTimeoutMs}ms`));
           }, timeoutMs ?? this.commandTimeoutMs);
           this.pendingCommands.set(id, {
-            resolve: resolve19,
+            resolve: resolve17,
             reject,
             timeout,
             type
@@ -74177,8 +74793,8 @@ var init_remote_node_client = __esm({
         return error instanceof TypeError;
       }
       async sleep(ms) {
-        await new Promise((resolve19) => {
-          setTimeout(resolve19, ms);
+        await new Promise((resolve17) => {
+          setTimeout(resolve17, ms);
         });
       }
     };
@@ -74442,14 +75058,14 @@ var init_remote_node_runtime = __esm({
         return error instanceof Error ? error : new Error(String(error));
       }
       async sleep(ms, signal) {
-        await new Promise((resolve19) => {
+        await new Promise((resolve17) => {
           const timeout = setTimeout(() => {
             cleanup();
-            resolve19();
+            resolve17();
           }, ms);
           const onAbort = () => {
             cleanup();
-            resolve19();
+            resolve17();
           };
           const cleanup = () => {
             clearTimeout(timeout);
@@ -75336,10 +75952,10 @@ var init_tunnel_process_manager = __esm({
           lastError: null
         });
         this.emitLog("info", "manager", `Stopping ${currentHandle.provider} tunnel (pid=${currentHandle.child.pid ?? "n/a"})`);
-        this.activeStopPromise = new Promise((resolve19) => {
+        this.activeStopPromise = new Promise((resolve17) => {
           const onClose = () => {
             currentHandle.child.removeListener("close", onClose);
-            resolve19();
+            resolve17();
           };
           currentHandle.child.once("close", onClose);
           killManagedProcess(currentHandle.child, "SIGTERM");
@@ -75554,6 +76170,12 @@ var init_project_engine = __esm({
        *  a follow-up triage task so a fresh agent (or human) can investigate
        *  the underlying flake/regression instead of looping forever. */
       static MAX_VERIFICATION_FAILURE_BOUNCES = 3;
+      /** Cap on outer in-review→in-progress bounces caused by auto-merge conflict
+       *  retries being exhausted. After this many bounces the task is parked in
+       *  in-review with status=failed and a follow-up task is created, so the
+       *  30-minute cooldown sweep cannot loop forever on a merge that requires
+       *  human intervention. */
+      static MAX_MERGE_CONFLICT_BOUNCES = 2;
       /** 30-minute cooldown before a retry-exhausted task gets another sweep attempt */
       static AUTO_MERGE_COOLDOWN_MS = 30 * 60 * 1e3;
       // Event handler references for cleanup
@@ -75895,12 +76517,12 @@ ${detail}`
        */
       async onMerge(taskId) {
         if (this.mergeActive.has(taskId)) {
-          return new Promise((resolve19, reject) => {
-            this.manualMergeResolvers.set(taskId, { resolve: resolve19, reject });
+          return new Promise((resolve17, reject) => {
+            this.manualMergeResolvers.set(taskId, { resolve: resolve17, reject });
           });
         }
-        return new Promise((resolve19, reject) => {
-          this.manualMergeResolvers.set(taskId, { resolve: resolve19, reject });
+        return new Promise((resolve17, reject) => {
+          this.manualMergeResolvers.set(taskId, { resolve: resolve17, reject });
           this.internalEnqueueMerge(taskId);
         });
       }
@@ -76120,6 +76742,7 @@ ${detail}`
       canMergeTask(task) {
         if (task.mergeDetails?.mergeConfirmed) return true;
         if (this.options.getTaskMergeBlocker?.(task)) return false;
+        if (task.status === "failed") return false;
         return (task.mergeRetries ?? 0) < _ProjectEngine.MAX_AUTO_MERGE_RETRIES || this.hasAutoHealableVerificationBufferFailure(task) || this.isRetryCooldownElapsed(task);
       }
       internalEnqueueMerge(taskId) {
@@ -76283,6 +76906,15 @@ ${detail}`
                 continue;
               }
               runtimeLog.error(`${manualResolver ? "Manual" : "Auto"}-merge failed for ${taskId}: ${errorMsg}`);
+              await store.logEntry(
+                taskId,
+                `${manualResolver ? "Manual" : "Auto"}-merge failed: ${errorMsg}`,
+                err instanceof Error ? err.name : void 0
+              ).catch((logErr) => {
+                runtimeLog.warn(
+                  `Auto-merge: failed to log merge-failure entry on ${taskId}: ${logErr instanceof Error ? logErr.message : String(logErr)}`
+                );
+              });
               if (manualResolver) {
                 this.manualMergeResolvers.delete(taskId);
                 manualResolver.reject(err instanceof Error ? err : new Error(errorMsg));
@@ -76361,7 +76993,7 @@ ${detail}`
                 const isConflictError = errorMsg.includes("conflict") || errorMsg.includes("Conflict");
                 if (taskOnErr && isConflictError) {
                   const currentRetries = taskOnErr.mergeRetries ?? 0;
-                  if (settingsOnErr.autoResolveConflicts !== false && currentRetries < _ProjectEngine.MAX_AUTO_MERGE_RETRIES) {
+                  if (settingsOnErr.autoResolveConflicts !== false && currentRetries + 1 < _ProjectEngine.MAX_AUTO_MERGE_RETRIES) {
                     const newRetryCount = currentRetries + 1;
                     await store.updateTask(taskId, { mergeRetries: newRetryCount, status: null });
                     const delayMs = 5e3 * Math.pow(2, currentRetries);
@@ -76372,21 +77004,92 @@ ${detail}`
                       if (!this.shuttingDown) this.internalEnqueueMerge(taskId);
                     }, delayMs);
                   } else {
-                    try {
-                      await store.updateTask(taskId, { status: null });
-                    } catch (recoveryErr) {
-                      runtimeLog.error(
-                        `Auto-merge: failed to clear status on ${taskId} after max retries exceeded: ${recoveryErr instanceof Error ? recoveryErr.message : String(recoveryErr)}`
-                      );
+                    const previousBounces = taskOnErr.mergeConflictBounceCount ?? 0;
+                    const nextBounces = previousBounces + 1;
+                    const bounceCap = _ProjectEngine.MAX_MERGE_CONFLICT_BOUNCES;
+                    const autoResolveDisabled = settingsOnErr.autoResolveConflicts === false;
+                    if (autoResolveDisabled || nextBounces > bounceCap) {
+                      const reason = autoResolveDisabled ? "autoResolveConflicts is disabled" : `merge-conflict bounce cap reached (${nextBounces - 1}/${bounceCap})`;
+                      try {
+                        await store.updateTask(taskId, {
+                          status: "failed",
+                          mergeRetries: _ProjectEngine.MAX_AUTO_MERGE_RETRIES,
+                          error: `Auto-merge gave up: ${reason}. ${errorMsg}`
+                        });
+                        await store.addTaskComment(
+                          taskId,
+                          `Auto-merge gave up after ${_ProjectEngine.MAX_AUTO_MERGE_RETRIES} conflict-resolution retries (${reason}). Resolve the conflict on branch \`${taskOnErr.branch ?? "?"}\` manually, then unpause/retry.`,
+                          "agent"
+                        );
+                        await store.logEntry(
+                          taskId,
+                          `Auto-merge gave up after conflict retries exhausted (${reason}); task parked for human intervention`,
+                          "MergeConflictGiveUp"
+                        );
+                        if (!autoResolveDisabled) {
+                          try {
+                            const followUp = await store.createTask({
+                              description: `Resolve auto-merge conflict on ${taskId} (${taskOnErr.title || "untitled"}). Auto-merge attempted to rebase + resolve ${nextBounces - 1} times against main and exhausted retries each pass. Branch: \`${taskOnErr.branch ?? "?"}\`. Worktree: \`${taskOnErr.worktree ?? "?"}\`. Last merge error: ${errorMsg}`,
+                              column: "triage",
+                              priority: "high"
+                            });
+                            await store.addTaskComment(
+                              taskId,
+                              `Created follow-up ${followUp.id} to track manual conflict resolution.`,
+                              "agent"
+                            );
+                          } catch (followUpErr) {
+                            runtimeLog.warn(
+                              `Auto-merge: failed to create follow-up for ${taskId}: ${followUpErr instanceof Error ? followUpErr.message : String(followUpErr)}`
+                            );
+                          }
+                        }
+                      } catch (recoveryErr) {
+                        runtimeLog.error(
+                          `Auto-merge: failed to park ${taskId} after conflict-bounce cap: ${recoveryErr instanceof Error ? recoveryErr.message : String(recoveryErr)}`
+                        );
+                      }
+                    } else {
+                      try {
+                        await store.addTaskComment(
+                          taskId,
+                          `Auto-merge could not resolve conflicts within ${_ProjectEngine.MAX_AUTO_MERGE_RETRIES} retries (bounce ${nextBounces}/${bounceCap}). Bouncing back to in-progress for a fresh rebase against main; the executor will re-run quality gates and re-attempt the merge.`,
+                          "agent"
+                        );
+                        await store.updateTask(taskId, {
+                          status: null,
+                          mergeRetries: 0,
+                          error: null,
+                          mergeConflictBounceCount: nextBounces
+                        });
+                        await store.moveTask(taskId, "in-progress");
+                        await store.logEntry(
+                          taskId,
+                          `Auto-merge conflicts unresolved (${_ProjectEngine.MAX_AUTO_MERGE_RETRIES}/${_ProjectEngine.MAX_AUTO_MERGE_RETRIES}) \u2014 bounced to in-progress for re-rebase (bounce ${nextBounces}/${bounceCap})`,
+                          "MergeConflictBounce"
+                        );
+                        runtimeLog.log(
+                          `Auto-merge: ${taskId} conflict retries exhausted \u2014 bounced to in-progress (${nextBounces}/${bounceCap})`
+                        );
+                      } catch (recoveryErr) {
+                        runtimeLog.error(
+                          `Auto-merge: failed to bounce ${taskId} after conflict exhaustion: ${recoveryErr instanceof Error ? recoveryErr.message : String(recoveryErr)}`
+                        );
+                      }
                     }
                   }
                 } else {
                   try {
                     await store.updateTask(taskId, {
-                      status: null,
+                      status: "failed",
                       mergeRetries: _ProjectEngine.MAX_AUTO_MERGE_RETRIES,
                       error: errorMsg
                     });
+                    await store.addTaskComment(
+                      taskId,
+                      `Auto-merge failed with a non-conflict error and stopped retrying: ${errorMsg}`,
+                      "agent"
+                    );
                   } catch (recoveryErr) {
                     runtimeLog.error(
                       `Auto-merge: failed to update ${taskId} after non-conflict error: ${recoveryErr instanceof Error ? recoveryErr.message : String(recoveryErr)}`
@@ -76396,7 +77099,7 @@ ${detail}`
               } else {
                 try {
                   await store.updateTask(taskId, {
-                    status: null,
+                    status: "failed",
                     mergeRetries: _ProjectEngine.MAX_AUTO_MERGE_RETRIES,
                     error: errorMsg
                   });
@@ -79424,7 +80127,7 @@ function buildHermesArgs(prompt, settings, resumeSessionId) {
 async function invokeHermesCli(prompt, settings, resumeSessionId, signal) {
   const args = buildHermesArgs(prompt, settings, resumeSessionId);
   const binary = resolveBinaryForSpawn(settings.binaryPath);
-  return new Promise((resolve19, reject) => {
+  return new Promise((resolve17, reject) => {
     let settled = false;
     const spawnEnv = { ...process.env, PYTHONUNBUFFERED: "1" };
     if (settings.profile) {
@@ -79492,7 +80195,7 @@ ${combined}`));
         return;
       }
       try {
-        resolve19(parseHermesOutput(stdout, stderr));
+        resolve17(parseHermesOutput(stdout, stderr));
       } catch (parseErr) {
         reject(parseErr);
       }
@@ -79718,7 +80421,7 @@ async function promptCli(session, message, config, callbacks, signal) {
   const args = buildOpenClawArgs(config, session.sessionId, message);
   const cb = { ...session.callbacks, ...callbacks };
   cb.onToolStart?.("openclaw.agent", { sessionId: session.sessionId });
-  return new Promise((resolve19, reject) => {
+  return new Promise((resolve17, reject) => {
     let settled = false;
     const child = spawn5(config.binaryPath, args, {
       stdio: ["ignore", "pipe", "pipe"]
@@ -79811,7 +80514,7 @@ async function promptCli(session, message, config, callbacks, signal) {
         ...metaError ? { error: metaError } : {},
         ...errorText.length > 0 ? { toolErrors: errorText } : {}
       });
-      resolve19();
+      resolve17();
     });
   });
 }
@@ -80093,6 +80796,7 @@ var init_register_settings_memory_routes = __esm({
   "../dashboard/src/routes/register-settings-memory-routes.ts"() {
     "use strict";
     init_src();
+    init_src2();
     init_api_error();
     init_remote_auth();
     init_project_store_resolver();
@@ -80122,7 +80826,7 @@ var init_register_messaging_scripts = __esm({
 
 // ../dashboard/src/github.ts
 function delay(ms) {
-  return new Promise((resolve19) => setTimeout(resolve19, ms));
+  return new Promise((resolve17) => setTimeout(resolve17, ms));
 }
 function normalizeCheckState(state) {
   switch ((state ?? "").toLowerCase()) {
@@ -82833,7 +83537,7 @@ async function spawnPaperclipCliJson(args, opts) {
   }
   const timeoutMs = opts.cliTimeoutMs ?? 15e3;
   const label = ["paperclipai", ...args].join(" ");
-  return new Promise((resolve19, reject) => {
+  return new Promise((resolve17, reject) => {
     let child;
     try {
       child = spawn10(bin, fullArgs, { stdio: ["ignore", "pipe", "pipe"] });
@@ -82879,7 +83583,7 @@ async function spawnPaperclipCliJson(args, opts) {
         return;
       }
       try {
-        resolve19(JSON.parse(cleaned));
+        resolve17(JSON.parse(cleaned));
       } catch {
         reject(new Error(`${label} returned non-JSON output: ${cleaned.slice(0, 200)}`));
       }
@@ -82949,7 +83653,7 @@ var init_paperclip_client = __esm({
 // ../../plugins/fusion-plugin-paperclip-runtime/dist/runtime-adapter.js
 import { randomUUID as randomUUID13 } from "node:crypto";
 function sleep3(ms) {
-  return new Promise((resolve19) => setTimeout(resolve19, ms));
+  return new Promise((resolve17) => setTimeout(resolve17, ms));
 }
 function asString2(value) {
   return typeof value === "string" ? value : void 0;
@@ -83357,35 +84061,20 @@ var init_update_check = __esm({
   }
 });
 
+// ../dashboard/src/cli-package-version.ts
+var init_cli_package_version = __esm({
+  "../dashboard/src/cli-package-version.ts"() {
+    "use strict";
+  }
+});
+
 // ../dashboard/src/routes/register-update-check-routes.ts
-import { existsSync as existsSync28, readFileSync as readFileSync7 } from "node:fs";
-import { dirname as dirname9, resolve as resolve15 } from "node:path";
-import { fileURLToPath as fileURLToPath3 } from "node:url";
-var CLI_PACKAGE_VERSION;
 var init_register_update_check_routes = __esm({
   "../dashboard/src/routes/register-update-check-routes.ts"() {
     "use strict";
     init_src();
     init_update_check();
-    CLI_PACKAGE_VERSION = (() => {
-      try {
-        let cur = dirname9(fileURLToPath3(import.meta.url));
-        for (let i = 0; i < 8; i++) {
-          const pkgPath = resolve15(cur, "package.json");
-          if (existsSync28(pkgPath)) {
-            const parsed = JSON.parse(readFileSync7(pkgPath, "utf-8"));
-            if (parsed.name === "@runfusion/fusion" && typeof parsed.version === "string" && parsed.version.length > 0) {
-              return parsed.version;
-            }
-          }
-          const parent = resolve15(cur, "..");
-          if (parent === cur) break;
-          cur = parent;
-        }
-      } catch {
-      }
-      return process.env.npm_package_version ?? "0.0.0";
-    })();
+    init_cli_package_version();
   }
 });
 
@@ -87412,9 +88101,8 @@ var init_auth_middleware = __esm({
 
 // ../dashboard/src/server.ts
 import express from "express";
-import { join as join35, dirname as dirname10, resolve as resolve16 } from "node:path";
-import { existsSync as existsSync29, readFileSync as readFileSync8 } from "node:fs";
-import { fileURLToPath as fileURLToPath4 } from "node:url";
+import { join as join35, dirname as dirname9 } from "node:path";
+import { fileURLToPath as fileURLToPath3 } from "node:url";
 function clearAiSessionCleanupInterval() {
   if (!aiSessionCleanupIntervalHandle) {
     return;
@@ -87422,7 +88110,7 @@ function clearAiSessionCleanupInterval() {
   clearInterval(aiSessionCleanupIntervalHandle);
   aiSessionCleanupIntervalHandle = void 0;
 }
-var __dirname, PACKAGE_VERSION, CLI_PACKAGE_VERSION2, MIN_AI_SESSION_TTL_MS, MAX_AI_SESSION_TTL_MS, MIN_AI_SESSION_CLEANUP_INTERVAL_MS, MAX_AI_SESSION_CLEANUP_INTERVAL_MS, aiSessionCleanupIntervalHandle;
+var __dirname, MIN_AI_SESSION_TTL_MS, MAX_AI_SESSION_TTL_MS, MIN_AI_SESSION_CLEANUP_INTERVAL_MS, MAX_AI_SESSION_CLEANUP_INTERVAL_MS, aiSessionCleanupIntervalHandle;
 var init_server = __esm({
   "../dashboard/src/server.ts"() {
     "use strict";
@@ -87448,37 +88136,8 @@ var init_server = __esm({
     init_dev_server_routes();
     init_auth_middleware();
     init_remote_auth();
-    __dirname = dirname10(fileURLToPath4(import.meta.url));
-    PACKAGE_VERSION = (() => {
-      try {
-        const packageJsonPath = join35(__dirname, "..", "package.json");
-        const packageJson = JSON.parse(readFileSync8(packageJsonPath, "utf-8"));
-        if (typeof packageJson.version === "string" && packageJson.version.length > 0) {
-          return packageJson.version;
-        }
-      } catch {
-      }
-      return process.env.npm_package_version ?? "0.0.0";
-    })();
-    CLI_PACKAGE_VERSION2 = (() => {
-      try {
-        let cur = __dirname;
-        for (let i = 0; i < 8; i++) {
-          const pkgPath = resolve16(cur, "package.json");
-          if (existsSync29(pkgPath)) {
-            const parsed = JSON.parse(readFileSync8(pkgPath, "utf-8"));
-            if (parsed.name === "@runfusion/fusion" && typeof parsed.version === "string" && parsed.version.length > 0) {
-              return parsed.version;
-            }
-          }
-          const parent = resolve16(cur, "..");
-          if (parent === cur) break;
-          cur = parent;
-        }
-      } catch {
-      }
-      return process.env.npm_package_version ?? "0.0.0";
-    })();
+    init_cli_package_version();
+    __dirname = dirname9(fileURLToPath3(import.meta.url));
     MIN_AI_SESSION_TTL_MS = 10 * 60 * 1e3;
     MAX_AI_SESSION_TTL_MS = 30 * 24 * 60 * 60 * 1e3;
     MIN_AI_SESSION_CLEANUP_INTERVAL_MS = 60 * 1e3;
@@ -87542,6 +88201,7 @@ var init_src4 = __esm({
     init_rate_limit();
     init_github_poll();
     init_github_issue_comment();
+    init_cli_package_version();
     init_api_error();
     init_badge_pubsub();
     init_plugins();
@@ -87549,8 +88209,7 @@ var init_src4 = __esm({
 });
 
 // src/project-context.ts
-import { resolve as resolve17, dirname as dirname11 } from "node:path";
-import { existsSync as existsSync30 } from "node:fs";
+import { resolve as resolve15, dirname as dirname10, basename as basename9 } from "node:path";
 async function resolveProject(projectNameFlag, cwd = process.cwd(), globalDir) {
   const central = new CentralCore(globalDir);
   await central.init();
@@ -87626,21 +88285,21 @@ async function clearDefaultProject(globalDir) {
   await globalStore.updateSettings(rest);
 }
 async function detectProjectFromCwd(cwd, central) {
-  let currentDir = resolve17(cwd);
+  let currentDir = resolve15(cwd);
   while (true) {
-    const kbPath = resolve17(currentDir, ".fusion", "fusion.db");
-    if (existsSync30(kbPath)) {
+    const kbPath = resolve15(currentDir, ".fusion", "fusion.db");
+    if (isValidSqliteDatabaseFile(kbPath)) {
       const project = await central.getProjectByPath(currentDir);
       if (project) {
         return project;
       }
       return {
         id: "",
-        name: currentDir.split("/").filter(Boolean).at(-1) ?? "current-project",
+        name: basename9(currentDir) || "current-project",
         path: currentDir
       };
     }
-    const parentDir = dirname11(currentDir);
+    const parentDir = dirname10(currentDir);
     if (parentDir === currentDir) {
       break;
     }
@@ -87690,10 +88349,12 @@ async function findNodeByNameOrId(central, nameOrId) {
   }
   return central.getNodeByName(nameOrId);
 }
+var ANSI_ESCAPE_PATTERN;
 var init_node = __esm({
   "src/commands/node.ts"() {
     "use strict";
     init_src();
+    ANSI_ESCAPE_PATTERN = new RegExp("\\u001b\\[[0-9;]*m", "g");
   }
 });
 
@@ -87729,14 +88390,14 @@ __export(task_exports, {
   runTaskUpdate: () => runTaskUpdate
 });
 import { createInterface as createInterface2 } from "node:readline/promises";
-import { watchFile, unwatchFile, statSync as statSync6, existsSync as existsSync31, readFileSync as readFileSync9 } from "node:fs";
-import { join as join36 } from "node:path";
+import { watchFile, unwatchFile, statSync as statSync6, existsSync as existsSync29, readFileSync as readFileSync7 } from "node:fs";
+import { basename as basename10, join as join36 } from "node:path";
 function asLocalProjectContext(store) {
   const cwd = process.cwd();
   return {
     projectId: cwd,
     projectPath: cwd,
-    projectName: cwd.split("/").filter(Boolean).at(-1) ?? "current-project",
+    projectName: basename10(cwd) || "current-project",
     isRegistered: false,
     store
   };
@@ -87850,10 +88511,10 @@ async function runTaskCreate(descriptionArg, attachFiles, depends, projectName,
   console.log(`    Path:   .fusion/tasks/${task.id}/`);
   if (attachFiles && attachFiles.length > 0) {
     const { readFile: readFile19 } = await import("node:fs/promises");
-    const { basename: basename9, extname: extname3, resolve: resolve19 } = await import("node:path");
+    const { basename: basename12, extname: extname3, resolve: resolve17 } = await import("node:path");
     for (const filePath of attachFiles) {
-      const resolvedPath = resolve19(filePath);
-      const filename = basename9(resolvedPath);
+      const resolvedPath = resolve17(filePath);
+      const filename = basename12(resolvedPath);
       const ext = extname3(filename).toLowerCase();
       const mimeType = MIME_TYPES[ext];
       if (!mimeType) {
@@ -87987,7 +88648,7 @@ async function runTaskLogs(id, options = {}, projectName) {
   if (options.follow) {
     const projectPath = projectContext?.projectPath ?? process.cwd();
     const logPath = join36(projectPath, ".fusion", "tasks", id, "agent.log");
-    if (!existsSync31(logPath)) {
+    if (!existsSync29(logPath)) {
       console.log(`
   Waiting for log file to be created...`);
     }
@@ -88016,7 +88677,7 @@ async function runTaskLogs(id, options = {}, projectName) {
           lastPosition = 0;
         }
         if (stats.size > lastPosition) {
-          const content = readFileSync9(logPath, "utf-8");
+          const content = readFileSync7(logPath, "utf-8");
           const lines = content.slice(lastPosition).split("\n");
           for (const line of lines) {
             if (!line.trim()) continue;
@@ -88145,10 +88806,10 @@ async function runTaskMerge(id, projectName) {
 }
 async function runTaskAttach(id, filePath, projectName) {
   const { readFile: readFile19 } = await import("node:fs/promises");
-  const { basename: basename9, extname: extname3 } = await import("node:path");
-  const { resolve: resolve19 } = await import("node:path");
-  const resolvedPath = resolve19(filePath);
-  const filename = basename9(resolvedPath);
+  const { basename: basename12, extname: extname3 } = await import("node:path");
+  const { resolve: resolve17 } = await import("node:path");
+  const resolvedPath = resolve17(filePath);
+  const filename = basename12(resolvedPath);
   const ext = extname3(filename).toLowerCase();
   const mimeType = MIME_TYPES[ext];
   if (!mimeType) {
@@ -88678,12 +89339,12 @@ async function promptText(question) {
   console.log("  (Enter your response. Type DONE on its own line when finished):\n");
   const rl = createInterface2({ input: process.stdin, output: process.stdout });
   const lines = [];
-  return new Promise((resolve19) => {
+  return new Promise((resolve17) => {
     const askLine = () => {
       rl.question("  ").then((line) => {
         if (line.trim() === "DONE") {
           rl.close();
-          resolve19(lines.join("\n"));
+          resolve17(lines.join("\n"));
         } else {
           lines.push(line);
           askLine();
@@ -89087,9 +89748,9 @@ async function runSkillsInstall(args, options) {
     stdio: "inherit",
     shell: true
   });
-  const exitCode = await new Promise((resolve19, reject) => {
+  const exitCode = await new Promise((resolve17, reject) => {
     child.on("exit", (code) => {
-      resolve19(code ?? 1);
+      resolve17(code ?? 1);
     });
     child.on("error", (err) => {
       reject(err);
@@ -89116,9 +89777,9 @@ init_src();
 init_gh_cli();
 import { Type as Type7 } from "typebox";
 import { StringEnum } from "@mariozechner/pi-ai";
-import { resolve as resolve18, basename as basename8, extname as extname2, join as join37 } from "node:path";
+import { resolve as resolve16, basename as basename11, extname as extname2, join as join37 } from "node:path";
 import { readFile as readFile18 } from "node:fs/promises";
-import { existsSync as existsSync32 } from "node:fs";
+import { existsSync as existsSync30 } from "node:fs";
 import { spawn as spawn9 } from "node:child_process";
 var MIME_TYPES2 = {
   ".png": "image/png",
@@ -89136,14 +89797,14 @@ var MIME_TYPES2 = {
   ".xml": "application/xml"
 };
 function resolveProjectRoot(cwd) {
-  let current = resolve18(cwd);
+  let current = resolve16(cwd);
   while (true) {
-    if (existsSync32(join37(current, ".fusion"))) {
+    if (existsSync30(join37(current, ".fusion"))) {
       return current;
     }
-    const parent = resolve18(current, "..");
+    const parent = resolve16(current, "..");
     if (parent === current) {
-      return resolve18(cwd);
+      return resolve16(cwd);
     }
     current = parent;
   }
@@ -89487,8 +90148,8 @@ Column: triage
       path: Type7.String({ description: "Path to the file to attach" })
     }),
     async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
-      const filePath = resolve18(ctx.cwd, params.path.replace(/^@/, ""));
-      const filename = basename8(filePath);
+      const filePath = resolve16(ctx.cwd, params.path.replace(/^@/, ""));
+      const filename = basename11(filePath);
       const ext = extname2(filename).toLowerCase();
       const mimeType = MIME_TYPES2[ext];
       if (!mimeType) {
@@ -90596,12 +91257,12 @@ Status: ${updated.status}`
       child.stderr?.on("data", (data) => {
         stderr += data.toString();
       });
-      const exitCode = await new Promise((resolve19) => {
+      const exitCode = await new Promise((resolve17) => {
         child.on("exit", (code) => {
-          resolve19(code ?? 1);
+          resolve17(code ?? 1);
         });
         child.on("error", () => {
-          resolve19(1);
+          resolve17(1);
         });
       });
       try {