@runfusion/fusion 0.17.0 → 0.17.2

package/dist/bin.js

@@ -1391,7 +1391,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
@@ -1399,15 +1406,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}$/;
@@ -52659,6 +52667,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 access12 = typeof tokenRecord.access_token === "string" ? tokenRecord.access_token : void 0;
+  const refresh = typeof tokenRecord.refresh_token === "string" ? tokenRecord.refresh_token : void 0;
+  if (!access12 || !refresh) {
+    return void 0;
+  }
+  const expires = getJwtExpiryMs(access12) ?? 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(access12, tokenRecord.account_id);
+  return {
+    type: "oauth",
+    access: access12,
+    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, {
@@ -52815,6 +53010,7 @@ __export(src_exports, {
   buildTriageMemoryInstructions: () => buildTriageMemoryInstructions,
   canTransition: () => canTransition,
   checkRateLimit: () => checkRateLimit,
+  choosePreferredStoredCredential: () => choosePreferredStoredCredential,
   classifyInsightRunError: () => classifyInsightRunError,
   clearOverrides: () => clearOverrides,
   collectSystemMetrics: () => collectSystemMetrics,
@@ -52845,6 +53041,7 @@ __export(src_exports, {
   executeInsightRunLifecycle: () => executeInsightRunLifecycle,
   exportAgentsToDirectory: () => exportAgentsToDirectory,
   exportSettings: () => exportSettings,
+  extractCodexCliStoredCredential: () => extractCodexCliStoredCredential,
   extractDreamProcessorResult: () => extractDreamProcessorResult,
   formatPiExtensionSource: () => formatPiExtensionSource,
   fromJson: () => fromJson,
@@ -52855,6 +53052,7 @@ __export(src_exports, {
   generateMemoryAudit: () => generateMemoryAudit,
   getAppVersion: () => getAppVersion,
   getAvailableTemplates: () => getAvailableTemplates,
+  getCodexCliAuthPath: () => getCodexCliAuthPath,
   getCurrentRepo: () => getCurrentRepo,
   getDefaultDailyMemoryScaffold: () => getDefaultDailyMemoryScaffold,
   getDefaultDreamsScaffold: () => getDefaultDreamsScaffold,
@@ -52952,6 +53150,7 @@ __export(src_exports, {
   readProjectMemoryFile: () => readProjectMemoryFile,
   readProjectMemoryFileContent: () => readProjectMemoryFileContent,
   readProjectMemoryWithBackend: () => readProjectMemoryWithBackend,
+  readStoredCredentialsFromAuthFile: () => readStoredCredentialsFromAuthFile,
   readWorkingMemory: () => readWorkingMemory,
   reconcileClaudeCliPaths: () => reconcileClaudeCliPaths,
   reconcileDroidCliPaths: () => reconcileDroidCliPaths,
@@ -52987,6 +53186,7 @@ __export(src_exports, {
   scheduleQmdProjectMemoryRefresh: () => scheduleQmdProjectMemoryRefresh,
   searchProjectMemory: () => searchProjectMemory,
   setCreateFnAgent: () => setCreateFnAgent,
+  shouldHydrateStoredCredential: () => shouldHydrateStoredCredential,
   shouldSkipBackgroundQmdRefresh: () => shouldSkipBackgroundQmdRefresh,
   shouldTriggerExtraction: () => shouldTriggerExtraction,
   slugify: () => slugify,
@@ -53091,13 +53291,14 @@ var init_src = __esm({
     init_agent_companies_parser();
     init_agent_companies_exporter();
     init_chat_store();
+    init_oauth_credential_interop();
     init_error_message();
   }
 });
 
 // ../dashboard/src/github-webhooks.ts
 import { createHmac, timingSafeEqual as timingSafeEqual2 } from "node:crypto";
-import { readFileSync as readFileSync6 } from "node:fs";
+import { readFileSync as readFileSync7 } from "node:fs";
 function getGitHubAppConfig() {
   const appId = process.env.FUSION_GITHUB_APP_ID;
   const webhookSecret = process.env.FUSION_GITHUB_WEBHOOK_SECRET;
@@ -53107,7 +53308,7 @@ function getGitHubAppConfig() {
   } else if (process.env.FUSION_GITHUB_APP_PRIVATE_KEY_PATH) {
     if (cachedPrivateKey === void 0) {
       try {
-        cachedPrivateKey = readFileSync6(process.env.FUSION_GITHUB_APP_PRIVATE_KEY_PATH, "utf-8");
+        cachedPrivateKey = readFileSync7(process.env.FUSION_GITHUB_APP_PRIVATE_KEY_PATH, "utf-8");
       } catch {
         cachedPrivateKey = null;
       }
@@ -55186,12 +55387,12 @@ var init_github_provider = __esm({
 });
 
 // ../engine/src/skill-resolver.ts
-import { existsSync as existsSync19, readFileSync as readFileSync7 } from "node:fs";
-import { dirname as dirname8, join as join22, resolve as resolve11 } from "node:path";
+import { existsSync as existsSync20, readFileSync as readFileSync8 } 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 parent2 = dirname8(current);
@@ -55202,19 +55403,19 @@ function resolveProjectRoot(cwd) {
   }
 }
 function readJsonObject(path5) {
-  if (!existsSync19(path5)) {
+  if (!existsSync20(path5)) {
     return {};
   }
   try {
-    const parsed = JSON.parse(readFileSync7(path5, "utf-8"));
+    const parsed = JSON.parse(readFileSync8(path5, "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,
@@ -55439,51 +55640,51 @@ var init_context_limit_detector = __esm({
 });
 
 // ../engine/src/auth-storage.ts
-import { existsSync as existsSync20, readFileSync as readFileSync8 } from "node:fs";
-import { homedir as homedir4 } from "node:os";
-import { join as join23 } from "node:path";
+import { existsSync as existsSync21, readFileSync as readFileSync9 } 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 = getHomeDir5()) {
+  return join24(home, ".fusion", "agent", "auth.json");
 }
-function getFusionAuthPath(home = getHomeDir4()) {
-  return join23(home, ".fusion", "agent", "auth.json");
+function getFusionModelsPath(home = getHomeDir5()) {
+  return join24(home, ".fusion", "agent", "models.json");
 }
-function getFusionModelsPath(home = getHomeDir4()) {
-  return join23(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(readFileSync8(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;
@@ -55507,14 +55708,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(readFileSync8(modelsPath, "utf-8"));
+    const parsed = JSON.parse(readFileSync9(modelsPath, "utf-8"));
     const providers = parsed?.providers;
     if (providers) {
       for (const [providerId, config] of Object.entries(providers)) {
@@ -55529,8 +55730,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
@@ -55544,31 +55757,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);
         };
       }
@@ -55579,17 +55812,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 readFileSync9 } from "node:fs";
-import { homedir as homedir5 } from "node:os";
-import { join as join24 } from "node:path";
+import { readFileSync as readFileSync10 } 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 = readFileSync9(settingsPath, "utf-8");
+    const settingsPath = join25(homedir6(), ".fusion", "settings.json");
+    const raw = readFileSync10(settingsPath, "utf-8");
     const parsed = JSON.parse(raw);
     return Array.isArray(parsed.customProviders) ? parsed.customProviders : [];
   } catch {
@@ -55603,11 +55837,11 @@ var init_custom_providers = __esm({
 });
 
 // ../engine/src/pi.ts
-import { existsSync as existsSync21, readFileSync as readFileSync10 } from "node:fs";
+import { existsSync as existsSync22, readFileSync as readFileSync11 } 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,
@@ -55861,11 +56095,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(path5) {
-  if (!existsSync21(path5)) {
+  if (!existsSync22(path5)) {
     return {};
   }
   try {
-    const parsed = JSON.parse(readFileSync10(path5, "utf-8"));
+    const parsed = JSON.parse(readFileSync11(path5, "utf-8"));
     return parsed && typeof parsed === "object" ? parsed : {};
   } catch {
     return {};
@@ -56002,17 +56236,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),
@@ -56023,27 +56257,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_3 = createRequire2(import.meta.url);
     const pkgJsonPath = require_3.resolve("@fusion/pi-claude-cli/package.json");
-    const pkgJson = JSON.parse(readFileSync10(pkgJsonPath, "utf-8"));
+    const pkgJson = JSON.parse(readFileSync11(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 path5 = resolve12(dirname9(pkgJsonPath), entry);
-    return existsSync21(path5) ? path5 : null;
+    return existsSync22(path5) ? path5 : null;
   } catch {
     return null;
   }
@@ -56052,13 +56286,13 @@ function resolveVendoredDroidCliEntry() {
   try {
     const require_3 = createRequire2(import.meta.url);
     const pkgJsonPath = require_3.resolve("@fusion/droid-cli/package.json");
-    const pkgJson = JSON.parse(readFileSync10(pkgJsonPath, "utf-8"));
+    const pkgJson = JSON.parse(readFileSync11(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 path5 = resolve12(dirname9(pkgJsonPath), entry);
-    return existsSync21(path5) ? path5 : null;
+    return existsSync22(path5) ? path5 : null;
   } catch {
     return null;
   }
@@ -56086,7 +56320,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: path5, error } of extensionsResult.errors) {
       extensionsLog.warn(`Failed to load ${path5}: ${error}`);
@@ -56141,10 +56375,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)) {
@@ -56725,7 +56959,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));
@@ -56854,7 +57088,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)];
@@ -56864,7 +57098,7 @@ var init_local_docs_provider = __esm({
         const entries = await fs.readdir(dir2, { withFileTypes: true });
         for (const entry of entries) {
           this.throwIfAborted(signal);
-          const fullPath = join26(dir2, entry.name);
+          const fullPath = join27(dir2, entry.name);
           const relPath = relative4(this.projectRoot, fullPath).replace(/\\/g, "/");
           if (matchesGitignore(relPath, ignorePatterns)) continue;
           if (entry.isDirectory()) {
@@ -56889,7 +57123,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 [];
@@ -57499,9 +57733,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";
@@ -57513,16 +57747,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);
@@ -57558,7 +57792,7 @@ async function syncAgentMemoryFile(rootDir, agentMemory) {
   const dir2 = agentMemoryDirectory(rootDir, agentMemory.agentId);
   await mkdir11(dir2, { 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}
 
@@ -57569,11 +57803,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. -->
@@ -57597,7 +57831,7 @@ async function listAgentMemoryFiles2(rootDir, agentMemory) {
   }
   for (const entry of entries) {
     if (!DAILY_AGENT_MEMORY_RE2.test(entry)) continue;
-    const absPath = join27(dir2, entry);
+    const absPath = join28(dir2, entry);
     const fileStat = await stat4(absPath);
     if (fileStat.isFile()) {
       files.push({
@@ -57759,7 +57993,7 @@ function resolveAgentMemoryPath(rootDir, agentId, path5) {
     return null;
   }
   return {
-    absPath: join27(agentMemoryDirectory(rootDir, agentId), filename),
+    absPath: join28(agentMemoryDirectory(rootDir, agentId), filename),
     displayPath: `${prefix}${filename}`
   };
 }
@@ -58774,6 +59008,7 @@ __export(agent_session_helpers_exports, {
   createResolvedAgentSession: () => createResolvedAgentSession,
   describeAgentModel: () => describeAgentModel,
   extractRuntimeHint: () => extractRuntimeHint,
+  extractRuntimeModel: () => extractRuntimeModel,
   promptWithAutoRetry: () => promptWithAutoRetry
 });
 function extractRuntimeHint(runtimeConfig) {
@@ -58784,6 +59019,24 @@ function extractRuntimeHint(runtimeConfig) {
   const normalizedHint = hint.trim();
   return normalizedHint.length > 0 ? normalizedHint : void 0;
 }
+function extractRuntimeModel(runtimeConfig) {
+  const combined = typeof runtimeConfig?.model === "string" ? runtimeConfig.model.trim() : "";
+  if (combined) {
+    const slashIdx = combined.indexOf("/");
+    if (slashIdx > 0 && slashIdx < combined.length - 1) {
+      return {
+        provider: combined.slice(0, slashIdx).trim() || void 0,
+        modelId: combined.slice(slashIdx + 1).trim() || void 0
+      };
+    }
+  }
+  const provider = typeof runtimeConfig?.modelProvider === "string" ? runtimeConfig.modelProvider.trim() : "";
+  const modelId = typeof runtimeConfig?.modelId === "string" ? runtimeConfig.modelId.trim() : "";
+  return {
+    provider: provider || void 0,
+    modelId: modelId || void 0
+  };
+}
 async function createResolvedAgentSession(options) {
   const { sessionPurpose, pluginRunner, runtimeHint, ...runtimeOptions } = options;
   const context = buildRuntimeResolutionContext(sessionPurpose, pluginRunner, runtimeHint);
@@ -60037,6 +60290,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;
@@ -60167,7 +60452,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;
@@ -60354,7 +60645,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.
 
@@ -60715,7 +61006,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;
@@ -60744,9 +61035,9 @@ async function readAttachmentContents(rootDir, taskId, attachments) {
     return { attachmentContents, imageContents };
   }
   const { readFile: readFile26 } = await import("node:fs/promises");
-  const { join: join71 } = await import("node:path");
+  const { join: join72 } = await import("node:path");
   for (const att of attachments) {
-    const filePath = join71(
+    const filePath = join72(
       rootDir,
       ".fusion",
       "tasks",
@@ -60971,7 +61262,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();
@@ -61581,7 +61872,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}`);
@@ -61811,7 +62102,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}`);
@@ -61954,7 +62251,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);
@@ -62039,7 +62342,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);
@@ -62358,9 +62661,9 @@ Remove or replace these ids and call fn_task_create again.`
             }
             try {
               const { readFile: readFile26 } = await import("node:fs/promises");
-              const { join: join71 } = await import("node:path");
+              const { join: join72 } = await import("node:path");
               const promptContent = await readFile26(
-                join71(rootDir, promptPath),
+                join72(rootDir, promptPath),
                 "utf-8"
               ).catch((err) => {
                 const msg = err instanceof Error ? err.message : String(err);
@@ -62588,160 +62891,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((resolve44, reject2) => {
     if (options.signal?.aborted) {
@@ -62853,6 +63004,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;
@@ -62918,6 +63074,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);
@@ -62935,29 +63098,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, log19, agentLabel) {
+  const logger2 = log19 ?? { 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 ...
@@ -63001,7 +63427,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;
@@ -63010,10 +63436,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;
@@ -63046,8 +63472,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\`.`
       );
@@ -63058,21 +63484,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",
@@ -63109,7 +63535,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,
@@ -63140,7 +63566,7 @@ async function runDeterministicVerification(store, rootDir, taskId, testCommand,
     }
   }
   if (hasBuildCommand) {
-    const buildResult = await runVerificationCommand(
+    const buildResult = await runVerificationCommand2(
       store,
       rootDir,
       taskId,
@@ -63175,98 +63601,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 {
@@ -63329,9 +63666,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";
@@ -63384,7 +63732,7 @@ ${failureContext.output.slice(0, VERIFICATION_LOG_MAX_CHARS)}
         void 0,
         "merger"
       );
-      const reRunResult = await runVerificationCommand(
+      const reRunResult = await runVerificationCommand2(
         store,
         rootDir,
         taskId,
@@ -64126,9 +64474,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}.`,
@@ -64320,7 +64675,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;
@@ -65261,7 +65616,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}`);
@@ -65915,9 +66270,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 {
@@ -66348,7 +66714,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)" : ""}`);
@@ -66384,15 +66757,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();
@@ -66438,9 +66813,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;
@@ -66465,8 +66837,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, "");
 }
@@ -66477,7 +66849,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);
@@ -66492,7 +66864,7 @@ function generateReservedWorktreeName(rootDir, reservedNames = /* @__PURE__ */ n
   return `${baseName}-${suffix}`;
 }
 function getExistingWorktreeNames(worktreesDir) {
-  if (!existsSync24(worktreesDir)) {
+  if (!existsSync25(worktreesDir)) {
     return /* @__PURE__ */ new Set();
   }
   try {
@@ -66629,8 +67001,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) {
@@ -66676,10 +67048,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");
@@ -66688,14 +67060,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}`);
@@ -66718,16 +67090,16 @@ async function scanIdleWorktrees(rootDir, store) {
   return registeredDirs.filter((dir2) => !activeWorktrees.has(resolve15(dir2)));
 }
 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}`);
@@ -66759,8 +67131,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;
@@ -66768,11 +67140,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}`);
@@ -66791,8 +67163,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;
     }
@@ -66852,7 +67224,7 @@ var init_worktree_pool = __esm({
       acquire() {
         for (const path5 of this.idle) {
           this.idle.delete(path5);
-          if (existsSync25(path5)) {
+          if (existsSync26(path5)) {
             return path5;
           }
           worktreePoolLog.log(`Pruned stale entry: ${path5}`);
@@ -66899,7 +67271,7 @@ var init_worktree_pool = __esm({
        */
       rehydrate(idlePaths) {
         for (const path5 of idlePaths) {
-          if (existsSync25(path5)) {
+          if (existsSync26(path5)) {
             this.idle.add(path5);
           } else {
             worktreePoolLog.log(`Rehydrate skipped (not on disk): ${path5}`);
@@ -66955,7 +67327,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;
@@ -67032,8 +67404,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;
@@ -67320,7 +67692,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();
@@ -67437,7 +67809,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
               });
@@ -67602,7 +67974,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 = {
@@ -67782,7 +68160,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
                 });
@@ -67812,7 +68190,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 {
@@ -67887,7 +68265,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) {
@@ -67927,7 +68305,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({
@@ -67958,8 +68336,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 };
@@ -67992,7 +68370,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 = [];
@@ -68132,7 +68510,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;
       }
@@ -68147,8 +68525,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);
@@ -68159,7 +68537,7 @@ function createRunVerificationTool(opts) {
       log19.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,
@@ -68259,8 +68637,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";
@@ -68554,6 +68932,7 @@ var init_executor = __esm({
     "use strict";
     init_src();
     init_merger();
+    init_verification_utils();
     init_worktree_names();
     init_pi();
     init_session_token_usage();
@@ -68578,7 +68957,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);
@@ -69725,7 +70104,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 });
@@ -69905,7 +70284,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;
           }
         }
@@ -69956,7 +70335,7 @@ The tool prevents your session from being killed by the inactivity watchdog duri
         const activeMergeStatuses = /* @__PURE__ */ new Set(["merging", "merging-pr"]);
         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) {
@@ -70003,7 +70382,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;
@@ -70027,7 +70406,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)) {
@@ -70040,8 +70419,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) {
@@ -70267,6 +70646,84 @@ 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})`
+                        );
+                        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`
+                        );
+                        return;
+                      }
+                    }
+                  }
+                }
                 if (executionMode !== "fast") {
                   const workflowResult = await this.runWorkflowSteps(task, worktreePath, settings);
                   if (workflowResult === "deferred-paused") {
@@ -70355,7 +70812,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 });
@@ -70414,7 +70871,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) {
@@ -70526,7 +70983,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");
@@ -70556,7 +71013,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}`);
@@ -70990,7 +71453,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}`);
@@ -71086,7 +71549,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}`);
@@ -71141,7 +71604,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}`);
@@ -71646,7 +72109,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");
@@ -71700,6 +72163,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;
@@ -71769,7 +72443,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");
@@ -71834,31 +72508,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 [];
           }
@@ -72094,6 +72770,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:
@@ -72101,6 +72801,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.
@@ -72569,7 +73271,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;
@@ -72589,7 +73291,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
        */
       async tryCreateWorktree(branch, path5, taskId, startPoint, attemptNumber = 0, recoveryDepth = 0) {
         await this.assertWorktreePathNotNested(path5, taskId);
-        if (existsSync28(path5)) {
+        if (existsSync29(path5)) {
           const isRegistered = await this.isRegisteredWorktree(path5);
           if (!isRegistered) {
             await this.store.logEntry(
@@ -72740,7 +73442,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 {
@@ -73340,7 +74042,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");
@@ -73529,9 +74231,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;
@@ -73701,12 +74403,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 {
@@ -73845,7 +74547,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.
@@ -75122,7 +75824,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 EventEmitter18 {
@@ -75356,7 +76058,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}`);
@@ -77164,7 +77872,7 @@ not loop on the same plan across heartbeats without recording why.`;
                 };
               }
             };
-            const { createResolvedAgentSession: createResolvedAgentSession2, extractRuntimeHint: extractRuntimeHint2 } = await Promise.resolve().then(() => (init_agent_session_helpers(), agent_session_helpers_exports));
+            const { createResolvedAgentSession: createResolvedAgentSession3, extractRuntimeHint: extractRuntimeHint2, extractRuntimeModel: extractRuntimeModel2 } = await Promise.resolve().then(() => (init_agent_session_helpers(), agent_session_helpers_exports));
             const { buildSessionSkillContextSync: buildSessionSkillContextSync2 } = await Promise.resolve().then(() => (init_session_skill_context(), session_skill_context_exports));
             let heartbeatTools;
             if (isNoTaskRun) {
@@ -77235,7 +77943,7 @@ not loop on the same plan across heartbeats without recording why.`;
                 persistAgentToolOutput: memorySettings?.persistAgentToolOutput
               });
             }
-            const { session } = await createResolvedAgentSession2({
+            const { session } = await createResolvedAgentSession3({
               sessionPurpose: "heartbeat",
               runtimeHint: extractRuntimeHint2(agent.runtimeConfig),
               pluginRunner: this.pluginRunner,
@@ -77243,8 +77951,10 @@ not loop on the same plan across heartbeats without recording why.`;
               systemPrompt,
               tools: "readonly",
               customTools: heartbeatTools,
-              defaultProvider: agent.runtimeConfig?.modelProvider,
-              defaultModelId: agent.runtimeConfig?.modelId,
+              ...(() => {
+                const { provider, modelId } = extractRuntimeModel2(agent.runtimeConfig);
+                return { defaultProvider: provider, defaultModelId: modelId };
+              })(),
               onText: (delta) => {
                 outputLength += delta.length;
                 appendStdoutExcerpt(delta);
@@ -78619,7 +79329,7 @@ async function createAiPromptExecutor(cwd) {
     }
   };
 }
-function truncateOutput(stdout, stderr) {
+function truncateOutput2(stdout, stderr) {
   const out = stdout ?? "";
   const err = stderr ?? "";
   let combined = out;
@@ -78799,7 +79509,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,
@@ -78810,7 +79520,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 {
@@ -78855,7 +79565,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) {
@@ -78896,7 +79606,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";
@@ -78975,7 +79685,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()
           };
@@ -78988,7 +79698,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()
@@ -79138,7 +79848,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" : "";
@@ -79321,7 +80031,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()
@@ -79345,7 +80055,7 @@ var init_routine_runner = __esm({
           });
           return {
             success: true,
-            output: truncateOutput2(stdout, stderr),
+            output: truncateOutput3(stdout, stderr),
             startedAt,
             completedAt: (/* @__PURE__ */ new Date()).toISOString()
           };
@@ -79356,7 +80066,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()
@@ -79389,7 +80099,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(),
@@ -79424,7 +80134,7 @@ var init_routine_runner = __esm({
               this.options.aiPromptExecutor(step.prompt, step.modelProvider, step.modelId),
               new Promise((_resolve, reject2) => setTimeout(() => reject2(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() };
           }
@@ -80038,8 +80748,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, "'\\''")}'`;
 }
@@ -80435,7 +81145,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,
@@ -81056,7 +81766,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;
           });
@@ -81065,7 +81775,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, {
@@ -81211,7 +81921,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,
@@ -81396,11 +82106,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;
@@ -81505,8 +82215,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;
@@ -83344,7 +84054,7 @@ var init_ipc_host = __esm({
 import { EventEmitter as EventEmitter21 } 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"() {
@@ -83506,7 +84216,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.
@@ -87759,6 +88469,8 @@ __export(src_exports2, {
   describeAgentModel: () => describeAgentModel,
   describeModel: () => describeModel,
   ensureDefaultHeartbeatProcedureFile: () => ensureDefaultHeartbeatProcedureFile,
+  extractRuntimeHint: () => extractRuntimeHint,
+  extractRuntimeModel: () => extractRuntimeModel,
   formatTaskIdentifier: () => formatTaskIdentifier,
   getDefaultPiRuntime: () => getDefaultPiRuntime,
   getHostExtensionPaths: () => getHostExtensionPaths,
@@ -92103,7 +92815,7 @@ var init_api_error = __esm({
 // ../dashboard/src/plugin-routes.ts
 import { Router } from "express";
 import { access as access5, stat as stat6, readFile as readFile18 } from "node:fs/promises";
-import { join as join39, isAbsolute as isAbsolute14, dirname as dirname12, basename as basename9 } from "node:path";
+import { join as join40, isAbsolute as isAbsolute14, dirname as dirname12, basename as basename9 } from "node:path";
 async function resolvePluginManifest(sourcePath) {
   try {
     await access5(sourcePath);
@@ -92119,7 +92831,7 @@ async function resolvePluginManifest(sourcePath) {
   if (!sourceStat.isDirectory()) {
     throw badRequest(`Path is not a directory: ${sourcePath}`);
   }
-  const directManifestPath = join39(sourcePath, "manifest.json");
+  const directManifestPath = join40(sourcePath, "manifest.json");
   try {
     await access5(directManifestPath);
     const manifest = await readAndValidateManifest(directManifestPath);
@@ -92130,7 +92842,7 @@ async function resolvePluginManifest(sourcePath) {
   const dirName = basename9(sourcePath).toLowerCase();
   if (DIST_DIR_NAMES.has(dirName)) {
     const parentDir = dirname12(sourcePath);
-    const parentManifestPath = join39(parentDir, "manifest.json");
+    const parentManifestPath = join40(parentDir, "manifest.json");
     try {
       await access5(parentManifestPath);
       const manifest = await readAndValidateManifest(parentManifestPath);
@@ -93601,8 +94313,8 @@ function registerTaskWorkflowRoutes(ctx, deps) {
       });
       if (retrySpecification) {
         const { rm: rm6 } = await import("node:fs/promises");
-        const { join: join71 } = await import("node:path");
-        const promptPath = join71(scopedStore.getRootDir(), ".fusion", "tasks", task.id, "PROMPT.md");
+        const { join: join72 } = await import("node:path");
+        const promptPath = join72(scopedStore.getRootDir(), ".fusion", "tasks", task.id, "PROMPT.md");
         await rm6(promptPath, { force: true });
         await scopedStore.logEntry(req.params.id, "Retry requested from dashboard (planning retry budget reset)");
         const updated2 = await scopedStore.getTask(req.params.id);
@@ -94067,8 +94779,8 @@ function registerTaskWorkflowRoutes(ctx, deps) {
       await scopedStore.logEntry(task.id, "Plan rejected by user", "Specification will be regenerated");
       await scopedStore.updateTask(task.id, { status: void 0 });
       const { rm: rm6 } = await import("node:fs/promises");
-      const { join: join71 } = await import("node:path");
-      const promptPath = join71(scopedStore.getRootDir(), ".fusion", "tasks", task.id, "PROMPT.md");
+      const { join: join72 } = await import("node:path");
+      const promptPath = join72(scopedStore.getRootDir(), ".fusion", "tasks", task.id, "PROMPT.md");
       await rm6(promptPath, { force: true });
       const updated = await scopedStore.getTask(task.id);
       res.json(updated);
@@ -94338,8 +95050,8 @@ function registerTaskWorkflowRoutes(ctx, deps) {
       if (task.column === "triage") {
         await scopedStore.logEntry(task.id, "AI spec revision requested", feedback);
         const { rm: rm7 } = await import("node:fs/promises");
-        const { join: join72 } = await import("node:path");
-        const promptPath2 = join72(scopedStore.getRootDir(), ".fusion", "tasks", task.id, "PROMPT.md");
+        const { join: join73 } = await import("node:path");
+        const promptPath2 = join73(scopedStore.getRootDir(), ".fusion", "tasks", task.id, "PROMPT.md");
         await rm7(promptPath2, { force: true });
         await scopedStore.updateTask(task.id, { status: "needs-replan" });
         const updated2 = await scopedStore.getTask(task.id);
@@ -94355,8 +95067,8 @@ function registerTaskWorkflowRoutes(ctx, deps) {
       await scopedStore.logEntry(task.id, "AI spec revision requested", feedback);
       const updated = await scopedStore.moveTask(task.id, "triage");
       const { rm: rm6 } = await import("node:fs/promises");
-      const { join: join71 } = await import("node:path");
-      const promptPath = join71(scopedStore.getRootDir(), ".fusion", "tasks", task.id, "PROMPT.md");
+      const { join: join72 } = await import("node:path");
+      const promptPath = join72(scopedStore.getRootDir(), ".fusion", "tasks", task.id, "PROMPT.md");
       await rm6(promptPath, { force: true });
       await scopedStore.updateTask(task.id, { status: "needs-replan" });
       res.json(updated);
@@ -94376,8 +95088,8 @@ function registerTaskWorkflowRoutes(ctx, deps) {
       if (task.column === "triage") {
         await scopedStore.logEntry(task.id, "Specification rebuild requested by user");
         const { rm: rm7 } = await import("node:fs/promises");
-        const { join: join72 } = await import("node:path");
-        const promptPath2 = join72(scopedStore.getRootDir(), ".fusion", "tasks", task.id, "PROMPT.md");
+        const { join: join73 } = await import("node:path");
+        const promptPath2 = join73(scopedStore.getRootDir(), ".fusion", "tasks", task.id, "PROMPT.md");
         await rm7(promptPath2, { force: true });
         await scopedStore.updateTask(task.id, { status: "needs-replan" });
         const updated2 = await scopedStore.getTask(task.id);
@@ -94391,8 +95103,8 @@ function registerTaskWorkflowRoutes(ctx, deps) {
       await scopedStore.logEntry(task.id, "Specification rebuild requested by user");
       const updated = await scopedStore.moveTask(task.id, "triage");
       const { rm: rm6 } = await import("node:fs/promises");
-      const { join: join71 } = await import("node:path");
-      const promptPath = join71(scopedStore.getRootDir(), ".fusion", "tasks", task.id, "PROMPT.md");
+      const { join: join72 } = await import("node:path");
+      const promptPath = join72(scopedStore.getRootDir(), ".fusion", "tasks", task.id, "PROMPT.md");
       await rm6(promptPath, { force: true });
       await scopedStore.updateTask(task.id, { status: "needs-replan" });
       res.json(updated);
@@ -95773,14 +96485,15 @@ __export(chat_exports, {
   __setBuildAgentChatPrompt: () => __setBuildAgentChatPrompt,
   __setChatDiagnostics: () => __setChatDiagnostics,
   __setCreateFnAgent: () => __setCreateFnAgent2,
+  __setCreateResolvedAgentSession: () => __setCreateResolvedAgentSession,
   chatStreamManager: () => chatStreamManager,
   checkRateLimit: () => checkRateLimit5,
   getRateLimitResetTime: () => getRateLimitResetTime5,
   resolveFileReferences: () => resolveFileReferences
 });
 import { EventEmitter as EventEmitter29 } from "node:events";
-import { existsSync as existsSync31 } from "node:fs";
-import { join as join40, resolve as resolve19, relative as relative9 } from "node:path";
+import { existsSync as existsSync32 } from "node:fs";
+import { join as join41, resolve as resolve19, relative as relative9 } from "node:path";
 import { SessionManager as SessionManager3 } from "@mariozechner/pi-coding-agent";
 function __getChatDiagnostics() {
   return _diagnostics;
@@ -95810,7 +96523,7 @@ function validateFilePath(basePath, filePath) {
     throw new Error(`Access denied: Absolute paths not allowed`);
   }
   const resolvedBase = resolve19(basePath);
-  const resolvedPath = resolve19(join40(resolvedBase, decodedPath));
+  const resolvedPath = resolve19(join41(resolvedBase, decodedPath));
   const relativePath = relative9(resolvedBase, resolvedPath);
   if (relativePath.startsWith("..") || relativePath.startsWith("../") || relativePath === "..") {
     throw new Error(`Access denied: Path traversal detected`);
@@ -95887,6 +96600,9 @@ function getRateLimitResetTime5(ip) {
 function __setCreateFnAgent2(mock) {
   createFnAgent8 = mock;
 }
+function __setCreateResolvedAgentSession(mock) {
+  createResolvedAgentSession2 = mock;
+}
 function __setBuildAgentChatPrompt(mock) {
   buildAgentChatPromptFn = mock;
 }
@@ -95894,9 +96610,11 @@ function __resetChatState() {
   chatStreamManager.reset();
   rateLimits5.clear();
   buildAgentChatPromptFn = void 0;
+  createFnAgent8 = createFnAgent2;
+  createResolvedAgentSession2 = createResolvedAgentSession;
   __setChatDiagnostics(null);
 }
-var createFnAgent8, buildAgentChatPromptFn, defaultDiagnostics, _diagnostics, diagnostics6, CHAT_SYSTEM_PROMPT, RATE_LIMIT_WINDOW_MS5, MAX_MESSAGES_PER_IP_PER_MINUTE, MAX_REFERENCED_FILE_SIZE, rateLimits5, ChatStreamManager, chatStreamManager, ChatManager;
+var createFnAgent8, createResolvedAgentSession2, buildAgentChatPromptFn, defaultDiagnostics, _diagnostics, diagnostics6, CHAT_SYSTEM_PROMPT, RATE_LIMIT_WINDOW_MS5, MAX_MESSAGES_PER_IP_PER_MINUTE, MAX_REFERENCED_FILE_SIZE, rateLimits5, ChatStreamManager, chatStreamManager, ChatManager;
 var init_chat = __esm({
   "../dashboard/src/chat.ts"() {
     "use strict";
@@ -95905,6 +96623,7 @@ var init_chat = __esm({
     init_src2();
     init_src2();
     createFnAgent8 = createFnAgent2;
+    createResolvedAgentSession2 = createResolvedAgentSession;
     defaultDiagnostics = {
       log(message, ...args) {
         console.log(`[chat] ${message}`, ...args);
@@ -96023,13 +96742,49 @@ var init_chat = __esm({
     };
     chatStreamManager = new ChatStreamManager();
     ChatManager = class {
-      constructor(chatStore, rootDir, agentStore) {
+      constructor(chatStore, rootDir, agentStore, pluginRunner, getSettings) {
         this.chatStore = chatStore;
         this.rootDir = rootDir;
         this.agentStore = agentStore;
+        this.pluginRunner = pluginRunner;
+        this.getSettings = getSettings;
       }
       agentStoreReady;
       activeGenerations = /* @__PURE__ */ new Map();
+      async getChatModelSettings() {
+        if (!this.getSettings) {
+          return {};
+        }
+        try {
+          const settings = await this.getSettings();
+          return {
+            fallbackProvider: settings?.fallbackProvider ?? void 0,
+            fallbackModelId: settings?.fallbackModelId ?? void 0,
+            defaultProvider: settings?.defaultProvider ?? void 0,
+            defaultModelId: settings?.defaultModelId ?? void 0
+          };
+        } catch (err) {
+          const message = err instanceof Error ? err.message : String(err);
+          diagnostics6.warn(`Failed to load chat fallback settings: ${message}`);
+          return {};
+        }
+      }
+      handleFallbackModelUsed(sessionId, payload) {
+        const slashIndex = payload.fallbackModel.indexOf("/");
+        if (slashIndex > 0 && slashIndex < payload.fallbackModel.length - 1) {
+          this.chatStore.updateSession(sessionId, {
+            modelProvider: payload.fallbackModel.slice(0, slashIndex),
+            modelId: payload.fallbackModel.slice(slashIndex + 1)
+          });
+        }
+        diagnostics6.warn(
+          `[fallback] chat ${sessionId} switched from ${payload.primaryModel} to ${payload.fallbackModel} (${payload.triggerPoint})`
+        );
+        chatStreamManager.broadcast(sessionId, {
+          type: "fallback",
+          data: payload
+        });
+      }
       /**
        * Resolve the per-chat pi/Claude CLI SessionManager.
        *
@@ -96048,7 +96803,7 @@ var init_chat = __esm({
        * keep the CLI session stable across user messages.
        */
       resolveCliSessionManager(session) {
-        if (session.cliSessionFile && existsSync31(session.cliSessionFile)) {
+        if (session.cliSessionFile && existsSync32(session.cliSessionFile)) {
           try {
             return SessionManager3.open(session.cliSessionFile);
           } catch (err) {
@@ -96182,6 +96937,7 @@ var init_chat = __esm({
         let accumulatedText = "";
         const toolCallsAccum = [];
         const pendingToolStarts = /* @__PURE__ */ new Map();
+        let fallbackInfo;
         try {
           if (!session) {
             chatStreamManager.broadcast(sessionId, {
@@ -96207,30 +96963,12 @@ var init_chat = __esm({
             });
             return;
           }
-          const effectiveModelProvider = modelProvider ?? session.modelProvider ?? void 0;
-          const effectiveModelId = modelId ?? session.modelId ?? void 0;
+          const requestedModelProvider = modelProvider ?? session.modelProvider ?? void 0;
+          const requestedModelId = modelId ?? session.modelId ?? void 0;
+          let effectiveModelProvider = requestedModelProvider;
+          let effectiveModelId = requestedModelId;
+          let hasExplicitAgentRuntimeModel = false;
           const needsTitle = session.title === null || session.title === void 0 || session.title.trim() === "";
-          if (needsTitle) {
-            (async () => {
-              try {
-                const generated = await summarizeTitle(
-                  content.trim(),
-                  this.rootDir,
-                  effectiveModelProvider,
-                  effectiveModelId
-                );
-                const title = generated ?? content.trim().slice(0, 60).trim();
-                if (title) {
-                  this.chatStore.updateSession(sessionId, { title });
-                }
-              } catch {
-                const fallback2 = content.trim().slice(0, 60).trim();
-                if (fallback2) {
-                  this.chatStore.updateSession(sessionId, { title: fallback2 });
-                }
-              }
-            })();
-          }
           await ensureEngineReady5();
           if (!createFnAgent8) {
             throw new Error("AI agent not available");
@@ -96261,6 +96999,35 @@ var init_chat = __esm({
               diagnostics6.warn(`Failed to build enriched system prompt for ${agent.id}: ${message}`);
             }
           }
+          if (agent) {
+            const runtimeModel = extractRuntimeModel(agent.runtimeConfig);
+            if (runtimeModel.provider && runtimeModel.modelId) {
+              hasExplicitAgentRuntimeModel = true;
+            }
+            effectiveModelProvider ??= runtimeModel.provider;
+            effectiveModelId ??= runtimeModel.modelId;
+          }
+          if (needsTitle) {
+            (async () => {
+              try {
+                const generated = await summarizeTitle(
+                  content.trim(),
+                  this.rootDir,
+                  effectiveModelProvider,
+                  effectiveModelId
+                );
+                const title = generated ?? content.trim().slice(0, 60).trim();
+                if (title) {
+                  this.chatStore.updateSession(sessionId, { title });
+                }
+              } catch {
+                const fallback2 = content.trim().slice(0, 60).trim();
+                if (fallback2) {
+                  this.chatStore.updateSession(sessionId, { title: fallback2 });
+                }
+              }
+            })();
+          }
           if (mentions.length > 0) {
             const mentionContext = await this.buildMentionContext(mentions, mentionAgents);
             if (mentionContext) {
@@ -96273,7 +97040,10 @@ ${mentionContext}`;
           const attachmentSummary = attachments && attachments.length > 0 ? `[User attached: ${attachments.map((attachment) => `${attachment.originalName} (${attachment.mimeType}, ${formatAttachmentSize(attachment.size)})`).join(", ")}]` : "";
           const promptContent = [attachmentSummary, resolvedContent].filter(Boolean).join("\n\n");
           const sessionManager = this.resolveCliSessionManager(session);
-          agentResult = await createFnAgent8({
+          const chatModelSettings = await this.getChatModelSettings();
+          const usesConfiguredDefaultModel = requestedModelProvider === chatModelSettings.defaultProvider && requestedModelId === chatModelSettings.defaultModelId && !!requestedModelProvider && !!requestedModelId;
+          const allowFallback = !hasExplicitAgentRuntimeModel && (!(requestedModelProvider && requestedModelId) || usesConfiguredDefaultModel);
+          const sessionOptions = {
             cwd: this.rootDir,
             systemPrompt,
             tools: "coding",
@@ -96282,6 +97052,14 @@ ${mentionContext}`;
               defaultProvider: effectiveModelProvider,
               defaultModelId: effectiveModelId
             } : {},
+            ...allowFallback && chatModelSettings.fallbackProvider && chatModelSettings.fallbackModelId ? {
+              fallbackProvider: chatModelSettings.fallbackProvider,
+              fallbackModelId: chatModelSettings.fallbackModelId
+            } : {},
+            onFallbackModelUsed: (payload) => {
+              fallbackInfo = payload;
+              this.handleFallbackModelUsed(sessionId, payload);
+            },
             onThinking: (delta) => {
               accumulatedThinking += delta;
               chatStreamManager.broadcast(sessionId, {
@@ -96322,16 +97100,35 @@ ${mentionContext}`;
                 data: { toolName: name, isError, result }
               });
             }
-          });
+          };
+          const agentRuntimeHint = agent ? extractRuntimeHint(agent.runtimeConfig) : void 0;
+          if (agentRuntimeHint) {
+            agentResult = await createResolvedAgentSession2({
+              sessionPurpose: "executor",
+              runtimeHint: agentRuntimeHint,
+              pluginRunner: this.pluginRunner,
+              ...sessionOptions
+            });
+          } else {
+            agentResult = await createFnAgent8(sessionOptions);
+          }
           this.activeGenerations.set(sessionId, { abortController, agentResult });
           if (abortController.signal.aborted) {
             agentResult.session.dispose?.();
             return;
           }
-          await agentResult.session.prompt(promptContent);
+          await promptWithFallback(agentResult.session, promptContent);
           if (abortController.signal.aborted) {
             return;
           }
+          const sessionErrorMessage = agentResult.session.state.errorMessage;
+          if (typeof sessionErrorMessage === "string" && sessionErrorMessage.trim().length > 0 && !accumulatedText && !accumulatedThinking && toolCallsAccum.length === 0) {
+            chatStreamManager.broadcast(sessionId, {
+              type: "error",
+              data: sessionErrorMessage
+            });
+            return;
+          }
           let responseText = "";
           const lastMessage = agentResult.session.state.messages.filter((m) => m.role === "assistant").pop();
           if (lastMessage?.content) {
@@ -96342,11 +97139,18 @@ ${mentionContext}`;
             }
           }
           const finalResponseText = accumulatedText || responseText;
+          const assistantMetadata = {};
+          if (toolCallsAccum.length > 0) {
+            assistantMetadata.toolCalls = toolCallsAccum;
+          }
+          if (fallbackInfo) {
+            assistantMetadata.fallback = fallbackInfo;
+          }
           const assistantMessage = this.chatStore.addMessage(sessionId, {
             role: "assistant",
             content: finalResponseText,
             thinkingOutput: accumulatedThinking || void 0,
-            metadata: toolCallsAccum.length > 0 ? { toolCalls: toolCallsAccum } : void 0
+            metadata: Object.keys(assistantMetadata).length > 0 ? assistantMetadata : void 0
           });
           chatStreamManager.broadcast(sessionId, {
             type: "done",
@@ -96370,6 +97174,7 @@ ${mentionContext}`;
                 thinkingOutput: accumulatedThinking || void 0,
                 metadata: {
                   interrupted: true,
+                  ...fallbackInfo ? { fallback: fallbackInfo } : {},
                   ...toolCallsAccum.length > 0 ? { toolCalls: toolCallsAccum } : {}
                 }
               });
@@ -96432,7 +97237,7 @@ ${mentionContext}`;
 import { randomUUID as randomUUID19 } from "node:crypto";
 import { createReadStream as createReadStream2 } from "node:fs";
 import { mkdir as mkdir13, rm as rm2, writeFile as writeFile13 } from "node:fs/promises";
-import { basename as basename10, join as join41, resolve as resolve20 } from "node:path";
+import { basename as basename10, join as join42, resolve as resolve20 } from "node:path";
 function resolveAttachmentPath(rootDir, sessionId, filename) {
   const sessionDir = resolve20(rootDir, ".fusion", "chat-attachments", sessionId);
   const safeName = basename10(filename);
@@ -96690,7 +97495,7 @@ function registerChatRoutes(ctx, deps) {
       await mkdir13(sessionDir, { recursive: true });
       const sanitizedFilename = (file.originalname || "attachment").replace(/[^a-zA-Z0-9._-]/g, "_");
       const filename = `${Date.now()}-${sanitizedFilename}`;
-      const filePath = join41(sessionDir, filename);
+      const filePath = join42(sessionDir, filename);
       await writeFile13(filePath, file.buffer);
       const attachment = {
         id: `att-${randomUUID19().slice(0, 8)}`,
@@ -101612,7 +102417,7 @@ var init_remote_auth = __esm({
 
 // ../dashboard/src/routes/register-settings-memory-routes.ts
 import { execFile as execFile5 } from "node:child_process";
-import { homedir as homedir6 } from "node:os";
+import { homedir as homedir7 } from "node:os";
 import { promisify as promisify12 } from "node:util";
 function registerSettingsMemoryRoutes(ctx, deps) {
   const { router, options, store, runtimeLogger, getProjectContext: getProjectContext3, rethrowAsApiError: rethrowAsApiError8 } = ctx;
@@ -101708,7 +102513,7 @@ function registerSettingsMemoryRoutes(ctx, deps) {
       try {
         await execFileAsync7("mv", [tempPath, globalInstallPath], { timeout: 3e4 });
       } catch (error) {
-        const localBinDir = `${homedir6()}/.local/bin`;
+        const localBinDir = `${homedir7()}/.local/bin`;
         const localInstallPath = `${localBinDir}/cloudflared`;
         attemptedCommands.push(`mkdir -p ${localBinDir}`);
         attemptedCommands.push(`mv ${tempPath} ${localInstallPath}`);
@@ -103074,7 +103879,7 @@ import * as os3 from "os";
 import * as path2 from "path";
 import * as fs2 from "node:fs";
 import { createRequire as createRequire3 } from "node:module";
-import { join as join42, dirname as dirname13 } from "node:path";
+import { join as join43, dirname as dirname13 } from "node:path";
 function getNativePrebuildName() {
   const platform4 = process.platform === "darwin" ? "darwin" : process.platform === "linux" ? "linux" : process.platform === "win32" ? "win32" : "unknown";
   const arch = process.arch === "arm64" ? "arm64" : process.arch === "x64" ? "x64" : "unknown";
@@ -103084,12 +103889,12 @@ function findInstalledNodePtyNativeDir() {
   try {
     const packageJsonPath = require2.resolve("node-pty/package.json");
     const pkgRoot = dirname13(packageJsonPath);
-    const releaseDir = join42(pkgRoot, "build", "Release");
-    if (fs2.existsSync(join42(releaseDir, "pty.node"))) {
+    const releaseDir = join43(pkgRoot, "build", "Release");
+    if (fs2.existsSync(join43(releaseDir, "pty.node"))) {
       return releaseDir;
     }
-    const prebuildDir = join42(pkgRoot, "prebuilds", getNativePrebuildName());
-    if (fs2.existsSync(join42(prebuildDir, "pty.node"))) {
+    const prebuildDir = join43(pkgRoot, "prebuilds", getNativePrebuildName());
+    if (fs2.existsSync(join43(prebuildDir, "pty.node"))) {
       return prebuildDir;
     }
     return null;
@@ -103115,8 +103920,8 @@ function ensureNodePtyNativePermissions() {
     candidateDirs.add(installedNativeDir);
   }
   for (const nativeDir of candidateDirs) {
-    const helperPath = join42(nativeDir, "spawn-helper");
-    const nativeModulePath = join42(nativeDir, "pty.node");
+    const helperPath = join43(nativeDir, "spawn-helper");
+    const nativeModulePath = join43(nativeDir, "pty.node");
     try {
       fs2.chmodSync(helperPath, 493);
     } catch {
@@ -103134,14 +103939,14 @@ function ensureNodePtyNativePermissions() {
 function findStagedNativeDir() {
   const prebuildName = getNativePrebuildName();
   if (process.env.FUSION_RUNTIME_DIR) {
-    const envPath = join42(process.env.FUSION_RUNTIME_DIR, prebuildName);
-    if (fs2.existsSync(join42(envPath, "pty.node"))) {
+    const envPath = join43(process.env.FUSION_RUNTIME_DIR, prebuildName);
+    if (fs2.existsSync(join43(envPath, "pty.node"))) {
       return envPath;
     }
   }
   const execDir = dirname13(process.execPath);
-  const nextToBinary = join42(execDir, "runtime", prebuildName);
-  if (fs2.existsSync(join42(nextToBinary, "pty.node"))) {
+  const nextToBinary = join43(execDir, "runtime", prebuildName);
+  if (fs2.existsSync(join43(nextToBinary, "pty.node"))) {
     return nextToBinary;
   }
   return null;
@@ -103161,7 +103966,7 @@ async function loadPtyModule() {
         process.env.NODE_PTY_SPAWN_HELPER_DIR = nativeDir;
       }
       process.env.FUSION_NATIVE_ASSETS_PATH = nativeDir;
-      const nativePath = join42(nativeDir, "pty.node");
+      const nativePath = join43(nativeDir, "pty.node");
       if (fs2.existsSync(nativePath)) {
         try {
           const nativeModule = { exports: {} };
@@ -108851,7 +109656,7 @@ var init_terminal = __esm({
 });
 
 // ../dashboard/src/file-service.ts
-import { join as join43, resolve as resolve22, relative as relative11, dirname as dirname14, basename as basename12 } from "node:path";
+import { join as join44, resolve as resolve22, relative as relative11, dirname as dirname14, basename as basename12 } from "node:path";
 import { readdir as readdir8, readFile as fsReadFile, writeFile as fsWriteFile, stat as stat7, copyFile as fsCopyFile, rename as fsRename, rm as fsRm, mkdir as mkdir14, access as access6 } from "node:fs/promises";
 async function getTaskBasePath(store, taskId) {
   try {
@@ -108864,7 +109669,7 @@ async function getTaskBasePath(store, taskId) {
       }
     }
     const rootDir = store.getRootDir();
-    return resolve22(join43(rootDir, ".fusion", "tasks", taskId));
+    return resolve22(join44(rootDir, ".fusion", "tasks", taskId));
   } catch (err) {
     const error = err;
     if (error.code === "ENOENT" || error.message && error.message.includes("not found")) {
@@ -108891,7 +109696,7 @@ function validatePath(basePath, filePath) {
     throw new FileServiceError(`Access denied: Absolute paths not allowed`, "EINVAL");
   }
   const resolvedBase = resolve22(basePath);
-  const resolvedPath = resolve22(join43(resolvedBase, decodedPath));
+  const resolvedPath = resolve22(join44(resolvedBase, decodedPath));
   const relativePath = relative11(resolvedBase, resolvedPath);
   if (relativePath.startsWith("..") || relativePath.startsWith("../") || relativePath === "..") {
     throw new FileServiceError(`Access denied: Path traversal detected`, "EINVAL");
@@ -108920,7 +109725,7 @@ async function listFilesForBasePath(basePath, subPath) {
     const entries = await readdir8(targetPath, { withFileTypes: true });
     const fileNodes = [];
     for (const entry of entries) {
-      const entryPath = join43(targetPath, entry.name);
+      const entryPath = join44(targetPath, entry.name);
       const entryStats = await stat7(entryPath);
       fileNodes.push({
         name: entry.name,
@@ -109247,7 +110052,7 @@ async function renameWorkspaceFile(store, workspace, filePath, newName) {
     }
     throw err;
   }
-  const destPath = join43(dirname14(resolvedPath), newName);
+  const destPath = join44(dirname14(resolvedPath), newName);
   const destRelative = relative11(resolve22(workspaceBase), destPath);
   if (destRelative.startsWith("..") || destRelative.startsWith("../") || destRelative === "..") {
     throw new FileServiceError("Destination would be outside workspace", "EINVAL");
@@ -109340,7 +110145,7 @@ function isHiddenPathSegment(name) {
   return name.startsWith(".");
 }
 async function walkDirForMarkdown(basePath, currentRelative, results, options) {
-  const currentPath = currentRelative ? join43(basePath, currentRelative) : basePath;
+  const currentPath = currentRelative ? join44(basePath, currentRelative) : basePath;
   let entries;
   try {
     entries = await readdir8(currentPath, { withFileTypes: true });
@@ -109348,7 +110153,7 @@ async function walkDirForMarkdown(basePath, currentRelative, results, options) {
     return;
   }
   for (const entry of entries) {
-    const entryRelativePath = currentRelative ? join43(currentRelative, entry.name) : entry.name;
+    const entryRelativePath = currentRelative ? join44(currentRelative, entry.name) : entry.name;
     if (entry.isDirectory()) {
       if (MARKDOWN_SCAN_EXCLUDED_DIRS.has(entry.name)) {
         continue;
@@ -109365,7 +110170,7 @@ async function walkDirForMarkdown(basePath, currentRelative, results, options) {
     if (!options.showHidden && isHiddenPathSegment(entry.name)) {
       continue;
     }
-    const fullPath = join43(basePath, entryRelativePath);
+    const fullPath = join44(basePath, entryRelativePath);
     let fileStats;
     try {
       fileStats = await stat7(fullPath);
@@ -109415,7 +110220,7 @@ async function scanMarkdownFiles(store, options) {
       return;
     }
     for (const entry of entries) {
-      const entryRelativePath = relativeDir ? join43(relativeDir, entry.name) : entry.name;
+      const entryRelativePath = relativeDir ? join44(relativeDir, entry.name) : entry.name;
       let shouldRecurse = entry.isDirectory();
       if (!shouldRecurse && typeof entry.isSymbolicLink === "function" && entry.isSymbolicLink()) {
         let symlinkPath;
@@ -109505,8 +110310,8 @@ async function searchWorkspaceFiles(store, workspace, query) {
       if (entry.isDirectory() && EXCLUDED_DIRS.has(entry.name)) {
         continue;
       }
-      const fullPath = join43(dir2, entry.name);
-      const relPath = join43(relativeDir, entry.name);
+      const fullPath = join44(dir2, entry.name);
+      const relPath = join44(relativeDir, entry.name);
       if (entry.isFile()) {
         if (entry.name.toLowerCase().includes(lowerQuery)) {
           results.push({
@@ -109527,8 +110332,8 @@ async function copyDirectoryRecursive(source, destination) {
   await mkdir14(destination, { recursive: true });
   const entries = await readdir8(source, { withFileTypes: true });
   for (const entry of entries) {
-    const sourcePath = join43(source, entry.name);
-    const destPath = join43(destination, entry.name);
+    const sourcePath = join44(source, entry.name);
+    const destPath = join44(destination, entry.name);
     if (entry.isDirectory()) {
       await copyDirectoryRecursive(sourcePath, destPath);
     } else {
@@ -113597,7 +114402,7 @@ var require_BufferList = __commonJS({
         this.head = this.tail = null;
         this.length = 0;
       };
-      BufferList.prototype.join = function join71(s) {
+      BufferList.prototype.join = function join72(s) {
         if (this.length === 0) return "";
         var p = this.head;
         var ret = "" + p.data;
@@ -136106,7 +136911,7 @@ var init_exec_file = __esm({
 
 // ../dashboard/src/routes/register-project-routes.ts
 import * as fsPromises from "node:fs/promises";
-import { dirname as dirname15, isAbsolute as isAbsolute17, join as join44 } from "node:path";
+import { dirname as dirname15, isAbsolute as isAbsolute17, join as join45 } from "node:path";
 var access9, stat8, mkdir15, readdir9, rm3, registerProjectRoutes;
 var init_register_project_routes = __esm({
   "../dashboard/src/routes/register-project-routes.ts"() {
@@ -136329,7 +137134,7 @@ var init_register_project_routes = __esm({
             }
           }
           let hasFusionDir = false;
-          const fusionDirPath = join44(normalizedPath, ".fusion");
+          const fusionDirPath = join45(normalizedPath, ".fusion");
           try {
             await access9(fusionDirPath);
             hasFusionDir = true;
@@ -136393,8 +137198,8 @@ var init_register_project_routes = __esm({
             const entries = await readdir9(searchPath, { withFileTypes: true });
             for (const entry of entries) {
               if (!entry.isDirectory()) continue;
-              const dirPath = join44(searchPath, entry.name);
-              if (isValidSqliteDatabaseFile(join44(dirPath, ".fusion", "fusion.db"))) {
+              const dirPath = join45(searchPath, entry.name);
+              if (isValidSqliteDatabaseFile(join45(dirPath, ".fusion", "fusion.db"))) {
                 detected.push({
                   path: dirPath,
                   suggestedName: entry.name,
@@ -137408,14 +138213,14 @@ var init_register_docker_provisioning_routes = __esm({
 
 // ../dashboard/src/auth-paths.ts
 import path3 from "node:path";
-import { homedir as homedir7 } from "node:os";
-function getFusionAgentDir2(home = process.env.HOME || process.env.USERPROFILE || homedir7()) {
+import { homedir as homedir8 } from "node:os";
+function getFusionAgentDir2(home = process.env.HOME || process.env.USERPROFILE || homedir8()) {
   return path3.join(home, ".fusion", "agent");
 }
-function getFusionAuthPath2(home = process.env.HOME || process.env.USERPROFILE || homedir7()) {
+function getFusionAuthPath2(home = process.env.HOME || process.env.USERPROFILE || homedir8()) {
   return path3.join(getFusionAgentDir2(home), "auth.json");
 }
-function getAuthFileCandidates(cwd = process.cwd(), home = process.env.HOME || process.env.USERPROFILE || homedir7()) {
+function getAuthFileCandidates(cwd = process.cwd(), home = process.env.HOME || process.env.USERPROFILE || homedir8()) {
   return [
     path3.join(home, ".fusion", "agent", "auth.json"),
     path3.join(home, ".fusion", "auth.json"),
@@ -140718,7 +141523,7 @@ Rules:
 import { createWriteStream } from "node:fs";
 import * as fsPromises2 from "node:fs/promises";
 import { tmpdir as tmpdir4 } from "node:os";
-import { join as join45, resolve as resolve23 } from "node:path";
+import { join as join46, resolve as resolve23 } from "node:path";
 import { Readable } from "node:stream";
 import { pipeline as streamPipeline } from "node:stream/promises";
 function registerAgentImportExportRoutes(ctx) {
@@ -140759,7 +141564,7 @@ function registerAgentImportExportRoutes(ctx) {
       } else if (typeof outputDir === "string") {
         throw badRequest("outputDir cannot be empty");
       } else {
-        resolvedOutputDir = await mkdtemp(join45(tmpdir4(), "fusion-agent-export-"));
+        resolvedOutputDir = await mkdtemp(join46(tmpdir4(), "fusion-agent-export-"));
       }
       const result = await exportAgentsToDirectory2(agentsToExport, resolvedOutputDir, {
         companyName: typeof companyName === "string" ? companyName : void 0,
@@ -140886,7 +141691,7 @@ ${body}`;
       return result;
     }
     const safeCompanySlug = companySlug ? slugifyPathSegment2(companySlug, "unknown-company") : "unknown-company";
-    const skillsBaseDir = join45(projectRoot, "skills", "imported", safeCompanySlug);
+    const skillsBaseDir = join46(projectRoot, "skills", "imported", safeCompanySlug);
     const usedSlugs = /* @__PURE__ */ new Set();
     for (const skill of skills) {
       const name = typeof skill.name === "string" && skill.name.trim().length > 0 ? skill.name.trim() : null;
@@ -140903,8 +141708,8 @@ ${body}`;
         skillSlug = `${skillSlug}-${counter}`;
       }
       usedSlugs.add(skillSlug);
-      const skillDir = join45(skillsBaseDir, skillSlug);
-      const skillPath = join45(skillDir, "SKILL.md");
+      const skillDir = join46(skillsBaseDir, skillSlug);
+      const skillPath = join46(skillDir, "SKILL.md");
       try {
         await access10(skillPath);
         result.skipped.push(name);
@@ -141074,8 +141879,8 @@ ${body}`;
         const archiveUrl = `https://github.com/${repoOwner}/${repoName}/archive/refs/heads/main.tar.gz`;
         let tempDir = null;
         try {
-          tempDir = await mkdtemp(join45(tmpdir4(), `fn-agent-import-${importCompanySlug}-`));
-          const archivePath = join45(tempDir, "archive.tar.gz");
+          tempDir = await mkdtemp(join46(tmpdir4(), `fn-agent-import-${importCompanySlug}-`));
+          const archivePath = join46(tempDir, "archive.tar.gz");
           const downloadController = new AbortController();
           const downloadTimeout = setTimeout(() => downloadController.abort(), 3e4);
           let archiveResponse;
@@ -142356,7 +143161,7 @@ import * as path4 from "node:path";
 import { readFile as readFile20 } from "node:fs/promises";
 import * as https from "node:https";
 import * as child_process from "node:child_process";
-function getHomeDir5() {
+function getHomeDir6() {
   return process.env.HOME || process.env.USERPROFILE || os4.homedir();
 }
 function execFileAsync5(file, args, options) {
@@ -142866,8 +143671,8 @@ async function fetchClaudeUsage(authStorage) {
   }
   if (!creds) {
     const credPaths = [
-      path4.join(getHomeDir5(), ".claude", ".credentials.json"),
-      path4.join(getHomeDir5(), ".config", "claude", ".credentials.json")
+      path4.join(getHomeDir6(), ".claude", ".credentials.json"),
+      path4.join(getHomeDir6(), ".config", "claude", ".credentials.json")
     ];
     for (const p of credPaths) {
       try {
@@ -143027,7 +143832,7 @@ async function fetchCodexUsage() {
     status: "no-auth",
     windows: []
   };
-  const codexHome = process.env.CODEX_HOME || path4.join(getHomeDir5(), ".codex");
+  const codexHome = process.env.CODEX_HOME || path4.join(getHomeDir6(), ".codex");
   const authPath = path4.join(codexHome, "auth.json");
   let auth = null;
   try {
@@ -143118,7 +143923,7 @@ async function fetchGeminiUsage() {
     status: "no-auth",
     windows: []
   };
-  const oauthPath = path4.join(getHomeDir5(), ".gemini", "oauth_creds.json");
+  const oauthPath = path4.join(getHomeDir6(), ".gemini", "oauth_creds.json");
   let oauthCreds = null;
   try {
     oauthCreds = JSON.parse(await readFile20(oauthPath, "utf-8"));
@@ -143134,7 +143939,7 @@ async function fetchGeminiUsage() {
     const claims = decodeJwtPayload(oauthCreds.id_token);
     if (claims?.email) usage.email = claims.email;
   }
-  const settingsPath = path4.join(getHomeDir5(), ".gemini", "settings.json");
+  const settingsPath = path4.join(getHomeDir6(), ".gemini", "settings.json");
   try {
     const settings = JSON.parse(await readFile20(settingsPath, "utf-8"));
     const authType = settings?.security?.auth?.selectedType;
@@ -143771,6 +144576,13 @@ var init_register_auth_routes = __esm({
         }
         return key.slice(0, 3) + "\u2022\u2022\u2022\u2022\u2022" + key.slice(-4);
       }
+      function isExpiredOauthCredential(providerId, storage) {
+        const credential = storage.get?.(providerId);
+        if (!credential || credential.type !== "oauth" || typeof credential.expires !== "number") {
+          return false;
+        }
+        return Date.now() >= credential.expires;
+      }
       const loginInProgress = /* @__PURE__ */ new Map();
       const OAUTH_SESSION_TTL_MS = 5 * 60 * 1e3;
       const oauthSessions = /* @__PURE__ */ new Map();
@@ -143831,6 +144643,40 @@ var init_register_auth_routes = __esm({
           path: `${redirectUriUrl.pathname}${redirectUriUrl.search}`
         };
       }
+      function shouldRewriteOauthRedirect(providerId, origin) {
+        if (!origin || isLocalhostOrigin(origin)) {
+          return false;
+        }
+        if (providerId === "openai-codex") {
+          return false;
+        }
+        return true;
+      }
+      function getManualCodeConfig(providerId, origin) {
+        if (providerId !== "openai-codex") {
+          return void 0;
+        }
+        const remoteDashboard = origin !== void 0 && !isLocalhostOrigin(origin);
+        return {
+          prompt: "Paste the final redirect URL or authorization code",
+          placeholder: "http://localhost:1455/auth/callback?code=...&state=... or just the code",
+          helpText: remoteDashboard ? "After sign-in, OpenAI may redirect to a localhost callback that cannot open from this dashboard host. Copy the full browser URL from the address bar and paste it here." : "If the browser cannot finish the localhost callback automatically, copy the full browser URL from the address bar and paste it here."
+        };
+      }
+      function appendManualCodeHint(instructions, providerId, origin) {
+        const manualCode = getManualCodeConfig(providerId, origin);
+        if (!manualCode) {
+          return instructions;
+        }
+        const hint = manualCode.helpText;
+        if (!hint) {
+          return instructions;
+        }
+        if (!instructions?.trim()) {
+          return hint;
+        }
+        return `${instructions.trim()} ${hint}`;
+      }
       router.get("/auth/status", async (_req, res) => {
         try {
           const storage = getAuthStorage();
@@ -143839,7 +144685,7 @@ var init_register_auth_routes = __esm({
           const providers = oauthProviders.map((p) => ({
             id: p.id,
             name: p.name,
-            authenticated: storage.hasAuth(p.id),
+            authenticated: storage.hasAuth(p.id) && !isExpiredOauthCredential(p.id, storage),
             type: "oauth",
             loginInProgress: loginInProgress.has(p.id)
           }));
@@ -144093,7 +144939,29 @@ var init_register_auth_routes = __esm({
             throw badRequest(`Unknown provider: ${provider}`);
           }
           const abortController = new AbortController();
-          loginInProgress.set(provider, abortController);
+          let resolveInput = () => {
+          };
+          let rejectInput = () => {
+          };
+          const inputPromise = new Promise((resolve44, reject2) => {
+            resolveInput = resolve44;
+            rejectInput = reject2;
+          });
+          void inputPromise.catch((error) => {
+            const message = error instanceof Error ? error.message : String(error);
+            if (message !== "cancelled") {
+              console.warn(`[auth/login] manual OAuth input promise rejected for ${provider}: ${message}`);
+            }
+          });
+          const pendingLogin = {
+            abortController,
+            inputPromise,
+            resolveInput,
+            rejectInput,
+            inputSubmitted: false,
+            manualCode: getManualCodeConfig(provider, origin)
+          };
+          loginInProgress.set(provider, pendingLogin);
           let authResolve;
           let authReject;
           const authUrlPromise = new Promise((resolve44, reject2) => {
@@ -144102,12 +144970,16 @@ var init_register_auth_routes = __esm({
           });
           const loginPromise = storage.login(provider, {
             onAuth: (info) => {
-              authResolve({ url: info.url, instructions: info.instructions });
-            },
-            onPrompt: async (prompt) => {
-              if (prompt.allowEmpty) return "";
-              return prompt.placeholder || "";
+              authResolve({
+                url: info.url,
+                instructions: appendManualCodeHint(info.instructions, provider, origin)
+              });
             },
+            onPrompt: async () => await pendingLogin.inputPromise,
+            // AuthStorage.login() forwards callbacks to provider-specific OAuth
+            // implementations verbatim. openai-codex supports this optional hook
+            // to race pasted codes against the localhost callback server.
+            onManualCodeInput: async () => await pendingLogin.inputPromise,
             onProgress: () => {
             },
             // no-op for web UI
@@ -144126,7 +144998,7 @@ var init_register_auth_routes = __esm({
           const authInfo = await authUrlPromise;
           clearTimeout(timeout2);
           let responseUrl = authInfo.url;
-          if (origin && !isLocalhostOrigin(origin)) {
+          if (shouldRewriteOauthRedirect(provider, origin)) {
             const rewritten = rewriteAuthUrl(authInfo.url, origin);
             setOauthSession(rewritten.state, {
               port: rewritten.port,
@@ -144135,7 +145007,11 @@ var init_register_auth_routes = __esm({
             });
             responseUrl = rewritten.url;
           }
-          res.json({ url: responseUrl, instructions: authInfo.instructions });
+          res.json({
+            url: responseUrl,
+            instructions: authInfo.instructions,
+            manualCode: pendingLogin.manualCode
+          });
         } catch (err) {
           if (err instanceof ApiError) {
             throw err;
@@ -144157,7 +145033,9 @@ var init_register_auth_routes = __esm({
             return;
           }
           loginInProgress.delete(provider);
-          activeLogin.abort();
+          activeLogin.inputSubmitted = true;
+          activeLogin.rejectInput(new Error("cancelled"));
+          activeLogin.abortController.abort();
           res.json({ success: true, cancelled: true });
         } catch (err) {
           if (err instanceof ApiError) {
@@ -144166,6 +145044,33 @@ var init_register_auth_routes = __esm({
           rethrowAsApiError8(err);
         }
       });
+      router.post("/auth/manual-code", (req, res) => {
+        try {
+          const { provider, code } = req.body;
+          if (!provider || typeof provider !== "string") {
+            throw badRequest("provider is required");
+          }
+          if (!code || typeof code !== "string" || !code.trim()) {
+            throw badRequest("code is required");
+          }
+          const activeLogin = loginInProgress.get(provider);
+          if (!activeLogin) {
+            throw conflict(`No login in progress for ${provider}`);
+          }
+          if (activeLogin.inputSubmitted) {
+            res.json({ success: true, submitted: false });
+            return;
+          }
+          activeLogin.inputSubmitted = true;
+          activeLogin.resolveInput(code.trim());
+          res.json({ success: true, submitted: true });
+        } catch (err) {
+          if (err instanceof ApiError) {
+            throw err;
+          }
+          rethrowAsApiError8(err);
+        }
+      });
       router.get("/auth/oauth-callback", async (req, res) => {
         try {
           const error = typeof req.query.error === "string" ? req.query.error : void 0;
@@ -145497,15 +146402,15 @@ var init_register_runtime_provider_routes = __esm({
 });
 
 // ../dashboard/src/cli-package-version.ts
-import { existsSync as existsSync33, readFileSync as readFileSync11 } from "node:fs";
+import { existsSync as existsSync34, readFileSync as readFileSync12 } from "node:fs";
 import { dirname as dirname16, resolve as resolve24 } from "node:path";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 function readCliPackageVersion(pkgPath) {
-  if (!existsSync33(pkgPath)) {
+  if (!existsSync34(pkgPath)) {
     return null;
   }
   try {
-    const parsed = JSON.parse(readFileSync11(pkgPath, "utf-8"));
+    const parsed = JSON.parse(readFileSync12(pkgPath, "utf-8"));
     if (parsed.name === CLI_PACKAGE_NAME && typeof parsed.version === "string" && parsed.version.length > 0) {
       return {
         packageJsonPath: pkgPath,
@@ -145707,9 +146612,9 @@ var init_register_fn_binary_routes = __esm({
 });
 
 // ../dashboard/src/update-check.ts
-import { readFileSync as readFileSync12 } from "node:fs";
+import { readFileSync as readFileSync13 } from "node:fs";
 import { mkdir as mkdir17, rm as rm5, writeFile as writeFile15 } from "node:fs/promises";
-import { join as join47 } from "node:path";
+import { join as join48 } from "node:path";
 function ttlForFrequency(frequency) {
   switch (frequency) {
     case "manual":
@@ -145723,7 +146628,7 @@ function ttlForFrequency(frequency) {
   }
 }
 function getCachePath(fusionDir) {
-  return join47(fusionDir, CACHE_FILENAME);
+  return join48(fusionDir, CACHE_FILENAME);
 }
 function parseVersion(version) {
   return version.split(".").slice(0, 3).map((part) => Number.parseInt(part, 10)).map((value) => Number.isFinite(value) ? value : 0);
@@ -145747,7 +146652,7 @@ function isValidResult(value) {
 }
 function readCachedUpdateCheck(fusionDir) {
   try {
-    const raw = readFileSync12(getCachePath(fusionDir), "utf-8");
+    const raw = readFileSync13(getCachePath(fusionDir), "utf-8");
     const parsed = JSON.parse(raw);
     return isValidResult(parsed) ? parsed : null;
   } catch {
@@ -150394,7 +151299,7 @@ var init_todo_routes = __esm({
 
 // ../dashboard/src/dev-server-detect.ts
 import { glob, readFile as readFile21 } from "node:fs/promises";
-import { dirname as dirname17, join as join48, relative as relative12, resolve as resolve25 } from "node:path";
+import { dirname as dirname17, join as join49, relative as relative12, resolve as resolve25 } from "node:path";
 async function readPackageJson(filePath) {
   try {
     const raw = await readFile21(filePath, "utf-8");
@@ -150437,7 +151342,7 @@ function scoreCandidate(scriptName, pkg) {
 async function collectWorkspacePackageJsons(projectRoot) {
   const discovered = /* @__PURE__ */ new Set();
   try {
-    await readFile21(join48(projectRoot, "pnpm-workspace.yaml"), "utf-8");
+    await readFile21(join49(projectRoot, "pnpm-workspace.yaml"), "utf-8");
   } catch {
   }
   for (const pattern of ["packages/*/package.json", "apps/*/package.json"]) {
@@ -150471,7 +151376,7 @@ function toSource(projectRoot, packageJsonPath) {
 async function detectDevServerScripts(projectRoot) {
   const root = resolve25(projectRoot);
   const candidates = [];
-  const rootPackagePath = join48(root, "package.json");
+  const rootPackagePath = join49(root, "package.json");
   const rootPackage = await readPackageJson(rootPackagePath);
   if (rootPackage) {
     for (const script of extractScripts(rootPackage)) {
@@ -150538,9 +151443,9 @@ var init_dev_server_detect = __esm({
 
 // ../dashboard/src/dev-server-store.ts
 import { mkdir as mkdir18, readFile as readFile22, writeFile as writeFile16 } from "node:fs/promises";
-import { dirname as dirname18, join as join49, resolve as resolve26 } from "node:path";
+import { dirname as dirname18, join as join50, resolve as resolve26 } from "node:path";
 function devServerFilePath(projectDir) {
-  return join49(resolve26(projectDir), ".fusion", "dev-server.json");
+  return join50(resolve26(projectDir), ".fusion", "dev-server.json");
 }
 function normalizeState(candidate) {
   const defaults = DEV_SERVER_DEFAULT_STATE();
@@ -151794,7 +152699,7 @@ Your job is to refine task descriptions based on the user's selected refinement
 
 // ../dashboard/src/routes.ts
 import multer from "multer";
-import { resolve as resolve27, sep as sep7, join as join50, isAbsolute as isAbsolute18 } from "node:path";
+import { resolve as resolve27, sep as sep7, join as join51, isAbsolute as isAbsolute18 } from "node:path";
 import * as nodeFs from "node:fs";
 import os5 from "node:os";
 import v8 from "node:v8";
@@ -151822,8 +152727,8 @@ async function getPiPackageManagerAgentDir() {
   const fusionAgentDir = getFusionAgentDir();
   const legacyAgentDir = getLegacyPiAgentDir();
   const [fusionSettings, legacySettings, legacyExists, fusionExists] = await Promise.all([
-    readJsonObject3(join50(fusionAgentDir, "settings.json")),
-    readJsonObject3(join50(legacyAgentDir, "settings.json")),
+    readJsonObject3(join51(fusionAgentDir, "settings.json")),
+    readJsonObject3(join51(legacyAgentDir, "settings.json")),
     pathExists(legacyAgentDir),
     pathExists(fusionAgentDir)
   ]);
@@ -151850,9 +152755,9 @@ async function discoverDashboardPiExtensions(cwd) {
     const { DefaultPackageManager: DefaultPackageManager5 } = await import("@mariozechner/pi-coding-agent");
     const [agentDir, legacyGlobalSettings, fusionGlobalSettings, projectSettings] = await Promise.all([
       getPiPackageManagerAgentDir(),
-      readJsonObject3(join50(getLegacyPiAgentDir(), "settings.json")),
-      readJsonObject3(join50(getFusionAgentDir(), "settings.json")),
-      readJsonObject3(join50(cwd, ".fusion", "settings.json"))
+      readJsonObject3(join51(getLegacyPiAgentDir(), "settings.json")),
+      readJsonObject3(join51(getFusionAgentDir(), "settings.json")),
+      readJsonObject3(join51(cwd, ".fusion", "settings.json"))
     ]);
     const globalSettings = { ...legacyGlobalSettings, ...fusionGlobalSettings };
     const mergedSettings = { ...globalSettings, ...projectSettings };
@@ -154266,7 +155171,7 @@ Description: ${step.description}`
           return;
         }
       }
-      const { resolve: resolve44, dirname: dirname34, join: join71 } = await import("node:path");
+      const { resolve: resolve44, dirname: dirname34, join: join72 } = await import("node:path");
       const { readdir: readdir12, stat: stat12 } = await import("node:fs/promises");
       const rawPath = req.query.path || process.env.HOME || process.env.USERPROFILE || "/";
       const showHidden = req.query.showHidden === "true";
@@ -154291,7 +155196,7 @@ Description: ${step.description}`
       for (const entry of dirEntries) {
         if (!entry.isDirectory()) continue;
         if (!showHidden && entry.name.startsWith(".")) continue;
-        const entryPath = join71(resolvedPath, entry.name);
+        const entryPath = join72(resolvedPath, entry.name);
         let hasChildren = false;
         try {
           const subEntries = await readdir12(entryPath, { withFileTypes: true });
@@ -159899,8 +160804,8 @@ var init_auth_middleware = __esm({
 // ../dashboard/src/server.ts
 import express from "express";
 import { randomUUID as randomUUID25 } from "node:crypto";
-import { join as join51, dirname as dirname19 } from "node:path";
-import { existsSync as existsSync34, readFileSync as readFileSync13 } from "node:fs";
+import { join as join52, dirname as dirname19 } from "node:path";
+import { existsSync as existsSync35, readFileSync as readFileSync14 } from "node:fs";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 import { createSecureServer as createHttp2SecureServer } from "node:http2";
 function parseVersion2(version) {
@@ -160002,11 +160907,11 @@ function loadTlsCredentialsFromEnv(env = process.env) {
       "FUSION_TLS_* environment is incomplete: set both a cert and a key (inline via FUSION_TLS_CERT/FUSION_TLS_KEY or paths via *_FILE)."
     );
   }
-  const cert = certInline ? Buffer.from(certInline) : readFileSync13(certFile);
-  const key = keyInline ? Buffer.from(keyInline) : readFileSync13(keyFile);
+  const cert = certInline ? Buffer.from(certInline) : readFileSync14(certFile);
+  const key = keyInline ? Buffer.from(keyInline) : readFileSync14(keyFile);
   const caInline = env.FUSION_TLS_CA;
   const caFile = env.FUSION_TLS_CA_FILE;
-  const ca = caInline ? Buffer.from(caInline) : caFile ? readFileSync13(caFile) : void 0;
+  const ca = caInline ? Buffer.from(caInline) : caFile ? readFileSync14(caFile) : void 0;
   return { cert, key, ca };
 }
 function createServer(store, options) {
@@ -160082,11 +160987,11 @@ function createServer(store, options) {
   getTerminalService(store.getRootDir());
   const isHeadless = options?.headless === true;
   const execDir = dirname19(process.execPath);
-  const clientDir = process.env.FUSION_CLIENT_DIR ? process.env.FUSION_CLIENT_DIR : existsSync34(join51(execDir, "client", "index.html")) ? join51(execDir, "client") : existsSync34(join51(__dirname, "..", "dist", "client")) ? join51(__dirname, "..", "dist", "client") : join51(__dirname, "..", "client");
+  const clientDir = process.env.FUSION_CLIENT_DIR ? process.env.FUSION_CLIENT_DIR : existsSync35(join52(execDir, "client", "index.html")) ? join52(execDir, "client") : existsSync35(join52(__dirname, "..", "dist", "client")) ? join52(__dirname, "..", "dist", "client") : join52(__dirname, "..", "client");
   if (!isHeadless) {
     app.get("/version.json", (_req, res) => {
       res.setHeader("Cache-Control", "no-store, max-age=0");
-      res.sendFile(join51(clientDir, "version.json"), (err) => {
+      res.sendFile(join52(clientDir, "version.json"), (err) => {
         if (err) {
           res.status(404).json({ version: null });
         }
@@ -160350,7 +161255,13 @@ data: ${JSON.stringify({ type: event.type, data: event.data })}
     });
   }
   const chatAgentStore = new AgentStore({ rootDir: store.getFusionDir() });
-  const chatManager = options?.chatManager ?? new ChatManager(chatStore, store.getRootDir(), chatAgentStore);
+  const chatManager = options?.chatManager ?? new ChatManager(
+    chatStore,
+    store.getRootDir(),
+    chatAgentStore,
+    options?.pluginRunner,
+    () => store.getSettings()
+  );
   const runAiSessionCleanup = (maxAgeMs, source) => {
     const result = aiSessionStore.cleanupStaleSessions(maxAgeMs);
     runtimeLogger.info("AI session cleanup summary", {
@@ -160543,7 +161454,7 @@ data: ${JSON.stringify({ type: event.type, data: event.data })}
   });
   if (!isHeadless) {
     app.get("/{*splat}", (_req, res) => {
-      res.sendFile(join51(clientDir, "index.html"));
+      res.sendFile(join52(clientDir, "index.html"));
     });
   }
   const dashboardApp = app;
@@ -160998,7 +161909,7 @@ var init_server = __esm({
 
 // ../dashboard/src/skills-adapter.ts
 import { access as access11, readFile as readFile23, writeFile as writeFile17, mkdir as mkdir19, readdir as readdir10, stat as stat10 } from "node:fs/promises";
-import { join as join52, relative as relative13, dirname as dirname20 } from "node:path";
+import { join as join53, relative as relative13, dirname as dirname20 } from "node:path";
 async function pathExists2(path5) {
   try {
     await access11(path5);
@@ -161254,7 +162165,7 @@ function createSkillsAdapter(options) {
       } catch {
         skillDir = dirname20(skill.path);
       }
-      const skillMdPath = join52(skillDir, "SKILL.md");
+      const skillMdPath = join53(skillDir, "SKILL.md");
       let skillMd = "";
       try {
         skillMd = await readFile23(skillMdPath, "utf-8");
@@ -161462,7 +162373,7 @@ function normalizeEntry(entry) {
   };
 }
 function getProjectSettingsPath(rootDir) {
-  return join52(rootDir, ".fusion", "settings.json");
+  return join53(rootDir, ".fusion", "settings.json");
 }
 var MIN_PUBLIC_SEARCH_QUERY_LENGTH;
 var init_skills_adapter = __esm({
@@ -161705,33 +162616,33 @@ var init_port_prompt = __esm({
 });
 
 // src/commands/provider-settings.ts
-import { existsSync as existsSync35, readFileSync as readFileSync14, writeFileSync as writeFileSync2, mkdirSync as mkdirSync6 } from "node:fs";
-import { join as join53, dirname as dirname21, basename as basename15 } from "node:path";
+import { existsSync as existsSync36, readFileSync as readFileSync15, writeFileSync as writeFileSync2, mkdirSync as mkdirSync6 } from "node:fs";
+import { join as join54, dirname as dirname21, basename as basename15 } from "node:path";
 function siblingAgentDir2(agentDir, siblingRoot) {
   if (basename15(agentDir) !== "agent") {
     return void 0;
   }
-  return join53(dirname21(dirname21(agentDir)), siblingRoot, "agent");
+  return join54(dirname21(dirname21(agentDir)), siblingRoot, "agent");
 }
 function readJsonObject4(path5) {
-  if (!existsSync35(path5)) {
+  if (!existsSync36(path5)) {
     return {};
   }
   try {
-    const parsed = JSON.parse(readFileSync14(path5, "utf-8"));
+    const parsed = JSON.parse(readFileSync15(path5, "utf-8"));
     return parsed !== null && typeof parsed === "object" ? parsed : {};
   } catch {
     return {};
   }
 }
 function createReadOnlyProviderSettingsView(cwd, agentDir) {
-  const fusionAgentDir = agentDir.includes(`${join53(".fusion", "agent")}`) ? agentDir : siblingAgentDir2(agentDir, ".fusion");
-  const legacyAgentDir = agentDir.includes(`${join53(".pi", "agent")}`) ? agentDir : siblingAgentDir2(agentDir, ".pi");
-  const legacyGlobalSettings = legacyAgentDir ? readJsonObject4(join53(legacyAgentDir, "settings.json")) : {};
-  const fusionGlobalSettings = fusionAgentDir ? readJsonObject4(join53(fusionAgentDir, "settings.json")) : {};
-  const directGlobalSettings = readJsonObject4(join53(agentDir, "settings.json"));
+  const fusionAgentDir = agentDir.includes(`${join54(".fusion", "agent")}`) ? agentDir : siblingAgentDir2(agentDir, ".fusion");
+  const legacyAgentDir = agentDir.includes(`${join54(".pi", "agent")}`) ? agentDir : siblingAgentDir2(agentDir, ".pi");
+  const legacyGlobalSettings = legacyAgentDir ? readJsonObject4(join54(legacyAgentDir, "settings.json")) : {};
+  const fusionGlobalSettings = fusionAgentDir ? readJsonObject4(join54(fusionAgentDir, "settings.json")) : {};
+  const directGlobalSettings = readJsonObject4(join54(agentDir, "settings.json"));
   const globalSettings = { ...legacyGlobalSettings, ...directGlobalSettings, ...fusionGlobalSettings };
-  const fusionProjectSettings = readJsonObject4(join53(cwd, ".fusion", "settings.json"));
+  const fusionProjectSettings = readJsonObject4(join54(cwd, ".fusion", "settings.json"));
   const mergedSettings = { ...globalSettings, ...fusionProjectSettings };
   return {
     getGlobalSettings: () => structuredClone(globalSettings),
@@ -161746,7 +162657,6 @@ var init_provider_settings = __esm({
 });
 
 // src/commands/provider-auth.ts
-import { existsSync as existsSync36, readFileSync as readFileSync15 } from "node:fs";
 import { getOAuthProvider as getOAuthProvider2 } from "@mariozechner/pi-ai/oauth";
 function getProviderDisplayName(providerId) {
   const knownProviderNames = new Map(
@@ -161762,7 +162672,10 @@ function wrapAuthStorageWithApiKeyProviders(authStorage, modelRegistry, readFall
     reload: () => mergedAuthStorage.reload(),
     getOAuthProviders: () => mergedAuthStorage.getOAuthProviders().filter((provider) => !OAUTH_TO_API_KEY_RECLASSIFICATIONS.has(provider.id)).map((provider) => ({ id: provider.id, name: provider.name })),
     hasAuth: (provider) => mergedAuthStorage.hasAuth(provider),
-    login: (providerId, callbacks) => mergedAuthStorage.login(providerId, callbacks),
+    login: (providerId, callbacks) => mergedAuthStorage.login(
+      providerId,
+      callbacks
+    ),
     logout: (provider) => mergedAuthStorage.logout(provider),
     getApiKeyProviders: () => {
       const oauthProviderIds = new Set(
@@ -161801,13 +162714,28 @@ function wrapAuthStorageWithApiKeyProviders(authStorage, modelRegistry, readFall
 }
 function mergeAuthStorageReads(authStorage, readFallbackAuthStorages = []) {
   const readAuthStorages = [authStorage, ...readFallbackAuthStorages];
-  const getCredential = (providerId) => {
-    for (const storage of readAuthStorages) {
-      const credential = storage.get(providerId);
-      if (credential) return credential;
+  const selectCredential = (providerId, storages) => {
+    let best;
+    for (const storage of storages) {
+      best = choosePreferredStoredCredential(best, storage.get(providerId));
     }
-    return void 0;
+    return best;
   };
+  const getCredential = (providerId) => selectCredential(providerId, readAuthStorages);
+  const syncFallbackOauthCredentials = () => {
+    const providerIds = new Set(readFallbackAuthStorages.flatMap((storage) => storage.list()));
+    for (const providerId of providerIds) {
+      const current = authStorage.get(providerId);
+      const candidate = selectCredential(providerId, readFallbackAuthStorages);
+      if (!shouldHydrateStoredCredential(current, candidate)) {
+        continue;
+      }
+      if (candidate && (candidate.type === "oauth" || candidate.type === "api_key")) {
+        authStorage.set(providerId, candidate);
+      }
+    }
+  };
+  syncFallbackOauthCredentials();
   return new Proxy(authStorage, {
     get(target, prop, receiver) {
       if (prop === "reload") {
@@ -161815,6 +162743,7 @@ function mergeAuthStorageReads(authStorage, readFallbackAuthStorages = []) {
           for (const storage of readAuthStorages) {
             storage.reload();
           }
+          syncFallbackOauthCredentials();
         };
       }
       if (prop === "get") {
@@ -161827,13 +162756,17 @@ function mergeAuthStorageReads(authStorage, readFallbackAuthStorages = []) {
         return (provider) => readAuthStorages.some((storage) => storage.hasAuth(provider));
       }
       if (prop === "getAll") {
-        return () => ({
-          ...readFallbackAuthStorages.reduce(
-            (merged, storage) => ({ ...merged, ...storage.getAll() }),
-            {}
-          ),
-          ...target.getAll()
-        });
+        return () => {
+          const providerIds = new Set(readAuthStorages.flatMap((storage) => storage.list()));
+          const merged = {};
+          for (const providerId of providerIds) {
+            const credential = getCredential(providerId);
+            if (credential) {
+              merged[providerId] = credential;
+            }
+          }
+          return merged;
+        };
       }
       if (prop === "list") {
         return () => Array.from(new Set(readAuthStorages.flatMap((storage) => storage.list())));
@@ -161875,15 +162808,9 @@ function createReadOnlyAuthFileStorage(authPaths) {
   const reload = () => {
     const nextCredentials = {};
     for (const authPath of authPaths) {
-      if (!existsSync36(authPath)) {
-        continue;
-      }
-      try {
-        const parsed = JSON.parse(readFileSync15(authPath, "utf-8"));
-        for (const [provider, credential] of Object.entries(parsed)) {
-          nextCredentials[provider] ??= credential;
-        }
-      } catch {
+      const parsed = readStoredCredentialsFromAuthFile(authPath);
+      for (const [provider, credential] of Object.entries(parsed)) {
+        nextCredentials[provider] = choosePreferredStoredCredential(nextCredentials[provider], credential) ?? credential;
       }
     }
     credentials = nextCredentials;
@@ -161904,6 +162831,7 @@ var OAUTH_TO_API_KEY_RECLASSIFICATIONS, BUILT_IN_API_KEY_PROVIDERS, CLI_PROVIDER
 var init_provider_auth = __esm({
   "src/commands/provider-auth.ts"() {
     "use strict";
+    init_src();
     OAUTH_TO_API_KEY_RECLASSIFICATIONS = /* @__PURE__ */ new Set([
       "anthropic"
     ]);
@@ -161921,34 +162849,37 @@ var init_provider_auth = __esm({
 });
 
 // src/commands/auth-paths.ts
-import { homedir as homedir9 } from "node:os";
+import { homedir as homedir10 } from "node:os";
 import { existsSync as existsSync37, readFileSync as readFileSync16 } from "node:fs";
-import { join as join54 } from "node:path";
-function getFusionAgentDir3(home = process.env.HOME || process.env.USERPROFILE || homedir9()) {
-  return join54(home, ".fusion", "agent");
+import { join as join55 } from "node:path";
+function getFusionAgentDir3(home = process.env.HOME || process.env.USERPROFILE || homedir10()) {
+  return join55(home, ".fusion", "agent");
+}
+function getLegacyAgentDir(home = process.env.HOME || process.env.USERPROFILE || homedir10()) {
+  return join55(home, ".pi", "agent");
 }
-function getLegacyAgentDir(home = process.env.HOME || process.env.USERPROFILE || homedir9()) {
-  return join54(home, ".pi", "agent");
+function getFusionAuthPath3(home = process.env.HOME || process.env.USERPROFILE || homedir10()) {
+  return join55(getFusionAgentDir3(home), "auth.json");
 }
-function getFusionAuthPath3(home = process.env.HOME || process.env.USERPROFILE || homedir9()) {
-  return join54(getFusionAgentDir3(home), "auth.json");
+function getCodexCliAuthPath2(home = process.env.HOME || process.env.USERPROFILE || homedir10()) {
+  return join55(home, ".codex", "auth.json");
 }
-function getLegacyAuthPaths2(home = process.env.HOME || process.env.USERPROFILE || homedir9()) {
+function getLegacyAuthPaths2(home = process.env.HOME || process.env.USERPROFILE || homedir10()) {
   return [
-    join54(home, ".pi", "agent", "auth.json"),
-    join54(home, ".pi", "auth.json")
+    join55(home, ".pi", "agent", "auth.json"),
+    join55(home, ".pi", "auth.json")
   ];
 }
-function getFusionModelsPath2(home = process.env.HOME || process.env.USERPROFILE || homedir9()) {
-  return join54(getFusionAgentDir3(home), "models.json");
+function getFusionModelsPath2(home = process.env.HOME || process.env.USERPROFILE || homedir10()) {
+  return join55(getFusionAgentDir3(home), "models.json");
 }
-function getLegacyModelsPaths2(home = process.env.HOME || process.env.USERPROFILE || homedir9()) {
+function getLegacyModelsPaths2(home = process.env.HOME || process.env.USERPROFILE || homedir10()) {
   return [
-    join54(home, ".pi", "agent", "models.json"),
-    join54(home, ".pi", "models.json")
+    join55(home, ".pi", "agent", "models.json"),
+    join55(home, ".pi", "models.json")
   ];
 }
-function getModelRegistryModelsPath2(home = process.env.HOME || process.env.USERPROFILE || homedir9()) {
+function getModelRegistryModelsPath2(home = process.env.HOME || process.env.USERPROFILE || homedir10()) {
   const fusionModelsPath = getFusionModelsPath2(home);
   if (existsSync37(fusionModelsPath)) {
     return fusionModelsPath;
@@ -161969,11 +162900,11 @@ function readJsonObject5(path5) {
 function hasPackageManagerSettings3(settings) {
   return Array.isArray(settings.packages) || Array.isArray(settings.npmCommand);
 }
-function getPackageManagerAgentDir2(home = process.env.HOME || process.env.USERPROFILE || homedir9()) {
+function getPackageManagerAgentDir2(home = process.env.HOME || process.env.USERPROFILE || homedir10()) {
   const fusionAgentDir = getFusionAgentDir3(home);
   const legacyAgentDir = getLegacyAgentDir(home);
-  const fusionSettings = readJsonObject5(join54(fusionAgentDir, "settings.json"));
-  const legacySettings = readJsonObject5(join54(legacyAgentDir, "settings.json"));
+  const fusionSettings = readJsonObject5(join55(fusionAgentDir, "settings.json"));
+  const legacySettings = readJsonObject5(join55(legacyAgentDir, "settings.json"));
   if (hasPackageManagerSettings3(fusionSettings) || !existsSync37(legacyAgentDir)) {
     return fusionAgentDir;
   }
@@ -162149,7 +163080,7 @@ import {
   symlinkSync,
   unlinkSync
 } from "node:fs";
-import { dirname as dirname23, join as join55, resolve as resolve29 } from "node:path";
+import { dirname as dirname23, join as join56, resolve as resolve29 } from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 function isPiClaudeCliConfigured(globalSettings) {
   if (!globalSettings || typeof globalSettings !== "object") {
@@ -162173,7 +163104,7 @@ function resolveFusionSkillSource() {
   return existsSync38(candidate) ? candidate : null;
 }
 function installFusionSkillIntoProject(projectPath, options = {}) {
-  const target = join55(projectPath, ".claude", "skills", FUSION_SKILL_NAME);
+  const target = join56(projectPath, ".claude", "skills", FUSION_SKILL_NAME);
   if (options.enabled === false) {
     return { outcome: "skipped", target, reason: "pi-claude-cli not configured" };
   }
@@ -162198,7 +163129,7 @@ function installFusionSkillIntoProject(projectPath, options = {}) {
         unlinkSync(target);
         replaced = true;
       } else {
-        const skillMd = join55(target, "SKILL.md");
+        const skillMd = join56(target, "SKILL.md");
         if (!existsSync38(skillMd)) {
           return {
             outcome: "failed",
@@ -162245,7 +163176,7 @@ function ensureFusionSkillForProjects(projects, options = { enabled: false }) {
   if (!options.enabled) {
     return projects.map((p) => ({
       outcome: "skipped",
-      target: join55(p.path, ".claude", "skills", FUSION_SKILL_NAME),
+      target: join56(p.path, ".claude", "skills", FUSION_SKILL_NAME),
       reason: "pi-claude-cli not configured"
     }));
   }
@@ -162548,10 +163479,10 @@ var init_droid_cli_extension = __esm({
 
 // src/update-cache.ts
 import { readFileSync as readFileSync19 } from "node:fs";
-import { join as join56 } from "node:path";
+import { join as join57 } from "node:path";
 function getCachedUpdateStatus(currentVersion) {
   try {
-    const cachePath = join56(resolveGlobalDir(), "update-check.json");
+    const cachePath = join57(resolveGlobalDir(), "update-check.json");
     const raw = readFileSync19(cachePath, "utf-8");
     const parsed = JSON.parse(raw);
     if (parsed.updateAvailable === true && typeof parsed.latestVersion === "string" && parsed.latestVersion.length > 0 && typeof parsed.currentVersion === "string" && parsed.currentVersion.length > 0) {
@@ -162641,19 +163572,19 @@ var init_self_extension = __esm({
 // src/plugins/bundled-plugin-install.ts
 import { existsSync as existsSync42 } from "node:fs";
 import { readFile as readFile24 } from "node:fs/promises";
-import { dirname as dirname27, join as join57, resolve as resolve33 } from "node:path";
+import { dirname as dirname27, join as join58, resolve as resolve33 } from "node:path";
 import { fileURLToPath as fileURLToPath10 } from "node:url";
 function getCandidatePluginPaths() {
   const moduleDir = dirname27(fileURLToPath10(import.meta.url));
   const cliPackageRoot = resolve33(moduleDir, "..", "..");
   return [
-    join57(cliPackageRoot, "dist", "plugins", DEPENDENCY_GRAPH_PLUGIN_ID),
-    join57(cliPackageRoot, "plugins", DEPENDENCY_GRAPH_PLUGIN_ID),
-    join57(cliPackageRoot, "..", "..", "plugins", DEPENDENCY_GRAPH_PLUGIN_ID)
+    join58(cliPackageRoot, "dist", "plugins", DEPENDENCY_GRAPH_PLUGIN_ID),
+    join58(cliPackageRoot, "plugins", DEPENDENCY_GRAPH_PLUGIN_ID),
+    join58(cliPackageRoot, "..", "..", "plugins", DEPENDENCY_GRAPH_PLUGIN_ID)
   ];
 }
 async function loadManifest(pluginDir) {
-  const manifestPath = join57(pluginDir, "manifest.json");
+  const manifestPath = join58(pluginDir, "manifest.json");
   const content = await readFile24(manifestPath, "utf-8");
   const manifest = JSON.parse(content);
   const validation = validatePluginManifest(manifest);
@@ -162664,7 +163595,7 @@ async function loadManifest(pluginDir) {
 }
 function resolveBundledDependencyGraphPath() {
   for (const path5 of getCandidatePluginPaths()) {
-    if (existsSync42(join57(path5, "manifest.json"))) {
+    if (existsSync42(join58(path5, "manifest.json"))) {
       return path5;
     }
   }
@@ -167093,7 +168024,7 @@ __export(dashboard_exports, {
   promptForPort: () => promptForPort,
   runDashboard: () => runDashboard
 });
-import { dirname as dirname28, join as join58, resolve as pathResolve } from "node:path";
+import { dirname as dirname28, join as join59, resolve as pathResolve } from "node:path";
 import { execFile as execFileCb } from "node:child_process";
 import { promisify as promisify16 } from "node:util";
 import { stat as stat11, readdir as readdir11, readFile as fsReadFile3 } from "node:fs/promises";
@@ -167431,7 +168362,7 @@ async function buildFileListDirectory(projectPath, relativePath) {
     let size = 0;
     let modifiedAt = (/* @__PURE__ */ new Date(0)).toISOString();
     try {
-      const s = await stat11(join58(absDir, d.name));
+      const s = await stat11(join59(absDir, d.name));
       size = d.isDirectory() ? 0 : s.size;
       modifiedAt = s.mtime.toISOString();
     } catch {
@@ -167843,8 +168774,11 @@ async function runDashboard(port, opts = {}) {
     rootDir: cwd
   });
   const authStorage = AuthStorage2.create(getFusionAuthPath3());
-  const legacyAuthStorage = createReadOnlyAuthFileStorage(getLegacyAuthPaths2());
-  const mergedAuthStorage = mergeAuthStorageReads(authStorage, [legacyAuthStorage]);
+  const supplementalAuthStorage = createReadOnlyAuthFileStorage([
+    ...getLegacyAuthPaths2(),
+    getCodexCliAuthPath2()
+  ]);
+  const mergedAuthStorage = mergeAuthStorageReads(authStorage, [supplementalAuthStorage]);
   const modelRegistry = ModelRegistry3.create(mergedAuthStorage, getModelRegistryModelsPath2());
   const dashboardAuthStorage = wrapAuthStorageWithApiKeyProviders(mergedAuthStorage, modelRegistry);
   let packageManager;
@@ -167906,7 +168840,7 @@ async function runDashboard(port, opts = {}) {
         ...droidCliPaths
       ],
       cwd,
-      join58(cwd, ".fusion", "disabled-auto-extension-discovery")
+      join59(cwd, ".fusion", "disabled-auto-extension-discovery")
     );
     for (const { path: path5, error } of extensionsResult.errors) {
       logSink.log(`Failed to load ${path5}: ${error}`, "extensions");
@@ -169429,7 +170363,7 @@ var serve_exports = {};
 __export(serve_exports, {
   runServe: () => runServe
 });
-import { dirname as dirname29, join as join59 } from "node:path";
+import { dirname as dirname29, join as join60 } from "node:path";
 import {
   AuthStorage as AuthStorage3,
   DefaultPackageManager as DefaultPackageManager3,
@@ -169682,8 +170616,11 @@ async function runServe(port, opts = {}) {
   const missionExecutionLoop = cwdEngine.getRuntime().getMissionExecutionLoop();
   const automationStore = cwdEngine.getAutomationStore();
   const authStorage = AuthStorage3.create(getFusionAuthPath3());
-  const legacyAuthStorage = createReadOnlyAuthFileStorage(getLegacyAuthPaths2());
-  const mergedAuthStorage = mergeAuthStorageReads(authStorage, [legacyAuthStorage]);
+  const supplementalAuthStorage = createReadOnlyAuthFileStorage([
+    ...getLegacyAuthPaths2(),
+    getCodexCliAuthPath2()
+  ]);
+  const mergedAuthStorage = mergeAuthStorageReads(authStorage, [supplementalAuthStorage]);
   const modelRegistry = ModelRegistry4.create(mergedAuthStorage, getModelRegistryModelsPath2());
   const dashboardAuthStorage = wrapAuthStorageWithApiKeyProviders(mergedAuthStorage, modelRegistry);
   let packageManager;
@@ -169745,7 +170682,7 @@ async function runServe(port, opts = {}) {
         ...droidCliPaths
       ],
       cwd,
-      join59(cwd, ".fusion", "disabled-auto-extension-discovery")
+      join60(cwd, ".fusion", "disabled-auto-extension-discovery")
     );
     for (const { path: path5, error } of extensionsResult.errors) {
       console.log(`[extensions] Failed to load ${path5}: ${error}`);
@@ -170100,7 +171037,7 @@ var daemon_exports = {};
 __export(daemon_exports, {
   runDaemon: () => runDaemon
 });
-import { join as join60 } from "node:path";
+import { join as join61 } from "node:path";
 import {
   AuthStorage as AuthStorage4,
   DefaultPackageManager as DefaultPackageManager4,
@@ -170346,8 +171283,11 @@ async function runDaemon(opts = {}) {
   const missionExecutionLoop = cwdEngine.getRuntime().getMissionExecutionLoop();
   const automationStore = cwdEngine.getAutomationStore();
   const authStorage = AuthStorage4.create(getFusionAuthPath3());
-  const legacyAuthStorage = createReadOnlyAuthFileStorage(getLegacyAuthPaths2());
-  const mergedAuthStorage = mergeAuthStorageReads(authStorage, [legacyAuthStorage]);
+  const supplementalAuthStorage = createReadOnlyAuthFileStorage([
+    ...getLegacyAuthPaths2(),
+    getCodexCliAuthPath2()
+  ]);
+  const mergedAuthStorage = mergeAuthStorageReads(authStorage, [supplementalAuthStorage]);
   const modelRegistry = ModelRegistry5.create(mergedAuthStorage, getModelRegistryModelsPath2());
   const dashboardAuthStorage = wrapAuthStorageWithApiKeyProviders(mergedAuthStorage, modelRegistry);
   let packageManager;
@@ -170407,7 +171347,7 @@ async function runDaemon(opts = {}) {
     const extensionsResult = await discoverAndLoadExtensions4(
       [...reconciledExtensionPaths, ...droidCliPaths],
       cwd,
-      join60(cwd, ".fusion", "disabled-auto-extension-discovery")
+      join61(cwd, ".fusion", "disabled-auto-extension-discovery")
     );
     for (const { path: path5, error } of extensionsResult.errors) {
       console.log(`[extensions] Failed to load ${path5}: ${error}`);
@@ -170628,7 +171568,7 @@ __export(desktop_exports, {
 });
 import { spawn as spawn18 } from "node:child_process";
 import { once as once2 } from "node:events";
-import { join as join61 } from "node:path";
+import { join as join62 } from "node:path";
 import { createRequire as createRequire6 } from "node:module";
 function runCommand(command, args, cwd) {
   return new Promise((resolve44, reject2) => {
@@ -170707,7 +171647,7 @@ async function runDesktop(options = {}) {
   }
   const runtime = await startDashboardRuntime(rootDir, Boolean(options.paused));
   const electronBinary = resolveElectronBinary();
-  const desktopEntry = join61(rootDir, "packages", "desktop", "dist", "main.js");
+  const desktopEntry = join62(rootDir, "packages", "desktop", "dist", "main.js");
   const electronArgs = ["--enable-source-maps", desktopEntry, ...options.dev ? ["--dev"] : []];
   const electronEnv = {
     ...process.env,
@@ -170793,7 +171733,7 @@ __export(task_exports, {
 });
 import { createInterface as createInterface3 } from "node:readline/promises";
 import { watchFile, unwatchFile, statSync as statSync6, existsSync as existsSync43, readFileSync as readFileSync21 } from "node:fs";
-import { basename as basename17, join as join62 } from "node:path";
+import { basename as basename17, join as join63 } from "node:path";
 function getGitHubIssueUrl(sourceMetadata) {
   if (!sourceMetadata || typeof sourceMetadata !== "object") return void 0;
   const issueUrl = sourceMetadata.issueUrl;
@@ -171106,7 +172046,7 @@ async function runTaskLogs(id, options = {}, projectName) {
   printEntries(filteredEntries);
   if (options.follow) {
     const projectPath = projectContext?.projectPath ?? process.cwd();
-    const logPath = join62(projectPath, ".fusion", "tasks", id, "agent.log");
+    const logPath = join63(projectPath, ".fusion", "tasks", id, "agent.log");
     if (!existsSync43(logPath)) {
       console.log(`
   Waiting for log file to be created...`);
@@ -172384,7 +173324,7 @@ __export(settings_export_exports, {
   runSettingsExport: () => runSettingsExport
 });
 import { writeFile as writeFile18 } from "node:fs/promises";
-import { resolve as resolve34, join as join63 } from "node:path";
+import { resolve as resolve34, join as join64 } from "node:path";
 async function runSettingsExport(options = {}) {
   const scope = options.scope ?? "both";
   const project = options.projectName ? await resolveProject(options.projectName) : void 0;
@@ -172398,7 +173338,7 @@ async function runSettingsExport(options = {}) {
       targetPath = resolve34(outputPath);
     } else {
       const filename = generateExportFilename();
-      targetPath = join63(process.cwd(), filename);
+      targetPath = join64(process.cwd(), filename);
     }
     const jsonContent = JSON.stringify(exportData, null, 2);
     await writeFile18(targetPath, jsonContent);
@@ -173972,14 +174912,14 @@ var init_project = __esm({
 
 // src/commands/skill-installation.ts
 import { cpSync as cpSync2, existsSync as existsSync47, mkdirSync as mkdirSync8 } from "node:fs";
-import { homedir as homedir10 } from "node:os";
-import { dirname as dirname31, join as join64, resolve as resolve38 } from "node:path";
+import { homedir as homedir11 } from "node:os";
+import { dirname as dirname31, join as join65, resolve as resolve38 } from "node:path";
 import { fileURLToPath as fileURLToPath11 } from "node:url";
-function getSupportedSkillInstallTargets(homeDir = process.env.HOME || process.env.USERPROFILE || homedir10()) {
+function getSupportedSkillInstallTargets(homeDir = process.env.HOME || process.env.USERPROFILE || homedir11()) {
   return [
-    { client: "claude", targetDir: join64(homeDir, ".claude", "skills", FUSION_SKILL_NAME2) },
-    { client: "codex", targetDir: join64(homeDir, ".codex", "skills", FUSION_SKILL_NAME2) },
-    { client: "gemini", targetDir: join64(homeDir, ".gemini", "skills", FUSION_SKILL_NAME2) }
+    { client: "claude", targetDir: join65(homeDir, ".claude", "skills", FUSION_SKILL_NAME2) },
+    { client: "codex", targetDir: join65(homeDir, ".codex", "skills", FUSION_SKILL_NAME2) },
+    { client: "gemini", targetDir: join65(homeDir, ".gemini", "skills", FUSION_SKILL_NAME2) }
   ];
 }
 function resolveBundledFusionSkillSource() {
@@ -174043,13 +174983,13 @@ __export(init_exports, {
   runInit: () => runInit
 });
 import { existsSync as existsSync48, mkdirSync as mkdirSync9, writeFileSync as writeFileSync3, readFileSync as readFileSync22 } from "node:fs";
-import { join as join65, resolve as resolve39, basename as basename20 } from "node:path";
+import { join as join66, resolve as resolve39, basename as basename20 } from "node:path";
 import { exec as exec13 } from "node:child_process";
 import { promisify as promisify18 } from "node:util";
 async function runInit(options = {}) {
   const cwd = options.path ? resolve39(options.path) : process.cwd();
-  const fusionDir = join65(cwd, ".fusion");
-  const dbPath = join65(fusionDir, "fusion.db");
+  const fusionDir = join66(cwd, ".fusion");
+  const dbPath = join66(fusionDir, "fusion.db");
   const hasDbPath = existsSync48(dbPath);
   const hasValidDb = hasDbPath && isValidSqliteDatabaseFile(dbPath);
   if (existsSync48(fusionDir) && hasDbPath && hasValidDb) {
@@ -174145,7 +175085,7 @@ async function runInit(options = {}) {
   }
 }
 async function detectProjectName(dir2) {
-  if (!existsSync48(join65(dir2, ".git"))) {
+  if (!existsSync48(join66(dir2, ".git"))) {
     return basename20(dir2) || "my-project";
   }
   try {
@@ -174165,7 +175105,7 @@ async function detectProjectName(dir2) {
   return basename20(dir2) || "my-project";
 }
 async function addLocalStorageToGitignore(cwd) {
-  const gitignorePath = join65(cwd, ".gitignore");
+  const gitignorePath = join66(cwd, ".gitignore");
   let content = "";
   if (existsSync48(gitignorePath)) {
     try {
@@ -174208,7 +175148,7 @@ async function initializeGitRepo(cwd) {
   }
   await ensureGitConfig(cwd, "user.name", "Fusion");
   await ensureGitConfig(cwd, "user.email", "noreply@runfusion.ai");
-  const gitkeepPath = join65(cwd, ".gitkeep");
+  const gitkeepPath = join66(cwd, ".gitkeep");
   if (!existsSync48(gitkeepPath)) {
     writeFileSync3(gitkeepPath, "\n");
   }
@@ -174875,7 +175815,7 @@ __export(plugin_exports, {
   runPluginUninstall: () => runPluginUninstall
 });
 import { existsSync as existsSync50 } from "node:fs";
-import { join as join66 } from "node:path";
+import { join as join67 } from "node:path";
 import { readFile as readFile25 } from "node:fs/promises";
 import * as readline from "node:readline";
 async function getProjectPath6(projectName) {
@@ -174913,7 +175853,7 @@ async function createPluginLoader(pluginStore, projectName) {
   return { store: pluginStore, loader };
 }
 async function loadManifestFromPath(pluginPath) {
-  const manifestPath = join66(pluginPath, "manifest.json");
+  const manifestPath = join67(pluginPath, "manifest.json");
   if (!existsSync50(manifestPath)) {
     throw new Error(`Plugin manifest not found at: ${manifestPath}`);
   }
@@ -175105,7 +176045,7 @@ __export(plugin_scaffold_exports, {
   runPluginCreate: () => runPluginCreate
 });
 import { mkdirSync as mkdirSync11, writeFileSync as writeFileSync5, existsSync as existsSync51 } from "node:fs";
-import { join as join67 } from "node:path";
+import { join as join68 } from "node:path";
 function toTitleCase(str) {
   return str.split("-").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
 }
@@ -175238,7 +176178,7 @@ async function runPluginCreate(name, options) {
     process.exit(1);
   }
   const targetDir = options?.output ?? name;
-  const targetPath = join67(process.cwd(), targetDir);
+  const targetPath = join68(process.cwd(), targetDir);
   if (existsSync51(targetPath)) {
     console.error(`Error: Directory '${targetDir}' already exists.`);
     console.error("Please choose a different name or remove the existing directory.");
@@ -175246,16 +176186,16 @@ async function runPluginCreate(name, options) {
   }
   try {
     mkdirSync11(targetPath, { recursive: true });
-    mkdirSync11(join67(targetPath, "src", "__tests__"), { recursive: true });
-    writeFileSync5(join67(targetPath, "package.json"), generatePackageJson(name));
-    writeFileSync5(join67(targetPath, "tsconfig.json"), generateTsconfig());
-    writeFileSync5(join67(targetPath, "vitest.config.ts"), generateVitestConfig());
-    writeFileSync5(join67(targetPath, "src", "index.ts"), generateIndexTs(name));
+    mkdirSync11(join68(targetPath, "src", "__tests__"), { recursive: true });
+    writeFileSync5(join68(targetPath, "package.json"), generatePackageJson(name));
+    writeFileSync5(join68(targetPath, "tsconfig.json"), generateTsconfig());
+    writeFileSync5(join68(targetPath, "vitest.config.ts"), generateVitestConfig());
+    writeFileSync5(join68(targetPath, "src", "index.ts"), generateIndexTs(name));
     writeFileSync5(
-      join67(targetPath, "src", "__tests__", "index.test.ts"),
+      join68(targetPath, "src", "__tests__", "index.test.ts"),
       generateTestTs(name)
     );
-    writeFileSync5(join67(targetPath, "README.md"), generateReadme(name));
+    writeFileSync5(join68(targetPath, "README.md"), generateReadme(name));
   } catch (err) {
     console.error(
       `Error creating plugin files: ${err instanceof Error ? err.message : String(err)}`
@@ -175407,7 +176347,7 @@ __export(research_exports, {
   runResearchShow: () => runResearchShow
 });
 import { writeFile as writeFile19 } from "node:fs/promises";
-import { join as join68, resolve as resolve42 } from "node:path";
+import { join as join69, resolve as resolve42 } from "node:path";
 async function getStore3(projectName) {
   const project = projectName ? await resolveProject(projectName) : void 0;
   const store = new TaskStore(project?.projectPath ?? process.cwd());
@@ -175563,7 +176503,7 @@ async function runResearchExport(options) {
     }
     const content = format === "json" ? JSON.stringify(run, null, 2) : renderMarkdown(run);
     const ext = format === "json" ? "json" : "md";
-    const outputPath = options.output ? resolve42(options.output) : join68(process.cwd(), `research-${run.id.toLowerCase()}.${ext}`);
+    const outputPath = options.output ? resolve42(options.output) : join69(process.cwd(), `research-${run.id.toLowerCase()}.${ext}`);
     await writeFile19(outputPath, content, "utf8");
     store.getResearchStore().createExport(run.id, format, content);
     if (options.json) {
@@ -175628,7 +176568,7 @@ __export(native_patch_exports, {
   isTerminalAvailable: () => isTerminalAvailable,
   setupNativeResolution: () => setupNativeResolution
 });
-import { join as join69, basename as basename21, dirname as dirname32 } from "node:path";
+import { join as join70, basename as basename21, dirname as dirname32 } from "node:path";
 import { existsSync as existsSync52, copyFileSync, mkdirSync as mkdirSync12, symlinkSync as symlinkSync2, rmSync as rmSync5, lstatSync as lstatSync3, readlinkSync as readlinkSync2 } from "node:fs";
 import { tmpdir as tmpdir5 } from "node:os";
 function findStagedNativeDir2() {
@@ -175636,13 +176576,13 @@ function findStagedNativeDir2() {
   const arch = process.arch === "arm64" ? "arm64" : process.arch === "x64" ? "x64" : "unknown";
   const prebuildName = `${platform4}-${arch}`;
   const execDir = dirname32(process.execPath);
-  const nextToBinary = join69(execDir, "runtime", prebuildName);
-  if (existsSync52(join69(nextToBinary, "pty.node"))) {
+  const nextToBinary = join70(execDir, "runtime", prebuildName);
+  if (existsSync52(join70(nextToBinary, "pty.node"))) {
     return nextToBinary;
   }
   if (process.env.FUSION_RUNTIME_DIR) {
-    const envPath = join69(process.env.FUSION_RUNTIME_DIR, prebuildName);
-    if (existsSync52(join69(envPath, "pty.node"))) {
+    const envPath = join70(process.env.FUSION_RUNTIME_DIR, prebuildName);
+    if (existsSync52(join70(envPath, "pty.node"))) {
       return envPath;
     }
   }
@@ -175675,17 +176615,17 @@ function setupNativeResolution() {
     process.env.NODE_PTY_SPAWN_HELPER_DIR = nativeDir;
   }
   process.env.FUSION_NATIVE_ASSETS_PATH = nativeDir;
-  const tmpRoot = join69(tmpdir5(), `fn-bunfs-${process.pid}`);
-  const fnDir = join69(tmpRoot, "fn");
-  const prebuildsDir = join69(fnDir, "prebuilds");
-  const platformDir = join69(prebuildsDir, basename21(nativeDir));
+  const tmpRoot = join70(tmpdir5(), `fn-bunfs-${process.pid}`);
+  const fnDir = join70(tmpRoot, "fn");
+  const prebuildsDir = join70(fnDir, "prebuilds");
+  const platformDir = join70(prebuildsDir, basename21(nativeDir));
   try {
     cleanupStaleBunfsLinks();
     mkdirSync12(platformDir, { recursive: true });
-    const ptyNodeDest = join69(platformDir, "pty.node");
-    copyFileSync(join69(nativeDir, "pty.node"), ptyNodeDest);
-    if (existsSync52(join69(nativeDir, "spawn-helper"))) {
-      copyFileSync(join69(nativeDir, "spawn-helper"), join69(platformDir, "spawn-helper"));
+    const ptyNodeDest = join70(platformDir, "pty.node");
+    copyFileSync(join70(nativeDir, "pty.node"), ptyNodeDest);
+    if (existsSync52(join70(nativeDir, "spawn-helper"))) {
+      copyFileSync(join70(nativeDir, "spawn-helper"), join70(platformDir, "spawn-helper"));
     }
     process.env.FUSION_FAKE_BUNFS_ROOT = tmpRoot;
     if (process.platform !== "win32") {
@@ -175762,7 +176702,7 @@ var init_native_patch = __esm({
 // src/bin.ts
 import { existsSync as existsSync53, mkdtempSync as mkdtempSync2, readFileSync as readFileSync24, symlinkSync as symlinkSync3, writeFileSync as writeFileSync6 } from "node:fs";
 import { createRequire as createRequire7 } from "node:module";
-import { join as join70, dirname as dirname33, resolve as resolve43 } from "node:path";
+import { join as join71, dirname as dirname33, resolve as resolve43 } from "node:path";
 import { tmpdir as tmpdir6 } from "node:os";
 import { performance as performance3 } from "node:perf_hooks";
 import { fileURLToPath as fileURLToPath12 } from "node:url";
@@ -175771,7 +176711,7 @@ function configurePiPackage() {
   if (process.env.PI_PACKAGE_DIR) {
     return;
   }
-  const tmp = mkdtempSync2(join70(tmpdir6(), "fn-pkg-"));
+  const tmp = mkdtempSync2(join71(tmpdir6(), "fn-pkg-"));
   let packageJson = {
     name: "pi",
     version: "0.1.0",
@@ -175783,9 +176723,9 @@ function configurePiPackage() {
     const piPackageDir = dirname33(piPackagePath);
     packageJson = JSON.parse(readFileSync24(piPackagePath, "utf-8"));
     for (const entry of ["dist", "docs", "examples", "README.md", "CHANGELOG.md"]) {
-      const source = join70(piPackageDir, entry);
+      const source = join71(piPackageDir, entry);
       if (existsSync53(source)) {
-        symlinkSync3(source, join70(tmp, entry));
+        symlinkSync3(source, join71(tmp, entry));
       }
     }
   } catch {
@@ -175794,7 +176734,7 @@ function configurePiPackage() {
     ...packageJson.piConfig ?? {},
     configDir: ".fusion"
   };
-  writeFileSync6(join70(tmp, "package.json"), JSON.stringify(packageJson, null, 2) + "\n");
+  writeFileSync6(join71(tmp, "package.json"), JSON.stringify(packageJson, null, 2) + "\n");
   process.env.PI_PACKAGE_DIR = tmp;
 }
 configurePiPackage();
@@ -175822,8 +176762,8 @@ function loadEnvFile(path5) {
 }
 function loadLocalEnv() {
   const cwd = process.cwd();
-  loadEnvFile(join70(cwd, ".env"));
-  loadEnvFile(join70(cwd, ".env.local"));
+  loadEnvFile(join71(cwd, ".env"));
+  loadEnvFile(join71(cwd, ".env.local"));
 }
 loadLocalEnv();
 async function loadCommandHandlers() {