@runfusion/fusion 0.1.2 → 0.2.0

package/dist/extension.js

@@ -60,6 +60,7 @@ var init_settings_schema = __esm({
       defaultThinkingLevel: void 0,
       ntfyEnabled: false,
       ntfyTopic: void 0,
+      ntfyBaseUrl: void 0,
       ntfyEvents: ["in-review", "merged", "failed", "awaiting-approval", "awaiting-user-review", "planning-awaiting-input"],
       ntfyDashboardHost: void 0,
       defaultProjectId: void 0,
@@ -767,7 +768,7 @@ function validateMessageMetadata(metadata) {
     throw new Error("metadata.replyTo.messageId must be a non-empty string");
   }
 }
-var THINKING_LEVELS, COLUMNS, EXECUTION_MODES, DEFAULT_EXECUTION_MODE, THEME_MODES, COLOR_THEMES, WORKFLOW_STEP_TEMPLATES, DOCUMENT_KEY_RE, CheckoutConflictError, COLUMN_LABELS, COLUMN_DESCRIPTIONS, VALID_TRANSITIONS, AGENT_VALID_TRANSITIONS, AGENT_PERMISSIONS;
+var THINKING_LEVELS, COLUMNS, TASK_PRIORITIES, DEFAULT_TASK_PRIORITY, EXECUTION_MODES, DEFAULT_EXECUTION_MODE, THEME_MODES, COLOR_THEMES, WORKFLOW_STEP_TEMPLATES, DOCUMENT_KEY_RE, CheckoutConflictError, COLUMN_LABELS, COLUMN_DESCRIPTIONS, VALID_TRANSITIONS, AGENT_VALID_TRANSITIONS, AGENT_PERMISSIONS;
 var init_types = __esm({
   "../core/src/types.ts"() {
     "use strict";
@@ -776,6 +777,8 @@ var init_types = __esm({
     init_error_message();
     THINKING_LEVELS = ["off", "minimal", "low", "medium", "high"];
     COLUMNS = ["triage", "todo", "in-progress", "in-review", "done", "archived"];
+    TASK_PRIORITIES = ["low", "normal", "high", "urgent"];
+    DEFAULT_TASK_PRIORITY = "normal";
     EXECUTION_MODES = ["standard", "fast"];
     DEFAULT_EXECUTION_MODE = "standard";
     THEME_MODES = ["dark", "light", "system"];
@@ -2069,13 +2072,14 @@ var init_db = __esm({
   "../core/src/db.ts"() {
     "use strict";
     init_types();
-    SCHEMA_VERSION = 42;
+    SCHEMA_VERSION = 45;
     SCHEMA_SQL = `
 -- Tasks table with JSON columns for nested data
 CREATE TABLE IF NOT EXISTS tasks (
   id TEXT PRIMARY KEY,
   title TEXT,
   description TEXT NOT NULL,
+  priority TEXT DEFAULT 'normal',
   "column" TEXT NOT NULL,
   status TEXT,
   size TEXT,
@@ -2103,6 +2107,12 @@ CREATE TABLE IF NOT EXISTS tasks (
   summary TEXT,
   thinkingLevel TEXT,
   executionMode TEXT DEFAULT 'standard',
+  tokenUsageInputTokens INTEGER,
+  tokenUsageOutputTokens INTEGER,
+  tokenUsageCachedTokens INTEGER,
+  tokenUsageTotalTokens INTEGER,
+  tokenUsageFirstUsedAt TEXT,
+  tokenUsageLastUsedAt TEXT,
   createdAt TEXT NOT NULL,
   updatedAt TEXT NOT NULL,
   columnMovedAt TEXT,
@@ -2116,6 +2126,11 @@ CREATE TABLE IF NOT EXISTS tasks (
   workflowStepResults TEXT DEFAULT '[]',
   prInfo TEXT,
   issueInfo TEXT,
+  sourceIssueProvider TEXT,
+  sourceIssueRepository TEXT,
+  sourceIssueExternalIssueId TEXT,
+  sourceIssueNumber INTEGER,
+  sourceIssueUrl TEXT,
   mergeDetails TEXT,
   breakIntoSubtasks INTEGER DEFAULT 0,
   enabledWorkflowSteps TEXT DEFAULT '[]',
@@ -3410,6 +3425,35 @@ CREATE INDEX IF NOT EXISTS idxInsightRunsProjectId
         `);
           });
         }
+        if (version < 43) {
+          this.applyMigration(43, () => {
+            this.addColumnIfMissing("tasks", "priority", "TEXT DEFAULT 'normal'");
+            this.db.exec(`
+          UPDATE tasks
+          SET priority = 'normal'
+          WHERE priority IS NULL OR priority = '' OR priority NOT IN ('low', 'normal', 'high', 'urgent')
+        `);
+          });
+        }
+        if (version < 44) {
+          this.applyMigration(44, () => {
+            this.addColumnIfMissing("tasks", "tokenUsageInputTokens", "INTEGER");
+            this.addColumnIfMissing("tasks", "tokenUsageOutputTokens", "INTEGER");
+            this.addColumnIfMissing("tasks", "tokenUsageCachedTokens", "INTEGER");
+            this.addColumnIfMissing("tasks", "tokenUsageTotalTokens", "INTEGER");
+            this.addColumnIfMissing("tasks", "tokenUsageFirstUsedAt", "TEXT");
+            this.addColumnIfMissing("tasks", "tokenUsageLastUsedAt", "TEXT");
+          });
+        }
+        if (version < 45) {
+          this.applyMigration(45, () => {
+            this.addColumnIfMissing("tasks", "sourceIssueProvider", "TEXT");
+            this.addColumnIfMissing("tasks", "sourceIssueRepository", "TEXT");
+            this.addColumnIfMissing("tasks", "sourceIssueExternalIssueId", "TEXT");
+            this.addColumnIfMissing("tasks", "sourceIssueNumber", "INTEGER");
+            this.addColumnIfMissing("tasks", "sourceIssueUrl", "TEXT");
+          });
+        }
       }
       /**
        * Run a single migration step inside a transaction and bump the version.
@@ -5680,6 +5724,54 @@ var init_message_store = __esm({
   }
 });
 
+// ../core/src/task-priority.ts
+function isTaskPriority(value) {
+  return typeof value === "string" && TASK_PRIORITIES.includes(value);
+}
+function normalizeTaskPriority(priority) {
+  return isTaskPriority(priority) ? priority : DEFAULT_TASK_PRIORITY;
+}
+function getTaskPriorityRank(priority) {
+  return PRIORITY_RANK[normalizeTaskPriority(priority)];
+}
+function compareTaskPriority(a, b) {
+  return getTaskPriorityRank(b) - getTaskPriorityRank(a);
+}
+function compareTaskId(a, b) {
+  const aNum = Number.parseInt(a.slice(a.lastIndexOf("-") + 1), 10);
+  const bNum = Number.parseInt(b.slice(b.lastIndexOf("-") + 1), 10);
+  if (Number.isFinite(aNum) && Number.isFinite(bNum) && aNum !== bNum) {
+    return aNum - bNum;
+  }
+  return a.localeCompare(b);
+}
+function compareTasksByPriorityThenAgeAndId(a, b) {
+  const priorityCmp = compareTaskPriority(a.priority, b.priority);
+  if (priorityCmp !== 0) {
+    return priorityCmp;
+  }
+  if (a.createdAt !== b.createdAt) {
+    return a.createdAt.localeCompare(b.createdAt);
+  }
+  return compareTaskId(a.id, b.id);
+}
+function sortTasksByPriorityThenAgeAndId(tasks) {
+  return [...tasks].sort(compareTasksByPriorityThenAgeAndId);
+}
+var PRIORITY_RANK;
+var init_task_priority = __esm({
+  "../core/src/task-priority.ts"() {
+    "use strict";
+    init_types();
+    PRIORITY_RANK = {
+      low: 0,
+      normal: 1,
+      high: 2,
+      urgent: 3
+    };
+  }
+});
+
 // ../core/src/global-settings.ts
 import { homedir } from "node:os";
 import { dirname, join as join4 } from "node:path";
@@ -6177,17 +6269,18 @@ async function migrateTasks(fusionDir, db) {
   let skipped = 0;
   const insertStmt = db.prepare(`
     INSERT OR REPLACE INTO tasks (
-      id, title, description, "column", status, size, reviewLevel, currentStep,
+      id, title, description, priority, "column", status, size, reviewLevel, currentStep,
       worktree, blockedBy, paused, baseBranch, baseCommitSha, modelPresetId,
       modelProvider, modelId, validatorModelProvider, validatorModelId,
       mergeRetries, recoveryRetryCount, nextRecoveryAt,
       error, summary, thinkingLevel, createdAt, updatedAt,
       columnMovedAt, dependencies, steps, log, attachments, steeringComments,
-      comments, workflowStepResults, prInfo, issueInfo, mergeDetails,
-      breakIntoSubtasks, enabledWorkflowSteps, modifiedFiles, sliceId
+      comments, workflowStepResults, prInfo, issueInfo,
+      sourceIssueProvider, sourceIssueRepository, sourceIssueExternalIssueId, sourceIssueNumber, sourceIssueUrl,
+      mergeDetails, breakIntoSubtasks, enabledWorkflowSteps, modifiedFiles, sliceId
     ) VALUES (
-      ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
-      ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
+      ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
+      ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
     )
   `);
   for (const entry of entries) {
@@ -6205,6 +6298,7 @@ async function migrateTasks(fusionDir, db) {
         task.id,
         task.title ?? null,
         task.description,
+        normalizeTaskPriority(task.priority),
         task.column,
         task.status ?? null,
         task.size ?? null,
@@ -6238,6 +6332,11 @@ async function migrateTasks(fusionDir, db) {
         toJson(task.workflowStepResults || []),
         toJsonNullable(task.prInfo),
         toJsonNullable(task.issueInfo),
+        task.sourceIssue?.provider ?? null,
+        task.sourceIssue?.repository ?? null,
+        task.sourceIssue?.externalIssueId ?? null,
+        task.sourceIssue?.issueNumber ?? null,
+        task.sourceIssue?.url ?? null,
         toJsonNullable(task.mergeDetails),
         task.breakIntoSubtasks ? 1 : 0,
         toJson(task.enabledWorkflowSteps || []),
@@ -6488,6 +6587,7 @@ var init_db_migrate = __esm({
   "../core/src/db-migrate.ts"() {
     "use strict";
     init_db();
+    init_task_priority();
   }
 });
 
@@ -20322,7 +20422,7 @@ var require_luxon = __commonJS({
         }, zone || mergedZone, next];
       }, [{}, null, 1]).slice(0, 2);
     }
-    function parse2(s2, ...patterns) {
+    function parse(s2, ...patterns) {
       if (s2 == null) {
         return [null, null];
       }
@@ -20465,26 +20565,26 @@ var require_luxon = __commonJS({
     var extractISOOrdinalDateAndTime = combineExtractors(extractISOOrdinalData, extractISOTime, extractISOOffset, extractIANAZone);
     var extractISOTimeAndOffset = combineExtractors(extractISOTime, extractISOOffset, extractIANAZone);
     function parseISODate(s2) {
-      return parse2(s2, [isoYmdWithTimeExtensionRegex, extractISOYmdTimeAndOffset], [isoWeekWithTimeExtensionRegex, extractISOWeekTimeAndOffset], [isoOrdinalWithTimeExtensionRegex, extractISOOrdinalDateAndTime], [isoTimeCombinedRegex, extractISOTimeAndOffset]);
+      return parse(s2, [isoYmdWithTimeExtensionRegex, extractISOYmdTimeAndOffset], [isoWeekWithTimeExtensionRegex, extractISOWeekTimeAndOffset], [isoOrdinalWithTimeExtensionRegex, extractISOOrdinalDateAndTime], [isoTimeCombinedRegex, extractISOTimeAndOffset]);
     }
     function parseRFC2822Date(s2) {
-      return parse2(preprocessRFC2822(s2), [rfc2822, extractRFC2822]);
+      return parse(preprocessRFC2822(s2), [rfc2822, extractRFC2822]);
     }
     function parseHTTPDate(s2) {
-      return parse2(s2, [rfc1123, extractRFC1123Or850], [rfc850, extractRFC1123Or850], [ascii, extractASCII]);
+      return parse(s2, [rfc1123, extractRFC1123Or850], [rfc850, extractRFC1123Or850], [ascii, extractASCII]);
     }
     function parseISODuration(s2) {
-      return parse2(s2, [isoDuration, extractISODuration]);
+      return parse(s2, [isoDuration, extractISODuration]);
     }
     var extractISOTimeOnly = combineExtractors(extractISOTime);
     function parseISOTimeOnly(s2) {
-      return parse2(s2, [isoTimeOnly, extractISOTimeOnly]);
+      return parse(s2, [isoTimeOnly, extractISOTimeOnly]);
     }
     var sqlYmdWithTimeExtensionRegex = combineRegexes(sqlYmdRegex, sqlTimeExtensionRegex);
     var sqlTimeCombinedRegex = combineRegexes(sqlTimeRegex);
     var extractISOTimeOffsetAndIANAZone = combineExtractors(extractISOTime, extractISOOffset, extractIANAZone);
     function parseSQL(s2) {
-      return parse2(s2, [sqlYmdWithTimeExtensionRegex, extractISOYmdTimeAndOffset], [sqlTimeCombinedRegex, extractISOTimeOffsetAndIANAZone]);
+      return parse(s2, [sqlYmdWithTimeExtensionRegex, extractISOYmdTimeAndOffset], [sqlTimeCombinedRegex, extractISOTimeOffsetAndIANAZone]);
     }
     var INVALID$2 = "Invalid Duration";
     var lowOrderMatrix = {
@@ -26807,13 +26907,14 @@ __export(automation_store_exports, {
 import { EventEmitter as EventEmitter10 } from "node:events";
 import { join as join12 } from "node:path";
 import { randomUUID as randomUUID5 } from "node:crypto";
-var import_cron_parser, AutomationStore;
+var import_cron_parser, CRON_TIMEZONE, AutomationStore;
 var init_automation_store = __esm({
   "../core/src/automation-store.ts"() {
     "use strict";
     import_cron_parser = __toESM(require_dist2(), 1);
     init_automation();
     init_db();
+    CRON_TIMEZONE = "UTC";
     AutomationStore = class _AutomationStore extends EventEmitter10 {
       constructor(rootDir) {
         super();
@@ -26931,7 +27032,8 @@ var init_automation_store = __esm({
        */
       computeNextRun(cronExpression, fromDate) {
         const interval = import_cron_parser.CronExpressionParser.parse(cronExpression, {
-          currentDate: fromDate ?? /* @__PURE__ */ new Date()
+          currentDate: fromDate ?? /* @__PURE__ */ new Date(),
+          tz: CRON_TIMEZONE
         });
         const next = interval.next();
         return next.toISOString() ?? new Date(next.getTime()).toISOString();
@@ -28551,8 +28653,8 @@ This project has OpenClaw-style memory files:
 - \`.fusion/memory/YYYY-MM-DD.md\` \u2014 append-only daily notes for running context
 
 **Before writing the specification:**
-1. Use \`memory_search\` first for task-relevant context
-2. Use \`memory_get\` only for specific memory files/line ranges returned by search
+1. Use \`fn_memory_search\` first for task-relevant context
+2. Use \`fn_memory_get\` only for specific memory files/line ranges returned by search
 3. Incorporate relevant learnings into your specification \u2014 reference actual patterns, constraints, and conventions documented there
 
 Do not read all memory directly by default. If memory is irrelevant, skip it.
@@ -28564,8 +28666,8 @@ Do not read all memory directly by default. If memory is irrelevant, skip it.
 This project has a memory system that stores durable project learnings.
 
 **Before writing the specification:**
-1. Use \`memory_search\` first for task-relevant context
-2. Use \`memory_get\` only for specific memory files/line ranges returned by search
+1. Use \`fn_memory_search\` first for task-relevant context
+2. Use \`fn_memory_get\` only for specific memory files/line ranges returned by search
 3. Incorporate useful learnings into your specification
 
 **If the memory contains useful context for this task, reference it in the specification.**
@@ -28597,12 +28699,12 @@ This project has OpenClaw-style memory files:
 - \`.fusion/memory/YYYY-MM-DD.md\` \u2014 append-only daily notes for running observations and open loops
 
 **At the start of execution:**
-1. Use \`memory_search\` first for task-relevant context
-2. Use \`memory_get\` only for specific memory files/line ranges returned by search
+1. Use \`fn_memory_search\` first for task-relevant context
+2. Use \`fn_memory_get\` only for specific memory files/line ranges returned by search
 3. Apply relevant learnings to your implementation \u2014 follow documented patterns and avoid known pitfalls
 4. Do not load all memory directly by default. Skip memory reads when memory is irrelevant or context is tight.
 
-**At the end of execution (before calling \`task_done()\`):**
+**At the end of execution (before calling \`fn_task_done()\`):**
 1. Review what you learned during this task that would genuinely benefit future runs
 2. Write durable decisions, conventions, and pitfalls to \`.fusion/memory/MEMORY.md\`
 3. Write running observations, unresolved context, and open loops to today's \`.fusion/memory/YYYY-MM-DD.md\`
@@ -28631,11 +28733,11 @@ This project has OpenClaw-style memory files:
 This project has a memory system that stores durable project learnings accumulated from past task runs.
 
 **At the start of execution:**
-1. Use \`memory_search\` first for task-relevant context
-2. Use \`memory_get\` only for specific memory files/line ranges returned by search
+1. Use \`fn_memory_search\` first for task-relevant context
+2. Use \`fn_memory_get\` only for specific memory files/line ranges returned by search
 3. Apply useful learnings to your implementation
 
-**At the end of execution (before calling \`task_done()\`):**
+**At the end of execution (before calling \`fn_task_done()\`):**
 1. Review what you learned during this task that would genuinely benefit future runs
 2. **If nothing durable was learned, skip the memory update entirely** \u2014 do not append trivial or task-specific notes
 3. Only write when you have genuinely durable, reusable insights such as:
@@ -28663,8 +28765,8 @@ function buildReviewerMemoryInstructions(rootDir, settings) {
 This project has a memory system that stores durable project learnings.
 
 **During review:**
-1. Use \`memory_search\` for task-relevant project conventions, pitfalls, and prior decisions when they could affect your verdict
-2. Use \`memory_get\` only for specific memory files/line ranges returned by search
+1. Use \`fn_memory_search\` for task-relevant project conventions, pitfalls, and prior decisions when they could affect your verdict
+2. Use \`fn_memory_get\` only for specific memory files/line ranges returned by search
 3. Treat documented durable conventions and pitfalls as review evidence when deciding APPROVE, REVISE, or RETHINK
 4. Do not update memory during review; reviewer memory access is read-only
 5. Skip memory reads when they are not relevant to the reviewed plan or code
@@ -28786,23 +28888,29 @@ var init_run_command = __esm({
 });
 
 // ../core/src/logger.ts
+function withSeverityMarker(level, payload) {
+  return `${LOG_LEVEL_MARKER_PREFIX}${level}${LOG_LEVEL_MARKER_SUFFIX}${payload}`;
+}
 function createLogger(prefix) {
   const tag = `[${prefix}]`;
   return {
     log(message, ...args) {
-      console.error(`${tag} ${message}`, ...args);
+      console.error(withSeverityMarker("info", `${tag} ${message}`), ...args);
     },
     warn(message, ...args) {
-      console.warn(`${tag} ${message}`, ...args);
+      console.warn(withSeverityMarker("warn", `${tag} ${message}`), ...args);
     },
     error(message, ...args) {
-      console.error(`${tag} ${message}`, ...args);
+      console.error(withSeverityMarker("error", `${tag} ${message}`), ...args);
     }
   };
 }
+var LOG_LEVEL_MARKER_PREFIX, LOG_LEVEL_MARKER_SUFFIX;
 var init_logger = __esm({
   "../core/src/logger.ts"() {
     "use strict";
+    LOG_LEVEL_MARKER_PREFIX = "\0fnlvl=";
+    LOG_LEVEL_MARKER_SUFFIX = "\0";
   }
 });
 
@@ -28854,6 +28962,7 @@ var init_store = __esm({
   "../core/src/store.ts"() {
     "use strict";
     init_types();
+    init_task_priority();
     init_global_settings();
     init_db();
     init_archive_db();
@@ -29043,6 +29152,7 @@ var init_store = __esm({
           id: row.id,
           title: row.title || void 0,
           description: row.description,
+          priority: normalizeTaskPriority(row.priority),
           column: row.column,
           status: row.status || void 0,
           size: row.size || void 0,
@@ -29078,6 +29188,19 @@ var init_store = __esm({
           dependencies: fromJson(row.dependencies) || [],
           steps: fromJson(row.steps) || [],
           log: fromJson(row.log) || [],
+          tokenUsage: (() => {
+            if (row.tokenUsageInputTokens === null || row.tokenUsageOutputTokens === null || row.tokenUsageCachedTokens === null || row.tokenUsageTotalTokens === null || row.tokenUsageFirstUsedAt === null || row.tokenUsageLastUsedAt === null) {
+              return void 0;
+            }
+            return {
+              inputTokens: row.tokenUsageInputTokens,
+              outputTokens: row.tokenUsageOutputTokens,
+              cachedTokens: row.tokenUsageCachedTokens,
+              totalTokens: row.tokenUsageTotalTokens,
+              firstUsedAt: row.tokenUsageFirstUsedAt,
+              lastUsedAt: row.tokenUsageLastUsedAt
+            };
+          })(),
           attachments: (() => {
             const a = fromJson(row.attachments);
             return a && a.length > 0 ? a : void 0;
@@ -29102,6 +29225,18 @@ var init_store = __esm({
           })(),
           prInfo: fromJson(row.prInfo),
           issueInfo: fromJson(row.issueInfo),
+          sourceIssue: (() => {
+            if (row.sourceIssueProvider === null || row.sourceIssueRepository === null || row.sourceIssueExternalIssueId === null || row.sourceIssueNumber === null) {
+              return void 0;
+            }
+            return {
+              provider: row.sourceIssueProvider,
+              repository: row.sourceIssueRepository,
+              externalIssueId: row.sourceIssueExternalIssueId,
+              issueNumber: row.sourceIssueNumber,
+              url: row.sourceIssueUrl ?? void 0
+            };
+          })(),
           mergeDetails: fromJson(row.mergeDetails),
           breakIntoSubtasks: row.breakIntoSubtasks ? true : void 0,
           enabledWorkflowSteps: (() => {
@@ -29125,6 +29260,7 @@ var init_store = __esm({
           id: entry.id,
           title: entry.title,
           description: entry.description,
+          priority: normalizeTaskPriority(entry.priority),
           column: "archived",
           dependencies: entry.dependencies ?? [],
           steps: entry.steps ?? [],
@@ -29133,6 +29269,7 @@ var init_store = __esm({
           reviewLevel: entry.reviewLevel,
           prInfo: slim ? void 0 : entry.prInfo,
           issueInfo: slim ? void 0 : entry.issueInfo,
+          sourceIssue: slim ? void 0 : entry.sourceIssue,
           attachments: slim ? void 0 : entry.attachments,
           comments: entry.comments,
           log: slim ? [] : entry.log ?? [],
@@ -29221,6 +29358,7 @@ ${recentText}` : void 0
           id: task.id,
           title: task.title,
           description: task.description,
+          priority: normalizeTaskPriority(task.priority),
           column: "archived",
           dependencies: task.dependencies,
           steps: task.steps,
@@ -29229,6 +29367,7 @@ ${recentText}` : void 0
           reviewLevel: task.reviewLevel,
           prInfo: task.prInfo,
           issueInfo: task.issueInfo,
+          sourceIssue: task.sourceIssue,
           attachments: task.attachments,
           comments: task.comments,
           prompt,
@@ -29297,6 +29436,7 @@ ${recentText}` : void 0
           "id",
           "title",
           "description",
+          "priority",
           '"column"',
           "status",
           "size",
@@ -29326,6 +29466,12 @@ ${recentText}` : void 0
           "summary",
           "thinkingLevel",
           "executionMode",
+          "tokenUsageInputTokens",
+          "tokenUsageOutputTokens",
+          "tokenUsageCachedTokens",
+          "tokenUsageTotalTokens",
+          "tokenUsageFirstUsedAt",
+          "tokenUsageLastUsedAt",
           "createdAt",
           "updatedAt",
           "columnMovedAt",
@@ -29337,6 +29483,11 @@ ${recentText}` : void 0
           "attachments",
           "prInfo",
           "issueInfo",
+          "sourceIssueProvider",
+          "sourceIssueRepository",
+          "sourceIssueExternalIssueId",
+          "sourceIssueNumber",
+          "sourceIssueUrl",
           "mergeDetails",
           "breakIntoSubtasks",
           "enabledWorkflowSteps",
@@ -29354,6 +29505,7 @@ ${recentText}` : void 0
           "id",
           "title",
           "description",
+          "priority",
           '"column"',
           "status",
           "size",
@@ -29383,6 +29535,12 @@ ${recentText}` : void 0
           "summary",
           "thinkingLevel",
           "executionMode",
+          "tokenUsageInputTokens",
+          "tokenUsageOutputTokens",
+          "tokenUsageCachedTokens",
+          "tokenUsageTotalTokens",
+          "tokenUsageFirstUsedAt",
+          "tokenUsageLastUsedAt",
           "createdAt",
           "updatedAt",
           "columnMovedAt",
@@ -29394,6 +29552,11 @@ ${recentText}` : void 0
           "workflowStepResults",
           "prInfo",
           "issueInfo",
+          "sourceIssueProvider",
+          "sourceIssueRepository",
+          "sourceIssueExternalIssueId",
+          "sourceIssueNumber",
+          "sourceIssueUrl",
           "mergeDetails",
           "breakIntoSubtasks",
           "enabledWorkflowSteps",
@@ -29431,21 +29594,23 @@ ${recentText}` : void 0
       upsertTask(task) {
         this.db.prepare(`
       INSERT INTO tasks (
-        id, title, description, "column", status, size, reviewLevel, currentStep,
+        id, title, description, priority, "column", status, size, reviewLevel, currentStep,
         worktree, blockedBy, paused, baseBranch, branch, baseCommitSha, modelPresetId, modelProvider,
         modelId, validatorModelProvider, validatorModelId, planningModelProvider, planningModelId, mergeRetries,
         workflowStepRetries, stuckKillCount, postReviewFixCount, recoveryRetryCount, taskDoneRetryCount, nextRecoveryAt, error,
-        summary, thinkingLevel, executionMode, createdAt, updatedAt, columnMovedAt,
+        summary, thinkingLevel, executionMode, tokenUsageInputTokens, tokenUsageOutputTokens, tokenUsageCachedTokens,
+        tokenUsageTotalTokens, tokenUsageFirstUsedAt, tokenUsageLastUsedAt, createdAt, updatedAt, columnMovedAt,
         dependencies, steps, log, attachments, steeringComments,
-        comments, workflowStepResults, prInfo, issueInfo, mergeDetails,
-        breakIntoSubtasks, enabledWorkflowSteps, modifiedFiles, missionId, sliceId, assignedAgentId, assigneeUserId, checkedOutBy, checkedOutAt
+        comments, workflowStepResults, prInfo, issueInfo,
+        sourceIssueProvider, sourceIssueRepository, sourceIssueExternalIssueId, sourceIssueNumber, sourceIssueUrl,
+        mergeDetails, breakIntoSubtasks, enabledWorkflowSteps, modifiedFiles, missionId, sliceId, assignedAgentId, assigneeUserId, checkedOutBy, checkedOutAt
       ) VALUES (
-        ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
-        ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
+        ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
       )
       ON CONFLICT(id) DO UPDATE SET
         title = excluded.title,
         description = excluded.description,
+        priority = excluded.priority,
         "column" = excluded."column",
         status = excluded.status,
         size = excluded.size,
@@ -29475,6 +29640,12 @@ ${recentText}` : void 0
         summary = excluded.summary,
         thinkingLevel = excluded.thinkingLevel,
         executionMode = excluded.executionMode,
+        tokenUsageInputTokens = excluded.tokenUsageInputTokens,
+        tokenUsageOutputTokens = excluded.tokenUsageOutputTokens,
+        tokenUsageCachedTokens = excluded.tokenUsageCachedTokens,
+        tokenUsageTotalTokens = excluded.tokenUsageTotalTokens,
+        tokenUsageFirstUsedAt = excluded.tokenUsageFirstUsedAt,
+        tokenUsageLastUsedAt = excluded.tokenUsageLastUsedAt,
         createdAt = excluded.createdAt,
         updatedAt = excluded.updatedAt,
         columnMovedAt = excluded.columnMovedAt,
@@ -29487,6 +29658,11 @@ ${recentText}` : void 0
         workflowStepResults = excluded.workflowStepResults,
         prInfo = excluded.prInfo,
         issueInfo = excluded.issueInfo,
+        sourceIssueProvider = excluded.sourceIssueProvider,
+        sourceIssueRepository = excluded.sourceIssueRepository,
+        sourceIssueExternalIssueId = excluded.sourceIssueExternalIssueId,
+        sourceIssueNumber = excluded.sourceIssueNumber,
+        sourceIssueUrl = excluded.sourceIssueUrl,
         mergeDetails = excluded.mergeDetails,
         breakIntoSubtasks = excluded.breakIntoSubtasks,
         enabledWorkflowSteps = excluded.enabledWorkflowSteps,
@@ -29501,6 +29677,7 @@ ${recentText}` : void 0
           task.id,
           task.title ?? null,
           task.description,
+          normalizeTaskPriority(task.priority),
           task.column,
           task.status ?? null,
           task.size ?? null,
@@ -29530,6 +29707,12 @@ ${recentText}` : void 0
           task.summary ?? null,
           task.thinkingLevel ?? null,
           task.executionMode ?? null,
+          task.tokenUsage?.inputTokens ?? null,
+          task.tokenUsage?.outputTokens ?? null,
+          task.tokenUsage?.cachedTokens ?? null,
+          task.tokenUsage?.totalTokens ?? null,
+          task.tokenUsage?.firstUsedAt ?? null,
+          task.tokenUsage?.lastUsedAt ?? null,
           task.createdAt,
           task.updatedAt,
           task.columnMovedAt ?? null,
@@ -29542,6 +29725,11 @@ ${recentText}` : void 0
           toJson(task.workflowStepResults || []),
           toJsonNullable(task.prInfo),
           toJsonNullable(task.issueInfo),
+          task.sourceIssue?.provider ?? null,
+          task.sourceIssue?.repository ?? null,
+          task.sourceIssue?.externalIssueId ?? null,
+          task.sourceIssue?.issueNumber ?? null,
+          task.sourceIssue?.url ?? null,
           toJsonNullable(task.mergeDetails),
           task.breakIntoSubtasks ? 1 : 0,
           toJson(task.enabledWorkflowSteps || []),
@@ -29746,6 +29934,7 @@ ${recentText}` : void 0
           if (!Array.isArray(fileTask.log)) fileTask.log = [];
           if (!Array.isArray(fileTask.dependencies)) fileTask.dependencies = [];
           if (!Array.isArray(fileTask.steps)) fileTask.steps = [];
+          fileTask.priority = normalizeTaskPriority(fileTask.priority);
           return fileTask;
         } catch (err) {
           throw new Error(
@@ -30280,6 +30469,9 @@ ${recentText}` : void 0
           id,
           title,
           description: input.description,
+          priority: normalizeTaskPriority(input.priority),
+          tokenUsage: input.tokenUsage,
+          sourceIssue: input.sourceIssue,
           column: input.column || "triage",
           dependencies: input.dependencies || [],
           breakIntoSubtasks: input.breakIntoSubtasks === true ? true : void 0,
@@ -30334,6 +30526,7 @@ ${task.description}
           description: `${sourceTask.description}
 
 (Duplicated from ${id})`,
+          priority: normalizeTaskPriority(sourceTask.priority),
           column: "triage",
           modelPresetId: sourceTask.modelPresetId,
           dependencies: [],
@@ -30392,6 +30585,7 @@ ${task.description}
           description: `${feedback.trim()}
 
 Refines: ${id}`,
+          priority: normalizeTaskPriority(sourceTask.priority),
           column: "triage",
           dependencies: [id],
           // Refinement depends on the original being complete
@@ -30716,6 +30910,11 @@ ${newTask.description}
           }
           if (updates.title !== void 0) task.title = updates.title;
           if (updates.description !== void 0) task.description = updates.description;
+          if (updates.priority === null) {
+            task.priority = normalizeTaskPriority(void 0);
+          } else if (updates.priority !== void 0) {
+            task.priority = normalizeTaskPriority(updates.priority);
+          }
           if (updates.worktree === null) {
             task.worktree = void 0;
           } else if (updates.worktree !== void 0) {
@@ -30883,6 +31082,16 @@ ${newTask.description}
           } else if (updates.mergeDetails !== void 0) {
             task.mergeDetails = updates.mergeDetails;
           }
+          if (updates.sourceIssue === null) {
+            task.sourceIssue = void 0;
+          } else if (updates.sourceIssue !== void 0) {
+            task.sourceIssue = updates.sourceIssue;
+          }
+          if (updates.tokenUsage === null) {
+            task.tokenUsage = void 0;
+          } else if (updates.tokenUsage !== void 0) {
+            task.tokenUsage = updates.tokenUsage;
+          }
           if (updates.modifiedFiles === null) {
             task.modifiedFiles = void 0;
           } else if (updates.modifiedFiles !== void 0) {
@@ -31283,14 +31492,14 @@ ${task.description}
         }
         return paths;
       }
-      async deleteTask(id) {
+      async deleteTask(id, options) {
         return this.withTaskLock(id, async () => {
           const task = this.readTaskFromDb(id);
           if (!task) {
             throw new Error(`Task ${id} not found`);
           }
           const dependentIds = this.findLiveDependents(id);
-          if (dependentIds.length > 0) {
+          if (dependentIds.length > 0 && !options?.removeDependencyReferences) {
             throw new TaskHasDependentsError(id, dependentIds);
           }
           const cleanedBranches = await this.cleanupBranchForTask(task);
@@ -31301,18 +31510,50 @@ ${task.description}
               action: `Cleaned up branch: ${cleanedBranches.join(", ")}`
             });
           }
-          this.db.prepare("DELETE FROM tasks WHERE id = ?").run(id);
-          this.db.bumpLastModified();
+          const rewrittenDependents = this.rewriteDependentsAndDeleteTask(id, dependentIds);
           if (this.isWatching) this.taskCache.delete(id);
           const dir = this.taskDir(id);
           if (existsSync12(dir)) {
-            const { rm: rm2 } = await import("node:fs/promises");
-            await rm2(dir, { recursive: true });
+            const { rm: rm3 } = await import("node:fs/promises");
+            await rm3(dir, { recursive: true });
+          }
+          for (const dependentTask of rewrittenDependents) {
+            this.emit("task:updated", dependentTask);
           }
           this.emit("task:deleted", task);
           return task;
         });
       }
+      rewriteDependentsAndDeleteTask(taskId, dependentIds) {
+        const rewrittenDependents = [];
+        this.db.transaction(() => {
+          for (const dependentId of dependentIds) {
+            const dependentTask = this.readTaskFromDb(dependentId);
+            if (!dependentTask) continue;
+            const nextDependencies = dependentTask.dependencies.filter((dependencyId) => dependencyId !== taskId);
+            if (nextDependencies.length === dependentTask.dependencies.length) {
+              continue;
+            }
+            const updatedDependent = {
+              ...dependentTask,
+              dependencies: nextDependencies,
+              updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+            };
+            this.db.prepare("UPDATE tasks SET dependencies = ?, updatedAt = ? WHERE id = ?").run(
+              toJson(updatedDependent.dependencies),
+              updatedDependent.updatedAt,
+              updatedDependent.id
+            );
+            if (this.isWatching) {
+              this.taskCache.set(updatedDependent.id, updatedDependent);
+            }
+            rewrittenDependents.push(updatedDependent);
+          }
+          this.db.prepare("DELETE FROM tasks WHERE id = ?").run(taskId);
+          this.db.bumpLastModified();
+        });
+        return rewrittenDependents;
+      }
       /**
        * Clean up the git branch associated with a task.
        *
@@ -31609,8 +31850,8 @@ ${task.description}
           this.archiveDb.upsert(entry);
           this.db.prepare("DELETE FROM tasks WHERE id = ?").run(id);
           this.db.bumpLastModified();
-          const { rm: rm2 } = await import("node:fs/promises");
-          await rm2(dir, { recursive: true, force: true });
+          const { rm: rm3 } = await import("node:fs/promises");
+          await rm3(dir, { recursive: true, force: true });
           if (this.isWatching) {
             this.taskCache.delete(id);
           }
@@ -32088,24 +32329,64 @@ ${task.description}
           this.emit("task:updated", task2);
           return task2;
         });
+        const commentContextBase = {
+          taskId: id,
+          author,
+          commentLength: text.length,
+          column: task.column,
+          priorStatus: task.status ?? null
+        };
+        if (runContext) {
+          commentContextBase.runId = runContext.runId;
+          commentContextBase.agentId = runContext.agentId;
+          if (runContext.source) {
+            commentContextBase.runSource = runContext.source;
+          }
+        }
         if (task.column === "done" && author === "user" && !options?.skipRefinement) {
           try {
             await this.refineTask(id, text);
-          } catch {
+          } catch (err) {
+            storeLog.warn("Best-effort post-comment auto-refinement failed", {
+              ...commentContextBase,
+              phase: "addComment:auto-refinement",
+              error: err instanceof Error ? err.message : String(err)
+            });
           }
         }
         if (task.column === "triage" && task.status === "awaiting-approval" && author === "user") {
+          let invalidatedStatus = false;
           try {
             await this.updateTask(id, {
               status: "needs-respecify"
             });
-            await this.logEntry(
-              id,
-              `User comment invalidated spec approval \u2014 task needs re-specification`,
-              void 0,
-              runContext
-            );
-          } catch {
+            invalidatedStatus = true;
+          } catch (err) {
+            storeLog.warn("Best-effort post-comment awaiting-approval invalidation failed", {
+              ...commentContextBase,
+              phase: "addComment:awaiting-approval-invalidation",
+              stage: "status-update",
+              nextStatus: "needs-respecify",
+              error: err instanceof Error ? err.message : String(err)
+            });
+          }
+          if (invalidatedStatus) {
+            try {
+              await this.logEntry(
+                id,
+                `User comment invalidated spec approval \u2014 task needs re-specification`,
+                void 0,
+                runContext
+              );
+            } catch (err) {
+              storeLog.warn("Best-effort post-comment awaiting-approval invalidation failed", {
+                ...commentContextBase,
+                phase: "addComment:awaiting-approval-invalidation",
+                stage: "post-invalidation-log-entry",
+                nextStatus: "needs-respecify",
+                error: err instanceof Error ? err.message : String(err)
+              });
+            }
           }
         }
         return task;
@@ -32381,7 +32662,7 @@ ${task.description}
           const rows2 = this.db.prepare(`
         SELECT * FROM agentLogEntries
         WHERE taskId = ?
-        ORDER BY timestamp DESC
+        ORDER BY timestamp DESC, id DESC
         LIMIT ?
       `).all(taskId, readCount);
           const entries2 = rows2.map((row) => this.mapAgentLogRow(row)).reverse();
@@ -32393,7 +32674,7 @@ ${task.description}
         const rows = this.db.prepare(`
       SELECT * FROM agentLogEntries
       WHERE taskId = ?
-      ORDER BY timestamp ASC
+      ORDER BY timestamp ASC, id ASC
     `).all(taskId);
         const entries = rows.map((row) => this.mapAgentLogRow(row));
         if (offset > 0) {
@@ -32426,7 +32707,7 @@ ${task.description}
         const rows = this.db.prepare(`
       SELECT * FROM agentLogEntries
       WHERE taskId = ? AND timestamp >= ? AND timestamp <= ?
-      ORDER BY timestamp ASC
+      ORDER BY timestamp ASC, id ASC
     `).all(taskId, startIso, end);
         return rows.map((row) => this.mapAgentLogRow(row));
       }
@@ -32522,14 +32803,14 @@ ${task.description}
         if (rows.length === 0) {
           return;
         }
-        const { rm: rm2 } = await import("node:fs/promises");
+        const { rm: rm3 } = await import("node:fs/promises");
         for (const row of rows) {
           const task = this.rowToTask(row);
           const archivedAt = task.columnMovedAt ?? task.updatedAt ?? (/* @__PURE__ */ new Date()).toISOString();
           const entry = await this.taskToArchiveEntry(task, archivedAt);
           this.archiveDb.upsert(entry);
           this.db.prepare("DELETE FROM tasks WHERE id = ?").run(task.id);
-          await rm2(this.taskDir(task.id), { recursive: true, force: true });
+          await rm3(this.taskDir(task.id), { recursive: true, force: true });
           if (this.isWatching) {
             this.taskCache.delete(task.id);
           }
@@ -32552,8 +32833,8 @@ ${task.description}
           this.archiveDb.upsert(entry);
           this.db.prepare("DELETE FROM tasks WHERE id = ?").run(task.id);
           this.db.bumpLastModified();
-          const { rm: rm2 } = await import("node:fs/promises");
-          await rm2(dir, { recursive: true, force: true });
+          const { rm: rm3 } = await import("node:fs/promises");
+          await rm3(dir, { recursive: true, force: true });
           if (this.isWatching) {
             this.taskCache.delete(task.id);
           }
@@ -32576,6 +32857,7 @@ ${task.description}
           id: entry.id,
           title: entry.title,
           description: entry.description,
+          priority: normalizeTaskPriority(entry.priority),
           column: "archived",
           // Will be changed to "done" by unarchiveTask
           dependencies: entry.dependencies,
@@ -32585,6 +32867,7 @@ ${task.description}
           reviewLevel: entry.reviewLevel,
           prInfo: entry.prInfo,
           issueInfo: entry.issueInfo,
+          sourceIssue: entry.sourceIssue,
           attachments: entry.attachments,
           log: [...entry.log, { timestamp: (/* @__PURE__ */ new Date()).toISOString(), action: "Task restored from archive" }],
           comments: entry.comments,
@@ -33194,6 +33477,28 @@ var init_daemon_token = __esm({
         const settings = await this.settingsStore.getSettings();
         return settings.daemonToken;
       }
+      /**
+       * Retrieve the existing daemon token or create/persist one if missing.
+       *
+       * Safe for concurrent callers: if another process writes the token between
+       * the initial read and generateToken(), this method re-reads and returns the
+       * persisted token instead of failing.
+       */
+      async getOrCreateToken() {
+        const existing = await this.getToken();
+        if (existing) {
+          return existing;
+        }
+        try {
+          return await this.generateToken();
+        } catch (error) {
+          const afterRace = await this.getToken();
+          if (afterRace) {
+            return afterRace;
+          }
+          throw error;
+        }
+      }
       /**
        * Validate that a provided token matches the stored token.
        *
@@ -33637,13 +33942,14 @@ __export(routine_store_exports, {
 });
 import { EventEmitter as EventEmitter12 } from "node:events";
 import { randomUUID as randomUUID7 } from "node:crypto";
-var import_cron_parser2, RoutineStore;
+var import_cron_parser2, CRON_TIMEZONE2, RoutineStore;
 var init_routine_store = __esm({
   "../core/src/routine-store.ts"() {
     "use strict";
     import_cron_parser2 = __toESM(require_dist2(), 1);
     init_db();
     init_routine();
+    CRON_TIMEZONE2 = "UTC";
     RoutineStore = class _RoutineStore extends EventEmitter12 {
       constructor(rootDir) {
         super();
@@ -33806,7 +34112,8 @@ var init_routine_store = __esm({
        */
       computeNextRun(cronExpression, fromDate) {
         const interval = import_cron_parser2.CronExpressionParser.parse(cronExpression, {
-          currentDate: fromDate ?? /* @__PURE__ */ new Date()
+          currentDate: fromDate ?? /* @__PURE__ */ new Date(),
+          tz: CRON_TIMEZONE2
         });
         const next = interval.next();
         return new Date(next.getTime()).toISOString();
@@ -34048,12 +34355,11 @@ var init_routine_store = __esm({
 });
 
 // ../core/src/plugin-loader.ts
-import { randomUUID as randomUUID8 } from "node:crypto";
-import { copyFile, unlink as unlink4 } from "node:fs/promises";
-import { isAbsolute as isAbsolute5, parse, resolve as resolve7 } from "node:path";
+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";
-var MINIMUM_FUSION_VERSION, log, PluginLoader;
+var MINIMUM_FUSION_VERSION, log, moduleImportVersion, PluginLoader;
 var init_plugin_loader = __esm({
   "../core/src/plugin-loader.ts"() {
     "use strict";
@@ -34061,6 +34367,7 @@ var init_plugin_loader = __esm({
     init_logger();
     MINIMUM_FUSION_VERSION = "0.1.0";
     log = createLogger("plugin-loader");
+    moduleImportVersion = 0;
     PluginLoader = class extends EventEmitter13 {
       constructor(options) {
         super();
@@ -34070,8 +34377,6 @@ var init_plugin_loader = __esm({
       plugins = /* @__PURE__ */ new Map();
       /** Cache of dynamically imported modules */
       loadedModules = /* @__PURE__ */ new Map();
-      /** Monotonic nonce to guarantee unique cache-busting import URLs. */
-      importNonce = 0;
       getProjectRoot() {
         return this.options.taskStore.getRootDir();
       }
@@ -34201,31 +34506,24 @@ var init_plugin_loader = __esm({
         if (!bypassCache && this.loadedModules.has(path)) {
           return this.loadedModules.get(path);
         }
-        let importPath = path;
-        let tempPath = null;
+        const moduleUrl = pathToFileURL(path).href;
+        let mod;
         if (bypassCache) {
-          const parsed = parse(path);
-          tempPath = resolve7(
-            parsed.dir,
-            `${parsed.name}.fusion-import-${process.pid}-${++this.importNonce}-${randomUUID8()}${parsed.ext || ".js"}`
-          );
-          await copyFile(path, tempPath);
-          importPath = tempPath;
-        }
-        const fileUrl = pathToFileURL(importPath);
-        if (bypassCache) {
-          fileUrl.searchParams.set("t", `${Date.now()}-${this.importNonce}`);
-        }
-        try {
-          const mod = await import(fileUrl.href);
-          this.loadedModules.set(path, mod);
-          return mod;
-        } finally {
-          if (tempPath) {
-            void unlink4(tempPath).catch(() => {
-            });
+          moduleImportVersion += 1;
+          const ext = extname(path);
+          const baseName = basename6(path, ext);
+          const reloadedPath = resolve7(dirname5(path), `.${baseName}.reload-${moduleImportVersion}${ext}`);
+          await copyFile(path, reloadedPath);
+          try {
+            mod = await import(pathToFileURL(reloadedPath).href);
+          } finally {
+            await rm(reloadedPath, { force: true }).catch(() => void 0);
           }
+        } else {
+          mod = await import(moduleUrl);
         }
+        this.loadedModules.set(path, mod);
+        return mod;
       }
       /**
        * Invalidate the module cache for a plugin path.
@@ -34614,7 +34912,7 @@ var init_plugin_loader = __esm({
 });
 
 // ../core/src/backup.ts
-import { cp, mkdir as mkdir8, readdir as readdir6, stat as stat3, unlink as unlink5 } from "node:fs/promises";
+import { cp, mkdir as mkdir8, readdir as readdir6, stat as stat3, unlink as unlink4 } from "node:fs/promises";
 import { existsSync as existsSync14 } from "node:fs";
 import { join as join17 } from "node:path";
 function generateBackupFilename() {
@@ -34867,7 +35165,7 @@ var init_backup = __esm({
         let deletedCount = 0;
         for (const backup of toDelete) {
           try {
-            await unlink5(backup.path);
+            await unlink4(backup.path);
             deletedCount++;
           } catch {
           }
@@ -35577,7 +35875,7 @@ var init_mission_types = __esm({
 // ../core/src/memory-insights.ts
 import { readFile as readFile10, writeFile as writeFile8, mkdir as mkdir9 } from "node:fs/promises";
 import { existsSync as existsSync15 } from "node:fs";
-import { dirname as dirname5, join as join18 } from "node:path";
+import { dirname as dirname6, join as join18 } from "node:path";
 async function readWorkingMemory(rootDir) {
   const filePath = join18(rootDir, MEMORY_WORKING_PATH);
   if (!existsSync15(filePath)) {
@@ -35602,7 +35900,7 @@ async function writeInsightsMemory(rootDir, content) {
 }
 async function writeWorkingMemory(rootDir, content) {
   const filePath = join18(rootDir, MEMORY_WORKING_PATH);
-  const dir = dirname5(filePath);
+  const dir = dirname6(filePath);
   if (!existsSync15(dir)) {
     await mkdir9(dir, { recursive: true });
   }
@@ -36447,7 +36745,7 @@ var require_ms = __commonJS({
       options = options || {};
       var type = typeof val;
       if (type === "string" && val.length > 0) {
-        return parse2(val);
+        return parse(val);
       } else if (type === "number" && isFinite(val)) {
         return options.long ? fmtLong(val) : fmtShort(val);
       }
@@ -36455,7 +36753,7 @@ var require_ms = __commonJS({
         "val is not a non-empty string or a valid number. val=" + JSON.stringify(val)
       );
     };
-    function parse2(str) {
+    function parse(str) {
       str = String(str);
       if (str.length > 100) {
         return;
@@ -46128,7 +46426,7 @@ var require_public_api = __commonJS({
       }
       return doc;
     }
-    function parse2(src, reviver, options) {
+    function parse(src, reviver, options) {
       let _reviver = void 0;
       if (typeof reviver === "function") {
         _reviver = reviver;
@@ -46169,7 +46467,7 @@ var require_public_api = __commonJS({
         return value.toString(options);
       return new Document.Document(value, _replacer, options).toString(options);
     }
-    exports.parse = parse2;
+    exports.parse = parse;
     exports.parseAllDocuments = parseAllDocuments;
     exports.parseDocument = parseDocument;
     exports.stringify = stringify;
@@ -46270,10 +46568,10 @@ function pushAlias(aliases, value) {
   if (pathRef !== normalized && pathRef.length > 0) {
     aliases.add(pathRef);
   }
-  const basename8 = extractPathBasename(value);
-  if (basename8) {
-    aliases.add(basename8);
-    const basenameSlug = slugifyAgentReference(basename8);
+  const basename9 = extractPathBasename(value);
+  if (basename9) {
+    aliases.add(basename9);
+    const basenameSlug = slugifyAgentReference(basename9);
     if (basenameSlug.length > 0) {
       aliases.add(basenameSlug);
     }
@@ -46959,7 +47257,7 @@ var init_agent_companies_exporter = __esm({
 
 // ../core/src/chat-store.ts
 import { EventEmitter as EventEmitter14 } from "node:events";
-import { randomUUID as randomUUID9 } from "node:crypto";
+import { randomUUID as randomUUID8 } from "node:crypto";
 var ChatStore;
 var init_chat_store = __esm({
   "../core/src/chat-store.ts"() {
@@ -47012,7 +47310,7 @@ var init_chat_store = __esm({
        */
       createSession(input) {
         const now = (/* @__PURE__ */ new Date()).toISOString();
-        const id = `chat-${randomUUID9().slice(0, 8)}`;
+        const id = `chat-${randomUUID8().slice(0, 8)}`;
         const session = {
           id,
           agentId: input.agentId,
@@ -47080,6 +47378,58 @@ var init_chat_store = __esm({
     `).all(...params);
         return rows.map((row) => this.rowToSession(row));
       }
+      /**
+       * Find the newest active session for a specific quick-chat target.
+       *
+       * Matching semantics:
+       * - model target (`modelProvider` + `modelId`): exact agent+model match
+       * - agent target (no model): prefer model-less sessions, then newest agent session fallback
+       */
+      findLatestActiveSessionForTarget(options) {
+        const normalizedAgentId = options.agentId.trim();
+        if (!normalizedAgentId) {
+          return void 0;
+        }
+        const normalizedProvider = options.modelProvider?.trim();
+        const normalizedModelId = options.modelId?.trim();
+        if (normalizedProvider && !normalizedModelId || !normalizedProvider && normalizedModelId) {
+          throw new Error("modelProvider and modelId must both be provided together, or neither");
+        }
+        const whereClauses = ["status = ?", "agentId = ?"];
+        const baseParams = ["active", normalizedAgentId];
+        if (options.projectId && options.projectId.trim()) {
+          whereClauses.push("projectId = ?");
+          baseParams.push(options.projectId.trim());
+        }
+        const baseWhereSql = whereClauses.join(" AND ");
+        if (normalizedProvider && normalizedModelId) {
+          const row = this.db.prepare(`
+        SELECT * FROM chat_sessions
+        WHERE ${baseWhereSql} AND modelProvider = ? AND modelId = ?
+        ORDER BY updatedAt DESC
+        LIMIT 1
+      `).get(...baseParams, normalizedProvider, normalizedModelId);
+          return row ? this.rowToSession(row) : void 0;
+        }
+        const modelLessRow = this.db.prepare(`
+      SELECT * FROM chat_sessions
+      WHERE ${baseWhereSql}
+        AND COALESCE(TRIM(modelProvider), '') = ''
+        AND COALESCE(TRIM(modelId), '') = ''
+      ORDER BY updatedAt DESC
+      LIMIT 1
+    `).get(...baseParams);
+        if (modelLessRow) {
+          return this.rowToSession(modelLessRow);
+        }
+        const fallbackRow = this.db.prepare(`
+      SELECT * FROM chat_sessions
+      WHERE ${baseWhereSql}
+      ORDER BY updatedAt DESC
+      LIMIT 1
+    `).get(...baseParams);
+        return fallbackRow ? this.rowToSession(fallbackRow) : void 0;
+      }
       /**
        * Update a chat session.
        *
@@ -47158,7 +47508,7 @@ var init_chat_store = __esm({
           throw new Error(`Chat session ${sessionId} not found`);
         }
         const now = (/* @__PURE__ */ new Date()).toISOString();
-        const id = `msg-${randomUUID9().slice(0, 8)}`;
+        const id = `msg-${randomUUID8().slice(0, 8)}`;
         const message = {
           id,
           sessionId,
@@ -47312,6 +47662,7 @@ __export(src_exports, {
   DEFAULT_MIN_INTERVAL_MS: () => DEFAULT_MIN_INTERVAL_MS,
   DEFAULT_PROJECT_SETTINGS: () => DEFAULT_PROJECT_SETTINGS,
   DEFAULT_SETTINGS: () => DEFAULT_SETTINGS,
+  DEFAULT_TASK_PRIORITY: () => DEFAULT_TASK_PRIORITY,
   DaemonTokenManager: () => DaemonTokenManager,
   Database: () => Database,
   EXECUTION_MODES: () => EXECUTION_MODES,
@@ -47367,6 +47718,7 @@ __export(src_exports, {
   SLICE_PLAN_STATES: () => SLICE_PLAN_STATES,
   SLICE_STATUSES: () => SLICE_STATUSES,
   SUMMARIZE_SYSTEM_PROMPT: () => SUMMARIZE_SYSTEM_PROMPT,
+  TASK_PRIORITIES: () => TASK_PRIORITIES,
   THEME_MODES: () => THEME_MODES,
   THINKING_LEVELS: () => THINKING_LEVELS,
   TaskStore: () => TaskStore,
@@ -47399,6 +47751,8 @@ __export(src_exports, {
   clearOverrides: () => clearOverrides,
   collectSystemMetrics: () => collectSystemMetrics,
   compactMemoryWithAi: () => compactMemoryWithAi,
+  compareTaskPriority: () => compareTaskPriority,
+  compareTasksByPriorityThenAgeAndId: () => compareTasksByPriorityThenAgeAndId,
   computeAccessState: () => computeAccessState,
   computeInsightFingerprint: () => computeInsightFingerprint,
   convertAgentCompanies: () => convertAgentCompanies,
@@ -47454,6 +47808,7 @@ __export(src_exports, {
   getRateLimitResetTime: () => getRateLimitResetTime,
   getTaskCompletionBlocker: () => getTaskCompletionBlocker,
   getTaskMergeBlocker: () => getTaskMergeBlocker,
+  getTaskPriorityRank: () => getTaskPriorityRank,
   getTemplatesForRole: () => getTemplatesForRole,
   getValidTransitions: () => getValidTransitions,
   hasAgentIdentity: () => hasAgentIdentity,
@@ -47470,6 +47825,7 @@ __export(src_exports, {
   isManualTrigger: () => isManualTrigger,
   isProjectSettingsKey: () => isProjectSettingsKey,
   isQmdAvailable: () => isQmdAvailable,
+  isTaskPriority: () => isTaskPriority,
   isTaskReadyForMerge: () => isTaskReadyForMerge,
   isValidPermission: () => isValidPermission,
   isValidPromptKey: () => isValidPromptKey,
@@ -47493,6 +47849,7 @@ __export(src_exports, {
   normalizePermissions: () => normalizePermissions,
   normalizeRoadmapFeatureOrder: () => normalizeRoadmapFeatureOrder,
   normalizeRoadmapMilestoneOrder: () => normalizeRoadmapMilestoneOrder,
+  normalizeTaskPriority: () => normalizeTaskPriority,
   parseAgentManifest: () => parseAgentManifest,
   parseCompanyArchive: () => parseCompanyArchive,
   parseCompanyDirectory: () => parseCompanyDirectory,
@@ -47545,6 +47902,7 @@ __export(src_exports, {
   shouldSkipBackgroundQmdRefresh: () => shouldSkipBackgroundQmdRefresh,
   shouldTriggerExtraction: () => shouldTriggerExtraction,
   slugify: () => slugify,
+  sortTasksByPriorityThenAgeAndId: () => sortTasksByPriorityThenAgeAndId,
   summarizeTitle: () => summarizeTitle,
   syncAutoSummarizeAutomation: () => syncAutoSummarizeAutomation,
   syncBackupAutomation: () => syncBackupAutomation,
@@ -47602,6 +47960,7 @@ var init_src = __esm({
     init_ai_summarize();
     init_memory_compaction();
     init_roadmap_ordering();
+    init_task_priority();
     init_roadmap_handoff();
     init_mission_types();
     init_mission_store();
@@ -47627,25 +47986,50 @@ var init_src = __esm({
   }
 });
 
-// ../engine/src/logger.js
+// ../engine/src/logger.ts
+function withSeverityMarker2(level, payload) {
+  return `${LOG_LEVEL_MARKER_PREFIX2}${level}${LOG_LEVEL_MARKER_SUFFIX2}${payload}`;
+}
 function createLogger2(prefix) {
   const tag = `[${prefix}]`;
   return {
     log(message, ...args) {
-      globalThis.console.error(`${tag} ${message}`, ...args);
+      console.error(withSeverityMarker2("info", `${tag} ${message}`), ...args);
     },
     warn(message, ...args) {
-      globalThis.console.warn(`${tag} ${message}`, ...args);
+      console.warn(withSeverityMarker2("warn", `${tag} ${message}`), ...args);
     },
     error(message, ...args) {
-      globalThis.console.error(`${tag} ${message}`, ...args);
+      console.error(withSeverityMarker2("error", `${tag} ${message}`), ...args);
     }
   };
 }
-var schedulerLog, executorLog, triageLog, piLog, extensionsLog, mergerLog, worktreePoolLog, reviewerLog, prMonitorLog, runtimeLog, ipcLog, projectManagerLog, hybridExecutorLog, autopilotLog, heartbeatLog, remoteNodeLog, nodeHealthMonitorLog, peerExchangeLog;
+function formatError(err) {
+  if (err instanceof Error) {
+    const message2 = err.message || err.name || "Error";
+    const stack = err.stack;
+    const detail = stack && stack.includes(message2) ? stack : stack ? `${message2}
+${stack}` : message2;
+    return { message: message2, stack, detail };
+  }
+  let message;
+  if (typeof err === "string") {
+    message = err;
+  } else {
+    try {
+      message = JSON.stringify(err);
+    } catch {
+      message = String(err);
+    }
+  }
+  return { message, detail: message };
+}
+var LOG_LEVEL_MARKER_PREFIX2, LOG_LEVEL_MARKER_SUFFIX2, schedulerLog, executorLog, triageLog, piLog, extensionsLog, mergerLog, worktreePoolLog, reviewerLog, prMonitorLog, runtimeLog, ipcLog, projectManagerLog, hybridExecutorLog, autopilotLog, heartbeatLog, remoteNodeLog, nodeHealthMonitorLog, peerExchangeLog;
 var init_logger2 = __esm({
-  "../engine/src/logger.js"() {
+  "../engine/src/logger.ts"() {
     "use strict";
+    LOG_LEVEL_MARKER_PREFIX2 = "\0fnlvl=";
+    LOG_LEVEL_MARKER_SUFFIX2 = "\0";
     schedulerLog = createLogger2("scheduler");
     executorLog = createLogger2("executor");
     triageLog = createLogger2("triage");
@@ -48100,7 +48484,7 @@ async function getAgentMemoryWindow(rootDir, agentMemory, path, startLine = 1, l
 }
 function createTaskCreateTool(store) {
   return {
-    name: "task_create",
+    name: "fn_task_create",
     label: "Create Task",
     description: "Create a new task for out-of-scope work discovered during execution. The task goes into triage where it will be specified by the AI. Optionally set dependencies (e.g., the new task depends on the current one, or the current task should wait for the new one).",
     parameters: taskCreateParams,
@@ -48123,7 +48507,7 @@ function createTaskCreateTool(store) {
 }
 function createTaskLogTool(store, taskId) {
   return {
-    name: "task_log",
+    name: "fn_task_log",
     label: "Log Entry",
     description: "Log an important action, decision, or issue for this task. Use for significant events \u2014 not every small step.",
     parameters: taskLogParams,
@@ -48138,7 +48522,7 @@ function createTaskLogTool(store, taskId) {
 }
 function createTaskLogToolWithContext(store, taskId, runContext) {
   return {
-    name: "task_log",
+    name: "fn_task_log",
     label: "Log Entry",
     description: "Log an important action, decision, or issue for this task. Use for significant events \u2014 not every small step.",
     parameters: taskLogParams,
@@ -48153,7 +48537,7 @@ function createTaskLogToolWithContext(store, taskId, runContext) {
 }
 function createTaskDocumentWriteTool(store, taskId) {
   return {
-    name: "task_document_write",
+    name: "fn_task_document_write",
     label: "Write Document",
     description: "Save a named document for this task (for example plan, notes, or research). Each write creates a new revision so you can update documents over time.",
     parameters: taskDocumentWriteParams,
@@ -48186,7 +48570,7 @@ function createTaskDocumentWriteTool(store, taskId) {
 }
 function createTaskDocumentReadTool(store, taskId) {
   return {
-    name: "task_document_read",
+    name: "fn_task_document_read",
     label: "Read Document",
     description: "Read a named document for this task, or list all documents when no key is provided.",
     parameters: taskDocumentReadParams,
@@ -48242,9 +48626,9 @@ ${lines.join("\n")}`
 }
 function createMemorySearchTool(rootDir, settings, options) {
   return {
-    name: "memory_search",
+    name: "fn_memory_search",
     label: "Search Memory",
-    description: "Search durable project memory and this agent's own memory, returning small snippets with file paths and line ranges. Use this before memory_get; do not read all memory by default.",
+    description: "Search durable project memory and this agent's own memory, returning small snippets with file paths and line ranges. Use this before fn_memory_get; do not read all memory by default.",
     parameters: memorySearchParams,
     execute: async (_id, params) => {
       const limit = params.limit ?? 5;
@@ -48270,9 +48654,9 @@ function createMemorySearchTool(rootDir, settings, options) {
 }
 function createMemoryGetTool(rootDir, settings, options) {
   return {
-    name: "memory_get",
+    name: "fn_memory_get",
     label: "Get Memory",
-    description: "Read a bounded line window from a memory file returned by memory_search. Allowed files include project memory under .fusion/memory/ and this agent's own .fusion/agent-memory/{agentId}/MEMORY.md file.",
+    description: "Read a bounded line window from a memory file returned by fn_memory_search. Allowed files include project memory under .fusion/memory/ and this agent's own .fusion/agent-memory/{agentId}/MEMORY.md file.",
     parameters: memoryGetParams,
     execute: async (_id, params) => {
       const agentResult = options?.agentMemory ? await getAgentMemoryWindow(rootDir, options.agentMemory, params.path, params.startLine, params.lineCount) : null;
@@ -48306,7 +48690,7 @@ ${result.content}`
 }
 function createMemoryAppendTool(rootDir, settings, options) {
   return {
-    name: "memory_append",
+    name: "fn_memory_append",
     label: "Append Memory",
     description: "Append concise Markdown to project memory. Use long-term only for durable conventions/decisions/pitfalls; use daily for running observations and open loops. Skip this tool when there is no reusable memory.",
     parameters: memoryAppendParams,
@@ -48368,7 +48752,7 @@ function createMemoryTools(rootDir, settings, options) {
 }
 function createReflectOnPerformanceTool(reflectionService, agentId) {
   return {
-    name: "reflect_on_performance",
+    name: "fn_reflect_on_performance",
     label: "Reflect on Performance",
     description: 'Review your past task performance and generate insights for improvement. Optionally focus on a specific area like "code quality", "speed", or "testing".',
     parameters: reflectOnPerformanceParams,
@@ -48401,7 +48785,7 @@ function createReflectOnPerformanceTool(reflectionService, agentId) {
 }
 function createListAgentsTool(agentStore) {
   return {
-    name: "list_agents",
+    name: "fn_list_agents",
     label: "List Agents",
     description: "List all available agents in the system. Shows each agent's name, role, state, personality (soul), and current assignment. Use this to discover which agents exist and what they specialize in before delegating work.",
     parameters: listAgentsParams,
@@ -48444,9 +48828,9 @@ ${lines.join("\n\n")}` }],
 }
 function createDelegateTaskTool(agentStore, taskStore) {
   return {
-    name: "delegate_task",
+    name: "fn_delegate_task",
     label: "Delegate Task",
-    description: "Create a new task and assign it to a specific agent for execution. The task goes to 'todo' and will be picked up by the target agent on their next heartbeat cycle. Use list_agents first to find available agents and their capabilities.",
+    description: "Create a new task and assign it to a specific agent for execution. The task goes to 'todo' and will be picked up by the target agent on their next heartbeat cycle. Use fn_list_agents first to find available agents and their capabilities.",
     parameters: delegateTaskParams,
     execute: async (_id, params) => {
       const agent = await agentStore.getAgent(params.agent_id);
@@ -48481,7 +48865,7 @@ function createDelegateTaskTool(agentStore, taskStore) {
 }
 function createSendMessageTool(messageStore, fromAgentId) {
   return {
-    name: "send_message",
+    name: "fn_send_message",
     label: "Send Message",
     description: "Send a message to another agent or user. The recipient will be woken if they have `messageResponseMode: 'immediate'` configured. When replying to an existing message, include `reply_to_message_id` to preserve threading.",
     parameters: sendMessageParams,
@@ -48538,7 +48922,7 @@ function createSendMessageTool(messageStore, fromAgentId) {
 }
 function createReadMessagesTool(messageStore, agentId) {
   return {
-    name: "read_messages",
+    name: "fn_read_messages",
     label: "Read Messages",
     description: "Read your inbox messages. Returns unread messages by default.",
     parameters: readMessagesParams,
@@ -48640,7 +49024,7 @@ var init_agent_tools = __esm({
         Type.Literal("agent-to-user")
       ], { description: "Message type (defaults to 'agent-to-agent')" })),
       reply_to_message_id: Type.Optional(
-        Type.String({ description: "Optional ID of the message you are replying to (use IDs from read_messages output)" })
+        Type.String({ description: "Optional ID of the message you are replying to (use IDs from fn_read_messages output)" })
       )
     });
     readMessagesParams = Type.Object({
@@ -48652,7 +49036,7 @@ var init_agent_tools = __esm({
       limit: Type.Optional(Type.Number({ description: "Maximum snippets to return (default: 5, max: 20)" }))
     });
     memoryGetParams = Type.Object({
-      path: Type.String({ description: "Memory path from memory_search, e.g. .fusion/memory/MEMORY.md or .fusion/memory/YYYY-MM-DD.md" }),
+      path: Type.String({ description: "Memory path from fn_memory_search, e.g. .fusion/memory/MEMORY.md or .fusion/memory/YYYY-MM-DD.md" }),
       startLine: Type.Optional(Type.Number({ description: "1-based start line (default: 1)" })),
       lineCount: Type.Optional(Type.Number({ description: "Number of lines to read (default: 120, max: 400)" }))
     });
@@ -48801,7 +49185,7 @@ var init_concurrency = __esm({
   }
 });
 
-// ../engine/src/skill-resolver.js
+// ../engine/src/skill-resolver.ts
 import { existsSync as existsSync18, readFileSync as readFileSync4 } from "node:fs";
 import { join as join22 } from "node:path";
 function readJsonObject(path) {
@@ -48925,9 +49309,13 @@ function createSkillsOverrideFromSelection(selection, options = {}) {
     let filteredSkills;
     if (hasRequestedNames) {
       const requestedNamesLower = new Set(requestedSkillNames.map((n) => n.toLowerCase()));
-      filteredSkills = base.skills.filter((skill) => requestedNamesLower.has(skill.name.toLowerCase()) && !excludedSkillPaths.has(skill.filePath));
+      filteredSkills = base.skills.filter(
+        (skill) => requestedNamesLower.has(skill.name.toLowerCase()) && !excludedSkillPaths.has(skill.filePath)
+      );
     } else if (hasPatterns) {
-      filteredSkills = base.skills.filter((skill) => allowedSkillPaths.has(skill.filePath) && !excludedSkillPaths.has(skill.filePath));
+      filteredSkills = base.skills.filter(
+        (skill) => allowedSkillPaths.has(skill.filePath) && !excludedSkillPaths.has(skill.filePath)
+      );
     } else if (hasExcluded) {
       filteredSkills = base.skills.filter((skill) => !excludedSkillPaths.has(skill.filePath));
     } else {
@@ -48967,6 +49355,7 @@ function createSkillsOverrideFromSelection(selection, options = {}) {
       }
     }
     if (newDiagnostics.length > 0) {
+      const _purpose = sessionPurpose ? `[${sessionPurpose}]` : "skills";
       for (const diag of newDiagnostics) {
         piLog.warn(`[skills] ${diag.type}: ${diag.message}`);
       }
@@ -48978,21 +49367,20 @@ function createSkillsOverrideFromSelection(selection, options = {}) {
   };
 }
 var init_skill_resolver = __esm({
-  "../engine/src/skill-resolver.js"() {
+  "../engine/src/skill-resolver.ts"() {
     "use strict";
     init_logger2();
   }
 });
 
-// ../engine/src/context-limit-detector.js
+// ../engine/src/context-limit-detector.ts
 function isContextLimitError(message) {
-  if (!message)
-    return false;
+  if (!message) return false;
   return CONTEXT_OVERFLOW_PATTERNS.some((pattern) => pattern.test(message));
 }
 var CONTEXT_OVERFLOW_PATTERNS;
 var init_context_limit_detector = __esm({
-  "../engine/src/context-limit-detector.js"() {
+  "../engine/src/context-limit-detector.ts"() {
     "use strict";
     CONTEXT_OVERFLOW_PATTERNS = [
       // Anthropic: "prompt is too long: X tokens > Y maximum"
@@ -49029,14 +49417,14 @@ var init_context_limit_detector = __esm({
   }
 });
 
-// ../engine/src/auth-storage.js
+// ../engine/src/auth-storage.ts
 import { existsSync as existsSync19, readFileSync as readFileSync5 } from "node:fs";
 import { homedir as homedir4 } from "node:os";
 import { join as join23 } from "node:path";
 import { AuthStorage } from "@mariozechner/pi-coding-agent";
 import { getOAuthProvider } from "@mariozechner/pi-ai/oauth";
 function getHomeDir2() {
-  return globalThis.process.env.HOME || globalThis.process.env.USERPROFILE || homedir4();
+  return process.env.HOME || process.env.USERPROFILE || homedir4();
 }
 function getFusionAuthPath(home = getHomeDir2()) {
   return join23(home, ".fusion", "agent", "auth.json");
@@ -49080,9 +49468,8 @@ function readLegacyCredentials(authPaths = getLegacyAuthPaths()) {
   return credentials;
 }
 function resolveStoredApiKey(key) {
-  if (!key)
-    return void 0;
-  return globalThis.process.env[key] ?? key;
+  if (!key) return void 0;
+  return process.env[key] ?? key;
 }
 function resolveOAuthApiKey(providerId, credential) {
   if (credential.type !== "oauth" || typeof credential.access !== "string" || typeof credential.refresh !== "string" || typeof credential.expires !== "number" || Date.now() >= credential.expires) {
@@ -49128,8 +49515,7 @@ function createFusionAuthStorage() {
       if (prop === "getApiKey") {
         return async (provider) => {
           const primaryKey = await target.getApiKey(provider);
-          if (primaryKey)
-            return primaryKey;
+          if (primaryKey) return primaryKey;
           return resolveStoredCredentialApiKey(provider, legacyCredentials[provider]);
         };
       }
@@ -49138,12 +49524,12 @@ function createFusionAuthStorage() {
   });
 }
 var init_auth_storage = __esm({
-  "../engine/src/auth-storage.js"() {
+  "../engine/src/auth-storage.ts"() {
     "use strict";
   }
 });
 
-// ../engine/src/pi.js
+// ../engine/src/pi.ts
 var pi_exports = {};
 __export(pi_exports, {
   COMPACTION_FALLBACK_INSTRUCTIONS: () => COMPACTION_FALLBACK_INSTRUCTIONS,
@@ -49156,20 +49542,36 @@ __export(pi_exports, {
 import { existsSync as existsSync20, readFileSync as readFileSync6 } from "node:fs";
 import { exec } from "node:child_process";
 import { promisify as promisify2 } from "node:util";
-import { basename as basename6, dirname as dirname6, join as join24, relative as relative3, isAbsolute as isAbsolute6, resolve as resolve10 } from "node:path";
-import { createAgentSession, createCodingTools, createExtensionRuntime, createReadOnlyTools, DefaultResourceLoader, DefaultPackageManager, discoverAndLoadExtensions, ModelRegistry, SessionManager, SettingsManager } from "@mariozechner/pi-coding-agent";
+import { basename as basename7, dirname as dirname7, join as join24, relative as relative3, isAbsolute as isAbsolute6, resolve as resolve10 } from "node:path";
+import {
+  createAgentSession,
+  createCodingTools,
+  createExtensionRuntime,
+  createReadOnlyTools,
+  DefaultResourceLoader,
+  DefaultPackageManager,
+  discoverAndLoadExtensions,
+  ModelRegistry,
+  SessionManager,
+  SettingsManager
+} from "@mariozechner/pi-coding-agent";
 function getSessionStateError(session) {
-  const error = session.state?.error;
+  const state = session.state;
+  const error = state?.errorMessage ?? state?.error;
   return typeof error === "string" ? error : "";
 }
 function clearSessionStateError(session) {
   const state = session.state;
-  if (!state || typeof state !== "object" || !("error" in state)) {
+  if (!state || typeof state !== "object") {
     return;
   }
-  try {
-    state.error = void 0;
-  } catch {
+  for (const key of ["errorMessage", "error"]) {
+    if (key in state) {
+      try {
+        state[key] = void 0;
+      } catch {
+      }
+    }
   }
 }
 async function promptSessionAndCheck(session, prompt, options) {
@@ -49181,6 +49583,29 @@ async function promptSessionAndCheck(session, prompt, options) {
   }
   const stateError = getSessionStateError(session);
   if (stateError) {
+    if (/Cannot read propert(y|ies) of (undefined|null)/i.test(stateError)) {
+      try {
+        const messages = session.agent?.state?.messages ?? session.state?.messages;
+        if (Array.isArray(messages)) {
+          const recent = messages.slice(-6).map((m, idx) => {
+            const i = messages.length - 6 + idx;
+            const content = m?.content;
+            return {
+              index: i < 0 ? idx : i,
+              role: m?.role,
+              contentType: Array.isArray(content) ? `array(len=${content.length})` : typeof content,
+              toolName: m.toolName,
+              stopReason: m.stopReason
+            };
+          });
+          piLog.error(`pi state error \u2014 transcript tail (${messages.length} msgs total): ${JSON.stringify(recent)}`);
+        } else {
+          piLog.error(`pi state error \u2014 state.messages is not an array: ${typeof messages}`);
+        }
+      } catch (inspectErr) {
+        piLog.warn(`pi state error \u2014 failed to inspect transcript: ${inspectErr instanceof Error ? inspectErr.message : String(inspectErr)}`);
+      }
+    }
     throw new Error(stateError);
   }
 }
@@ -49232,8 +49657,7 @@ async function promptWithFallback(session, prompt, options) {
 }
 function describeModel(session) {
   const model = session.model;
-  if (!model)
-    return "unknown model";
+  if (!model) return "unknown model";
   return `${model.provider}/${model.id}`;
 }
 function compactMarkdownMemorySection(sectionBody) {
@@ -49286,7 +49710,9 @@ async function retryWithCompactedPromptMemory(session, prompt, options) {
   if (!compactedPrompt) {
     return { recovered: false };
   }
-  piLog.log(`promptWithFallback: retrying with compacted prompt memory (${prompt.length} \u2192 ${compactedPrompt.length} chars)`);
+  piLog.log(
+    `promptWithFallback: retrying with compacted prompt memory (${prompt.length} \u2192 ${compactedPrompt.length} chars)`
+  );
   try {
     await promptSessionAndCheck(session, compactedPrompt, options);
     piLog.log("promptWithFallback: prompt completed after prompt-memory compaction");
@@ -49303,7 +49729,7 @@ async function flushMemoryBeforeSessionCompaction(session) {
   }
   const flushPrompt = [
     "Before context compaction, preserve only unresolved durable memory if needed.",
-    "If memory_append is available and you learned reusable project decisions, conventions, pitfalls, or open loops that are not already saved, append them now.",
+    "If fn_memory_append is available and you learned reusable project decisions, conventions, pitfalls, or open loops that are not already saved, append them now.",
     'Use layer="long-term" for durable facts and layer="daily" for running notes/open loops.',
     "If there is nothing durable to save, reply exactly: NONE."
   ].join("\n");
@@ -49348,7 +49774,9 @@ function resolveConfiguredModel(modelRegistry, kind, provider, modelId) {
     piLog.warn(`${kind} model ${provider}/${modelId} not in registry; using provider base model as template`);
     return { ...baseModel, id: modelId, name: modelId };
   }
-  throw new Error(`Configured ${kind} model ${provider}/${modelId} was not found in the pi model registry. Open Settings and choose a model from /api/models, or update your pi model configuration.`);
+  throw new Error(
+    `Configured ${kind} model ${provider}/${modelId} was not found in the pi model registry. Open Settings and choose a model from /api/models, or update your pi model configuration.`
+  );
 }
 function isRetryableModelSelectionError(message) {
   const normalized = message.toLowerCase();
@@ -49393,11 +49821,18 @@ function normalizeAssistantOrToolResultMessage(message) {
     return false;
   }
   const role = message.role;
-  if (role !== "assistant" && role !== "toolResult") {
+  if (role !== "assistant" && role !== "toolResult" && role !== "user") {
     return false;
   }
-  if (!Array.isArray(message.content)) {
-    message.content = [];
+  const obj = message;
+  if (role === "user") {
+    if (typeof obj.content !== "string" && !Array.isArray(obj.content)) {
+      obj.content = [];
+    }
+    return true;
+  }
+  if (!Array.isArray(obj.content)) {
+    obj.content = [];
   }
   return true;
 }
@@ -49454,6 +49889,12 @@ function installMessageContentGuard(session, sessionManager) {
   if (session.__fusionMessageContentGuardInstalled) {
     return;
   }
+  const existingMessages = session.agent?.state?.messages;
+  if (Array.isArray(existingMessages)) {
+    for (const candidate of existingMessages) {
+      normalizeAssistantOrToolResultMessage(candidate);
+    }
+  }
   if (typeof session.subscribe === "function") {
     session.subscribe((event) => {
       if (!event || typeof event !== "object" || event.type !== "message_end") {
@@ -49480,10 +49921,10 @@ function hasPackageManagerSettings(settings) {
   return Array.isArray(settings.packages) || Array.isArray(settings.npmCommand);
 }
 function siblingAgentDir(agentDir, siblingRoot) {
-  if (basename6(agentDir) !== "agent") {
+  if (basename7(agentDir) !== "agent") {
     return void 0;
   }
-  return join24(dirname6(dirname6(agentDir)), siblingRoot, "agent");
+  return join24(dirname7(dirname7(agentDir)), siblingRoot, "agent");
 }
 function createReadOnlyPiSettingsView(cwd, agentDir) {
   const projectRoot = resolvePiExtensionProjectRoot(cwd);
@@ -49496,8 +49937,8 @@ function createReadOnlyPiSettingsView(cwd, agentDir) {
   const fusionProjectSettings = readJsonObject2(join24(projectRoot, ".fusion", "settings.json"));
   const mergedSettings = { ...globalSettings, ...fusionProjectSettings };
   return {
-    getGlobalSettings: () => globalThis.structuredClone(globalSettings),
-    getProjectSettings: () => globalThis.structuredClone(fusionProjectSettings),
+    getGlobalSettings: () => structuredClone(globalSettings),
+    getProjectSettings: () => structuredClone(fusionProjectSettings),
     getNpmCommand: () => Array.isArray(mergedSettings.npmCommand) ? [...mergedSettings.npmCommand] : void 0
   };
 }
@@ -49524,7 +49965,11 @@ 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([...getEnabledPiExtensionPaths(cwd), ...packageExtensionPaths], cwd, join24(resolvePiExtensionProjectRoot(cwd), ".fusion", "disabled-auto-extension-discovery"));
+    const extensionsResult = await discoverAndLoadExtensions(
+      [...getEnabledPiExtensionPaths(cwd), ...packageExtensionPaths],
+      cwd,
+      join24(resolvePiExtensionProjectRoot(cwd), ".fusion", "disabled-auto-extension-discovery")
+    );
     for (const { path, error } of extensionsResult.errors) {
       extensionsLog.warn(`Failed to load ${path}: ${error}`);
     }
@@ -49559,7 +50004,9 @@ async function isRegisteredGitWorktree(projectRoot, worktreePath) {
       encoding: "utf-8"
     });
     const resolvedWorktree = resolve10(worktreePath);
-    return stdout.split("\n").some((line) => line.startsWith("worktree ") && resolve10(line.slice("worktree ".length)) === resolvedWorktree);
+    return stdout.split("\n").some(
+      (line) => line.startsWith("worktree ") && resolve10(line.slice("worktree ".length)) === resolvedWorktree
+    );
   } catch {
     return false;
   }
@@ -49586,7 +50033,7 @@ async function assertValidWorktreeSession(cwd, projectRoot) {
     throw new Error(`Refusing to start coding agent in unregistered git worktree: ${cwd}`);
   }
 }
-function isWorktreeAllowedPath(worktreePath, projectRoot, requestedPath) {
+function isWorktreeAllowedPath(worktreePath, projectRoot, requestedPath, toolName) {
   const worktreeResolved = resolve10(worktreePath);
   const projectRootResolved = resolve10(projectRoot);
   const requestedResolved = isAbsolute6(requestedPath) ? resolve10(requestedPath) : resolve10(worktreeResolved, requestedPath);
@@ -49601,8 +50048,20 @@ function isWorktreeAllowedPath(worktreePath, projectRoot, requestedPath) {
   if (relToProjectRoot.match(/^\.fusion\/tasks\/[^/]+\/attachments\//)) {
     return true;
   }
+  const readOnlyTools = /* @__PURE__ */ new Set(["read", "glob", "grep"]);
+  if (toolName && readOnlyTools.has(toolName) && /^\.fusion\/tasks\/[^/]+\/(PROMPT\.md|task\.json)$/.test(relToProjectRoot)) {
+    return true;
+  }
   return false;
 }
+function boundaryRejection(message) {
+  return {
+    content: [{ type: "text", text: message }],
+    isError: true,
+    ok: false,
+    error: message
+  };
+}
 function wrapToolsWithBoundary(tools, worktreePath, projectRoot) {
   if (!worktreePath || !projectRoot) {
     return tools;
@@ -49616,21 +50075,21 @@ function wrapToolsWithBoundary(tools, worktreePath, projectRoot) {
     return {
       ...tool,
       execute: async (...args) => {
+        const _toolCallId = args[0];
         const params = args[1];
+        const _signal = args[2];
         const pathArg = params.path;
-        if (pathArg && !isWorktreeAllowedPath(worktreePath, projectRoot, pathArg)) {
+        if (pathArg && !isWorktreeAllowedPath(worktreePath, projectRoot, pathArg, tool.name)) {
           const relToProject = relative3(projectRoot, pathArg);
-          return {
-            ok: false,
-            error: `Path "${relToProject}" is outside the worktree boundary. Coding agents can only modify files inside the current worktree. Exception: .fusion/memory/ (project root) and .fusion/tasks/*/attachments/* are permitted for reading.`
-          };
+          return boundaryRejection(
+            `Path "${relToProject}" is outside the worktree boundary. Coding agents can only modify files inside the current worktree. Exceptions (read-only): .fusion/memory/, .fusion/tasks/*/attachments/, and .fusion/tasks/*/{PROMPT.md,task.json} for dependency context.`
+          );
         }
         const cwdArg = params.cwd;
-        if (tool.name === "bash" && cwdArg && !isWorktreeAllowedPath(worktreePath, projectRoot, cwdArg)) {
-          return {
-            ok: false,
-            error: `Working directory is outside the worktree boundary. Commands must run inside the worktree.`
-          };
+        if (tool.name === "bash" && cwdArg && !isWorktreeAllowedPath(worktreePath, projectRoot, cwdArg, tool.name)) {
+          return boundaryRejection(
+            `Working directory is outside the worktree boundary. Commands must run inside the worktree.`
+          );
         }
         return originalExecute(...args);
       }
@@ -49640,7 +50099,7 @@ function wrapToolsWithBoundary(tools, worktreePath, projectRoot) {
 async function createFnAgent2(options) {
   piLog.log(`createFnAgent called (cwd=${options.cwd}, tools=${options.tools}, provider=${options.defaultProvider}, model=${options.defaultModelId})`);
   const authStorage = createFusionAuthStorage();
-  const modelRegistry = new ModelRegistry(authStorage, getModelRegistryModelsPath());
+  const modelRegistry = ModelRegistry.create(authStorage, getModelRegistryModelsPath());
   await registerExtensionProviders(options.cwd, modelRegistry);
   const tools = options.tools === "readonly" ? createReadOnlyTools(options.cwd) : createCodingTools(options.cwd);
   const worktreePath = options.cwd;
@@ -49653,8 +50112,18 @@ async function createFnAgent2(options) {
     compaction: { enabled: true },
     retry: { enabled: true, maxRetries: 3 }
   });
-  const selectedModel = resolveConfiguredModel(modelRegistry, "primary", options.defaultProvider, options.defaultModelId);
-  const fallbackModel = resolveConfiguredModel(modelRegistry, "fallback", options.fallbackProvider, options.fallbackModelId);
+  const selectedModel = resolveConfiguredModel(
+    modelRegistry,
+    "primary",
+    options.defaultProvider,
+    options.defaultModelId
+  );
+  const fallbackModel = resolveConfiguredModel(
+    modelRegistry,
+    "fallback",
+    options.fallbackProvider,
+    options.fallbackModelId
+  );
   let effectiveSkillSelection = options.skillSelection;
   if (!effectiveSkillSelection && options.skills && options.skills.length > 0) {
     piLog.log(`Using skills from convenience parameter: [${options.skills.join(", ")}]`);
@@ -49680,6 +50149,7 @@ async function createFnAgent2(options) {
   }
   const resourceLoader = new DefaultResourceLoader({
     cwd: options.cwd,
+    agentDir: getFusionAgentDir(),
     settingsManager,
     systemPromptOverride: () => options.systemPrompt,
     appendSystemPromptOverride: () => [],
@@ -49689,13 +50159,17 @@ async function createFnAgent2(options) {
   const sessionManager = options.sessionManager ?? SessionManager.inMemory();
   normalizeSessionHistoryEntries(sessionManager);
   const createSessionWithModel = async (modelOverride) => {
+    const customToolList = [
+      ...wrappedTools,
+      ...options.customTools ?? []
+    ];
     return createAgentSession({
       cwd: options.cwd,
       authStorage,
       modelRegistry,
       resourceLoader,
-      tools: wrappedTools,
-      customTools: options.customTools,
+      noTools: "builtin",
+      customTools: customToolList,
       sessionManager,
       settingsManager,
       ...modelOverride ? { model: modelOverride } : {}
@@ -49719,7 +50193,7 @@ async function createFnAgent2(options) {
   const { session } = sessionResult;
   installToolResultContentGuard(session);
   installMessageContentGuard(session, sessionManager);
-  session.__fusionMemoryAppendAvailable = options.customTools?.some((tool) => tool.name === "memory_append") === true;
+  session.__fusionMemoryAppendAvailable = options.customTools?.some((tool) => tool.name === FN_MEMORY_APPEND_TOOL_NAME) === true;
   const promptableSession = session;
   promptableSession.promptWithFallback = async (prompt, promptOptions) => {
     try {
@@ -49769,8 +50243,11 @@ async function createFnAgent2(options) {
       const fallbackSessionResult = await createSessionWithModel(fallbackModel);
       const fallbackSession = fallbackSessionResult.session;
       installToolResultContentGuard(fallbackSession);
-      installMessageContentGuard(fallbackSession, sessionManager);
-      fallbackSession.__fusionMemoryAppendAvailable = options.customTools?.some((tool) => tool.name === "memory_append") === true;
+      installMessageContentGuard(
+        fallbackSession,
+        sessionManager
+      );
+      fallbackSession.__fusionMemoryAppendAvailable = options.customTools?.some((tool) => tool.name === FN_MEMORY_APPEND_TOOL_NAME) === true;
       if (options.defaultThinkingLevel) {
         fallbackSession.setThinkingLevel(options.defaultThinkingLevel);
       }
@@ -49852,9 +50329,9 @@ async function createFnAgent2(options) {
   });
   return { session: promptableSession, sessionFile: promptableSession.sessionFile };
 }
-var execAsync, COMPACTION_FALLBACK_INSTRUCTIONS, MAX_COMPACTED_PROMPT_MEMORY_CHARS;
+var execAsync, FN_MEMORY_APPEND_TOOL_NAME, COMPACTION_FALLBACK_INSTRUCTIONS, MAX_COMPACTED_PROMPT_MEMORY_CHARS;
 var init_pi = __esm({
-  "../engine/src/pi.js"() {
+  "../engine/src/pi.ts"() {
     "use strict";
     init_src();
     init_skill_resolver();
@@ -49862,6 +50339,7 @@ var init_pi = __esm({
     init_auth_storage();
     init_logger2();
     execAsync = promisify2(exec);
+    FN_MEMORY_APPEND_TOOL_NAME = "fn_memory_append";
     COMPACTION_FALLBACK_INSTRUCTIONS = [
       "Summarize all completed steps concisely.",
       "Preserve the current step number and any in-progress work details.",
@@ -50802,12 +51280,12 @@ When reviewing specs, actively assess whether the task should have been broken i
 Say explicitly: "This task should be broken into subtasks because [specific reason]."
 Recommend the number of child tasks (2-5) and what each should cover.
 **Critically**, instruct the planner to take these actions in your REVISE feedback:
-1. Use the \`task_create\` tool to create 2\u20135 child tasks from the oversized spec
+1. Use the \`fn_task_create\` tool to create 2\u20135 child tasks from the oversized spec
 2. Do NOT write a parent PROMPT.md \u2014 the parent will be closed automatically after children are created
 3. Each child task should cover one coherent deliverable with clear scope boundaries
 
 Example REVISE feedback for an undersplit task:
-"This task should be broken into 3 subtasks because it spans the engine, dashboard, and CLI packages with independent deliverables. Use task_create to create: (1) engine logic, (2) dashboard UI, (3) CLI integration. Do not write a parent PROMPT."
+"This task should be broken into 3 subtasks because it spans the engine, dashboard, and CLI packages with independent deliverables. Use fn_task_create to create: (1) engine logic, (2) dashboard UI, (3) CLI integration. Do not write a parent PROMPT."
 
 **Do NOT flag if:**
 - Steps are sequential and tightly coupled (e.g., a pipeline where each step depends on the previous)
@@ -51180,12 +51658,12 @@ The user has requested that this task be broken into smaller subtasks if it is c
 
 **How to split:**
 1. First, analyze the task to determine if it should be split
-2. If splitting: use the \\\`task_create\\\` tool to create child tasks in order, setting up dependencies as needed
+2. If splitting: use the \\\`fn_task_create\\\` tool to create child tasks in order, setting up dependencies as needed
 3. Include clear descriptions and acceptance criteria for each child task
 4. After creating all subtasks, stop \u2014 do NOT write a PROMPT.md for the parent task
 5. If NOT splitting: proceed with a normal PROMPT.md specification for this task
 
-**Subtask dependencies rule:** \`dependencies\` on a child may only reference **sibling subtasks created earlier in this same split** or **pre-existing tasks in the store**. They must NEVER reference the parent task being split \u2014 the parent is deleted after the split completes, and a dependency on a deleted task permanently blocks the dependent. If a child "needs the rest of the parent's work to finish first", create another sibling subtask for that remaining work and depend on the sibling. The \`task_create\` tool rejects parent-id dependencies.
+**Subtask dependencies rule:** \`dependencies\` on a child may only reference **sibling subtasks created earlier in this same split** or **pre-existing tasks in the store**. They must NEVER reference the parent task being split \u2014 the parent is deleted after the split completes, and a dependency on a deleted task permanently blocks the dependent. If a child "needs the rest of the parent's work to finish first", create another sibling subtask for that remaining work and depend on the sibling. The \`fn_task_create\` tool rejects parent-id dependencies.
 
 **Important:** If you create subtasks, this parent task will be closed and replaced by the children. Make sure each child is a complete, executable task.`;
   } else {
@@ -51211,7 +51689,7 @@ The user did not explicitly request subtask breakdown, so you should first asses
 - Adding a small feature to one module with 5 steps
 
 **How to decide:**
-- If you choose to split: use the \\\`task_create\\\` tool to create the child tasks, set dependencies where needed, and then stop without writing a PROMPT.md for the parent task.
+- If you choose to split: use the \\\`fn_task_create\\\` tool to create the child tasks, set dependencies where needed, and then stop without writing a PROMPT.md for the parent task.
 - **Subtask dependencies must only reference sibling subtasks created earlier in this same split, or pre-existing tasks. NEVER depend on the parent task being split \u2014 the parent is deleted after splitting, and the tool will reject parent-id dependencies.**
 - If the work appears to be Size S, or if an M/L task genuinely has 5 or fewer focused steps with a clear scope, proceed with a normal PROMPT.md specification.
 - If size is uncertain at first, make a quick assessment from the available context before deciding.`;
@@ -51325,8 +51803,8 @@ Follow this structure exactly:
 ### Step {N}: Documentation & Delivery
 
 - [ ] Update relevant documentation
-- [ ] Save documentation deliverables as task documents via \`task_document_write\` (key="docs", content=...)
-- [ ] Out-of-scope findings created as new tasks via \`task_create\` tool
+- [ ] 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
 
@@ -51359,7 +51837,7 @@ Commits at step boundaries. All commits include the task ID:
 - 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 \`task_create\`
+- Remove features as "cleanup" \u2014 if something seems unused, create a task via \`fn_task_create\`
 
 ## Changeset Requirements
 
@@ -51381,13 +51859,13 @@ tests. Manual verification is NOT a test.
   as part of this task (not just skipping tests)
 
 ## Duplicate check
-Before writing a spec, call \`task_list\` to see existing tasks.
+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 \`task_get\` on that task ID to read its PROMPT.md.
+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.
 
@@ -51395,8 +51873,8 @@ If the dependency task has no PROMPT.md yet (not yet specified), note that in th
 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 \`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 \`task_create\` tool will reject parent-id dependencies with an error.
+- 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
@@ -51419,20 +51897,20 @@ For tasks you assess as Size M or L, proactively evaluate whether splitting into
 
 ## Triage tools
 You have these extra tools during triage:
-- \`task_list\` \u2014 list existing active tasks
-- \`task_get\` \u2014 inspect a task and its PROMPT.md
-- \`task_create\` \u2014 create a child/follow-up task while triaging
-- \`task_document_write\` \u2014 save a planning document (e.g., key="plan")
-- \`task_document_read\` \u2014 read back a previously saved document
+- \`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 \`task_document_write(key='plan', content='...')\` so the executor can reference it during implementation.
+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 \`task_document_write\`
+- 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)
@@ -51446,16 +51924,16 @@ package.json when explicit commands are provided.
 
 ## Spec Review
 
-After writing the PROMPT.md, call \`review_spec()\` to get an independent quality 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 \`review_spec()\` again. Repeat until approved.
+- **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 \`review_spec()\` after writing the PROMPT.md. Do not finish without getting an APPROVE verdict.
+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 \`review_spec()\` for review.
+Write the PROMPT.md directly using the write tool, then call \`fn_review_spec()\` for review.
 
 ## Frontend UX Criteria Injection
 
@@ -51702,9 +52180,10 @@ Only inject this section when the task genuinely touches frontend UI. Omit it fo
           this.wasEnginePaused = false;
           const allTasks = await this.store.listTasks({ slim: true, includeArchived: false });
           const now = Date.now();
-          const triageTasks = allTasks.filter(
+          const eligibleTriageTasks = allTasks.filter(
             (t) => t.column === "triage" && !this.processing.has(t.id) && !t.paused && t.status !== "awaiting-approval" && t.status !== "failed" && t.status !== "stuck-killed" && !(t.nextRecoveryAt && new Date(t.nextRecoveryAt).getTime() > now)
           );
+          const triageTasks = sortTasksByPriorityThenAgeAndId(eligibleTriageTasks);
           const maxTriageConcurrent = settings.maxTriageConcurrent ?? settings.maxConcurrent ?? 2;
           const specifying = allTasks.filter(
             (t) => t.column === "triage" && t.status === "specifying" && !t.paused
@@ -51730,11 +52209,11 @@ Only inject this section when the task genuinely touches frontend UI. Omit it fo
       /**
        * Specify a triage task by spawning an AI agent to generate a PROMPT.md.
        *
-       * After the agent writes the PROMPT.md, it calls `review_spec()` to spawn
+       * After the agent writes the PROMPT.md, it calls `fn_review_spec()` to spawn
        * an independent reviewer agent that evaluates the specification quality.
        * The review loop works as follows:
        * - **APPROVE**: the spec is accepted and the task moves to `todo`
-       * - **REVISE**: the agent revises the spec and calls `review_spec()` again.
+       * - **REVISE**: the agent revises the spec and calls `fn_review_spec()` again.
        *   If the agent finishes without getting APPROVE, the task is NOT moved to
        *   `todo` — a post-session gate requires an explicit APPROVE verdict.
        * - **RETHINK**: the conversation rewinds to a pre-specification checkpoint
@@ -51938,7 +52417,7 @@ Only inject this section when the task genuinely touches frontend UI. Omit it fo
               const planningFallbackModelId = settings.planningFallbackModelId;
               const canRetryWithPlanningFallback = specReviewVerdictRef.current !== "APPROVE" && planningFallbackProvider && planningFallbackModelId && modelDesc !== `${planningFallbackProvider}/${planningFallbackModelId}`;
               if (canRetryWithPlanningFallback) {
-                const verdictDesc = specReviewVerdictRef.current === null ? "review_spec was never called" : `verdict was ${specReviewVerdictRef.current}`;
+                const verdictDesc = specReviewVerdictRef.current === null ? "fn_review_spec was never called" : `verdict was ${specReviewVerdictRef.current}`;
                 const fallbackDesc = `${planningFallbackProvider}/${planningFallbackModelId}`;
                 triageLog.warn(
                   `${task.id} primary planning model produced no approved spec (${verdictDesc}) \u2014 retrying with fallback ${fallbackDesc}`
@@ -52001,7 +52480,7 @@ Only inject this section when the task genuinely touches frontend UI. Omit it fo
                 }
               }
               if (specReviewVerdictRef.current !== "APPROVE") {
-                const verdictDesc = specReviewVerdictRef.current === null ? "review_spec was never called" : `verdict was ${specReviewVerdictRef.current}`;
+                const verdictDesc = specReviewVerdictRef.current === null ? "fn_review_spec was never called" : `verdict was ${specReviewVerdictRef.current}`;
                 const decision = computeRecoveryDecision({
                   recoveryRetryCount: task.recoveryRetryCount,
                   nextRecoveryAt: task.nextRecoveryAt
@@ -52086,7 +52565,7 @@ Only inject this section when the task genuinely touches frontend UI. Omit it fo
             await retryableWork();
           }
         } catch (err) {
-          const errorMessage = err instanceof Error ? err.message : String(err);
+          const { message: errorMessage, detail: errorDetail, stack: errorStack } = formatError(err);
           if (err.code === "ENOENT") {
             triageLog.log(`${task.id} no longer exists \u2014 skipping`);
           } else if (this.pauseAborted.has(task.id)) {
@@ -52159,7 +52638,13 @@ Only inject this section when the task genuinely touches frontend UI. Omit it fo
               const msg = restoreErr instanceof Error ? restoreErr.message : String(restoreErr);
               triageLog.warn(`${task.id}: failed to restore status to '${restoreStatus}' after specification error: ${msg}`);
             });
-            triageLog.error(`\u2717 ${task.id} specification failed:`, errorMessage);
+            triageLog.error(`\u2717 ${task.id} specification failed:`, errorDetail);
+            if (errorStack) {
+              await this.store.logEntry(task.id, `Specification failed: ${errorMessage}`, errorStack).catch((logErr) => {
+                const msg = logErr instanceof Error ? logErr.message : String(logErr);
+                triageLog.warn(`${task.id}: failed to persist specification-failure stack trace: ${msg}`);
+              });
+            }
             this.options.onSpecifyError?.(task, err instanceof Error ? err : new Error(errorMessage));
           }
         } finally {
@@ -52180,7 +52665,7 @@ Only inject this section when the task genuinely touches frontend UI. Omit it fo
           )
         });
         const taskList = {
-          name: "task_list",
+          name: "fn_task_list",
           label: "List Tasks",
           description: "List all tasks that aren't done. Returns ID, description, column, and dependencies for each. Use to check for duplicates before specifying.",
           parameters: Type2.Object({}),
@@ -52205,7 +52690,7 @@ Only inject this section when the task genuinely touches frontend UI. Omit it fo
           }
         };
         const taskGet = {
-          name: "task_get",
+          name: "fn_task_get",
           label: "Get Task",
           description: "Get full details of a specific task including its PROMPT.md content. Use to verify duplicates and to read dependency task specs before writing a new PROMPT.md.",
           parameters: taskGetParams,
@@ -52227,7 +52712,7 @@ Only inject this section when the task genuinely touches frontend UI. Omit it fo
               };
             } catch (err) {
               const msg = err instanceof Error ? err.message : String(err);
-              triageLog.warn(`${options.parentTaskId}: task_get lookup failed for ${params.id}: ${msg}`);
+              triageLog.warn(`${options.parentTaskId}: fn_task_get lookup failed for ${params.id}: ${msg}`);
               return {
                 content: [
                   { type: "text", text: `Task ${params.id} not found.` }
@@ -52238,7 +52723,7 @@ Only inject this section when the task genuinely touches frontend UI. Omit it fo
           }
         };
         const taskCreate = {
-          name: "task_create",
+          name: "fn_task_create",
           label: "Create Child Task",
           description: "Create a child task (subtask) while breaking a larger task into smaller pieces. Use this when the work can be split into 2-5 independently executable tasks, either because the user requested subtask breakdown or because the task is oversized (8+ steps, 3+ packages, multiple independent deliverables). The created task will be a child of the current task being triaged. IMPORTANT: `dependencies` may ONLY reference other subtasks you have created in this same triage session. Never depend on the parent task \u2014 the parent is deleted after splitting, and stale dependency ids permanently block the dependent.",
           parameters: taskCreateParams3,
@@ -52276,10 +52761,10 @@ Only inject this section when the task genuinely touches frontend UI. Omit it fo
                   content: [
                     {
                       type: "text",
-                      text: `ERROR: task_create rejected. Invalid dependencies:
+                      text: `ERROR: fn_task_create rejected. Invalid dependencies:
 ${summary}
 
-Remove or replace these ids and call task_create again.`
+Remove or replace these ids and call fn_task_create again.`
                     }
                   ],
                   details: { rejectedDependencies: rejected }
@@ -52290,7 +52775,7 @@ Remove or replace these ids and call task_create again.`
                 parentTask = await store.getTask(options.parentTaskId);
               } catch (err) {
                 const msg = err instanceof Error ? err.message : String(err);
-                triageLog.warn(`${options.parentTaskId}: failed to load parent task for task_create inheritance: ${msg}`);
+                triageLog.warn(`${options.parentTaskId}: failed to load parent task for fn_task_create inheritance: ${msg}`);
                 parentTask = void 0;
               }
               const newTask = await store.createTask({
@@ -52331,13 +52816,13 @@ Remove or replace these ids and call task_create again.`
         return [taskList, taskGet, taskCreate];
       }
       /**
-       * Create the `review_spec` tool for the triage agent.
+       * Create the `fn_review_spec` tool for the triage agent.
        *
        * Spawns an independent reviewer agent to evaluate the generated PROMPT.md.
        * Verdict handling:
        * - **APPROVE**: returns "APPROVE" — the triage agent's work is done.
        * - **REVISE**: returns the review feedback. The triage agent must fix the
-       *   PROMPT.md and call `review_spec` again. A post-session gate in
+       *   PROMPT.md and call `fn_review_spec` again. A post-session gate in
        *   `specifyTask()` prevents moving to `todo` if the last verdict is REVISE.
        * - **RETHINK**: rewinds the conversation to a pre-specification checkpoint
        *   using `session.navigateTree()`. Returns a re-prompt instructing the agent
@@ -52348,7 +52833,7 @@ Remove or replace these ids and call task_create again.`
         const rootDir = this.rootDir;
         const options = this.options;
         return {
-          name: "review_spec",
+          name: "fn_review_spec",
           label: "Review Specification",
           description: "Spawn a reviewer agent to evaluate the generated PROMPT.md specification. Returns APPROVE, REVISE, RETHINK, or UNAVAILABLE. Call after writing the PROMPT.md.",
           parameters: Type2.Object({}),
@@ -52366,7 +52851,7 @@ Remove or replace these ids and call task_create again.`
                 "utf-8"
               ).catch((err) => {
                 const msg = err instanceof Error ? err.message : String(err);
-                triageLog.warn(`${taskId}: failed to read PROMPT.md for review_spec (${promptPath}): ${msg}`);
+                triageLog.warn(`${taskId}: failed to read PROMPT.md for fn_review_spec (${promptPath}): ${msg}`);
                 return "";
               });
               if (!promptContent) {
@@ -52374,7 +52859,7 @@ Remove or replace these ids and call task_create again.`
                   content: [
                     {
                       type: "text",
-                      text: "UNAVAILABLE \u2014 PROMPT.md file not found or empty. Write the specification first, then call review_spec."
+                      text: "UNAVAILABLE \u2014 PROMPT.md file not found or empty. Write the specification first, then call fn_review_spec."
                     }
                   ],
                   details: {}
@@ -52430,7 +52915,7 @@ Remove or replace these ids and call task_create again.`
                   text = "APPROVE";
                   break;
                 case "REVISE":
-                  text = `REVISE \u2014 fix the issues below, rewrite the PROMPT.md, and call review_spec() again.
+                  text = `REVISE \u2014 fix the issues below, rewrite the PROMPT.md, and call fn_review_spec() again.
 
 ${result.review}`;
                   break;
@@ -52854,6 +53339,11 @@ function inferDefaultTestCommand(rootDir, explicitTestCommand, explicitBuildComm
     };
   }
   if (existsSync21(join26(rootDir, "pnpm-lock.yaml"))) {
+    if (existsSync21(join26(rootDir, "pnpm-workspace.yaml"))) {
+      mergerLog.warn(
+        `Inferred test command "pnpm test" in a pnpm workspace (${rootDir}). This runs the full monorepo suite on every merge. Consider setting an explicit scoped testCommand in project settings, e.g. \`pnpm -r --filter "...[main]" test\`.`
+      );
+    }
     return {
       command: "pnpm test",
       testSource: "inferred",
@@ -52962,6 +53452,7 @@ async function runVerificationCommand(store, rootDir, taskId, command, type) {
     stderr: "",
     success: false
   };
+  const verificationStartedAt = Date.now();
   try {
     const { stdout, stderr } = await execAsync2(command, {
       cwd: rootDir,
@@ -52973,37 +53464,46 @@ async function runVerificationCommand(store, rootDir, taskId, command, type) {
     result.stderr = stderr?.toString?.() || "";
     result.exitCode = 0;
     result.success = true;
-    mergerLog.log(`${taskId}: ${type} command succeeded`);
-    await store.logEntry(taskId, `[verification] ${type} command succeeded (exit 0)`);
+    const verificationDurationMs = Date.now() - verificationStartedAt;
+    mergerLog.log(`${taskId}: ${type} command succeeded in ${verificationDurationMs}ms`);
+    await store.logEntry(taskId, `[timing] [verification] ${type} command succeeded (exit 0) in ${verificationDurationMs}ms`);
     return result;
   } catch (error) {
+    const verificationDurationMs = Date.now() - verificationStartedAt;
     result.stdout = error?.stdout?.toString?.() || "";
     result.stderr = error?.stderr?.toString?.() || "";
     result.exitCode = typeof error?.status === "number" ? error.status : typeof error?.code === "number" ? error.code : null;
     const maxBufferExceeded = error?.code === "ENOBUFS" || error?.code === "ERR_CHILD_PROCESS_STDIO_MAXBUFFER" || String(error?.message ?? "").includes("maxBuffer");
     result.success = maxBufferExceeded && result.exitCode === 0;
     if (result.success) {
-      mergerLog.log(`${taskId}: ${type} command succeeded (exit 0, output exceeded buffer)`);
+      mergerLog.log(`${taskId}: ${type} command succeeded (exit 0, output exceeded buffer) in ${verificationDurationMs}ms`);
       await store.logEntry(
         taskId,
-        `[verification] ${type} command succeeded (exit 0, output exceeded buffer)`
+        `[timing] [verification] ${type} command succeeded (exit 0, output exceeded buffer) in ${verificationDurationMs}ms`
       );
       return result;
     }
     const output = result.stderr || result.stdout || error?.message || "Unknown error";
     const summary = summarizeVerificationOutput(output, type);
-    mergerLog.error(`${taskId}: ${type} command failed (exit ${result.exitCode}); output captured in task log`);
+    mergerLog.error(`${taskId}: ${type} command failed (exit ${result.exitCode}) in ${verificationDurationMs}ms; output captured in task log`);
     await store.logEntry(
       taskId,
-      `[verification] ${type} command failed (exit ${result.exitCode}):
+      `[timing] [verification] ${type} command failed (exit ${result.exitCode}) after ${verificationDurationMs}ms:
 ${summary}`
     );
   }
   return result;
 }
-async function attemptInMergeVerificationFix(store, rootDir, taskId, failureContext, settings, options, _testCommand, _buildCommand) {
+async function attemptInMergeVerificationFix(store, rootDir, taskId, failureContext, settings, options, mergeRunContext, fixAttemptNumber, _testCommand, _buildCommand) {
   try {
     mergerLog.log(`${taskId}: spawning in-merge verification fix agent`);
+    const logger2 = new AgentLogger({
+      store,
+      taskId,
+      agent: "merger",
+      onAgentText: options.onAgentText,
+      onAgentTool: options.onAgentTool
+    });
     let skillContext = void 0;
     if (options.agentStore) {
       try {
@@ -53035,12 +53535,22 @@ A merge has been applied and the verification command failed. Your job is to fix
 6. If you cannot fix the issue, explain why`,
       tools: "coding",
       // Agent needs read/write file access
+      onText: logger2.onText,
+      onThinking: logger2.onThinking,
+      onToolStart: logger2.onToolStart,
+      onToolEnd: logger2.onToolEnd,
       defaultProvider: settings.defaultProvider,
       defaultModelId: settings.defaultModelId,
       defaultThinkingLevel: settings.defaultThinkingLevel,
       // Skill selection: use assigned agent skills if available, otherwise role fallback
       ...skillContext?.skillSelectionContext ? { skillSelection: skillContext.skillSelectionContext } : {}
     });
+    const runId = mergeRunContext?.runId;
+    const agentId = mergeRunContext?.agentId ?? "merger";
+    await store.logEntry(
+      taskId,
+      `In-merge verification fix agent started (model: ${describeModel(session)}, runId: ${runId ?? "unknown"}, agentId: ${agentId})`
+    );
     try {
       const fixPrompt = `Fix the failing ${failureContext.type} verification for task ${taskId}.
 
@@ -53065,6 +53575,10 @@ ${failureContext.output.slice(0, VERIFICATION_LOG_MAX_CHARS)}
           mergerLog.warn(`\u23F3 ${taskId} in-merge fix rate limited \u2014 retry ${attempt} in ${delaySec}s: ${error.message}`);
         }
       });
+      await store.logEntry(
+        taskId,
+        `Re-running deterministic merge verification (attempt ${fixAttemptNumber ?? "unknown"})`
+      );
       const reRunResult = await runVerificationCommand(
         store,
         rootDir,
@@ -53074,6 +53588,7 @@ ${failureContext.output.slice(0, VERIFICATION_LOG_MAX_CHARS)}
       );
       return reRunResult.success;
     } finally {
+      await logger2.flush();
       await session.dispose();
     }
   } catch (err) {
@@ -53365,7 +53880,7 @@ and the bash tool returned exit code 0.
 1. Run the build command (shown in the prompt context below)
 2. If the build succeeds (exit code 0), proceed with the commit
 3. If the build fails (non-zero exit code), DO NOT commit. Instead:
-   - Call the \`report_build_failure\` tool with the real error details
+   - Call the \`fn_report_build_failure\` tool with the real error details
    - Stop immediately and do not run \`git commit\`
    - Do not claim success in plain text
 
@@ -53404,7 +53919,7 @@ and the bash tool returned exit code 0.
 1. Run the build command (shown in the prompt context below)
 2. If the build succeeds (exit code 0), proceed with the commit
 3. If the build fails (non-zero exit code), DO NOT commit. Instead:
-   - Call the \`report_build_failure\` tool with the real error details
+   - Call the \`fn_report_build_failure\` tool with the real error details
    - Stop immediately and do not run \`git commit\`
    - Do not claim success in plain text
 
@@ -53947,6 +54462,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
           if (failedResult) {
             let fixSuccess = false;
             for (let fixAttempt = 1; fixAttempt <= maxFixRetries; fixAttempt++) {
+              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}`);
               fixSuccess = await attemptInMergeVerificationFix(
@@ -53961,16 +54477,19 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
                 },
                 settings,
                 options,
+                { runId: mergeRunId, agentId: engineRunContext.agentId },
+                fixAttempt,
                 effectiveTestCommand,
                 effectiveBuildCommand
               );
+              const fixAttemptDurationMs = Date.now() - fixAttemptStartedAt;
               if (fixSuccess) {
-                mergerLog.log(`${taskId}: in-merge verification fix succeeded on attempt ${fixAttempt}`);
-                await store.logEntry(taskId, `In-merge verification fix succeeded \u2014 verification now passes`);
+                mergerLog.log(`${taskId}: in-merge verification fix succeeded on attempt ${fixAttempt} in ${fixAttemptDurationMs}ms`);
+                await store.logEntry(taskId, `[timing] In-merge verification fix succeeded on attempt ${fixAttempt} in ${fixAttemptDurationMs}ms \u2014 verification now passes`);
                 break;
               }
-              mergerLog.warn(`${taskId}: in-merge verification fix attempt ${fixAttempt} \u2014 verification still fails`);
-              await store.logEntry(taskId, `In-merge verification fix attempt ${fixAttempt} \u2014 verification still fails`);
+              mergerLog.warn(`${taskId}: in-merge verification fix attempt ${fixAttempt} \u2014 verification still fails (${fixAttemptDurationMs}ms)`);
+              await store.logEntry(taskId, `[timing] In-merge verification fix attempt ${fixAttempt} \u2014 verification still fails (${fixAttemptDurationMs}ms)`);
             }
             if (fixSuccess) {
               const authorArg = getCommitAuthorArg(settings);
@@ -53991,6 +54510,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
           const fixType = effectiveBuildCommand ? "build" : "test";
           let fixSuccess = false;
           for (let fixAttempt = 1; fixAttempt <= maxFixRetries; fixAttempt++) {
+            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}`);
             fixSuccess = await attemptInMergeVerificationFix(
@@ -54005,14 +54525,18 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
               },
               settings,
               options,
+              { runId: mergeRunId, agentId: engineRunContext.agentId },
+              fixAttempt,
               effectiveTestCommand,
               effectiveBuildCommand
             );
+            const fixAttemptDurationMs = Date.now() - fixAttemptStartedAt;
             if (fixSuccess) {
-              mergerLog.log(`${taskId}: in-merge verification fix succeeded on attempt ${fixAttempt}`);
-              await store.logEntry(taskId, `In-merge verification fix succeeded`);
+              mergerLog.log(`${taskId}: in-merge verification fix succeeded on attempt ${fixAttempt} in ${fixAttemptDurationMs}ms`);
+              await store.logEntry(taskId, `[timing] In-merge verification fix succeeded on attempt ${fixAttempt} in ${fixAttemptDurationMs}ms`);
               break;
             }
+            await store.logEntry(taskId, `[timing] In-merge verification fix attempt ${fixAttempt} \u2014 verification still fails (${fixAttemptDurationMs}ms)`);
           }
           if (fixSuccess) {
             const authorArg = getCommitAuthorArg(settings);
@@ -54091,8 +54615,15 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
       deletions = deletionsMatch ? Number.parseInt(deletionsMatch[1], 10) : 0;
     } catch {
     }
+    const isEmptyCommit = filesChanged === 0;
+    const recordedSha = isEmptyCommit ? void 0 : commitSha;
+    if (isEmptyCommit) {
+      mergerLog.warn(
+        `${taskId}: local squash produced an empty commit (${commitSha?.slice(0, 8)}) \u2014 branch likely contained dupes of main. Skipping commitSha; recovery will backfill when real commit lands.`
+      );
+    }
     const mergeDetails = {
-      commitSha,
+      commitSha: recordedSha,
       filesChanged,
       insertions,
       deletions,
@@ -54105,7 +54636,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
       autoResolvedCount: result.autoResolvedCount
     };
     await store.updateTask(taskId, { mergeDetails });
-    mergerLog.log(`${taskId}: merge details stored (commitSha: ${commitSha?.slice(0, 8)})`);
+    mergerLog.log(`${taskId}: merge details stored (commitSha: ${recordedSha?.slice(0, 8) ?? "<deferred>"})`);
   } catch (err) {
     mergerLog.warn(`${taskId}: failed to collect/store merge details: ${err.message}`);
   }
@@ -54461,7 +54992,7 @@ async function runAiAgentForCommit(params) {
   let buildFailed = false;
   let buildErrorMessage = "";
   const reportBuildFailureTool = {
-    name: "report_build_failure",
+    name: "fn_report_build_failure",
     label: "Report Build Failure",
     description: "Report that the build verification failed. Use this when the build command returns a non-zero exit code. Provide the error details in the message parameter.",
     parameters: Type3.Object({
@@ -54678,7 +55209,7 @@ function buildMergePrompt(params) {
       "This command is mandatory before commit.",
       "Run it with the bash tool in the current worktree and inspect the actual exit code.",
       "Only proceed if it exits 0.",
-      "If it exits non-zero, call `report_build_failure` with the concrete error output and stop without committing."
+      "If it exits non-zero, call `fn_report_build_failure` with the concrete error output and stop without committing."
     );
   }
   if (buildCommand) {
@@ -54690,7 +55221,7 @@ function buildMergePrompt(params) {
       "This command is mandatory before commit.",
       "Run it with the bash tool in the current worktree and inspect the actual exit code.",
       "Only commit if it exits 0.",
-      "If it exits non-zero, call `report_build_failure` with the concrete error output and stop without committing."
+      "If it exits non-zero, call `fn_report_build_failure` with the concrete error output and stop without committing."
     );
   }
   return parts.join("\n");
@@ -55719,11 +56250,11 @@ function buildStepPrompt(taskDetail, stepIndex, rootDir, settings, worktreePath)
   if (isLastStep) {
     parts.push(
       "",
-      `**Document your deliverables:** When this task produces written output (documentation, specifications, reports, API references, README updates, guides, or any other content), save that content as a task document using \`task_document_write(key='...', content='...')\`. Use a key that describes the deliverable (e.g., key="readme", key="api-docs"). The document persists in the task for review even after the worktree is cleaned up.`,
+      `**Document your deliverables:** When this task produces written output (documentation, specifications, reports, API references, README updates, guides, or any other content), save that content as a task document using \`fn_task_document_write(key='...', content='...')\`. Use a key that describes the deliverable (e.g., key="readme", key="api-docs"). The document persists in the task for review even after the worktree is cleaned up.`,
       ""
     );
   }
-  parts.push("After completing this step, commit your changes and call task_done(). Do NOT proceed to subsequent steps.");
+  parts.push("After completing this step, commit your changes and call fn_task_done(). Do NOT proceed to subsequent steps.");
   return parts.join("\n");
 }
 function scopePromptToWorktree(prompt, rootDir, worktreePath) {
@@ -55778,7 +56309,7 @@ function buildReducedStepPrompt(taskDetail, stepIndex) {
     "IMPORTANT: Your previous attempt hit the context window limit.",
     "Do NOT repeat work that's already been done.",
     "Check git status and git log to see what's been committed.",
-    "Complete the remaining work and call task_done()."
+    "Complete the remaining work and call fn_task_done()."
   ];
   return parts.join("\n").replace(/\n{3,}/g, "\n\n");
 }
@@ -56578,10 +57109,10 @@ ${attachmentsSection}${commandsSection}${memorySection}${progressSection}${steer
 
 ${reviewLevel === 0 ? "No reviews required. Implement directly." : ""}
 ${reviewLevel >= 1 ? `Before implementing each step (except Step 0 and the final step), call:
-\`review_step(step=N, type="plan", step_name="...")\`` : ""}
+\`fn_review_step(step=N, type="plan", step_name="...")\`` : ""}
 ${reviewLevel >= 2 ? `After implementing + committing each step, call:
-\`review_step(step=N, type="code", step_name="...", baseline="<SHA from before step>")\`` : ""}
-${reviewLevel >= 3 ? `After tests, also call review_step with type="code" for test review.` : ""}
+\`fn_review_step(step=N, type="code", step_name="...", baseline="<SHA from before step>")\`` : ""}
+${reviewLevel >= 3 ? `After tests, also call fn_review_step with type="code" for test review.` : ""}
 
 ## Worktree Boundaries
 
@@ -56590,23 +57121,24 @@ You are running in an **isolated git worktree**. This means:
 - **All code changes must be made inside the current worktree directory.** Do not modify files outside the worktree.
 - **Exception \u2014 Project memory:** You MAY read and write to files under \`.fusion/memory/\` at the project root to save durable project learnings.
 - **Exception \u2014 Task attachments:** You MAY read files under \`.fusion/tasks/{taskId}/attachments/\` at the project root for context.
+- **Exception \u2014 Sibling task specs:** You MAY read \`.fusion/tasks/{taskId}/PROMPT.md\` and \`.fusion/tasks/{taskId}/task.json\` at the project root (read-only) to consult dependency tasks' specifications.
 - **Shell commands** run inside the worktree by default. Avoid using \`cd\` to navigate outside the worktree.
 
 ## Begin
 
 ${hasProgress ? `Resume from Step ${task.currentStep}. Do NOT redo completed steps.` : "Start with Step 0 (Preflight). Work through each step in order."}
-Use \`task_update\` to report progress on every step transition.
-Use \`task_log\` for important actions and decisions.
-Use \`task_create\` for truly separate follow-up work, not for fixes required to get tests, build, or typecheck back to green.
+Use \`fn_task_update\` to report progress on every step transition.
+Use \`fn_task_log\` for important actions and decisions.
+Use \`fn_task_create\` for truly separate follow-up work, not for fixes required to get tests, build, or typecheck back to green.
 Commit at step boundaries: \`git commit -m "feat(${task.id}): complete Step N \u2014 description"${authorArg}\`
-When all steps are complete: call \`task_done()\`
+When all steps are complete: call \`fn_task_done()\`
 
-If a build command is configured, run that exact command in this worktree before calling \`task_done()\`.
+If a build command is configured, run that exact command in this worktree before calling \`fn_task_done()\`.
 Treat a non-zero exit code as a blocking failure. Do not claim success without a real passing run.
 Run the configured/full test suite and fix failures even when that requires edits outside the original File Scope.
-If the repo has a lint command (e.g. \`pnpm lint\`, \`npm run lint\`), run it before \`task_done()\` and fix any failures it reports.
-If the repo has a typecheck command, run it before \`task_done()\` and fix any failures it reports.
-Use \`task_create\` for truly separate follow-up work, not for fixes required to get tests, build, or typecheck back to green.
+If the repo has a lint command (e.g. \`pnpm lint\`, \`npm run lint\`), run it before \`fn_task_done()\` and fix any failures it reports.
+If the repo has a typecheck command, run it before \`fn_task_done()\` and fix any failures it reports.
+Use \`fn_task_create\` for truly separate follow-up work, not for fixes required to get tests, build, or typecheck back to green.
 If lint is configured and failing, fix that too before completion.
 **CRITICAL: Resolve ALL test failures (and any lint/typecheck failures) before completing the task, even if they appear unrelated or pre-existing.** Unrelated failures left unfixed accumulate technical debt and block future integrations. Investigate and fix or suppress them \u2014 do not defer them to a separate task.`;
 }
@@ -56721,22 +57253,22 @@ You are working in a git worktree isolated from the main branch. Your job is to
 You have tools to report progress. The board updates in real-time.
 
 **Step lifecycle:**
-- Before starting a step: \`task_update(step=N, status="in-progress")\`
-- After completing a step: \`task_update(step=N, status="done")\`
-- If skipping a step: \`task_update(step=N, status="skipped")\`
+- Before starting a step: \`fn_task_update(step=N, status="in-progress")\`
+- After completing a step: \`fn_task_update(step=N, status="done")\`
+- If skipping a step: \`fn_task_update(step=N, status="skipped")\`
 
-**Logging important actions:** \`task_log(message="what happened")\`
+**Logging important actions:** \`fn_task_log(message="what happened")\`
 
-**Out-of-scope work found during execution:** \`task_create(description="what needs doing")\`
+**Out-of-scope work found during execution:** \`fn_task_create(description="what needs doing")\`
 When creating multiple related tasks, declare dependencies between them:
-\`task_create(description="load door sounds", dependencies=[])\` \u2192 returns KB-050
-\`task_create(description="play sound on door open/close", dependencies=["KB-050"])\`
+\`fn_task_create(description="load door sounds", dependencies=[])\` \u2192 returns KB-050
+\`fn_task_create(description="play sound on door open/close", dependencies=["KB-050"])\`
 
-**Discovered a dependency:** \`task_add_dep(task_id="KB-XXX")\` \u2014 use when you discover mid-execution that another task must be completed first. This will return a warning first \u2014 you must call again with \`confirm=true\` to proceed. Adding a dependency stops execution, discards current work, and moves the task to triage for re-specification.
+**Discovered a dependency:** \`fn_task_add_dep(task_id="KB-XXX")\` \u2014 use when you discover mid-execution that another task must be completed first. This will return a warning first \u2014 you must call again with \`confirm=true\` to proceed. Adding a dependency stops execution, discards current work, and moves the task to triage for re-specification.
 
-## Cross-model review via review_step tool
+## Cross-model review via fn_review_step tool
 
-You have a \`review_step\` tool. It spawns a SEPARATE reviewer agent (different
+You have a \`fn_review_step\` tool. It spawns a SEPARATE reviewer agent (different
 model, read-only access) to independently assess your work.
 
 **When to call it** \u2014 based on the Review Level in the PROMPT.md:
@@ -56744,8 +57276,8 @@ model, read-only access) to independently assess your work.
 | Review Level | Before implementing | After implementing + committing |
 |-------------|--------------------|---------------------------------|
 | 0 (None)    | \u2014                  | \u2014                               |
-| 1 (Plan)    | \`review_step(step, "plan", step_name)\` | \u2014              |
-| 2 (Plan+Code) | \`review_step(step, "plan", step_name)\` | \`review_step(step, "code", step_name, baseline)\` |
+| 1 (Plan)    | \`fn_review_step(step, "plan", step_name)\` | \u2014              |
+| 2 (Plan+Code) | \`fn_review_step(step, "plan", step_name)\` | \`fn_review_step(step, "code", step_name, baseline)\` |
 | 3 (Full)    | plan review        | code review + test review       |
 
 **Skip reviews for** Step 0 (Preflight) and the final documentation/delivery step.
@@ -56754,13 +57286,13 @@ model, read-only access) to independently assess your work.
 1. Before starting a step, capture baseline: \`git rev-parse HEAD\`
 2. Implement the step
 3. Commit
-4. Call \`review_step\` with the baseline SHA so the reviewer sees only your changes
+4. Call \`fn_review_step\` with the baseline SHA so the reviewer sees only your changes
 
 **Handling verdicts:**
 - **APPROVE** \u2192 proceed to next step
 - **REVISE (code review)** \u2192 **enforced**. You MUST fix the issues, commit again,
-  and re-run \`review_step(type="code")\` before the step can be marked done.
-  \`task_update(status="done")\` will be rejected until the code review passes.
+  and re-run \`fn_review_step(type="code")\` before the step can be marked done.
+  \`fn_task_update(status="done")\` will be rejected until the code review passes.
 - **REVISE (plan review)** \u2192 advisory. Incorporate the feedback at your discretion
   and proceed with implementation. No re-review is required.
 - **RETHINK (code review)** \u2192 your code changes have been reverted and conversation rewound. Read the feedback carefully and take a fundamentally different approach. Do NOT repeat the rejected strategy.
@@ -56770,13 +57302,13 @@ model, read-only access) to independently assess your work.
 
 You can save and retrieve named documents for this task. Use these to store planning notes, research findings, or any persistent data that should survive across sessions.
 
-- **Save a document:** \`task_document_write(key="plan", content="...")\`
-- **Read a document:** \`task_document_read(key="plan")\`
-- **List all documents:** \`task_document_read()\` (no key)
+- **Save a document:** \`fn_task_document_write(key="plan", content="...")\`
+- **Read a document:** \`fn_task_document_read(key="plan")\`
+- **List all documents:** \`fn_task_document_read()\` (no key)
 
 Documents are versioned \u2014 each write creates a new revision. Use meaningful keys like "plan", "notes", "research", "architecture".
 
-**IMPORTANT \u2014 Save your deliverables as documents:** When your task produces written output (documentation, specifications, reports, API references, README updates, guides, or any other content), you MUST save that content as a task document using \`task_document_write\`. Use a key that describes the deliverable (e.g., key="readme", key="api-docs", key="changelog"). Do this in addition to writing the file to disk \u2014 the document persists in the task for review even after the worktree is cleaned up.
+**IMPORTANT \u2014 Save your deliverables as documents:** When your task produces written output (documentation, specifications, reports, API references, README updates, guides, or any other content), you MUST save that content as a task document using \`fn_task_document_write\`. Use a key that describes the deliverable (e.g., key="readme", key="api-docs", key="changelog"). Do this in addition to writing the file to disk \u2014 the document persists in the task for review even after the worktree is cleaned up.
 
 If the task's PROMPT.md includes a "Documentation Requirements" section listing files to update, save each updated file's final content as a task document with a matching key.
 
@@ -56792,6 +57324,7 @@ You are running in an **isolated git worktree**. This means:
 - **All code changes must be made inside the current worktree directory.** Do not modify files outside the worktree \u2014 the worktree is your isolated execution environment.
 - **Exception \u2014 Project memory:** You MAY read and write to files under .fusion/memory/ at the project root to save durable project learnings (architecture patterns, conventions, pitfalls).
 - **Exception \u2014 Task attachments:** You MAY read files under .fusion/tasks/{taskId}/attachments/ at the project root for context screenshots and documents attached to this task.
+- **Exception \u2014 Sibling task specs:** You MAY read .fusion/tasks/{taskId}/PROMPT.md and .fusion/tasks/{taskId}/task.json at the project root (read-only) to consult dependency tasks' specifications.
 - **Shell commands** run inside the worktree by default. Avoid using cd to navigate outside the worktree.
 
 If you attempt to write to a path outside the worktree, the file tools will reject the operation with an error explaining the boundary.
@@ -56802,7 +57335,7 @@ If you attempt to write to a path outside the worktree, the file tools will reje
 - Read "Context to Read First" files before starting
 - Follow the "Do NOT" section strictly
 - If tests, lint, build, or typecheck fail and the fix requires touching code outside the declared File Scope, fix those failures directly and keep the repo green
-- Use \`task_create\` for genuinely separate follow-up work, not for mandatory fixes required to make this task land cleanly
+- Use \`fn_task_create\` for genuinely separate follow-up work, not for mandatory fixes required to make this task land cleanly
 - Update documentation listed in "Must Update" and check "Check If Affected"
 - NEVER delete, remove, or gut modules, interfaces, settings, exports, or test files outside your File Scope
 - NEVER remove features as "cleanup" \u2014 if something seems unused, create a task for investigation instead
@@ -56813,14 +57346,14 @@ If you attempt to write to a path outside the worktree, the file tools will reje
 
 You can spawn child agents to handle parallel work or specialized sub-tasks:
 
-**When to use \`spawn_agent\`:**
+**When to use \`fn_spawn_agent\`:**
 - Parallel work that can be divided into independent chunks
 - Specialized tasks requiring different expertise or tools
 - Delegation of sub-tasks to specialized agents
 
 **How to spawn:**
 \`\`\`javascript
-spawn_agent({
+fn_spawn_agent({
   name: "researcher",
   role: "engineer",
   task: "Research best practices for authentication in React applications"
@@ -56830,7 +57363,7 @@ spawn_agent({
 **Child agent behavior:**
 - Each child runs in its own git worktree (branched from your worktree)
 - Children execute autonomously and report completion
-- When you end (task_done), all spawned children are terminated
+- When you end (fn_task_done), all spawned children are terminated
 - Check AgentStore for spawned agent status
 
 **Limits:**
@@ -56840,13 +57373,13 @@ spawn_agent({
 ## Completion
 After all steps are done, lint passes, tests pass, typecheck passes, and docs are updated:
 \`\`\`bash
-Call \`task_done()\` to signal completion.
+Call \`fn_task_done()\` to signal completion.
 \`\`\`
 
 If a project build command is listed in the prompt, it is a hard completion gate:
-- Run the exact build command in the current worktree before \`task_done()\`
+- Run the exact build command in the current worktree before \`fn_task_done()\`
 - Do not claim the build passes unless you actually ran it and got exit code 0
-- If the build fails, do NOT call \`task_done()\`; keep working until it passes
+- If the build fails, do NOT call \`fn_task_done()\`; keep working until it passes
 
 Lint, tests, and typecheck are also hard quality gates:
 - Keep fixing failures until lint, the configured/full test suite, and typecheck all pass
@@ -57104,15 +57637,15 @@ Lint, tests, and typecheck are also hard quality gates:
       }
       /**
        * Check whether a task's work is complete — all steps are done or skipped.
-       * Used to detect tasks that called task_done() but never transitioned to in-review
-       * (e.g., killed by stuck detector after task_done but before moveTask).
+       * Used to detect tasks that called fn_task_done() but never transitioned to in-review
+       * (e.g., killed by stuck detector after fn_task_done but before moveTask).
        */
       isTaskWorkComplete(task) {
         if (task.steps.length === 0) return false;
         return task.steps.every((s) => s.status === "done" || s.status === "skipped");
       }
       isNoProgressNoTaskDoneFailure(task) {
-        return task.status === "failed" && task.error?.includes("without calling task_done") === true && task.steps.every((step) => step.status === "pending");
+        return task.status === "failed" && task.error?.includes("without calling fn_task_done") === true && task.steps.every((step) => step.status === "pending");
       }
       async clearResumeFailureState(task) {
         const updates = {};
@@ -57288,7 +57821,7 @@ Lint, tests, and typecheck are also hard quality gates:
             continue;
           }
           if (this.isNoProgressNoTaskDoneFailure(task)) {
-            executorLog.log(`${task.id} failed without task_done and has no step progress \u2014 leaving for self-healing requeue`);
+            executorLog.log(`${task.id} failed without fn_task_done and has no step progress \u2014 leaving for self-healing requeue`);
             continue;
           }
           executorLog.log(`Resuming ${task.id}: ${task.title || task.description.slice(0, 60)}`);
@@ -57513,13 +58046,15 @@ Lint, tests, and typecheck are also hard quality gates:
                 await this.store.logEntry(task.id, `Worktree created at ${worktreePath}`, void 0, this.currentRunContext);
               }
               if (settings.worktreeInitCommand) {
+                const initStartedAt = Date.now();
                 try {
                   const initResult = await runConfiguredCommand(settings.worktreeInitCommand, worktreePath, 3e5);
                   if (initResult.spawnError || initResult.timedOut || initResult.exitCode !== 0) {
                     throw new Error(configuredCommandErrorMessage(initResult));
                   }
-                  await this.store.logEntry(task.id, "Worktree init command completed", settings.worktreeInitCommand, this.currentRunContext);
+                  await this.store.logEntry(task.id, `[timing] Worktree init command completed in ${Date.now() - initStartedAt}ms`, settings.worktreeInitCommand, this.currentRunContext);
                 } catch (err) {
+                  await this.store.logEntry(task.id, `[timing] Worktree init command failed after ${Date.now() - initStartedAt}ms`, void 0, this.currentRunContext);
                   const execError = err instanceof Error ? err : new Error(String(err));
                   const message = "stderr" in execError && typeof execError.stderr === "string" ? String(execError.stderr) : execError.message;
                   executorLog.error(`${task.id}: worktree init command failed \u2014 first test run will likely fail: ${message}`);
@@ -57534,12 +58069,13 @@ Lint, tests, and typecheck are also hard quality gates:
               if (settings.setupScript) {
                 const scriptCommand = settings.scripts?.[settings.setupScript];
                 if (scriptCommand) {
+                  const setupStartedAt = Date.now();
                   try {
                     const setupResult = await runConfiguredCommand(scriptCommand, worktreePath, 12e4);
                     if (setupResult.spawnError || setupResult.timedOut || setupResult.exitCode !== 0) {
                       throw new Error(configuredCommandErrorMessage(setupResult));
                     }
-                    await this.store.logEntry(task.id, `Setup script '${settings.setupScript}' completed`, scriptCommand, this.currentRunContext);
+                    await this.store.logEntry(task.id, `[timing] Setup script '${settings.setupScript}' completed in ${Date.now() - setupStartedAt}ms`, scriptCommand, this.currentRunContext);
                   } catch (err) {
                     const execError = err instanceof Error ? err : new Error(String(err));
                     const message = "stderr" in execError && typeof execError.stderr === "string" ? String(execError.stderr) : execError.message;
@@ -57705,7 +58241,7 @@ Lint, tests, and typecheck are also hard quality gates:
                 await retryableStepWork();
               }
             } catch (err) {
-              const errorMessage = err instanceof Error ? err.message : String(err);
+              const { message: errorMessage, detail: errorDetail, stack: errorStack } = formatError(err);
               if (this.depAborted.has(task.id)) {
                 this.depAborted.delete(task.id);
                 await this.handleDepAbortCleanup(task.id, worktreePath);
@@ -57749,7 +58285,10 @@ Lint, tests, and typecheck are also hard quality gates:
                   stuckRequeue = null;
                   return;
                 }
-                executorLog.error(`\u2717 ${task.id} transient error retries exhausted: ${errorMessage}`);
+                executorLog.error(`\u2717 ${task.id} transient error retries exhausted: ${errorDetail}`);
+                if (errorStack) {
+                  await this.store.logEntry(task.id, `Transient error retries exhausted: ${errorMessage}`, errorStack, this.currentRunContext);
+                }
                 await this.store.updateTask(task.id, {
                   status: "failed",
                   error: errorMessage,
@@ -57760,8 +58299,8 @@ Lint, tests, and typecheck are also hard quality gates:
                 executorLog.log(`\u2717 ${task.id} transient retries exhausted \u2192 in-review`);
                 this.options.onError?.(task, err instanceof Error ? err : new Error(errorMessage));
               } else {
-                executorLog.error(`\u2717 ${task.id} step-session execution failed:`, errorMessage);
-                await this.store.logEntry(task.id, `Step-session execution failed: ${errorMessage}`, void 0, this.currentRunContext);
+                executorLog.error(`\u2717 ${task.id} step-session execution failed:`, errorDetail);
+                await this.store.logEntry(task.id, `Step-session execution failed: ${errorMessage}`, errorStack ?? errorDetail, this.currentRunContext);
                 await this.store.updateTask(task.id, { status: "failed", error: errorMessage });
                 await this.store.moveTask(task.id, "in-review");
                 executorLog.log(`\u2717 ${task.id} step-session execution failed \u2192 in-review`);
@@ -57811,7 +58350,7 @@ Lint, tests, and typecheck are also hard quality gates:
           const reflectionTools = this.options.reflectionService && settings.reflectionEnabled && assignedAgentId ? [createReflectOnPerformanceTool(this.options.reflectionService, assignedAgentId)] : [];
           const assignedAgent = assignedAgentId && this.options.agentStore ? await this.options.agentStore.getAgent(assignedAgentId).catch(() => null) : null;
           if (executionMode === "fast") {
-            executorLog.log(`${task.id}: fast mode \u2014 review_step tool not injected`);
+            executorLog.log(`${task.id}: fast mode \u2014 fn_review_step tool not injected`);
           }
           const customTools = [
             this.createTaskUpdateTool(task.id, codeReviewVerdicts, sessionRef, stepCheckpoints, stuckDetector),
@@ -57821,7 +58360,7 @@ Lint, tests, and typecheck are also hard quality gates:
             this.createTaskDoneTool(task.id, () => {
               taskDone = true;
             }),
-            // Skip review_step tool in fast mode — fast mode bypasses automated review gates
+            // Skip fn_review_step tool in fast mode — fast mode bypasses automated review gates
             ...executionMode !== "fast" ? [
               this.createReviewStepTool(task.id, worktreePath, detail.prompt, codeReviewVerdicts, sessionRef, stepCheckpoints, detail, stuckDetector)
             ] : [],
@@ -57978,7 +58517,7 @@ Lint, tests, and typecheck are also hard quality gates:
                   "3. Review the PROMPT.md steps to see which are still pending",
                   "",
                   "Take a DIFFERENT approach from what you were doing before.",
-                  "If the current step is complete, call task_update to mark it done and move to the next step.",
+                  "If the current step is complete, call fn_task_update to mark it done and move to the next step.",
                   "If you're stuck on a problem, try a simpler or alternative solution.",
                   "",
                   "Continue the task from where you left off."
@@ -58016,8 +58555,8 @@ Lint, tests, and typecheck are also hard quality gates:
                 const implicitCheck = await this.store.getTask(task.id);
                 if (implicitCheck.steps.length > 0 && implicitCheck.steps.every((s) => s.status === "done" || s.status === "skipped")) {
                   taskDone = true;
-                  executorLog.log(`${task.id} all steps done \u2014 treating as implicit task_done`);
-                  await this.store.logEntry(task.id, "All steps complete \u2014 implicit task_done (agent did not call tool explicitly)", void 0, this.currentRunContext);
+                  executorLog.log(`${task.id} all steps done \u2014 treating as implicit fn_task_done`);
+                  await this.store.logEntry(task.id, "All steps complete \u2014 implicit fn_task_done (agent did not call tool explicitly)", void 0, this.currentRunContext);
                 }
               }
               if (taskDone) {
@@ -58054,11 +58593,11 @@ Lint, tests, and typecheck are also hard quality gates:
                 while (!taskDone && taskDoneSessionRetries < MAX_TASK_DONE_SESSION_RETRIES) {
                   taskDoneSessionRetries++;
                   executorLog.log(
-                    `\u26A0 ${task.id} finished without task_done \u2014 retrying with new session (${taskDoneSessionRetries}/${MAX_TASK_DONE_SESSION_RETRIES})`
+                    `\u26A0 ${task.id} finished without fn_task_done \u2014 retrying with new session (${taskDoneSessionRetries}/${MAX_TASK_DONE_SESSION_RETRIES})`
                   );
                   await this.store.logEntry(
                     task.id,
-                    `Agent finished without calling task_done \u2014 retrying with new session (${taskDoneSessionRetries}/${MAX_TASK_DONE_SESSION_RETRIES})`,
+                    `Agent finished without calling fn_task_done \u2014 retrying with new session (${taskDoneSessionRetries}/${MAX_TASK_DONE_SESSION_RETRIES})`,
                     void 0,
                     this.currentRunContext
                   );
@@ -58100,10 +58639,10 @@ Lint, tests, and typecheck are also hard quality gates:
                   });
                   stuckDetector?.trackTask(task.id, retrySession);
                   const retryPrompt = [
-                    "Your previous session ended without calling the task_done tool.",
+                    "Your previous session ended without calling the fn_task_done tool.",
                     "The task may already be complete \u2014 review the current state of the worktree and either:",
-                    "1. If the work is done, call task_done with a summary of what was accomplished.",
-                    "2. If there is remaining work, finish it and then call task_done.",
+                    "1. If the work is done, call fn_task_done with a summary of what was accomplished.",
+                    "2. If there is remaining work, finish it and then call fn_task_done.",
                     "",
                     "Original task:",
                     buildExecutionPrompt(detail, this.rootDir, settings, worktreePath)
@@ -58115,8 +58654,8 @@ Lint, tests, and typecheck are also hard quality gates:
                     const implicitCheck = await this.store.getTask(task.id);
                     if (implicitCheck.steps.length > 0 && implicitCheck.steps.every((s) => s.status === "done" || s.status === "skipped")) {
                       taskDone = true;
-                      executorLog.log(`${task.id} all steps done \u2014 treating as implicit task_done`);
-                      await this.store.logEntry(task.id, "All steps complete \u2014 implicit task_done (agent did not call tool explicitly)", void 0, this.currentRunContext);
+                      executorLog.log(`${task.id} all steps done \u2014 treating as implicit fn_task_done`);
+                      await this.store.logEntry(task.id, "All steps complete \u2014 implicit fn_task_done (agent did not call tool explicitly)", void 0, this.currentRunContext);
                     }
                   }
                 }
@@ -58148,7 +58687,7 @@ Lint, tests, and typecheck are also hard quality gates:
                 } else {
                   const priorRequeues = task.taskDoneRetryCount ?? 0;
                   const nextRequeueCount = priorRequeues + 1;
-                  const errorMessage = `Agent finished without calling task_done (after ${MAX_TASK_DONE_SESSION_RETRIES} retries)`;
+                  const errorMessage = `Agent finished without calling fn_task_done (after ${MAX_TASK_DONE_SESSION_RETRIES} retries)`;
                   if (priorRequeues < MAX_TASK_DONE_REQUEUE_RETRIES) {
                     await this.store.updateTask(task.id, {
                       status: "failed",
@@ -58167,7 +58706,7 @@ Lint, tests, and typecheck are also hard quality gates:
                     await this.store.updateTask(task.id, { status: "failed", error: errorMessage });
                     await this.store.logEntry(task.id, `${errorMessage} \u2014 moved to in-review for inspection`, void 0, this.currentRunContext);
                     await this.store.moveTask(task.id, "in-review");
-                    executorLog.log(`\u2717 ${task.id} failed after ${MAX_TASK_DONE_SESSION_RETRIES} retries \u2014 no task_done \u2192 in-review`);
+                    executorLog.log(`\u2717 ${task.id} failed after ${MAX_TASK_DONE_SESSION_RETRIES} retries \u2014 no fn_task_done \u2192 in-review`);
                   }
                   this.options.onError?.(task, new Error(errorMessage));
                 }
@@ -58203,7 +58742,7 @@ Lint, tests, and typecheck are also hard quality gates:
             await retryableWork();
           }
         } catch (err) {
-          const errorMessage = err instanceof Error ? err.message : String(err);
+          const { message: errorMessage, detail: errorDetail, stack: errorStack } = formatError(err);
           if (this.depAborted.has(task.id)) {
             this.depAborted.delete(task.id);
             await this.handleDepAbortCleanup(task.id, worktreePath);
@@ -58271,7 +58810,7 @@ Lint, tests, and typecheck are also hard quality gates:
                     "2. Identify the most critical remaining work",
                     "3. Complete it with a simpler, more focused approach",
                     "",
-                    "Do not repeat what's already been done. Just complete the task and call task_done."
+                    "Do not repeat what's already been done. Just complete the task and call fn_task_done."
                   ].join("\n");
                   await promptWithFallback(activeEntry.session, reducedPrompt);
                   checkSessionError(activeEntry.session);
@@ -58346,8 +58885,8 @@ Lint, tests, and typecheck are also hard quality gates:
                 await this.store.moveTask(task.id, "todo");
                 return;
               }
-              executorLog.error(`\u2717 ${task.id} transient error retries exhausted (${MAX_RECOVERY_RETRIES} attempts): ${errorMessage}`);
-              await this.store.logEntry(task.id, `Transient error retries exhausted after ${MAX_RECOVERY_RETRIES} attempts: ${errorMessage}`, void 0, this.currentRunContext);
+              executorLog.error(`\u2717 ${task.id} transient error retries exhausted (${MAX_RECOVERY_RETRIES} attempts): ${errorDetail}`);
+              await this.store.logEntry(task.id, `Transient error retries exhausted after ${MAX_RECOVERY_RETRIES} attempts: ${errorMessage}`, errorStack ?? errorDetail, this.currentRunContext);
               await this.store.updateTask(task.id, {
                 status: "failed",
                 error: errorMessage,
@@ -58359,8 +58898,8 @@ Lint, tests, and typecheck are also hard quality gates:
               this.options.onError?.(task, err instanceof Error ? err : new Error(errorMessage));
               return;
             }
-            executorLog.error(`\u2717 ${task.id} execution failed:`, errorMessage);
-            await this.store.logEntry(task.id, `Execution failed: ${errorMessage}`, void 0, this.currentRunContext);
+            executorLog.error(`\u2717 ${task.id} execution failed:`, errorDetail);
+            await this.store.logEntry(task.id, `Execution failed: ${errorMessage}`, errorStack ?? errorDetail, this.currentRunContext);
             await this.store.updateTask(task.id, { status: "failed", error: errorMessage });
             await this.store.moveTask(task.id, "in-review");
             executorLog.log(`\u2717 ${task.id} execution failed \u2192 in-review`);
@@ -58408,7 +58947,7 @@ Lint, tests, and typecheck are also hard quality gates:
       createTaskUpdateTool(taskId, codeReviewVerdicts, sessionRef, stepCheckpoints, stuckDetector) {
         const store = this.store;
         return {
-          name: "task_update",
+          name: "fn_task_update",
           label: "Update Step",
           description: "Update a step's status. Call before starting a step (in-progress), after completing it (done), or to skip it (skipped). The board updates in real-time.",
           parameters: taskUpdateParams,
@@ -58421,7 +58960,7 @@ Lint, tests, and typecheck are also hard quality gates:
               return {
                 content: [{
                   type: "text",
-                  text: `Cannot mark Step ${step} as done \u2014 the last code review returned REVISE. Fix the issues from the code review, commit your changes, and call review_step(step=${step}, type="code") again. The step can only advance after the code review passes.`
+                  text: `Cannot mark Step ${step} as done \u2014 the last code review returned REVISE. Fix the issues from the code review, commit your changes, and call fn_review_step(step=${step}, type="code") again. The step can only advance after the code review passes.`
                 }],
                 details: {}
               };
@@ -58460,7 +58999,7 @@ Lint, tests, and typecheck are also hard quality gates:
       createTaskAddDepTool(taskId) {
         const store = this.store;
         return {
-          name: "task_add_dep",
+          name: "fn_task_add_dep",
           label: "Add Dependency",
           description: "Declare a dependency on an existing task. Use when you discover mid-execution that another task must be completed first. Adding a dependency to an in-progress task will stop execution and discard current work, so confirm=true is required. Without confirm=true, a warning is returned first.",
           parameters: taskAddDepParams,
@@ -58530,7 +59069,7 @@ Lint, tests, and typecheck are also hard quality gates:
       createTaskDoneTool(taskId, onDone) {
         const store = this.store;
         return {
-          name: "task_done",
+          name: "fn_task_done",
           label: "Mark Task Done",
           description: "Signal that all steps are complete, tests pass, and documentation is updated. Call this as the final action after finishing all work. Automatically marks all remaining steps as done. Optionally provide a summary of what was changed/fixed.",
           parameters: Type4.Object({
@@ -58545,7 +59084,7 @@ Lint, tests, and typecheck are also hard quality gates:
               return {
                 content: [{
                   type: "text",
-                  text: `Cannot mark task done yet \u2014 ${completionBlocker}. Resolve the blocker before calling task_done().`
+                  text: `Cannot mark task done yet \u2014 ${completionBlocker}. Resolve the blocker before calling fn_task_done().`
                 }],
                 details: {}
               };
@@ -58569,7 +59108,7 @@ Lint, tests, and typecheck are also hard quality gates:
         };
       }
       /**
-       * Create the review_step tool for the executor agent.
+       * Create the fn_review_step tool for the executor agent.
        *
        * When the reviewer returns a RETHINK verdict, this tool:
        * 1. Runs `git reset --hard <baseline>` to revert file changes
@@ -58581,7 +59120,7 @@ Lint, tests, and typecheck are also hard quality gates:
         const store = this.store;
         const options = this.options;
         return {
-          name: "review_step",
+          name: "fn_review_step",
           label: "Review Step",
           description: "Spawn a reviewer agent to evaluate your plan or code for a step. Returns APPROVE, REVISE, RETHINK, or UNAVAILABLE. Call at step boundaries based on the task's review level. Skip reviews for Step 0 (Preflight) and the final documentation step.",
           parameters: reviewStepParams,
@@ -58651,7 +59190,7 @@ Lint, tests, and typecheck are also hard quality gates:
                   if (reviewType === "code") {
                     text = `REVISE \u2014 this step cannot be marked done until the code review passes.
 
-Fix the issues below, commit your changes, and call review_step(step=${step}, type="code", step_name="${step_name}", baseline="<new SHA>") again.
+Fix the issues below, commit your changes, and call fn_review_step(step=${step}, type="code", step_name="${step_name}", baseline="<new SHA>") again.
 
 ${result.review}`;
                   } else {
@@ -58851,7 +59390,7 @@ Take a different approach. Do NOT repeat the rejected strategy. Re-read the step
           executorLog.warn(`${task.id}: PROMPT.md not found at ${promptPath}, skipping revision injection`);
           return;
         }
-        const scopeLine = "All prior steps remain **done**. Apply the feedback above as an in-place fix (make the necessary code changes, commit, and call `task_done()` when complete). Do **not** re-run or re-plan any earlier step unless the feedback explicitly calls it out.";
+        const scopeLine = "All prior steps remain **done**. Apply the feedback above as an in-place fix (make the necessary code changes, commit, and call `fn_task_done()` when complete). Do **not** re-run or re-plan any earlier step unless the feedback explicitly calls it out.";
         const revisionSectionHeader = "## Workflow Revision Instructions";
         const revisionSectionContent = `${revisionSectionHeader}
 
@@ -59150,6 +59689,7 @@ ${failureFeedback}
           await this.store.logEntry(task.id, `[pre-merge] Starting workflow step: ${ws.name} (${stepMode} mode)`);
           executorLog.log(`${task.id} \u2014 [pre-merge] running workflow step: ${ws.name} (${stepMode} mode)`);
           const startedAt = (/* @__PURE__ */ new Date()).toISOString();
+          const stepStartedAtMs = Date.now();
           results.push({
             workflowStepId: ws.id,
             workflowStepName: ws.name,
@@ -59162,6 +59702,7 @@ ${failureFeedback}
             const result = stepMode === "script" ? await this.executeScriptWorkflowStep(task, ws, worktreePath, settings) : await this.executeWorkflowStep(task, ws, worktreePath, settings);
             const completedAt = (/* @__PURE__ */ new Date()).toISOString();
             if (result.success) {
+              await this.store.logEntry(task.id, `[timing] Workflow step '${ws.name}' completed in ${Date.now() - stepStartedAtMs}ms`);
               await this.store.logEntry(task.id, `[pre-merge] Workflow step completed: ${ws.name}`);
               executorLog.log(`${task.id} \u2014 [pre-merge] workflow step passed: ${ws.name}`);
               const existingIdx = results.findIndex((r) => r.workflowStepId === ws.id);
@@ -59175,6 +59716,7 @@ ${failureFeedback}
               }
               await this.store.updateTask(task.id, { workflowStepResults: results });
             } else if (result.revisionRequested) {
+              await this.store.logEntry(task.id, `[timing] Workflow step '${ws.name}' requested revision after ${Date.now() - stepStartedAtMs}ms`);
               await this.store.logEntry(
                 task.id,
                 `[pre-merge] Workflow step requested revision: ${ws.name}`,
@@ -59198,6 +59740,7 @@ ${failureFeedback}
                 stepName: ws.name
               };
             } else {
+              await this.store.logEntry(task.id, `[timing] Workflow step '${ws.name}' failed after ${Date.now() - stepStartedAtMs}ms`);
               await this.store.logEntry(
                 task.id,
                 `[pre-merge] Workflow step failed: ${ws.name}`,
@@ -59222,14 +59765,14 @@ ${failureFeedback}
               };
             }
           } catch (err) {
-            const errorMessage = err instanceof Error ? err.message : String(err);
+            const { message: errorMessage, detail: errorDetail, stack: errorStack } = formatError(err);
             const completedAt = (/* @__PURE__ */ new Date()).toISOString();
             await this.store.logEntry(
               task.id,
               `[pre-merge] Workflow step failed: ${ws.name}`,
-              errorMessage
+              errorStack ?? errorDetail
             );
-            executorLog.error(`${task.id} \u2014 [pre-merge] workflow step error: ${ws.name} \u2014 ${errorMessage}`);
+            executorLog.error(`${task.id} \u2014 [pre-merge] workflow step error: ${ws.name} \u2014 ${errorDetail}`);
             const existingIdx = results.findIndex((r) => r.workflowStepId === ws.id);
             if (existingIdx >= 0) {
               results[existingIdx] = {
@@ -59855,7 +60398,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
       /**
        * When the engine restarts mid-step, an `in-progress` step may have already
        * passed its code review (log: `code review Step N: APPROVE`) but not yet
-       * been flipped to `done` by the agent's next `task_update` call. Without
+       * been flipped to `done` by the agent's next `fn_task_update` call. Without
        * intervention, the next executor pass re-enters the step and replays plan
        * + code review, which we've measured at 5–20 min of pure waste per restart.
        *
@@ -60118,14 +60661,14 @@ Review the work done in this worktree and evaluate it against the criteria in yo
         }
       }
       /**
-       * Create the spawn_agent tool definition.
+       * Create the fn_spawn_agent tool definition.
        * Allows the parent agent to spawn child agents with delegated tasks.
        */
       createSpawnAgentTool(taskId, worktreePath, settings) {
         return {
-          name: "spawn_agent",
+          name: "fn_spawn_agent",
           label: "Spawn Agent",
-          description: "Spawn a child agent to handle parallel work or specialized sub-tasks. Each child runs in its own git worktree (branched from your worktree) and executes autonomously. When you end (task_done), all spawned children are terminated.",
+          description: "Spawn a child agent to handle parallel work or specialized sub-tasks. Each child runs in its own git worktree (branched from your worktree) and executes autonomously. When you end (fn_task_done), all spawned children are terminated.",
           parameters: spawnAgentParams,
           execute: async (_id, params) => {
             const { name, role, task: taskPrompt } = params;
@@ -60645,6 +61188,7 @@ var init_scheduler = __esm({
             }
           }
           if (todo.length === 0) return;
+          todo = sortTasksByPriorityThenAgeAndId(todo);
           const activeScopes = /* @__PURE__ */ new Map();
           if (settings.groupOverlappingFiles) {
             for (const t of inProgress) {
@@ -63190,6 +63734,13 @@ function formatTaskIdentifier(task) {
   const snippet = task.description.length > maxLen ? task.description.slice(0, maxLen) + "..." : task.description;
   return `${task.id}: ${snippet}`;
 }
+function resolveNtfyBaseUrl(baseUrl, fallback = DEFAULT_NTFY_BASE_URL) {
+  const trimmed = baseUrl?.trim();
+  if (!trimmed) {
+    return fallback;
+  }
+  return trimmed.replace(/\/+$/, "");
+}
 function resolveNtfyEvents(events) {
   return events ? [...events] : [...DEFAULT_NTFY_EVENTS];
 }
@@ -63213,7 +63764,7 @@ function buildNtfyClickUrl(options) {
   return query ? `${normalizedHost}/?${query}` : `${normalizedHost}/`;
 }
 async function sendNtfyNotification({
-  ntfyBaseUrl = "https://ntfy.sh",
+  ntfyBaseUrl,
   topic,
   title,
   message,
@@ -63230,7 +63781,8 @@ async function sendNtfyNotification({
     if (clickUrl) {
       headers.Click = clickUrl;
     }
-    const response = await fetch(`${ntfyBaseUrl}/${topic}`, {
+    const resolvedBaseUrl = resolveNtfyBaseUrl(ntfyBaseUrl);
+    const response = await fetch(`${resolvedBaseUrl}/${topic}`, {
       method: "POST",
       headers,
       body: message,
@@ -63246,11 +63798,12 @@ async function sendNtfyNotification({
     schedulerLog.log(`Failed to send ntfy notification: ${err}`);
   }
 }
-var DEFAULT_NTFY_EVENTS, NtfyNotifier;
+var DEFAULT_NTFY_BASE_URL, DEFAULT_NTFY_EVENTS, NtfyNotifier;
 var init_notifier = __esm({
   "../engine/src/notifier.ts"() {
     "use strict";
     init_logger2();
+    DEFAULT_NTFY_BASE_URL = "https://ntfy.sh";
     DEFAULT_NTFY_EVENTS = [
       "in-review",
       "merged",
@@ -63262,7 +63815,8 @@ var init_notifier = __esm({
     NtfyNotifier = class {
       constructor(store, options = {}) {
         this.store = store;
-        this.ntfyBaseUrl = options.ntfyBaseUrl ?? "https://ntfy.sh";
+        this.defaultNtfyBaseUrl = resolveNtfyBaseUrl(options.ntfyBaseUrl);
+        this.ntfyBaseUrl = this.defaultNtfyBaseUrl;
         this.projectId = options.projectId;
       }
       config = {
@@ -63272,6 +63826,7 @@ var init_notifier = __esm({
         events: [...DEFAULT_NTFY_EVENTS]
       };
       ntfyBaseUrl;
+      defaultNtfyBaseUrl;
       projectId;
       notifiedEvents = /* @__PURE__ */ new Set();
       abortController = null;
@@ -63410,7 +63965,7 @@ var init_notifier = __esm({
       };
       handleSettingsUpdated = (data) => {
         const { settings, previous } = data;
-        if (settings.ntfyEnabled !== previous.ntfyEnabled || settings.ntfyTopic !== previous.ntfyTopic || settings.ntfyDashboardHost !== previous.ntfyDashboardHost || JSON.stringify(settings.ntfyEvents) !== JSON.stringify(previous.ntfyEvents)) {
+        if (settings.ntfyEnabled !== previous.ntfyEnabled || settings.ntfyTopic !== previous.ntfyTopic || settings.ntfyBaseUrl !== previous.ntfyBaseUrl || settings.ntfyDashboardHost !== previous.ntfyDashboardHost || JSON.stringify(settings.ntfyEvents) !== JSON.stringify(previous.ntfyEvents)) {
           const wasEnabled = this.config.enabled;
           this.loadConfig(settings);
           if (this.config.enabled && !wasEnabled) {
@@ -63419,6 +63974,8 @@ var init_notifier = __esm({
             schedulerLog.log("NtfyNotifier disabled");
           } else if (this.config.topic !== previous.ntfyTopic) {
             schedulerLog.log("NtfyNotifier topic updated");
+          } else if (this.ntfyBaseUrl !== resolveNtfyBaseUrl(previous.ntfyBaseUrl)) {
+            schedulerLog.log("NtfyNotifier base URL updated");
           } else if (this.config.dashboardHost !== previous.ntfyDashboardHost) {
             schedulerLog.log("NtfyNotifier dashboard host updated");
           } else if (JSON.stringify(this.config.events) !== JSON.stringify(previous.ntfyEvents)) {
@@ -63433,6 +63990,7 @@ var init_notifier = __esm({
           dashboardHost: settings.ntfyDashboardHost,
           events: resolveNtfyEvents(settings.ntfyEvents)
         };
+        this.ntfyBaseUrl = resolveNtfyBaseUrl(settings.ntfyBaseUrl, this.defaultNtfyBaseUrl);
       }
       isEventEnabled(event) {
         return isNtfyEventEnabled(this.config.events, event);
@@ -64822,14 +65380,14 @@ var init_agent_heartbeat = __esm({
 Your job:
 1. Check your assigned task \u2014 read the description and PROMPT.md if present.
 2. Do ONE useful action: analyze, review, create follow-up tasks, or log findings.
-3. Use task_create to spawn follow-up work, task_log to record observations.
-4. Use task_document_write to save durable findings, plans, or research notes.
-5. Call heartbeat_done when finished with an optional summary of what was accomplished.
+3. Use fn_task_create to spawn follow-up work, fn_task_log to record observations.
+4. Use fn_task_document_write to save durable findings, plans, or research notes.
+5. Call fn_heartbeat_done when finished with an optional summary of what was accomplished.
 
 Keep work lightweight \u2014 this is a single-pass check, not a full implementation run.
-You have readonly file access plus task_create, task_log, and task_document tools.
+You have readonly file access plus fn_task_create, fn_task_log, and fn_task_document tools.
 
-**Task Documents:** Save important findings with task_document_write(key="...", content="...").
+**Task Documents:** Save important findings with fn_task_document_write(key="...", content="...").
 Documents persist across sessions and are visible in the dashboard's Documents tab.
 
 ## Memory Boundaries
@@ -64842,12 +65400,12 @@ You may receive an Agent Memory section and a Project Memory section.
 ## Processing Messages
 
 When you are woken by an incoming message (source includes "wake-on-message"), you should:
-1. Use read_messages to check your inbox for unread messages.
+1. Use fn_read_messages to check your inbox for unread messages.
 2. Review each message and determine the appropriate action:
-   - If the message requires a response, use send_message to reply.
-   - When replying, include 'reply_to_message_id' with the original message ID from read_messages output.
-   - If the message is informational, acknowledge it by logging with task_log.
-   - If the message requests work, create a follow-up task with task_create or handle it directly.
+   - If the message requires a response, use fn_send_message to reply.
+   - When replying, include 'reply_to_message_id' with the original message ID from fn_read_messages output.
+   - If the message is informational, acknowledge it by logging with fn_task_log.
+   - If the message requests work, create a follow-up task with fn_task_create or handle it directly.
 3. After processing messages, continue with your normal heartbeat duties.
 
 When sending messages:
@@ -64860,17 +65418,17 @@ When sending messages:
 Your job:
 1. Review your context \u2014 check messages, memory, and project state.
 2. Do ONE useful action: analyze, create follow-up tasks, delegate work, or update memory.
-3. Use task_create to spawn follow-up work.
-4. Use list_agents and delegate_task to coordinate with other agents.
-5. Call heartbeat_done when finished with an optional summary of what was accomplished.
+3. Use fn_task_create to spawn follow-up work.
+4. Use fn_list_agents and fn_delegate_task to coordinate with other agents.
+5. Call fn_heartbeat_done when finished with an optional summary of what was accomplished.
 
 Keep work lightweight \u2014 this is a single-pass ambient check, not a full implementation run.
 You have readonly file access plus:
-- task_create
-- list_agents and delegate_task
-- memory_search, memory_get, and memory_append
-- heartbeat_done
-- send_message and read_messages when messaging is enabled for this run (they may not always be available)
+- fn_task_create
+- fn_list_agents and fn_delegate_task
+- fn_memory_search, fn_memory_get, and fn_memory_append
+- fn_heartbeat_done
+- fn_send_message and fn_read_messages when messaging is enabled for this run (they may not always be available)
 
 ## Memory Boundaries
 
@@ -64882,12 +65440,12 @@ You may receive an Agent Memory section and a Project Memory section.
 ## Processing Messages
 
 When you are woken by an incoming message (source includes "wake-on-message"), you should:
-1. If read_messages is available, use it to check your inbox for unread messages.
+1. If fn_read_messages is available, use it to check your inbox for unread messages.
 2. Review each message and determine the appropriate action:
-   - If the message requires a response and send_message is available, use send_message to reply.
-   - When replying, include 'reply_to_message_id' with the original message ID from read_messages output.
-   - If the message is informational, acknowledge it and respond via send_message when appropriate.
-   - If the message requests work, create a follow-up task with task_create.
+   - If the message requires a response and fn_send_message is available, use fn_send_message to reply.
+   - When replying, include 'reply_to_message_id' with the original message ID from fn_read_messages output.
+   - If the message is informational, acknowledge it and respond via fn_send_message when appropriate.
+   - If the message requests work, create a follow-up task with fn_task_create.
 3. After processing messages, continue with your ambient work.
 
 When sending messages:
@@ -65294,7 +65852,7 @@ When sending messages:
        * Implements the Paperclip-style execution model:
        * 1. Wake — start a heartbeat run record
        * 2. Check inbox — resolve the agent's assigned task
-       * 3. Work — run a lightweight agent session with readonly tools + task_create/task_log
+       * 3. Work — run a lightweight agent session with readonly tools + fn_task_create/fn_task_log
        * 4. Exit — record results and complete the run
        * 
        * Budget governance:
@@ -65544,7 +66102,7 @@ When sending messages:
               stdoutExcerpt += delta.slice(0, remaining);
             };
             const heartbeatDoneTool = {
-              name: "heartbeat_done",
+              name: "fn_heartbeat_done",
               label: "Heartbeat Done",
               description: "Signal that the heartbeat execution is complete. Call when finished.",
               parameters: heartbeatDoneParams,
@@ -65673,16 +66231,16 @@ When sending messages:
                   "You have identity (soul, instructions, and/or memory) loaded, which means you can perform",
                   "useful ambient work. Here are some things you can do:",
                   "",
-                  "1. **Check your messages** \u2014 Use read_messages to review any pending messages",
-                  "   and use send_message with reply_to_message_id when responding.",
+                  "1. **Check your messages** \u2014 Use fn_read_messages to review any pending messages",
+                  "   and use fn_send_message with reply_to_message_id when responding.",
                   "",
-                  "2. **Create new tasks** \u2014 Use task_create to spawn follow-up work that needs",
+                  "2. **Create new tasks** \u2014 Use fn_task_create to spawn follow-up work that needs",
                   "   to be done. This is useful for surfacing issues or ideas you discover.",
                   "",
-                  "3. **Delegate work** \u2014 Use list_agents to discover available agents and",
-                  "   delegate_task to assign work to them.",
+                  "3. **Delegate work** \u2014 Use fn_list_agents to discover available agents and",
+                  "   fn_delegate_task to assign work to them.",
                   "",
-                  "4. **Update your memory** \u2014 Use memory_append to persist important learnings",
+                  "4. **Update your memory** \u2014 Use fn_memory_append to persist important learnings",
                   "   or context that will help you in future sessions.",
                   "",
                   "5. **Monitor the project** \u2014 Review the task board and identify any issues",
@@ -65691,7 +66249,7 @@ When sending messages:
                   "",
                   "Your soul, instructions, and memory are already loaded in the system prompt.",
                   "Focus on work that benefits the project without requiring a specific task context.",
-                  "Call heartbeat_done when finished."
+                  "Call fn_heartbeat_done when finished."
                 ].join("\n");
               } else {
                 const taskTitle = taskDetail.title ?? taskDetail.description.slice(0, 100);
@@ -65751,7 +66309,7 @@ ${taskDetail.prompt}` : "No PROMPT.md available.",
                   ...triggeringCommentLines,
                   ...pendingMessagesLines,
                   "",
-                  "Review the task status and take appropriate action. Call heartbeat_done when finished."
+                  "Review the task status and take appropriate action. Call fn_heartbeat_done when finished."
                 ].join("\n");
               }
               await promptWithFallback2(session, executionPrompt);
@@ -65783,12 +66341,12 @@ ${taskDetail.prompt}` : "No PROMPT.md available.",
               });
               heartbeatLog.log(`Heartbeat completed for ${agentId} (${toolCallCount} tool calls, ~${estimatedOutputTokens} output tokens)`);
             } catch (err) {
-              const errorMessage = err instanceof Error ? err.message : String(err);
-              heartbeatLog.error(`Heartbeat execution failed for ${agentId}: ${errorMessage}`);
+              const errorDetail = formatError(err).detail;
+              heartbeatLog.error(`Heartbeat execution failed for ${agentId}: ${errorDetail}`);
               await flushAgentLogger();
               await this.completeRun(agentId, run.id, {
                 status: "failed",
-                stderrExcerpt: errorMessage,
+                stderrExcerpt: errorDetail,
                 stdoutExcerpt: stdoutExcerpt || void 0
               });
             } finally {
@@ -65807,13 +66365,14 @@ ${taskDetail.prompt}` : "No PROMPT.md available.",
             }
             return await this.store.getRunDetail(agentId, run.id);
           } catch (err) {
+            const errorDetail = formatError(err).detail;
             const errorMessage = err instanceof Error ? err.message : String(err);
-            heartbeatLog.error(`Heartbeat execution error for ${agentId}: ${errorMessage}`);
+            heartbeatLog.error(`Heartbeat execution error for ${agentId}: ${errorDetail}`);
             await flushAgentLogger();
             try {
               await this.completeRun(agentId, run.id, {
                 status: "failed",
-                stderrExcerpt: errorMessage
+                stderrExcerpt: errorDetail
               });
             } catch (completeRunErr) {
               const completeRunErrMsg = completeRunErr instanceof Error ? completeRunErr.message : String(completeRunErr);
@@ -65851,7 +66410,7 @@ ${taskDetail.prompt}` : "No PROMPT.md available.",
        *
        * @param agentId - The agent ID (used for tracking and logging)
        * @param taskStore - TaskStore for task creation and logging
-       * @param taskId - The assigned task ID (for task_log context)
+       * @param taskId - The assigned task ID (for fn_task_log context)
        * @param runContext - Optional run context for mutation correlation
        * @param audit - Optional run auditor for audit trail (FN-1404)
        * @param messageStore - Optional MessageStore for messaging tools
@@ -69927,7 +70486,7 @@ var init_sse_buffer = __esm({
 });
 
 // ../dashboard/src/ai-session-diagnostics.ts
-import { randomUUID as randomUUID10 } from "node:crypto";
+import { randomUUID as randomUUID9 } from "node:crypto";
 function defaultSink(level, scope, message, context) {
   const prefix = `[${scope}]`;
   const logArgs = [prefix, message, context];
@@ -69971,7 +70530,7 @@ function emit(level, scope, message, context) {
   const fullContext = {
     ...context,
     _emittedAt: (/* @__PURE__ */ new Date()).toISOString(),
-    _diagnosticsId: randomUUID10()
+    _diagnosticsId: randomUUID9()
   };
   try {
     _sink(level, scope, message, fullContext);
@@ -70028,7 +70587,7 @@ var init_ai_session_diagnostics = __esm({
 });
 
 // ../dashboard/src/planning.ts
-import { randomUUID as randomUUID11 } from "node:crypto";
+import { randomUUID as randomUUID10 } from "node:crypto";
 import { EventEmitter as EventEmitter17 } from "node:events";
 async function initEngine2() {
   try {
@@ -70222,7 +70781,7 @@ async function createSession(ip, initialPlan, _store, rootDir, promptOverrides)
   if (!rootDir) {
     throw new Error("rootDir is required for AI-powered planning sessions");
   }
-  const sessionId = randomUUID11();
+  const sessionId = randomUUID10();
   const session = {
     id: sessionId,
     ip,
@@ -72749,7 +73308,7 @@ var init_github_poll = __esm({
 
 // ../dashboard/src/terminal.ts
 import { spawn as spawn2 } from "node:child_process";
-import { randomUUID as randomUUID12 } from "node:crypto";
+import { randomUUID as randomUUID11 } from "node:crypto";
 import { EventEmitter as EventEmitter19 } from "node:events";
 function extractBaseCommand(command) {
   let trimmed = command.trim();
@@ -72909,7 +73468,7 @@ var init_terminal = __esm({
         if (!validation.valid) {
           return { sessionId: "", error: validation.error };
         }
-        const sessionId = randomUUID12();
+        const sessionId = randomUUID11();
         const childProcess = spawn2(command, [], {
           cwd,
           shell: true,
@@ -73281,6 +73840,8 @@ function cleanupExpiredSessions3() {
     diagnostics4.info("Cleanup completed", {
       cleanedSessions,
       cleanedRateLimits,
+      ttlMs: SESSION_TTL_MS3,
+      rateLimitWindowMs: RATE_LIMIT_WINDOW_MS3,
       operation: "cleanup-expired"
     });
   }
@@ -73615,7 +74176,7 @@ async function initPromptOverrides() {
     promptOverridesReady = true;
   }
 }
-var mkdtemp, access3, stat6, mkdir12, readdir8, rm, fsReadFile, fsWriteFile, upload, execFileAsync, resolveWorkflowStepRefinePrompt, promptOverridesReady, DEFAULT_WORKFLOW_STEP_REFINE_PROMPT;
+var mkdtemp, access3, stat6, mkdir12, readdir8, rm2, fsReadFile, fsWriteFile, upload, execFileAsync, resolveWorkflowStepRefinePrompt, promptOverridesReady, DEFAULT_WORKFLOW_STEP_REFINE_PROMPT;
 var init_routes = __esm({
   "../dashboard/src/routes.ts"() {
     "use strict";
@@ -73652,7 +74213,7 @@ var init_routes = __esm({
       stat: stat6,
       mkdir: mkdir12,
       readdir: readdir8,
-      rm,
+      rm: rm2,
       readFile: fsReadFile,
       writeFile: fsWriteFile
     } = fsPromises);
@@ -75739,7 +76300,7 @@ var require_extension = __commonJS({
       if (dest[name] === void 0) dest[name] = [elem];
       else dest[name].push(elem);
     }
-    function parse2(header) {
+    function parse(header) {
       const offers = /* @__PURE__ */ Object.create(null);
       let params = /* @__PURE__ */ Object.create(null);
       let mustUnescape = false;
@@ -75879,7 +76440,7 @@ var require_extension = __commonJS({
         }).join(", ");
       }).join(", ");
     }
-    module.exports = { format, parse: parse2 };
+    module.exports = { format, parse };
   }
 });
 
@@ -75913,7 +76474,7 @@ var require_websocket = __commonJS({
     var {
       EventTarget: { addEventListener, removeEventListener }
     } = require_event_target();
-    var { format, parse: parse2 } = require_extension();
+    var { format, parse } = require_extension();
     var { toBuffer } = require_buffer_util();
     var kAborted = /* @__PURE__ */ Symbol("kAborted");
     var protocolVersions = [8, 13];
@@ -76582,7 +77143,7 @@ var require_websocket = __commonJS({
           }
           let extensions;
           try {
-            extensions = parse2(secWebSocketExtensions);
+            extensions = parse(secWebSocketExtensions);
           } catch (err) {
             const message = "Invalid Sec-WebSocket-Extensions header";
             abortHandshake(websocket, socket, message);
@@ -76872,7 +77433,7 @@ var require_subprotocol = __commonJS({
   "../../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/subprotocol.js"(exports, module) {
     "use strict";
     var { tokenChars } = require_validation();
-    function parse2(header) {
+    function parse(header) {
       const protocols = /* @__PURE__ */ new Set();
       let start = -1;
       let end = -1;
@@ -76908,7 +77469,7 @@ var require_subprotocol = __commonJS({
       protocols.add(protocol);
       return protocols;
     }
-    module.exports = { parse: parse2 };
+    module.exports = { parse };
   }
 });
 
@@ -77478,7 +78039,7 @@ var init_auth_middleware = __esm({
 
 // ../dashboard/src/server.ts
 import express from "express";
-import { join as join34, dirname as dirname7 } from "node:path";
+import { join as join34, dirname as dirname8 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 function clearAiSessionCleanupInterval() {
   if (!aiSessionCleanupIntervalHandle) {
@@ -77512,7 +78073,7 @@ var init_server = __esm({
     init_chat();
     init_dev_server_routes();
     init_auth_middleware();
-    __dirname = dirname7(fileURLToPath2(import.meta.url));
+    __dirname = dirname8(fileURLToPath2(import.meta.url));
     MIN_AI_SESSION_TTL_MS = 10 * 60 * 1e3;
     MAX_AI_SESSION_TTL_MS = 30 * 24 * 60 * 60 * 1e3;
     MIN_AI_SESSION_CLEANUP_INTERVAL_MS = 60 * 1e3;
@@ -77581,7 +78142,7 @@ var init_src3 = __esm({
 });
 
 // src/project-context.ts
-import { resolve as resolve14, dirname as dirname8 } from "node:path";
+import { resolve as resolve14, dirname as dirname9 } from "node:path";
 import { existsSync as existsSync28 } from "node:fs";
 async function resolveProject(projectNameFlag, cwd = process.cwd(), globalDir) {
   const central = new CentralCore(globalDir);
@@ -77672,7 +78233,7 @@ async function detectProjectFromCwd(cwd, central) {
         path: currentDir
       };
     }
-    const parentDir = dirname8(currentDir);
+    const parentDir = dirname9(currentDir);
     if (parentDir === currentDir) {
       break;
     }
@@ -77834,11 +78395,11 @@ async function runTaskCreate(descriptionArg, attachFiles, depends, projectName)
   console.log(`    Path:   .fusion/tasks/${task.id}/`);
   if (attachFiles && attachFiles.length > 0) {
     const { readFile: readFile19 } = await import("node:fs/promises");
-    const { basename: basename8, extname: extname2, resolve: resolve16 } = await import("node:path");
+    const { basename: basename9, extname: extname3, resolve: resolve16 } = await import("node:path");
     for (const filePath of attachFiles) {
       const resolvedPath = resolve16(filePath);
-      const filename = basename8(resolvedPath);
-      const ext = extname2(filename).toLowerCase();
+      const filename = basename9(resolvedPath);
+      const ext = extname3(filename).toLowerCase();
       const mimeType = MIME_TYPES[ext];
       if (!mimeType) {
         console.error(`    \u2717 Unsupported file type: ${ext} (${filename})`);
@@ -78082,11 +78643,11 @@ async function runTaskMerge(id, projectName) {
 }
 async function runTaskAttach(id, filePath, projectName) {
   const { readFile: readFile19 } = await import("node:fs/promises");
-  const { basename: basename8, extname: extname2 } = await import("node:path");
+  const { basename: basename9, extname: extname3 } = await import("node:path");
   const { resolve: resolve16 } = await import("node:path");
   const resolvedPath = resolve16(filePath);
-  const filename = basename8(resolvedPath);
-  const ext = extname2(filename).toLowerCase();
+  const filename = basename9(resolvedPath);
+  const ext = extname3(filename).toLowerCase();
   const mimeType = MIME_TYPES[ext];
   if (!mimeType) {
     console.error(`Unsupported file type: ${ext}`);
@@ -79037,7 +79598,7 @@ init_src();
 init_gh_cli();
 import { Type as Type7 } from "typebox";
 import { StringEnum } from "@mariozechner/pi-ai";
-import { resolve as resolve15, basename as basename7, extname, join as join36 } from "node:path";
+import { resolve as resolve15, basename as basename8, extname as extname2, join as join36 } from "node:path";
 import { readFile as readFile18 } from "node:fs/promises";
 import { existsSync as existsSync30 } from "node:fs";
 import { spawn as spawn4 } from "node:child_process";
@@ -79358,8 +79919,8 @@ Column: triage
     }),
     async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
       const filePath = resolve15(ctx.cwd, params.path.replace(/^@/, ""));
-      const filename = basename7(filePath);
-      const ext = extname(filename).toLowerCase();
+      const filename = basename8(filePath);
+      const ext = extname2(filename).toLowerCase();
       const mimeType = MIME_TYPES2[ext];
       if (!mimeType) {
         throw new Error(