@runfusion/fusion 0.2.7 → 0.3.0

package/dist/extension.js

@@ -106,6 +106,7 @@ var init_settings_schema = __esm({
       pollIntervalMs: 15e3,
       heartbeatMultiplier: 1,
       groupOverlappingFiles: true,
+      overlapIgnorePaths: [],
       autoMerge: true,
       mergeStrategy: "direct",
       pushAfterMerge: false,
@@ -1323,11 +1324,6 @@ Your job: take a rough task description and produce a fully specified PROMPT.md
 ## What you produce
 Write a complete PROMPT.md specification to the given path using the write tool.
 
-**Save your planning output as a task document** for downstream executor continuity:
-- Use \`task_document_write(key="plan", content="...")\` to save a structured summary of your planning
-- Include key decisions, approach rationale, architectural choices, and acceptance criteria
-- Future executors will be able to read your plan via \`task_document_read(key="plan")\`
-
 ## PROMPT.md Format
 
 Follow this structure exactly:
@@ -1391,52 +1387,169 @@ Follow this structure exactly:
 - [ ] Fix all failures
 - [ ] Build passes
 
-### Step N: Documentation & Delivery
+### Step {N}: Documentation & Delivery
 
-- [ ] Update documentation
-- [ ] Final verification
+- [ ] Update relevant documentation
+- [ ] Save documentation deliverables as task documents via \`fn_task_document_write\` (key="docs", content=...)
+- [ ] Out-of-scope findings created as new tasks via \`fn_task_create\` tool
 
 ## Documentation Requirements
 
 **Must Update:**
-- {Files that MUST be updated}
+- \`path/to/doc.md\` \u2014 {what to add/change}
 
 **Check If Affected:**
-- {Files to check}
+- \`path/to/doc.md\` \u2014 {update if relevant}
 
 ## Completion Criteria
 
 - [ ] All steps complete
 - [ ] Lint passing
 - [ ] All tests passing
-- [ ] Build passing
+- [ ] Typecheck passing (if available)
 - [ ] Documentation updated
 
 ## Git Commit Convention
 
-Commits at step boundaries. All commits include the task ID.
+Commits at step boundaries. All commits include the task ID:
+
+- **Step completion:** \`feat({ID}): complete Step N \u2014 description\`
+- **Bug fixes:** \`fix({ID}): description\`
+- **Tests:** \`test({ID}): description\`
 
 ## Do NOT
 
-- {Things to avoid}
+- Expand task scope
+- Skip tests
+- Refuse necessary fixes just because they touch files outside the initial File Scope
+- Commit without the task ID prefix
+- Remove, delete, or gut modules, settings, interfaces, exports, or test files outside the File Scope
+- Remove features as "cleanup" \u2014 if something seems unused, create a task via \`fn_task_create\`
+
+## Changeset Requirements
+
+If this task REMOVES existing functionality (deleting modules, settings, API endpoints, or exports), a changeset file is REQUIRED:
+- Create \`.changeset/{task-id}-removal.md\` explaining what was removed and why
+- This is mandatory for any net-negative change (more deletions than additions to existing files)
 \`\`\`
 
-## Key rules
-
-1. **Size estimation:** S = 1-2 files, clear change. M = 3-8 files, moderate complexity. L = 8+ files, architecture changes, or security-sensitive.
-2. **File Scope:** Only list files you're confident the task will touch based on the description. When uncertain, list the module/directory with a wildcard.
-3. **Steps:** Each step should be independently committable and testable. Include a preflight step (Step 0) that validates preconditions.
-4. **Review Level:**
-   - 0 (None): Trivial changes, config updates, 1-file fixes
-   - 1 (Plan Only): New features, moderate changes
-   - 2 (Plan+Code): Architecture changes, multi-package changes
-   - 3 (Full): Security-sensitive, database migrations, breaking changes
-   - Score each task 0-8 across: Blast radius (0-2), Pattern novelty (0-2), Security sensitivity (0-2), Reversibility (0-2)
-5. **No placeholders:** Every section must have real content. No "TBD" or "fill in later".
-6. **Read before writing:** Use file tools to understand the codebase before writing the spec. Your spec must be grounded in real code paths.
-7. **Dependencies:** Check existing tasks. If this task depends on another, list it explicitly. If no dependencies, state "None" explicitly.
-8. **Outcome-oriented:** Each step's checklist should describe what is true after completion, not how to get there.
-9. **Be specific about tests:** Don't say "write tests" \u2014 specify what to test and what assertions to verify.`;
+## Testing requirements
+
+The Testing & Verification step MUST require REAL automated tests \u2014 actual test
+files with assertions that run via a test runner. Typechecks and builds are NOT
+tests. Manual verification is NOT a test.
+
+- Each implementation step should include writing tests for the code being changed
+- The final Testing step runs lint, the FULL test suite, and project typecheck when the repo exposes one
+- Specs must instruct executors to fix lint failures and quality-gate failures directly, even when the required edits extend beyond the original File Scope
+- If the project has no test framework, the Testing step must include setting one up
+  as part of this task (not just skipping tests)
+
+## Duplicate check
+Before writing a spec, call \`fn_task_list\` to see existing tasks.
+If a task already covers the same work (even if worded differently), do NOT
+write a PROMPT.md. Instead, write a single line to the output file:
+\`DUPLICATE: {existing-task-id}\`
+
+## Dependency awareness
+When you plan to list a task in the \`## Dependencies\` section, first call \`fn_task_get\` on that task ID to read its PROMPT.md.
+Use what you learn \u2014 file scope, APIs, patterns, completion criteria \u2014 to make the new spec accurate: reference the right paths, avoid conflicting assumptions, and describe what the dependency must deliver before this task starts.
+If the dependency task has no PROMPT.md yet (not yet specified), note that in the Dependencies section.
+
+## Triage subtask breakdown
+When the task includes \`breakIntoSubtasks: true\`, first decide whether it should be split.
+
+- Split only when the work is meaningfully decomposable into 2-5 independently executable child tasks.
+- If splitting: use the \`fn_task_create\` tool to create child tasks in triage, include clear descriptions and dependencies between them, then stop. Do NOT write a PROMPT.md for the parent task.
+- **CRITICAL \u2014 subtask dependencies:** the parent task is deleted once all subtasks are created. \`dependencies\` on a new subtask may ONLY reference sibling subtasks you have created earlier in this same split (or unrelated existing tasks). **Never depend on the parent task's id.** If a child conceptually "waits for the parent's remaining work", create a sibling subtask that does that work and depend on the sibling instead. The \`fn_task_create\` tool will reject parent-id dependencies with an error.
+- If not splitting: proceed with a normal PROMPT.md specification.
+
+## Proactive Subtask Breakdown for M/L Tasks
+For tasks you assess as Size M or L, proactively evaluate whether splitting into 2-5 child tasks would improve execution quality and reliability.
+
+**Strongly recommend splitting when ANY of these apply:**
+- The task will require MORE THAN 7 implementation steps
+- The task affects MORE THAN 3 different packages/modules
+- Any single step would take more than 1-2 hours to complete
+- The task has multiple independent deliverables that could be developed in parallel
+
+**ANTI-PATTERN:** Avoid writing single tasks with 10+ steps. If you find yourself planning more than 7 steps, STOP and create 2-5 child tasks instead.
+
+**Splitting guidance:**
+- Even when \`breakIntoSubtasks\` is not set to \`true\`, apply these thresholds proactively
+- Keep explicit user intent first: when \`breakIntoSubtasks: true\`, follow the mandatory breakdown flow above
+- Size S tasks should generally NOT be split because the overhead usually outweighs the benefit
+- Only keep a task as one unit if it genuinely has 5 or fewer focused steps with a clear scope
+- If you decide not to split an M/L task, proceed with a normal PROMPT.md specification
+
+## Triage tools
+You have these extra tools during triage:
+- \`fn_task_list\` \u2014 list existing active tasks
+- \`fn_task_get\` \u2014 inspect a task and its PROMPT.md
+- \`fn_task_create\` \u2014 create a child/follow-up task while triaging
+- \`fn_task_document_write\` \u2014 save a planning document (e.g., key="plan")
+- \`fn_task_document_read\` \u2014 read back a previously saved document
+
+When the planning conversation produces a structured plan, save it as a document with \`fn_task_document_write(key='plan', content='...')\` so the executor can reference it during implementation.
+
+## Guidelines
+- Read the project structure and relevant source files to understand context BEFORE writing
+- Be specific \u2014 name actual files, functions, and patterns from the codebase
+- Steps should express OUTCOMES, not micro-instructions (2-5 checkboxes per step)
+- Always include a testing step and a documentation step
+- For tasks whose primary deliverable is documentation (updating docs, writing README, API references), include an explicit step or checkbox instructing the executor to save the final documentation content via \`fn_task_document_write\`
+- Include a "Do NOT" section with project-appropriate guardrails
+- Size assessment: S (<2h), M (2-4h), L (4-8h). Split if XL (8h+)
+- Review level scoring: Blast radius (0-2), Pattern novelty (0-2), Security (0-2), Reversibility (0-2)
+  - 0-1 \u2192 Level 0, 2-3 \u2192 Level 1, 4-5 \u2192 Level 2, 6-8 \u2192 Level 3
+
+## Project commands
+When the user prompt includes a "Project Commands" section with test and/or build
+commands, use those EXACT commands in the testing/verification steps and anywhere
+the spec references running tests or builds. Do NOT guess or infer commands from
+package.json when explicit commands are provided.
+
+## Spec Review
+
+After writing the PROMPT.md, call \`fn_review_spec()\` to get an independent quality review.
+
+- **APPROVE** \u2192 your spec is accepted, you're done
+- **REVISE** \u2192 fix the issues described in the review feedback, rewrite the PROMPT.md, and call \`fn_review_spec()\` again. Repeat until approved.
+- **RETHINK** \u2192 your approach was fundamentally rejected. The conversation will rewind. Read the feedback carefully and take a completely different approach. Do NOT repeat the rejected strategy.
+
+You MUST call \`fn_review_spec()\` after writing the PROMPT.md. Do not finish without getting an APPROVE verdict.
+
+## Output
+Write the PROMPT.md directly using the write tool, then call \`fn_review_spec()\` for review.
+
+## Frontend UX Criteria Injection
+
+<!-- UX criteria mirror the "frontend-ux-design" reviewer persona in packages/core/src/types.ts \u2014 keep them aligned. -->
+
+If the derived **File Scope** touches any of the following paths:
+- \`packages/dashboard/**\`
+- \`packages/*/app/components/**\`
+- \`packages/*/app/hooks/**\`
+- Any \`*.css\` or \`*.tsx\` file inside a dashboard-like package
+
+\u2026then **PREPEND** a \`## Frontend UX Criteria\` section to the generated PROMPT.md, placed immediately after the \`## Mission\` section.
+
+Use this exact checklist (keep it verbatim \u2014 do not expand or reorder):
+
+\`\`\`markdown
+## Frontend UX Criteria
+
+- [ ] **Design tokens only** \u2014 no hardcoded \`px\` values except \`0\`, no hardcoded hex/rgb colors; use CSS custom properties (\`--color-*\`, \`--spacing-*\`, etc.)
+- [ ] **Icon sizing** \u2014 match the surrounding component's icon size convention (default lucide size unless the local pattern already uses an explicit \`size={N}\`)
+- [ ] **Semantic color tokens for status** \u2014 use \`--color-error\` for stderr/error states, \`--color-warning\` for starting/pending states; never hardcode status colors
+- [ ] **Component reuse** \u2014 reach for existing classes (\`.btn\`, \`.btn-icon\`, \`.card\`, \`.input\`) before writing one-off styles
+- [ ] **Responsive scaffolding** \u2014 add \`@media (max-width: 768px)\` overrides for any new layout; verify mobile usability
+- [ ] **Single canonical nav destination** \u2014 each route must appear in exactly one of: Header primary nav, Header overflow menu, or MobileNavBar More; no duplicates across all three
+- [ ] **Status-indicator dot convention** \u2014 use the existing \`.status-dot\` pattern (size, border, animation) rather than custom dot styling
+- [ ] **Visual hierarchy preserved** \u2014 new elements must not disrupt heading levels, content flow, or information architecture established in the surrounding page
+\`\`\`
+
+Only inject this section when the task genuinely touches frontend UI. Omit it for backend-only, config-only, or documentation-only tasks.`;
     REVIEWER_PROMPT_TEXT = `You are an independent code and plan reviewer.
 
 You provide quality assessment for task implementations. You have full read
@@ -2075,7 +2188,7 @@ var init_db = __esm({
   "../core/src/db.ts"() {
     "use strict";
     init_types();
-    SCHEMA_VERSION = 45;
+    SCHEMA_VERSION = 46;
     SCHEMA_SQL = `
 -- Tasks table with JSON columns for nested data
 CREATE TABLE IF NOT EXISTS tasks (
@@ -2549,6 +2662,33 @@ CREATE INDEX IF NOT EXISTS idxProjectInsightsCategory
 -- Index for filtering runs by projectId
 CREATE INDEX IF NOT EXISTS idxInsightRunsProjectId
   ON project_insight_runs(projectId);
+
+-- Todo list persistence tables (FN-2575)
+-- Project-scoped todo lists and ordered checklist items
+
+CREATE TABLE IF NOT EXISTS todo_lists (
+  id TEXT PRIMARY KEY,
+  projectId TEXT NOT NULL,
+  title TEXT NOT NULL,
+  createdAt TEXT NOT NULL,
+  updatedAt TEXT NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS todo_items (
+  id TEXT PRIMARY KEY,
+  listId TEXT NOT NULL,
+  text TEXT NOT NULL,
+  completed INTEGER NOT NULL DEFAULT 0,
+  completedAt TEXT,
+  sortOrder INTEGER NOT NULL DEFAULT 0,
+  createdAt TEXT NOT NULL,
+  updatedAt TEXT NOT NULL,
+  FOREIGN KEY (listId) REFERENCES todo_lists(id) ON DELETE CASCADE
+);
+
+CREATE INDEX IF NOT EXISTS idxTodoListsProjectId ON todo_lists(projectId);
+CREATE INDEX IF NOT EXISTS idxTodoItemsListId ON todo_items(listId);
+CREATE INDEX IF NOT EXISTS idxTodoItemsSortOrder ON todo_items(listId, sortOrder);
 `;
     Database = class {
       db;
@@ -3457,6 +3597,35 @@ CREATE INDEX IF NOT EXISTS idxInsightRunsProjectId
             this.addColumnIfMissing("tasks", "sourceIssueUrl", "TEXT");
           });
         }
+        if (version < 46) {
+          this.applyMigration(46, () => {
+            this.db.exec(`
+          CREATE TABLE IF NOT EXISTS todo_lists (
+            id TEXT PRIMARY KEY,
+            projectId TEXT NOT NULL,
+            title TEXT NOT NULL,
+            createdAt TEXT NOT NULL,
+            updatedAt TEXT NOT NULL
+          )
+        `);
+            this.db.exec(`
+          CREATE TABLE IF NOT EXISTS todo_items (
+            id TEXT PRIMARY KEY,
+            listId TEXT NOT NULL,
+            text TEXT NOT NULL,
+            completed INTEGER NOT NULL DEFAULT 0,
+            completedAt TEXT,
+            sortOrder INTEGER NOT NULL DEFAULT 0,
+            createdAt TEXT NOT NULL,
+            updatedAt TEXT NOT NULL,
+            FOREIGN KEY (listId) REFERENCES todo_lists(id) ON DELETE CASCADE
+          )
+        `);
+            this.db.exec("CREATE INDEX IF NOT EXISTS idxTodoListsProjectId ON todo_lists(projectId)");
+            this.db.exec("CREATE INDEX IF NOT EXISTS idxTodoItemsListId ON todo_items(listId)");
+            this.db.exec("CREATE INDEX IF NOT EXISTS idxTodoItemsSortOrder ON todo_items(listId, sortOrder)");
+          });
+        }
       }
       /**
        * Run a single migration step inside a transaction and bump the version.
@@ -11030,6 +11199,225 @@ var init_insight_store = __esm({
   }
 });
 
+// ../core/src/todo-store.ts
+import { EventEmitter as EventEmitter8 } from "node:events";
+var TodoStore;
+var init_todo_store = __esm({
+  "../core/src/todo-store.ts"() {
+    "use strict";
+    TodoStore = class extends EventEmitter8 {
+      constructor(db) {
+        super();
+        this.db = db;
+        this.setMaxListeners(50);
+      }
+      getDatabase() {
+        return this.db;
+      }
+      generateListId() {
+        const timestamp = Date.now().toString(36).toUpperCase();
+        const random = Math.random().toString(36).slice(2, 6).toUpperCase();
+        return `TDL-${timestamp}-${random}`;
+      }
+      generateItemId() {
+        const timestamp = Date.now().toString(36).toUpperCase();
+        const random = Math.random().toString(36).slice(2, 6).toUpperCase();
+        return `TDI-${timestamp}-${random}`;
+      }
+      rowToTodoList(row) {
+        return {
+          id: row.id,
+          projectId: row.projectId,
+          title: row.title,
+          createdAt: row.createdAt,
+          updatedAt: row.updatedAt
+        };
+      }
+      rowToTodoItem(row) {
+        return {
+          id: row.id,
+          listId: row.listId,
+          text: row.text,
+          completed: row.completed === 1,
+          completedAt: row.completedAt,
+          sortOrder: row.sortOrder,
+          createdAt: row.createdAt,
+          updatedAt: row.updatedAt
+        };
+      }
+      createList(projectId, input) {
+        const now = (/* @__PURE__ */ new Date()).toISOString();
+        const list = {
+          id: this.generateListId(),
+          projectId,
+          title: input.title,
+          createdAt: now,
+          updatedAt: now
+        };
+        this.db.prepare(
+          "INSERT INTO todo_lists (id, projectId, title, createdAt, updatedAt) VALUES (?, ?, ?, ?, ?)"
+        ).run(list.id, list.projectId, list.title, list.createdAt, list.updatedAt);
+        this.db.bumpLastModified();
+        this.emit("list:created", list);
+        return list;
+      }
+      getList(id) {
+        const row = this.db.prepare("SELECT * FROM todo_lists WHERE id = ?").get(id);
+        return row ? this.rowToTodoList(row) : void 0;
+      }
+      listLists(projectId) {
+        const rows = this.db.prepare(
+          "SELECT * FROM todo_lists WHERE projectId = ? ORDER BY createdAt ASC, id ASC"
+        ).all(projectId);
+        return rows.map((row) => this.rowToTodoList(row));
+      }
+      updateList(id, input) {
+        const existing = this.getList(id);
+        if (!existing) return void 0;
+        const now = (/* @__PURE__ */ new Date()).toISOString();
+        const title = input.title ?? existing.title;
+        this.db.prepare("UPDATE todo_lists SET title = ?, updatedAt = ? WHERE id = ?").run(title, now, id);
+        this.db.bumpLastModified();
+        const updated = this.getList(id);
+        this.emit("list:updated", updated);
+        return updated;
+      }
+      deleteList(id) {
+        const result = this.db.prepare("DELETE FROM todo_lists WHERE id = ?").run(id);
+        if ((result.changes ?? 0) < 1) return false;
+        this.db.bumpLastModified();
+        this.emit("list:deleted", id);
+        return true;
+      }
+      createItem(listId, input) {
+        const list = this.getList(listId);
+        if (!list) {
+          throw new Error(`Todo list ${listId} not found`);
+        }
+        const nextSortOrder = (() => {
+          if (input.sortOrder !== void 0) return input.sortOrder;
+          const row = this.db.prepare("SELECT MAX(sortOrder) AS maxSortOrder FROM todo_items WHERE listId = ?").get(listId);
+          return (row?.maxSortOrder ?? -1) + 1;
+        })();
+        const now = (/* @__PURE__ */ new Date()).toISOString();
+        const item = {
+          id: this.generateItemId(),
+          listId,
+          text: input.text,
+          completed: false,
+          completedAt: null,
+          sortOrder: nextSortOrder,
+          createdAt: now,
+          updatedAt: now
+        };
+        this.db.prepare(
+          `INSERT INTO todo_items
+         (id, listId, text, completed, completedAt, sortOrder, createdAt, updatedAt)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?)`
+        ).run(item.id, item.listId, item.text, 0, null, item.sortOrder, item.createdAt, item.updatedAt);
+        this.db.bumpLastModified();
+        this.emit("item:created", item);
+        return item;
+      }
+      getItem(id) {
+        const row = this.db.prepare("SELECT * FROM todo_items WHERE id = ?").get(id);
+        return row ? this.rowToTodoItem(row) : void 0;
+      }
+      listItems(listId) {
+        const rows = this.db.prepare(
+          "SELECT * FROM todo_items WHERE listId = ? ORDER BY sortOrder ASC, createdAt ASC, id ASC"
+        ).all(listId);
+        return rows.map((row) => this.rowToTodoItem(row));
+      }
+      updateItem(id, input) {
+        const existing = this.getItem(id);
+        if (!existing) return void 0;
+        const now = (/* @__PURE__ */ new Date()).toISOString();
+        const sets = ["updatedAt = ?"];
+        const params = [now];
+        if (input.text !== void 0) {
+          sets.push("text = ?");
+          params.push(input.text);
+        }
+        if (input.sortOrder !== void 0) {
+          sets.push("sortOrder = ?");
+          params.push(input.sortOrder);
+        }
+        if (input.completed !== void 0) {
+          sets.push("completed = ?");
+          params.push(input.completed ? 1 : 0);
+          sets.push("completedAt = ?");
+          params.push(input.completed ? now : null);
+        }
+        params.push(id);
+        this.db.prepare(`UPDATE todo_items SET ${sets.join(", ")} WHERE id = ?`).run(...params);
+        this.db.bumpLastModified();
+        const updated = this.getItem(id);
+        this.emit("item:updated", updated);
+        return updated;
+      }
+      deleteItem(id) {
+        const result = this.db.prepare("DELETE FROM todo_items WHERE id = ?").run(id);
+        if ((result.changes ?? 0) < 1) return false;
+        this.db.bumpLastModified();
+        this.emit("item:deleted", id);
+        return true;
+      }
+      toggleItem(id) {
+        const existing = this.getItem(id);
+        if (!existing) return void 0;
+        return this.updateItem(id, { completed: !existing.completed });
+      }
+      reorderItems(listId, itemIds) {
+        const items = this.listItems(listId);
+        const existingIds = items.map((item) => item.id);
+        if (new Set(itemIds).size !== itemIds.length) {
+          throw new Error("Cannot reorder items: duplicate item IDs provided");
+        }
+        if (existingIds.length !== itemIds.length) {
+          throw new Error("Cannot reorder items: provided IDs must include all items in the list");
+        }
+        const existingIdSet = new Set(existingIds);
+        for (const itemId of itemIds) {
+          if (!existingIdSet.has(itemId)) {
+            throw new Error(`Cannot reorder items: item ${itemId} does not belong to list ${listId}`);
+          }
+        }
+        const now = (/* @__PURE__ */ new Date()).toISOString();
+        this.db.transaction(() => {
+          for (let index = 0; index < itemIds.length; index++) {
+            this.db.prepare("UPDATE todo_items SET sortOrder = ?, updatedAt = ? WHERE id = ? AND listId = ?").run(index, now, itemIds[index], listId);
+          }
+        });
+        this.db.bumpLastModified();
+        const reordered = this.listItems(listId);
+        this.emit("items:reordered", { listId, items: reordered });
+        return reordered;
+      }
+      getListsWithItems(projectId) {
+        const lists = this.listLists(projectId);
+        if (lists.length === 0) return [];
+        const rows = this.db.prepare(
+          `SELECT * FROM todo_items
+       WHERE listId IN (SELECT id FROM todo_lists WHERE projectId = ?)
+       ORDER BY listId ASC, sortOrder ASC, createdAt ASC, id ASC`
+        ).all(projectId);
+        const itemsByListId = /* @__PURE__ */ new Map();
+        for (const row of rows) {
+          const item = this.rowToTodoItem(row);
+          const listItems = itemsByListId.get(item.listId) ?? [];
+          listItems.push(item);
+          itemsByListId.set(item.listId, listItems);
+        }
+        return lists.map((list) => ({
+          ...list,
+          items: itemsByListId.get(list.id) ?? []
+        }));
+      }
+    };
+  }
+});
+
 // ../core/src/app-version.ts
 import { readFileSync } from "node:fs";
 import { join as join8, dirname as dirname2 } from "node:path";
@@ -14774,7 +15162,7 @@ var require_dist = __commonJS({
 });
 
 // ../core/src/node-discovery.ts
-import { EventEmitter as EventEmitter8 } from "node:events";
+import { EventEmitter as EventEmitter9 } from "node:events";
 import os from "node:os";
 var import_bonjour_service, DEFAULT_DISCOVERY_CONFIG, STALE_CLEANUP_INTERVAL_MS, FUSION_VERSION, NodeDiscovery;
 var init_node_discovery = __esm({
@@ -14790,7 +15178,7 @@ var init_node_discovery = __esm({
     };
     STALE_CLEANUP_INTERVAL_MS = 6e4;
     FUSION_VERSION = "0.1.0";
-    NodeDiscovery = class extends EventEmitter8 {
+    NodeDiscovery = class extends EventEmitter9 {
       config;
       bonjour = null;
       broadcastService = null;
@@ -15241,7 +15629,7 @@ var init_system_metrics = __esm({
 });
 
 // ../core/src/central-core.ts
-import { EventEmitter as EventEmitter9 } from "node:events";
+import { EventEmitter as EventEmitter10 } from "node:events";
 import { createHash as createHash2, randomUUID as randomUUID4 } from "node:crypto";
 import { existsSync as existsSync7, statSync } from "node:fs";
 import { mkdir as mkdir4 } from "node:fs/promises";
@@ -15256,7 +15644,7 @@ var init_central_core = __esm({
     init_node_connection();
     init_node_discovery();
     init_system_metrics();
-    CentralCore = class extends EventEmitter9 {
+    CentralCore = class extends EventEmitter10 {
       db = null;
       globalDir;
       initialized = false;
@@ -26907,7 +27295,7 @@ var automation_store_exports = {};
 __export(automation_store_exports, {
   AutomationStore: () => AutomationStore
 });
-import { EventEmitter as EventEmitter10 } from "node:events";
+import { EventEmitter as EventEmitter11 } from "node:events";
 import { join as join12 } from "node:path";
 import { randomUUID as randomUUID5 } from "node:crypto";
 var import_cron_parser, CRON_TIMEZONE, AutomationStore;
@@ -26918,7 +27306,7 @@ var init_automation_store = __esm({
     init_automation();
     init_db();
     CRON_TIMEZONE = "UTC";
-    AutomationStore = class _AutomationStore extends EventEmitter10 {
+    AutomationStore = class _AutomationStore extends EventEmitter11 {
       constructor(rootDir) {
         super();
         this.rootDir = rootDir;
@@ -27107,6 +27495,9 @@ var init_automation_store = __esm({
       async updateSchedule(id, updates) {
         return this.withScheduleLock(id, async () => {
           const schedule = await this.getSchedule(id);
+          const previousEnabled = schedule.enabled;
+          const previousScheduleType = schedule.scheduleType;
+          const previousCronExpression = schedule.cronExpression;
           if (updates.name !== void 0) {
             if (!updates.name.trim()) throw new Error("Name cannot be empty");
             schedule.name = updates.name.trim();
@@ -27145,10 +27536,13 @@ var init_automation_store = __esm({
           if (updates.enabled !== void 0) {
             schedule.enabled = updates.enabled;
           }
-          if (schedule.enabled) {
-            schedule.nextRunAt = this.computeNextRun(schedule.cronExpression);
-          } else {
+          const cadenceChanged = schedule.scheduleType !== previousScheduleType || schedule.cronExpression !== previousCronExpression;
+          const enabledFromDisabled = !previousEnabled && schedule.enabled;
+          const missingNextRunAt = !schedule.nextRunAt;
+          if (!schedule.enabled) {
             schedule.nextRunAt = void 0;
+          } else if (cadenceChanged || enabledFromDisabled || missingNextRunAt) {
+            schedule.nextRunAt = this.computeNextRun(schedule.cronExpression);
           }
           schedule.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
           await this.persistSchedule(schedule);
@@ -28918,7 +29312,7 @@ var init_logger = __esm({
 });
 
 // ../core/src/store.ts
-import { EventEmitter as EventEmitter11 } from "node:events";
+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";
@@ -28974,6 +29368,7 @@ var init_store = __esm({
     init_plugin_store();
     init_roadmap_store();
     init_insight_store();
+    init_todo_store();
     init_migration();
     init_central_core();
     init_task_merge();
@@ -28997,7 +29392,7 @@ var init_store = __esm({
         this.dependentIds = dependentIds;
       }
     };
-    TaskStore = class _TaskStore extends EventEmitter11 {
+    TaskStore = class _TaskStore extends EventEmitter12 {
       constructor(rootDir, globalSettingsDir) {
         super();
         this.rootDir = rootDir;
@@ -29087,6 +29482,8 @@ var init_store = __esm({
       roadmapStore = null;
       /** Cached InsightStore instance */
       insightStore = null;
+      /** Cached TodoStore instance */
+      todoStore = null;
       /**
        * Get the SQLite database, initializing it on first access.
        * Also performs auto-migration from legacy file-based storage if needed.
@@ -33435,6 +33832,16 @@ ${notificationsSection}
         }
         return this.insightStore;
       }
+      /**
+       * Get the TodoStore instance for project-scoped todo list operations.
+       * Lazily initializes the TodoStore on first access.
+       */
+      getTodoStore() {
+        if (!this.todoStore) {
+          this.todoStore = new TodoStore(this.db);
+        }
+        return this.todoStore;
+      }
       // ── Backward Compatibility (Multi-Project Support) ────────────────────────
     };
   }
@@ -33728,6 +34135,20 @@ function updatePiExtensionDisabledIds(cwd, disabledIds, home, extraKnownIds = []
 `);
   return discoverPiExtensions(cwd, home);
 }
+function isExternalClaudeCliPath(p, vendoredPath) {
+  if (vendoredPath && p === vendoredPath) return false;
+  return /(^|[/\\])pi-claude-cli([/\\]|$)/i.test(p);
+}
+function reconcileClaudeCliPaths(paths, vendoredPath) {
+  if (!vendoredPath) {
+    return [...paths];
+  }
+  const filtered = paths.filter((p) => !isExternalClaudeCliPath(p, vendoredPath));
+  if (!filtered.includes(vendoredPath)) {
+    return [vendoredPath, ...filtered];
+  }
+  return filtered;
+}
 function formatPiExtensionSource(source, extensionPath, cwd, home) {
   const homeDir = getHomeDir(home);
   const projectRoot = resolvePiExtensionProjectRoot(cwd);
@@ -33943,7 +34364,7 @@ var routine_store_exports = {};
 __export(routine_store_exports, {
   RoutineStore: () => RoutineStore
 });
-import { EventEmitter as EventEmitter12 } from "node:events";
+import { EventEmitter as EventEmitter13 } from "node:events";
 import { randomUUID as randomUUID7 } from "node:crypto";
 var import_cron_parser2, CRON_TIMEZONE2, RoutineStore;
 var init_routine_store = __esm({
@@ -33953,7 +34374,7 @@ var init_routine_store = __esm({
     init_db();
     init_routine();
     CRON_TIMEZONE2 = "UTC";
-    RoutineStore = class _RoutineStore extends EventEmitter12 {
+    RoutineStore = class _RoutineStore extends EventEmitter13 {
       constructor(rootDir) {
         super();
         this.rootDir = rootDir;
@@ -34361,7 +34782,7 @@ var init_routine_store = __esm({
 import { basename as basename6, dirname as dirname5, extname, isAbsolute as isAbsolute5, resolve as resolve7 } from "node:path";
 import { copyFile, rm } from "node:fs/promises";
 import { pathToFileURL } from "node:url";
-import { EventEmitter as EventEmitter13 } from "node:events";
+import { EventEmitter as EventEmitter14 } from "node:events";
 var MINIMUM_FUSION_VERSION, log, moduleImportVersion, PluginLoader;
 var init_plugin_loader = __esm({
   "../core/src/plugin-loader.ts"() {
@@ -34371,7 +34792,7 @@ var init_plugin_loader = __esm({
     MINIMUM_FUSION_VERSION = "0.1.0";
     log = createLogger("plugin-loader");
     moduleImportVersion = 0;
-    PluginLoader = class extends EventEmitter13 {
+    PluginLoader = class extends EventEmitter14 {
       constructor(options) {
         super();
         this.options = options;
@@ -37903,15 +38324,15 @@ var require_fd_slicer = __commonJS({
     var Writable = stream.Writable;
     var PassThrough = stream.PassThrough;
     var Pend = require_pend();
-    var EventEmitter24 = __require("events").EventEmitter;
+    var EventEmitter25 = __require("events").EventEmitter;
     exports.createFromBuffer = createFromBuffer;
     exports.createFromFd = createFromFd;
     exports.BufferSlicer = BufferSlicer;
     exports.FdSlicer = FdSlicer;
-    util.inherits(FdSlicer, EventEmitter24);
+    util.inherits(FdSlicer, EventEmitter25);
     function FdSlicer(fd, options) {
       options = options || {};
-      EventEmitter24.call(this);
+      EventEmitter25.call(this);
       this.fd = fd;
       this.pend = new Pend();
       this.pend.max = 1;
@@ -38055,9 +38476,9 @@ var require_fd_slicer = __commonJS({
       this.destroyed = true;
       this.context.unref();
     };
-    util.inherits(BufferSlicer, EventEmitter24);
+    util.inherits(BufferSlicer, EventEmitter25);
     function BufferSlicer(buffer, options) {
-      EventEmitter24.call(this);
+      EventEmitter25.call(this);
       options = options || {};
       this.refCount = 0;
       this.buffer = buffer;
@@ -38469,7 +38890,7 @@ var require_yauzl = __commonJS({
     var fd_slicer = require_fd_slicer();
     var crc32 = require_buffer_crc32();
     var util = __require("util");
-    var EventEmitter24 = __require("events").EventEmitter;
+    var EventEmitter25 = __require("events").EventEmitter;
     var Transform = __require("stream").Transform;
     var PassThrough = __require("stream").PassThrough;
     var Writable = __require("stream").Writable;
@@ -38601,10 +39022,10 @@ var require_yauzl = __commonJS({
         callback(new Error("end of central directory record signature not found"));
       });
     }
-    util.inherits(ZipFile, EventEmitter24);
+    util.inherits(ZipFile, EventEmitter25);
     function ZipFile(reader, centralDirectoryOffset, fileSize, entryCount, comment, autoClose, lazyEntries, decodeStrings, validateEntrySizes, strictFileNames) {
       var self = this;
-      EventEmitter24.call(self);
+      EventEmitter25.call(self);
       self.reader = reader;
       self.reader.on("error", function(err) {
         emitError(self, err);
@@ -38965,9 +39386,9 @@ var require_yauzl = __commonJS({
       }
       cb();
     };
-    util.inherits(RandomAccessReader, EventEmitter24);
+    util.inherits(RandomAccessReader, EventEmitter25);
     function RandomAccessReader() {
-      EventEmitter24.call(this);
+      EventEmitter25.call(this);
       this.refCount = 0;
     }
     RandomAccessReader.prototype.ref = function() {
@@ -47259,14 +47680,14 @@ var init_agent_companies_exporter = __esm({
 });
 
 // ../core/src/chat-store.ts
-import { EventEmitter as EventEmitter14 } from "node:events";
+import { EventEmitter as EventEmitter15 } from "node:events";
 import { randomUUID as randomUUID8 } from "node:crypto";
 var ChatStore;
 var init_chat_store = __esm({
   "../core/src/chat-store.ts"() {
     "use strict";
     init_db();
-    ChatStore = class extends EventEmitter14 {
+    ChatStore = class extends EventEmitter15 {
       constructor(fusionDir, db) {
         super();
         this.fusionDir = fusionDir;
@@ -47725,6 +48146,7 @@ __export(src_exports, {
   THEME_MODES: () => THEME_MODES,
   THINKING_LEVELS: () => THINKING_LEVELS,
   TaskStore: () => TaskStore,
+  TodoStore: () => TodoStore,
   VALIDATOR_RUN_STATUSES: () => VALIDATOR_RUN_STATUSES,
   VALID_TRANSITIONS: () => VALID_TRANSITIONS,
   ValidationError: () => ValidationError,
@@ -47882,6 +48304,7 @@ __export(src_exports, {
   readProjectMemoryFileContent: () => readProjectMemoryFileContent,
   readProjectMemoryWithBackend: () => readProjectMemoryWithBackend,
   readWorkingMemory: () => readWorkingMemory,
+  reconcileClaudeCliPaths: () => reconcileClaudeCliPaths,
   refreshQmdProjectMemoryIndex: () => refreshQmdProjectMemoryIndex,
   registerMemoryBackend: () => registerMemoryBackend,
   renderMemoryAuditMarkdown: () => renderMemoryAuditMarkdown,
@@ -47982,6 +48405,7 @@ var init_src = __esm({
     init_memory_backend();
     init_memory_dreams();
     init_insight_store();
+    init_todo_store();
     init_agent_companies_parser();
     init_agent_companies_exporter();
     init_chat_store();
@@ -49302,6 +49726,10 @@ function resolveSessionSkills(context) {
 function createSkillsOverrideFromSelection(selection, options = {}) {
   const { allowedSkillPaths, excludedSkillPaths, filterActive } = selection;
   const { requestedSkillNames, sessionPurpose } = options;
+  const isBuiltInFallbackRequest = (name) => {
+    const purposeUsesRoleFallback = sessionPurpose === "triage" || sessionPurpose === "executor" || sessionPurpose === "reviewer" || sessionPurpose === "merger";
+    return purposeUsesRoleFallback && requestedSkillNames?.length === 1 && name.toLowerCase() === "fusion";
+  };
   return (base) => {
     if (!filterActive) {
       return base;
@@ -49348,7 +49776,7 @@ function createSkillsOverrideFromSelection(selection, options = {}) {
     if (requestedSkillNames) {
       const discoveredNamesLower = new Set(base.skills.map((s) => s.name.toLowerCase()));
       for (const requestedName of requestedSkillNames) {
-        if (!discoveredNamesLower.has(requestedName.toLowerCase())) {
+        if (!discoveredNamesLower.has(requestedName.toLowerCase()) && !isBuiltInFallbackRequest(requestedName)) {
           const purpose2 = sessionPurpose ? ` [${sessionPurpose}]` : "";
           newDiagnostics.push({
             type: "warning",
@@ -49539,18 +49967,28 @@ __export(pi_exports, {
   compactSessionContext: () => compactSessionContext,
   createFnAgent: () => createFnAgent2,
   describeModel: () => describeModel,
+  getHostExtensionPaths: () => getHostExtensionPaths,
   promptWithFallback: () => promptWithFallback,
+  setHostExtensionPaths: () => setHostExtensionPaths,
   wrapToolsWithBoundary: () => wrapToolsWithBoundary
 });
 import { existsSync as existsSync20, readFileSync as readFileSync6 } from "node:fs";
 import { exec } from "node:child_process";
 import { promisify as promisify2 } from "node:util";
+import { createRequire } 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 {
   createAgentSession,
+  createBashTool,
   createCodingTools,
+  createEditTool,
   createExtensionRuntime,
+  createFindTool,
+  createGrepTool,
+  createLsTool,
   createReadOnlyTools,
+  createReadTool,
+  createWriteTool,
   DefaultResourceLoader,
   DefaultPackageManager,
   discoverAndLoadExtensions,
@@ -49558,6 +49996,12 @@ import {
   SessionManager,
   SettingsManager
 } from "@mariozechner/pi-coding-agent";
+function setHostExtensionPaths(paths) {
+  hostExtensionPaths = [...paths];
+}
+function getHostExtensionPaths() {
+  return hostExtensionPaths;
+}
 function getSessionStateError(session) {
   const state = session.state;
   const error = state?.errorMessage ?? state?.error;
@@ -49958,6 +50402,21 @@ function getPackageManagerAgentDir() {
   }
   return existsSync20(fusionAgentDir) ? fusionAgentDir : legacyAgentDir;
 }
+function resolveVendoredClaudeCliEntry() {
+  try {
+    const require_ = createRequire(import.meta.url);
+    const pkgJsonPath = require_.resolve("@fusion/pi-claude-cli/package.json");
+    const pkgJson = JSON.parse(readFileSync6(pkgJsonPath, "utf-8"));
+    const extensions = pkgJson.pi?.extensions;
+    if (!Array.isArray(extensions) || extensions.length === 0) return null;
+    const entry = extensions[0];
+    if (typeof entry !== "string" || entry.length === 0) return null;
+    const path = resolve10(dirname7(pkgJsonPath), entry);
+    return existsSync20(path) ? path : null;
+  } catch {
+    return null;
+  }
+}
 async function registerExtensionProviders(cwd, modelRegistry) {
   try {
     const agentDir = getPackageManagerAgentDir();
@@ -49968,8 +50427,13 @@ async function registerExtensionProviders(cwd, modelRegistry) {
     });
     const resolvedPaths = await packageManager.resolve();
     const packageExtensionPaths = resolvedPaths.extensions.filter((resource) => resource.enabled).map((resource) => resource.path);
-    const extensionsResult = await discoverAndLoadExtensions(
+    const vendoredClaudeCli = resolveVendoredClaudeCliEntry();
+    const reconciledPaths = reconcileClaudeCliPaths(
       [...getEnabledPiExtensionPaths(cwd), ...packageExtensionPaths],
+      vendoredClaudeCli
+    );
+    const extensionsResult = await discoverAndLoadExtensions(
+      reconciledPaths,
       cwd,
       join24(resolvePiExtensionProjectRoot(cwd), ".fusion", "disabled-auto-extension-discovery")
     );
@@ -50104,7 +50568,22 @@ async function createFnAgent2(options) {
   const authStorage = createFusionAuthStorage();
   const modelRegistry = ModelRegistry.create(authStorage, getModelRegistryModelsPath());
   await registerExtensionProviders(options.cwd, modelRegistry);
-  const tools = options.tools === "readonly" ? createReadOnlyTools(options.cwd) : createCodingTools(options.cwd);
+  const tools = options.tools === "readonly" ? [
+    createReadTool(options.cwd),
+    createGrepTool(options.cwd),
+    createFindTool(options.cwd),
+    createLsTool(options.cwd)
+  ] : [
+    createReadTool(options.cwd),
+    createBashTool(options.cwd),
+    createEditTool(options.cwd),
+    createWriteTool(options.cwd),
+    createGrepTool(options.cwd),
+    createFindTool(options.cwd),
+    createLsTool(options.cwd)
+  ];
+  void createCodingTools;
+  void createReadOnlyTools;
   const worktreePath = options.cwd;
   const projectRoot = getProjectRootFromWorktree(worktreePath);
   if (projectRoot) {
@@ -50156,6 +50635,10 @@ async function createFnAgent2(options) {
     settingsManager,
     systemPromptOverride: () => options.systemPrompt,
     appendSystemPromptOverride: () => [],
+    // Inject host-supplied extension paths (e.g. cli's own `@runfusion/fusion`
+    // extension that registers `fn_*` tools) so they're loaded inside every
+    // agent session, including chat sessions that don't pass `customTools`.
+    ...hostExtensionPaths.length > 0 ? { additionalExtensionPaths: [...hostExtensionPaths] } : {},
     ...skillsOverrideFn ? { skillsOverride: skillsOverrideFn } : {}
   });
   await resourceLoader.reload();
@@ -50332,7 +50815,7 @@ async function createFnAgent2(options) {
   });
   return { session: promptableSession, sessionFile: promptableSession.sessionFile };
 }
-var execAsync, FN_MEMORY_APPEND_TOOL_NAME, COMPACTION_FALLBACK_INSTRUCTIONS, MAX_COMPACTED_PROMPT_MEMORY_CHARS;
+var execAsync, hostExtensionPaths, FN_MEMORY_APPEND_TOOL_NAME, COMPACTION_FALLBACK_INSTRUCTIONS, MAX_COMPACTED_PROMPT_MEMORY_CHARS;
 var init_pi = __esm({
   "../engine/src/pi.ts"() {
     "use strict";
@@ -50342,6 +50825,7 @@ var init_pi = __esm({
     init_auth_storage();
     init_logger2();
     execAsync = promisify2(exec);
+    hostExtensionPaths = [];
     FN_MEMORY_APPEND_TOOL_NAME = "fn_memory_append";
     COMPACTION_FALLBACK_INSTRUCTIONS = [
       "Summarize all completed steps concisely.",
@@ -50676,10 +51160,10 @@ var init_session_skill_context = __esm({
   "../engine/src/session-skill-context.ts"() {
     "use strict";
     ROLE_FALLBACK_SKILLS = {
-      triage: ["triage"],
-      executor: ["executor"],
-      reviewer: ["reviewer"],
-      merger: ["merger"]
+      triage: ["fusion"],
+      executor: ["fusion"],
+      reviewer: ["fusion"],
+      merger: ["fusion"]
     };
     SKILL_DIAGNOSTIC_MESSAGES = {
       missing: (skillName) => `skill selection: requested skill "${skillName}" not found in discovered skills`,
@@ -51711,7 +52195,7 @@ ${isRevision ? "1. Review the existing specification and user feedback carefully
 
 Use the write tool to write the specification file.${commandsSection}${memorySection}${attachmentsSection}${userCommentsSection}`;
 }
-var TRIAGE_SYSTEM_PROMPT, TriageProcessor, IMAGE_MIME_TYPES, TEXT_INLINE_LIMIT;
+var TRIAGE_SYSTEM_PROMPT, FAST_TRIAGE_SYSTEM_PROMPT, TriageProcessor, IMAGE_MIME_TYPES, TEXT_INLINE_LIMIT;
 var init_triage = __esm({
   "../engine/src/triage.ts"() {
     "use strict";
@@ -51966,6 +52450,148 @@ Use this exact checklist (keep it verbatim \u2014 do not expand or reorder):
 \`\`\`
 
 Only inject this section when the task genuinely touches frontend UI. Omit it for backend-only, config-only, or documentation-only tasks.`;
+    FAST_TRIAGE_SYSTEM_PROMPT = `You are a task specification agent for "fn", an AI-orchestrated task board. This task is running in **fast mode** \u2014 produce a lean, executable PROMPT.md without heavyweight review scoring or subtask analysis.
+
+Your job: turn a rough task description into a focused PROMPT.md another agent can execute autonomously.
+
+## What you produce
+Write a complete PROMPT.md specification to the given path using the write tool.
+
+## PROMPT.md Format
+
+Follow this structure exactly:
+
+\`\`\`markdown
+# Task: {ID} - {Name}
+
+**Created:** {YYYY-MM-DD}
+**Size:** {S | M}
+
+## Mission
+
+{One paragraph: what to build and why it matters}
+
+## Dependencies
+
+- **None**
+{OR}
+- **Task:** {ID} ({what must be complete first})
+
+## Context to Read First
+
+{List the minimal, specific files needed for implementation}
+
+## File Scope
+
+{List exact files/directories expected to change}
+
+- \`path/to/file.ext\`
+- \`path/to/directory/*\`
+
+## Steps
+
+### Step 0: Preflight
+
+- [ ] Required files and paths exist
+- [ ] Dependencies satisfied
+
+### Step 1: {Implementation step name}
+
+- [ ] {Specific, verifiable outcome}
+- [ ] {Specific, verifiable outcome}
+- [ ] Run targeted tests for changed files
+
+**Artifacts:**
+- \`path/to/file\` (new | modified)
+
+### Step {N-1}: Testing & Verification
+
+> ZERO test failures allowed. Full test suite as quality gate.
+> If keeping lint/tests/build/typecheck green requires edits outside the initial File Scope, make those fixes as part of this task.
+
+- [ ] Run lint check (\`pnpm lint\`)
+- [ ] Run full test suite
+- [ ] Run project typecheck if available
+- [ ] Build passes
+
+### Step {N}: Documentation & Delivery
+
+- [ ] Update relevant documentation
+- [ ] Save documentation deliverables as task documents via \`fn_task_document_write\` (key="docs", content=...)
+- [ ] Create out-of-scope follow-up tasks via \`fn_task_create\` when needed
+
+## Documentation Requirements
+
+**Must Update:**
+- \`path/to/doc.md\` \u2014 {what to add/change}
+
+**Check If Affected:**
+- \`path/to/doc.md\` \u2014 {update if relevant}
+
+## Completion Criteria
+
+- [ ] All steps complete
+- [ ] Lint passing
+- [ ] All tests passing
+- [ ] Typecheck passing (if available)
+- [ ] Documentation updated
+
+## Git Commit Convention
+
+Commits at step boundaries. All commits include the task ID:
+
+- **Step completion:** \`feat({ID}): complete Step N \u2014 description\`
+- **Bug fixes:** \`fix({ID}): description\`
+- **Tests:** \`test({ID}): description\`
+
+## Do NOT
+
+- Expand task scope
+- Skip tests
+- Refuse necessary fixes just because they touch files outside the initial File Scope
+- Commit without the task ID prefix
+- Remove, delete, or gut modules, settings, interfaces, exports, or test files outside the File Scope
+- Remove features as "cleanup" \u2014 if something seems unused, create a task via \`fn_task_create\`
+
+## Changeset Requirements
+
+If this task REMOVES existing functionality (deleting modules, settings, API endpoints, or exports), a changeset file is REQUIRED:
+- Create \`.changeset/{task-id}-removal.md\` explaining what was removed and why
+- This is mandatory for any net-negative change (more deletions than additions to existing files)
+\`\`\`
+
+## Testing requirements
+- Require real automated tests with assertions that run in the project's test runner
+- Typecheck/build/manual checks are not tests and cannot replace tests
+- Include targeted tests in implementation steps and full quality-gate runs in final verification
+
+## Duplicate check
+Before writing a spec, call \`fn_task_list\` to find existing active tasks.
+If an existing task already covers the same work, do NOT write a PROMPT.md. Instead write exactly:
+\`DUPLICATE: {existing-task-id}\`
+
+## Dependency awareness
+When adding a dependency in \`## Dependencies\`, first call \`fn_task_get\` for that task and read its PROMPT.md.
+Use that context to align file paths, APIs, assumptions, and completion expectations. If the dependency has no PROMPT.md yet, note that explicitly.
+
+## Guidelines
+- Read relevant source files before writing the spec
+- Be specific: reference concrete files, modules, and commands from this repo
+- Keep steps outcome-focused with 2\u20134 checkboxes per step
+- Always include Testing & Verification and Documentation & Delivery steps
+- Keep fast-mode scope lean and executable; do not add heavyweight review scoring or subtask-analysis sections
+
+## Project commands
+When the user prompt includes explicit test/build commands, use those exact commands in the generated spec.
+
+## Spec Review
+
+After writing the PROMPT.md, call \`fn_review_spec()\` to confirm the spec.
+
+Fast-mode specs are auto-approved \u2014 the review tool will return APPROVE immediately without spawning an independent reviewer. You do NOT need to wait for or iterate on review feedback.
+
+## Output
+Write the PROMPT.md directly using the write tool, then call \`fn_review_spec()\` to confirm.`;
     TriageProcessor = class _TriageProcessor {
       /**
        * @param store — Task store instance (also used to listen for `settings:updated` events)
@@ -52234,6 +52860,7 @@ Only inject this section when the task genuinely touches frontend UI. Omit it fo
           const detail = await this.store.getTask(task.id);
           const settings = await this.store.getSettings();
           const promptPath = `.fusion/tasks/${task.id}/PROMPT.md`;
+          const isFast = task.executionMode === "fast";
           const agentWork = async () => {
             await this.store.updateTask(task.id, { status: "specifying" });
             const stuckDetector = this.options.stuckTaskDetector;
@@ -52279,7 +52906,8 @@ Only inject this section when the task genuinely touches frontend UI. Omit it fo
                 checkpointRef,
                 specReviewVerdictRef,
                 approvedCommentFingerprintRef,
-                settings
+                settings,
+                isFast
               )
             ];
             let triageInstructions = "";
@@ -52297,8 +52925,9 @@ Only inject this section when the task genuinely touches frontend UI. Omit it fo
                 triageLog.warn(`${task.id}: failed to resolve triage agent instructions, continuing with defaults: ${msg}`);
               }
             }
+            triageLog.log(`${task.id}: specifying in ${isFast ? "fast" : "standard"} mode`);
             const triageSystemPrompt = buildSystemPromptWithInstructions(
-              resolveAgentPrompt("triage", settings.agentPrompts) || TRIAGE_SYSTEM_PROMPT,
+              resolveAgentPrompt("triage", settings.agentPrompts) || (isFast ? FAST_TRIAGE_SYSTEM_PROMPT : TRIAGE_SYSTEM_PROMPT),
               triageInstructions
             );
             const skillContext = await buildSessionSkillContext({
@@ -52416,6 +53045,26 @@ Only inject this section when the task genuinely touches frontend UI. Omit it fo
                 }
                 return;
               }
+              const MAX_REVIEW_REMINDERS = 2;
+              let reviewReminders = 0;
+              while (specReviewVerdictRef.current !== "APPROVE" && !this.pauseAborted.has(task.id) && !this.stuckAborted.has(task.id) && createdSubtasksRef.current.length === 0 && reviewReminders < MAX_REVIEW_REMINDERS) {
+                reviewReminders += 1;
+                const verdictDesc = specReviewVerdictRef.current === null ? "fn_review_spec was never called" : `verdict was ${specReviewVerdictRef.current}`;
+                triageLog.warn(
+                  `${task.id} primary planning model returned without APPROVE (${verdictDesc}) \u2014 reminder ${reviewReminders}/${MAX_REVIEW_REMINDERS}`
+                );
+                await this.store.logEntry(
+                  task.id,
+                  `Primary planning model returned without APPROVE (${verdictDesc}) \u2014 reminder ${reviewReminders}/${MAX_REVIEW_REMINDERS}`
+                );
+                const reminder = specReviewVerdictRef.current === null ? "You wrote the PROMPT.md but did not call `fn_review_spec()`. Call `fn_review_spec()` now to validate the spec. Do not stop until the verdict is APPROVE." : `Spec review verdict was ${specReviewVerdictRef.current}. Address the feedback, rewrite the PROMPT.md as needed, and call \`fn_review_spec()\` again. Do not stop until the verdict is APPROVE.`;
+                stuckDetector?.recordActivity(task.id);
+                await promptWithFallback(session, reminder);
+                checkSessionError(session);
+                if (this.pauseAborted.has(task.id) || this.stuckAborted.has(task.id)) {
+                  break;
+                }
+              }
               const planningFallbackProvider = settings.planningFallbackProvider;
               const planningFallbackModelId = settings.planningFallbackModelId;
               const canRetryWithPlanningFallback = specReviewVerdictRef.current !== "APPROVE" && planningFallbackProvider && planningFallbackModelId && modelDesc !== `${planningFallbackProvider}/${planningFallbackModelId}`;
@@ -52831,7 +53480,7 @@ Remove or replace these ids and call fn_task_create again.`
        *   using `session.navigateTree()`. Returns a re-prompt instructing the agent
        *   to take a fundamentally different approach.
        */
-      createReviewSpecTool(taskId, promptPath, sessionRef, checkpointRef, specReviewVerdictRef, approvedCommentFingerprintRef, _settings) {
+      createReviewSpecTool(taskId, promptPath, sessionRef, checkpointRef, specReviewVerdictRef, approvedCommentFingerprintRef, _settings, skipSpecReview) {
         const store = this.store;
         const rootDir = this.rootDir;
         const options = this.options;
@@ -52868,11 +53517,18 @@ Remove or replace these ids and call fn_task_create again.`
                   details: {}
                 };
               }
-              const currentSettings = await store.getSettings();
               const currentDetail = await store.getTask(taskId);
               const currentUserComments = (currentDetail.comments || []).filter(
                 (c) => c.author === "user"
               );
+              if (skipSpecReview) {
+                specReviewVerdictRef.current = "APPROVE";
+                approvedCommentFingerprintRef.current = currentUserComments.length > 0 ? computeUserCommentFingerprint(currentUserComments) : "";
+                triageLog.log(`${taskId}: spec review auto-approved (fast mode)`);
+                await store.logEntry(taskId, "Spec review: APPROVE (auto, fast mode)");
+                return { content: [{ type: "text", text: "APPROVE" }], details: {} };
+              }
+              const currentSettings = await store.getSettings();
               const result = await reviewStep(
                 rootDir,
                 taskId,
@@ -53316,9 +53972,10 @@ function getDependencySyncCommand(rootDir) {
   }
   return null;
 }
-async function syncDependenciesForMerge(store, rootDir, taskId) {
+async function syncDependenciesForMerge(store, rootDir, taskId, signal) {
   const installCommand = getDependencySyncCommand(rootDir);
   if (!installCommand) return;
+  throwIfAborted(signal, taskId);
   mergerLog.log(`${taskId}: syncing dependencies before merge build verification`);
   await store.logEntry(taskId, `Syncing dependencies before merge build verification: ${installCommand}`);
   try {
@@ -53328,7 +53985,9 @@ async function syncDependenciesForMerge(store, rootDir, taskId) {
       maxBuffer: 10 * 1024 * 1024,
       timeout: 3e5
     });
+    throwIfAborted(signal, taskId);
   } catch (error) {
+    throwIfAborted(signal, taskId);
     const details = error?.stderr || error?.stdout || error?.message || String(error);
     throw new Error(`Dependency sync failed for ${taskId}: ${details}`.trim());
   }
@@ -53376,7 +54035,16 @@ function inferDefaultTestCommand(rootDir, explicitTestCommand, explicitBuildComm
   }
   return null;
 }
-async function runDeterministicVerification(store, rootDir, taskId, testCommand, buildCommand, testSource, buildSource) {
+function throwIfAborted(signal, taskId) {
+  if (!signal?.aborted) return;
+  throw new MergeAbortedError(`Merge aborted for ${taskId}: engine shutdown requested`);
+}
+function rethrowIfMergeAborted(error) {
+  if (error instanceof Error && error.name === "MergeAbortedError") {
+    throw error;
+  }
+}
+async function runDeterministicVerification(store, rootDir, taskId, testCommand, buildCommand, testSource, buildSource, signal) {
   const result = { allPassed: true };
   if (!testCommand && !buildCommand) {
     mergerLog.log(`${taskId}: no verification commands configured \u2014 skipping`);
@@ -53401,7 +54069,8 @@ async function runDeterministicVerification(store, rootDir, taskId, testCommand,
       rootDir,
       taskId,
       normalizedTestCommand,
-      "test"
+      "test",
+      signal
     );
     result.testResult = testResult;
     if (!testResult.success) {
@@ -53424,7 +54093,8 @@ async function runDeterministicVerification(store, rootDir, taskId, testCommand,
       rootDir,
       taskId,
       normalizedBuildCommand,
-      "build"
+      "build",
+      signal
     );
     result.buildResult = buildResult;
     if (!buildResult.success) {
@@ -53445,7 +54115,8 @@ async function runDeterministicVerification(store, rootDir, taskId, testCommand,
   await store.logEntry(taskId, "Deterministic merge verification passed");
   return result;
 }
-async function runVerificationCommand(store, rootDir, taskId, command, type) {
+async function runVerificationCommand(store, rootDir, taskId, command, type, signal) {
+  throwIfAborted(signal, taskId);
   mergerLog.log(`${taskId}: running ${type} command: ${command}`);
   await store.logEntry(taskId, `[verification] Running ${type} command: ${command}`);
   const result = {
@@ -53463,6 +54134,7 @@ async function runVerificationCommand(store, rootDir, taskId, command, type) {
       timeout: 3e5,
       maxBuffer: VERIFICATION_COMMAND_MAX_BUFFER
     });
+    throwIfAborted(signal, taskId);
     result.stdout = stdout?.toString?.() || "";
     result.stderr = stderr?.toString?.() || "";
     result.exitCode = 0;
@@ -53472,6 +54144,7 @@ async function runVerificationCommand(store, rootDir, taskId, command, type) {
     await store.logEntry(taskId, `[timing] [verification] ${type} command succeeded (exit 0) in ${verificationDurationMs}ms`);
     return result;
   } catch (error) {
+    throwIfAborted(signal, taskId);
     const verificationDurationMs = Date.now() - verificationStartedAt;
     result.stdout = error?.stdout?.toString?.() || "";
     result.stderr = error?.stderr?.toString?.() || "";
@@ -53520,6 +54193,7 @@ async function attemptInMergeVerificationFix(store, rootDir, taskId, failureCont
       } catch {
       }
     }
+    throwIfAborted(options.signal, taskId);
     const { session } = await createResolvedAgentSession({
       sessionPurpose: "merger",
       pluginRunner: options.pluginRunner,
@@ -53571,12 +54245,14 @@ ${failureContext.output.slice(0, VERIFICATION_LOG_MAX_CHARS)}
 4. If the fix doesn't work, try a different approach
 5. Do NOT make any git commits`;
       await withRateLimitRetry(async () => {
+        throwIfAborted(options.signal, taskId);
         await promptWithFallback(session, fixPrompt);
       }, {
         onRetry: (attempt, delayMs, error) => {
           const delaySec = Math.round(delayMs / 1e3);
           mergerLog.warn(`\u23F3 ${taskId} in-merge fix rate limited \u2014 retry ${attempt} in ${delaySec}s: ${error.message}`);
-        }
+        },
+        signal: options.signal
       });
       await store.logEntry(
         taskId,
@@ -53587,7 +54263,8 @@ ${failureContext.output.slice(0, VERIFICATION_LOG_MAX_CHARS)}
         rootDir,
         taskId,
         failureContext.command,
-        failureContext.type
+        failureContext.type,
+        options.signal
       );
       return reRunResult.success;
     } finally {
@@ -53595,6 +54272,7 @@ ${failureContext.output.slice(0, VERIFICATION_LOG_MAX_CHARS)}
       await session.dispose();
     }
   } catch (err) {
+    rethrowIfMergeAborted(err);
     const errorMessage = err instanceof Error ? err.message : String(err);
     mergerLog.warn(`${taskId}: in-merge fix agent error: ${errorMessage}`);
     await store.logEntry(taskId, "In-merge verification fix agent encountered an error", errorMessage);
@@ -54058,6 +54736,7 @@ You are assisting with a paused \`git pull --rebase\`.
     agent: "merger",
     onAgentText: options?.onAgentText ? (_id, delta) => options.onAgentText?.(delta) : void 0
   });
+  throwIfAborted(options?.signal, taskId);
   const { session } = await createResolvedAgentSession({
     sessionPurpose: "merger",
     pluginRunner: options?.pluginRunner,
@@ -54082,6 +54761,7 @@ You are assisting with a paused \`git pull --rebase\`.
   ].join("\n");
   try {
     await withRateLimitRetry(async () => {
+      throwIfAborted(options?.signal, taskId);
       await promptWithFallback(session, prompt);
       checkSessionError(session);
     }, {
@@ -54089,7 +54769,8 @@ You are assisting with a paused \`git pull --rebase\`.
         mergerLog.warn(
           `${taskId}: rate limited while resolving rebase conflicts \u2014 retry ${attempt} in ${Math.round(delayMs / 1e3)}s: ${error.message}`
         );
-      }
+      },
+      signal: options?.signal
     });
   } finally {
     session.dispose();
@@ -54127,6 +54808,7 @@ async function resolveRebaseConflictSet(store, rootDir, taskId, settings, option
 async function pullWithRebaseAndResolveConflicts(store, rootDir, taskId, settings, remote, branch, options) {
   const pullCommand = `git pull --rebase ${quoteArg(remote)} ${quoteArg(branch)}`;
   try {
+    throwIfAborted(options?.signal, taskId);
     await execAsync2(pullCommand, {
       cwd: rootDir,
       timeout: PULL_REBASE_TIMEOUT_MS,
@@ -54146,11 +54828,13 @@ async function pullWithRebaseAndResolveConflicts(store, rootDir, taskId, setting
     try {
       await resolveRebaseConflictSet(store, rootDir, taskId, settings, options);
       for (let attempt = 1; attempt <= 10; attempt++) {
+        throwIfAborted(options?.signal, taskId);
         if (!isRebaseInProgress(rootDir)) {
           mergerLog.log(`${taskId}: rebase conflicts resolved`);
           return;
         }
         try {
+          throwIfAborted(options?.signal, taskId);
           await execAsync2("GIT_EDITOR=true git rebase --continue", {
             cwd: rootDir,
             timeout: PULL_REBASE_TIMEOUT_MS,
@@ -54189,6 +54873,7 @@ async function pullWithRebaseAndResolveConflicts(store, rootDir, taskId, setting
           mergerLog.warn(`${taskId}: failed to abort rebase: ${getCommandErrorMessage(abortError)}`);
         }
       }
+      rethrowIfMergeAborted(resolutionError);
       throw new Error(`unable to resolve rebase conflicts: ${getCommandErrorMessage(resolutionError)}`);
     }
   }
@@ -54196,8 +54881,10 @@ async function pullWithRebaseAndResolveConflicts(store, rootDir, taskId, setting
 async function pushToRemoteAfterMerge(store, rootDir, taskId, settings, options) {
   let target;
   try {
+    throwIfAborted(options?.signal, taskId);
     target = parsePushRemoteTarget(rootDir, settings.pushRemote);
   } catch (error) {
+    rethrowIfMergeAborted(error);
     const message = getCommandErrorMessage(error);
     mergerLog.error(`${taskId}: invalid push remote configuration: ${message}`);
     return { pushed: false, error: message };
@@ -54205,14 +54892,17 @@ async function pushToRemoteAfterMerge(store, rootDir, taskId, settings, options)
   const { remote, branch } = target;
   mergerLog.log(`${taskId}: push-after-merge enabled; syncing ${remote}/${branch}`);
   try {
+    throwIfAborted(options?.signal, taskId);
     await pullWithRebaseAndResolveConflicts(store, rootDir, taskId, settings, remote, branch, options);
   } catch (error) {
+    rethrowIfMergeAborted(error);
     const message = getCommandErrorMessage(error);
     mergerLog.error(`${taskId}: pull --rebase before push failed: ${message}`);
     return { pushed: false, error: message };
   }
   const pushCommand = `git push ${quoteArg(remote)} ${quoteArg(branch)}`;
   try {
+    throwIfAborted(options?.signal, taskId);
     await execAsync2(pushCommand, {
       cwd: rootDir,
       timeout: PUSH_TIMEOUT_MS,
@@ -54229,7 +54919,9 @@ async function pushToRemoteAfterMerge(store, rootDir, taskId, settings, options)
     }
     mergerLog.log(`${taskId}: push rejected as non-fast-forward; retrying pull --rebase and push once`);
     try {
+      throwIfAborted(options?.signal, taskId);
       await pullWithRebaseAndResolveConflicts(store, rootDir, taskId, settings, remote, branch, options);
+      throwIfAborted(options?.signal, taskId);
       await execAsync2(pushCommand, {
         cwd: rootDir,
         timeout: PUSH_TIMEOUT_MS,
@@ -54239,6 +54931,7 @@ async function pushToRemoteAfterMerge(store, rootDir, taskId, settings, options)
       mergerLog.log(`${taskId}: push succeeded after non-fast-forward retry`);
       return { pushed: true };
     } catch (retryError) {
+      rethrowIfMergeAborted(retryError);
       const retryMessage = getCommandErrorMessage(retryError);
       mergerLog.error(`${taskId}: push retry failed: ${retryMessage}`);
       return { pushed: false, error: retryMessage };
@@ -54264,6 +54957,7 @@ async function removePostMergeWorktree(rootDir, postMergeWorktree, taskId) {
   }
 }
 async function aiMergeTask(store, rootDir, taskId, options = {}) {
+  throwIfAborted(options.signal, taskId);
   const task = await store.getTask(taskId);
   const mergeBlocker = getTaskMergeBlocker(task);
   if (mergeBlocker) {
@@ -54322,6 +55016,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
     return result;
   }
   try {
+    throwIfAborted(options.signal, taskId);
     const currentBranch = execSync("git symbolic-ref --short HEAD", {
       cwd: rootDir,
       encoding: "utf-8",
@@ -54339,11 +55034,14 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
       });
       await audit.git({ type: "branch:checkout", target: mainBranch });
     }
-  } catch {
+  } catch (error) {
+    rethrowIfMergeAborted(error);
     try {
+      throwIfAborted(options.signal, taskId);
       await execAsync2("git checkout main", { cwd: rootDir });
       await audit.git({ type: "branch:checkout", target: "main" });
-    } catch {
+    } catch (fallbackError) {
+      rethrowIfMergeAborted(fallbackError);
       mergerLog.warn(`${taskId}: unable to verify/checkout main branch \u2014 proceeding on current HEAD`);
     }
   }
@@ -54383,6 +55081,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
       if (!remote) {
         mergerLog.log(`${taskId}: no remote resolvable \u2014 skipping pre-merge rebase`);
       } else {
+        throwIfAborted(options.signal, taskId);
         mergerLog.log(`${taskId}: fetching ${remote} before merge`);
         await execAsync2(`git fetch "${remote}"`, { cwd: rootDir });
         try {
@@ -54393,12 +55092,14 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
           const mainBranch = mainBranchOut.trim();
           const remoteRef = `${remote}/${mainBranch}`;
           if (worktreePath) {
+            throwIfAborted(options.signal, taskId);
             await execAsync2(`git rebase "${remoteRef}"`, { cwd: worktreePath });
             mergerLog.log(`${taskId}: rebased ${branch} onto ${remoteRef}`);
           } else {
             mergerLog.warn(`${taskId}: no worktreePath \u2014 skipping task branch rebase`);
           }
         } catch (rebaseErr) {
+          rethrowIfMergeAborted(rebaseErr);
           const msg = rebaseErr instanceof Error ? rebaseErr.message : String(rebaseErr);
           mergerLog.warn(`${taskId}: pre-merge rebase failed (${msg}) \u2014 aborting rebase and falling through to smart/AI merge`);
           if (worktreePath) {
@@ -54411,6 +55112,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
         }
       }
     } catch (err) {
+      rethrowIfMergeAborted(err);
       const msg = err instanceof Error ? err.message : String(err);
       mergerLog.warn(`${taskId}: pre-merge rebase pipeline failed (${msg}) \u2014 proceeding without rebase`);
     }
@@ -54513,6 +55215,13 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
       }
       return false;
     } catch (error) {
+      if (error instanceof Error && error.name === "MergeAbortedError") {
+        try {
+          execSync("git reset --merge", { cwd: rootDir, stdio: "pipe" });
+        } catch {
+        }
+        throw error;
+      }
       if (error.name === "VerificationError") {
         const verificationErr = error;
         const maxFixRetries = Math.min(settings.verificationFixRetries ?? 3, 3);
@@ -54527,6 +55236,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
               const fixAttemptStartedAt = Date.now();
               mergerLog.log(`${taskId}: in-merge verification fix attempt ${fixAttempt}/${maxFixRetries}`);
               await store.logEntry(taskId, `In-merge verification fix attempt ${fixAttempt}/${maxFixRetries}`);
+              throwIfAborted(options.signal, taskId);
               fixSuccess = await attemptInMergeVerificationFix(
                 store,
                 rootDir,
@@ -54575,6 +55285,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
             const fixAttemptStartedAt = Date.now();
             mergerLog.log(`${taskId}: in-merge verification fix attempt ${fixAttempt}/${maxFixRetries}`);
             await store.logEntry(taskId, `In-merge verification fix attempt ${fixAttempt}/${maxFixRetries}`);
+            throwIfAborted(options.signal, taskId);
             fixSuccess = await attemptInMergeVerificationFix(
               store,
               rootDir,
@@ -54725,6 +55436,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
       mergerLog.warn(`${taskId}: failed to clear stale baseBranch references: ${msg}`);
     }
   }
+  throwIfAborted(options.signal, taskId);
   const hasPostMergeSteps = await hasEnabledPostMergeWorkflowSteps(store, taskId, task.enabledWorkflowSteps);
   if (hasPostMergeSteps) {
     const postMergeWorktree = await createPostMergeWorktree(rootDir, taskId);
@@ -54737,6 +55449,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
     try {
       await runPostMergeWorkflowSteps(store, taskId, rootDir, postMergeCwd, settings, options);
     } catch (err) {
+      rethrowIfMergeAborted(err);
       mergerLog.error(`${taskId}: post-merge workflow steps error: ${err.message}`);
     } finally {
       if (postMergeWorktree) {
@@ -54744,6 +55457,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
       }
     }
   }
+  throwIfAborted(options.signal, taskId);
   if (worktreePath && existsSync21(worktreePath)) {
     const otherUser = await findWorktreeUser(store, worktreePath, taskId);
     if (otherUser) {
@@ -54765,6 +55479,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
   }
   if (settings.pushAfterMerge && settings.mergeStrategy !== "pull-request") {
     try {
+      throwIfAborted(options.signal, taskId);
       const pushResult = await pushToRemoteAfterMerge(store, rootDir, taskId, settings, options);
       if (pushResult.pushed) {
         mergerLog.log(`${taskId}: pushed merged result to remote`);
@@ -54845,7 +55560,9 @@ async function executeMergeAttempt(params, aiTracker) {
         await execAsync2(`git merge --squash "${branch}"`, {
           cwd: rootDir
         });
-      } catch {
+        throwIfAborted(options.signal, taskId);
+      } catch (error) {
+        rethrowIfMergeAborted(error);
         mergeExitedWithConflicts = true;
       }
       const conflictedFiles = await getConflictedFiles(rootDir);
@@ -54887,6 +55604,7 @@ async function executeMergeAttempt(params, aiTracker) {
             encoding: "utf-8"
           }).trim();
           if (staged !== "0") {
+            throwIfAborted(options.signal, taskId);
             const escapedLog = commitLog.replace(/"/g, '\\"');
             const fallbackPrefix = includeTaskId ? `feat(${taskId})` : "feat";
             const authorArg = getCommitAuthorArg(settings);
@@ -54897,7 +55615,17 @@ async function executeMergeAttempt(params, aiTracker) {
             mergerLog.log(`${taskId}: committed after auto-resolving all conflicts`);
           }
           if (testCommand || buildCommand) {
-            await runDeterministicVerification(store, rootDir, taskId, testCommand, buildCommand, testSource, buildSource);
+            throwIfAborted(options.signal, taskId);
+            await runDeterministicVerification(
+              store,
+              rootDir,
+              taskId,
+              testCommand,
+              buildCommand,
+              testSource,
+              buildSource,
+              options.signal
+            );
           }
           return true;
         }
@@ -54910,7 +55638,17 @@ async function executeMergeAttempt(params, aiTracker) {
         if (squashIsEmpty) {
           mergerLog.log(`${taskId}: squash merge staged nothing \u2014 already merged`);
           if (testCommand || buildCommand) {
-            await runDeterministicVerification(store, rootDir, taskId, testCommand, buildCommand, testSource, buildSource);
+            throwIfAborted(options.signal, taskId);
+            await runDeterministicVerification(
+              store,
+              rootDir,
+              taskId,
+              testCommand,
+              buildCommand,
+              testSource,
+              buildSource,
+              options.signal
+            );
           }
           return true;
         }
@@ -54919,6 +55657,7 @@ async function executeMergeAttempt(params, aiTracker) {
       await execAsync2(`git merge --squash "${branch}"`, {
         cwd: rootDir
       });
+      throwIfAborted(options.signal, taskId);
       const squashIsEmpty = execSync(
         "git diff --cached --quiet 2>&1; echo $?",
         { cwd: rootDir, encoding: "utf-8" }
@@ -54926,7 +55665,17 @@ async function executeMergeAttempt(params, aiTracker) {
       if (squashIsEmpty) {
         mergerLog.log(`${taskId}: squash merge staged nothing \u2014 already merged`);
         if (testCommand || buildCommand) {
-          await runDeterministicVerification(store, rootDir, taskId, testCommand, buildCommand, testSource, buildSource);
+          throwIfAborted(options.signal, taskId);
+          await runDeterministicVerification(
+            store,
+            rootDir,
+            taskId,
+            testCommand,
+            buildCommand,
+            testSource,
+            buildSource,
+            options.signal
+          );
         }
         return true;
       }
@@ -54943,11 +55692,13 @@ async function executeMergeAttempt(params, aiTracker) {
       }
     }
     if (buildCommand) {
+      throwIfAborted(options.signal, taskId);
       const stagedFiles = await getStagedFiles(rootDir);
       if (shouldSyncDependenciesForMerge(stagedFiles, hasInstallState(rootDir))) {
-        await syncDependenciesForMerge(store, rootDir, taskId);
+        await syncDependenciesForMerge(store, rootDir, taskId, options.signal);
       }
     }
+    throwIfAborted(options.signal, taskId);
     aiTracker.aiWasInvoked = true;
     const agentResult = await runAiAgentForCommit({
       store,
@@ -54977,10 +55728,27 @@ async function executeMergeAttempt(params, aiTracker) {
       throw new Error(`Build verification failed for ${taskId}: ${errorMessage}`);
     }
     if (testCommand || buildCommand) {
-      await runDeterministicVerification(store, rootDir, taskId, testCommand, buildCommand, testSource, buildSource);
+      throwIfAborted(options.signal, taskId);
+      await runDeterministicVerification(
+        store,
+        rootDir,
+        taskId,
+        testCommand,
+        buildCommand,
+        testSource,
+        buildSource,
+        options.signal
+      );
     }
     return true;
   } catch (error) {
+    if (error instanceof Error && error.name === "MergeAbortedError") {
+      try {
+        execSync("git reset --merge", { cwd: rootDir, stdio: "pipe" });
+      } catch {
+      }
+      throw error;
+    }
     if (error.message?.includes("Build verification failed")) {
       throw error;
     }
@@ -54997,6 +55765,7 @@ async function attemptWithTheirsStrategy(params) {
   const { rootDir, branch, commitLog, includeTaskId, taskId, store, settings, testCommand, buildCommand, testSource, buildSource } = params;
   mergerLog.log(`${taskId}: attempting merge with -X theirs strategy`);
   try {
+    throwIfAborted(params.options.signal, taskId);
     await execAsync2(`git merge -X theirs --squash "${branch}"`, {
       cwd: rootDir
     });
@@ -55014,10 +55783,21 @@ async function attemptWithTheirsStrategy(params) {
     }).trim();
     if (staged === "0") {
       if (testCommand || buildCommand) {
-        await runDeterministicVerification(store, rootDir, taskId, testCommand, buildCommand, testSource, buildSource);
+        throwIfAborted(params.options.signal, taskId);
+        await runDeterministicVerification(
+          store,
+          rootDir,
+          taskId,
+          testCommand,
+          buildCommand,
+          testSource,
+          buildSource,
+          params.options.signal
+        );
       }
       return true;
     }
+    throwIfAborted(params.options.signal, taskId);
     const escapedLog = commitLog.replace(/"/g, '\\"');
     const fallbackPrefix = includeTaskId ? `feat(${taskId})` : "feat";
     const authorArg = getCommitAuthorArg(settings);
@@ -55027,10 +55807,23 @@ async function attemptWithTheirsStrategy(params) {
     );
     mergerLog.log(`${taskId}: committed with -X theirs auto-resolution`);
     if (testCommand || buildCommand) {
-      await runDeterministicVerification(store, rootDir, taskId, testCommand, buildCommand, testSource, buildSource);
+      throwIfAborted(params.options.signal, taskId);
+      await runDeterministicVerification(
+        store,
+        rootDir,
+        taskId,
+        testCommand,
+        buildCommand,
+        testSource,
+        buildSource,
+        params.options.signal
+      );
     }
     return true;
   } catch (error) {
+    if (error instanceof Error && error.name === "MergeAbortedError") {
+      throw error;
+    }
     mergerLog.error(`${taskId}: -X theirs merge failed: ${error}`);
     return false;
   }
@@ -55096,6 +55889,7 @@ async function runAiAgentForCommit(params) {
     buildMergeSystemPrompt(includeTaskId, settings.agentPrompts, authorArg),
     mergerInstructions
   );
+  throwIfAborted(options.signal, taskId);
   let skillContext = void 0;
   if (options.agentStore) {
     try {
@@ -55142,13 +55936,15 @@ async function runAiAgentForCommit(params) {
     mergerLog.log(`${taskId}: starting fresh merge agent session`);
     try {
       await withRateLimitRetry(async () => {
+        throwIfAborted(options.signal, taskId);
         await promptWithFallback(session, prompt);
         checkSessionError(session);
       }, {
         onRetry: (attempt, delayMs, error) => {
           const delaySec = Math.round(delayMs / 1e3);
           mergerLog.warn(`\u23F3 ${taskId} rate limited \u2014 retry ${attempt} in ${delaySec}s: ${error.message}`);
-        }
+        },
+        signal: options.signal
       });
     } catch (err) {
       const errorMessage = err instanceof Error ? err.message : String(err);
@@ -55171,13 +55967,15 @@ async function runAiAgentForCommit(params) {
         });
         try {
           await withRateLimitRetry(async () => {
+            throwIfAborted(options.signal, taskId);
             await promptWithFallback(session, truncatedPrompt);
             checkSessionError(session);
           }, {
             onRetry: (attempt, delayMs, error) => {
               const delaySec = Math.round(delayMs / 1e3);
               mergerLog.warn(`\u23F3 ${taskId} rate limited during truncated retry \u2014 retry ${attempt} in ${delaySec}s: ${error.message}`);
-            }
+            },
+            signal: options.signal
           });
         } catch (retryErr) {
           const retryErrorMessage = retryErr instanceof Error ? retryErr.message : String(retryErr);
@@ -55201,6 +55999,7 @@ async function runAiAgentForCommit(params) {
     }).trim();
     if (staged !== "0") {
       if (!buildCommand) {
+        throwIfAborted(options.signal, taskId);
         mergerLog.log("Agent didn't commit \u2014 committing with fallback message");
         const escapedLog = commitLog.replace(/"/g, '\\"');
         const fallbackPrefix = includeTaskId ? `feat(${taskId})` : "feat";
@@ -55305,6 +56104,7 @@ async function hasEnabledPostMergeWorkflowSteps(store, taskId, enabledWorkflowSt
   return false;
 }
 async function runPostMergeWorkflowSteps(store, taskId, rootDir, cwd, settings, mergeOptions = {}) {
+  throwIfAborted(mergeOptions.signal, taskId);
   const task = await store.getTask(taskId);
   if (!task.enabledWorkflowSteps?.length) return;
   const existingResults = task.workflowStepResults || [];
@@ -55514,7 +56314,7 @@ async function completeTask(store, taskId, result) {
   result.task = task;
   store.emit("task:merged", result);
 }
-var execAsync2, LOCKFILE_PATTERNS, GENERATED_PATTERNS, DEPENDENCY_SYNC_TRIGGER_PATTERNS, VERIFICATION_COMMAND_MAX_BUFFER, VERIFICATION_LOG_MAX_CHARS, WORKFLOW_SCRIPT_OUTPUT_MAX_CHARS, PULL_REBASE_TIMEOUT_MS, PUSH_TIMEOUT_MS, MERGE_COMMIT_LOG_MAX_CHARS, MERGE_DIFF_STAT_MAX_CHARS, VerificationError;
+var execAsync2, LOCKFILE_PATTERNS, GENERATED_PATTERNS, DEPENDENCY_SYNC_TRIGGER_PATTERNS, VERIFICATION_COMMAND_MAX_BUFFER, VERIFICATION_LOG_MAX_CHARS, WORKFLOW_SCRIPT_OUTPUT_MAX_CHARS, PULL_REBASE_TIMEOUT_MS, PUSH_TIMEOUT_MS, MERGE_COMMIT_LOG_MAX_CHARS, MERGE_DIFF_STAT_MAX_CHARS, VerificationError, MergeAbortedError;
 var init_merger = __esm({
   "../engine/src/merger.ts"() {
     "use strict";
@@ -55581,6 +56381,12 @@ var init_merger = __esm({
         this.name = "VerificationError";
       }
     };
+    MergeAbortedError = class extends Error {
+      constructor(message) {
+        super(message);
+        this.name = "MergeAbortedError";
+      }
+    };
   }
 });
 
@@ -56483,12 +57289,33 @@ var init_step_session_executor = __esm({
        * After calling this method, any in-progress or future `executeStep()` calls
        * will return a failed result immediately.
        */
+      /**
+       * Abort in-flight bash on every active step session without disposing the
+       * sessions. Used during runtime shutdown so detached bash subprocess trees
+       * (including vitest workers) are killed via pi-coding-agent's
+       * killProcessTree. Sessions remain alive so near-complete steps can still
+       * finish during the runtime's graceful drain window.
+       */
+      abortAllSessionBash() {
+        for (const [stepIdx, handle] of this.activeSessions) {
+          try {
+            handle.abortBash();
+          } catch (err) {
+            stepExecLog.warn(`Failed to abort bash for step ${stepIdx}: ${err}`);
+          }
+        }
+      }
       async terminateAllSessions() {
         this.aborted = true;
         stepExecLog.log(
           `Terminating ${this.activeSessions.size} active session(s) for task ${this.options.taskDetail.id}`
         );
         for (const [stepIdx, handle] of this.activeSessions) {
+          try {
+            handle.abortBash();
+          } catch (err) {
+            stepExecLog.warn(`Failed to abort bash for step ${stepIdx}: ${err}`);
+          }
           try {
             handle.dispose();
           } catch (err) {
@@ -56638,7 +57465,10 @@ var init_step_session_executor = __esm({
                 ...this.options.skillSelection ? { skillSelection: this.options.skillSelection } : {}
               });
               session = createResult.session;
-              const handle = { dispose: () => session?.dispose() };
+              const handle = {
+                dispose: () => session?.dispose(),
+                abortBash: () => session?.abortBash()
+              };
               this.activeSessions.set(stepIndex, handle);
               stuckTaskDetector?.trackTask(trackingKey, { dispose: () => session?.dispose() }, taskDetail.id);
               stepExecLog.log(
@@ -57697,6 +58527,40 @@ Lint, tests, and typecheck are also hard quality gates:
       getExecutingTaskIds() {
         return /* @__PURE__ */ new Set([...this.executing, ...this.recoveringCompleted]);
       }
+      /**
+       * Abort the in-flight bash subprocess (if any) on every active agent session.
+       *
+       * Invoked at runtime shutdown so detached subprocess trees spawned by agent
+       * bash tools — including grandchildren like vitest workers — are killed via
+       * pi-coding-agent's killProcessTree. Without this, when the worker is killed
+       * those process groups are orphaned because they're detached.
+       *
+       * Sessions are not disposed here so any near-complete agent loop still has a
+       * chance to wrap up during the runtime's graceful drain window.
+       */
+      abortAllSessionBash() {
+        for (const [taskId, { session }] of this.activeSessions) {
+          try {
+            session.abortBash();
+          } catch (err) {
+            executorLog.warn(`abortAllSessionBash: failed for task ${taskId}: ${err}`);
+          }
+        }
+        for (const [agentId, session] of this.childSessions) {
+          try {
+            session.abortBash();
+          } catch (err) {
+            executorLog.warn(`abortAllSessionBash: failed for child agent ${agentId}: ${err}`);
+          }
+        }
+        for (const [taskId, stepExecutor] of this.activeStepExecutors) {
+          try {
+            stepExecutor.abortAllSessionBash();
+          } catch (err) {
+            executorLog.warn(`abortAllSessionBash: failed for step executor ${taskId}: ${err}`);
+          }
+        }
+      }
       /**
        * Check whether a task's work is complete — all steps are done or skipped.
        * Used to detect tasks that called fn_task_done() but never transitioned to in-review
@@ -60906,6 +61770,32 @@ function pathsOverlap2(a, b) {
   }
   return false;
 }
+function normalizeOverlapPath(path) {
+  return path.trim().replaceAll("\\", "/").replace(/^\.\//, "");
+}
+function isIgnoredOverlapPath(path, ignorePath) {
+  const normalizedPath = normalizeOverlapPath(path);
+  const normalizedIgnore = normalizeOverlapPath(ignorePath);
+  if (normalizedIgnore.endsWith("/*")) {
+    const directory = normalizedIgnore.slice(0, -2);
+    return normalizedPath === directory || normalizedPath.startsWith(`${directory}/`);
+  }
+  if (normalizedIgnore.endsWith("/")) {
+    const directory = normalizedIgnore.slice(0, -1);
+    return normalizedPath === directory || normalizedPath.startsWith(normalizedIgnore);
+  }
+  return normalizedPath === normalizedIgnore || normalizedPath.startsWith(`${normalizedIgnore}/`);
+}
+function filterPathsByIgnoreList(paths, ignorePaths) {
+  if (!ignorePaths || ignorePaths.length === 0) {
+    return paths;
+  }
+  const normalizedIgnorePaths = ignorePaths.map(normalizeOverlapPath).filter(Boolean);
+  if (normalizedIgnorePaths.length === 0) {
+    return paths;
+  }
+  return paths.filter((path) => !normalizedIgnorePaths.some((ignore) => isIgnoredOverlapPath(path, ignore)));
+}
 var Scheduler;
 var init_scheduler = __esm({
   "../engine/src/scheduler.ts"() {
@@ -61253,16 +62143,19 @@ var init_scheduler = __esm({
           todo = sortTasksByPriorityThenAgeAndId(todo);
           const activeScopes = /* @__PURE__ */ new Map();
           if (settings.groupOverlappingFiles) {
+            const overlapIgnorePaths = settings.overlapIgnorePaths ?? [];
             for (const t of inProgress) {
               const scope = await this.store.parseFileScopeFromPrompt(t.id);
-              if (scope.length > 0) activeScopes.set(t.id, scope);
+              const filteredScope = filterPathsByIgnoreList(scope, overlapIgnorePaths);
+              if (filteredScope.length > 0) activeScopes.set(t.id, filteredScope);
             }
             const inReviewWithWorktree = tasks.filter(
               (t) => t.column === "in-review" && t.worktree
             );
             for (const t of inReviewWithWorktree) {
               const scope = await this.store.parseFileScopeFromPrompt(t.id);
-              if (scope.length > 0) activeScopes.set(t.id, scope);
+              const filteredScope = filterPathsByIgnoreList(scope, overlapIgnorePaths);
+              if (filteredScope.length > 0) activeScopes.set(t.id, filteredScope);
             }
           }
           const ordered = resolveDependencyOrder(todo);
@@ -61298,7 +62191,11 @@ var init_scheduler = __esm({
               continue;
             }
             if (settings.groupOverlappingFiles) {
-              const taskScope = await this.store.parseFileScopeFromPrompt(task.id);
+              const overlapIgnorePaths = settings.overlapIgnorePaths ?? [];
+              const taskScope = filterPathsByIgnoreList(
+                await this.store.parseFileScopeFromPrompt(task.id),
+                overlapIgnorePaths
+              );
               if (taskScope.length > 0) {
                 let overlappingTaskId = null;
                 for (const [ipId, ipScope] of activeScopes) {
@@ -61342,7 +62239,10 @@ var init_scheduler = __esm({
             this.options.onSchedule?.(task);
             started++;
             if (settings.groupOverlappingFiles) {
-              const scope = await this.store.parseFileScopeFromPrompt(task.id);
+              const scope = filterPathsByIgnoreList(
+                await this.store.parseFileScopeFromPrompt(task.id),
+                settings.overlapIgnorePaths
+              );
               if (scope.length > 0) activeScopes.set(task.id, scope);
             }
           }
@@ -62373,7 +63273,7 @@ var init_mission_autopilot = __esm({
 });
 
 // ../engine/src/mission-execution-loop.ts
-import { EventEmitter as EventEmitter15 } from "node:events";
+import { EventEmitter as EventEmitter16 } from "node:events";
 var loopLog, VALIDATION_TIMEOUT_MS, MissionExecutionLoop;
 var init_mission_execution_loop = __esm({
   "../engine/src/mission-execution-loop.ts"() {
@@ -62383,7 +63283,7 @@ var init_mission_execution_loop = __esm({
     init_logger2();
     loopLog = createLogger2("mission-loop");
     VALIDATION_TIMEOUT_MS = 10 * 60 * 1e3;
-    MissionExecutionLoop = class extends EventEmitter15 {
+    MissionExecutionLoop = class extends EventEmitter16 {
       running = false;
       taskStore;
       missionStore;
@@ -68726,7 +69626,7 @@ var init_plugin_runner = __esm({
 });
 
 // ../engine/src/runtimes/in-process-runtime.ts
-import { EventEmitter as EventEmitter16 } from "node:events";
+import { EventEmitter as EventEmitter17 } from "node:events";
 var InProcessRuntime;
 var init_in_process_runtime = __esm({
   "../engine/src/runtimes/in-process-runtime.ts"() {
@@ -68747,7 +69647,7 @@ var init_in_process_runtime = __esm({
     init_mission_autopilot();
     init_mission_execution_loop();
     init_triage();
-    InProcessRuntime = class extends EventEmitter16 {
+    InProcessRuntime = class extends EventEmitter17 {
       /**
        * @param config - Runtime configuration
        * @param centralCore - CentralCore reference for global coordination
@@ -69088,9 +69988,11 @@ var init_in_process_runtime = __esm({
             );
             this.triggerScheduler.start();
             const isHeartbeatEnabledAgent = (agent) => !isEphemeralAgent(agent) && agent.runtimeConfig?.enabled !== false;
+            const isTickableHeartbeatState = (state) => state === "active" || state === "running" || state === "idle";
+            const isTimerManagedAgent = (agent) => isHeartbeatEnabledAgent(agent) && isTickableHeartbeatState(agent.state);
             this.agentCreatedListener = (agent) => {
               if (!this.triggerScheduler) return;
-              if (!isHeartbeatEnabledAgent(agent)) return;
+              if (!isTimerManagedAgent(agent)) return;
               const rc = agent.runtimeConfig;
               this.triggerScheduler.registerAgent(agent.id, {
                 heartbeatIntervalMs: rc?.heartbeatIntervalMs,
@@ -69101,7 +70003,7 @@ var init_in_process_runtime = __esm({
             this.agentStore.on("agent:created", this.agentCreatedListener);
             this.agentUpdatedListener = (agent) => {
               if (!this.triggerScheduler) return;
-              if (!isHeartbeatEnabledAgent(agent)) {
+              if (!isTimerManagedAgent(agent)) {
                 this.triggerScheduler.unregisterAgent(agent.id);
                 runtimeLog.log(`Unregistered agent ${agent.id} from heartbeat triggers`);
                 return;
@@ -69130,6 +70032,9 @@ var init_in_process_runtime = __esm({
                     try {
                       await this.agentStore?.deleteAgent(agentId);
                     } catch (err) {
+                      if (this.isBenignEphemeralDeleteRaceError(agentId, err)) {
+                        return;
+                      }
                       const msg = err instanceof Error ? err.message : String(err);
                       runtimeLog.warn(`Failed to delete ephemeral agent ${agentId} after termination: ${msg}`);
                     }
@@ -69146,7 +70051,7 @@ var init_in_process_runtime = __esm({
               const agents = await this.agentStore.listAgents();
               let registeredCount = 0;
               for (const agent of agents) {
-                if (!isHeartbeatEnabledAgent(agent)) continue;
+                if (!isTimerManagedAgent(agent)) continue;
                 const rc = agent.runtimeConfig;
                 this.triggerScheduler.registerAgent(agent.id, {
                   heartbeatIntervalMs: rc?.heartbeatIntervalMs,
@@ -69348,6 +70253,14 @@ var init_in_process_runtime = __esm({
             this.missionExecutionLoop.stop();
             runtimeLog.log("MissionExecutionLoop stopped");
           }
+          if (this.executor) {
+            try {
+              this.executor.abortAllSessionBash();
+              runtimeLog.log("Aborted in-flight bash subprocesses on active sessions");
+            } catch (err) {
+              runtimeLog.warn(`Failed to abort in-flight bash subprocesses: ${err}`);
+            }
+          }
           const shutdownTimeout = 3e4;
           const startTime = Date.now();
           while (Date.now() - startTime < shutdownTimeout) {
@@ -69553,6 +70466,21 @@ var init_in_process_runtime = __esm({
         });
         runtimeLog.log("Event forwarding setup complete");
       }
+      /**
+       * Returns true when an ephemeral delete failure is expected due to cleanup races
+       * (for example the agent was already removed by a parallel cleanup path).
+       */
+      isBenignEphemeralDeleteRaceError(agentId, err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        const normalized = msg.toLowerCase();
+        if (normalized.includes("already deleted") || normalized.includes("already removed")) {
+          return true;
+        }
+        if (normalized.includes(`agent ${agentId.toLowerCase()} not found`)) {
+          return true;
+        }
+        return /^agent\s+.+\s+not found$/i.test(msg.trim());
+      }
       /**
        * Update status and emit health-changed event.
        */
@@ -69683,6 +70611,7 @@ var init_project_engine = __esm({
       mergeActive = /* @__PURE__ */ new Set();
       mergeRunning = false;
       activeMergeSession = null;
+      mergeAbortController = null;
       mergeRetryTimer = null;
       /**
        * Pending manual merge resolvers — keyed by taskId.
@@ -69742,6 +70671,13 @@ var init_project_engine = __esm({
             }
           } catch {
           }
+          try {
+            const { syncMemoryDreamsAutomation: syncMemoryDreamsAutomation2 } = await Promise.resolve().then(() => (init_src(), src_exports));
+            if (typeof syncMemoryDreamsAutomation2 === "function") {
+              await syncMemoryDreamsAutomation2(this.automationStore, settings);
+            }
+          } catch {
+          }
           this.cronRunner.start();
           runtimeLog.log("CronRunner initialized and started");
         } catch (err) {
@@ -69758,6 +70694,10 @@ var init_project_engine = __esm({
       }
       /**
        * Gracefully stop the engine and all subsystems.
+       *
+       * If a merge is currently running, its abort signal is triggered before the
+       * active merge session is disposed so merge pipeline checkpoints can exit
+       * promptly without continuing git/verification work after shutdown starts.
        */
       async stop() {
         this.shuttingDown = true;
@@ -69765,6 +70705,13 @@ var init_project_engine = __esm({
           clearTimeout(this.mergeRetryTimer);
           this.mergeRetryTimer = null;
         }
+        this.mergeAbortController?.abort();
+        this.mergeAbortController = null;
+        const queuedTaskIds = [...this.mergeQueue];
+        this.mergeQueue.length = 0;
+        for (const queuedTaskId of queuedTaskIds) {
+          this.mergeActive.delete(queuedTaskId);
+        }
         if (this.activeMergeSession) {
           this.activeMergeSession.dispose();
           this.activeMergeSession = null;
@@ -69898,6 +70845,7 @@ var init_project_engine = __esm({
         return (task.mergeRetries ?? 0) < _ProjectEngine.MAX_AUTO_MERGE_RETRIES || this.hasAutoHealableVerificationBufferFailure(task) || this.isRetryCooldownElapsed(task);
       }
       internalEnqueueMerge(taskId) {
+        if (this.shuttingDown) return;
         if (this.mergeActive.has(taskId)) return;
         this.mergeActive.add(taskId);
         this.mergeQueue.push(taskId);
@@ -70006,14 +70954,18 @@ var init_project_engine = __esm({
                 const pool = this.runtime.worktreePool;
                 const agentStore = this.runtime.agentStore;
                 const usageLimitPauser = this.runtime.usageLimitPauser;
-                const rawMerge = () => aiMergeTask(store, cwd, taskId, {
-                  pool,
-                  usageLimitPauser,
-                  agentStore,
-                  onSession: (session) => {
-                    this.activeMergeSession = session;
-                  }
-                });
+                const rawMerge = () => {
+                  this.mergeAbortController = new AbortController();
+                  return aiMergeTask(store, cwd, taskId, {
+                    pool,
+                    usageLimitPauser,
+                    agentStore,
+                    signal: this.mergeAbortController.signal,
+                    onSession: (session) => {
+                      this.activeMergeSession = session;
+                    }
+                  });
+                };
                 let result;
                 if (semaphore) {
                   result = await semaphore.run(rawMerge, PRIORITY_MERGE);
@@ -70034,6 +70986,18 @@ var init_project_engine = __esm({
             } catch (err) {
               this.activeMergeSession = null;
               const errorMsg = err instanceof Error ? err.message : String(err);
+              const mergeWasAborted = err instanceof Error && err.name === "MergeAbortedError";
+              if (mergeWasAborted) {
+                runtimeLog.log(`${manualResolver ? "Manual" : "Auto"}-merge aborted for ${taskId}: ${errorMsg}`);
+                this.mergeAbortController = null;
+                if (manualResolver) {
+                  this.manualMergeResolvers.delete(taskId);
+                  manualResolver.reject(err instanceof Error ? err : new Error(errorMsg));
+                } else {
+                  await store.updateTask(taskId, { status: null }).catch(() => void 0);
+                }
+                continue;
+              }
               runtimeLog.error(`${manualResolver ? "Manual" : "Auto"}-merge failed for ${taskId}: ${errorMsg}`);
               if (manualResolver) {
                 this.manualMergeResolvers.delete(taskId);
@@ -70118,6 +71082,7 @@ var init_project_engine = __esm({
                 }
               }
             } finally {
+              this.mergeAbortController = null;
               this.mergeActive.delete(taskId);
               const lateResolver = this.manualMergeResolvers.get(taskId);
               if (lateResolver) {
@@ -70650,7 +71615,7 @@ var init_ai_session_diagnostics = __esm({
 
 // ../dashboard/src/planning.ts
 import { randomUUID as randomUUID10 } from "node:crypto";
-import { EventEmitter as EventEmitter17 } from "node:events";
+import { EventEmitter as EventEmitter18 } from "node:events";
 async function initEngine2() {
   try {
     const engineModule = "@fusion/engine";
@@ -71484,7 +72449,7 @@ For completion:
     process.on("beforeExit", () => {
       clearInterval(cleanupInterval2);
     });
-    PlanningStreamManager = class extends EventEmitter17 {
+    PlanningStreamManager = class extends EventEmitter18 {
       constructor(bufferSize = 100) {
         super();
         this.bufferSize = bufferSize;
@@ -73083,7 +74048,7 @@ var init_github = __esm({
 });
 
 // ../dashboard/src/github-poll.ts
-import { EventEmitter as EventEmitter18 } from "node:events";
+import { EventEmitter as EventEmitter19 } from "node:events";
 function toAlias(type, number) {
   return `${type}_${number}`;
 }
@@ -73129,7 +74094,7 @@ var init_github_poll = __esm({
       }
     };
     githubRateLimiter = new GitHubRateLimiter();
-    GitHubPollingService = class extends EventEmitter18 {
+    GitHubPollingService = class extends EventEmitter19 {
       watches = /* @__PURE__ */ new Map();
       rateLimiter;
       pollingIntervalMs;
@@ -73376,7 +74341,7 @@ var init_github_poll = __esm({
 // ../dashboard/src/terminal.ts
 import { spawn as spawn2 } from "node:child_process";
 import { randomUUID as randomUUID11 } from "node:crypto";
-import { EventEmitter as EventEmitter19 } from "node:events";
+import { EventEmitter as EventEmitter20 } from "node:events";
 function extractBaseCommand(command) {
   let trimmed = command.trim();
   while (/^[A-Za-z_][A-Za-z0-9_]*=/.test(trimmed)) {
@@ -73522,7 +74487,7 @@ var init_terminal = __esm({
       // >(...)  — process substitution (bash)
     ];
     CHAIN_OPERATORS = /&&|\|\||;|(?<!\|)\|(?!\|)/;
-    TerminalSessionManager = class extends EventEmitter19 {
+    TerminalSessionManager = class extends EventEmitter20 {
       sessions = /* @__PURE__ */ new Map();
       defaultTimeout = 3e4;
       // 30 seconds
@@ -73660,13 +74625,13 @@ var init_terminal = __esm({
 });
 
 // ../dashboard/src/terminal-service.ts
-import { createRequire } from "node:module";
+import { createRequire as createRequire2 } from "node:module";
 var isBunBinary, require2;
 var init_terminal_service = __esm({
   "../dashboard/src/terminal-service.ts"() {
     "use strict";
     isBunBinary = typeof Bun !== "undefined" && !!Bun.embeddedFiles;
-    require2 = createRequire(import.meta.url);
+    require2 = createRequire2(import.meta.url);
   }
 });
 
@@ -73708,60 +74673,6 @@ var init_project_store_resolver = __esm({
   }
 });
 
-// ../dashboard/src/runtime-logger.ts
-var init_runtime_logger = __esm({
-  "../dashboard/src/runtime-logger.ts"() {
-    "use strict";
-  }
-});
-
-// ../dashboard/src/api-error.ts
-var init_api_error = __esm({
-  "../dashboard/src/api-error.ts"() {
-    "use strict";
-    init_runtime_logger();
-  }
-});
-
-// ../dashboard/src/mission-routes.ts
-import { Router } from "express";
-var init_mission_routes = __esm({
-  "../dashboard/src/mission-routes.ts"() {
-    "use strict";
-    init_project_store_resolver();
-    init_src();
-    init_sse_buffer();
-    init_api_error();
-  }
-});
-
-// ../dashboard/src/roadmap-suggestions.ts
-var init_roadmap_suggestions = __esm({
-  "../dashboard/src/roadmap-suggestions.ts"() {
-    "use strict";
-  }
-});
-
-// ../dashboard/src/roadmap-routes.ts
-import { Router as Router2 } from "express";
-var init_roadmap_routes = __esm({
-  "../dashboard/src/roadmap-routes.ts"() {
-    "use strict";
-    init_api_error();
-    init_roadmap_suggestions();
-    init_project_store_resolver();
-  }
-});
-
-// ../dashboard/src/insights-routes.ts
-import { Router as Router3 } from "express";
-var init_insights_routes = __esm({
-  "../dashboard/src/insights-routes.ts"() {
-    "use strict";
-    init_api_error();
-  }
-});
-
 // ../dashboard/src/ai-session-store.ts
 var MAX_THINKING_BYTES, SESSION_CLEANUP_DEFAULT_MAX_AGE_MS, SESSION_CLEANUP_INTERVAL_MS, diagnostics2;
 var init_ai_session_store = __esm({
@@ -73776,7 +74687,7 @@ var init_ai_session_store = __esm({
 });
 
 // ../dashboard/src/subtask-breakdown.ts
-import { EventEmitter as EventEmitter20 } from "node:events";
+import { EventEmitter as EventEmitter21 } from "node:events";
 function cleanupInMemorySubtaskSession(sessionId) {
   const session = sessions2.get(sessionId);
   if (!session) {
@@ -73814,7 +74725,7 @@ var init_subtask_breakdown = __esm({
     process.on("beforeExit", () => {
       clearInterval(cleanupInterval3);
     });
-    SubtaskStreamManager = class extends EventEmitter20 {
+    SubtaskStreamManager = class extends EventEmitter21 {
       constructor(bufferSize = 100) {
         super();
         this.bufferSize = bufferSize;
@@ -73936,7 +74847,7 @@ var init_agent_generation = __esm({
 });
 
 // ../dashboard/src/mission-interview.ts
-import { EventEmitter as EventEmitter21 } from "node:events";
+import { EventEmitter as EventEmitter22 } from "node:events";
 function cleanupInMemoryMissionSession(sessionId) {
   const session = sessions4.get(sessionId);
   if (!session) {
@@ -73982,7 +74893,7 @@ var init_mission_interview = __esm({
     cleanupInterval5 = setInterval(cleanupExpiredSessions4, CLEANUP_INTERVAL_MS5);
     cleanupInterval5.unref?.();
     process.on("beforeExit", () => clearInterval(cleanupInterval5));
-    MissionInterviewStreamManager = class extends EventEmitter21 {
+    MissionInterviewStreamManager = class extends EventEmitter22 {
       constructor(bufferSize = 100) {
         super();
         this.bufferSize = bufferSize;
@@ -74050,7 +74961,7 @@ var init_mission_interview = __esm({
 });
 
 // ../dashboard/src/milestone-slice-interview.ts
-import { EventEmitter as EventEmitter22 } from "node:events";
+import { EventEmitter as EventEmitter23 } from "node:events";
 function cleanupInMemorySession2(sessionId) {
   const session = sessions5.get(sessionId);
   if (!session) {
@@ -74097,7 +75008,7 @@ var init_milestone_slice_interview = __esm({
     cleanupInterval6 = setInterval(cleanupExpiredSessions5, CLEANUP_INTERVAL_MS6);
     cleanupInterval6.unref?.();
     process.on("beforeExit", () => clearInterval(cleanupInterval6));
-    MilestoneSliceInterviewStreamManager = class extends EventEmitter22 {
+    MilestoneSliceInterviewStreamManager = class extends EventEmitter23 {
       constructor(bufferSize = 100) {
         super();
         this.bufferSize = bufferSize;
@@ -74164,6 +75075,156 @@ var init_milestone_slice_interview = __esm({
   }
 });
 
+// ../dashboard/src/runtime-logger.ts
+var init_runtime_logger = __esm({
+  "../dashboard/src/runtime-logger.ts"() {
+    "use strict";
+  }
+});
+
+// ../dashboard/src/api-error.ts
+var init_api_error = __esm({
+  "../dashboard/src/api-error.ts"() {
+    "use strict";
+    init_runtime_logger();
+  }
+});
+
+// ../dashboard/src/rate-limit.ts
+var init_rate_limit = __esm({
+  "../dashboard/src/rate-limit.ts"() {
+    "use strict";
+    init_api_error();
+  }
+});
+
+// ../dashboard/src/plugin-routes.ts
+import { Router } from "express";
+var init_plugin_routes = __esm({
+  "../dashboard/src/plugin-routes.ts"() {
+    "use strict";
+    init_src();
+    init_api_error();
+  }
+});
+
+// ../dashboard/src/routes/context.ts
+import { Router as Router2 } from "express";
+var init_context = __esm({
+  "../dashboard/src/routes/context.ts"() {
+    "use strict";
+    init_api_error();
+    init_project_store_resolver();
+    init_runtime_logger();
+  }
+});
+
+// ../dashboard/src/routes/register-tasks.ts
+var init_register_tasks = __esm({
+  "../dashboard/src/routes/register-tasks.ts"() {
+    "use strict";
+  }
+});
+
+// ../dashboard/src/routes/register-planning-chat.ts
+var init_register_planning_chat = __esm({
+  "../dashboard/src/routes/register-planning-chat.ts"() {
+    "use strict";
+  }
+});
+
+// ../dashboard/src/routes/register-settings-memory.ts
+var init_register_settings_memory = __esm({
+  "../dashboard/src/routes/register-settings-memory.ts"() {
+    "use strict";
+  }
+});
+
+// ../dashboard/src/routes/register-messaging-scripts.ts
+var init_register_messaging_scripts = __esm({
+  "../dashboard/src/routes/register-messaging-scripts.ts"() {
+    "use strict";
+    init_src();
+    init_api_error();
+    init_terminal_service();
+  }
+});
+
+// ../dashboard/src/routes/register-git-github.ts
+var init_register_git_github = __esm({
+  "../dashboard/src/routes/register-git-github.ts"() {
+    "use strict";
+  }
+});
+
+// ../dashboard/src/routes/register-files-terminal-workspaces.ts
+var init_register_files_terminal_workspaces = __esm({
+  "../dashboard/src/routes/register-files-terminal-workspaces.ts"() {
+    "use strict";
+  }
+});
+
+// ../dashboard/src/routes/register-agents-projects-nodes.ts
+var init_register_agents_projects_nodes = __esm({
+  "../dashboard/src/routes/register-agents-projects-nodes.ts"() {
+    "use strict";
+  }
+});
+
+// ../dashboard/src/routes/register-plugins-automation.ts
+var init_register_plugins_automation = __esm({
+  "../dashboard/src/routes/register-plugins-automation.ts"() {
+    "use strict";
+  }
+});
+
+// ../dashboard/src/routes/register-proxy.ts
+var init_register_proxy = __esm({
+  "../dashboard/src/routes/register-proxy.ts"() {
+    "use strict";
+    init_api_error();
+  }
+});
+
+// ../dashboard/src/mission-routes.ts
+import { Router as Router3 } from "express";
+var init_mission_routes = __esm({
+  "../dashboard/src/mission-routes.ts"() {
+    "use strict";
+    init_project_store_resolver();
+    init_src();
+    init_sse_buffer();
+    init_api_error();
+  }
+});
+
+// ../dashboard/src/roadmap-suggestions.ts
+var init_roadmap_suggestions = __esm({
+  "../dashboard/src/roadmap-suggestions.ts"() {
+    "use strict";
+  }
+});
+
+// ../dashboard/src/roadmap-routes.ts
+import { Router as Router4 } from "express";
+var init_roadmap_routes = __esm({
+  "../dashboard/src/roadmap-routes.ts"() {
+    "use strict";
+    init_api_error();
+    init_roadmap_suggestions();
+    init_project_store_resolver();
+  }
+});
+
+// ../dashboard/src/insights-routes.ts
+import { Router as Router5 } from "express";
+var init_insights_routes = __esm({
+  "../dashboard/src/insights-routes.ts"() {
+    "use strict";
+    init_api_error();
+  }
+});
+
 // ../dashboard/src/dev-server-detect.ts
 var init_dev_server_detect = __esm({
   "../dashboard/src/dev-server-detect.ts"() {
@@ -74197,7 +75258,7 @@ var init_dev_server_process = __esm({
 });
 
 // ../dashboard/src/dev-server-routes.ts
-import { Router as Router4 } from "express";
+import { Router as Router6 } from "express";
 var init_dev_server_routes = __esm({
   "../dashboard/src/dev-server-routes.ts"() {
     "use strict";
@@ -74208,26 +75269,18 @@ var init_dev_server_routes = __esm({
   }
 });
 
-// ../dashboard/src/rate-limit.ts
-var init_rate_limit = __esm({
-  "../dashboard/src/rate-limit.ts"() {
-    "use strict";
-    init_api_error();
-  }
-});
-
-// ../dashboard/src/plugin-routes.ts
-import { Router as Router5 } from "express";
-var init_plugin_routes = __esm({
-  "../dashboard/src/plugin-routes.ts"() {
+// ../dashboard/src/routes/register-integrated-routers.ts
+var init_register_integrated_routers = __esm({
+  "../dashboard/src/routes/register-integrated-routers.ts"() {
     "use strict";
-    init_src();
-    init_api_error();
+    init_mission_routes();
+    init_roadmap_routes();
+    init_insights_routes();
+    init_dev_server_routes();
   }
 });
 
 // ../dashboard/src/routes.ts
-import { Router as Router6 } from "express";
 import multer from "multer";
 import * as fsPromises from "node:fs/promises";
 import { execFile as execFile3 } from "node:child_process";
@@ -74256,9 +75309,6 @@ var init_routes = __esm({
     init_file_service();
     init_usage();
     init_github_webhooks();
-    init_mission_routes();
-    init_roadmap_routes();
-    init_insights_routes();
     init_project_store_resolver();
     init_ai_session_store();
     init_planning();
@@ -74267,13 +75317,23 @@ var init_routes = __esm({
     init_mission_interview();
     init_milestone_slice_interview();
     init_sse_buffer();
-    init_dev_server_routes();
     init_api_error();
     init_rate_limit();
     init_plugin_routes();
     init_auth_paths();
     init_runtime_logger();
     init_ai_session_diagnostics();
+    init_context();
+    init_register_tasks();
+    init_register_planning_chat();
+    init_register_settings_memory();
+    init_register_messaging_scripts();
+    init_register_git_github();
+    init_register_files_terminal_workspaces();
+    init_register_agents_projects_nodes();
+    init_register_plugins_automation();
+    init_register_proxy();
+    init_register_integrated_routers();
     ({
       mkdtemp,
       access: access3,
@@ -76517,7 +77577,7 @@ var require_extension = __commonJS({
 var require_websocket = __commonJS({
   "../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/websocket.js"(exports, module) {
     "use strict";
-    var EventEmitter24 = __require("events");
+    var EventEmitter25 = __require("events");
     var https = __require("https");
     var http = __require("http");
     var net = __require("net");
@@ -76549,7 +77609,7 @@ var require_websocket = __commonJS({
     var protocolVersions = [8, 13];
     var readyStates = ["CONNECTING", "OPEN", "CLOSING", "CLOSED"];
     var subprotocolRegex = /^[!#$%&'*+\-.0-9A-Z^_`|a-z~]+$/;
-    var WebSocket2 = class _WebSocket extends EventEmitter24 {
+    var WebSocket2 = class _WebSocket extends EventEmitter25 {
       /**
        * Create a new `WebSocket`.
        *
@@ -77546,7 +78606,7 @@ var require_subprotocol = __commonJS({
 var require_websocket_server = __commonJS({
   "../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/websocket-server.js"(exports, module) {
     "use strict";
-    var EventEmitter24 = __require("events");
+    var EventEmitter25 = __require("events");
     var http = __require("http");
     var { Duplex } = __require("stream");
     var { createHash: createHash5 } = __require("crypto");
@@ -77559,7 +78619,7 @@ var require_websocket_server = __commonJS({
     var RUNNING = 0;
     var CLOSING = 1;
     var CLOSED = 2;
-    var WebSocketServer2 = class extends EventEmitter24 {
+    var WebSocketServer2 = class extends EventEmitter25 {
       /**
        * Create a `WebSocketServer` instance.
        *
@@ -77975,7 +79035,7 @@ var init_terminal_websocket_diagnostics = __esm({
 });
 
 // ../dashboard/src/chat.ts
-import { EventEmitter as EventEmitter23 } from "node:events";
+import { EventEmitter as EventEmitter24 } from "node:events";
 var defaultDiagnostics, _diagnostics, diagnostics7, RATE_LIMIT_WINDOW_MS6, MAX_REFERENCED_FILE_SIZE, ChatStreamManager, chatStreamManager;
 var init_chat = __esm({
   "../dashboard/src/chat.ts"() {
@@ -78007,7 +79067,7 @@ var init_chat = __esm({
     };
     RATE_LIMIT_WINDOW_MS6 = 60 * 1e3;
     MAX_REFERENCED_FILE_SIZE = 50 * 1024;
-    ChatStreamManager = class extends EventEmitter23 {
+    ChatStreamManager = class extends EventEmitter24 {
       constructor(bufferSize = 100) {
         super();
         this.bufferSize = bufferSize;
@@ -78199,6 +79259,7 @@ var init_src3 = __esm({
   "../dashboard/src/index.ts"() {
     "use strict";
     init_server();
+    init_dev_server_routes();
     init_runtime_logger();
     init_skills_adapter();
     init_github();