@runfusion/fusion 0.17.1 → 0.18.0

package/dist/extension.js

@@ -1389,7 +1389,14 @@ Note: Refs (@e1, @e2) are invalidated after page navigation. Re-snapshot after c
         toolMode: "readonly",
         prompt: `You are a UX design reviewer. Verify frontend changes maintain visual polish and consistency with existing UI patterns and design tokens.
 
-Design System Review:
+FAST-BAIL RULE (check this FIRST):
+- The task harness gives you a "Diff Scope" listing the files this task actually changed.
+- If that list contains NO frontend/UI files (no .tsx/.jsx/.ts/.js component files, no .css/.scss/.sass/.styl, no .html/.vue/.svelte/.astro, no design-token/theme files), respond IMMEDIATELY with a single short line such as "No UI changes in scope \u2014 approved." and STOP.
+- Do NOT explore the worktree looking for related-looking UI code to critique. If this task didn't change a UI file, your review is a no-op by definition.
+
+Otherwise, restrict your review to the UI files actually present in the diff scope.
+
+Design System Review (only for UI files in the diff scope):
 1. **Visual Hierarchy** \u2014 Check that the changes maintain consistent heading levels, content flow, and information architecture
 2. **Spacing and Typography** \u2014 Verify consistent spacing (margins, padding, gaps) and typography scale usage
 3. **Color and Token Consistency** \u2014 Check that CSS custom properties and design tokens are used correctly; no hardcoded color values that bypass the design system
@@ -1397,15 +1404,16 @@ Design System Review:
 5. **Responsive Behavior** \u2014 Check that layouts adapt properly across viewport sizes and maintain usability on mobile
 6. **Fit with Design Language** \u2014 Verify the visual style matches existing patterns (border radius, shadows, transitions, icon style, etc.)
 
-Files to Review:
+Files to Review (only those that appear in the Diff Scope):
 - Modified UI components (React, Vue, Angular, HTML)
 - CSS/SCSS/styled-component files
 - Design token or theme configuration files
 
 Output Requirements:
-- If design is consistent and polished: call task_done() with success status
-- If issues found: describe each finding with specific file paths and suggested corrections via task_log()
-- Prioritize issues by impact: layout breaks > visual inconsistency > style preferences`
+- If design is consistent and polished (or there are no UI files in scope): respond with a brief approval line and stop.
+- If issues found: start your response with "REQUEST REVISION" and describe each finding with specific file paths and suggested corrections.
+- Prioritize issues by impact: layout breaks > visual inconsistency > style preferences.
+- Do NOT spend time on stylistic nits when no real issues exist.`
       }
     ];
     DOCUMENT_KEY_RE = /^[a-zA-Z0-9_-]{1,64}$/;
@@ -2763,7 +2771,7 @@ var init_db = __esm({
     "use strict";
     init_sqlite_adapter();
     init_types();
-    SCHEMA_VERSION = 59;
+    SCHEMA_VERSION = 60;
     SCHEMA_SQL = `
 -- Tasks table with JSON columns for nested data
 CREATE TABLE IF NOT EXISTS tasks (
@@ -2831,6 +2839,7 @@ CREATE TABLE IF NOT EXISTS tasks (
   missionId TEXT,
   sliceId TEXT,
   assignedAgentId TEXT,
+  pausedByAgentId TEXT,
   assigneeUserId TEXT,
   sourceType TEXT,
   sourceAgentId TEXT,
@@ -4628,6 +4637,12 @@ This means a caller passed a .fusion directory where a project root was expected
             this.db.exec(`CREATE INDEX IF NOT EXISTS idxInsightRunEventsRunIdSeq ON project_insight_run_events(runId, seq)`);
           });
         }
+        if (version < 60) {
+          this.applyMigration(60, () => {
+            this.addColumnIfMissing("tasks", "pausedByAgentId", "TEXT");
+            this.db.exec(`CREATE INDEX IF NOT EXISTS idxTasksPausedByAgentId ON tasks(pausedByAgentId)`);
+          });
+        }
       }
       /**
        * Run a single migration step inside a transaction and bump the version.
@@ -29610,8 +29625,8 @@ var require_CronFileParser = __commonJS({
        * @throws If file cannot be read
        */
       static parseFileSync(filePath) {
-        const { readFileSync: readFileSync11 } = __require("fs");
-        const data = readFileSync11(filePath, "utf8");
+        const { readFileSync: readFileSync12 } = __require("fs");
+        const data = readFileSync12(filePath, "utf8");
         return _CronFileParser.#parseContent(data);
       }
       /**
@@ -32637,6 +32652,7 @@ var init_store = __esm({
           missionId: row.missionId || void 0,
           sliceId: row.sliceId || void 0,
           assignedAgentId: row.assignedAgentId || void 0,
+          pausedByAgentId: row.pausedByAgentId || void 0,
           assigneeUserId: row.assigneeUserId || void 0,
           nodeId: row.nodeId || void 0,
           effectiveNodeId: row.effectiveNodeId || void 0,
@@ -32901,6 +32917,7 @@ ${recentText}` : void 0
           "missionId",
           "sliceId",
           "assignedAgentId",
+          "pausedByAgentId",
           "assigneeUserId",
           "nodeId",
           "effectiveNodeId",
@@ -33013,6 +33030,7 @@ ${outcome}`;
           "missionId",
           "sliceId",
           "assignedAgentId",
+          "pausedByAgentId",
           "assigneeUserId",
           "nodeId",
           "effectiveNodeId",
@@ -33063,9 +33081,9 @@ ${outcome}`;
         dependencies, steps, log, attachments, steeringComments,
         comments, workflowStepResults, prInfo, issueInfo,
         sourceIssueProvider, sourceIssueRepository, sourceIssueExternalIssueId, sourceIssueNumber, sourceIssueUrl,
-        mergeDetails, breakIntoSubtasks, enabledWorkflowSteps, modifiedFiles, missionId, sliceId, assignedAgentId, assigneeUserId, nodeId, effectiveNodeId, effectiveNodeSource, sourceType, sourceAgentId, sourceRunId, sourceSessionId, sourceMessageId, sourceParentTaskId, sourceMetadata, checkedOutBy, checkedOutAt
+        mergeDetails, breakIntoSubtasks, enabledWorkflowSteps, modifiedFiles, missionId, sliceId, assignedAgentId, pausedByAgentId, assigneeUserId, nodeId, effectiveNodeId, effectiveNodeSource, sourceType, sourceAgentId, sourceRunId, sourceSessionId, sourceMessageId, sourceParentTaskId, sourceMetadata, checkedOutBy, checkedOutAt
       ) VALUES (
-        ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
+        ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
       )
       ON CONFLICT(id) DO UPDATE SET
         title = excluded.title,
@@ -33134,6 +33152,7 @@ ${outcome}`;
         missionId = excluded.missionId,
         sliceId = excluded.sliceId,
         assignedAgentId = excluded.assignedAgentId,
+        pausedByAgentId = excluded.pausedByAgentId,
         assigneeUserId = excluded.assigneeUserId,
         nodeId = excluded.nodeId,
         effectiveNodeId = excluded.effectiveNodeId,
@@ -33215,6 +33234,7 @@ ${outcome}`;
           task.missionId ?? null,
           task.sliceId ?? null,
           task.assignedAgentId ?? null,
+          task.pausedByAgentId ?? null,
           task.assigneeUserId ?? null,
           task.nodeId ?? null,
           task.effectiveNodeId ?? null,
@@ -34332,6 +34352,23 @@ ${newTask.description}
         const matches = [...activeMatches, ...archiveMatches];
         return limit >= 0 ? matches.slice(0, limit) : matches;
       }
+      async getTasksByAssignedAgent(agentId, options) {
+        const whereClauses = ["assignedAgentId = ?"];
+        const params = [agentId];
+        if (options?.pausedOnly) {
+          whereClauses.push("paused = 1");
+        }
+        if (options?.excludeArchived) {
+          whereClauses.push(`"column" != 'archived'`);
+        }
+        const selectClause = this.getTaskSelectClause(false);
+        const rows = this.db.prepare(`
+      SELECT ${selectClause} FROM tasks
+      WHERE ${whereClauses.join(" AND ")}
+      ORDER BY createdAt ASC
+    `).all(...params);
+        return rows.map((row) => this.rowToTask(row));
+      }
       async selectNextTaskForAgent(agentId) {
         const tasks = await this.listTasks({ slim: true });
         if (tasks.length === 0) {
@@ -34569,6 +34606,11 @@ ${newTask.description}
           } else if (updates.assignedAgentId !== void 0) {
             task.assignedAgentId = updates.assignedAgentId;
           }
+          if (updates.pausedByAgentId === null) {
+            task.pausedByAgentId = void 0;
+          } else if (updates.pausedByAgentId !== void 0) {
+            task.pausedByAgentId = updates.pausedByAgentId;
+          }
           if (updates.assigneeUserId === null) {
             task.assigneeUserId = void 0;
           } else if (updates.assigneeUserId !== void 0) {
@@ -34807,14 +34849,21 @@ ${newTask.description}
        * Pause or unpause a task. Paused tasks are excluded from all automated
        * agent and scheduler interaction. Logs the action and emits `task:updated`.
        */
-      async pauseTask(id, paused, runContext) {
+      async pauseTask(id, paused, runContext, agentOptions) {
         return this.withTaskLock(id, async () => {
           const dir = this.taskDir(id);
           const task = await this.readTaskJson(dir);
           if (!task.log) {
             task.log = [];
           }
+          const previousPausedByAgentId = task.pausedByAgentId;
           task.paused = paused || void 0;
+          if (paused && agentOptions?.pausedByAgentId) {
+            task.pausedByAgentId = agentOptions.pausedByAgentId;
+          }
+          if (!paused) {
+            task.pausedByAgentId = void 0;
+          }
           if (task.column === "in-progress" || task.column === "in-review") {
             task.status = paused ? "paused" : void 0;
           }
@@ -34822,7 +34871,7 @@ ${newTask.description}
           task.updatedAt = now;
           const logEntry = {
             timestamp: now,
-            action: paused ? "Task paused" : "Task unpaused"
+            action: paused ? agentOptions?.pausedByAgentId ? `Task paused (agent ${agentOptions.pausedByAgentId} paused)` : "Task paused" : previousPausedByAgentId ? `Task unpaused (agent ${previousPausedByAgentId} resumed)` : "Task unpaused"
           };
           if (runContext) {
             logEntry.runContext = runContext;
@@ -39973,10 +40022,17 @@ var init_docker_client = __esm({
         }
         return this.createDockerInstance(hostConfig);
       }
-      async getContainerInfo(containerId) {
+      async getContainerInfo(containerId, hostConfig) {
         try {
-          const docker = await this.getInstance();
+          const docker = await this.getDockerInstance(hostConfig);
           const inspect = await docker.getContainer(containerId).inspect();
+          const ports = Object.entries(inspect.NetworkSettings?.Ports ?? {}).reduce((acc, [key, value]) => {
+            const binding = Array.isArray(value) && value.length > 0 ? value[0] : void 0;
+            if (binding?.HostPort) {
+              acc[key] = binding.HostPort;
+            }
+            return acc;
+          }, {});
           return {
             id: inspect.Id,
             name: (inspect.Name ?? "").replace(/^\//, ""),
@@ -39988,8 +40044,12 @@ var init_docker_client = __esm({
               paused: Boolean(inspect.State?.Paused),
               restarting: Boolean(inspect.State?.Restarting),
               dead: Boolean(inspect.State?.Dead),
-              error: inspect.State?.Error || void 0
-            }
+              error: inspect.State?.Error || void 0,
+              exitCode: typeof inspect.State?.ExitCode === "number" ? inspect.State.ExitCode : void 0,
+              startedAt: inspect.State?.StartedAt || void 0,
+              finishedAt: inspect.State?.FinishedAt || void 0
+            },
+            ports
           };
         } catch (error) {
           const message = toErrorMessage(error);
@@ -39999,6 +40059,18 @@ var init_docker_client = __esm({
           throw error;
         }
       }
+      async getContainerLogs(containerId, hostConfig, options) {
+        const docker = await this.getDockerInstance(hostConfig);
+        const stream = await docker.getContainer(containerId).logs({
+          stdout: true,
+          stderr: true,
+          tail: options?.tail ?? 100
+        });
+        if (Buffer.isBuffer(stream)) {
+          return stream.toString("utf8");
+        }
+        return String(stream ?? "");
+      }
       async getInstance() {
         if (!this.dockerInstance) {
           this.dockerInstance = await this.createDockerInstance(this.defaultHostConfig);
@@ -52657,6 +52729,193 @@ var init_chat_store = __esm({
   }
 });
 
+// ../core/src/oauth-credential-interop.ts
+import { existsSync as existsSync19, readFileSync as readFileSync6 } from "node:fs";
+import { homedir as homedir4 } from "node:os";
+import { join as join22 } from "node:path";
+function getHomeDir4() {
+  return process.env.HOME || process.env.USERPROFILE || homedir4();
+}
+function getCodexCliAuthPath(home = getHomeDir4()) {
+  return join22(home, ".codex", "auth.json");
+}
+function parseJwtPayload(token) {
+  try {
+    const [, payload = ""] = token.split(".", 3);
+    if (!payload) {
+      return null;
+    }
+    return JSON.parse(Buffer.from(payload, "base64url").toString("utf-8"));
+  } catch {
+    return null;
+  }
+}
+function getJwtExpiryMs(token) {
+  if (!token) {
+    return void 0;
+  }
+  const payload = parseJwtPayload(token);
+  const exp = payload?.exp;
+  if (typeof exp !== "number" || !Number.isFinite(exp)) {
+    return void 0;
+  }
+  return exp * 1e3;
+}
+function getCodexAccountId(accessToken, fallbackAccountId) {
+  const payload = parseJwtPayload(accessToken);
+  const authClaim = payload?.[OPENAI_AUTH_CLAIM];
+  const claimAccountId = authClaim && typeof authClaim === "object" ? authClaim.chatgpt_account_id : void 0;
+  if (typeof claimAccountId === "string" && claimAccountId.trim().length > 0) {
+    return claimAccountId;
+  }
+  if (typeof fallbackAccountId === "string" && fallbackAccountId.trim().length > 0) {
+    return fallbackAccountId;
+  }
+  return void 0;
+}
+function getLastRefreshFallbackExpiryMs(lastRefresh) {
+  if (typeof lastRefresh !== "string" || lastRefresh.trim().length === 0) {
+    return void 0;
+  }
+  const parsed = Date.parse(lastRefresh);
+  if (!Number.isFinite(parsed)) {
+    return void 0;
+  }
+  return parsed + CODEX_REFRESH_FALLBACK_WINDOW_MS;
+}
+function isStoredAuthCredential(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return false;
+  }
+  const record = value;
+  return record.type === "oauth" || record.type === "api_key";
+}
+function isValidOauthCredential(credential) {
+  return credential?.type === "oauth" && typeof credential.access === "string" && credential.access.length > 0 && typeof credential.refresh === "string" && credential.refresh.length > 0 && typeof credential.expires === "number" && Number.isFinite(credential.expires) && Date.now() < credential.expires;
+}
+function isRefreshableOauthCredential(credential) {
+  return credential?.type === "oauth" && typeof credential.refresh === "string" && credential.refresh.length > 0 && typeof credential.expires === "number" && Number.isFinite(credential.expires);
+}
+function compareStoredCredentials(left, right) {
+  if (!left && !right) {
+    return 0;
+  }
+  if (left && !right) {
+    return 1;
+  }
+  if (!left && right) {
+    return -1;
+  }
+  if (left?.type === "api_key" && right?.type !== "api_key") {
+    return 1;
+  }
+  if (right?.type === "api_key" && left?.type !== "api_key") {
+    return -1;
+  }
+  if (left?.type === "oauth" && right?.type === "oauth") {
+    const leftValid = isValidOauthCredential(left);
+    const rightValid = isValidOauthCredential(right);
+    if (leftValid !== rightValid) {
+      return leftValid ? 1 : -1;
+    }
+    const leftRefreshable = isRefreshableOauthCredential(left);
+    const rightRefreshable = isRefreshableOauthCredential(right);
+    if (leftRefreshable !== rightRefreshable) {
+      return leftRefreshable ? 1 : -1;
+    }
+    const leftExpiry = typeof left.expires === "number" && Number.isFinite(left.expires) ? left.expires : -Infinity;
+    const rightExpiry = typeof right.expires === "number" && Number.isFinite(right.expires) ? right.expires : -Infinity;
+    if (leftExpiry !== rightExpiry) {
+      return leftExpiry > rightExpiry ? 1 : -1;
+    }
+    const leftAccessLength = typeof left.access === "string" ? left.access.length : 0;
+    const rightAccessLength = typeof right.access === "string" ? right.access.length : 0;
+    if (leftAccessLength !== rightAccessLength) {
+      return leftAccessLength > rightAccessLength ? 1 : -1;
+    }
+  }
+  return 0;
+}
+function choosePreferredStoredCredential(...credentials) {
+  let best;
+  for (const credential of credentials) {
+    if (compareStoredCredentials(credential, best) > 0) {
+      best = credential;
+    }
+  }
+  return best;
+}
+function shouldHydrateStoredCredential(current, candidate) {
+  if (!candidate || candidate.type !== "oauth") {
+    return false;
+  }
+  if (current?.type === "api_key") {
+    return false;
+  }
+  return compareStoredCredentials(candidate, current) > 0;
+}
+function extractCodexCliStoredCredential(raw) {
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
+    return void 0;
+  }
+  const record = raw;
+  const tokens = record.tokens;
+  if (!tokens || typeof tokens !== "object" || Array.isArray(tokens)) {
+    return void 0;
+  }
+  const tokenRecord = tokens;
+  const access7 = typeof tokenRecord.access_token === "string" ? tokenRecord.access_token : void 0;
+  const refresh = typeof tokenRecord.refresh_token === "string" ? tokenRecord.refresh_token : void 0;
+  if (!access7 || !refresh) {
+    return void 0;
+  }
+  const expires = getJwtExpiryMs(access7) ?? getJwtExpiryMs(typeof tokenRecord.id_token === "string" ? tokenRecord.id_token : void 0) ?? getLastRefreshFallbackExpiryMs(record.last_refresh);
+  if (typeof expires !== "number" || !Number.isFinite(expires)) {
+    return void 0;
+  }
+  const accountId = getCodexAccountId(access7, tokenRecord.account_id);
+  return {
+    type: "oauth",
+    access: access7,
+    refresh,
+    expires,
+    ...accountId ? { accountId } : {}
+  };
+}
+function readStoredCredentialsFromAuthFile(authPath) {
+  if (!existsSync19(authPath)) {
+    return {};
+  }
+  try {
+    const parsed = JSON.parse(readFileSync6(authPath, "utf-8"));
+    const codexCliCredential = extractCodexCliStoredCredential(parsed);
+    if (codexCliCredential) {
+      return { "openai-codex": codexCliCredential };
+    }
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+      return {};
+    }
+    const credentials = {};
+    for (const [providerId, value] of Object.entries(parsed)) {
+      if (!isStoredAuthCredential(value)) {
+        continue;
+      }
+      credentials[providerId] = value;
+    }
+    return credentials;
+  } catch {
+    return {};
+  }
+}
+var OPENAI_AUTH_CLAIM, CODEX_REFRESH_FALLBACK_WINDOW_MS;
+var init_oauth_credential_interop = __esm({
+  "../core/src/oauth-credential-interop.ts"() {
+    "use strict";
+    OPENAI_AUTH_CLAIM = "https://api.openai.com/auth";
+    CODEX_REFRESH_FALLBACK_WINDOW_MS = 55 * 60 * 1e3;
+  }
+});
+
 // ../core/src/index.ts
 var src_exports = {};
 __export(src_exports, {
@@ -52813,6 +53072,7 @@ __export(src_exports, {
   buildTriageMemoryInstructions: () => buildTriageMemoryInstructions,
   canTransition: () => canTransition,
   checkRateLimit: () => checkRateLimit,
+  choosePreferredStoredCredential: () => choosePreferredStoredCredential,
   classifyInsightRunError: () => classifyInsightRunError,
   clearOverrides: () => clearOverrides,
   collectSystemMetrics: () => collectSystemMetrics,
@@ -52843,6 +53103,7 @@ __export(src_exports, {
   executeInsightRunLifecycle: () => executeInsightRunLifecycle,
   exportAgentsToDirectory: () => exportAgentsToDirectory,
   exportSettings: () => exportSettings,
+  extractCodexCliStoredCredential: () => extractCodexCliStoredCredential,
   extractDreamProcessorResult: () => extractDreamProcessorResult,
   formatPiExtensionSource: () => formatPiExtensionSource,
   fromJson: () => fromJson,
@@ -52853,6 +53114,7 @@ __export(src_exports, {
   generateMemoryAudit: () => generateMemoryAudit,
   getAppVersion: () => getAppVersion,
   getAvailableTemplates: () => getAvailableTemplates,
+  getCodexCliAuthPath: () => getCodexCliAuthPath,
   getCurrentRepo: () => getCurrentRepo,
   getDefaultDailyMemoryScaffold: () => getDefaultDailyMemoryScaffold,
   getDefaultDreamsScaffold: () => getDefaultDreamsScaffold,
@@ -52950,6 +53212,7 @@ __export(src_exports, {
   readProjectMemoryFile: () => readProjectMemoryFile,
   readProjectMemoryFileContent: () => readProjectMemoryFileContent,
   readProjectMemoryWithBackend: () => readProjectMemoryWithBackend,
+  readStoredCredentialsFromAuthFile: () => readStoredCredentialsFromAuthFile,
   readWorkingMemory: () => readWorkingMemory,
   reconcileClaudeCliPaths: () => reconcileClaudeCliPaths,
   reconcileDroidCliPaths: () => reconcileDroidCliPaths,
@@ -52985,6 +53248,7 @@ __export(src_exports, {
   scheduleQmdProjectMemoryRefresh: () => scheduleQmdProjectMemoryRefresh,
   searchProjectMemory: () => searchProjectMemory,
   setCreateFnAgent: () => setCreateFnAgent,
+  shouldHydrateStoredCredential: () => shouldHydrateStoredCredential,
   shouldSkipBackgroundQmdRefresh: () => shouldSkipBackgroundQmdRefresh,
   shouldTriggerExtraction: () => shouldTriggerExtraction,
   slugify: () => slugify,
@@ -53089,6 +53353,7 @@ var init_src = __esm({
     init_agent_companies_parser();
     init_agent_companies_exporter();
     init_chat_store();
+    init_oauth_credential_interop();
     init_error_message();
   }
 });
@@ -54278,12 +54543,12 @@ var init_github_provider = __esm({
 });
 
 // ../engine/src/skill-resolver.ts
-import { existsSync as existsSync19, readFileSync as readFileSync6 } from "node:fs";
-import { dirname as dirname8, join as join22, resolve as resolve11 } from "node:path";
+import { existsSync as existsSync20, readFileSync as readFileSync7 } from "node:fs";
+import { dirname as dirname8, join as join23, resolve as resolve11 } from "node:path";
 function resolveProjectRoot(cwd) {
   let current = resolve11(cwd);
   while (true) {
-    if (existsSync19(join22(current, ".fusion"))) {
+    if (existsSync20(join23(current, ".fusion"))) {
       return current;
     }
     const parent = dirname8(current);
@@ -54294,19 +54559,19 @@ function resolveProjectRoot(cwd) {
   }
 }
 function readJsonObject(path2) {
-  if (!existsSync19(path2)) {
+  if (!existsSync20(path2)) {
     return {};
   }
   try {
-    const parsed = JSON.parse(readFileSync6(path2, "utf-8"));
+    const parsed = JSON.parse(readFileSync7(path2, "utf-8"));
     return parsed && typeof parsed === "object" ? parsed : {};
   } catch {
     return {};
   }
 }
 function readProjectSettings(projectRootDir) {
-  const fusionSettings = join22(projectRootDir, ".fusion", "settings.json");
-  if (existsSync19(fusionSettings)) {
+  const fusionSettings = join23(projectRootDir, ".fusion", "settings.json");
+  if (existsSync20(fusionSettings)) {
     const parsed = readJsonObject(fusionSettings);
     return {
       skills: Array.isArray(parsed.skills) ? parsed.skills : void 0,
@@ -54324,6 +54589,9 @@ function normalizePattern(pattern) {
 function isExclusionPattern(pattern) {
   return pattern.startsWith("-");
 }
+function bareSkillName(name) {
+  return name.replace(/\/SKILL\.md$/i, "");
+}
 function resolveSessionSkills(context) {
   const { requestedSkillNames } = context;
   const projectRootDir = resolveProjectRoot(context.projectRootDir);
@@ -54417,25 +54685,40 @@ function createSkillsOverrideFromSelection(selection, options = {}) {
     const hasRequestedNames = Boolean(requestedSkillNames && requestedSkillNames.length > 0);
     const hasExcluded = excludedSkillPaths.size > 0;
     let filteredSkills;
+    const skillNameMatches = (skill, pattern) => bareSkillName(skill.name).toLowerCase() === bareSkillName(pattern).toLowerCase() || skill.filePath === pattern;
+    const isExcluded = (skill) => {
+      for (const ep of excludedSkillPaths) {
+        if (skillNameMatches(skill, ep)) return true;
+      }
+      return false;
+    };
+    const isAllowed = (skill) => {
+      for (const ap of allowedSkillPaths) {
+        if (skillNameMatches(skill, ap)) return true;
+      }
+      return false;
+    };
     if (hasRequestedNames) {
-      const requestedNamesLower = new Set(requestedSkillNames.map((n) => n.toLowerCase()));
+      const requestedBareNamesLower = new Set(requestedSkillNames.map((n) => bareSkillName(n).toLowerCase()));
       filteredSkills = base.skills.filter(
-        (skill) => requestedNamesLower.has(skill.name.toLowerCase()) && !excludedSkillPaths.has(skill.filePath)
+        (skill) => requestedBareNamesLower.has(bareSkillName(skill.name).toLowerCase()) && !isExcluded(skill)
       );
     } else if (hasPatterns) {
       filteredSkills = base.skills.filter(
-        (skill) => allowedSkillPaths.has(skill.filePath) && !excludedSkillPaths.has(skill.filePath)
+        (skill) => isAllowed(skill) && !isExcluded(skill)
       );
     } else if (hasExcluded) {
-      filteredSkills = base.skills.filter((skill) => !excludedSkillPaths.has(skill.filePath));
+      filteredSkills = base.skills.filter((skill) => !isExcluded(skill));
     } else {
       filteredSkills = base.skills;
     }
     const newDiagnostics = [];
     const purpose = sessionPurpose ? ` [${sessionPurpose}]` : "";
-    const discoveredPaths = new Set(base.skills.map((s) => s.filePath));
+    const discoveredBareNames = new Set(base.skills.map((s) => bareSkillName(s.name).toLowerCase()));
+    const discoveredFilePaths = new Set(base.skills.map((s) => s.filePath));
+    const hasDiscoveredMatch = (pattern) => discoveredBareNames.has(bareSkillName(pattern).toLowerCase()) || discoveredFilePaths.has(pattern);
     for (const excludedPath of excludedSkillPaths) {
-      if (discoveredPaths.has(excludedPath)) {
+      if (hasDiscoveredMatch(excludedPath)) {
         newDiagnostics.push({
           type: "warning",
           message: `Skill at '${excludedPath}' exists but is disabled by project execution settings${purpose}`,
@@ -54444,7 +54727,7 @@ function createSkillsOverrideFromSelection(selection, options = {}) {
       }
     }
     for (const allowedPath of allowedSkillPaths) {
-      if (!discoveredPaths.has(allowedPath)) {
+      if (!hasDiscoveredMatch(allowedPath)) {
         newDiagnostics.push({
           type: "warning",
           message: `Configured skill pattern '${allowedPath}' not found in discovered skills${purpose}`,
@@ -54453,9 +54736,9 @@ function createSkillsOverrideFromSelection(selection, options = {}) {
       }
     }
     if (requestedSkillNames) {
-      const discoveredNamesLower = new Set(base.skills.map((s) => s.name.toLowerCase()));
+      const discoveredBareNamesLower = new Set(base.skills.map((s) => bareSkillName(s.name).toLowerCase()));
       for (const requestedName of requestedSkillNames) {
-        if (!discoveredNamesLower.has(requestedName.toLowerCase()) && !isBuiltInFallbackRequest(requestedName)) {
+        if (!discoveredBareNamesLower.has(bareSkillName(requestedName).toLowerCase()) && !isBuiltInFallbackRequest(requestedName)) {
           const purpose2 = sessionPurpose ? ` [${sessionPurpose}]` : "";
           newDiagnostics.push({
             type: "warning",
@@ -54531,51 +54814,51 @@ var init_context_limit_detector = __esm({
 });
 
 // ../engine/src/auth-storage.ts
-import { existsSync as existsSync20, readFileSync as readFileSync7 } from "node:fs";
-import { homedir as homedir4 } from "node:os";
-import { join as join23 } from "node:path";
+import { existsSync as existsSync21, readFileSync as readFileSync8 } from "node:fs";
+import { homedir as homedir5 } from "node:os";
+import { join as join24 } from "node:path";
 import { AuthStorage } from "@mariozechner/pi-coding-agent";
 import { getOAuthProvider } from "@mariozechner/pi-ai/oauth";
-function getHomeDir4() {
-  return process.env.HOME || process.env.USERPROFILE || homedir4();
+function getHomeDir5() {
+  return process.env.HOME || process.env.USERPROFILE || homedir5();
 }
-function getFusionAuthPath(home = getHomeDir4()) {
-  return join23(home, ".fusion", "agent", "auth.json");
+function getFusionAuthPath(home = getHomeDir5()) {
+  return join24(home, ".fusion", "agent", "auth.json");
 }
-function getFusionModelsPath(home = getHomeDir4()) {
-  return join23(home, ".fusion", "agent", "models.json");
+function getFusionModelsPath(home = getHomeDir5()) {
+  return join24(home, ".fusion", "agent", "models.json");
+}
+function getLegacyAuthPaths(home = getHomeDir5()) {
+  return [
+    join24(home, ".pi", "agent", "auth.json"),
+    join24(home, ".pi", "auth.json")
+  ];
 }
-function getLegacyAuthPaths(home = getHomeDir4()) {
+function getSupplementalAuthPaths(home = getHomeDir5()) {
   return [
-    join23(home, ".pi", "agent", "auth.json"),
-    join23(home, ".pi", "auth.json")
+    ...getLegacyAuthPaths(home),
+    getCodexCliAuthPath(home)
   ];
 }
-function getLegacyModelsPaths(home = getHomeDir4()) {
+function getLegacyModelsPaths(home = getHomeDir5()) {
   return [
-    join23(home, ".pi", "agent", "models.json"),
-    join23(home, ".pi", "models.json")
+    join24(home, ".pi", "agent", "models.json"),
+    join24(home, ".pi", "models.json")
   ];
 }
-function getModelRegistryModelsPath(home = getHomeDir4()) {
+function getModelRegistryModelsPath(home = getHomeDir5()) {
   const fusionModelsPath = getFusionModelsPath(home);
-  if (existsSync20(fusionModelsPath)) {
+  if (existsSync21(fusionModelsPath)) {
     return fusionModelsPath;
   }
-  return getLegacyModelsPaths(home).find((modelsPath) => existsSync20(modelsPath)) ?? fusionModelsPath;
+  return getLegacyModelsPaths(home).find((modelsPath) => existsSync21(modelsPath)) ?? fusionModelsPath;
 }
-function readLegacyCredentials(authPaths = getLegacyAuthPaths()) {
+function readSupplementalCredentials(authPaths = getSupplementalAuthPaths()) {
   const credentials = {};
   for (const authPath of authPaths) {
-    if (!existsSync20(authPath)) {
-      continue;
-    }
-    try {
-      const parsed = JSON.parse(readFileSync7(authPath, "utf-8"));
-      for (const [provider, credential] of Object.entries(parsed)) {
-        credentials[provider] ??= credential;
-      }
-    } catch {
+    const parsed = readStoredCredentialsFromAuthFile(authPath);
+    for (const [provider, credential] of Object.entries(parsed)) {
+      credentials[provider] = choosePreferredStoredCredential(credentials[provider], credential) ?? credential;
     }
   }
   return credentials;
@@ -54599,14 +54882,14 @@ function resolveStoredCredentialApiKey(providerId, credential) {
   }
   return void 0;
 }
-function readModelsJsonApiKeys(home = getHomeDir4()) {
+function readModelsJsonApiKeys(home = getHomeDir5()) {
   const apiKeys = /* @__PURE__ */ new Map();
   const modelsPath = getModelRegistryModelsPath(home);
-  if (!existsSync20(modelsPath)) {
+  if (!existsSync21(modelsPath)) {
     return apiKeys;
   }
   try {
-    const parsed = JSON.parse(readFileSync7(modelsPath, "utf-8"));
+    const parsed = JSON.parse(readFileSync8(modelsPath, "utf-8"));
     const providers = parsed?.providers;
     if (providers) {
       for (const [providerId, config] of Object.entries(providers)) {
@@ -54621,8 +54904,20 @@ function readModelsJsonApiKeys(home = getHomeDir4()) {
 }
 function createFusionAuthStorage() {
   const primary = AuthStorage.create(getFusionAuthPath());
-  let legacyCredentials = readLegacyCredentials();
+  let supplementalCredentials = readSupplementalCredentials();
   let modelsJsonApiKeys = readModelsJsonApiKeys();
+  const syncSupplementalOauthCredentials = () => {
+    for (const [provider, credential] of Object.entries(supplementalCredentials)) {
+      const current = primary.get(provider);
+      if (!shouldHydrateStoredCredential(current, credential)) {
+        continue;
+      }
+      if (credential.type === "oauth" || credential.type === "api_key") {
+        primary.set(provider, credential);
+      }
+    }
+  };
+  syncSupplementalOauthCredentials();
   return new Proxy(primary, {
     // Forward property writes to the target so that methods like
     // `setFallbackResolver` (called by ModelRegistry) correctly update the
@@ -54636,31 +54931,51 @@ function createFusionAuthStorage() {
       if (prop === "reload") {
         return () => {
           target.reload();
-          legacyCredentials = readLegacyCredentials();
+          supplementalCredentials = readSupplementalCredentials();
+          syncSupplementalOauthCredentials();
           modelsJsonApiKeys = readModelsJsonApiKeys();
         };
       }
       if (prop === "get") {
-        return (provider) => target.get(provider) ?? legacyCredentials[provider];
+        return (provider) => choosePreferredStoredCredential(
+          target.get(provider),
+          supplementalCredentials[provider]
+        );
       }
       if (prop === "has") {
-        return (provider) => target.has(provider) || provider in legacyCredentials || modelsJsonApiKeys.has(provider);
+        return (provider) => target.has(provider) || provider in supplementalCredentials || modelsJsonApiKeys.has(provider);
       }
       if (prop === "hasAuth") {
-        return (provider) => target.hasAuth(provider) || Boolean(legacyCredentials[provider]) || modelsJsonApiKeys.has(provider);
+        return (provider) => target.hasAuth(provider) || Boolean(supplementalCredentials[provider]) || modelsJsonApiKeys.has(provider);
       }
       if (prop === "getAll") {
-        return () => ({ ...legacyCredentials, ...target.getAll() });
+        return () => {
+          const providerIds = /* @__PURE__ */ new Set([
+            ...Object.keys(supplementalCredentials),
+            ...Object.keys(target.getAll())
+          ]);
+          const merged = {};
+          for (const providerId of providerIds) {
+            const credential = choosePreferredStoredCredential(
+              target.get(providerId),
+              supplementalCredentials[providerId]
+            );
+            if (credential) {
+              merged[providerId] = credential;
+            }
+          }
+          return merged;
+        };
       }
       if (prop === "list") {
-        return () => Array.from(/* @__PURE__ */ new Set([...Object.keys(legacyCredentials), ...target.list(), ...modelsJsonApiKeys.keys()]));
+        return () => Array.from(/* @__PURE__ */ new Set([...Object.keys(supplementalCredentials), ...target.list(), ...modelsJsonApiKeys.keys()]));
       }
       if (prop === "getApiKey") {
         return async (provider) => {
           const primaryKey = await target.getApiKey(provider);
           if (primaryKey) return primaryKey;
-          const legacyKey = resolveStoredCredentialApiKey(provider, legacyCredentials[provider]);
-          if (legacyKey) return legacyKey;
+          const supplementalKey = resolveStoredCredentialApiKey(provider, supplementalCredentials[provider]);
+          if (supplementalKey) return supplementalKey;
           return modelsJsonApiKeys.get(provider);
         };
       }
@@ -54671,17 +54986,18 @@ function createFusionAuthStorage() {
 var init_auth_storage = __esm({
   "../engine/src/auth-storage.ts"() {
     "use strict";
+    init_src();
   }
 });
 
 // ../engine/src/custom-providers.ts
-import { readFileSync as readFileSync8 } from "node:fs";
-import { homedir as homedir5 } from "node:os";
-import { join as join24 } from "node:path";
+import { readFileSync as readFileSync9 } from "node:fs";
+import { homedir as homedir6 } from "node:os";
+import { join as join25 } from "node:path";
 function readCustomProviders() {
   try {
-    const settingsPath = join24(homedir5(), ".fusion", "settings.json");
-    const raw = readFileSync8(settingsPath, "utf-8");
+    const settingsPath = join25(homedir6(), ".fusion", "settings.json");
+    const raw = readFileSync9(settingsPath, "utf-8");
     const parsed = JSON.parse(raw);
     return Array.isArray(parsed.customProviders) ? parsed.customProviders : [];
   } catch {
@@ -54695,11 +55011,11 @@ var init_custom_providers = __esm({
 });
 
 // ../engine/src/pi.ts
-import { existsSync as existsSync21, readFileSync as readFileSync9 } from "node:fs";
+import { existsSync as existsSync22, readFileSync as readFileSync10 } from "node:fs";
 import { exec as exec2 } from "node:child_process";
 import { promisify as promisify3 } from "node:util";
 import { createRequire as createRequire2 } from "node:module";
-import { basename as basename7, dirname as dirname9, join as join25, relative as relative3, isAbsolute as isAbsolute7, resolve as resolve12 } from "node:path";
+import { basename as basename7, dirname as dirname9, join as join26, relative as relative3, isAbsolute as isAbsolute7, resolve as resolve12 } from "node:path";
 import {
   createAgentSession,
   createBashTool,
@@ -54776,6 +55092,11 @@ async function promptSessionAndCheck(session, prompt, options) {
         piLog.warn(`pi state error \u2014 failed to inspect transcript: ${inspectErr instanceof Error ? inspectErr.message : String(inspectErr)}`);
       }
     }
+    if (/Provider finish_reason:\s*repeat\b/i.test(stateError)) {
+      piLog.warn(`pi state error \u2014 treating provider finish_reason=repeat as soft stop: ${stateError}`);
+      clearSessionStateError(session);
+      return;
+    }
     throw new Error(stateError);
   }
 }
@@ -54953,11 +55274,11 @@ function isRetryableModelSelectionError(message) {
   return normalized.includes("rate limit") || normalized.includes("too many requests") || normalized.includes("429") || normalized.includes("401") || normalized.includes("403") || normalized.includes("unauthorized") || normalized.includes("forbidden") || normalized.includes("authentication") || normalized.includes("invalid api key") || normalized.includes("invalid key") || normalized.includes("api key") || normalized.includes("overloaded") || normalized.includes("quota") || normalized.includes("capacity") || normalized.includes("temporarily unavailable") || normalized.includes("invalid temperature");
 }
 function readJsonObject2(path2) {
-  if (!existsSync21(path2)) {
+  if (!existsSync22(path2)) {
     return {};
   }
   try {
-    const parsed = JSON.parse(readFileSync9(path2, "utf-8"));
+    const parsed = JSON.parse(readFileSync10(path2, "utf-8"));
     return parsed && typeof parsed === "object" ? parsed : {};
   } catch {
     return {};
@@ -55094,17 +55415,17 @@ function siblingAgentDir(agentDir, siblingRoot) {
   if (basename7(agentDir) !== "agent") {
     return void 0;
   }
-  return join25(dirname9(dirname9(agentDir)), siblingRoot, "agent");
+  return join26(dirname9(dirname9(agentDir)), siblingRoot, "agent");
 }
 function createReadOnlyPiSettingsView(cwd, agentDir) {
   const projectRoot = resolvePiExtensionProjectRoot(cwd);
-  const fusionAgentDir = agentDir.includes(`${join25(".fusion", "agent")}`) ? agentDir : siblingAgentDir(agentDir, ".fusion");
-  const legacyAgentDir = agentDir.includes(`${join25(".pi", "agent")}`) ? agentDir : siblingAgentDir(agentDir, ".pi");
-  const legacyGlobalSettings = legacyAgentDir ? readJsonObject2(join25(legacyAgentDir, "settings.json")) : {};
-  const fusionGlobalSettings = fusionAgentDir ? readJsonObject2(join25(fusionAgentDir, "settings.json")) : {};
-  const directGlobalSettings = readJsonObject2(join25(agentDir, "settings.json"));
+  const fusionAgentDir = agentDir.includes(`${join26(".fusion", "agent")}`) ? agentDir : siblingAgentDir(agentDir, ".fusion");
+  const legacyAgentDir = agentDir.includes(`${join26(".pi", "agent")}`) ? agentDir : siblingAgentDir(agentDir, ".pi");
+  const legacyGlobalSettings = legacyAgentDir ? readJsonObject2(join26(legacyAgentDir, "settings.json")) : {};
+  const fusionGlobalSettings = fusionAgentDir ? readJsonObject2(join26(fusionAgentDir, "settings.json")) : {};
+  const directGlobalSettings = readJsonObject2(join26(agentDir, "settings.json"));
   const globalSettings = { ...legacyGlobalSettings, ...directGlobalSettings, ...fusionGlobalSettings };
-  const fusionProjectSettings = readJsonObject2(join25(projectRoot, ".fusion", "settings.json"));
+  const fusionProjectSettings = readJsonObject2(join26(projectRoot, ".fusion", "settings.json"));
   const mergedSettings = { ...globalSettings, ...fusionProjectSettings };
   return {
     getGlobalSettings: () => structuredClone(globalSettings),
@@ -55115,27 +55436,27 @@ function createReadOnlyPiSettingsView(cwd, agentDir) {
 function getPackageManagerAgentDir() {
   const fusionAgentDir = getFusionAgentDir();
   const legacyAgentDir = getLegacyPiAgentDir();
-  const fusionSettings = readJsonObject2(join25(fusionAgentDir, "settings.json"));
-  const legacySettings = readJsonObject2(join25(legacyAgentDir, "settings.json"));
-  if (hasPackageManagerSettings(fusionSettings) || !existsSync21(legacyAgentDir)) {
+  const fusionSettings = readJsonObject2(join26(fusionAgentDir, "settings.json"));
+  const legacySettings = readJsonObject2(join26(legacyAgentDir, "settings.json"));
+  if (hasPackageManagerSettings(fusionSettings) || !existsSync22(legacyAgentDir)) {
     return fusionAgentDir;
   }
   if (hasPackageManagerSettings(legacySettings)) {
     return legacyAgentDir;
   }
-  return existsSync21(fusionAgentDir) ? fusionAgentDir : legacyAgentDir;
+  return existsSync22(fusionAgentDir) ? fusionAgentDir : legacyAgentDir;
 }
 function resolveVendoredClaudeCliEntry() {
   try {
     const require_ = createRequire2(import.meta.url);
     const pkgJsonPath = require_.resolve("@fusion/pi-claude-cli/package.json");
-    const pkgJson = JSON.parse(readFileSync9(pkgJsonPath, "utf-8"));
+    const pkgJson = JSON.parse(readFileSync10(pkgJsonPath, "utf-8"));
     const extensions = pkgJson.pi?.extensions;
     if (!Array.isArray(extensions) || extensions.length === 0) return null;
     const entry = extensions[0];
     if (typeof entry !== "string" || entry.length === 0) return null;
     const path2 = resolve12(dirname9(pkgJsonPath), entry);
-    return existsSync21(path2) ? path2 : null;
+    return existsSync22(path2) ? path2 : null;
   } catch {
     return null;
   }
@@ -55144,13 +55465,13 @@ function resolveVendoredDroidCliEntry() {
   try {
     const require_ = createRequire2(import.meta.url);
     const pkgJsonPath = require_.resolve("@fusion/droid-cli/package.json");
-    const pkgJson = JSON.parse(readFileSync9(pkgJsonPath, "utf-8"));
+    const pkgJson = JSON.parse(readFileSync10(pkgJsonPath, "utf-8"));
     const extensions = pkgJson.pi?.extensions;
     if (!Array.isArray(extensions) || extensions.length === 0) return null;
     const entry = extensions[0];
     if (typeof entry !== "string" || entry.length === 0) return null;
     const path2 = resolve12(dirname9(pkgJsonPath), entry);
-    return existsSync21(path2) ? path2 : null;
+    return existsSync22(path2) ? path2 : null;
   } catch {
     return null;
   }
@@ -55178,7 +55499,7 @@ async function registerExtensionProviders(cwd, modelRegistry) {
     const extensionsResult = await discoverAndLoadExtensions(
       doubleReconciledPaths,
       cwd,
-      join25(resolvePiExtensionProjectRoot(cwd), ".fusion", "disabled-auto-extension-discovery")
+      join26(resolvePiExtensionProjectRoot(cwd), ".fusion", "disabled-auto-extension-discovery")
     );
     for (const { path: path2, error } of extensionsResult.errors) {
       extensionsLog.warn(`Failed to load ${path2}: ${error}`);
@@ -55233,10 +55554,10 @@ async function isCompleteGitWorktree(worktreePath) {
   }
 }
 async function assertValidWorktreeSession(cwd, projectRoot) {
-  if (!existsSync21(cwd)) {
+  if (!existsSync22(cwd)) {
     throw new Error(`Refusing to start coding agent in missing worktree: ${cwd}`);
   }
-  if (!existsSync21(join25(cwd, ".git")) || !await isCompleteGitWorktree(cwd)) {
+  if (!existsSync22(join26(cwd, ".git")) || !await isCompleteGitWorktree(cwd)) {
     throw new Error(`Refusing to start coding agent in incomplete worktree: ${cwd}`);
   }
   if (!await isRegisteredGitWorktree(projectRoot, cwd)) {
@@ -55817,7 +56138,7 @@ ${source.content ?? ""}`;
 
 // ../engine/src/research/providers/local-docs-provider.ts
 import { promises as fs } from "node:fs";
-import { extname as extname2, join as join26, relative as relative4, resolve as resolve13 } from "node:path";
+import { extname as extname2, join as join27, relative as relative4, resolve as resolve13 } from "node:path";
 function buildExcerpt(content, terms) {
   const lower = content.toLowerCase();
   const first = terms.find((term) => lower.includes(term));
@@ -55946,7 +56267,7 @@ var init_local_docs_provider = __esm({
         const rootEntries = await fs.readdir(this.projectRoot, { withFileTypes: true });
         for (const entry of rootEntries) {
           if (entry.isFile() && entry.name.toLowerCase().endsWith(".md")) {
-            files.push(join26(this.projectRoot, entry.name));
+            files.push(join27(this.projectRoot, entry.name));
           }
         }
         return [...new Set(files)];
@@ -55956,7 +56277,7 @@ var init_local_docs_provider = __esm({
         const entries = await fs.readdir(dir, { withFileTypes: true });
         for (const entry of entries) {
           this.throwIfAborted(signal);
-          const fullPath = join26(dir, entry.name);
+          const fullPath = join27(dir, entry.name);
           const relPath = relative4(this.projectRoot, fullPath).replace(/\\/g, "/");
           if (matchesGitignore(relPath, ignorePatterns)) continue;
           if (entry.isDirectory()) {
@@ -55981,7 +56302,7 @@ var init_local_docs_provider = __esm({
       }
       async readGitignore() {
         try {
-          const content = await fs.readFile(join26(this.projectRoot, ".gitignore"), "utf-8");
+          const content = await fs.readFile(join27(this.projectRoot, ".gitignore"), "utf-8");
           return content.split(/\r?\n/).map((line) => line.trim()).filter((line) => line && !line.startsWith("#"));
         } catch {
           return [];
@@ -56591,9 +56912,9 @@ var init_research_step_runner = __esm({
 
 // ../engine/src/agent-tools.ts
 import { appendFile as appendFile3, mkdir as mkdir11, readFile as readFile12, readdir as readdir7, stat as stat4, writeFile as writeFile10 } from "node:fs/promises";
-import { existsSync as existsSync22 } from "node:fs";
+import { existsSync as existsSync23 } from "node:fs";
 import { createHash as createHash4 } from "node:crypto";
-import { join as join27 } from "node:path";
+import { join as join28 } from "node:path";
 import { Type } from "@mariozechner/pi-ai";
 function sanitizeAgentMemoryId(agentId) {
   return agentId.trim().replace(/[^a-zA-Z0-9._-]+/g, "-").replace(/^-+|-+$/g, "") || "agent";
@@ -56605,16 +56926,16 @@ function agentDreamsDisplayPath(agentId) {
   return `${AGENT_MEMORY_ROOT2}/${sanitizeAgentMemoryId(agentId)}/${AGENT_DREAMS_FILENAME2}`;
 }
 function agentMemoryDirectory(rootDir, agentId) {
-  return join27(rootDir, AGENT_MEMORY_ROOT2, sanitizeAgentMemoryId(agentId));
+  return join28(rootDir, AGENT_MEMORY_ROOT2, sanitizeAgentMemoryId(agentId));
 }
 function agentMemoryFilePath(rootDir, agentId) {
-  return join27(agentMemoryDirectory(rootDir, agentId), AGENT_MEMORY_FILENAME2);
+  return join28(agentMemoryDirectory(rootDir, agentId), AGENT_MEMORY_FILENAME2);
 }
 function agentDreamsFilePath(rootDir, agentId) {
-  return join27(agentMemoryDirectory(rootDir, agentId), AGENT_DREAMS_FILENAME2);
+  return join28(agentMemoryDirectory(rootDir, agentId), AGENT_DREAMS_FILENAME2);
 }
 function agentDailyFilePath(rootDir, agentId, date = /* @__PURE__ */ new Date()) {
-  return join27(agentMemoryDirectory(rootDir, agentId), `${date.toISOString().slice(0, 10)}.md`);
+  return join28(agentMemoryDirectory(rootDir, agentId), `${date.toISOString().slice(0, 10)}.md`);
 }
 function qmdAgentMemoryCollectionName(rootDir, agentId) {
   const hash = createHash4("sha1").update(`${rootDir}:${agentId}`).digest("hex").slice(0, 12);
@@ -56650,7 +56971,7 @@ async function syncAgentMemoryFile(rootDir, agentMemory) {
   const dir = agentMemoryDirectory(rootDir, agentMemory.agentId);
   await mkdir11(dir, { recursive: true });
   const longTermPath = agentMemoryFilePath(rootDir, agentMemory.agentId);
-  if (!existsSync22(longTermPath)) {
+  if (!existsSync23(longTermPath)) {
     const title = agentMemory.agentName?.trim() ? `# Agent Memory: ${agentMemory.agentName.trim()}` : "# Agent Memory";
     const fileContent = `${title}
 
@@ -56661,11 +56982,11 @@ ${content || ""}
     await writeFile10(longTermPath, fileContent, "utf-8");
   }
   const dreamsPath = agentDreamsFilePath(rootDir, agentMemory.agentId);
-  if (!existsSync22(dreamsPath)) {
+  if (!existsSync23(dreamsPath)) {
     await writeFile10(dreamsPath, "# Agent Memory Dreams\n\n<!-- Synthesized patterns from this agent's daily notes. -->\n", "utf-8");
   }
   const dailyPath = agentDailyFilePath(rootDir, agentMemory.agentId);
-  if (!existsSync22(dailyPath)) {
+  if (!existsSync23(dailyPath)) {
     await writeFile10(dailyPath, `# Agent Daily Memory ${(/* @__PURE__ */ new Date()).toISOString().slice(0, 10)}
 
 <!-- Running observations for this agent. -->
@@ -56689,7 +57010,7 @@ async function listAgentMemoryFiles2(rootDir, agentMemory) {
   }
   for (const entry of entries) {
     if (!DAILY_AGENT_MEMORY_RE2.test(entry)) continue;
-    const absPath = join27(dir, entry);
+    const absPath = join28(dir, entry);
     const fileStat = await stat4(absPath);
     if (fileStat.isFile()) {
       files.push({
@@ -56851,7 +57172,7 @@ function resolveAgentMemoryPath(rootDir, agentId, path2) {
     return null;
   }
   return {
-    absPath: join27(agentMemoryDirectory(rootDir, agentId), filename),
+    absPath: join28(agentMemoryDirectory(rootDir, agentId), filename),
     displayPath: `${prefix}${filename}`
   };
 }
@@ -57957,9 +58278,18 @@ function normalizeAgentSkills(metadataSkills) {
         name = namedEntry.trim();
       }
     }
-    if (name && name.length > 0 && !seen.has(name)) {
-      seen.add(name);
-      result.push(name);
+    if (name && name.length > 0) {
+      if (name.includes("::")) {
+        const idPath = name.split("::").pop();
+        const parts = idPath.replace(/\\/g, "/").split("/").filter(Boolean);
+        if (parts.length >= 2) {
+          name = parts.slice(-2).join("/");
+        }
+      }
+      if (!seen.has(name)) {
+        seen.add(name);
+        result.push(name);
+      }
     }
   }
   return result;
@@ -59148,6 +59478,38 @@ var init_notifier = __esm({
   }
 });
 
+// ../engine/src/fallback-model-observer.ts
+function buildFallbackLogMessage(label, payload) {
+  return `[fallback] ${label} switched from ${payload.primaryModel} to ${payload.fallbackModel} (${payload.triggerPoint})`;
+}
+function createFallbackModelObserver(options) {
+  return async (payload) => {
+    const taskId = options.taskId ?? payload.taskId;
+    const taskTitle = options.taskTitle ?? payload.taskTitle;
+    const message = buildFallbackLogMessage(options.label, payload);
+    if (taskId && options.store?.logEntry) {
+      await options.store.logEntry(taskId, message).catch(() => void 0);
+    }
+    if (taskId && options.store?.appendAgentLog) {
+      await options.store.appendAgentLog(taskId, message, "text", void 0, options.agent).catch(() => void 0);
+    }
+    await notifyFallbackUsed({
+      primaryModel: payload.primaryModel,
+      fallbackModel: payload.fallbackModel,
+      triggerPoint: payload.triggerPoint,
+      taskId,
+      taskTitle,
+      timestamp: payload.timestamp
+    });
+  };
+}
+var init_fallback_model_observer = __esm({
+  "../engine/src/fallback-model-observer.ts"() {
+    "use strict";
+    init_notifier();
+  }
+});
+
 // ../engine/src/reviewer.ts
 async function reviewStep(cwd, taskId, stepNumber, stepName, reviewType, promptContent, baseline, options = {}) {
   let liveSettings = options.settings;
@@ -59278,7 +59640,13 @@ async function reviewStep(cwd, taskId, stepNumber, stepName, reviewType, promptC
       ...skillContext?.skillSelectionContext ? { skillSelection: skillContext.skillSelectionContext } : {},
       taskId: options.taskId,
       taskTitle: options.taskTitle,
-      onFallbackModelUsed: notifyFallbackUsed,
+      onFallbackModelUsed: createFallbackModelObserver({
+        agent: "reviewer",
+        label: "reviewer",
+        store: options.store,
+        taskId: options.taskId,
+        taskTitle: options.taskTitle
+      }),
       beforeSpawnSession: async () => {
         if (!options.store) return;
         let finalSettings;
@@ -59465,7 +59833,7 @@ var init_reviewer = __esm({
     init_logger2();
     init_usage_limit_detector();
     init_agent_instructions();
-    init_notifier();
+    init_fallback_model_observer();
     init_agent_tools();
     REVIEWER_SYSTEM_PROMPT = `You are an independent code and plan reviewer.
 
@@ -59826,7 +60194,7 @@ var init_recovery_policy = __esm({
 // ../engine/src/triage.ts
 import { Type as Type2 } from "@mariozechner/pi-ai";
 import { readFile as readFile14 } from "node:fs/promises";
-import { join as join28 } from "node:path";
+import { join as join29 } from "node:path";
 function extractPromptDeclaredTitle(prompt, taskId) {
   const headingMatch = prompt.match(/^#\s+Task:\s+([A-Z]+-\d+)\s+-\s+(.+)$/m);
   if (!headingMatch) return null;
@@ -59855,9 +60223,9 @@ async function readAttachmentContents(rootDir, taskId, attachments) {
     return { attachmentContents, imageContents };
   }
   const { readFile: readFile20 } = await import("node:fs/promises");
-  const { join: join42 } = await import("node:path");
+  const { join: join43 } = await import("node:path");
   for (const att of attachments) {
-    const filePath = join42(
+    const filePath = join43(
       rootDir,
       ".fusion",
       "tasks",
@@ -60082,7 +60450,7 @@ var init_triage = __esm({
     init_concurrency();
     init_agent_logger();
     init_agent_instructions();
-    init_notifier();
+    init_fallback_model_observer();
     init_logger2();
     init_usage_limit_detector();
     init_transient_error_detector();
@@ -60692,7 +61060,7 @@ Write the PROMPT.md directly using the write tool, then call \`fn_review_spec()\
           return false;
         }
         const settings = await this.store.getSettings();
-        const promptPath = join28(this.rootDir, ".fusion", "tasks", task.id, "PROMPT.md");
+        const promptPath = join29(this.rootDir, ".fusion", "tasks", task.id, "PROMPT.md");
         const written = await readFile14(promptPath, "utf-8").catch((err) => {
           const msg = err instanceof Error ? err.message : String(err);
           planLog.warn(`${task.id}: failed to read PROMPT.md during approved-spec recovery (${promptPath}): ${msg}`);
@@ -60922,7 +61290,13 @@ Write the PROMPT.md directly using the write tool, then call \`fn_review_spec()\
               ...skillContext.skillSelectionContext ? { skillSelection: skillContext.skillSelectionContext } : {},
               taskId: task.id,
               taskTitle: task.title,
-              onFallbackModelUsed: notifyFallbackUsed
+              onFallbackModelUsed: createFallbackModelObserver({
+                agent: "triage",
+                label: "triage",
+                store: this.store,
+                taskId: task.id,
+                taskTitle: task.title
+              })
             });
             const modelDesc = describeModel(session);
             planLog.log(`${task.id}: using model ${modelDesc}`);
@@ -61065,7 +61439,13 @@ Write the PROMPT.md directly using the write tool, then call \`fn_review_spec()\
                   ...skillContext.skillSelectionContext ? { skillSelection: skillContext.skillSelectionContext } : {},
                   taskId: task.id,
                   taskTitle: task.title,
-                  onFallbackModelUsed: notifyFallbackUsed
+                  onFallbackModelUsed: createFallbackModelObserver({
+                    agent: "triage",
+                    label: "triage",
+                    store: this.store,
+                    taskId: task.id,
+                    taskTitle: task.title
+                  })
                 });
                 session = fallbackResult.session;
                 const fallbackModelDesc = describeModel(session);
@@ -61150,7 +61530,7 @@ Write the PROMPT.md directly using the write tool, then call \`fn_review_spec()\
                 return;
               }
               const written = await readFile14(
-                join28(this.rootDir, promptPath),
+                join29(this.rootDir, promptPath),
                 "utf-8"
               ).catch((err) => {
                 const msg = err instanceof Error ? err.message : String(err);
@@ -61469,9 +61849,9 @@ Remove or replace these ids and call fn_task_create again.`
             }
             try {
               const { readFile: readFile20 } = await import("node:fs/promises");
-              const { join: join42 } = await import("node:path");
+              const { join: join43 } = await import("node:path");
               const promptContent = await readFile20(
-                join42(rootDir, promptPath),
+                join43(rootDir, promptPath),
                 "utf-8"
               ).catch((err) => {
                 const msg = err instanceof Error ? err.message : String(err);
@@ -61699,160 +62079,8 @@ Take a completely different approach to writing this specification. Do NOT repea
   }
 });
 
-// ../engine/src/session-token-usage.ts
-var session_token_usage_exports = {};
-__export(session_token_usage_exports, {
-  accumulateSessionTokenUsage: () => accumulateSessionTokenUsage
-});
-function readSessionStats(session) {
-  const accessor = session.getSessionStats;
-  if (typeof accessor !== "function") return void 0;
-  try {
-    return accessor.call(session);
-  } catch {
-    return void 0;
-  }
-}
-async function accumulateSessionTokenUsage(store, taskId, session) {
-  try {
-    const stats = readSessionStats(session);
-    const tokens = stats?.tokens;
-    if (!tokens) return;
-    const currentInput = (tokens.input ?? 0) + (tokens.cacheWrite ?? 0);
-    const currentOutput = tokens.output ?? 0;
-    const currentCached = tokens.cacheRead ?? 0;
-    const baseline = sessionBaselines.get(session) ?? { input: 0, output: 0, cached: 0 };
-    const inputDelta = Math.max(0, currentInput - baseline.input);
-    const outputDelta = Math.max(0, currentOutput - baseline.output);
-    const cachedDelta = Math.max(0, currentCached - baseline.cached);
-    sessionBaselines.set(session, {
-      input: currentInput,
-      output: currentOutput,
-      cached: currentCached
-    });
-    if (inputDelta === 0 && outputDelta === 0 && cachedDelta === 0) return;
-    const task = await store.getTask(taskId);
-    const now = (/* @__PURE__ */ new Date()).toISOString();
-    const newInput = (task.tokenUsage?.inputTokens ?? 0) + inputDelta;
-    const newOutput = (task.tokenUsage?.outputTokens ?? 0) + outputDelta;
-    const newCached = (task.tokenUsage?.cachedTokens ?? 0) + cachedDelta;
-    await store.updateTask(taskId, {
-      tokenUsage: {
-        inputTokens: newInput,
-        outputTokens: newOutput,
-        cachedTokens: newCached,
-        totalTokens: newInput + newOutput + newCached,
-        firstUsedAt: task.tokenUsage?.firstUsedAt ?? now,
-        lastUsedAt: now
-      }
-    });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    log14.warn(`${taskId}: session token usage accumulate failed: ${message}`);
-  }
-}
-var log14, sessionBaselines;
-var init_session_token_usage = __esm({
-  "../engine/src/session-token-usage.ts"() {
-    "use strict";
-    init_logger2();
-    log14 = createLogger2("session-token-usage");
-    sessionBaselines = /* @__PURE__ */ new WeakMap();
-  }
-});
-
-// ../engine/src/run-audit.ts
-function createRunAuditor(store, context) {
-  if (!context) {
-    return {
-      git: async () => {
-      },
-      database: async () => {
-      },
-      filesystem: async () => {
-      }
-    };
-  }
-  const hasRecordAuditEvent = typeof store.recordRunAuditEvent === "function";
-  if (!hasRecordAuditEvent) {
-    return {
-      git: async () => {
-      },
-      database: async () => {
-      },
-      filesystem: async () => {
-      }
-    };
-  }
-  return {
-    git: async (input) => {
-      const eventInput = {
-        taskId: context.taskId,
-        agentId: context.agentId,
-        runId: context.runId,
-        domain: "git",
-        mutationType: input.type,
-        target: input.target,
-        metadata: {
-          phase: context.phase,
-          ...context.source ? { source: context.source } : {},
-          ...input.metadata
-        }
-      };
-      await store.recordRunAuditEvent(eventInput);
-    },
-    database: async (input) => {
-      const inferredTaskId = input.target.startsWith("FN-") || input.target.startsWith("KB-") ? input.target : context.taskId;
-      const eventInput = {
-        taskId: inferredTaskId,
-        agentId: context.agentId,
-        runId: context.runId,
-        domain: "database",
-        mutationType: input.type,
-        target: input.target,
-        metadata: {
-          phase: context.phase,
-          ...context.source ? { source: context.source } : {},
-          ...input.metadata
-        }
-      };
-      await store.recordRunAuditEvent(eventInput);
-    },
-    filesystem: async (input) => {
-      const eventInput = {
-        taskId: context.taskId,
-        agentId: context.agentId,
-        runId: context.runId,
-        domain: "filesystem",
-        mutationType: input.type,
-        target: input.target,
-        metadata: {
-          phase: context.phase,
-          ...context.source ? { source: context.source } : {},
-          ...input.metadata
-        }
-      };
-      await store.recordRunAuditEvent(eventInput);
-    }
-  };
-}
-function generateSyntheticRunId(prefix, taskId) {
-  const timestamp = Date.now();
-  const random = Math.random().toString(36).slice(2, 6);
-  return `${prefix}-${taskId}-${timestamp}-${random}`;
-}
-var init_run_audit = __esm({
-  "../engine/src/run-audit.ts"() {
-    "use strict";
-  }
-});
-
-// ../engine/src/merger.ts
-import { execSync, exec as exec3, spawn as spawn3 } from "node:child_process";
-import { promisify as promisify4 } from "node:util";
-import { existsSync as existsSync23 } from "node:fs";
-import { join as join29 } from "node:path";
-import { Type as Type3 } from "typebox";
+// ../engine/src/verification-utils.ts
+import { spawn as spawn3 } from "node:child_process";
 async function execWithProcessGroup(command, options) {
   return new Promise((resolve20, reject) => {
     if (options.signal?.aborted) {
@@ -61964,6 +62192,11 @@ function truncateWithEllipsis(text, maxChars) {
   return `${text.slice(0, maxChars)}
 ... (truncated)`;
 }
+function truncateOutput(output) {
+  if (output.length <= VERIFICATION_LOG_MAX_CHARS) return output;
+  return `... output truncated to last ${VERIFICATION_LOG_MAX_CHARS} characters ...
+${output.slice(-VERIFICATION_LOG_MAX_CHARS)}`;
+}
 function summarizeVerificationOutput(output, type) {
   const lines = output.split("\n");
   let summaryLine = null;
@@ -62029,6 +62262,13 @@ function summarizeVerificationOutput(output, type) {
     failureNames.add(truncated);
   }
   const footer = "(full output available in engine logs)";
+  if (type === "build") {
+    const buildError = output.length > 500 ? `${output.slice(0, 500)}
+... (truncated)` : output;
+    return `Build output:
+${buildError}
+${footer}`;
+  }
   const parts = [];
   if (summaryLine) {
     parts.push(summaryLine);
@@ -62046,29 +62286,292 @@ function summarizeVerificationOutput(output, type) {
       parts.push(`  \u2022 ... and ${names.length - 5} more failures`);
     }
   }
-  if (parts.length > 0) {
-    parts.push(footer);
-    return parts.join("\n");
-  }
-  const trimmed = output.trim();
-  if (!trimmed) {
-    return `Verification command failed with no output
+  if (parts.length === 0) {
+    if (output.trim().length === 0) {
+      return `no output
+${footer}`;
+    }
+    return `${truncateOutput(output)}
 ${footer}`;
   }
-  if (trimmed.length <= 500) {
-    return `${trimmed}
+  return parts.join("\n") + `
 ${footer}`;
+}
+async function runVerificationCommand(store, rootDir, taskId, command, type, signal, log18, agentLabel) {
+  const logger2 = log18 ?? { log: console.log, error: console.error, warn: console.warn };
+  const label = agentLabel ?? "merger";
+  if (signal?.aborted) {
+    throw Object.assign(
+      new Error(`Command aborted before start: ${command}`),
+      { code: "ABORT_ERR", aborted: true }
+    );
   }
-  let cutoff = 500;
-  for (let i = 500; i < trimmed.length; i++) {
-    if (trimmed[i] === " " || trimmed[i] === "\n") {
-      cutoff = i;
-      break;
+  logger2.log(`${taskId}: running ${type} command: ${command}`);
+  await store.logEntry(taskId, `[verification] Running ${type} command: ${command}`);
+  await store.appendAgentLog(taskId, `Running ${type} command`, "tool", command, label);
+  const result = {
+    command,
+    exitCode: null,
+    stdout: "",
+    stderr: "",
+    success: false
+  };
+  const verificationStartedAt = Date.now();
+  try {
+    const { stdout, stderr, bufferOverflow } = await execWithProcessGroup(command, {
+      cwd: rootDir,
+      timeout: VERIFICATION_COMMAND_TIMEOUT_MS,
+      maxBuffer: VERIFICATION_COMMAND_MAX_BUFFER,
+      signal
+    });
+    if (signal?.aborted) {
+      throw Object.assign(
+        new Error(`Command aborted: ${command}`),
+        { code: "ABORT_ERR", aborted: true }
+      );
+    }
+    result.stdout = stdout?.toString?.() || "";
+    result.stderr = stderr?.toString?.() || "";
+    result.exitCode = 0;
+    result.success = true;
+    const verificationDurationMs = Date.now() - verificationStartedAt;
+    const timingDetail = `${verificationDurationMs}ms`;
+    if (bufferOverflow) {
+      logger2.log(`${taskId}: ${type} command succeeded (exit 0, output exceeded buffer) in ${verificationDurationMs}ms`);
+      await store.logEntry(
+        taskId,
+        `[timing] [verification] ${type} command succeeded (exit 0, output exceeded buffer) in ${verificationDurationMs}ms`
+      );
+      await store.appendAgentLog(
+        taskId,
+        `${type} command succeeded (exit 0)`,
+        "tool_result",
+        timingDetail,
+        label
+      );
+    } else {
+      logger2.log(`${taskId}: ${type} command succeeded in ${verificationDurationMs}ms`);
+      await store.logEntry(taskId, `[timing] [verification] ${type} command succeeded (exit 0) in ${verificationDurationMs}ms`);
+      await store.appendAgentLog(
+        taskId,
+        `${type} command succeeded (exit 0)`,
+        "tool_result",
+        timingDetail,
+        label
+      );
+    }
+    return result;
+  } catch (error) {
+    if (signal?.aborted) {
+      throw Object.assign(
+        new Error(`Command aborted: ${command}`),
+        { code: "ABORT_ERR", aborted: true }
+      );
+    }
+    const verificationDurationMs = Date.now() - verificationStartedAt;
+    const err = error;
+    result.stdout = err?.stdout?.toString?.() || "";
+    result.stderr = err?.stderr?.toString?.() || "";
+    result.exitCode = typeof err?.status === "number" ? err.status : typeof err?.code === "number" ? err.code : null;
+    const maxBufferExceeded = err?.code === "ENOBUFS" || err?.code === "ERR_CHILD_PROCESS_STDIO_MAXBUFFER" || String(err?.message ?? "").includes("maxBuffer");
+    result.success = maxBufferExceeded && result.exitCode === 0;
+    if (result.success) {
+      logger2.log(`${taskId}: ${type} command succeeded (exit 0, output exceeded buffer) in ${verificationDurationMs}ms`);
+      await store.logEntry(
+        taskId,
+        `[timing] [verification] ${type} command succeeded (exit 0, output exceeded buffer) in ${verificationDurationMs}ms`
+      );
+      await store.appendAgentLog(
+        taskId,
+        `${type} command succeeded (exit 0)`,
+        "tool_result",
+        `${verificationDurationMs}ms`,
+        label
+      );
+      return result;
     }
+    const output = result.stderr || result.stdout || err?.message || "Unknown error";
+    const summary = summarizeVerificationOutput(output, type);
+    logger2.error(`${taskId}: ${type} command failed (exit ${result.exitCode}) in ${verificationDurationMs}ms; output captured in task log`);
+    await store.logEntry(
+      taskId,
+      `[timing] [verification] ${type} command failed (exit ${result.exitCode}) after ${verificationDurationMs}ms:
+${summary}`
+    );
+    await store.appendAgentLog(
+      taskId,
+      `${type} command failed (exit ${result.exitCode})`,
+      "tool_error",
+      summary,
+      label
+    );
   }
-  return `${trimmed.slice(0, cutoff)}...
-${footer}`;
+  return result;
+}
+var VERIFICATION_COMMAND_MAX_BUFFER, VERIFICATION_COMMAND_TIMEOUT_MS, VERIFICATION_LOG_MAX_CHARS;
+var init_verification_utils = __esm({
+  "../engine/src/verification-utils.ts"() {
+    "use strict";
+    VERIFICATION_COMMAND_MAX_BUFFER = 50 * 1024 * 1024;
+    VERIFICATION_COMMAND_TIMEOUT_MS = 6e5;
+    VERIFICATION_LOG_MAX_CHARS = 2e4;
+  }
+});
+
+// ../engine/src/session-token-usage.ts
+var session_token_usage_exports = {};
+__export(session_token_usage_exports, {
+  accumulateSessionTokenUsage: () => accumulateSessionTokenUsage
+});
+function readSessionStats(session) {
+  const accessor = session.getSessionStats;
+  if (typeof accessor !== "function") return void 0;
+  try {
+    return accessor.call(session);
+  } catch {
+    return void 0;
+  }
+}
+async function accumulateSessionTokenUsage(store, taskId, session) {
+  try {
+    const stats = readSessionStats(session);
+    const tokens = stats?.tokens;
+    if (!tokens) return;
+    const currentInput = (tokens.input ?? 0) + (tokens.cacheWrite ?? 0);
+    const currentOutput = tokens.output ?? 0;
+    const currentCached = tokens.cacheRead ?? 0;
+    const baseline = sessionBaselines.get(session) ?? { input: 0, output: 0, cached: 0 };
+    const inputDelta = Math.max(0, currentInput - baseline.input);
+    const outputDelta = Math.max(0, currentOutput - baseline.output);
+    const cachedDelta = Math.max(0, currentCached - baseline.cached);
+    sessionBaselines.set(session, {
+      input: currentInput,
+      output: currentOutput,
+      cached: currentCached
+    });
+    if (inputDelta === 0 && outputDelta === 0 && cachedDelta === 0) return;
+    const task = await store.getTask(taskId);
+    const now = (/* @__PURE__ */ new Date()).toISOString();
+    const newInput = (task.tokenUsage?.inputTokens ?? 0) + inputDelta;
+    const newOutput = (task.tokenUsage?.outputTokens ?? 0) + outputDelta;
+    const newCached = (task.tokenUsage?.cachedTokens ?? 0) + cachedDelta;
+    await store.updateTask(taskId, {
+      tokenUsage: {
+        inputTokens: newInput,
+        outputTokens: newOutput,
+        cachedTokens: newCached,
+        totalTokens: newInput + newOutput + newCached,
+        firstUsedAt: task.tokenUsage?.firstUsedAt ?? now,
+        lastUsedAt: now
+      }
+    });
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    log14.warn(`${taskId}: session token usage accumulate failed: ${message}`);
+  }
+}
+var log14, sessionBaselines;
+var init_session_token_usage = __esm({
+  "../engine/src/session-token-usage.ts"() {
+    "use strict";
+    init_logger2();
+    log14 = createLogger2("session-token-usage");
+    sessionBaselines = /* @__PURE__ */ new WeakMap();
+  }
+});
+
+// ../engine/src/run-audit.ts
+function createRunAuditor(store, context) {
+  if (!context) {
+    return {
+      git: async () => {
+      },
+      database: async () => {
+      },
+      filesystem: async () => {
+      }
+    };
+  }
+  const hasRecordAuditEvent = typeof store.recordRunAuditEvent === "function";
+  if (!hasRecordAuditEvent) {
+    return {
+      git: async () => {
+      },
+      database: async () => {
+      },
+      filesystem: async () => {
+      }
+    };
+  }
+  return {
+    git: async (input) => {
+      const eventInput = {
+        taskId: context.taskId,
+        agentId: context.agentId,
+        runId: context.runId,
+        domain: "git",
+        mutationType: input.type,
+        target: input.target,
+        metadata: {
+          phase: context.phase,
+          ...context.source ? { source: context.source } : {},
+          ...input.metadata
+        }
+      };
+      await store.recordRunAuditEvent(eventInput);
+    },
+    database: async (input) => {
+      const inferredTaskId = input.target.startsWith("FN-") || input.target.startsWith("KB-") ? input.target : context.taskId;
+      const eventInput = {
+        taskId: inferredTaskId,
+        agentId: context.agentId,
+        runId: context.runId,
+        domain: "database",
+        mutationType: input.type,
+        target: input.target,
+        metadata: {
+          phase: context.phase,
+          ...context.source ? { source: context.source } : {},
+          ...input.metadata
+        }
+      };
+      await store.recordRunAuditEvent(eventInput);
+    },
+    filesystem: async (input) => {
+      const eventInput = {
+        taskId: context.taskId,
+        agentId: context.agentId,
+        runId: context.runId,
+        domain: "filesystem",
+        mutationType: input.type,
+        target: input.target,
+        metadata: {
+          phase: context.phase,
+          ...context.source ? { source: context.source } : {},
+          ...input.metadata
+        }
+      };
+      await store.recordRunAuditEvent(eventInput);
+    }
+  };
 }
+function generateSyntheticRunId(prefix, taskId) {
+  const timestamp = Date.now();
+  const random = Math.random().toString(36).slice(2, 6);
+  return `${prefix}-${taskId}-${timestamp}-${random}`;
+}
+var init_run_audit = __esm({
+  "../engine/src/run-audit.ts"() {
+    "use strict";
+  }
+});
+
+// ../engine/src/merger.ts
+import { execSync, exec as exec3 } from "node:child_process";
+import { promisify as promisify4 } from "node:util";
+import { existsSync as existsSync24 } from "node:fs";
+import { join as join30 } from "node:path";
+import { Type as Type3 } from "typebox";
 function truncateWorkflowScriptOutput(output) {
   if (output.length <= WORKFLOW_SCRIPT_OUTPUT_MAX_CHARS) return output;
   return `... output truncated to last ${WORKFLOW_SCRIPT_OUTPUT_MAX_CHARS} characters ...
@@ -62112,7 +62615,7 @@ async function getStagedFiles(cwd) {
   }
 }
 function hasInstallState(rootDir) {
-  return existsSync23(join29(rootDir, "node_modules")) || existsSync23(join29(rootDir, ".pnp.cjs"));
+  return existsSync24(join30(rootDir, "node_modules")) || existsSync24(join30(rootDir, ".pnp.cjs"));
 }
 function shouldSyncDependenciesForMerge(stagedFiles, installStatePresent) {
   if (!installStatePresent) return true;
@@ -62121,10 +62624,10 @@ function shouldSyncDependenciesForMerge(stagedFiles, installStatePresent) {
   );
 }
 function getDependencySyncCommand(rootDir) {
-  if (existsSync23(join29(rootDir, "pnpm-lock.yaml"))) return "pnpm install --frozen-lockfile";
-  if (existsSync23(join29(rootDir, "package-lock.json"))) return "npm install";
-  if (existsSync23(join29(rootDir, "yarn.lock"))) return "yarn install --frozen-lockfile";
-  if (existsSync23(join29(rootDir, "bun.lock")) || existsSync23(join29(rootDir, "bun.lockb"))) {
+  if (existsSync24(join30(rootDir, "pnpm-lock.yaml"))) return "pnpm install --frozen-lockfile";
+  if (existsSync24(join30(rootDir, "package-lock.json"))) return "npm install";
+  if (existsSync24(join30(rootDir, "yarn.lock"))) return "yarn install --frozen-lockfile";
+  if (existsSync24(join30(rootDir, "bun.lock")) || existsSync24(join30(rootDir, "bun.lockb"))) {
     return "bun install --frozen-lockfile";
   }
   return null;
@@ -62157,8 +62660,8 @@ function inferDefaultTestCommand(rootDir, explicitTestCommand, explicitBuildComm
       buildSource: explicitBuildCommand?.trim() ? "explicit" : void 0
     };
   }
-  if (existsSync23(join29(rootDir, "pnpm-lock.yaml"))) {
-    if (existsSync23(join29(rootDir, "pnpm-workspace.yaml"))) {
+  if (existsSync24(join30(rootDir, "pnpm-lock.yaml"))) {
+    if (existsSync24(join30(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\`.`
       );
@@ -62169,21 +62672,21 @@ function inferDefaultTestCommand(rootDir, explicitTestCommand, explicitBuildComm
       buildSource: explicitBuildCommand?.trim() ? "explicit" : void 0
     };
   }
-  if (existsSync23(join29(rootDir, "yarn.lock"))) {
+  if (existsSync24(join30(rootDir, "yarn.lock"))) {
     return {
       command: "yarn test",
       testSource: "inferred",
       buildSource: explicitBuildCommand?.trim() ? "explicit" : void 0
     };
   }
-  if (existsSync23(join29(rootDir, "bun.lock")) || existsSync23(join29(rootDir, "bun.lockb"))) {
+  if (existsSync24(join30(rootDir, "bun.lock")) || existsSync24(join30(rootDir, "bun.lockb"))) {
     return {
       command: "bun test",
       testSource: "inferred",
       buildSource: explicitBuildCommand?.trim() ? "explicit" : void 0
     };
   }
-  if (existsSync23(join29(rootDir, "package-lock.json"))) {
+  if (existsSync24(join30(rootDir, "package-lock.json"))) {
     return {
       command: "npm test",
       testSource: "inferred",
@@ -62220,7 +62723,7 @@ async function runDeterministicVerification(store, rootDir, taskId, testCommand,
   await store.logEntry(taskId, deterministicVerificationMessage);
   await store.appendAgentLog(taskId, deterministicVerificationMessage, "text", void 0, "merger");
   if (hasTestCommand) {
-    const testResult = await runVerificationCommand(
+    const testResult = await runVerificationCommand2(
       store,
       rootDir,
       taskId,
@@ -62251,7 +62754,7 @@ async function runDeterministicVerification(store, rootDir, taskId, testCommand,
     }
   }
   if (hasBuildCommand) {
-    const buildResult = await runVerificationCommand(
+    const buildResult = await runVerificationCommand2(
       store,
       rootDir,
       taskId,
@@ -62286,98 +62789,9 @@ async function runDeterministicVerification(store, rootDir, taskId, testCommand,
   await store.appendAgentLog(taskId, "Deterministic merge verification passed", "text", void 0, "merger");
   return result;
 }
-async function runVerificationCommand(store, rootDir, taskId, command, type, signal) {
+async function runVerificationCommand2(store, rootDir, taskId, command, type, signal) {
   throwIfAborted(signal, taskId);
-  mergerLog.log(`${taskId}: running ${type} command: ${command}`);
-  await store.logEntry(taskId, `[verification] Running ${type} command: ${command}`);
-  await store.appendAgentLog(taskId, `Running ${type} command`, "tool", command, "merger");
-  const result = {
-    command,
-    exitCode: null,
-    stdout: "",
-    stderr: "",
-    success: false
-  };
-  const verificationStartedAt = Date.now();
-  try {
-    const { stdout, stderr, bufferOverflow } = await execWithProcessGroup(command, {
-      cwd: rootDir,
-      timeout: VERIFICATION_COMMAND_TIMEOUT_MS,
-      maxBuffer: VERIFICATION_COMMAND_MAX_BUFFER,
-      signal
-    });
-    throwIfAborted(signal, taskId);
-    result.stdout = stdout?.toString?.() || "";
-    result.stderr = stderr?.toString?.() || "";
-    result.exitCode = 0;
-    result.success = true;
-    const verificationDurationMs = Date.now() - verificationStartedAt;
-    const timingDetail = `${verificationDurationMs}ms`;
-    if (bufferOverflow) {
-      mergerLog.log(`${taskId}: ${type} command succeeded (exit 0, output exceeded buffer) in ${verificationDurationMs}ms`);
-      await store.logEntry(
-        taskId,
-        `[timing] [verification] ${type} command succeeded (exit 0, output exceeded buffer) in ${verificationDurationMs}ms`
-      );
-      await store.appendAgentLog(
-        taskId,
-        `${type} command succeeded (exit 0)`,
-        "tool_result",
-        timingDetail,
-        "merger"
-      );
-    } else {
-      mergerLog.log(`${taskId}: ${type} command succeeded in ${verificationDurationMs}ms`);
-      await store.logEntry(taskId, `[timing] [verification] ${type} command succeeded (exit 0) in ${verificationDurationMs}ms`);
-      await store.appendAgentLog(
-        taskId,
-        `${type} command succeeded (exit 0)`,
-        "tool_result",
-        timingDetail,
-        "merger"
-      );
-    }
-    return result;
-  } catch (error) {
-    throwIfAborted(signal, taskId);
-    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) in ${verificationDurationMs}ms`);
-      await store.logEntry(
-        taskId,
-        `[timing] [verification] ${type} command succeeded (exit 0, output exceeded buffer) in ${verificationDurationMs}ms`
-      );
-      await store.appendAgentLog(
-        taskId,
-        `${type} command succeeded (exit 0)`,
-        "tool_result",
-        `${verificationDurationMs}ms`,
-        "merger"
-      );
-      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}) in ${verificationDurationMs}ms; output captured in task log`);
-    await store.logEntry(
-      taskId,
-      `[timing] [verification] ${type} command failed (exit ${result.exitCode}) after ${verificationDurationMs}ms:
-${summary}`
-    );
-    await store.appendAgentLog(
-      taskId,
-      `${type} command failed (exit ${result.exitCode})`,
-      "tool_error",
-      summary,
-      "merger"
-    );
-  }
-  return result;
+  return runVerificationCommand(store, rootDir, taskId, command, type, signal, mergerLog, "merger");
 }
 async function attemptInMergeVerificationFix(store, rootDir, taskId, failureContext, settings, options, mergeRunContext, fixAttemptNumber, _testCommand, _buildCommand) {
   try {
@@ -62440,9 +62854,20 @@ Do not refactor, rename broadly, or make opportunistic improvements.
       onToolEnd: logger2.onToolEnd,
       defaultProvider: settings.defaultProviderOverride && settings.defaultModelIdOverride ? settings.defaultProviderOverride : settings.defaultProvider,
       defaultModelId: settings.defaultProviderOverride && settings.defaultModelIdOverride ? settings.defaultModelIdOverride : settings.defaultModelId,
+      fallbackProvider: settings.fallbackProvider,
+      fallbackModelId: settings.fallbackModelId,
       defaultThinkingLevel: settings.defaultThinkingLevel,
       // Skill selection: use assigned agent skills if available, otherwise role fallback
-      ...skillContext?.skillSelectionContext ? { skillSelection: skillContext.skillSelectionContext } : {}
+      ...skillContext?.skillSelectionContext ? { skillSelection: skillContext.skillSelectionContext } : {},
+      taskId,
+      taskTitle: taskForSkillContext?.title,
+      onFallbackModelUsed: createFallbackModelObserver({
+        agent: "merger",
+        label: "merge verification fix agent",
+        store,
+        taskId,
+        taskTitle: taskForSkillContext?.title
+      })
     });
     const runId = mergeRunContext?.runId;
     const agentId = mergeRunContext?.agentId ?? "merger";
@@ -62495,7 +62920,7 @@ ${failureContext.output.slice(0, VERIFICATION_LOG_MAX_CHARS)}
         void 0,
         "merger"
       );
-      const reRunResult = await runVerificationCommand(
+      const reRunResult = await runVerificationCommand2(
         store,
         rootDir,
         taskId,
@@ -63237,9 +63662,16 @@ You are assisting with a paused \`git pull --rebase\`.
     onToolEnd: agentLogger.onToolEnd,
     defaultProvider: settings.defaultProviderOverride && settings.defaultModelIdOverride ? settings.defaultProviderOverride : settings.defaultProvider,
     defaultModelId: settings.defaultProviderOverride && settings.defaultModelIdOverride ? settings.defaultModelIdOverride : settings.defaultModelId,
+    fallbackProvider: settings.fallbackProvider,
+    fallbackModelId: settings.fallbackModelId,
     defaultThinkingLevel: settings.defaultThinkingLevel,
     taskId,
-    onFallbackModelUsed: notifyFallbackUsed
+    onFallbackModelUsed: createFallbackModelObserver({
+      agent: "merger",
+      label: "rebase conflict resolver",
+      store,
+      taskId
+    })
   });
   const prompt = [
     `Resolve rebase conflicts for task ${taskId}.`,
@@ -63431,7 +63863,7 @@ async function pushToRemoteAfterMerge(store, rootDir, taskId, settings, options)
 }
 async function createPostMergeWorktree(rootDir, taskId) {
   const randomSuffix = Math.random().toString(36).slice(2, 10);
-  const postMergeWorktree = join29(rootDir, ".worktrees", `post-merge-${taskId}-${randomSuffix}`);
+  const postMergeWorktree = join30(rootDir, ".worktrees", `post-merge-${taskId}-${randomSuffix}`);
   try {
     await execAsync2(`git worktree add ${quoteArg(postMergeWorktree)} HEAD`, { cwd: rootDir });
     return postMergeWorktree;
@@ -64372,7 +64804,7 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
     }
   }
   throwIfAborted(options.signal, taskId);
-  if (worktreePath && existsSync23(worktreePath)) {
+  if (worktreePath && existsSync24(worktreePath)) {
     const otherUser = await findWorktreeUser(store, worktreePath, taskId);
     if (otherUser) {
       mergerLog.log(`Worktree retained \u2014 still needed by ${otherUser}`);
@@ -65026,9 +65458,20 @@ async function runAiAgentForCommit(params) {
     onToolEnd: agentLogger.onToolEnd,
     defaultProvider: settings.defaultProviderOverride && settings.defaultModelIdOverride ? settings.defaultProviderOverride : settings.defaultProvider,
     defaultModelId: settings.defaultProviderOverride && settings.defaultModelIdOverride ? settings.defaultModelIdOverride : settings.defaultModelId,
+    fallbackProvider: settings.fallbackProvider,
+    fallbackModelId: settings.fallbackModelId,
     defaultThinkingLevel: settings.defaultThinkingLevel,
     // Skill selection: use assigned agent skills if available, otherwise role fallback
-    ...skillContext?.skillSelectionContext ? { skillSelection: skillContext.skillSelectionContext } : {}
+    ...skillContext?.skillSelectionContext ? { skillSelection: skillContext.skillSelectionContext } : {},
+    taskId,
+    taskTitle: taskForSkillContext?.title,
+    onFallbackModelUsed: createFallbackModelObserver({
+      agent: "merger",
+      label: "merge agent",
+      store,
+      taskId,
+      taskTitle: taskForSkillContext?.title
+    })
   });
   options.onSession?.(session);
   try {
@@ -65459,7 +65902,14 @@ If issues are found that need attention, describe them clearly and include concr
       fallbackModelId: settings.fallbackModelId,
       defaultThinkingLevel: settings.defaultThinkingLevel,
       // Skill selection: use assigned agent skills if available, otherwise role fallback
-      ...postMergeSkillContext?.skillSelectionContext ? { skillSelection: postMergeSkillContext.skillSelectionContext } : {}
+      ...postMergeSkillContext?.skillSelectionContext ? { skillSelection: postMergeSkillContext.skillSelectionContext } : {},
+      taskId,
+      onFallbackModelUsed: createFallbackModelObserver({
+        agent: "merger",
+        label: `post-merge workflow step '${workflowStep.name}'`,
+        store,
+        taskId
+      })
     });
     mergerLog.log(`${taskId}: [post-merge] workflow step '${workflowStep.name}' using model ${describeModel(session)}${useOverride ? " (workflow step override)" : ""}`);
     await store.logEntry(taskId, `[post-merge] Workflow step '${workflowStep.name}' using model: ${describeModel(session)}${useOverride ? " (workflow step override)" : ""}`);
@@ -65495,15 +65945,17 @@ async function completeTask(store, taskId, result) {
   result.task = task;
   store.emit("task:merged", result);
 }
-var execAsync2, LOCKFILE_PATTERNS, GENERATED_PATTERNS, DEPENDENCY_SYNC_TRIGGER_PATTERNS, VERIFICATION_COMMAND_MAX_BUFFER, VERIFICATION_COMMAND_TIMEOUT_MS, VERIFICATION_LOG_MAX_CHARS, WORKFLOW_SCRIPT_OUTPUT_MAX_CHARS, PULL_REBASE_TIMEOUT_MS, PUSH_TIMEOUT_MS, MERGE_COMMIT_LOG_MAX_CHARS, MERGE_DIFF_STAT_MAX_CHARS, VerificationError, MergeAbortedError, FUSION_TASK_ID_TRAILER_KEY;
+var execAsync2, LOCKFILE_PATTERNS, GENERATED_PATTERNS, DEPENDENCY_SYNC_TRIGGER_PATTERNS, WORKFLOW_SCRIPT_OUTPUT_MAX_CHARS, PULL_REBASE_TIMEOUT_MS, PUSH_TIMEOUT_MS, MERGE_COMMIT_LOG_MAX_CHARS, MERGE_DIFF_STAT_MAX_CHARS, VerificationError, MergeAbortedError, FUSION_TASK_ID_TRAILER_KEY;
 var init_merger = __esm({
   "../engine/src/merger.ts"() {
     "use strict";
+    init_verification_utils();
+    init_verification_utils();
     init_src();
     init_pi();
     init_session_token_usage();
     init_agent_session_helpers();
-    init_notifier();
+    init_fallback_model_observer();
     init_session_skill_context();
     init_agent_logger();
     init_logger2();
@@ -65549,9 +66001,6 @@ var init_merger = __esm({
       "bun.lock",
       "packages/*/package.json"
     ];
-    VERIFICATION_COMMAND_MAX_BUFFER = 50 * 1024 * 1024;
-    VERIFICATION_COMMAND_TIMEOUT_MS = 6e5;
-    VERIFICATION_LOG_MAX_CHARS = 2e4;
     WORKFLOW_SCRIPT_OUTPUT_MAX_CHARS = 4e3;
     PULL_REBASE_TIMEOUT_MS = 12e4;
     PUSH_TIMEOUT_MS = 6e4;
@@ -65576,8 +66025,8 @@ var init_merger = __esm({
 
 // ../engine/src/worktree-names.ts
 import { readdirSync as readdirSync3 } from "node:fs";
-import { join as join30 } from "node:path";
-import { existsSync as existsSync24 } from "node:fs";
+import { join as join31 } from "node:path";
+import { existsSync as existsSync25 } from "node:fs";
 function slugify2(str) {
   return str.toLowerCase().replace(/[^a-z0-9\s-]/g, "").replace(/\s+/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
 }
@@ -65588,7 +66037,7 @@ function generateReservedWorktreeName(rootDir, reservedNames = /* @__PURE__ */ n
   const adjective = ADJECTIVES[Math.floor(Math.random() * ADJECTIVES.length)];
   const noun = NOUNS[Math.floor(Math.random() * NOUNS.length)];
   const baseName = `${adjective}-${noun}`;
-  const worktreesDir = join30(rootDir, ".worktrees");
+  const worktreesDir = join31(rootDir, ".worktrees");
   const existing = getExistingWorktreeNames(worktreesDir);
   for (const reserved of reservedNames) {
     existing.add(reserved);
@@ -65603,7 +66052,7 @@ function generateReservedWorktreeName(rootDir, reservedNames = /* @__PURE__ */ n
   return `${baseName}-${suffix}`;
 }
 function getExistingWorktreeNames(worktreesDir) {
-  if (!existsSync24(worktreesDir)) {
+  if (!existsSync25(worktreesDir)) {
     return /* @__PURE__ */ new Set();
   }
   try {
@@ -65740,8 +66189,8 @@ __export(worktree_pool_exports, {
 });
 import { exec as exec4 } from "node:child_process";
 import { promisify as promisify5 } from "node:util";
-import { existsSync as existsSync25, lstatSync, readdirSync as readdirSync4, rmSync as rmSync2 } from "node:fs";
-import { join as join31, relative as relative6, resolve as resolve15, isAbsolute as isAbsolute9 } from "node:path";
+import { existsSync as existsSync26, lstatSync, readdirSync as readdirSync4, rmSync as rmSync2 } from "node:fs";
+import { join as join32, relative as relative6, resolve as resolve15, isAbsolute as isAbsolute9 } from "node:path";
 function getExecStdout(result) {
   if (typeof result === "string") return result;
   if (result && typeof result === "object" && "stdout" in result) {
@@ -65787,10 +66236,10 @@ async function isRegisteredGitWorktree2(rootDir, worktreePath) {
   return (await getRegisteredWorktreePaths(rootDir)).has(resolve15(worktreePath));
 }
 function hasRequiredWorktreeFiles(worktreePath) {
-  return existsSync25(join31(worktreePath, ".git")) && existsSync25(join31(worktreePath, "package.json"));
+  return existsSync26(join32(worktreePath, ".git")) && existsSync26(join32(worktreePath, "package.json"));
 }
 async function isUsableTaskWorktree(rootDir, worktreePath) {
-  return existsSync25(worktreePath) && await isRegisteredGitWorktree2(rootDir, worktreePath) && hasRequiredWorktreeFiles(worktreePath);
+  return existsSync26(worktreePath) && await isRegisteredGitWorktree2(rootDir, worktreePath) && hasRequiredWorktreeFiles(worktreePath);
 }
 function isInsideWorktreesDir(rootDir, worktreePath) {
   const worktreesDir = resolve15(rootDir, ".worktrees");
@@ -65799,14 +66248,14 @@ function isInsideWorktreesDir(rootDir, worktreePath) {
   return rel !== "" && !rel.startsWith("..") && !isAbsolute9(rel);
 }
 async function scanIdleWorktrees(rootDir, store) {
-  const worktreesDir = join31(rootDir, ".worktrees");
-  if (!existsSync25(worktreesDir)) {
+  const worktreesDir = join32(rootDir, ".worktrees");
+  if (!existsSync26(worktreesDir)) {
     return [];
   }
   let dirs;
   try {
     const entries = readdirSync4(worktreesDir, { withFileTypes: true });
-    dirs = entries.filter((e) => e.isDirectory()).map((e) => join31(worktreesDir, e.name));
+    dirs = entries.filter((e) => e.isDirectory()).map((e) => join32(worktreesDir, e.name));
   } catch (err) {
     const errorMessage = err instanceof Error ? err.message : String(err);
     worktreePoolLog.warn(`Failed to read .worktrees/ directory: ${errorMessage}`);
@@ -65829,16 +66278,16 @@ async function scanIdleWorktrees(rootDir, store) {
   return registeredDirs.filter((dir) => !activeWorktrees.has(resolve15(dir)));
 }
 async function cleanupOrphanedWorktrees(rootDir, store) {
-  const worktreesDir = join31(rootDir, ".worktrees");
-  if (!existsSync25(worktreesDir)) {
+  const worktreesDir = join32(rootDir, ".worktrees");
+  if (!existsSync26(worktreesDir)) {
     return 0;
   }
   const orphaned = await scanIdleWorktrees(rootDir, store);
   const registeredWorktrees = await getRegisteredWorktreePaths(rootDir);
   let dirs = [];
-  if (existsSync25(worktreesDir)) {
+  if (existsSync26(worktreesDir)) {
     try {
-      dirs = readdirSync4(worktreesDir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => join31(worktreesDir, e.name));
+      dirs = readdirSync4(worktreesDir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => join32(worktreesDir, e.name));
     } catch (err) {
       const errorMessage = err instanceof Error ? err.message : String(err);
       worktreePoolLog.warn(`Failed to read .worktrees/ directory for cleanup: ${errorMessage}`);
@@ -65870,8 +66319,8 @@ async function cleanupOrphanedWorktrees(rootDir, store) {
   return cleaned;
 }
 async function reapOrphanWorktrees(projectRoot) {
-  const worktreesDir = join31(projectRoot, ".worktrees");
-  if (!existsSync25(worktreesDir)) {
+  const worktreesDir = join32(projectRoot, ".worktrees");
+  if (!existsSync26(worktreesDir)) {
     return 0;
   }
   let entries;
@@ -65879,11 +66328,11 @@ async function reapOrphanWorktrees(projectRoot) {
     entries = readdirSync4(worktreesDir, { withFileTypes: true }).filter((e) => {
       if (!e.isDirectory()) return false;
       try {
-        return lstatSync(join31(worktreesDir, e.name)).isDirectory() && !lstatSync(join31(worktreesDir, e.name)).isSymbolicLink();
+        return lstatSync(join32(worktreesDir, e.name)).isDirectory() && !lstatSync(join32(worktreesDir, e.name)).isSymbolicLink();
       } catch {
         return false;
       }
-    }).map((e) => ({ name: e.name, fullPath: join31(worktreesDir, e.name) }));
+    }).map((e) => ({ name: e.name, fullPath: join32(worktreesDir, e.name) }));
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     worktreePoolLog.warn(`reapOrphanWorktrees: failed to read .worktrees/ \u2014 ${msg}`);
@@ -65902,8 +66351,8 @@ async function reapOrphanWorktrees(projectRoot) {
     if (registered.has(resolvedFull)) {
       continue;
     }
-    const dotGit = join31(resolvedFull, ".git");
-    if (existsSync25(dotGit)) {
+    const dotGit = join32(resolvedFull, ".git");
+    if (existsSync26(dotGit)) {
       worktreePoolLog.log(`reapOrphanWorktrees: skipping ${name} (has .git entry but not in registered list \u2014 may be partially registered)`);
       continue;
     }
@@ -65963,7 +66412,7 @@ var init_worktree_pool = __esm({
       acquire() {
         for (const path2 of this.idle) {
           this.idle.delete(path2);
-          if (existsSync25(path2)) {
+          if (existsSync26(path2)) {
             return path2;
           }
           worktreePoolLog.log(`Pruned stale entry: ${path2}`);
@@ -66010,7 +66459,7 @@ var init_worktree_pool = __esm({
        */
       rehydrate(idlePaths) {
         for (const path2 of idlePaths) {
-          if (existsSync25(path2)) {
+          if (existsSync26(path2)) {
             this.idle.add(path2);
           } else {
             worktreePoolLog.log(`Rehydrate skipped (not on disk): ${path2}`);
@@ -66066,7 +66515,7 @@ var init_worktree_pool = __esm({
             throw err;
           }
           const conflictingPath = match[1];
-          if (!existsSync25(conflictingPath)) {
+          if (!existsSync26(conflictingPath)) {
             await execAsync3("git worktree prune", { cwd: worktreePath });
             await execAsync3(checkoutCmd, { cwd: worktreePath });
             return branchName;
@@ -66143,8 +66592,8 @@ var init_token_cap_detector = __esm({
 // ../engine/src/step-session-executor.ts
 import { exec as exec5 } from "node:child_process";
 import { promisify as promisify6 } from "node:util";
-import { existsSync as existsSync26 } from "node:fs";
-import { join as join32 } from "node:path";
+import { existsSync as existsSync27 } from "node:fs";
+import { join as join33 } from "node:path";
 function parseStepFileScopes(prompt) {
   const result = /* @__PURE__ */ new Map();
   if (!prompt) return result;
@@ -66431,7 +66880,7 @@ var init_step_session_executor = __esm({
     init_worktree_names();
     init_agent_logger();
     init_logger2();
-    init_notifier();
+    init_fallback_model_observer();
     init_context_limit_detector();
     init_usage_limit_detector();
     init_agent_tools();
@@ -66548,7 +66997,7 @@ var init_step_session_executor = __esm({
         }
         for (const [stepIdx, worktreePath] of this.parallelWorktrees) {
           try {
-            if (existsSync26(worktreePath)) {
+            if (existsSync27(worktreePath)) {
               await execAsync4(`git worktree remove "${worktreePath}" --force`, {
                 cwd: this.options.rootDir
               });
@@ -66713,7 +67162,13 @@ Follow instructions precisely and avoid unrelated changes.`,
                 ...this.options.skillSelection ? { skillSelection: this.options.skillSelection } : {},
                 taskId: taskDetail.id,
                 taskTitle: taskDetail.title,
-                onFallbackModelUsed: notifyFallbackUsed
+                onFallbackModelUsed: createFallbackModelObserver({
+                  agent: "executor",
+                  label: "workflow step agent",
+                  store: this.store,
+                  taskId: taskDetail.id,
+                  taskTitle: taskDetail.title
+                })
               });
               session = createResult.session;
               const handle = {
@@ -66893,7 +67348,7 @@ Follow instructions precisely and avoid unrelated changes.`,
         for (const [stepIdx, worktreePath] of worktreePaths) {
           if (worktreePath !== this.options.worktreePath) {
             try {
-              if (existsSync26(worktreePath)) {
+              if (existsSync27(worktreePath)) {
                 await execAsync4(`git worktree remove "${worktreePath}" --force`, {
                   cwd: this.options.rootDir
                 });
@@ -66923,7 +67378,7 @@ Follow instructions precisely and avoid unrelated changes.`,
       async createStepWorktree(stepIndex) {
         const { rootDir } = this.options;
         const name = generateWorktreeName(rootDir);
-        const worktreePath = join32(rootDir, ".worktrees", name);
+        const worktreePath = join33(rootDir, ".worktrees", name);
         const branchName = `fusion/step-${stepIndex}-${name}`;
         stepExecLog.log(`Creating worktree for step ${stepIndex}: ${worktreePath} (branch: ${branchName})`);
         try {
@@ -66998,7 +67453,7 @@ Follow instructions precisely and avoid unrelated changes.`,
 
 // ../engine/src/spec-staleness.ts
 import { stat as stat5 } from "node:fs/promises";
-import { join as join33 } from "node:path";
+import { join as join34 } from "node:path";
 async function evaluateSpecStaleness(options) {
   const { settings, promptPath, nowMs } = options;
   if (settings.specStalenessEnabled !== true) {
@@ -67038,7 +67493,7 @@ async function evaluateSpecStaleness(options) {
   };
 }
 function getPromptPath(tasksDir, taskId) {
-  return join33(tasksDir, taskId, "PROMPT.md");
+  return join34(tasksDir, taskId, "PROMPT.md");
 }
 var DEFAULT_SPEC_STALENESS_MAX_AGE_MS;
 var init_spec_staleness = __esm({
@@ -67069,8 +67524,8 @@ var init_task_completion = __esm({
 
 // ../engine/src/run-verification-tool.ts
 import { spawn as spawn4 } from "node:child_process";
-import { existsSync as existsSync27 } from "node:fs";
-import { isAbsolute as isAbsolute10, join as join34 } from "node:path";
+import { existsSync as existsSync28 } from "node:fs";
+import { isAbsolute as isAbsolute10, join as join35 } from "node:path";
 import { Type as Type4 } from "@mariozechner/pi-ai";
 function createBuffer() {
   return { headChunks: [], headBytes: 0, tailChunks: [], tailBytes: 0, totalBytes: 0 };
@@ -67103,7 +67558,7 @@ function flattenBuffer(buf) {
 
 ` + tail;
 }
-async function runVerificationCommand2(opts) {
+async function runVerificationCommand3(opts) {
   const { command, cwd, timeoutMs, expectFailure = false, onHeartbeat, onLine } = opts;
   const startMs = Date.now();
   const warnings = [];
@@ -67243,7 +67698,7 @@ function createRunVerificationTool(opts) {
       if (params.cwd && isAbsolute10(params.cwd)) {
         resolvedCwd = params.cwd;
       } else if (params.cwd) {
-        resolvedCwd = join34(worktreePath, params.cwd);
+        resolvedCwd = join35(worktreePath, params.cwd);
       } else {
         resolvedCwd = worktreePath;
       }
@@ -67258,8 +67713,8 @@ function createRunVerificationTool(opts) {
       }
       let effectiveCommand = command;
       if (command.trimStart().startsWith("pnpm --filter")) {
-        const modulesYaml = join34(rootDir, "node_modules", ".modules.yaml");
-        if (!existsSync27(modulesYaml)) {
+        const modulesYaml = join35(rootDir, "node_modules", ".modules.yaml");
+        if (!existsSync28(modulesYaml)) {
           const installCmd = "pnpm install --prefer-offline";
           const msg = `node_modules/.modules.yaml not found in workspace root \u2014 auto-prepending \`${installCmd}\` before running the command.`;
           warnings.push(msg);
@@ -67270,7 +67725,7 @@ function createRunVerificationTool(opts) {
       log18.info(
         `[fn_run_verification] ${taskId}: scope=${scope} timeout=${timeoutSec}s cwd=${resolvedCwd} cmd=${effectiveCommand}`
       );
-      const result = await runVerificationCommand2({
+      const result = await runVerificationCommand3({
         command: effectiveCommand,
         cwd: resolvedCwd,
         timeoutMs,
@@ -67370,8 +67825,8 @@ var init_run_verification_tool = __esm({
 // ../engine/src/executor.ts
 import { exec as exec6 } from "node:child_process";
 import { promisify as promisify7 } from "node:util";
-import { isAbsolute as isAbsolute11, join as join35, relative as relative7, resolve as resolvePath } from "node:path";
-import { existsSync as existsSync28 } from "node:fs";
+import { isAbsolute as isAbsolute11, join as join36, relative as relative7, resolve as resolvePath } from "node:path";
+import { existsSync as existsSync29 } from "node:fs";
 import { readFile as readFile15, writeFile as writeFile12 } from "node:fs/promises";
 import { Type as Type5 } from "@mariozechner/pi-ai";
 import { ModelRegistry as ModelRegistry2, SessionManager as SessionManager2 } from "@mariozechner/pi-coding-agent";
@@ -67665,6 +68120,7 @@ var init_executor = __esm({
     "use strict";
     init_src();
     init_merger();
+    init_verification_utils();
     init_worktree_names();
     init_pi();
     init_session_token_usage();
@@ -67689,7 +68145,7 @@ var init_executor = __esm({
     init_task_completion();
     init_auth_storage();
     init_run_verification_tool();
-    init_notifier();
+    init_fallback_model_observer();
     init_agent_logger();
     init_agent_tools();
     execAsync5 = promisify7(exec6);
@@ -68456,20 +68912,26 @@ The tool prevents your session from being killed by the inactivity watchdog duri
         if (from !== "in-review" && from !== "done") {
           return task;
         }
-        const hasMergeEvidence = Boolean(task.mergeDetails) || (task.mergeRetries ?? 0) > 0 || (task.verificationFailureCount ?? 0) > 0 || task.status === "merging" || task.status === "merging-pr";
+        const hasMergeEvidence = Boolean(task.mergeDetails) || (task.mergeRetries ?? 0) > 0 || (task.verificationFailureCount ?? 0) > 0 || task.status === "merging" || task.status === "merging-pr" || task.status === "merging-fix";
         if (!hasMergeEvidence) {
           return task;
         }
         return this.cleanupMergeStateForReverification(
           task,
-          `Task returned to in-progress from ${from} column \u2014 resetting verification steps and merge state for re-verification`
+          `Task returned to in-progress from ${from} column \u2014 resetting verification steps and merge state for re-verification`,
+          {
+            // Keep deterministic merge-verification bounce budget across remediation
+            // cycles. Status may be cleared by intermediate paths, so the counter is
+            // the canonical signal once a bounce has started.
+            preserveVerificationFailureCount: (task.verificationFailureCount ?? 0) > 0
+          }
         );
       }
-      async cleanupMergeStateForReverification(task, logMessage) {
+      async cleanupMergeStateForReverification(task, logMessage, options) {
         await this.store.updateTask(task.id, {
           mergeDetails: null,
           mergeRetries: 0,
-          verificationFailureCount: 0,
+          verificationFailureCount: options?.preserveVerificationFailureCount ? task.verificationFailureCount ?? 0 : 0,
           workflowStepResults: []
         });
         const refreshedTask = await this.store.getTask(task.id);
@@ -68836,7 +69298,7 @@ The tool prevents your session from being killed by the inactivity watchdog duri
             );
             return false;
           }
-          if (task.worktree && existsSync28(task.worktree)) {
+          if (task.worktree && existsSync29(task.worktree)) {
             const modifiedFiles = await this.captureModifiedFiles(task.worktree, task.baseCommitSha);
             if (modifiedFiles.length > 0) {
               await this.store.updateTask(task.id, { modifiedFiles });
@@ -69016,7 +69478,7 @@ The tool prevents your session from being killed by the inactivity watchdog duri
         if (task.dependencies.length === 0) return null;
         for (const depId of task.dependencies) {
           const dep = allTasks.find((t) => t.id === depId);
-          if (dep && dep.worktree && (dep.column === "done" || dep.column === "in-review") && existsSync28(dep.worktree)) {
+          if (dep && dep.worktree && (dep.column === "done" || dep.column === "in-review") && existsSync29(dep.worktree)) {
             return dep.worktree;
           }
         }
@@ -69064,10 +69526,10 @@ The tool prevents your session from being killed by the inactivity watchdog duri
         };
         const audit = createRunAuditor(this.store, engineRunContext);
         const activeColumns = /* @__PURE__ */ new Set(["in-progress", "in-review", "done"]);
-        const activeMergeStatuses = /* @__PURE__ */ new Set(["merging", "merging-pr"]);
+        const activeMergeStatuses = /* @__PURE__ */ new Set(["merging", "merging-pr", "merging-fix"]);
         const isActiveTask = activeColumns.has(task.column) || activeMergeStatuses.has(task.status ?? "");
         if (!isActiveTask) {
-          const tasksDir = join35(this.store.getFusionDir(), "tasks");
+          const tasksDir = join36(this.store.getFusionDir(), "tasks");
           const promptPath = getPromptPath(tasksDir, task.id);
           const staleness = await evaluateSpecStaleness({ settings, promptPath });
           if (staleness.isStale) {
@@ -69114,7 +69576,7 @@ The tool prevents your session from being killed by the inactivity watchdog duri
               worktreeName = generateWorktreeName(this.rootDir);
               break;
           }
-          worktreePath = join35(this.rootDir, ".worktrees", worktreeName);
+          worktreePath = join36(this.rootDir, ".worktrees", worktreeName);
         }
         let stuckRequeue = null;
         let taskDone = false;
@@ -69138,7 +69600,7 @@ The tool prevents your session from being killed by the inactivity watchdog duri
             );
           }
           const branchName = task.branch || `fusion/${task.id.toLowerCase()}`;
-          let isResume = existsSync28(worktreePath);
+          let isResume = existsSync29(worktreePath);
           let acquiredFromPool = false;
           const baseBranch = task.baseBranch || null;
           if (task.worktree && isResume && !await isUsableTaskWorktree(this.rootDir, worktreePath)) {
@@ -69151,8 +69613,8 @@ The tool prevents your session from being killed by the inactivity watchdog duri
               this.currentRunContext
             );
             await this.store.updateTask(task.id, { worktree: null, branch: null });
-            worktreePath = join35(this.rootDir, ".worktrees", generateWorktreeName(this.rootDir));
-            isResume = existsSync28(worktreePath);
+            worktreePath = join36(this.rootDir, ".worktrees", generateWorktreeName(this.rootDir));
+            isResume = existsSync29(worktreePath);
           }
           if (!isResume) {
             if (this.options.pool && settings.recycleWorktrees) {
@@ -69378,6 +69840,88 @@ The tool prevents your session from being killed by the inactivity watchdog duri
                 if (await this.shouldDeferCompletionForGlobalPause(task.id, "before workflow steps after step-session completion")) {
                   return;
                 }
+                if (executionMode !== "fast") {
+                  if (settings.testCommand?.trim() || settings.buildCommand?.trim()) {
+                    const verificationResult = await this.runExecutorDeterministicVerification(task, worktreePath, settings);
+                    if (!verificationResult.allPassed) {
+                      const failedType = verificationResult.failedCommand === "testCommand" ? "test" : "build";
+                      const failedResult = failedType === "test" ? verificationResult.testResult : verificationResult.buildResult;
+                      const failedCommand = failedResult.command;
+                      const failureOutput = failedResult.stderr || failedResult.stdout || "Unknown error";
+                      const summary = summarizeVerificationOutput(failureOutput, failedType);
+                      executorLog.log(`${task.id}: [verification] ${failedType} failed \u2014 attempting fix agent`);
+                      await this.store.logEntry(
+                        task.id,
+                        `[verification] ${failedType} command failed (exit ${failedResult.exitCode}). Attempting fix agent...`,
+                        summary,
+                        this.currentRunContext
+                      );
+                      const maxFixRetries = Math.min(settings.verificationFixRetries ?? 3, 3);
+                      if (maxFixRetries === 0) {
+                        executorLog.log(`${task.id}: [verification] fix retries set to 0 \u2014 sending task back immediately`);
+                        await this.sendTaskBackForFix(
+                          task,
+                          worktreePath,
+                          `${failedType} command \`${failedCommand}\` failed (exit ${failedResult.exitCode}):
+${summary}`,
+                          `Verification (${failedType})`,
+                          `Deterministic verification failed (${failedType})`,
+                          true,
+                          true
+                        );
+                        return;
+                      }
+                      let fixSucceeded = false;
+                      for (let attempt = 1; attempt <= maxFixRetries; attempt++) {
+                        const fixed = await this.attemptExecutorVerificationFix(
+                          task,
+                          worktreePath,
+                          {
+                            command: failedCommand,
+                            exitCode: failedResult.exitCode,
+                            output: failureOutput,
+                            type: failedType
+                          },
+                          settings,
+                          attempt,
+                          maxFixRetries
+                        );
+                        if (fixed) {
+                          fixSucceeded = true;
+                          executorLog.log(`${task.id}: [verification] fix agent succeeded on attempt ${attempt}/${maxFixRetries}`);
+                          await this.store.logEntry(
+                            task.id,
+                            `[verification] Fix agent succeeded on attempt ${attempt}/${maxFixRetries}. Verification now passing.`,
+                            void 0,
+                            this.currentRunContext
+                          );
+                          break;
+                        }
+                        executorLog.log(`${task.id}: [verification] fix agent attempt ${attempt}/${maxFixRetries} failed`);
+                        await this.store.logEntry(
+                          task.id,
+                          `[verification] Fix agent attempt ${attempt}/${maxFixRetries} failed`,
+                          void 0,
+                          this.currentRunContext
+                        );
+                      }
+                      if (!fixSucceeded) {
+                        executorLog.log(`${task.id}: [verification] all fix attempts exhausted (${maxFixRetries}/${maxFixRetries}) \u2014 sending task back`);
+                        await this.sendTaskBackForFix(
+                          task,
+                          worktreePath,
+                          `${failedType} command \`${failedCommand}\` failed (exit ${failedResult.exitCode}) after ${maxFixRetries} fix attempts:
+${summary}`,
+                          `Verification (${failedType})`,
+                          `Deterministic verification failed after ${maxFixRetries} fix attempts`,
+                          true,
+                          true
+                        );
+                        return;
+                      }
+                    }
+                  }
+                }
                 if (executionMode !== "fast") {
                   const workflowResult = await this.runWorkflowSteps(task, worktreePath, settings);
                   if (workflowResult === "deferred-paused") {
@@ -69466,7 +70010,7 @@ The tool prevents your session from being killed by the inactivity watchdog duri
                     executorLog.warn(`\u26A1 ${task.id} transient error \u2014 retry ${attempt}/${MAX_RECOVERY_RETRIES} in ${delay3}: ${errorMessage}`);
                     await this.store.logEntry(task.id, `Transient error (retry ${attempt}/${MAX_RECOVERY_RETRIES} in ${delay3}): ${errorMessage}`, void 0, this.currentRunContext);
                   }
-                  if (worktreePath && existsSync28(worktreePath)) {
+                  if (worktreePath && existsSync29(worktreePath)) {
                     try {
                       await execAsync5(`git worktree remove "${worktreePath}" --force`, { cwd: this.rootDir });
                       await audit.git({ type: "worktree:remove", target: worktreePath });
@@ -69525,7 +70069,7 @@ The tool prevents your session from being killed by the inactivity watchdog duri
                 try {
                   const latestTask = await this.store.getTask(task.id);
                   await this.resetStepsIfWorkLost(latestTask);
-                  if (worktreePath && existsSync28(worktreePath)) {
+                  if (worktreePath && existsSync29(worktreePath)) {
                     try {
                       await execAsync5(`git worktree remove "${worktreePath}" --force`, { cwd: this.rootDir });
                     } catch (wtErr) {
@@ -69637,7 +70181,7 @@ The tool prevents your session from being killed by the inactivity watchdog duri
             const executorFallbackProvider = settings.fallbackProvider;
             const executorFallbackModelId = settings.fallbackModelId;
             const executorThinkingLevel = detail.thinkingLevel ?? settings.defaultThinkingLevel;
-            const isResuming = !!task.sessionFile && existsSync28(task.sessionFile);
+            const isResuming = !!task.sessionFile && existsSync29(task.sessionFile);
             const sessionManager = isResuming ? SessionManager2.open(task.sessionFile) : SessionManager2.create(worktreePath);
             executorLog.log(`${task.id}: creating agent session (provider=${executorProvider ?? "default"}, model=${executorModelId ?? "default"}, resuming=${isResuming})`);
             const executorInstructions = await this.resolveInstructionsForRole("executor");
@@ -69667,7 +70211,13 @@ The tool prevents your session from being killed by the inactivity watchdog duri
               ...skillContext.skillSelectionContext ? { skillSelection: skillContext.skillSelectionContext } : {},
               taskId: task.id,
               taskTitle: detail.title,
-              onFallbackModelUsed: notifyFallbackUsed
+              onFallbackModelUsed: createFallbackModelObserver({
+                agent: "executor",
+                label: "executor",
+                store: this.store,
+                taskId: task.id,
+                taskTitle: detail.title
+              })
             });
             if (isResuming) {
               executorLog.log(`${task.id}: resumed session from ${task.sessionFile}`);
@@ -70101,7 +70651,7 @@ The tool prevents your session from being killed by the inactivity watchdog duri
               this.options.onComplete?.(task);
             } else {
               executorLog.log(`${task.id} paused \u2014 moving to todo`);
-              if (worktreePath && existsSync28(worktreePath)) {
+              if (worktreePath && existsSync29(worktreePath)) {
                 try {
                   await execAsync5(`git worktree remove "${worktreePath}" --force`, { cwd: this.rootDir });
                   executorLog.log(`Removed old worktree for paused task: ${worktreePath}`);
@@ -70197,7 +70747,7 @@ The tool prevents your session from being killed by the inactivity watchdog duri
                   executorLog.warn(`\u26A1 ${task.id} transient error \u2014 retry ${attempt}/${MAX_RECOVERY_RETRIES} in ${delay3}: ${errorMessage}`);
                   await this.store.logEntry(task.id, `Transient error (retry ${attempt}/${MAX_RECOVERY_RETRIES} in ${delay3}): ${errorMessage}`, void 0, this.currentRunContext);
                 }
-                if (worktreePath && existsSync28(worktreePath)) {
+                if (worktreePath && existsSync29(worktreePath)) {
                   try {
                     await execAsync5(`git worktree remove "${worktreePath}" --force`, { cwd: this.rootDir });
                     executorLog.log(`Removed old worktree for transient retry: ${worktreePath}`);
@@ -70252,7 +70802,7 @@ The tool prevents your session from being killed by the inactivity watchdog duri
             try {
               const latestTask = await this.store.getTask(task.id);
               await this.resetStepsIfWorkLost(latestTask);
-              if (worktreePath && existsSync28(worktreePath)) {
+              if (worktreePath && existsSync29(worktreePath)) {
                 try {
                   await execAsync5(`git worktree remove "${worktreePath}" --force`, { cwd: this.rootDir });
                   executorLog.log(`Removed old worktree for stuck-killed retry: ${worktreePath}`);
@@ -70757,7 +71307,7 @@ Take a different approach. Do NOT repeat the rejected strategy. Re-read the step
        * The section is replaced entirely to avoid accumulation of old feedback.
        */
       async injectWorkflowRevisionInstructions(task, feedback) {
-        const promptPath = join35(this.store.getFusionDir(), "tasks", task.id, "PROMPT.md");
+        const promptPath = join36(this.store.getFusionDir(), "tasks", task.id, "PROMPT.md");
         let content;
         try {
           content = await readFile15(promptPath, "utf-8");
@@ -70811,6 +71361,217 @@ ${feedback}
        *
        * @returns true if a retry was scheduled, false if retries are exhausted
        */
+      /**
+       * Run deterministic verification (test + build commands) in the task's worktree.
+       * Returns a structured result indicating whether all commands passed.
+       */
+      async runExecutorDeterministicVerification(task, worktreePath, settings) {
+        const testCommand = settings.testCommand?.trim();
+        const buildCommand2 = settings.buildCommand?.trim();
+        if (!testCommand && !buildCommand2) {
+          executorLog.log(`${task.id}: no test/build commands configured \u2014 skipping verification`);
+          return { allPassed: true };
+        }
+        const parts = [];
+        if (testCommand) parts.push(`test: ${testCommand}`);
+        if (buildCommand2) parts.push(`build: ${buildCommand2}`);
+        executorLog.log(`${task.id}: [verification] running deterministic verification (${parts.join(", ")})`);
+        await this.store.logEntry(
+          task.id,
+          `[verification] Running deterministic verification (${parts.join(", ")})`,
+          void 0,
+          this.currentRunContext
+        );
+        const result = { allPassed: true };
+        if (testCommand) {
+          const testResult = await runVerificationCommand(
+            this.store,
+            worktreePath,
+            task.id,
+            testCommand,
+            "test",
+            void 0,
+            executorLog,
+            "executor"
+          );
+          result.testResult = testResult;
+          if (!testResult.success) {
+            result.allPassed = false;
+            result.failedCommand = "testCommand";
+            executorLog.log(`${task.id}: [verification] test failed (exit ${testResult.exitCode})`);
+            return result;
+          }
+        }
+        if (buildCommand2) {
+          const buildResult = await runVerificationCommand(
+            this.store,
+            worktreePath,
+            task.id,
+            buildCommand2,
+            "build",
+            void 0,
+            executorLog,
+            "executor"
+          );
+          result.buildResult = buildResult;
+          if (!buildResult.success) {
+            result.allPassed = false;
+            result.failedCommand = "buildCommand";
+            executorLog.log(`${task.id}: [verification] build failed (exit ${buildResult.exitCode})`);
+            return result;
+          }
+        }
+        executorLog.log(`${task.id}: [verification] passed`);
+        await this.store.logEntry(
+          task.id,
+          `[verification] Deterministic verification passed`,
+          void 0,
+          this.currentRunContext
+        );
+        return result;
+      }
+      /**
+       * Attempt to fix verification failures by spawning a dedicated AI fix agent.
+       * Follows the pattern established by the merger's attemptInMergeVerificationFix.
+       * Returns true if verification passes after the fix attempt, false otherwise.
+       */
+      async attemptExecutorVerificationFix(task, worktreePath, failureContext, settings, retryNumber, maxRetries) {
+        try {
+          executorLog.log(`${task.id}: spawning executor verification fix agent (attempt ${retryNumber}/${maxRetries})`);
+          const logger2 = new AgentLogger({
+            store: this.store,
+            taskId: task.id,
+            agent: "executor",
+            persistAgentToolOutput: settings.persistAgentToolOutput,
+            onAgentText: this.options.onAgentText,
+            onAgentTool: this.options.onAgentTool
+          });
+          let skillContext;
+          if (this.options.agentStore) {
+            try {
+              skillContext = await buildSessionSkillContext({
+                agentStore: this.options.agentStore,
+                task,
+                sessionPurpose: "executor",
+                projectRootDir: worktreePath,
+                pluginRunner: this.options.pluginRunner
+              });
+            } catch {
+            }
+          }
+          const { provider: executorProvider, modelId: executorModelId } = resolveExecutorModelPair2(
+            task.modelProvider,
+            task.modelId,
+            settings
+          );
+          const { session } = await createResolvedAgentSession({
+            sessionPurpose: "executor",
+            pluginRunner: this.options.pluginRunner,
+            cwd: worktreePath,
+            // Run in the task's worktree
+            systemPrompt: `You are a verification fix agent running during task execution in a worktree.
+
+All step-session steps completed successfully but the deterministic verification command failed. Your job is to fix the failing code directly in the working directory.
+
+## Scope
+Only fix what is required to make the failing verification pass.
+Do not refactor, rename broadly, or make opportunistic improvements.
+
+## Rules
+1. Read the error output carefully to understand what is failing before editing anything
+2. Before assuming a code fix is needed, check whether the failure is caused by stale/missing build artifacts in a sibling workspace package \u2014 typical signatures: \`Failed to resolve import "./X.js"\` pointing into another package's \`dist/\`, \`Cannot find module\`, or \`ERR_MODULE_NOT_FOUND\` referencing a workspace-internal path. In that case, rebuild the affected package(s) (e.g. \`pnpm --filter <pkg> build\`, or \`pnpm --filter "<scope>/*" build\` for a group) and re-run verification before editing source files.
+3. Make targeted fixes to the failing code path
+4. After fixing, run the verification command to confirm the fix works
+5. Do NOT make any git commits \u2014 just fix the code
+6. You MAY modify any files needed to make the verification pass, including files unrelated to this task's original change. Pre-existing build/test breakage is in scope: fix it. Prefer the smallest change that makes verification green.
+7. If you cannot fix the issue within scope, explain why and what evidence indicates a deeper/root problem`,
+            tools: "coding",
+            onText: logger2.onText,
+            onThinking: logger2.onThinking,
+            onToolStart: logger2.onToolStart,
+            onToolEnd: logger2.onToolEnd,
+            defaultProvider: executorProvider,
+            defaultModelId: executorModelId,
+            defaultThinkingLevel: settings.defaultThinkingLevel,
+            ...skillContext?.skillSelectionContext ? { skillSelection: skillContext.skillSelectionContext } : {}
+          });
+          await this.store.logEntry(
+            task.id,
+            `Executor verification fix agent started (model: ${describeModel(session)}, attempt ${retryNumber}/${maxRetries})`,
+            void 0,
+            this.currentRunContext
+          );
+          await this.store.appendAgentLog(
+            task.id,
+            `Fix agent started (model: ${describeModel(session)}, attempt ${retryNumber}/${maxRetries})`,
+            "text",
+            void 0,
+            "executor"
+          );
+          try {
+            const fixPrompt = `Fix the failing ${failureContext.type} verification for task ${task.id}.
+
+## Failed command
+Command: \`${failureContext.command}\`
+Exit code: ${failureContext.exitCode}
+
+## Error output
+${failureContext.output.slice(0, VERIFICATION_LOG_MAX_CHARS)}
+
+## Instructions
+1. Read the error output and identify the root cause
+2. Make targeted fixes to resolve the failure
+3. Run the verification command \`${failureContext.command}\` to confirm your fix works
+4. If the fix doesn't work, try a different approach
+5. Do NOT make any git commits`;
+            await withRateLimitRetry(async () => {
+              await promptWithFallback(session, fixPrompt);
+            }, {
+              onRetry: (attempt, delayMs, error) => {
+                const delaySec = Math.round(delayMs / 1e3);
+                executorLog.warn(`\u23F3 ${task.id} executor fix agent rate limited \u2014 retry ${attempt} in ${delaySec}s: ${error.message}`);
+              }
+            });
+            await accumulateSessionTokenUsage(this.store, task.id, session);
+            executorLog.log(`${task.id}: re-running deterministic verification after fix attempt ${retryNumber}/${maxRetries}`);
+            await this.store.logEntry(
+              task.id,
+              `Re-running deterministic verification (attempt ${retryNumber}/${maxRetries})`,
+              void 0,
+              this.currentRunContext
+            );
+            await this.store.appendAgentLog(
+              task.id,
+              `Re-running verification (attempt ${retryNumber}/${maxRetries})`,
+              "text",
+              void 0,
+              "executor"
+            );
+            const reRunResult = await this.runExecutorDeterministicVerification(task, worktreePath, settings);
+            return reRunResult.allPassed;
+          } finally {
+            await logger2.flush();
+            await session.dispose();
+          }
+        } catch (err) {
+          const errorMessage = err instanceof Error ? err.message : String(err);
+          executorLog.warn(`${task.id}: executor verification fix agent error: ${errorMessage}`);
+          await this.store.logEntry(
+            task.id,
+            `Executor verification fix agent encountered an error`,
+            errorMessage,
+            this.currentRunContext
+          );
+          await this.store.appendAgentLog(
+            task.id,
+            "Fix agent encountered an error",
+            "tool_error",
+            errorMessage,
+            "executor"
+          );
+          return false;
+        }
+      }
       async handleWorkflowStepFailure(task, worktreePath, failureFeedback, stepName) {
         this.clearCompletedTaskWatchdog(task.id);
         const currentRetries = task.workflowStepRetries ?? 0;
@@ -70843,7 +71604,7 @@ ${feedback}
        * Injects failure feedback into PROMPT.md, resets steps, clears session,
        * and schedules a move to todo → in-progress after the executing guard clears.
        */
-      async sendTaskBackForFix(task, worktreePath, failureFeedback, stepName, reason, preserveResumeState = true) {
+      async sendTaskBackForFix(task, worktreePath, failureFeedback, stepName, reason, preserveResumeState = true, mergeVerificationFailure = false) {
         const taskId = task.id;
         this.clearCompletedTaskWatchdog(taskId);
         await this.store.addTaskComment(
@@ -70862,7 +71623,7 @@ Please fix the issues so the verification can pass on the next attempt.`,
         const updatedTask = await this.store.getTask(taskId);
         await this.reopenLastStepForRevision(taskId, updatedTask);
         await this.store.updateTask(taskId, {
-          status: null,
+          status: mergeVerificationFailure ? "merging-fix" : null,
           error: null,
           sessionFile: null,
           workflowStepRetries: 0
@@ -70880,7 +71641,7 @@ Please fix the issues so the verification can pass on the next attempt.`,
        * The section is replaced entirely to avoid accumulation of old feedback.
        */
       async injectWorkflowStepFailureInstructions(task, failureFeedback, stepName, retryCount) {
-        const promptPath = join35(this.store.getFusionDir(), "tasks", task.id, "PROMPT.md");
+        const promptPath = join36(this.store.getFusionDir(), "tasks", task.id, "PROMPT.md");
         let content;
         try {
           content = await readFile15(promptPath, "utf-8");
@@ -70945,31 +71706,33 @@ ${failureFeedback}
        * Uses git diff against the stored baseCommitSha to determine what changed.
        * Returns an empty array if no changes or if git commands fail.
        */
+      async resolveDiffBaseRef(worktreePath, baseCommitSha) {
+        if (baseCommitSha) return baseCommitSha;
+        try {
+          const { stdout } = await execAsync5(
+            "git merge-base HEAD origin/main 2>/dev/null || git merge-base HEAD main",
+            { cwd: worktreePath, encoding: "utf-8" }
+          );
+          const ref = stdout.trim();
+          if (ref) return ref;
+        } catch (mergeBaseErr) {
+          const mergeBaseMsg = mergeBaseErr instanceof Error ? mergeBaseErr.message : String(mergeBaseErr);
+          executorLog.warn(`Failed merge-base lookup for diff base in ${worktreePath}, trying HEAD~1 fallback: ${mergeBaseMsg}`);
+        }
+        try {
+          const { stdout } = await execAsync5("git rev-parse HEAD~1", {
+            cwd: worktreePath,
+            encoding: "utf-8"
+          });
+          return stdout.trim() || void 0;
+        } catch {
+          executorLog.log(`Could not determine base commit for diff in ${worktreePath}`);
+          return void 0;
+        }
+      }
       async captureModifiedFiles(worktreePath, baseCommitSha) {
         try {
-          let baseRef = baseCommitSha;
-          if (!baseRef) {
-            try {
-              const { stdout: stdout2 } = await execAsync5("git merge-base HEAD origin/main 2>/dev/null || git merge-base HEAD main", {
-                cwd: worktreePath,
-                encoding: "utf-8"
-              });
-              baseRef = stdout2.trim();
-            } catch (mergeBaseErr) {
-              const mergeBaseMsg = mergeBaseErr instanceof Error ? mergeBaseErr.message : String(mergeBaseErr);
-              executorLog.warn(`Failed merge-base lookup for diff base in ${worktreePath}, trying HEAD~1 fallback: ${mergeBaseMsg}`);
-              try {
-                const { stdout: stdout2 } = await execAsync5("git rev-parse HEAD~1", {
-                  cwd: worktreePath,
-                  encoding: "utf-8"
-                });
-                baseRef = stdout2.trim();
-              } catch {
-                executorLog.log(`Could not determine base commit for diff in ${worktreePath}`);
-                return [];
-              }
-            }
-          }
+          const baseRef = await this.resolveDiffBaseRef(worktreePath, baseCommitSha);
           if (!baseRef) {
             return [];
           }
@@ -71205,6 +71968,30 @@ ${failureFeedback}
        */
       async executeWorkflowStep(task, workflowStep, worktreePath, settings) {
         const toolMode = workflowStep.toolMode || "readonly";
+        const scopedFiles = await this.captureModifiedFiles(worktreePath, task.baseCommitSha);
+        let diffShortstat;
+        try {
+          const baseRef = await this.resolveDiffBaseRef(worktreePath, task.baseCommitSha);
+          if (baseRef) {
+            const { stdout } = await execAsync5(`git diff --shortstat ${baseRef}..HEAD`, {
+              cwd: worktreePath,
+              encoding: "utf-8"
+            });
+            diffShortstat = stdout.trim() || void 0;
+          }
+        } catch {
+        }
+        const MAX_SCOPE_FILES = 100;
+        const scopeFileBlock = scopedFiles.length === 0 ? "(no modified files detected for this task \u2014 review the worktree directly, but do NOT browse unrelated files)" : scopedFiles.length > MAX_SCOPE_FILES ? `${scopedFiles.slice(0, MAX_SCOPE_FILES).map((f) => `- ${f}`).join("\n")}
+- ... (${scopedFiles.length - MAX_SCOPE_FILES} more files truncated)` : scopedFiles.map((f) => `- ${f}`).join("\n");
+        const scopeBlock = `Diff Scope (files changed by THIS task vs base):
+${scopeFileBlock}${diffShortstat ? `
+Diff stat: ${diffShortstat}` : ""}
+
+CRITICAL SCOPING RULES \u2014 read before doing anything else:
+- Review ONLY the files listed above. Do NOT analyze unmodified files or unrelated parts of the codebase.
+- If NONE of the files in the diff scope are relevant to your review category (e.g. a UX/design reviewer with no UI/CSS/component files in scope, a security reviewer with no auth/network code in scope, an a11y reviewer with no markup changes), respond IMMEDIATELY with a single short approval line such as "No relevant changes in scope \u2014 approved." and STOP. Do not start exploring the codebase.
+- Your wall-clock budget is short. Spending it browsing unmodified files will cause this step to time out and block merge.`;
         const systemPrompt = `You are a workflow step agent executing: ${workflowStep.name}
 
 Task Context:
@@ -71212,6 +71999,8 @@ Task Context:
 - Task Description: ${task.description}
 - Worktree: ${worktreePath}
 
+${scopeBlock}
+
 Your role:
 - Execute this workflow step exactly as scoped.
 - Prioritize high-impact correctness/risk findings over stylistic nits.
@@ -71680,7 +72469,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
        * rather than fail the task permanently.
        */
       async resolveWorktreeStartPoint(startPoint, taskId) {
-        const command = isAbsolute11(startPoint) && existsSync28(startPoint) ? `git -C "${startPoint}" rev-parse --verify HEAD^{commit}` : `git rev-parse --verify "${startPoint}^{commit}"`;
+        const command = isAbsolute11(startPoint) && existsSync29(startPoint) ? `git -C "${startPoint}" rev-parse --verify HEAD^{commit}` : `git rev-parse --verify "${startPoint}^{commit}"`;
         try {
           const { stdout } = await execAsync5(command, { cwd: this.rootDir });
           return stdout.trim() || startPoint;
@@ -71700,7 +72489,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
        */
       async tryCreateWorktree(branch, path2, taskId, startPoint, attemptNumber = 0, recoveryDepth = 0) {
         await this.assertWorktreePathNotNested(path2, taskId);
-        if (existsSync28(path2)) {
+        if (existsSync29(path2)) {
           const isRegistered = await this.isRegisteredWorktree(path2);
           if (!isRegistered) {
             await this.store.logEntry(
@@ -71851,7 +72640,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
         );
         if (shouldGenerateNewName) {
           const conflictStartPoint = branch;
-          const newPath = join35(this.rootDir, ".worktrees", generateWorktreeName(this.rootDir));
+          const newPath = join36(this.rootDir, ".worktrees", generateWorktreeName(this.rootDir));
           for (let suffix = 2; suffix <= 6; suffix++) {
             const suffixedBranch = `${branch}-${suffix}`;
             try {
@@ -72451,7 +73240,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
                 metadata: { type: "spawned", parentTaskId: taskId }
               });
               const childWorktreeName = generateWorktreeName(this.rootDir);
-              const childWorktreePath = join35(this.rootDir, ".worktrees", childWorktreeName);
+              const childWorktreePath = join36(this.rootDir, ".worktrees", childWorktreeName);
               const childBranch = `fusion/spawn-${agent.id}`;
               await this.createWorktree(childBranch, childWorktreePath, taskId, worktreePath);
               await this.options.agentStore.updateAgentState(agent.id, "active");
@@ -72640,9 +73429,9 @@ var init_node_routing_policy = __esm({
 });
 
 // ../engine/src/scheduler.ts
-import { existsSync as existsSync29 } from "node:fs";
+import { existsSync as existsSync30 } from "node:fs";
 import { readFile as readFile16 } from "node:fs/promises";
-import { basename as basename8, join as join36 } from "node:path";
+import { basename as basename8, join as join37 } from "node:path";
 function pathsOverlap2(a, b) {
   for (const pa of a) {
     const prefixA = pa.endsWith("/*") ? pa.slice(0, -1) : null;
@@ -72812,12 +73601,12 @@ var init_scheduler = __esm({
        * @returns Object with `valid: true` if checks pass, or `valid: false` with a `reason` string if they fail
        */
       async validateTaskFilesystem(id) {
-        const taskDir = join36(this.store.getTasksDir(), id);
-        if (!existsSync29(taskDir)) {
+        const taskDir = join37(this.store.getTasksDir(), id);
+        if (!existsSync30(taskDir)) {
           return { valid: false, reason: "missing directory" };
         }
-        const promptPath = join36(taskDir, "PROMPT.md");
-        if (!existsSync29(promptPath)) {
+        const promptPath = join37(taskDir, "PROMPT.md");
+        if (!existsSync30(promptPath)) {
           return { valid: false, reason: "missing or empty PROMPT.md" };
         }
         try {
@@ -72956,7 +73745,7 @@ var init_scheduler = __esm({
             break;
         }
         reservedNames.add(worktreeName);
-        return join36(this.store.getRootDir(), ".worktrees", worktreeName);
+        return join37(this.store.getRootDir(), ".worktrees", worktreeName);
       }
       /**
        * Run one scheduling pass.
@@ -74233,7 +75022,7 @@ var init_mission_execution_loop = __esm({
     init_pi();
     init_agent_session_helpers();
     init_logger2();
-    init_notifier();
+    init_fallback_model_observer();
     loopLog = createLogger2("mission-loop");
     VALIDATION_TIMEOUT_MS = 10 * 60 * 1e3;
     MissionExecutionLoop = class extends EventEmitter17 {
@@ -74467,7 +75256,13 @@ Assertions: ${assertions.map((a) => a.title).join(", ")}`,
             },
             taskId: task?.id,
             taskTitle: task?.title,
-            onFallbackModelUsed: notifyFallbackUsed
+            onFallbackModelUsed: createFallbackModelObserver({
+              agent: "reviewer",
+              label: "mission validator",
+              store: this.taskStore,
+              taskId: task?.id,
+              taskTitle: task?.title
+            })
           });
           session = { session: sessionResult.session, sessionFile: sessionResult.sessionFile };
           loopLog.log(`Validation session created for feature ${feature.id}`);
@@ -77732,7 +78527,7 @@ async function createAiPromptExecutor(cwd) {
     }
   };
 }
-function truncateOutput(stdout, stderr) {
+function truncateOutput2(stdout, stderr) {
   const out = stdout ?? "";
   const err = stderr ?? "";
   let combined = out;
@@ -77912,7 +78707,7 @@ var init_cron_runner = __esm({
             maxBuffer: MAX_BUFFER,
             shell: defaultShell
           });
-          const output = truncateOutput(stdout, stderr);
+          const output = truncateOutput2(stdout, stderr);
           log15.log(`\u2713 ${schedule.name} completed (${output.length} bytes output)`);
           return {
             success: true,
@@ -77923,7 +78718,7 @@ var init_cron_runner = __esm({
         } catch (err) {
           const stdout = err.stdout ?? "";
           const stderr = err.stderr ?? "";
-          const output = truncateOutput(stdout, stderr);
+          const output = truncateOutput2(stdout, stderr);
           const errorMessage = err.killed ? `Command timed out after ${(schedule.timeoutMs ?? DEFAULT_TIMEOUT_MS6) / 1e3}s` : err.message ?? String(err);
           log15.warn(`\u2717 ${schedule.name} failed: ${errorMessage}`);
           return {
@@ -77968,7 +78763,7 @@ var init_cron_runner = __esm({
           const result = await runBackupCommand2(fusionDir, settings);
           return {
             success: result.success,
-            output: truncateOutput(result.output ?? "", ""),
+            output: truncateOutput2(result.output ?? "", ""),
             error: result.success ? void 0 : result.output
           };
         } catch (err) {
@@ -78009,7 +78804,7 @@ var init_cron_runner = __esm({
           if (sr.output) outputParts.push(sr.output);
           if (sr.error) outputParts.push(`Error: ${sr.error}`);
         }
-        const output = truncateOutput(outputParts.join("\n"), "");
+        const output = truncateOutput2(outputParts.join("\n"), "");
         const failedSteps = stepResults.filter((sr) => !sr.success);
         const error = failedSteps.length > 0 ? `${failedSteps.length} step(s) failed: ${failedSteps.map((s) => s.stepName).join(", ")}${stoppedEarly ? " (execution stopped)" : ""}` : void 0;
         const status = overallSuccess ? "\u2713" : "\u2717";
@@ -78088,7 +78883,7 @@ var init_cron_runner = __esm({
             stepName: step.name,
             stepIndex,
             success: true,
-            output: truncateOutput(stdout, stderr),
+            output: truncateOutput2(stdout, stderr),
             startedAt,
             completedAt: (/* @__PURE__ */ new Date()).toISOString()
           };
@@ -78101,7 +78896,7 @@ var init_cron_runner = __esm({
             stepName: step.name,
             stepIndex,
             success: false,
-            output: truncateOutput(stdout, stderr),
+            output: truncateOutput2(stdout, stderr),
             error: errorMessage,
             startedAt,
             completedAt: (/* @__PURE__ */ new Date()).toISOString()
@@ -78251,7 +79046,7 @@ var init_cron_runner = __esm({
 // ../engine/src/routine-runner.ts
 import { exec as exec8 } from "node:child_process";
 import { promisify as promisify8 } from "node:util";
-function truncateOutput2(stdout, stderr) {
+function truncateOutput3(stdout, stderr) {
   let output = stdout;
   if (stderr) {
     output += stdout ? "\n--- stderr ---\n" : "";
@@ -78434,7 +79229,7 @@ var init_routine_runner = __esm({
             const result = await runBackupCommand2(fusionDir, settings);
             return {
               success: result.success,
-              output: truncateOutput2(result.output ?? "", ""),
+              output: truncateOutput3(result.output ?? "", ""),
               error: result.success ? void 0 : result.output,
               startedAt,
               completedAt: (/* @__PURE__ */ new Date()).toISOString()
@@ -78458,7 +79253,7 @@ var init_routine_runner = __esm({
           });
           return {
             success: true,
-            output: truncateOutput2(stdout, stderr),
+            output: truncateOutput3(stdout, stderr),
             startedAt,
             completedAt: (/* @__PURE__ */ new Date()).toISOString()
           };
@@ -78469,7 +79264,7 @@ var init_routine_runner = __esm({
           const error = errObj.killed === true ? `Command timed out after ${(timeoutMs ?? DEFAULT_TIMEOUT_MS7) / 1e3}s` : (err instanceof Error ? err.message : null) ?? String(err);
           return {
             success: false,
-            output: truncateOutput2(stdout, stderr),
+            output: truncateOutput3(stdout, stderr),
             error,
             startedAt,
             completedAt: (/* @__PURE__ */ new Date()).toISOString()
@@ -78502,7 +79297,7 @@ var init_routine_runner = __esm({
         const failedSteps = stepResults.filter((sr) => !sr.success);
         return {
           success: overallSuccess,
-          output: truncateOutput2(outputParts.join("\n"), ""),
+          output: truncateOutput3(outputParts.join("\n"), ""),
           error: failedSteps.length > 0 ? `${failedSteps.length} step(s) failed: ${failedSteps.map((s) => s.stepName).join(", ")}${stoppedEarly ? " (execution stopped)" : ""}` : void 0,
           startedAt,
           completedAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -78537,7 +79332,7 @@ var init_routine_runner = __esm({
               this.options.aiPromptExecutor(step.prompt, step.modelProvider, step.modelId),
               new Promise((_resolve, reject) => setTimeout(() => reject(new Error(`AI prompt step timed out after ${timeoutMs / 1e3}s`)), timeoutMs))
             ]);
-            return { stepId: step.id, stepName: step.name, stepIndex, success: true, output: truncateOutput2(output, ""), startedAt, completedAt: (/* @__PURE__ */ new Date()).toISOString() };
+            return { stepId: step.id, stepName: step.name, stepIndex, success: true, output: truncateOutput3(output, ""), startedAt, completedAt: (/* @__PURE__ */ new Date()).toISOString() };
           } catch (err) {
             return { stepId: step.id, stepName: step.name, stepIndex, success: false, output: "", error: err instanceof Error ? err.message : String(err), startedAt, completedAt: (/* @__PURE__ */ new Date()).toISOString() };
           }
@@ -79151,8 +79946,8 @@ var init_stuck_task_detector = __esm({
 // ../engine/src/self-healing.ts
 import { exec as exec9 } from "node:child_process";
 import { promisify as promisify9 } from "node:util";
-import { existsSync as existsSync30, readdirSync as readdirSync5, rmSync as rmSync3, statSync as statSync5 } from "node:fs";
-import { isAbsolute as isAbsolute13, join as join37, relative as relative8, resolve as resolve17 } from "node:path";
+import { existsSync as existsSync31, readdirSync as readdirSync5, rmSync as rmSync3, statSync as statSync5 } from "node:fs";
+import { isAbsolute as isAbsolute13, join as join38, relative as relative8, resolve as resolve17 } from "node:path";
 function shellQuote(value) {
   return `'${value.replace(/'/g, "'\\''")}'`;
 }
@@ -79197,14 +79992,15 @@ var init_self_healing = __esm({
     execAsync7 = promisify9(exec9);
     APPROVED_TRIAGE_RECOVERY_GRACE_MS = 6e4;
     ORPHANED_EXECUTION_RECOVERY_GRACE_MS = 6e4;
-    ACTIVE_MERGE_STATUSES = /* @__PURE__ */ new Set(["merging", "merging-pr"]);
+    ACTIVE_MERGE_STATUSES = /* @__PURE__ */ new Set(["merging", "merging-pr", "merging-fix"]);
     NON_TERMINAL_STEP_STATUSES2 = /* @__PURE__ */ new Set(["pending", "in-progress"]);
     GHOST_REVIEW_PRESERVED_STATUSES = /* @__PURE__ */ new Set([
       "failed",
       "awaiting-user-review",
       "awaiting-approval",
       "merging",
-      "merging-pr"
+      "merging-pr",
+      "merging-fix"
     ]);
     ORPHANED_WITH_WORKTREE_GRACE_MS = 3e5;
     MAX_TASK_DONE_RETRIES = 3;
@@ -79548,7 +80344,7 @@ var init_self_healing = __esm({
         return commit;
       }
       async cleanupInterruptedMergeArtifacts(task) {
-        if (task.worktree && existsSync30(task.worktree)) {
+        if (task.worktree && existsSync31(task.worktree)) {
           try {
             await execAsync7(`git worktree remove ${shellQuote(task.worktree)} --force`, {
               cwd: this.options.rootDir,
@@ -79927,7 +80723,7 @@ var init_self_healing = __esm({
        *
        * Preserved statuses (skipped):
        * - `awaiting-user-review`, `awaiting-approval`: explicit human handoff
-       * - `merging`, `merging-pr`: handled by `recoverInterruptedMergingTasks`
+       * - `merging`, `merging-pr`, `merging-fix`: handled by `recoverInterruptedMergingTasks`
        *
        * Rate-limiting comes from the `updatedAt >= taskStuckTimeoutMs` gate —
        * each kick refreshes `updatedAt`, so a task that re-enters review and gets
@@ -80169,7 +80965,7 @@ var init_self_healing = __esm({
               return false;
             }
             const staleness = now - new Date(t.updatedAt).getTime();
-            const hasWorktree = t.worktree && existsSync30(t.worktree);
+            const hasWorktree = t.worktree && existsSync31(t.worktree);
             const graceMs = hasWorktree ? ORPHANED_WITH_WORKTREE_GRACE_MS : ORPHANED_EXECUTION_RECOVERY_GRACE_MS;
             return staleness >= graceMs;
           });
@@ -80178,7 +80974,7 @@ var init_self_healing = __esm({
           let recovered = 0;
           for (const task of orphaned) {
             try {
-              const hadWorktree = task.worktree && existsSync30(task.worktree);
+              const hadWorktree = task.worktree && existsSync31(task.worktree);
               const reason = hadWorktree ? "worktree exists but no active session" : "missing worktree/session";
               await this.resetStepsIfWorkLost(task);
               await this.store.updateTask(task.id, {
@@ -80324,7 +81120,7 @@ var init_self_healing = __esm({
         }
       }
       async hasRecoverableGitWork(task) {
-        if (task.worktree && existsSync30(task.worktree)) {
+        if (task.worktree && existsSync31(task.worktree)) {
           try {
             const { stdout: status } = await execAsync7("git status --porcelain", {
               cwd: task.worktree,
@@ -80509,11 +81305,11 @@ var init_self_healing = __esm({
        * tracks registered idle worktrees, never these orphans.
        */
       async reapUnregisteredOrphans() {
-        const worktreesDir = join37(this.options.rootDir, ".worktrees");
-        if (!existsSync30(worktreesDir)) return 0;
+        const worktreesDir = join38(this.options.rootDir, ".worktrees");
+        if (!existsSync31(worktreesDir)) return 0;
         let dirs;
         try {
-          dirs = readdirSync5(worktreesDir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => join37(worktreesDir, e.name));
+          dirs = readdirSync5(worktreesDir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => join38(worktreesDir, e.name));
         } catch (err) {
           log17.warn(`Failed to read .worktrees/ for unregistered orphan reap: ${err instanceof Error ? err.message : String(err)}`);
           return 0;
@@ -80618,8 +81414,8 @@ var init_self_healing = __esm({
       }
       /** Remove oldest idle worktrees if total count exceeds 2× maxWorktrees. */
       async enforceWorktreeCap() {
-        const worktreesDir = join37(this.options.rootDir, ".worktrees");
-        if (!existsSync30(worktreesDir)) return;
+        const worktreesDir = join38(this.options.rootDir, ".worktrees");
+        if (!existsSync31(worktreesDir)) return;
         try {
           const settings = await this.store.getSettings();
           const cap = (settings.maxWorktrees ?? 4) * 2;
@@ -82457,7 +83253,7 @@ var init_ipc_host = __esm({
 import { EventEmitter as EventEmitter20 } from "node:events";
 import { fork } from "node:child_process";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
-import { dirname as dirname11, join as join38 } from "node:path";
+import { dirname as dirname11, join as join39 } from "node:path";
 var HealthMonitor, ChildProcessRuntime;
 var init_child_process_runtime = __esm({
   "../engine/src/runtimes/child-process-runtime.ts"() {
@@ -82619,7 +83415,7 @@ var init_child_process_runtime = __esm({
         const isCompiled = !import.meta.url.endsWith(".ts");
         const currentDir = dirname11(fileURLToPath3(import.meta.url));
         const workerFile = isCompiled ? "child-process-worker.js" : "child-process-worker.ts";
-        return join38(currentDir, workerFile);
+        return join39(currentDir, workerFile);
       }
       /**
        * Set up event forwarding from IPC host to runtime listeners.
@@ -85543,7 +86339,7 @@ ${detail}`
                     "agent"
                   );
                   await store.updateTask(taskId, {
-                    status: null,
+                    status: "merging-fix",
                     mergeRetries: 0,
                     error: null,
                     verificationFailureCount: nextBounces
@@ -85551,10 +86347,10 @@ ${detail}`
                   await store.moveTask(taskId, "in-progress");
                   await store.logEntry(
                     taskId,
-                    `Deterministic ${failedKind} verification failed (${nextBounces}/${cap}) \u2014 moved back to in-progress for remediation`
+                    `Deterministic ${failedKind} verification failed (${nextBounces}/${cap}) \u2014 moved back to in-progress with status=merging-fix for remediation`
                   );
                   runtimeLog.log(
-                    `Auto-merge: ${taskId} deterministic ${failedKind} verification failed (${nextBounces}/${cap}) \u2014 moved to in-progress`
+                    `Auto-merge: ${taskId} deterministic ${failedKind} verification failed (${nextBounces}/${cap}) \u2014 moved to in-progress with status=merging-fix`
                   );
                 } catch {
                   runtimeLog.error(
@@ -86872,6 +87668,8 @@ __export(src_exports2, {
   describeAgentModel: () => describeAgentModel,
   describeModel: () => describeModel,
   ensureDefaultHeartbeatProcedureFile: () => ensureDefaultHeartbeatProcedureFile,
+  extractRuntimeHint: () => extractRuntimeHint,
+  extractRuntimeModel: () => extractRuntimeModel,
   formatTaskIdentifier: () => formatTaskIdentifier,
   getDefaultPiRuntime: () => getDefaultPiRuntime,
   getHostExtensionPaths: () => getHostExtensionPaths,
@@ -96539,10 +97337,18 @@ var init_claude_cli_probe = __esm({
   }
 });
 
+// ../../plugins/fusion-plugin-droid-runtime/dist/probe.js
+var init_probe3 = __esm({
+  "../../plugins/fusion-plugin-droid-runtime/dist/probe.js"() {
+    "use strict";
+  }
+});
+
 // ../dashboard/src/droid-cli-probe.ts
 var init_droid_cli_probe = __esm({
   "../dashboard/src/droid-cli-probe.ts"() {
     "use strict";
+    init_probe3();
   }
 });
 
@@ -101430,7 +102236,7 @@ var init_auth_middleware = __esm({
 
 // ../dashboard/src/server.ts
 import express from "express";
-import { join as join39, dirname as dirname12 } from "node:path";
+import { join as join40, dirname as dirname12 } from "node:path";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 function clearAiSessionCleanupInterval() {
   if (!aiSessionCleanupIntervalHandle) {
@@ -101722,8 +102528,8 @@ __export(task_exports, {
   runTaskUpdate: () => runTaskUpdate
 });
 import { createInterface as createInterface2 } from "node:readline/promises";
-import { watchFile, unwatchFile, statSync as statSync6, existsSync as existsSync31, readFileSync as readFileSync10 } from "node:fs";
-import { basename as basename10, join as join40 } from "node:path";
+import { watchFile, unwatchFile, statSync as statSync6, existsSync as existsSync32, readFileSync as readFileSync11 } from "node:fs";
+import { basename as basename10, join as join41 } from "node:path";
 function getGitHubIssueUrl(sourceMetadata) {
   if (!sourceMetadata || typeof sourceMetadata !== "object") return void 0;
   const issueUrl = sourceMetadata.issueUrl;
@@ -102036,8 +102842,8 @@ async function runTaskLogs(id, options = {}, projectName) {
   printEntries(filteredEntries);
   if (options.follow) {
     const projectPath = projectContext?.projectPath ?? process.cwd();
-    const logPath = join40(projectPath, ".fusion", "tasks", id, "agent.log");
-    if (!existsSync31(logPath)) {
+    const logPath = join41(projectPath, ".fusion", "tasks", id, "agent.log");
+    if (!existsSync32(logPath)) {
       console.log(`
   Waiting for log file to be created...`);
     }
@@ -102066,7 +102872,7 @@ async function runTaskLogs(id, options = {}, projectName) {
           lastPosition = 0;
         }
         if (stats.size > lastPosition) {
-          const content = readFileSync10(logPath, "utf-8");
+          const content = readFileSync11(logPath, "utf-8");
           const lines = content.slice(lastPosition).split("\n");
           for (const line of lines) {
             if (!line.trim()) continue;
@@ -103179,9 +103985,9 @@ init_src();
 init_gh_cli();
 import { Type as Type8 } from "typebox";
 import { StringEnum } from "@mariozechner/pi-ai";
-import { resolve as resolve19, basename as basename11, extname as extname3, join as join41 } from "node:path";
+import { resolve as resolve19, basename as basename11, extname as extname3, join as join42 } from "node:path";
 import { readFile as readFile19 } from "node:fs/promises";
-import { existsSync as existsSync32 } from "node:fs";
+import { existsSync as existsSync33 } from "node:fs";
 import { spawn as spawn11 } from "node:child_process";
 var MIME_TYPES2 = {
   ".png": "image/png",
@@ -103201,7 +104007,7 @@ var MIME_TYPES2 = {
 function resolveProjectRoot2(cwd) {
   let current = resolve19(cwd);
   while (true) {
-    if (existsSync32(join41(current, ".fusion"))) {
+    if (existsSync33(join42(current, ".fusion"))) {
       return current;
     }
     const parent = resolve19(current, "..");
@@ -103222,7 +104028,7 @@ async function getStore2(cwd) {
   return store;
 }
 function getFusionDir(cwd) {
-  return join41(resolveProjectRoot2(cwd), ".fusion");
+  return join42(resolveProjectRoot2(cwd), ".fusion");
 }
 async function validateAssignableAgentId(cwd, agentId) {
   const { AgentStore: AgentStore2, isEphemeralAgent: isEphemeralAgent2 } = await Promise.resolve().then(() => (init_src(), src_exports));
@@ -103271,9 +104077,12 @@ async function getResearchAvailability(store) {
   }
   const backend = resolved.searchProvider ?? settings.researchWebSearchProvider;
   const configured = backend === "searxng" ? Boolean(settings.researchSearxngUrl) : backend === "brave" ? Boolean(settings.researchBraveApiKey) : backend === "google" ? Boolean(settings.researchGoogleSearchApiKey && settings.researchGoogleSearchCx) : backend === "tavily" ? Boolean(settings.researchTavilyApiKey) : false;
-  if (!configured && !resolved.searchProvider) {
+  if (!backend) {
     return { ok: false, code: "provider-unavailable", message: "Research provider is not configured. Set research provider credentials in Settings." };
   }
+  if (!configured) {
+    return { ok: false, code: "missing-credentials", message: `Missing credentials for ${backend}. Add provider keys in Authentication and verify Research defaults.` };
+  }
   return { ok: true };
 }
 function toResearchRunDetails(run) {
@@ -103664,12 +104473,13 @@ Path: .fusion/tasks/${params.id}/attachments/${attachment.filename}`
   pi.registerTool({
     name: "fn_task_retry",
     label: "fn: Retry Task",
-    description: "Retry a failed task \u2014 clears the error state and moves it back to the todo column for re-execution.",
-    promptSnippet: "Retry a failed Fusion task (clears error, moves to todo)",
+    description: "Retry a failed task \u2014 clears the error state. Tasks in other columns move to todo; tasks in in-review stay in-place for auto-merge retry.",
+    promptSnippet: "Retry a failed Fusion task (clears error, moves to todo or stays in in-review)",
     promptGuidelines: [
-      "Use when a task has failed and needs to be retried from the beginning",
-      "Only tasks in 'failed' state can be retried",
-      "The task will be moved to the todo column with error state cleared"
+      "Use when a task has failed and needs to be retried",
+      "Only tasks in 'failed' or 'stuck-killed' state can be retried",
+      "Tasks in 'in-review' stay in in-review \u2014 only the error/retry state is cleared, and the auto-merge system re-attempts",
+      "Tasks in other columns are moved to the todo column with error state cleared"
     ],
     parameters: Type8.Object({
       id: Type8.String({ description: "Task ID to retry (e.g. FN-001). Must be in 'failed' state." })
@@ -103693,6 +104503,14 @@ Path: .fusion/tasks/${params.id}/attachments/${attachment.filename}`
           details: { taskId: params.id, currentStatus: task.status }
         };
       }
+      if (task.column === "in-review") {
+        await store.updateTask(params.id, { status: null, error: null, stuckKillCount: 0, mergeRetries: 0 });
+        await store.logEntry(params.id, "Retry requested via Fusion extension (in-review retry, mergeRetries reset)");
+        return {
+          content: [{ type: "text", text: `Retried ${params.id} \u2192 in-review (merge retry state cleared, task stays in in-review)` }],
+          details: { taskId: params.id, newColumn: "in-review" }
+        };
+      }
       await store.updateTask(params.id, { status: null, error: null });
       await store.moveTask(params.id, "todo");
       await store.logEntry(params.id, "Retry requested via Fusion extension", "Task reset to todo for retry");
@@ -104184,7 +105002,7 @@ Planning session completed. Task ${taskId} is now in planning and will be auto-p
   pi.registerTool({
     name: "fn_research_cancel",
     label: "fn: Cancel Research Run",
-    description: "Cancel a research run.",
+    description: "Cancel an in-flight research run. Terminal runs return INVALID_TRANSITION.",
     parameters: Type8.Object({ id: Type8.String({ description: "Research run ID" }) }),
     async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
       const store = await getStore2(ctx.cwd);
@@ -104196,6 +105014,17 @@ Planning session completed. Task ${taskId} is now in planning and will be auto-p
           details: { runId: params.id, status: "missing", summary: null, findings: [], citations: [], error: "not found", setup: null }
         };
       }
+      if (!["queued", "running", "cancelling", "retry_waiting"].includes(run.status)) {
+        return {
+          content: [{ type: "text", text: `Research run ${params.id} cannot be cancelled from status ${run.status}.` }],
+          isError: true,
+          details: {
+            ...toResearchRunDetails(run),
+            error: "invalid transition",
+            setup: { code: "INVALID_TRANSITION", message: "Cancel is only available for queued/running/cancelling/retry_waiting runs." }
+          }
+        };
+      }
       const updated = researchStore.requestCancellation(params.id);
       return {
         content: [{ type: "text", text: `Requested cancellation for research run ${params.id} (status: ${updated.status}).` }],
@@ -104203,6 +105032,41 @@ Planning session completed. Task ${taskId} is now in planning and will be auto-p
       };
     }
   });
+  pi.registerTool({
+    name: "fn_research_retry",
+    label: "fn: Retry Research Run",
+    description: "Retry a failed research run when lifecycle marks it retryable.",
+    parameters: Type8.Object({ id: Type8.String({ description: "Research run ID" }) }),
+    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      const store = await getStore2(ctx.cwd);
+      const researchStore = store.getResearchStore();
+      const run = researchStore.getRun(params.id);
+      if (!run) {
+        return {
+          content: [{ type: "text", text: `Research run ${params.id} not found.` }],
+          isError: true,
+          details: { runId: params.id, status: "missing", summary: null, findings: [], citations: [], error: "not found", setup: null }
+        };
+      }
+      const isRetryExhausted = run.status === "retry_exhausted" || run.lifecycle?.errorCode === "RETRY_EXHAUSTED";
+      if (run.status !== "failed" && run.status !== "timed_out" || run.lifecycle?.retryable === false || isRetryExhausted) {
+        return {
+          content: [{ type: "text", text: `Research run ${params.id} is not retryable from status ${run.status}.` }],
+          isError: true,
+          details: {
+            ...toResearchRunDetails(run),
+            error: "not retryable",
+            setup: { code: isRetryExhausted ? "RETRY_EXHAUSTED" : "INVALID_TRANSITION", message: "Retry is only available for failed/timed_out retryable runs." }
+          }
+        };
+      }
+      const retryRun = researchStore.createRetryRun(params.id);
+      return {
+        content: [{ type: "text", text: `Created retry run ${retryRun.id} from ${params.id}.` }],
+        details: toResearchRunDetails(retryRun)
+      };
+    }
+  });
   pi.registerTool({
     name: "fn_insight_list",
     label: "fn: List Insights",
@@ -104899,6 +105763,278 @@ Status: ${updated.status}`
       };
     }
   });
+  pi.registerTool({
+    name: "fn_list_agents",
+    label: "fn: 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.",
+    promptSnippet: "List all available Fusion agents",
+    promptGuidelines: [
+      "Use fn_list_agents to discover which agents exist before delegating work",
+      "Filter by role or state to narrow results",
+      "Ephemeral/runtime agents are excluded by default"
+    ],
+    parameters: Type8.Object({
+      role: Type8.Optional(
+        Type8.String({ description: "Filter by agent role/capability (e.g., 'executor', 'reviewer', 'qa')" })
+      ),
+      state: Type8.Optional(
+        Type8.String({ description: "Filter by agent state (e.g., 'idle', 'active', 'running')" })
+      ),
+      includeEphemeral: Type8.Optional(
+        Type8.Boolean({ description: "Include ephemeral/runtime agents (default: false)" })
+      )
+    }),
+    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      const { AgentStore: AgentStore2 } = await Promise.resolve().then(() => (init_src(), src_exports));
+      const agentStore = new AgentStore2({ rootDir: getFusionDir(ctx.cwd) });
+      await agentStore.init();
+      const filter = {};
+      if (params.role) filter.role = params.role;
+      if (params.state) filter.state = params.state;
+      if (params.includeEphemeral !== void 0) filter.includeEphemeral = params.includeEphemeral;
+      const agents = await agentStore.listAgents(filter);
+      if (agents.length === 0) {
+        return {
+          content: [{ type: "text", text: "No agents found matching the specified filters." }],
+          details: { agents: [], count: 0 }
+        };
+      }
+      const lines = agents.map((agent) => {
+        const parts = [
+          `ID: ${agent.id}`,
+          `Name: ${agent.name}`,
+          `Role: ${agent.role}`,
+          `State: ${agent.state}`
+        ];
+        if (agent.title) parts.push(`Title: ${agent.title}`);
+        if (agent.soul) parts.push(`Soul: ${agent.soul.slice(0, 200)}`);
+        if (agent.instructionsText) {
+          const snippet = agent.instructionsText.slice(0, 100);
+          parts.push(`Custom Instructions: ${snippet}${agent.instructionsText.length > 100 ? "\u2026" : ""}`);
+        }
+        if (agent.taskId) parts.push(`Current Task: ${agent.taskId}`);
+        return parts.join("\n");
+      });
+      return {
+        content: [{ type: "text", text: `Available agents (${agents.length}):
+
+${lines.join("\n\n")}` }],
+        details: { agents, count: agents.length }
+      };
+    }
+  });
+  pi.registerTool({
+    name: "fn_delegate_task",
+    label: "fn: 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 fn_list_agents first to find available agents and their capabilities.",
+    promptSnippet: "Delegate a task to a specific Fusion agent",
+    promptGuidelines: [
+      "Use fn_list_agents first to find available agents and their capabilities",
+      "The task is created in 'todo' and assigned to the target agent",
+      "Cannot delegate to ephemeral/runtime agents",
+      "Optionally specify dependencies on other tasks"
+    ],
+    parameters: Type8.Object({
+      agent_id: Type8.String({ description: "The agent ID to delegate work to" }),
+      description: Type8.String({ description: "What needs to be done" }),
+      dependencies: Type8.Optional(
+        Type8.Array(Type8.String(), { description: 'Task IDs this new task depends on (e.g. ["KB-001"]' })
+      )
+    }),
+    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      const agentError = await validateAssignableAgentId(ctx.cwd, params.agent_id);
+      if (agentError) {
+        return {
+          content: [{ type: "text", text: `ERROR: ${agentError}` }],
+          isError: true,
+          details: { error: agentError }
+        };
+      }
+      const { AgentStore: AgentStore2 } = await Promise.resolve().then(() => (init_src(), src_exports));
+      const agentStore = new AgentStore2({ rootDir: getFusionDir(ctx.cwd) });
+      await agentStore.init();
+      const agent = await agentStore.getAgent(params.agent_id);
+      const store = await getStore2(ctx.cwd);
+      const task = await store.createTask({
+        description: params.description,
+        dependencies: params.dependencies,
+        column: "todo",
+        assignedAgentId: params.agent_id,
+        source: { sourceType: "api" }
+      });
+      const deps = task.dependencies.length ? ` (depends on: ${task.dependencies.join(", ")})` : "";
+      return {
+        content: [{
+          type: "text",
+          text: `Delegated to ${agent.name} (${agent.id}): Created ${task.id}${deps}. The task will be picked up by ${agent.name} on their next heartbeat cycle.`
+        }],
+        details: { taskId: task.id, agentId: agent.id, agentName: agent.name }
+      };
+    }
+  });
+  pi.registerTool({
+    name: "fn_agent_show",
+    label: "fn: Show Agent",
+    description: "Show detailed information about a single agent, including their role, state, position in the org hierarchy (reports-to, direct reports), skills, and current assignment.",
+    promptSnippet: "Show details of a specific Fusion agent",
+    promptGuidelines: [
+      "Use to get full details about a specific agent",
+      "Provide agent ID or a resolvable name",
+      "Shows the agent's position in the org hierarchy"
+    ],
+    parameters: Type8.Object({
+      id: Type8.String({ description: "Agent ID or resolvable name" })
+    }),
+    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      const { AgentStore: AgentStore2 } = await Promise.resolve().then(() => (init_src(), src_exports));
+      const agentStore = new AgentStore2({ rootDir: getFusionDir(ctx.cwd) });
+      await agentStore.init();
+      const agent = await agentStore.resolveAgent(params.id);
+      if (!agent) {
+        return {
+          content: [{ type: "text", text: `Agent '${params.id}' not found` }],
+          isError: true,
+          details: { error: "Agent not found" }
+        };
+      }
+      const directReports = await agentStore.getAgentsByReportsTo(agent.id);
+      const parts = [
+        `ID: ${agent.id}`,
+        `Name: ${agent.name}`,
+        `Role: ${agent.role}`,
+        `State: ${agent.state}`
+      ];
+      if (agent.title) parts.push(`Title: ${agent.title}`);
+      if (agent.icon) parts.push(`Icon: ${agent.icon}`);
+      if (agent.reportsTo) {
+        const manager = await agentStore.getAgent(agent.reportsTo);
+        if (manager) {
+          parts.push(`Reports To: ${manager.name} (${manager.id})`);
+        } else {
+          parts.push(`Reports To: ${agent.reportsTo}`);
+        }
+      }
+      if (directReports.length > 0) {
+        parts.push(`Direct Reports: ${directReports.map((r) => `${r.name} (${r.id})`).join(", ")}`);
+      }
+      if (agent.taskId) parts.push(`Current Task: ${agent.taskId}`);
+      if (agent.instructionsText) {
+        const snippet = agent.instructionsText.slice(0, 100);
+        parts.push(`Custom Instructions: ${snippet}${agent.instructionsText.length > 100 ? "\u2026" : ""}`);
+      }
+      if (agent.soul) {
+        const snippet = agent.soul.slice(0, 200);
+        parts.push(`Soul: ${snippet}${agent.soul.length > 200 ? "\u2026" : ""}`);
+      }
+      if (agent.metadata?.skills) {
+        parts.push(`Skills: ${JSON.stringify(agent.metadata.skills)}`);
+      }
+      return {
+        content: [{ type: "text", text: parts.join("\n") }],
+        details: {
+          agent,
+          directReports: directReports.map((r) => ({ id: r.id, name: r.name, role: r.role }))
+        }
+      };
+    }
+  });
+  pi.registerTool({
+    name: "fn_agent_org_chart",
+    label: "fn: Agent Org Chart",
+    description: "Show the organizational tree of agents, displaying the role hierarchy. Optionally filter to a subtree rooted at a specific agent.",
+    promptSnippet: "Show the Fusion agent org chart",
+    promptGuidelines: [
+      "Use to understand the team structure and reporting hierarchy",
+      "Optionally specify a root agent to see only their subtree",
+      "Ephemeral/runtime agents are excluded by default"
+    ],
+    parameters: Type8.Object({
+      root_agent_id: Type8.Optional(
+        Type8.String({ description: "If provided, show only the subtree rooted at this agent" })
+      ),
+      include_ephemeral: Type8.Optional(
+        Type8.Boolean({ description: "Include ephemeral/runtime agents (default: false)" })
+      )
+    }),
+    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      const { AgentStore: AgentStore2 } = await Promise.resolve().then(() => (init_src(), src_exports));
+      const agentStore = new AgentStore2({ rootDir: getFusionDir(ctx.cwd) });
+      await agentStore.init();
+      const includeEphemeral = params.include_ephemeral ?? false;
+      if (params.root_agent_id) {
+        const rootAgent = await agentStore.resolveAgent(params.root_agent_id);
+        if (!rootAgent) {
+          return {
+            content: [{ type: "text", text: `Agent '${params.root_agent_id}' not found` }],
+            isError: true,
+            details: { error: "Root agent not found" }
+          };
+        }
+        const fullTree = await agentStore.getOrgTree({ includeEphemeral });
+        const findSubtree = (nodes) => {
+          for (const node of nodes) {
+            if (node.agent.id === rootAgent.id) return node;
+            const found = findSubtree(node.children);
+            if (found) return found;
+          }
+          return null;
+        };
+        const subtree = findSubtree(fullTree);
+        if (!subtree) {
+          return {
+            content: [{
+              type: "text",
+              text: `${rootAgent.icon ?? "\u{1F916}"} ${rootAgent.name} (${rootAgent.role}) \u2014 ${rootAgent.state}${rootAgent.taskId ? ` [${rootAgent.taskId}]` : ""}`
+            }],
+            details: { tree: [{ agent: rootAgent, children: [] }] }
+          };
+        }
+        const lines2 = [];
+        const renderNode2 = (node, indent) => {
+          const a = node.agent;
+          lines2.push(
+            `${indent}${a.icon ?? "\u{1F916}"} ${a.name} (${a.role}) \u2014 ${a.state}${a.taskId ? ` [${a.taskId}]` : ""}`
+          );
+          for (const child of node.children) {
+            renderNode2(child, indent + "  ");
+          }
+        };
+        renderNode2(subtree, "");
+        return {
+          content: [{ type: "text", text: `Agent Org Tree (subtree: ${rootAgent.name}):
+${lines2.join("\n")}` }],
+          details: { tree: [subtree] }
+        };
+      }
+      const tree = await agentStore.getOrgTree({ includeEphemeral });
+      if (tree.length === 0) {
+        return {
+          content: [{ type: "text", text: "No agents found." }],
+          details: { tree: [], count: 0 }
+        };
+      }
+      const lines = [];
+      let count = 0;
+      const renderNode = (node, indent) => {
+        const a = node.agent;
+        lines.push(
+          `${indent}${a.icon ?? "\u{1F916}"} ${a.name} (${a.role}) \u2014 ${a.state}${a.taskId ? ` [${a.taskId}]` : ""}`
+        );
+        count++;
+        for (const child of node.children) {
+          renderNode(child, indent + "  ");
+        }
+      };
+      for (const root of tree) {
+        renderNode(root, "");
+      }
+      return {
+        content: [{ type: "text", text: `Agent Org Tree (${count} agents):
+${lines.join("\n")}` }],
+        details: { tree, count }
+      };
+    }
+  });
   pi.registerTool({
     name: "fn_skills_search",
     label: "FN: Search Skills",