oh-my-opencode 4.12.1 → 4.13.0

package/dist/index.js

@@ -12901,7 +12901,16 @@ function resolveContainedPath2(baseDir, pathSegments) {
   return resolvedPath;
 }
 function resolveBaseDir(config) {
-  return config.base_dir ?? path14.join(homedir23(), ".omo");
+  return expandHomeDirectory(config.base_dir ?? path14.join(homedir23(), ".omo"));
+}
+function expandHomeDirectory(directoryPath) {
+  if (directoryPath === "~") {
+    return homedir23();
+  }
+  if (directoryPath.startsWith("~/") || directoryPath.startsWith("~\\")) {
+    return path14.join(homedir23(), directoryPath.slice(2));
+  }
+  return directoryPath;
 }
 function getTeamSpecPath(baseDir, teamName, scope, projectRoot) {
   return path14.join(getTeamDirectory(baseDir, teamName, scope, projectRoot), "config.json");
@@ -20468,20 +20477,38 @@ function ignoreStaleTeamSessionSweepFailure(error) {
   if (error instanceof Error)
     return;
 }
+function getTeamBackgroundTasks(bgMgr, runtimeState) {
+  if (!runtimeState.leadSessionId)
+    return [];
+  const teamMessageMarkerPrefix = `team-create:${runtimeState.teamRunId}:`;
+  return bgMgr.getTasksByParentSession(runtimeState.leadSessionId).filter((task) => task.teamRunId === runtimeState.teamRunId || task.parentMessageId?.startsWith(teamMessageMarkerPrefix));
+}
 async function deleteTeam(teamRunId, config, tmuxMgr, bgMgr, options, deps = defaultDeleteTeamDeps) {
   const runtimeState = await loadRuntimeState(teamRunId, config);
   const nonLeadMembers = runtimeState.members.filter((member) => member.agentType !== "leader");
   if (options?.force !== true && nonLeadMembers.some((member) => !DELETABLE_MEMBER_STATUSES.has(member.status))) {
     throw new Error("members still active");
   }
-  if (bgMgr && runtimeState.leadSessionId) {
-    const teamMessageMarkerPrefix = `team-create:${teamRunId}:`;
-    const teamTasks = bgMgr.getTasksByParentSession(runtimeState.leadSessionId).filter((task) => task.teamRunId === teamRunId || task.parentMessageId?.startsWith(teamMessageMarkerPrefix));
+  const deletableTeamStatuses = options?.force === true ? FORCE_DELETABLE_TEAM_STATUSES : DELETABLE_TEAM_STATUSES;
+  if (!deletableTeamStatuses.has(runtimeState.status)) {
+    throw new Error(`team cannot be deleted from '${runtimeState.status}'`);
+  }
+  if (bgMgr) {
+    const teamTasks = getTeamBackgroundTasks(bgMgr, runtimeState);
+    if (options?.force !== true && teamTasks.some((task) => task.status !== undefined && ACTIVE_BACKGROUND_TASK_STATUSES3.has(task.status))) {
+      throw new Error("members still active");
+    }
+    if (options?.force !== true) {
+      return await deleteTeamResources(teamRunId, config, runtimeState, tmuxMgr, options, deps);
+    }
     await Promise.all(teamTasks.map((task) => bgMgr.cancelTask(task.id, {
       source: "team-mode-delete",
       reason: `delete team ${teamRunId}`
     })));
   }
+  return await deleteTeamResources(teamRunId, config, runtimeState, tmuxMgr, options, deps);
+}
+async function deleteTeamResources(teamRunId, config, runtimeState, tmuxMgr, options, deps = defaultDeleteTeamDeps) {
   if (options?.force === true) {
     await transitionRuntimeState(teamRunId, (currentRuntimeState) => ({
       ...currentRuntimeState,
@@ -20533,7 +20560,7 @@ async function deleteTeam(teamRunId, config, tmuxMgr, bgMgr, options, deps = def
   sweepStaleTeamSessions(new Set(activeTeams.map((team) => team.teamRunId))).catch(ignoreStaleTeamSessionSweepFailure);
   return { removedWorktrees, removedLayout };
 }
-var defaultDeleteTeamDeps, DELETABLE_TEAM_STATUSES, FORCE_DELETABLE_TEAM_STATUSES, FORCE_COMPLETABLE_MEMBER_STATUSES, FORCE_BYPASS_DELETING_STATUSES;
+var defaultDeleteTeamDeps, DELETABLE_TEAM_STATUSES, FORCE_DELETABLE_TEAM_STATUSES, FORCE_COMPLETABLE_MEMBER_STATUSES, FORCE_BYPASS_DELETING_STATUSES, ACTIVE_BACKGROUND_TASK_STATUSES3;
 var init_delete_team = __esm(() => {
   init_logger2();
   init_layout4();
@@ -20565,6 +20592,7 @@ var init_delete_team = __esm(() => {
     "idle"
   ]);
   FORCE_BYPASS_DELETING_STATUSES = new Set(["creating", "orphaned"]);
+  ACTIVE_BACKGROUND_TASK_STATUSES3 = new Set(["pending", "running"]);
 });
 
 // packages/omo-opencode/src/features/team-mode/deps.ts
@@ -22280,7 +22308,7 @@ function classifyRuntimeFallbackError(error) {
   if (errorName?.includes("providermodelnotfounderror") || errorName?.includes("modelnotfounderror") || errorName?.includes("unknownerror") && /model\s+not\s+found/i.test(message)) {
     return "model_not_found";
   }
-  if (errorName?.includes("quotaexceeded") || errorName?.includes("insufficientquota") || errorName?.includes("billingerror") || errorName?.includes("resourceexhausted") || /quota.?exceeded/i.test(message) || /exceeded.*quota/i.test(message) || /usage\s*quota/i.test(message) || /subscription.*quota/i.test(message) || /insufficient.?(?:quota|balance|funds?)/i.test(message) || /billing.?(?:hard.?)?limit/i.test(message) || /exhausted\s+your\s+capacity/i.test(message) || /resource.?exhausted/i.test(message) || /out\s+of\s+credits?/i.test(message) || /payment.?required/i.test(message) || /usage\s+limit/i.test(message) || /credit\s+balance.*too\s+low/i.test(message) || /limit\s+exhausted/i.test(message) || /\u4F7F\u7528\u4E0A\u9650/.test(message) || /\u8FBE\u5230.*\u9650\u5236/.test(message) || /\u989D\u5EA6.*\u4E0D\u8DB3/.test(message) || /\u4F59\u989D.*\u4E0D\u8DB3/.test(message) || /\u5DF2\u8017\u5C3D/.test(message) || isLocalizedQuotaExhaustionMessage(message)) {
+  if (errorName?.includes("quotaexceeded") || errorName?.includes("insufficientquota") || errorName?.includes("billingerror") || errorName?.includes("resourceexhausted") || /quota.?exceeded/i.test(message) || /exceeded.*quota/i.test(message) || /usage\s*quota/i.test(message) || /subscription.?(?:quota|limit)/i.test(message) || /insufficient.?(?:quota|balance|funds?)/i.test(message) || /billing.?(?:hard.?)?limit/i.test(message) || /exhausted\s+your\s+capacity/i.test(message) || /resource.?exhausted/i.test(message) || /out\s+of\s+credits?/i.test(message) || /payment.?required/i.test(message) || /usage\s+limit/i.test(message) || /credit\s+balance.*too\s+low/i.test(message) || /limit\s+exhausted/i.test(message) || /\u4F7F\u7528\u4E0A\u9650/.test(message) || /\u8FBE\u5230.*\u9650\u5236/.test(message) || /\u989D\u5EA6.*\u4E0D\u8DB3/.test(message) || /\u4F59\u989D.*\u4E0D\u8DB3/.test(message) || /\u5DF2\u8017\u5C3D/.test(message) || isLocalizedQuotaExhaustionMessage(message)) {
     return "quota_exceeded";
   }
   return;
@@ -22306,6 +22334,14 @@ function isRuntimeFallbackRetryableError(error, retryOnErrors, options = {}) {
   }
   return RUNTIME_FALLBACK_RETRYABLE_ERROR_PATTERNS.some((pattern) => pattern.test(message));
 }
+// packages/model-core/src/provider-exhaustion-fallback-policy.ts
+function classifyProviderExhaustionFallbackSignal(error) {
+  const runtimeFallbackErrorType = classifyRuntimeFallbackError(error);
+  return runtimeFallbackErrorType === "quota_exceeded" ? runtimeFallbackErrorType : undefined;
+}
+function isProviderExhaustionFallbackEligible(error) {
+  return classifyProviderExhaustionFallbackSignal(error) !== undefined;
+}
 // packages/model-core/src/runtime-fallback-model.ts
 function isRuntimeFallbackModelRecord(model) {
   if (typeof model !== "object" || model === null)
@@ -80782,7 +80818,7 @@ function getCachedVersion(options = {}) {
 // package.json
 var package_default = {
   name: "oh-my-opencode",
-  version: "4.12.1",
+  version: "4.13.0",
   description: "The Best AI Agent Harness - Batteries-Included OpenCode Plugin with Multi-Model Orchestration, Parallel Background Agents, and Crafted LSP/AST Tools",
   main: "./dist/index.js",
   types: "dist/index.d.ts",
@@ -80863,7 +80899,8 @@ var package_default = {
     "build:cli-node": "bun run script/build-cli-node.ts",
     "build:codex-install": "bun run script/build-codex-install.ts",
     "build:codex-plugin": "npm --prefix packages/omo-codex/plugin ci && bun run --cwd packages/omo-codex/plugin build",
-    "build:shared-skills-assets": "rm -rf dist/skills && cp -R packages/shared-skills/skills dist/skills",
+    "build:materialize-frontend": "node packages/omo-codex/plugin/scripts/materialize-shared-upstreams.mjs --strict",
+    "build:shared-skills-assets": "bun run build:materialize-frontend && rm -rf dist/skills && cp -R packages/shared-skills/skills dist/skills",
     "build:lsp-tools-mcp": "npm --prefix packages/lsp-tools-mcp ci && npm --prefix packages/lsp-tools-mcp run build",
     "build:lsp-daemon": "npm --prefix packages/lsp-daemon ci && npm --prefix packages/lsp-daemon run build",
     "build:node-require-shim": "bun run script/patch-node-require-shim.ts",
@@ -80872,6 +80909,7 @@ var package_default = {
     "build:schema": "bun run script/build-schema.ts",
     "build:model-capabilities": "bun run script/build-model-capabilities.ts",
     clean: "rm -rf dist",
+    prepack: "bun run build:materialize-frontend",
     prepare: "bun run build",
     postinstall: "node postinstall.mjs",
     prepublishOnly: "bun run clean && bun run build:lsp-tools-mcp && bun run build:lsp-daemon && bun run build",
@@ -80952,18 +80990,18 @@ var package_default = {
     typescript: "^6.0.3"
   },
   optionalDependencies: {
-    "oh-my-opencode-darwin-arm64": "4.12.1",
-    "oh-my-opencode-darwin-x64": "4.12.1",
-    "oh-my-opencode-darwin-x64-baseline": "4.12.1",
-    "oh-my-opencode-linux-arm64": "4.12.1",
-    "oh-my-opencode-linux-arm64-musl": "4.12.1",
-    "oh-my-opencode-linux-x64": "4.12.1",
-    "oh-my-opencode-linux-x64-baseline": "4.12.1",
-    "oh-my-opencode-linux-x64-musl": "4.12.1",
-    "oh-my-opencode-linux-x64-musl-baseline": "4.12.1",
-    "oh-my-opencode-windows-arm64": "4.12.1",
-    "oh-my-opencode-windows-x64": "4.12.1",
-    "oh-my-opencode-windows-x64-baseline": "4.12.1"
+    "oh-my-opencode-darwin-arm64": "4.13.0",
+    "oh-my-opencode-darwin-x64": "4.13.0",
+    "oh-my-opencode-darwin-x64-baseline": "4.13.0",
+    "oh-my-opencode-linux-arm64": "4.13.0",
+    "oh-my-opencode-linux-arm64-musl": "4.13.0",
+    "oh-my-opencode-linux-x64": "4.13.0",
+    "oh-my-opencode-linux-x64-baseline": "4.13.0",
+    "oh-my-opencode-linux-x64-musl": "4.13.0",
+    "oh-my-opencode-linux-x64-musl-baseline": "4.13.0",
+    "oh-my-opencode-windows-arm64": "4.13.0",
+    "oh-my-opencode-windows-x64": "4.13.0",
+    "oh-my-opencode-windows-x64-baseline": "4.13.0"
   },
   overrides: {
     hono: "^4.12.18",
@@ -82152,6 +82190,14 @@ async function resolveOrProvisionCommand(deps, config) {
 }
 async function runBootstrap(projectRoot, config, deps) {
   try {
+    const autoInit = config.auto_init !== false;
+    const codegraphPath = join75(projectRoot, ".codegraph");
+    if (!autoInit && !existsSync65(codegraphPath)) {
+      deps.log("[codegraph-bootstrap] CodeGraph auto_init disabled and .codegraph not present; skipping bootstrap", {
+        projectRoot
+      });
+      return;
+    }
     const command = await resolveOrProvisionCommand(deps, config);
     if (command === null) {
       deps.log("[codegraph-bootstrap] CodeGraph unavailable; skipping bootstrap", { projectRoot });
@@ -90449,7 +90495,7 @@ function findSlashCommandPartIndex(parts) {
   return -1;
 }
 // packages/omo-opencode/src/hooks/auto-slash-command/executor.ts
-import { dirname as dirname28 } from "path";
+import { dirname as dirname29 } from "path";
 
 // packages/omo-opencode/src/shared/command-executor/resolve-commands-in-text.ts
 init_resolve_commands_in_text();
@@ -91241,6 +91287,14 @@ async function discoverGlobalAgentsSkills(homeDirectory = homedir26()) {
   return loadSkillsFromDir({ skillsDir: agentsGlobalDir, scope: "user" });
 }
 // packages/skills-loader-core/src/features/opencode-skill-loader/merger/builtin-skill-converter.ts
+import { existsSync as existsSync72 } from "fs";
+import { join as join89 } from "path";
+function resolveBuiltinSkillPath(builtin) {
+  if (builtin.resolvedPath !== undefined)
+    return builtin.resolvedPath;
+  const sharedSkillPath = join89(sharedSkillsRootPath(), builtin.name);
+  return existsSync72(sharedSkillPath) ? sharedSkillPath : undefined;
+}
 function builtinToLoadedSkill(builtin) {
   const definition = {
     name: builtin.name,
@@ -91259,13 +91313,14 @@ function builtinToLoadedSkill(builtin) {
     compatibility: builtin.compatibility,
     metadata: builtin.metadata,
     allowedTools: builtin.allowedTools,
-    mcpConfig: builtin.mcpConfig
+    mcpConfig: builtin.mcpConfig,
+    resolvedPath: resolveBuiltinSkillPath(builtin)
   };
 }
 
 // packages/skills-loader-core/src/features/opencode-skill-loader/merger/config-skill-entry-loader.ts
 init_src();
-import { existsSync as existsSync72, readFileSync as readFileSync46 } from "fs";
+import { existsSync as existsSync73, readFileSync as readFileSync46 } from "fs";
 import { dirname as dirname26, isAbsolute as isAbsolute13, resolve as resolve22 } from "path";
 import { homedir as homedir27 } from "os";
 function resolveFilePath5(from, configDir) {
@@ -91284,7 +91339,7 @@ function resolveFilePath5(from, configDir) {
 }
 function loadSkillFromFile(filePath) {
   try {
-    if (!existsSync72(filePath))
+    if (!existsSync73(filePath))
       return null;
     const content = readFileSync46(filePath, "utf-8");
     const { data, body } = parseFrontmatter(content);
@@ -92153,7 +92208,7 @@ playwright-cli close
 };
 // packages/skills-loader-core/src/features/builtin-skills/skill-file-loader.ts
 import { readFileSync as readFileSync47 } from "fs";
-import { join as join89 } from "path";
+import { join as join90 } from "path";
 init_src();
 function createSharedSkillTemplateLoader(readFile9 = readFileSync47, skillsRootPath = sharedSkillsRootPath()) {
   const cache2 = new Map;
@@ -92162,7 +92217,7 @@ function createSharedSkillTemplateLoader(readFile9 = readFileSync47, skillsRootP
     if (cached !== undefined)
       return cached;
     try {
-      const { body } = parseFrontmatter(readFile9(join89(skillsRootPath, skillName, "SKILL.md"), "utf8"));
+      const { body } = parseFrontmatter(readFile9(join90(skillsRootPath, skillName, "SKILL.md"), "utf8"));
       cache2.set(skillName, body);
       return body;
     } catch (error) {
@@ -93299,6 +93354,9 @@ var gitMasterSkill = {
   template: GIT_MASTER_TEMPLATE
 };
 // packages/skills-loader-core/src/features/builtin-skills/skills/dev-browser.ts
+import { dirname as dirname27, join as join91 } from "path";
+import { fileURLToPath as fileURLToPath6 } from "url";
+var CURRENT_DIR = dirname27(fileURLToPath6(import.meta.url));
 var devBrowserSkill = {
   name: "dev-browser",
   description: "Browser automation with persistent page state. Use when users ask to navigate websites, fill forms, take screenshots, extract web data, test web apps, or automate browser workflows. Trigger phrases include 'go to [url]', 'click on', 'fill out the form', 'take a screenshot', 'scrape', 'automate', 'test the website', 'log into', or any browser interaction request.",
@@ -93515,7 +93573,8 @@ console.log({
 
 await client.disconnect();
 EOF
-\`\`\``
+\`\`\``,
+  resolvedPath: join91(CURRENT_DIR, "..", "dev-browser")
 };
 // packages/skills-loader-core/src/features/builtin-skills/skills/review-work.ts
 var reviewWorkSkill = {
@@ -94516,7 +94575,7 @@ init_src();
 var import_picomatch2 = __toESM(require_picomatch2(), 1);
 import * as fs20 from "fs/promises";
 import { homedir as homedir28 } from "os";
-import { dirname as dirname27, extname as extname2, isAbsolute as isAbsolute14, join as join90, relative as relative12 } from "path";
+import { dirname as dirname28, extname as extname2, isAbsolute as isAbsolute14, join as join92, relative as relative12 } from "path";
 var MAX_RECURSIVE_DEPTH = 10;
 function isHttpUrl(path17) {
   return path17.startsWith("http://") || path17.startsWith("https://");
@@ -94526,12 +94585,12 @@ function toAbsolutePath(path17, configDir) {
     return homedir28();
   }
   if (path17.startsWith("~/")) {
-    return join90(homedir28(), path17.slice(2));
+    return join92(homedir28(), path17.slice(2));
   }
   if (isAbsolute14(path17)) {
     return path17;
   }
-  return join90(configDir, path17);
+  return join92(configDir, path17);
 }
 function isMarkdownPath(path17) {
   return extname2(path17).toLowerCase() === ".md";
@@ -94571,13 +94630,13 @@ async function loadSourcePath(options) {
       return [];
     const loaded = await loadSkillFromPath({
       skillPath: realSourcePath,
-      resolvedPath: dirname27(realSourcePath),
+      resolvedPath: dirname28(realSourcePath),
       defaultName: inferSkillNameFromFileName(realSourcePath),
       scope: "config"
     });
     if (!loaded)
       return [];
-    return filterByGlob([loaded], dirname27(realSourcePath), options.globPattern);
+    return filterByGlob([loaded], dirname28(realSourcePath), options.globPattern);
   }
   if (!stat5.isDirectory())
     return [];
@@ -94658,8 +94717,8 @@ function readOpencodeConfigSkills(directory) {
   return { paths, urls };
 }
 // packages/omo-opencode/src/tools/slashcommand/command-discovery.ts
-import { existsSync as existsSync74, readdirSync as readdirSync19, readFileSync as readFileSync50, statSync as statSync10 } from "fs";
-import { basename as basename15, join as join92 } from "path";
+import { existsSync as existsSync75, readdirSync as readdirSync19, readFileSync as readFileSync50, statSync as statSync10 } from "fs";
+import { basename as basename15, join as join94 } from "path";
 
 // packages/omo-opencode/src/tools/slashcommand/command-discovery-deps.ts
 init_frontmatter2();
@@ -96219,7 +96278,7 @@ function loadBuiltinCommands(disabledCommands, options) {
 // packages/omo-opencode/src/tools/slashcommand/command-discovery.ts
 var NESTED_COMMAND_SEPARATOR = "/";
 function discoverCommandsFromDir(commandsDir, scope, prefix = "") {
-  if (!existsSync74(commandsDir))
+  if (!existsSync75(commandsDir))
     return [];
   if (!statSync10(commandsDir).isDirectory()) {
     log2(`[command-discovery] Skipping non-directory path: ${commandsDir}`);
@@ -96234,12 +96293,12 @@ function discoverCommandsFromDir(commandsDir, scope, prefix = "") {
       if (entry.name.startsWith("."))
         continue;
       const nestedPrefix = prefix ? `${prefix}${NESTED_COMMAND_SEPARATOR}${entry.name}` : entry.name;
-      commands.push(...discoverCommandsFromDir(join92(commandsDir, entry.name), scope, nestedPrefix));
+      commands.push(...discoverCommandsFromDir(join94(commandsDir, entry.name), scope, nestedPrefix));
       continue;
     }
     if (!isMarkdownFile(entry))
       continue;
-    const commandPath = join92(commandsDir, entry.name);
+    const commandPath = join94(commandsDir, entry.name);
     const baseCommandName = basename15(entry.name, ".md");
     const commandName = prefix ? `${prefix}${NESTED_COMMAND_SEPARATOR}${baseCommandName}` : baseCommandName;
     try {
@@ -96298,8 +96357,8 @@ function deduplicateCommandInfosByName(commands) {
   return deduplicatedCommands;
 }
 function discoverCommandsSync(directory, options) {
-  const userCommandsDir = join92(getClaudeConfigDir(), "commands");
-  const projectCommandsDir = join92(directory ?? process.cwd(), ".claude", "commands");
+  const userCommandsDir = join94(getClaudeConfigDir(), "commands");
+  const projectCommandsDir = join94(directory ?? process.cwd(), ".claude", "commands");
   const opencodeGlobalDirs = getOpenCodeCommandDirs({ binary: "opencode" });
   const opencodeProjectDirs = findProjectOpencodeCommandDirs(directory ?? process.cwd());
   const userCommands = discoverCommandsFromDir(userCommandsDir, "user");
@@ -96403,7 +96462,7 @@ async function formatCommandTemplate(cmd, args) {
   if (!content && cmd.lazyContentLoader) {
     content = await cmd.lazyContentLoader.load();
   }
-  const commandDir = cmd.path ? dirname28(cmd.path) : process.cwd();
+  const commandDir = cmd.path ? dirname29(cmd.path) : process.cwd();
   const withFileRefs = await resolveFileReferencesInText(content, commandDir);
   const resolvedContent = await resolveCommandsInText(withFileRefs);
   const resolvedArguments = args;
@@ -96787,7 +96846,7 @@ var NOTEPAD_DIR = "notepads";
 var NOTEPAD_BASE_PATH = `${BOULDER_DIR}/${NOTEPAD_DIR}`;
 var PROMETHEUS_PLANS_DIR = ".omo/plans";
 // packages/boulder-state/src/top-level-task.ts
-import { existsSync as existsSync75, readFileSync as readFileSync51 } from "fs";
+import { existsSync as existsSync76, readFileSync as readFileSync51 } from "fs";
 var TODO_HEADING_PATTERN = /^##\s+TODOs\b/i;
 var FINAL_VERIFICATION_HEADING_PATTERN = /^##\s+Final Verification Wave\b/i;
 var SECOND_LEVEL_HEADING_PATTERN = /^##\s+/;
@@ -96810,7 +96869,7 @@ function buildTaskRef(section, taskLabel) {
   };
 }
 function readCurrentTopLevelTask(planPath) {
-  if (!existsSync75(planPath)) {
+  if (!existsSync76(planPath)) {
     return null;
   }
   try {
@@ -96839,10 +96898,10 @@ function readCurrentTopLevelTask(planPath) {
   }
 }
 // packages/boulder-state/src/storage/path.ts
-import { existsSync as existsSync76 } from "fs";
-import { isAbsolute as isAbsolute15, join as join93, relative as relative13, resolve as resolve23 } from "path";
+import { existsSync as existsSync77 } from "fs";
+import { isAbsolute as isAbsolute15, join as join95, relative as relative13, resolve as resolve23 } from "path";
 function getBoulderFilePath(directory) {
-  return join93(directory, BOULDER_DIR, BOULDER_FILE);
+  return join95(directory, BOULDER_DIR, BOULDER_FILE);
 }
 function resolveTrackedPath(baseDirectory, trackedPath) {
   return isAbsolute15(trackedPath) ? resolve23(trackedPath) : resolve23(baseDirectory, trackedPath);
@@ -96860,14 +96919,14 @@ function resolveBoulderPlanPath(directory, state3) {
   }
   const absoluteWorktreePath = resolveTrackedPath(directory, worktreePath);
   const worktreePlanPath = resolve23(absoluteWorktreePath, relativePlanPath);
-  return existsSync76(worktreePlanPath) ? worktreePlanPath : absolutePlanPath;
+  return existsSync77(worktreePlanPath) ? worktreePlanPath : absolutePlanPath;
 }
 function resolveBoulderPlanPathForWork(directory, work) {
   return resolveBoulderPlanPath(directory, work);
 }
 // packages/boulder-state/src/storage/plan-progress.ts
-import { existsSync as existsSync77, readFileSync as readFileSync52, readdirSync as readdirSync20, statSync as statSync11 } from "fs";
-import { basename as basename16, join as join94 } from "path";
+import { existsSync as existsSync78, readFileSync as readFileSync52, readdirSync as readdirSync20, statSync as statSync11 } from "fs";
+import { basename as basename16, join as join96 } from "path";
 var TODO_HEADING_PATTERN2 = /^##\s+TODOs\b/i;
 var FINAL_VERIFICATION_HEADING_PATTERN2 = /^##\s+Final Verification Wave\b/i;
 var SECOND_LEVEL_HEADING_PATTERN2 = /^##\s+/;
@@ -96880,11 +96939,11 @@ var PROMETHEUS_PLAN_DIRS = [PROMETHEUS_PLANS_DIR, LEGACY_PROMETHEUS_PLANS_DIR];
 function findPrometheusPlans(directory) {
   try {
     return PROMETHEUS_PLAN_DIRS.flatMap((planDir) => {
-      const plansDir = join94(directory, planDir);
-      if (!existsSync77(plansDir)) {
+      const plansDir = join96(directory, planDir);
+      if (!existsSync78(plansDir)) {
         return [];
       }
-      return readdirSync20(plansDir).filter((file2) => file2.endsWith(".md")).map((file2) => join94(plansDir, file2));
+      return readdirSync20(plansDir).filter((file2) => file2.endsWith(".md")).map((file2) => join96(plansDir, file2));
     }).sort((left, right) => statSync11(right).mtimeMs - statSync11(left).mtimeMs);
   } catch {
     return [];
@@ -96894,7 +96953,7 @@ function getPlanName(planPath) {
   return basename16(planPath, ".md");
 }
 function getPlanProgress(planPath) {
-  if (!existsSync77(planPath)) {
+  if (!existsSync78(planPath)) {
     return { total: 0, completed: 0, isComplete: false };
   }
   try {
@@ -97028,10 +97087,10 @@ function selectMirrorWork(state3) {
   return sorted[0] ?? null;
 }
 // packages/boulder-state/src/storage/read-state.ts
-import { existsSync as existsSync78, readFileSync as readFileSync53 } from "fs";
+import { existsSync as existsSync79, readFileSync as readFileSync53 } from "fs";
 function readBoulderState(directory) {
   const filePath = getBoulderFilePath(directory);
-  if (!existsSync78(filePath)) {
+  if (!existsSync79(filePath)) {
     return null;
   }
   try {
@@ -97184,15 +97243,15 @@ function getTaskSessionState(directory, taskKey) {
   return state3.task_sessions[taskKey] ?? null;
 }
 // packages/boulder-state/src/storage/write-state.ts
-import { existsSync as existsSync79, mkdirSync as mkdirSync18, unlinkSync as unlinkSync13, writeFileSync as writeFileSync17 } from "fs";
-import { dirname as dirname29, join as join95 } from "path";
+import { existsSync as existsSync80, mkdirSync as mkdirSync18, unlinkSync as unlinkSync13, writeFileSync as writeFileSync17 } from "fs";
+import { dirname as dirname30, join as join97 } from "path";
 function writeBoulderState(directory, state3) {
   const filePath = getBoulderFilePath(directory);
   try {
-    const dir = dirname29(filePath);
-    if (!existsSync79(dir)) {
+    const dir = dirname30(filePath);
+    if (!existsSync80(dir)) {
       mkdirSync18(dir, { recursive: true });
-      writeFileSync17(join95(dir, ".gitignore"), ["*", "!/rules/", "!/rules/**", ""].join(`
+      writeFileSync17(join97(dir, ".gitignore"), ["*", "!/rules/", "!/rules/**", ""].join(`
 `), "utf-8");
     }
     const stateToWrite = { ...state3 };
@@ -97228,7 +97287,7 @@ function writeBoulderState(directory, state3) {
 function clearBoulderState(directory) {
   const filePath = getBoulderFilePath(directory);
   try {
-    if (existsSync79(filePath)) {
+    if (existsSync80(filePath)) {
       unlinkSync13(filePath);
     }
     return true;
@@ -97724,11 +97783,11 @@ init_logger2();
 
 // packages/omo-opencode/src/hooks/start-work/worktree-detector.ts
 import { execFileSync as execFileSync5 } from "child_process";
-import { existsSync as existsSync80, realpathSync as realpathSync13 } from "fs";
+import { existsSync as existsSync81, realpathSync as realpathSync13 } from "fs";
 import { resolve as resolve25, win32 as win328 } from "path";
 function normalizePath5(path18) {
   const resolvedPath = process.platform !== "win32" && win328.isAbsolute(path18) ? path18 : resolve25(path18);
-  if (!existsSync80(resolvedPath)) {
+  if (!existsSync81(resolvedPath)) {
     return resolvedPath;
   }
   try {
@@ -99024,7 +99083,7 @@ async function isSessionInBoulderLineage(input) {
 
 // packages/omo-opencode/src/hooks/atlas/session-last-agent.ts
 import { readFileSync as readFileSync54, readdirSync as readdirSync21 } from "fs";
-import { join as join96 } from "path";
+import { join as join98 } from "path";
 var defaultSessionLastAgentDeps = {
   getMessageDir,
   isSqliteBackend,
@@ -99084,7 +99143,7 @@ async function getLastAgentFromSession(sessionID, client3, deps = {}) {
   try {
     const messages = readdirSync21(messageDir).filter((fileName) => fileName.endsWith(".json")).map((fileName) => {
       try {
-        const content = readFileSync54(join96(messageDir, fileName), "utf-8");
+        const content = readFileSync54(join98(messageDir, fileName), "utf-8");
         const parsed = JSON.parse(content);
         return {
           fileName,
@@ -99627,7 +99686,7 @@ function isOmoPath(filePath) {
 }
 
 // packages/omo-opencode/src/hooks/atlas/tool-execute-after-plan-tasks.ts
-import { existsSync as existsSync81, readFileSync as readFileSync55 } from "fs";
+import { existsSync as existsSync82, readFileSync as readFileSync55 } from "fs";
 var TODO_HEADING_PATTERN3 = /^##\s+TODOs\b/i;
 var FINAL_VERIFICATION_HEADING_PATTERN3 = /^##\s+Final Verification Wave\b/i;
 var SECOND_LEVEL_HEADING_PATTERN3 = /^##\s+/;
@@ -99635,7 +99694,7 @@ var CHECKED_CHECKBOX_PATTERN2 = /^(\s*)[-*]\s*\[[xX]\]\s*(.+)$/;
 var TODO_TASK_PATTERN3 = /^(\d+)\.\s+(.+)$/;
 var FINAL_WAVE_TASK_PATTERN3 = /^(F\d+)\.\s+(.+)$/i;
 function isTrackedTaskChecked(planPath, taskKey) {
-  if (!existsSync81(planPath)) {
+  if (!existsSync82(planPath)) {
     return false;
   }
   const [section, label] = taskKey.split(":");
@@ -99689,7 +99748,7 @@ function parseCheckedTopLevelTaskKeys(planContent) {
   return checkedKeys;
 }
 function readCheckedTaskKeysFromPlan(planPath) {
-  if (!existsSync81(planPath)) {
+  if (!existsSync82(planPath)) {
     return new Set;
   }
   try {
@@ -99868,7 +99927,7 @@ async function resolveFallbackTrackedSessionId(input) {
 }
 
 // packages/omo-opencode/src/hooks/atlas/final-wave-plan-state.ts
-import { existsSync as existsSync82, readFileSync as readFileSync56 } from "fs";
+import { existsSync as existsSync83, readFileSync as readFileSync56 } from "fs";
 var TODO_HEADING_PATTERN4 = /^##\s+TODOs\b/i;
 var FINAL_VERIFICATION_HEADING_PATTERN4 = /^##\s+Final Verification Wave\b/i;
 var SECOND_LEVEL_HEADING_PATTERN4 = /^##\s+/;
@@ -99876,7 +99935,7 @@ var UNCHECKED_CHECKBOX_PATTERN3 = /^\s*[-*]\s*\[\s*\]\s*(.+)$/;
 var TODO_TASK_PATTERN4 = /^\d+\./;
 var FINAL_WAVE_TASK_PATTERN4 = /^F\d+\./i;
 function readFinalWavePlanState(planPath) {
-  if (!existsSync82(planPath)) {
+  if (!existsSync83(planPath)) {
     return null;
   }
   try {
@@ -100323,7 +100382,7 @@ function createToolExecuteAfterHandler2(input) {
 
 // packages/omo-opencode/src/hooks/atlas/tool-execute-before.ts
 init_logger2();
-import { existsSync as existsSync83, readFileSync as readFileSync57 } from "fs";
+import { existsSync as existsSync84, readFileSync as readFileSync57 } from "fs";
 import { resolve as resolve27 } from "path";
 var TASK_SECTION_HEADER_PATTERN = /^##\s*1\.\s*TASK\s*$/i;
 var TODO_TASK_LINE_PATTERN = /^(?:[-*]\s*\[\s*\]\s*)?(\d+)\.\s+(.+)$/;
@@ -100384,7 +100443,7 @@ function createToolExecuteBeforeHandler2(input) {
       const planPath = sessionWork ? resolveBoulderPlanPathForWork(ctx.directory, sessionWork) : state3 ? resolveBoulderPlanPath(ctx.directory, state3) : null;
       if (planPath && resolve27(filePath) === resolve27(planPath) && pendingPlanSnapshots) {
         try {
-          if (existsSync83(planPath)) {
+          if (existsSync84(planPath)) {
             pendingPlanSnapshots.set(toolInput.callID, readFileSync57(planPath, "utf-8"));
           }
         } catch (error) {
@@ -102457,7 +102516,8 @@ var DEFAULT_CONFIG2 = {
   max_fallback_attempts: 3,
   cooldown_seconds: 60,
   timeout_seconds: 30,
-  notify_on_fallback: true
+  notify_on_fallback: true,
+  restore_primary_after_cooldown: false
 };
 var RETRYABLE_ERROR_PATTERNS = [
   /rate.?limit/i,
@@ -102494,7 +102554,7 @@ init_logger2();
 function createAbortSessionRequest(deps) {
   const { ctx } = deps;
   return async (sessionID, source) => {
-    if (source === "session.status.retry-signal" || source === "message.updated.retry-signal" || source === "session.timeout") {
+    if (source === "session.status.retry-signal" || source === "message.updated.retry-signal" || source === "message.updated.quota-fallback" || source === "session.timeout") {
       deps.internallyAbortedSessions.add(sessionID);
       deps.sessionLastAccess.set(sessionID, Date.now());
     }
@@ -102753,7 +102813,7 @@ function createAutoRetryDispatcher(deps, scheduleSessionFallbackTimeout, clearSe
   return async (sessionID, newModel, resolvedAgent, source) => {
     if (sessionRetryInFlight.has(sessionID)) {
       log2(`[${HOOK_NAME11}] Retry already in flight, skipping (${source})`, { sessionID });
-      return;
+      return { accepted: false, status: "blocked", reason: "retry already in flight" };
     }
     const agentSettings = resolvedAgent ? pluginConfig?.agents?.[resolvedAgent] : undefined;
     const retryModelPayload = buildRetryModelPayload(newModel, agentSettings ? {
@@ -102769,7 +102829,7 @@ function createAutoRetryDispatcher(deps, scheduleSessionFallbackTimeout, clearSe
       if (state3) {
         state3.pendingFallbackPromptMayHaveBeenAccepted = false;
       }
-      return;
+      return { accepted: false, status: "invalid-model", reason: "missing provider prefix" };
     }
     const hadAwaitingFallbackResult = sessionAwaitingFallbackResult.has(sessionID);
     const previousPendingFallbackModel = sessionStates.get(sessionID)?.pendingFallbackModel;
@@ -102777,6 +102837,7 @@ function createAutoRetryDispatcher(deps, scheduleSessionFallbackTimeout, clearSe
     sessionRetryInFlight.add(sessionID);
     let retryDispatched = false;
     let retryMayHaveBeenAccepted = false;
+    let acceptedStatus = "dispatched";
     try {
       const messagesResp = await ctx.client.session.messages({
         path: { id: sessionID },
@@ -102831,6 +102892,7 @@ function createAutoRetryDispatcher(deps, scheduleSessionFallbackTimeout, clearSe
           sessionID
         });
         promptResult = await dispatchRetryPrompt(`runtime-fallback:${source}:active-queue`);
+        acceptedStatus = "queued";
       }
       if (promptResult.status === "failed") {
         if (isAmbiguousPostDispatchPromptFailure(promptResult)) {
@@ -102839,6 +102901,7 @@ function createAutoRetryDispatcher(deps, scheduleSessionFallbackTimeout, clearSe
             sessionID,
             error: String(promptResult.error)
           });
+          return { accepted: true, status: "possibly-accepted" };
         }
         throw promptResult.error;
       }
@@ -102865,6 +102928,7 @@ function createAutoRetryDispatcher(deps, scheduleSessionFallbackTimeout, clearSe
               sessionID,
               error: String(reservedResult.error)
             });
+            return { accepted: true, status: "possibly-accepted" };
           }
           throw reservedResult.error;
         }
@@ -102873,14 +102937,15 @@ function createAutoRetryDispatcher(deps, scheduleSessionFallbackTimeout, clearSe
             sessionID,
             status: reservedResult.status
           });
-          return;
+          return { accepted: false, status: "blocked", reason: `prompt gate returned ${reservedResult.status}` };
         }
+        acceptedStatus = "queued";
       } else if (!isInternalPromptDispatchAccepted(promptResult)) {
         log2(`[${HOOK_NAME11}] Auto-retry skipped by promptAsync gate (${source})`, {
           sessionID,
           status: promptResult.status
         });
-        return;
+        return { accepted: false, status: "blocked", reason: `prompt gate returned ${promptResult.status}` };
       }
       sessionAwaitingFallbackResult.add(sessionID);
       if (hadAwaitingFallbackResult) {
@@ -102891,12 +102956,14 @@ function createAutoRetryDispatcher(deps, scheduleSessionFallbackTimeout, clearSe
         state3.pendingFallbackPromptMayHaveBeenAccepted = false;
       }
       retryDispatched = true;
+      return { accepted: true, status: acceptedStatus };
     } catch (retryError) {
       if (!(retryError instanceof Error)) {
         log2(`[${HOOK_NAME11}] Auto-retry failed (${source})`, { sessionID, error: String(retryError) });
-        return;
+        return { accepted: false, status: "failed", reason: String(retryError) };
       }
       log2(`[${HOOK_NAME11}] Auto-retry failed (${source})`, { sessionID, error: String(retryError) });
+      return { accepted: false, status: "failed", reason: retryError.message };
     } finally {
       sessionRetryInFlight.delete(sessionID);
       if (retryMayHaveBeenAccepted) {
@@ -103048,6 +103115,28 @@ function prepareFallback(sessionID, state3, fallbackModels, config) {
   return { success: true, newModel: nextModel };
 }
 
+// packages/omo-opencode/src/hooks/runtime-fallback/fallback-state-snapshot.ts
+function snapshotFallbackState(state3) {
+  return {
+    originalModel: state3.originalModel,
+    currentModel: state3.currentModel,
+    fallbackIndex: state3.fallbackIndex,
+    failedModels: new Map(state3.failedModels),
+    attemptCount: state3.attemptCount,
+    pendingFallbackModel: state3.pendingFallbackModel,
+    pendingFallbackPromptMayHaveBeenAccepted: state3.pendingFallbackPromptMayHaveBeenAccepted
+  };
+}
+function restoreFallbackState(state3, snapshot) {
+  state3.originalModel = snapshot.originalModel;
+  state3.currentModel = snapshot.currentModel;
+  state3.fallbackIndex = snapshot.fallbackIndex;
+  state3.failedModels = new Map(snapshot.failedModels);
+  state3.attemptCount = snapshot.attemptCount;
+  state3.pendingFallbackModel = snapshot.pendingFallbackModel;
+  state3.pendingFallbackPromptMayHaveBeenAccepted = snapshot.pendingFallbackPromptMayHaveBeenAccepted;
+}
+
 // packages/omo-opencode/src/hooks/runtime-fallback/auto-retry-timeout.ts
 function createFallbackTimeoutHelpers(deps, abortSessionRequest, autoRetryWithFallback) {
   const {
@@ -103089,6 +103178,7 @@ function createFallbackTimeoutHelpers(deps, abortSessionRequest, autoRetryWithFa
         state3.pendingFallbackModel = undefined;
       }
       state3.pendingFallbackPromptMayHaveBeenAccepted = false;
+      const stateSnapshot = snapshotFallbackState(state3);
       const fallbackModels = getFallbackModelsForSession(sessionID, resolvedAgent, pluginConfig);
       if (fallbackModels.length === 0)
         return;
@@ -103099,7 +103189,18 @@ function createFallbackTimeoutHelpers(deps, abortSessionRequest, autoRetryWithFa
       });
       const result = prepareFallback(sessionID, state3, fallbackModels, config);
       if (result.success && result.newModel) {
-        await autoRetryWithFallback(sessionID, result.newModel, resolvedAgent, "session.timeout");
+        const dispatchOutcome = await autoRetryWithFallback(sessionID, result.newModel, resolvedAgent, "session.timeout");
+        if (!dispatchOutcome.accepted) {
+          restoreFallbackState(state3, stateSnapshot);
+          if (deps.sessionAwaitingFallbackResult.has(sessionID)) {
+            scheduleSessionFallbackTimeout(sessionID, resolvedAgent);
+          }
+          log2(`[${HOOK_NAME11}] Session timeout fallback dispatch was not accepted`, {
+            sessionID,
+            status: dispatchOutcome.status,
+            reason: dispatchOutcome.reason
+          });
+        }
       }
     }, timeoutMs);
     sessionFallbackTimeouts.set(sessionID, timer);
@@ -103189,7 +103290,7 @@ function createChatMessageHandler2(deps) {
       sessionStates.set(sessionID, state3);
       return;
     }
-    if (state3.currentModel !== state3.originalModel && !state3.pendingFallbackModel && !isModelInCooldown(state3.originalModel, state3, config.cooldown_seconds)) {
+    if (config.restore_primary_after_cooldown && state3.currentModel !== state3.originalModel && !state3.pendingFallbackModel && !isModelInCooldown(state3.originalModel, state3, config.cooldown_seconds)) {
       const activeModel2 = state3.originalModel;
       log2(`[${HOOK_NAME11}] Restoring preferred primary model`, {
         sessionID,
@@ -103306,20 +103407,49 @@ function resolveFallbackBootstrapModel(options) {
 
 // packages/omo-opencode/src/hooks/runtime-fallback/fallback-retry-dispatcher.ts
 init_logger2();
+function resolveDispatchMessage(result, newModel) {
+  const modelName = newModel.split("/").pop() || newModel;
+  if (result.status === "queued")
+    return `Fallback queued for ${modelName}`;
+  if (result.status === "possibly-accepted")
+    return `Fallback dispatch may have been accepted for ${modelName}`;
+  return `Switched to ${modelName} for next request`;
+}
 async function dispatchFallbackRetry(deps, helpers, options) {
+  const snapshot = snapshotFallbackState(options.state);
   const result = prepareFallback(options.sessionID, options.state, options.fallbackModels, deps.config);
-  if (result.success && deps.config.notify_on_fallback) {
-    await deps.ctx.client.tui.showToast({
-      body: {
-        title: "Model Fallback",
-        message: `Switching to ${result.newModel?.split("/").pop() || result.newModel} for next request`,
-        variant: "warning",
-        duration: 5000
-      }
-    }).catch(() => {});
-  }
   if (result.success && result.newModel) {
-    await helpers.autoRetryWithFallback(options.sessionID, result.newModel, options.resolvedAgent, options.source);
+    const rawDispatchOutcome = await helpers.autoRetryWithFallback(options.sessionID, result.newModel, options.resolvedAgent, options.source);
+    const dispatchOutcome = rawDispatchOutcome ?? {
+      accepted: true,
+      status: "dispatched"
+    };
+    if (rawDispatchOutcome === undefined) {
+      log2(`[${HOOK_NAME11}] Fallback dispatch returned no outcome; treating as accepted for compatibility`, {
+        sessionID: options.sessionID,
+        source: options.source
+      });
+    }
+    if (!dispatchOutcome.accepted) {
+      restoreFallbackState(options.state, snapshot);
+      log2(`[${HOOK_NAME11}] Fallback dispatch was not accepted`, {
+        sessionID: options.sessionID,
+        source: options.source,
+        status: dispatchOutcome.status,
+        reason: dispatchOutcome.reason
+      });
+      return;
+    }
+    if (deps.config.notify_on_fallback) {
+      await deps.ctx.client.tui.showToast({
+        body: {
+          title: "Model Fallback",
+          message: resolveDispatchMessage(dispatchOutcome, result.newModel),
+          variant: "warning",
+          duration: 5000
+        }
+      }).catch(() => {});
+    }
     return;
   }
   log2(`[${HOOK_NAME11}] Fallback preparation failed`, {
@@ -104101,6 +104231,10 @@ function createMessageUpdateHandler(deps, helpers) {
           }
         }
       }
+      if (classifyErrorType(error) === "quota_exceeded") {
+        await helpers.abortSessionRequest(sessionID, "message.updated.quota-fallback");
+        sessionRetryInFlight.delete(sessionID);
+      }
       await dispatchFallbackRetry(deps, helpers, {
         sessionID,
         state: state3,
@@ -104131,7 +104265,8 @@ function createRuntimeFallbackHook(ctx, options, factoryOverrides = {}) {
     max_fallback_attempts: options?.config?.max_fallback_attempts ?? DEFAULT_CONFIG2.max_fallback_attempts,
     cooldown_seconds: options?.config?.cooldown_seconds ?? DEFAULT_CONFIG2.cooldown_seconds,
     timeout_seconds: options?.config?.timeout_seconds ?? DEFAULT_CONFIG2.timeout_seconds,
-    notify_on_fallback: options?.config?.notify_on_fallback ?? DEFAULT_CONFIG2.notify_on_fallback
+    notify_on_fallback: options?.config?.notify_on_fallback ?? DEFAULT_CONFIG2.notify_on_fallback,
+    restore_primary_after_cooldown: options?.config?.restore_primary_after_cooldown ?? DEFAULT_CONFIG2.restore_primary_after_cooldown
   };
   const deps = {
     ctx,
@@ -104199,11 +104334,11 @@ function createRuntimeFallbackHook(ctx, options, factoryOverrides = {}) {
   };
 }
 // packages/omo-opencode/src/hooks/write-existing-file-guard/hook.ts
-import { existsSync as existsSync85, realpathSync as realpathSync14 } from "fs";
-import { basename as basename17, dirname as dirname30, isAbsolute as isAbsolute17, join as join97, normalize as normalize2, relative as relative15, resolve as resolve28 } from "path";
+import { existsSync as existsSync86, realpathSync as realpathSync14 } from "fs";
+import { basename as basename17, dirname as dirname31, isAbsolute as isAbsolute17, join as join99, normalize as normalize2, relative as relative15, resolve as resolve28 } from "path";
 
 // packages/omo-opencode/src/hooks/write-existing-file-guard/tool-execute-before-handler.ts
-import { existsSync as existsSync84 } from "fs";
+import { existsSync as existsSync85 } from "fs";
 
 // packages/omo-opencode/src/hooks/write-existing-file-guard/session-read-permissions.ts
 function touchSession(sessionLastAccess, sessionID) {
@@ -104304,7 +104439,7 @@ async function handleWriteExistingFileGuardToolExecuteBefore(params) {
     return;
   }
   if (toolName === "read") {
-    if (!existsSync84(resolvedPath) || !input.sessionID) {
+    if (!existsSync85(resolvedPath) || !input.sessionID) {
       return;
     }
     registerReadPermission({
@@ -104322,7 +104457,7 @@ async function handleWriteExistingFileGuardToolExecuteBefore(params) {
     const { overwrite: _, ...rest } = argsRecord;
     output.args = rest;
   }
-  if (!existsSync84(resolvedPath)) {
+  if (!existsSync85(resolvedPath)) {
     return;
   }
   if (isOmoWorkspacePath(canonicalPath)) {
@@ -104380,7 +104515,7 @@ function isPathInsideDirectory(pathToCheck, directory) {
 }
 function toCanonicalPath2(absolutePath) {
   let canonicalPath = absolutePath;
-  if (existsSync85(absolutePath)) {
+  if (existsSync86(absolutePath)) {
     try {
       canonicalPath = realpathSync14.native(absolutePath);
     } catch (canonicalPathError) {
@@ -104388,9 +104523,9 @@ function toCanonicalPath2(absolutePath) {
       canonicalPath = absolutePath;
     }
   } else {
-    const absoluteDir = dirname30(absolutePath);
-    const resolvedDir = existsSync85(absoluteDir) ? realpathSync14.native(absoluteDir) : absoluteDir;
-    canonicalPath = join97(resolvedDir, basename17(absolutePath));
+    const absoluteDir = dirname31(absolutePath);
+    const resolvedDir = existsSync86(absoluteDir) ? realpathSync14.native(absoluteDir) : absoluteDir;
+    canonicalPath = join99(resolvedDir, basename17(absolutePath));
   }
   return normalize2(canonicalPath);
 }
@@ -107151,23 +107286,23 @@ init_logger2();
 init_plugin_identity();
 
 // packages/omo-opencode/src/hooks/legacy-plugin-toast/auto-migrate.ts
-import { existsSync as existsSync86, readFileSync as readFileSync58 } from "fs";
-import { join as join98 } from "path";
+import { existsSync as existsSync87, readFileSync as readFileSync58 } from "fs";
+import { join as join100 } from "path";
 init_plugin_identity();
 function detectOpenCodeConfigPath(overrideConfigDir) {
   if (overrideConfigDir) {
-    const jsoncPath = join98(overrideConfigDir, "opencode.jsonc");
-    const jsonPath = join98(overrideConfigDir, "opencode.json");
-    if (existsSync86(jsoncPath))
+    const jsoncPath = join100(overrideConfigDir, "opencode.jsonc");
+    const jsonPath = join100(overrideConfigDir, "opencode.json");
+    if (existsSync87(jsoncPath))
       return jsoncPath;
-    if (existsSync86(jsonPath))
+    if (existsSync87(jsonPath))
       return jsonPath;
     return null;
   }
   const paths = getOpenCodeConfigPaths({ binary: "opencode", version: null });
-  if (existsSync86(paths.configJsonc))
+  if (existsSync87(paths.configJsonc))
     return paths.configJsonc;
-  if (existsSync86(paths.configJson))
+  if (existsSync87(paths.configJson))
     return paths.configJson;
   return null;
 }
@@ -107359,7 +107494,7 @@ function createNotepadWriteGuardHook() {
   };
 }
 // packages/omo-opencode/src/hooks/plan-format-validator/hook.ts
-import { existsSync as existsSync87, readFileSync as readFileSync59 } from "fs";
+import { existsSync as existsSync88, readFileSync as readFileSync59 } from "fs";
 import { resolve as resolve29 } from "path";
 init_logger2();
 var WRITE_TOOLS = new Set(["Write", "Edit", "write", "edit"]);
@@ -107443,7 +107578,7 @@ function createPlanFormatValidatorHook(_ctx) {
       if (!isPlanFilePath(filePath))
         return;
       const resolvedPath = resolve29(_ctx.directory, filePath);
-      if (!existsSync87(resolvedPath))
+      if (!existsSync88(resolvedPath))
         return;
       const content = readFileSync59(resolvedPath, "utf-8");
       if (!CHECKBOX_PATTERN.test(content))
@@ -107555,19 +107690,19 @@ tool.schema = z3;
 
 // packages/omo-opencode/src/shared/ripgrep-cli.ts
 import { spawnSync as spawnSync3 } from "child_process";
-import { existsSync as existsSync89 } from "fs";
-import { dirname as dirname31, join as join100 } from "path";
+import { existsSync as existsSync90 } from "fs";
+import { dirname as dirname32, join as join102 } from "path";
 
 // packages/omo-opencode/src/tools/grep/downloader.ts
-import { existsSync as existsSync88, readdirSync as readdirSync22 } from "fs";
-import { join as join99 } from "path";
+import { existsSync as existsSync89, readdirSync as readdirSync22 } from "fs";
+import { join as join101 } from "path";
 init_plugin_identity();
 function findFileRecursive(dir, filename) {
   try {
     const entries = readdirSync22(dir, { withFileTypes: true, recursive: true });
     for (const entry of entries) {
       if (entry.isFile() && entry.name === filename) {
-        return join99(entry.parentPath ?? dir, entry.name);
+        return join101(entry.parentPath ?? dir, entry.name);
       }
     }
   } catch (error) {
@@ -107591,11 +107726,11 @@ function getPlatformKey() {
 }
 function getInstallDir() {
   const homeDir = process.env.HOME || process.env.USERPROFILE || ".";
-  return join99(homeDir, ".cache", CACHE_DIR_NAME, "bin");
+  return join101(homeDir, ".cache", CACHE_DIR_NAME, "bin");
 }
 function getRgPath() {
   const isWindows2 = process.platform === "win32";
-  return join99(getInstallDir(), isWindows2 ? "rg.exe" : "rg");
+  return join101(getInstallDir(), isWindows2 ? "rg.exe" : "rg");
 }
 async function extractTarGz3(archivePath, destDir) {
   const platformKey2 = getPlatformKey();
@@ -107612,7 +107747,7 @@ async function extractZip2(archivePath, destDir) {
   const binaryName = process.platform === "win32" ? "rg.exe" : "rg";
   const foundPath = findFileRecursive(destDir, binaryName);
   if (foundPath) {
-    const destPath = join99(destDir, binaryName);
+    const destPath = join101(destDir, binaryName);
     if (foundPath !== destPath) {
       const { renameSync: renameSync7 } = await import("fs");
       renameSync7(foundPath, destPath);
@@ -107627,13 +107762,13 @@ async function downloadAndInstallRipgrep() {
   }
   const installDir = getInstallDir();
   const rgPath = getRgPath();
-  if (existsSync88(rgPath)) {
+  if (existsSync89(rgPath)) {
     return rgPath;
   }
   ensureCacheDir(installDir);
   const filename = `ripgrep-${RG_VERSION}-${config.platform}.${config.extension}`;
   const url = `https://github.com/BurntSushi/ripgrep/releases/download/${RG_VERSION}/${filename}`;
-  const archivePath = join99(installDir, filename);
+  const archivePath = join101(installDir, filename);
   try {
     await downloadArchive(url, archivePath);
     if (config.extension === "tar.gz") {
@@ -107642,7 +107777,7 @@ async function downloadAndInstallRipgrep() {
       await extractZip2(archivePath, installDir);
     }
     ensureExecutable(rgPath);
-    if (!existsSync88(rgPath)) {
+    if (!existsSync89(rgPath)) {
       throw new Error("ripgrep binary not found after extraction");
     }
     return rgPath;
@@ -107658,7 +107793,7 @@ async function downloadAndInstallRipgrep() {
 }
 function getInstalledRipgrepPath() {
   const rgPath = getRgPath();
-  return existsSync88(rgPath) ? rgPath : null;
+  return existsSync89(rgPath) ? rgPath : null;
 }
 
 // packages/omo-opencode/src/shared/ripgrep-cli.ts
@@ -107694,19 +107829,19 @@ function findExecutable(name) {
 }
 function getOpenCodeBundledRg() {
   const execPath = process.execPath;
-  const execDir = dirname31(execPath);
+  const execDir = dirname32(execPath);
   const isWindows2 = process.platform === "win32";
   const rgName = isWindows2 ? "rg.exe" : "rg";
   const candidates = [
-    join100(getOpenCodeCacheDir(), "bin", rgName),
-    join100(getDataDir(), "opencode", "bin", rgName),
-    join100(execDir, rgName),
-    join100(execDir, "bin", rgName),
-    join100(execDir, "..", "bin", rgName),
-    join100(execDir, "..", "libexec", rgName)
+    join102(getOpenCodeCacheDir(), "bin", rgName),
+    join102(getDataDir(), "opencode", "bin", rgName),
+    join102(execDir, rgName),
+    join102(execDir, "bin", rgName),
+    join102(execDir, "..", "bin", rgName),
+    join102(execDir, "..", "libexec", rgName)
   ];
   for (const candidate of candidates) {
-    if (existsSync89(candidate)) {
+    if (existsSync90(candidate)) {
       return candidate;
     }
   }
@@ -108358,7 +108493,7 @@ Use this when a task matches an available skill's or command's description.
 - The tool will return detailed instructions with your context applied.
 `;
 // packages/omo-opencode/src/tools/skill/tools.ts
-import { dirname as dirname33 } from "path";
+import { dirname as dirname34 } from "path";
 // packages/omo-opencode/src/tools/skill/session-skill-cache.ts
 var seenSessionIDs = new Set;
 function shouldInvalidateSkillCacheForSession(sessionID) {
@@ -108369,7 +108504,7 @@ function shouldInvalidateSkillCacheForSession(sessionID) {
   return true;
 }
 // packages/omo-opencode/src/tools/slashcommand/command-output-formatter.ts
-import { dirname as dirname32 } from "path";
+import { dirname as dirname33 } from "path";
 async function formatLoadedCommand(command, userMessage) {
   const sections = [];
   sections.push(`# /${command.name} Command
@@ -108408,7 +108543,7 @@ async function formatLoadedCommand(command, userMessage) {
   if (!content && command.lazyContentLoader) {
     content = await command.lazyContentLoader.load();
   }
-  const commandDir = command.path ? dirname32(command.path) : process.cwd();
+  const commandDir = command.path ? dirname33(command.path) : process.cwd();
   const withFileReferences = await resolveFileReferencesInText(content, commandDir);
   const resolvedContent = await resolveCommandsInText(withFileReferences);
   let finalContent = resolvedContent.trim();
@@ -108810,7 +108945,7 @@ function createSkillTool(options) {
         if (matchedSkill.name === "git-master") {
           body = injectGitMasterConfig(body, options.gitMasterConfig);
         }
-        const dir = matchedSkill.path ? dirname33(matchedSkill.path) : matchedSkill.resolvedPath || process.cwd();
+        const dir = matchedSkill.path ? dirname34(matchedSkill.path) : matchedSkill.resolvedPath || process.cwd();
         const output = [
           `## Skill: ${matchedSkill.name}`,
           "",
@@ -108850,9 +108985,9 @@ function createSkillTool(options) {
 }
 var skill = createSkillTool({ directory: process.cwd() });
 // packages/omo-opencode/src/tools/session-manager/constants.ts
-import { join as join101 } from "path";
-var TODO_DIR2 = join101(getClaudeConfigDir(), "todos");
-var TRANSCRIPT_DIR2 = join101(getClaudeConfigDir(), "transcripts");
+import { join as join103 } from "path";
+var TODO_DIR2 = join103(getClaudeConfigDir(), "todos");
+var TRANSCRIPT_DIR2 = join103(getClaudeConfigDir(), "transcripts");
 var SESSION_LIST_DESCRIPTION = `List all OpenCode sessions with optional filtering.
 
 Returns a list of available session IDs with metadata including message count, date range, and agents used.
@@ -108925,16 +109060,16 @@ Has Todos: Yes (12 items, 8 completed)
 Has Transcript: Yes (234 entries)`;
 
 // packages/omo-opencode/src/tools/session-manager/file-storage.ts
-import { existsSync as existsSync90 } from "fs";
+import { existsSync as existsSync91 } from "fs";
 import { readdir as readdir6, readFile as readFile9 } from "fs/promises";
-import { join as join102 } from "path";
+import { join as join104 } from "path";
 function ignoreFileStorageError(error) {
   if (error instanceof Error)
     return;
   throw error;
 }
 async function getFileMainSessions(directory) {
-  if (!existsSync90(SESSION_STORAGE))
+  if (!existsSync91(SESSION_STORAGE))
     return [];
   const sessions = [];
   try {
@@ -108942,13 +109077,13 @@ async function getFileMainSessions(directory) {
     for (const projectDir of projectDirs) {
       if (!projectDir.isDirectory())
         continue;
-      const projectPath = join102(SESSION_STORAGE, projectDir.name);
+      const projectPath = join104(SESSION_STORAGE, projectDir.name);
       const sessionFiles = await readdir6(projectPath);
       for (const file2 of sessionFiles) {
         if (!file2.endsWith(".json"))
           continue;
         try {
-          const content = await readFile9(join102(projectPath, file2), "utf-8");
+          const content = await readFile9(join104(projectPath, file2), "utf-8");
           const meta = JSON.parse(content);
           if (meta.parentID)
             continue;
@@ -108968,7 +109103,7 @@ async function getFileMainSessions(directory) {
   return sessions.sort((a, b) => b.time.updated - a.time.updated);
 }
 async function getFileAllSessions() {
-  if (!existsSync90(MESSAGE_STORAGE))
+  if (!existsSync91(MESSAGE_STORAGE))
     return [];
   const sessions = [];
   async function scanDirectory(dir) {
@@ -108977,7 +109112,7 @@ async function getFileAllSessions() {
       for (const entry of entries) {
         if (!entry.isDirectory())
           continue;
-        const sessionPath = join102(dir, entry.name);
+        const sessionPath = join104(dir, entry.name);
         const files = await readdir6(sessionPath);
         if (files.some((file2) => file2.endsWith(".json"))) {
           sessions.push(entry.name);
@@ -108998,7 +109133,7 @@ async function fileSessionExists(sessionID) {
 }
 async function getFileSessionMessages(sessionID) {
   const messageDir = getMessageDir(sessionID);
-  if (!messageDir || !existsSync90(messageDir))
+  if (!messageDir || !existsSync91(messageDir))
     return [];
   const messages = [];
   try {
@@ -109007,7 +109142,7 @@ async function getFileSessionMessages(sessionID) {
       if (!file2.endsWith(".json"))
         continue;
       try {
-        const content = await readFile9(join102(messageDir, file2), "utf-8");
+        const content = await readFile9(join104(messageDir, file2), "utf-8");
         const meta = JSON.parse(content);
         const parts = await readParts2(meta.id);
         messages.push({
@@ -109035,8 +109170,8 @@ async function getFileSessionMessages(sessionID) {
   });
 }
 async function readParts2(messageID) {
-  const partDir = join102(PART_STORAGE, messageID);
-  if (!existsSync90(partDir))
+  const partDir = join104(PART_STORAGE, messageID);
+  if (!existsSync91(partDir))
     return [];
   const parts = [];
   try {
@@ -109045,7 +109180,7 @@ async function readParts2(messageID) {
       if (!file2.endsWith(".json"))
         continue;
       try {
-        const content = await readFile9(join102(partDir, file2), "utf-8");
+        const content = await readFile9(join104(partDir, file2), "utf-8");
         parts.push(JSON.parse(content));
       } catch (error) {
         ignoreFileStorageError(error);
@@ -109059,14 +109194,14 @@ async function readParts2(messageID) {
   return parts.sort((a, b) => a.id.localeCompare(b.id));
 }
 async function getFileSessionTodos(sessionID) {
-  if (!existsSync90(TODO_DIR2))
+  if (!existsSync91(TODO_DIR2))
     return [];
   try {
     const allFiles = await readdir6(TODO_DIR2);
     const todoFiles = allFiles.filter((file2) => file2 === `${sessionID}.json`);
     for (const file2 of todoFiles) {
       try {
-        const content = await readFile9(join102(TODO_DIR2, file2), "utf-8");
+        const content = await readFile9(join104(TODO_DIR2, file2), "utf-8");
         const data = JSON.parse(content);
         if (!Array.isArray(data))
           continue;
@@ -109088,10 +109223,10 @@ async function getFileSessionTodos(sessionID) {
   return [];
 }
 async function getFileSessionTranscript(sessionID) {
-  if (!existsSync90(TRANSCRIPT_DIR2))
+  if (!existsSync91(TRANSCRIPT_DIR2))
     return 0;
-  const transcriptFile = join102(TRANSCRIPT_DIR2, `${sessionID}.jsonl`);
-  if (!existsSync90(transcriptFile))
+  const transcriptFile = join104(TRANSCRIPT_DIR2, `${sessionID}.jsonl`);
+  if (!existsSync91(transcriptFile))
     return 0;
   try {
     const content = await readFile9(transcriptFile, "utf-8");
@@ -110024,7 +110159,7 @@ function createSkillMcpTool(options) {
     },
     async execute(args, toolContext) {
       const operation = validateOperationParams(args);
-      const skills = getLoadedSkills();
+      const skills = await getLoadedSkills();
       const found = findMcpServer(args.mcp_name, skills);
       if (!found) {
         const builtinHint = formatBuiltinMcpHint(args.mcp_name);
@@ -110910,23 +111045,23 @@ Pass \`session_id=<id>\` to continue previous agent with full context. Nested su
 // packages/omo-opencode/src/tools/call-omo-agent/tools.ts
 init_plugin_identity();
 // packages/claude-code-compat-core/src/features/claude-code-agent-loader/loader.ts
-import { existsSync as existsSync95, readdirSync as readdirSync23 } from "fs";
-import { join as join108 } from "path";
+import { existsSync as existsSync96, readdirSync as readdirSync23 } from "fs";
+import { join as join110 } from "path";
 
 // packages/claude-code-compat-core/src/shared/claude-config-dir.ts
 import { homedir as homedir29 } from "os";
-import { join as join103 } from "path";
+import { join as join105 } from "path";
 function getClaudeConfigDir3() {
   const envConfigDir = process.env.CLAUDE_CONFIG_DIR;
   if (envConfigDir) {
     return envConfigDir;
   }
-  return join103(process.env.HOME || process.env.USERPROFILE || homedir29(), ".claude");
+  return join105(process.env.HOME || process.env.USERPROFILE || homedir29(), ".claude");
 }
 // packages/claude-code-compat-core/src/shared/opencode-config-dir.ts
-import { existsSync as existsSync91, realpathSync as realpathSync15 } from "fs";
+import { existsSync as existsSync92, realpathSync as realpathSync15 } from "fs";
 import { homedir as homedir30 } from "os";
-import { join as join104, posix as posix7, resolve as resolve33, win32 as win3210 } from "path";
+import { join as join106, posix as posix7, resolve as resolve33, win32 as win3210 } from "path";
 var TAURI_APP_IDENTIFIER3 = "ai.opencode.desktop";
 var TAURI_APP_IDENTIFIER_DEV3 = "ai.opencode.desktop.dev";
 function isDevBuild3(version) {
@@ -110938,15 +111073,15 @@ function getTauriConfigDir3(identifier) {
   const platform2 = process.platform;
   switch (platform2) {
     case "darwin":
-      return join104(homedir30(), "Library", "Application Support", identifier);
+      return join106(homedir30(), "Library", "Application Support", identifier);
     case "win32": {
-      const appData = process.env.APPDATA || join104(homedir30(), "AppData", "Roaming");
+      const appData = process.env.APPDATA || join106(homedir30(), "AppData", "Roaming");
       return win3210.join(appData, identifier);
     }
     case "linux":
     default: {
-      const xdgConfig = process.env.XDG_CONFIG_HOME || join104(homedir30(), ".config");
-      return join104(xdgConfig, identifier);
+      const xdgConfig = process.env.XDG_CONFIG_HOME || join106(homedir30(), ".config");
+      return join106(xdgConfig, identifier);
     }
   }
 }
@@ -110955,7 +111090,7 @@ function resolveConfigPath3(pathValue) {
     return posix7.normalize(pathValue);
   }
   const resolvedPath = resolve33(pathValue);
-  if (!existsSync91(resolvedPath))
+  if (!existsSync92(resolvedPath))
     return resolvedPath;
   try {
     return realpathSync15(resolvedPath);
@@ -110989,8 +111124,8 @@ function getWslLinuxHomeDir3(windowsConfigRoot) {
 function getCliDefaultConfigDir3() {
   const envXdgConfig = process.env.XDG_CONFIG_HOME?.trim();
   const shouldIgnoreWindowsXdg = envXdgConfig !== undefined && envXdgConfig.length > 0 && isWslEnvironment3() && isWindowsUserConfigRoot3(envXdgConfig);
-  const xdgConfig = shouldIgnoreWindowsXdg ? posix7.join(getWslLinuxHomeDir3(envXdgConfig) ?? "/home", ".config") : envXdgConfig || join104(homedir30(), ".config");
-  const configDir = isWslEnvironment3() ? posix7.join(xdgConfig, "opencode") : join104(xdgConfig, "opencode");
+  const xdgConfig = shouldIgnoreWindowsXdg ? posix7.join(getWslLinuxHomeDir3(envXdgConfig) ?? "/home", ".config") : envXdgConfig || join106(homedir30(), ".config");
+  const configDir = isWslEnvironment3() ? posix7.join(xdgConfig, "opencode") : join106(xdgConfig, "opencode");
   return resolveConfigPath3(configDir);
 }
 function getCliCustomConfigDir3() {
@@ -111023,9 +111158,9 @@ function getOpenCodeConfigDir3(options) {
   const tauriDir = process.platform === "win32" ? win3210.isAbsolute(tauriDirBase) ? win3210.normalize(tauriDirBase) : win3210.resolve(tauriDirBase) : resolveConfigPath3(tauriDirBase);
   if (checkExisting) {
     const legacyDir = getCliConfigDir3();
-    const legacyConfig = join104(legacyDir, "opencode.json");
-    const legacyConfigC = join104(legacyDir, "opencode.jsonc");
-    if (existsSync91(legacyConfig) || existsSync91(legacyConfigC)) {
+    const legacyConfig = join106(legacyDir, "opencode.json");
+    const legacyConfigC = join106(legacyDir, "opencode.jsonc");
+    if (existsSync92(legacyConfig) || existsSync92(legacyConfigC)) {
       return legacyDir;
     }
   }
@@ -111035,10 +111170,10 @@ function getOpenCodeConfigDir3(options) {
 init_src();
 // packages/claude-code-compat-core/src/shared/resolve-agent-definition-paths.ts
 import { homedir as homedir31 } from "os";
-import { isAbsolute as isAbsolute18, join as join105, resolve as resolve34 } from "path";
+import { isAbsolute as isAbsolute18, join as join107, resolve as resolve34 } from "path";
 function resolveAgentDefinitionPaths2(paths, baseDir, containmentDir) {
   return paths.flatMap((p) => {
-    const expanded = p.startsWith("~/") ? join105(homedir31(), p.slice(2)) : p;
+    const expanded = p.startsWith("~/") ? join107(homedir31(), p.slice(2)) : p;
     const resolved = isAbsolute18(expanded) ? expanded : resolve34(baseDir, expanded);
     if (containmentDir !== null && !isWithinProject(resolved, containmentDir)) {
       log4(`agent_definitions path rejected (outside project boundary): ${p} -> ${resolved}`);
@@ -111066,13 +111201,13 @@ var EXCLUDED_DIR_NAMES2 = [
 ];
 var EXCLUDED_DIRS3 = Object.freeze(new Set(EXCLUDED_DIR_NAMES2));
 // packages/claude-code-compat-core/src/shared/opencode-command-dirs.ts
-import { basename as basename18, dirname as dirname34, join as join106 } from "path";
+import { basename as basename18, dirname as dirname35, join as join108 } from "path";
 function getParentOpencodeConfigDir3(configDir) {
-  const parentDir = dirname34(configDir);
+  const parentDir = dirname35(configDir);
   if (basename18(parentDir) !== "profiles") {
     return null;
   }
-  return dirname34(parentDir);
+  return dirname35(parentDir);
 }
 function getOpenCodeCommandDirs2(options) {
   const configDirs = getOpenCodeConfigDirs3(options);
@@ -111080,21 +111215,21 @@ function getOpenCodeCommandDirs2(options) {
     ...configDirs.flatMap((configDir) => {
       const parentConfigDir = getParentOpencodeConfigDir3(configDir);
       return [
-        join106(configDir, "commands"),
-        join106(configDir, "command"),
-        ...parentConfigDir ? [join106(parentConfigDir, "commands"), join106(parentConfigDir, "command")] : []
+        join108(configDir, "commands"),
+        join108(configDir, "command"),
+        ...parentConfigDir ? [join108(parentConfigDir, "commands"), join108(parentConfigDir, "command")] : []
       ];
     })
   ]));
 }
 // packages/claude-code-compat-core/src/shared/project-discovery-dirs.ts
 import { execFileSync as execFileSync6 } from "child_process";
-import { existsSync as existsSync92, realpathSync as realpathSync16 } from "fs";
-import { dirname as dirname35, join as join107, resolve as resolve35, win32 as win3211 } from "path";
+import { existsSync as existsSync93, realpathSync as realpathSync16 } from "fs";
+import { dirname as dirname36, join as join109, resolve as resolve35, win32 as win3211 } from "path";
 var worktreePathCache3 = new Map;
 function normalizePath6(path18) {
   const resolvedPath = process.platform !== "win32" && win3211.isAbsolute(path18) ? path18 : resolve35(path18);
-  if (!existsSync92(resolvedPath)) {
+  if (!existsSync93(resolvedPath)) {
     return resolvedPath;
   }
   try {
@@ -111149,10 +111284,10 @@ function detectWorktreePath4(directory) {
 function findGitMarkerAncestor(directory) {
   let currentDirectory = normalizePath6(directory);
   while (true) {
-    if (existsSync92(join107(currentDirectory, ".git"))) {
+    if (existsSync93(join109(currentDirectory, ".git"))) {
       return currentDirectory;
     }
-    const parentDirectory = dirname35(currentDirectory);
+    const parentDirectory = dirname36(currentDirectory);
     if (parentDirectory === currentDirectory) {
       return;
     }
@@ -111167,8 +111302,8 @@ function findAncestorDirectories3(startDirectory, targetPaths, stopDirectory) {
   const stopDirectoryKey = resolvedStopDirectory ? pathKey3(resolvedStopDirectory) : undefined;
   while (true) {
     for (const targetPath of targetPaths) {
-      const candidateDirectory = join107(currentDirectory, ...targetPath);
-      if (!existsSync92(candidateDirectory)) {
+      const candidateDirectory = join109(currentDirectory, ...targetPath);
+      if (!existsSync93(candidateDirectory)) {
         continue;
       }
       const normalizedCandidateDirectory = normalizePath6(candidateDirectory);
@@ -111182,7 +111317,7 @@ function findAncestorDirectories3(startDirectory, targetPaths, stopDirectory) {
     if (stopDirectoryKey === pathKey3(currentDirectory)) {
       return directories;
     }
-    const parentDirectory = dirname35(currentDirectory);
+    const parentDirectory = dirname36(currentDirectory);
     if (parentDirectory === currentDirectory) {
       return directories;
     }
@@ -111197,14 +111332,14 @@ function findProjectOpencodeCommandDirs2(startDirectory, stopDirectory) {
   ], detectedStopDirectory);
 }
 // packages/claude-code-compat-core/src/features/claude-code-agent-loader/agent-definitions-loader.ts
-import { existsSync as existsSync94, readFileSync as readFileSync61 } from "fs";
+import { existsSync as existsSync95, readFileSync as readFileSync61 } from "fs";
 import { basename as basename19, extname as extname4 } from "path";
 
 // packages/claude-code-compat-core/src/features/claude-code-agent-loader/json-agent-loader.ts
-import { existsSync as existsSync93, readFileSync as readFileSync60 } from "fs";
+import { existsSync as existsSync94, readFileSync as readFileSync60 } from "fs";
 function parseJsonAgentFile(filePath, scope) {
   try {
-    if (!existsSync93(filePath)) {
+    if (!existsSync94(filePath)) {
       return null;
     }
     const content = readFileSync60(filePath, "utf-8");
@@ -111245,7 +111380,7 @@ function parseJsonAgentFile(filePath, scope) {
 // packages/claude-code-compat-core/src/features/claude-code-agent-loader/agent-definitions-loader.ts
 function parseMarkdownAgentFile(filePath, scope, anthropicProvider) {
   try {
-    if (!existsSync94(filePath)) {
+    if (!existsSync95(filePath)) {
       return null;
     }
     const content = readFileSync61(filePath, "utf-8");
@@ -111282,7 +111417,7 @@ function parseMarkdownAgentFile(filePath, scope, anthropicProvider) {
 function loadAgentDefinitions(paths, scope, anthropicProvider) {
   const result = Object.create(null);
   for (const filePath of paths) {
-    if (!existsSync94(filePath)) {
+    if (!existsSync95(filePath)) {
       log4(`[agent-definitions-loader] File not found, skipping: ${filePath}`);
       continue;
     }
@@ -111307,7 +111442,7 @@ function loadAgentDefinitions(paths, scope, anthropicProvider) {
 
 // packages/claude-code-compat-core/src/features/claude-code-agent-loader/loader.ts
 function loadAgentsFromDir(agentsDir, scope, anthropicProvider) {
-  if (!existsSync95(agentsDir)) {
+  if (!existsSync96(agentsDir)) {
     return [];
   }
   const entries = readdirSync23(agentsDir, { withFileTypes: true });
@@ -111315,7 +111450,7 @@ function loadAgentsFromDir(agentsDir, scope, anthropicProvider) {
   for (const entry of entries) {
     if (!isMarkdownFile(entry))
       continue;
-    const agentPath = join108(agentsDir, entry.name);
+    const agentPath = join110(agentsDir, entry.name);
     const agent = parseMarkdownAgentFile(agentPath, scope, anthropicProvider);
     if (agent) {
       agents.push(agent);
@@ -111324,7 +111459,7 @@ function loadAgentsFromDir(agentsDir, scope, anthropicProvider) {
   return agents;
 }
 function loadUserAgents(anthropicProvider) {
-  const userAgentsDir = join108(getClaudeConfigDir3(), "agents");
+  const userAgentsDir = join110(getClaudeConfigDir3(), "agents");
   const agents = loadAgentsFromDir(userAgentsDir, "user", anthropicProvider);
   const result = Object.create(null);
   for (const agent of agents) {
@@ -111333,7 +111468,7 @@ function loadUserAgents(anthropicProvider) {
   return result;
 }
 function loadProjectAgents(directory, anthropicProvider) {
-  const projectAgentsDir = join108(directory ?? process.cwd(), ".claude", "agents");
+  const projectAgentsDir = join110(directory ?? process.cwd(), ".claude", "agents");
   const agents = loadAgentsFromDir(projectAgentsDir, "project", anthropicProvider);
   const result = Object.create(null);
   for (const agent of agents) {
@@ -111345,7 +111480,7 @@ function loadOpencodeGlobalAgents() {
   const result = Object.create(null);
   const configDirs = getOpenCodeConfigDirs3({ binary: "opencode" });
   for (const configDir of configDirs) {
-    const opencodeAgentsDir = join108(configDir, "agents");
+    const opencodeAgentsDir = join110(configDir, "agents");
     const agents = loadAgentsFromDir(opencodeAgentsDir, "opencode");
     for (const agent of agents) {
       if (!(agent.name in result)) {
@@ -111356,7 +111491,7 @@ function loadOpencodeGlobalAgents() {
   return result;
 }
 function loadOpencodeProjectAgents(directory) {
-  const opencodeProjectDir = join108(directory ?? process.cwd(), ".opencode", "agents");
+  const opencodeProjectDir = join110(directory ?? process.cwd(), ".opencode", "agents");
   const agents = loadAgentsFromDir(opencodeProjectDir, "opencode-project");
   const result = Object.create(null);
   for (const agent of agents) {
@@ -111951,6 +112086,28 @@ async function resolveCallableAgents(_client, _sessionId) {
   return [...ALLOWED_AGENTS];
 }
 
+// packages/omo-opencode/src/agents/builtin-agents/model-resolution.ts
+function applyModelResolution(input) {
+  const { uiSelectedModel, userModel, requirement, availableModels, systemDefaultModel } = input;
+  return resolveModelPipeline2({
+    intent: { uiSelectedModel, userModel },
+    constraints: { availableModels },
+    policy: { fallbackChain: requirement?.fallbackChain, systemDefaultModel }
+  });
+}
+function getFirstFallbackModel(requirement) {
+  const entry = requirement?.fallbackChain?.[0];
+  if (!entry || entry.providers.length === 0)
+    return;
+  const provider = entry.providers[0];
+  const transformedModel = transformModelForProvider(provider, entry.model);
+  return {
+    model: `${provider}/${transformedModel}`,
+    provenance: "provider-fallback",
+    variant: entry.variant
+  };
+}
+
 // packages/omo-opencode/src/tools/call-omo-agent/tools.ts
 function createSyncExecutorDeps(modelFallbackControllerAccessor) {
   return {
@@ -111995,6 +112152,19 @@ function resolveModelAndFallbackChain(args) {
         variant: variantToUse
       });
     }
+  } else {
+    const firstFallback = getFirstFallbackModel(agentRequirement);
+    if (firstFallback) {
+      const normalized = parseModelString(firstFallback.model);
+      if (normalized) {
+        model = firstFallback.variant ? { ...normalized, variant: firstFallback.variant } : normalized;
+        log2("[call_omo_agent] Resolved model from first fallbackChain entry", {
+          agent: subagentType,
+          model: firstFallback.model,
+          variant: firstFallback.variant
+        });
+      }
+    }
   }
   const normalizedFallbackModels = normalizeFallbackModels(agentOverride?.fallback_models ?? (agentOverride?.category ? userCategories?.[agentOverride.category]?.fallback_models : undefined));
   const defaultProviderID = model?.providerID ?? agentRequirement?.fallbackChain?.[0]?.providers?.[0] ?? "opencode";
@@ -112091,9 +112261,9 @@ function validateArgs(args) {
   const normalizedArgs = args;
   const filePath = args.file_path;
   const hasFilePath = hasNonEmptyString(args.file_path);
-  const hasFilePaths = Array.isArray(args.file_paths);
+  const hasFilePaths = hasValues(args.file_paths);
   const hasImageData = hasNonEmptyString(args.image_data);
-  const hasImageDataList = Array.isArray(args.image_data_list);
+  const hasImageDataList = hasValues(args.image_data_list);
   const filePathsFromSingular = normalizedArgs._normalized_file_paths_from_singular === true;
   const imageDataListFromSingular = normalizedArgs._normalized_image_data_list_from_singular === true;
   if (hasFilePath && hasFilePaths && !filePathsFromSingular) {
@@ -112102,12 +112272,6 @@ function validateArgs(args) {
   if (hasImageData && hasImageDataList && !imageDataListFromSingular) {
     return "Error: Provide either 'image_data' or 'image_data_list', not both.";
   }
-  if (hasFilePaths && !hasValues(args.file_paths)) {
-    return "Error: 'file_paths' must contain at least one local file path.";
-  }
-  if (hasImageDataList && !hasValues(args.image_data_list)) {
-    return "Error: 'image_data_list' must contain at least one Base64 image string.";
-  }
   if (hasValues(args.file_paths)) {
     for (const filePath2 of args.file_paths) {
       if (!hasNonEmptyString(filePath2)) {
@@ -112128,7 +112292,7 @@ function validateArgs(args) {
   if (hasNonEmptyString(filePath) && isRemoteUrl(filePath)) {
     return "Error: Remote URLs are not supported for file_path. Download the file first or use a local path.";
   }
-  if (!hasFilePath && !hasValues(args.file_paths) && !hasImageData && !hasValues(args.image_data_list)) {
+  if (!hasFilePath && !hasFilePaths && !hasImageData && !hasImageDataList) {
     return `Error: Must provide at least one of 'file_path', 'file_paths', 'image_data', or 'image_data_list'. Usage:
 - look_at(file_path="/path/to/file", goal="what to extract")
 - look_at(file_paths=["/path/to/file-1", "/path/to/file-2"], goal="what to extract")
@@ -112147,9 +112311,9 @@ import { pathToFileURL } from "url";
 
 // packages/omo-opencode/src/tools/look-at/image-converter.ts
 import * as childProcess2 from "child_process";
-import { existsSync as existsSync97, mkdtempSync, readFileSync as readFileSync63, rmSync as rmSync5, unlinkSync as unlinkSync14, writeFileSync as writeFileSync18 } from "fs";
+import { existsSync as existsSync98, mkdtempSync, readFileSync as readFileSync63, rmSync as rmSync5, unlinkSync as unlinkSync14, writeFileSync as writeFileSync18 } from "fs";
 import { tmpdir as tmpdir7 } from "os";
-import { dirname as dirname37, join as join110 } from "path";
+import { dirname as dirname38, join as join112 } from "path";
 var SUPPORTED_FORMATS = new Set([
   "image/jpeg",
   "image/png",
@@ -112179,7 +112343,7 @@ var UNSUPPORTED_FORMATS = new Set([
 var CONVERSION_TIMEOUT_MS = 30000;
 function cleanupTemporaryFileAfterFailure(filePath) {
   try {
-    if (existsSync97(filePath)) {
+    if (existsSync98(filePath)) {
       unlinkSync14(filePath);
     }
   } catch (cleanupError) {
@@ -112197,11 +112361,11 @@ function needsConversion(mimeType) {
   return mimeType.startsWith("image/");
 }
 function convertImageToJpeg(inputPath, mimeType) {
-  if (!existsSync97(inputPath)) {
+  if (!existsSync98(inputPath)) {
     throw new Error(`File not found: ${inputPath}`);
   }
-  const tempDir = mkdtempSync(join110(tmpdir7(), "opencode-img-"));
-  const outputPath = join110(tempDir, "converted.jpg");
+  const tempDir = mkdtempSync(join112(tmpdir7(), "opencode-img-"));
+  const outputPath = join112(tempDir, "converted.jpg");
   log2(`[image-converter] Converting ${mimeType} to JPEG: ${inputPath}`);
   try {
     if (process.platform === "darwin") {
@@ -112211,7 +112375,7 @@ function convertImageToJpeg(inputPath, mimeType) {
           encoding: "utf-8",
           timeout: CONVERSION_TIMEOUT_MS
         });
-        if (existsSync97(outputPath)) {
+        if (existsSync98(outputPath)) {
           log2(`[image-converter] Converted using sips: ${outputPath}`);
           return outputPath;
         }
@@ -112227,7 +112391,7 @@ function convertImageToJpeg(inputPath, mimeType) {
         encoding: "utf-8",
         timeout: CONVERSION_TIMEOUT_MS
       });
-      if (existsSync97(outputPath)) {
+      if (existsSync98(outputPath)) {
         log2(`[image-converter] Converted using ImageMagick: ${outputPath}`);
         return outputPath;
       }
@@ -112250,12 +112414,12 @@ function convertImageToJpeg(inputPath, mimeType) {
 }
 function cleanupConvertedImage(filePath) {
   try {
-    const tempDirectory = dirname37(filePath);
-    if (existsSync97(filePath)) {
+    const tempDirectory = dirname38(filePath);
+    if (existsSync98(filePath)) {
       unlinkSync14(filePath);
       log2(`[image-converter] Cleaned up temporary file: ${filePath}`);
     }
-    if (existsSync97(tempDirectory)) {
+    if (existsSync98(tempDirectory)) {
       rmSync5(tempDirectory, { recursive: true, force: true });
       log2(`[image-converter] Cleaned up temporary directory: ${tempDirectory}`);
     }
@@ -112265,9 +112429,9 @@ function cleanupConvertedImage(filePath) {
   }
 }
 function convertBase64ImageToJpeg(base64Data, mimeType) {
-  const tempDir = mkdtempSync(join110(tmpdir7(), "opencode-b64-"));
+  const tempDir = mkdtempSync(join112(tmpdir7(), "opencode-b64-"));
   const inputExt = mimeType.split("/")[1] || "bin";
-  const inputPath = join110(tempDir, `input.${inputExt}`);
+  const inputPath = join112(tempDir, `input.${inputExt}`);
   const tempFiles = [inputPath];
   try {
     const cleanBase64 = base64Data.replace(/^data:[^;]+;base64,/, "");
@@ -115010,7 +115174,8 @@ var syncTaskDeps = {
   createSyncSession,
   sendSyncPrompt,
   pollSyncSession,
-  fetchSyncResult
+  fetchSyncResult,
+  isProviderExhaustionFallbackEligible
 };
 
 // packages/omo-opencode/src/tools/delegate-task/sync-task-metadata.ts
@@ -115196,6 +115361,10 @@ function addRetryTaskToast(input) {
     modelInfo: input.modelInfo
   });
 }
+function shouldRetryPollErrorWithFallback(pollError, deps) {
+  const errorInfo = { message: pollError };
+  return shouldRetryError(errorInfo) || (deps.isProviderExhaustionFallbackEligible?.(errorInfo) ?? false);
+}
 async function runSyncTaskLoop(input) {
   const {
     args,
@@ -115295,7 +115464,7 @@ async function runSyncTaskLoop(input) {
           });
         }
       }
-      const nextFallbackModel = shouldRetryError({ message: pollError }) ? getNextSyncFallbackModel(activeSessionID, fallbackState) : null;
+      const nextFallbackModel = shouldRetryPollErrorWithFallback(pollError, deps) ? getNextSyncFallbackModel(activeSessionID, fallbackState) : null;
       if (!nextFallbackModel) {
         return pollError;
       }
@@ -116384,7 +116553,7 @@ function isExplicitSyncRun(runInBackground) {
   return runInBackground === false || runInBackground === "false";
 }
 // packages/omo-opencode/src/tools/task/task-create.ts
-import { join as join112 } from "path";
+import { join as join114 } from "path";
 
 // packages/omo-opencode/src/tools/task/types.ts
 import { z as z4 } from "zod";
@@ -116439,8 +116608,8 @@ var TaskDeleteInputSchema = z4.object({
 });
 
 // packages/omo-opencode/src/features/claude-tasks/storage.ts
-import { join as join111, dirname as dirname38, basename as basename21, isAbsolute as isAbsolute19 } from "path";
-import { existsSync as existsSync98, mkdirSync as mkdirSync19, readFileSync as readFileSync65, writeFileSync as writeFileSync19, renameSync as renameSync7, unlinkSync as unlinkSync15, readdirSync as readdirSync24 } from "fs";
+import { join as join113, dirname as dirname39, basename as basename21, isAbsolute as isAbsolute19 } from "path";
+import { existsSync as existsSync99, mkdirSync as mkdirSync19, readFileSync as readFileSync65, writeFileSync as writeFileSync19, renameSync as renameSync7, unlinkSync as unlinkSync15, readdirSync as readdirSync24 } from "fs";
 import { randomUUID as randomUUID7 } from "crypto";
 function ignoreClaudeTaskStorageError(error) {
   if (error instanceof Error)
@@ -116451,11 +116620,11 @@ function getTaskDir(config = {}) {
   const tasksConfig = config.sisyphus?.tasks;
   const storagePath = tasksConfig?.storage_path;
   if (storagePath) {
-    return isAbsolute19(storagePath) ? storagePath : join111(process.cwd(), storagePath);
+    return isAbsolute19(storagePath) ? storagePath : join113(process.cwd(), storagePath);
   }
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
   const listId = resolveTaskListId(config);
-  return join111(configDir, "tasks", listId);
+  return join113(configDir, "tasks", listId);
 }
 function sanitizePathSegment(value) {
   return value.replace(/[^a-zA-Z0-9_-]/g, "-") || "default";
@@ -116473,13 +116642,13 @@ function resolveTaskListId(config = {}) {
   return sanitizePathSegment(basename21(process.cwd()));
 }
 function ensureDir(dirPath) {
-  if (!existsSync98(dirPath)) {
+  if (!existsSync99(dirPath)) {
     mkdirSync19(dirPath, { recursive: true });
   }
 }
 function readJsonSafe(filePath, schema) {
   try {
-    if (!existsSync98(filePath)) {
+    if (!existsSync99(filePath)) {
       return null;
     }
     const content = readFileSync65(filePath, "utf-8");
@@ -116495,7 +116664,7 @@ function readJsonSafe(filePath, schema) {
   }
 }
 function writeJsonAtomic(filePath, data) {
-  const dir = dirname38(filePath);
+  const dir = dirname39(filePath);
   ensureDir(dir);
   const tempPath = `${filePath}.tmp.${Date.now()}`;
   try {
@@ -116503,7 +116672,7 @@ function writeJsonAtomic(filePath, data) {
     renameSync7(tempPath, filePath);
   } catch (error) {
     try {
-      if (existsSync98(tempPath)) {
+      if (existsSync99(tempPath)) {
         unlinkSync15(tempPath);
       }
     } catch (cleanupError) {
@@ -116517,7 +116686,7 @@ function generateTaskId() {
   return `T-${randomUUID7()}`;
 }
 function acquireLock3(dirPath) {
-  const lockPath = join111(dirPath, ".lock");
+  const lockPath = join113(dirPath, ".lock");
   const lockId = randomUUID7();
   const createLock = (timestamp) => {
     writeFileSync19(lockPath, JSON.stringify({ id: lockId, timestamp }), {
@@ -116568,7 +116737,7 @@ function acquireLock3(dirPath) {
     acquired: true,
     release: () => {
       try {
-        if (!existsSync98(lockPath))
+        if (!existsSync99(lockPath))
           return;
         const lockContent = readFileSync65(lockPath, "utf-8");
         const lockData = JSON.parse(lockContent);
@@ -116735,7 +116904,7 @@ async function handleCreate(args, config, ctx, context) {
         threadID: context.sessionID
       };
       const validatedTask = TaskObjectSchema.parse(task);
-      writeJsonAtomic(join112(taskDir, `${taskId}.json`), validatedTask);
+      writeJsonAtomic(join114(taskDir, `${taskId}.json`), validatedTask);
       await syncTaskTodoUpdate(ctx, validatedTask, context.sessionID);
       return JSON.stringify({
         task: {
@@ -116757,7 +116926,7 @@ async function handleCreate(args, config, ctx, context) {
   }
 }
 // packages/omo-opencode/src/tools/task/task-get.ts
-import { join as join113 } from "path";
+import { join as join115 } from "path";
 var TASK_ID_PATTERN = /^T-[A-Za-z0-9-]+$/;
 function parseTaskId(id) {
   if (!TASK_ID_PATTERN.test(id))
@@ -116782,7 +116951,7 @@ Returns null if the task does not exist or the file is invalid.`,
           return JSON.stringify({ error: "invalid_task_id" });
         }
         const taskDir = getTaskDir(config);
-        const taskPath = join113(taskDir, `${taskId}.json`);
+        const taskPath = join115(taskDir, `${taskId}.json`);
         const task = readJsonSafe(taskPath, TaskObjectSchema);
         return JSON.stringify({ task: task ?? null });
       } catch (error) {
@@ -116795,8 +116964,8 @@ Returns null if the task does not exist or the file is invalid.`,
   });
 }
 // packages/omo-opencode/src/tools/task/task-list.ts
-import { join as join114 } from "path";
-import { existsSync as existsSync99, readdirSync as readdirSync25 } from "fs";
+import { join as join116 } from "path";
+import { existsSync as existsSync100, readdirSync as readdirSync25 } from "fs";
 function createTaskList(config) {
   return tool({
     description: `List all active tasks with summary information.
@@ -116807,7 +116976,7 @@ Returns summary format: id, subject, status, owner, blockedBy (not full descript
     args: {},
     execute: async () => {
       const taskDir = getTaskDir(config);
-      if (!existsSync99(taskDir)) {
+      if (!existsSync100(taskDir)) {
         return JSON.stringify({ tasks: [] });
       }
       const files = readdirSync25(taskDir).filter((f) => f.endsWith(".json") && f.startsWith("T-")).map((f) => f.replace(".json", ""));
@@ -116816,7 +116985,7 @@ Returns summary format: id, subject, status, owner, blockedBy (not full descript
       }
       const allTasks = [];
       for (const fileId of files) {
-        const task = readJsonSafe(join114(taskDir, `${fileId}.json`), TaskObjectSchema);
+        const task = readJsonSafe(join116(taskDir, `${fileId}.json`), TaskObjectSchema);
         if (task) {
           allTasks.push(task);
         }
@@ -116844,7 +117013,7 @@ Returns summary format: id, subject, status, owner, blockedBy (not full descript
   });
 }
 // packages/omo-opencode/src/tools/task/task-update.ts
-import { join as join115 } from "path";
+import { join as join117 } from "path";
 var TASK_ID_PATTERN2 = /^T-[A-Za-z0-9-]+$/;
 function parseTaskId2(id) {
   if (!TASK_ID_PATTERN2.test(id))
@@ -116892,7 +117061,7 @@ async function handleUpdate(args, config, ctx, context) {
       return JSON.stringify({ error: "task_lock_unavailable" });
     }
     try {
-      const taskPath = join115(taskDir, `${taskId}.json`);
+      const taskPath = join117(taskDir, `${taskId}.json`);
       const task = readJsonSafe(taskPath, TaskObjectSchema);
       if (!task) {
         return JSON.stringify({ error: "task_not_found" });
@@ -118465,7 +118634,7 @@ function createHooks(args) {
   };
 }
 // packages/omo-opencode/src/features/background-agent/manager.ts
-import { join as join117 } from "path";
+import { join as join119 } from "path";
 init_tmux();
 
 // packages/omo-opencode/src/features/background-agent/abort-with-timeout.ts
@@ -118737,9 +118906,23 @@ Use \`background_output(task_id="${task.id}")\` to retrieve this result when rea
 </system-reminder>`;
 }
 
+// packages/omo-opencode/src/features/background-agent/background-task-marker.ts
+var BACKGROUND_COMPLETION_WAKE_PENDING_REASON = "background completion wake pending";
+function writeBackgroundTaskMarker(input) {
+  if (input.activeTaskCount > 0) {
+    setContinuationMarkerSource(input.directory, input.parentSessionID, "background-task", "active", `${input.activeTaskCount} background task(s) active`);
+    return;
+  }
+  if (input.hasUndeliveredParentWake) {
+    setContinuationMarkerSource(input.directory, input.parentSessionID, "background-task", "active", BACKGROUND_COMPLETION_WAKE_PENDING_REASON);
+    return;
+  }
+  setContinuationMarkerSource(input.directory, input.parentSessionID, "background-task", "idle");
+}
+
 // packages/omo-opencode/src/features/background-agent/compaction-aware-message-resolver.ts
 import { readdirSync as readdirSync26, readFileSync as readFileSync66 } from "fs";
-import { join as join116 } from "path";
+import { join as join118 } from "path";
 function hasFullAgentAndModel(message) {
   return !!message.agent && !isCompactionAgent(message.agent) && !!message.model?.providerID && !!message.model?.modelID;
 }
@@ -118818,7 +119001,7 @@ function findNearestMessageExcludingCompaction(messageDir, sessionID) {
     const messages = [];
     for (const file2 of files) {
       try {
-        const content = readFileSync66(join116(messageDir, file2), "utf-8");
+        const content = readFileSync66(join118(messageDir, file2), "utf-8");
         const parsed = JSON.parse(content);
         if (hasCompactionPartInStorage(parsed.id) || isCompactionAgent(parsed.agent)) {
           continue;
@@ -119049,13 +119232,15 @@ var defaultFallbackRetryHandlerDeps = {
   getNextFallback,
   hasMoreFallbacks,
   selectFallbackProvider,
-  transformModelForProvider
+  transformModelForProvider,
+  isProviderExhaustionFallbackEligible
 };
 async function tryFallbackRetry(args) {
   const { task, errorInfo, source, concurrencyManager, client: client3, idleDeferralTimers, queuesByKey, processKey, onRetrying } = args;
   const deps = { ...defaultFallbackRetryHandlerDeps, ...args.deps };
   const fallbackChain = task.fallbackChain;
-  const canRetry = deps.shouldRetryError(errorInfo) && fallbackChain && fallbackChain.length > 0 && deps.hasMoreFallbacks(fallbackChain, task.attemptCount ?? 0);
+  const canUseProviderExhaustionFallback = deps.isProviderExhaustionFallbackEligible(errorInfo);
+  const canRetry = (deps.shouldRetryError(errorInfo) || canUseProviderExhaustionFallback) && fallbackChain && fallbackChain.length > 0 && deps.hasMoreFallbacks(fallbackChain, task.attemptCount ?? 0);
   if (!canRetry)
     return false;
   const attemptCount = task.attemptCount ?? 0;
@@ -119283,7 +119468,8 @@ function cloneParentWake(wake) {
     ...wake.dispatchedAt !== undefined ? { dispatchedAt: wake.dispatchedAt } : {},
     ...wake.noReplyAdmittedAt !== undefined ? { noReplyAdmittedAt: wake.noReplyAdmittedAt } : {},
     ...wake.toolCallDeferralStartedAt !== undefined ? { toolCallDeferralStartedAt: wake.toolCallDeferralStartedAt } : {},
-    ...wake.allowEmptyAssistantTurnRetry !== undefined ? { allowEmptyAssistantTurnRetry: wake.allowEmptyAssistantTurnRetry } : {}
+    ...wake.allowEmptyAssistantTurnRetry !== undefined ? { allowEmptyAssistantTurnRetry: wake.allowEmptyAssistantTurnRetry } : {},
+    ...wake.noAssistantOutputRetryCount !== undefined ? { noAssistantOutputRetryCount: wake.noAssistantOutputRetryCount } : {}
   };
 }
 function isRedundantParentWake(latestWake, dispatchedWake) {
@@ -119815,7 +120001,13 @@ class ParentWakeFlushRunner {
     });
   }
   schedulePendingParentWakeFlush(sessionID, delayMs) {
-    this.deps.pendingQueue.scheduleFlush(sessionID, () => this.flushPendingParentWake(sessionID), delayMs);
+    this.deps.pendingQueue.scheduleFlush(sessionID, async () => {
+      try {
+        await this.flushPendingParentWake(sessionID);
+      } finally {
+        this.deps.notifierDeps.onScheduledFlushSettled?.(sessionID);
+      }
+    }, delayMs);
   }
   deferReplyWakeWhileUnsafe(sessionID, latestWake) {
     if (isFailureParentWake(latestWake)) {
@@ -119927,6 +120119,7 @@ class ParentWakePendingQueue {
       pendingWake.shouldReply = pendingWake.shouldReply || shouldReply;
       if (notificationsChanged) {
         delete pendingWake.noReplyAdmittedAt;
+        delete pendingWake.noAssistantOutputRetryCount;
       }
       return;
     }
@@ -119945,6 +120138,10 @@ class ParentWakePendingQueue {
       pendingWake.noReplyAdmittedAt ??= latestWake.noReplyAdmittedAt;
       pendingWake.toolCallDeferralStartedAt ??= latestWake.toolCallDeferralStartedAt;
       pendingWake.allowEmptyAssistantTurnRetry ||= latestWake.allowEmptyAssistantTurnRetry;
+      const noAssistantOutputRetryCount = Math.max(pendingWake.noAssistantOutputRetryCount ?? 0, latestWake.noAssistantOutputRetryCount ?? 0);
+      if (noAssistantOutputRetryCount > 0) {
+        pendingWake.noAssistantOutputRetryCount = noAssistantOutputRetryCount;
+      }
       return;
     }
     this.pendingParentWakes.set(sessionID, cloneParentWake(latestWake));
@@ -120235,6 +120432,7 @@ class ParentWakeSessionInspector {
 }
 
 // packages/omo-opencode/src/features/background-agent/parent-wake-window-recovery.ts
+var MAX_NO_ASSISTANT_OUTPUT_RETRIES = 1;
 async function handleDispatchedParentWakeWindowElapsed(input) {
   const currentWake = input.dispatchedTracker.getWake(input.sessionID);
   if (!currentWake || currentWake.dispatchedAt !== input.wake.dispatchedAt) {
@@ -120247,9 +120445,22 @@ async function handleDispatchedParentWakeWindowElapsed(input) {
     });
     return;
   }
-  input.dispatchedTracker.refreshWakeTimer(input.sessionID);
-  log2("[background-agent] Kept dispatched parent wake awaiting late failure or assistant output:", {
-    sessionID: input.sessionID
+  const retryCount = input.wake.noAssistantOutputRetryCount ?? 0;
+  if (retryCount >= MAX_NO_ASSISTANT_OUTPUT_RETRIES) {
+    input.dispatchedTracker.clearWake(input.sessionID);
+    log2("[background-agent] Stopped retrying parent wake after repeated no-output dispatch:", {
+      sessionID: input.sessionID,
+      retryCount
+    });
+    return;
+  }
+  input.dispatchedTracker.clearWake(input.sessionID);
+  input.wake.noAssistantOutputRetryCount = retryCount + 1;
+  input.requeueWake(input.wake);
+  input.scheduleFlush();
+  log2("[background-agent] Requeued dispatched parent wake after no assistant output:", {
+    sessionID: input.sessionID,
+    retryCount: input.wake.noAssistantOutputRetryCount
   });
 }
 function logParentWakeWindowRecoveryError(sessionID, error) {
@@ -120273,7 +120484,9 @@ class ParentWakeNotifier {
   dispatchedTracker;
   sessionInspector;
   flushRunner;
+  onPendingWakeRequeued;
   constructor(deps, options) {
+    this.onPendingWakeRequeued = deps.onPendingWakeRequeued;
     this.pendingQueue = new ParentWakePendingQueue({
       pendingRetryMs: options.pendingRetryMs,
       enqueueNotificationForParent: deps.enqueueNotificationForParent
@@ -120285,7 +120498,9 @@ class ParentWakeNotifier {
           sessionID,
           wake,
           dispatchedTracker: this.dispatchedTracker,
-          sessionInspector: this.sessionInspector
+          sessionInspector: this.sessionInspector,
+          requeueWake: (latestWake) => this.requeueWake(sessionID, latestWake),
+          scheduleFlush: () => this.schedulePendingParentWakeFlush(sessionID)
         }).catch((error) => {
           logParentWakeWindowRecoveryError(sessionID, error);
           rescheduleParentWakeWindowRecoveryAfterError(sessionID, wake, this.dispatchedTracker);
@@ -120391,6 +120606,7 @@ class ParentWakeNotifier {
   }
   requeueWake(sessionID, latestWake) {
     this.pendingQueue.requeueWake(sessionID, latestWake);
+    this.onPendingWakeRequeued?.(sessionID);
   }
   async shouldDeferParentWakeForSessionHistory(sessionID, wake) {
     return this.sessionInspector.shouldDeferForHistory(sessionID, wake);
@@ -121589,7 +121805,9 @@ class BackgroundManager {
     this.parentWakeNotifier = new ParentWakeNotifier({
       client: this.client,
       directory: this.directory,
-      enqueueNotificationForParent: this.enqueueNotificationForParent.bind(this)
+      enqueueNotificationForParent: this.enqueueNotificationForParent.bind(this),
+      onPendingWakeRequeued: (sessionID) => this.updateBackgroundTaskMarker(sessionID),
+      onScheduledFlushSettled: (sessionID) => this.updateBackgroundTaskMarker(sessionID)
     }, {
       pendingRetryMs: PENDING_PARENT_WAKE_RETRY_MS,
       acceptedMessageSkewMs: PARENT_WAKE_ACCEPTED_MESSAGE_SKEW_MS,
@@ -122231,16 +122449,20 @@ The fallback retry session is now created and can be inspected directly.
     return this.getTasksByParentSession(sessionID).some((t2) => t2.status === "running" || t2.status === "pending");
   }
   hasPendingParentWake(sessionID) {
-    return this.parentWakeNotifier.hasNotificationPreparation(sessionID) || this.parentWakeNotifier.getPendingParentWakes().has(sessionID) || this.parentWakeNotifier.getPendingParentWakeTimers().has(sessionID) || this.parentWakeNotifier.hasInFlightParentWakeDispatch(sessionID) || this.parentWakeNotifier.getDispatchedParentWakes().has(sessionID);
+    return this.hasUndeliveredParentWake(sessionID) || this.parentWakeNotifier.getDispatchedParentWakes().has(sessionID);
+  }
+  hasUndeliveredParentWake(sessionID) {
+    return this.parentWakeNotifier.hasNotificationPreparation(sessionID) || this.parentWakeNotifier.getPendingParentWakes().has(sessionID) || this.parentWakeNotifier.getPendingParentWakeTimers().has(sessionID) || this.parentWakeNotifier.hasInFlightParentWakeDispatch(sessionID);
   }
   updateBackgroundTaskMarker(parentSessionID) {
     const tasks = this.getTasksByParentSession(parentSessionID);
     const activeTasks = tasks.filter((t2) => t2.status === "running" || t2.status === "pending");
-    if (activeTasks.length > 0) {
-      setContinuationMarkerSource(this.directory, parentSessionID, "background-task", "active", `${activeTasks.length} background task(s) active`);
-    } else {
-      setContinuationMarkerSource(this.directory, parentSessionID, "background-task", "idle");
-    }
+    writeBackgroundTaskMarker({
+      directory: this.directory,
+      parentSessionID,
+      activeTaskCount: activeTasks.length,
+      hasUndeliveredParentWake: this.hasUndeliveredParentWake(parentSessionID)
+    });
   }
   getAllDescendantTasks(sessionID) {
     const result = [];
@@ -122917,6 +123139,7 @@ The fallback retry session is now created and can be inspected directly.
     const releaseNotificationPreparation = () => {
       if (notificationParentSessionID) {
         this.parentWakeNotifier.releaseNotificationPreparation(notificationParentSessionID);
+        this.updateBackgroundTaskMarker(notificationParentSessionID);
       }
     };
     if (task.currentAttemptID) {
@@ -123388,6 +123611,7 @@ The task was re-queued on a fallback model after a retryable failure.
     } finally {
       if (notificationParentSessionID) {
         this.parentWakeNotifier.releaseNotificationPreparation(notificationParentSessionID);
+        this.updateBackgroundTaskMarker(notificationParentSessionID);
       }
     }
   }
@@ -123501,7 +123725,7 @@ The task was re-queued on a fallback model after a retryable failure.
           parentSessionID: task.parentSessionId
         });
       }
-      const messageDir = join117(MESSAGE_STORAGE, task.parentSessionId);
+      const messageDir = join119(MESSAGE_STORAGE, task.parentSessionId);
       const currentMessage = messageDir ? findNearestMessageExcludingCompaction(messageDir, task.parentSessionId) : null;
       agent = currentMessage?.agent ?? task.parentAgent;
       model = currentMessage?.model?.providerID && currentMessage?.model?.modelID ? { providerID: currentMessage.model.providerID, modelID: currentMessage.model.modelID } : undefined;
@@ -123522,9 +123746,14 @@ The task was re-queued on a fallback model after a retryable failure.
   }
   queuePendingParentWake(sessionID, notification, promptContext, shouldReply, delayMs) {
     this.parentWakeNotifier.queuePendingParentWake(sessionID, notification, promptContext, shouldReply, delayMs);
+    this.updateBackgroundTaskMarker(sessionID);
   }
   async flushPendingParentWake(sessionID) {
-    await this.parentWakeNotifier.flushPendingParentWake(sessionID);
+    try {
+      await this.parentWakeNotifier.flushPendingParentWake(sessionID);
+    } finally {
+      this.updateBackgroundTaskMarker(sessionID);
+    }
   }
   hasRunningTasks() {
     for (const task of this.tasks.values()) {
@@ -125085,7 +125314,7 @@ function createMonitorManager(options) {
 import { createHash as createHash6 } from "crypto";
 import {
   chmodSync as chmodSync4,
-  existsSync as existsSync102,
+  existsSync as existsSync103,
   mkdirSync as mkdirSync20,
   readdirSync as readdirSync27,
   readFileSync as readFileSync68,
@@ -125093,15 +125322,15 @@ import {
   unlinkSync as unlinkSync16,
   writeFileSync as writeFileSync21
 } from "fs";
-import { basename as basename22, dirname as dirname39, join as join120 } from "path";
+import { basename as basename22, dirname as dirname40, join as join122 } from "path";
 
 // packages/mcp-client-core/src/config-dir.ts
-import { existsSync as existsSync100, realpathSync as realpathSync17 } from "fs";
+import { existsSync as existsSync101, realpathSync as realpathSync17 } from "fs";
 import { homedir as homedir32 } from "os";
-import { join as join118, resolve as resolve36 } from "path";
+import { join as join120, resolve as resolve36 } from "path";
 function resolveConfigPath4(pathValue) {
   const resolvedPath = resolve36(pathValue);
-  if (!existsSync100(resolvedPath))
+  if (!existsSync101(resolvedPath))
     return resolvedPath;
   try {
     return realpathSync17(resolvedPath);
@@ -125116,13 +125345,13 @@ function getOpenCodeCliConfigDir(env2 = process.env) {
   if (customConfigDir) {
     return resolveConfigPath4(customConfigDir);
   }
-  const xdgConfigDir = env2["XDG_CONFIG_HOME"]?.trim() || join118(homedir32(), ".config");
-  return resolveConfigPath4(join118(xdgConfigDir, "opencode"));
+  const xdgConfigDir = env2["XDG_CONFIG_HOME"]?.trim() || join120(homedir32(), ".config");
+  return resolveConfigPath4(join120(xdgConfigDir, "opencode"));
 }
 
 // packages/mcp-client-core/src/mcp-oauth/storage-index.ts
-import { chmodSync as chmodSync3, existsSync as existsSync101, readFileSync as readFileSync67, renameSync as renameSync8, writeFileSync as writeFileSync20 } from "fs";
-import { join as join119 } from "path";
+import { chmodSync as chmodSync3, existsSync as existsSync102, readFileSync as readFileSync67, renameSync as renameSync8, writeFileSync as writeFileSync20 } from "fs";
+import { join as join121 } from "path";
 var INDEX_FILE_NAME = "index.json";
 function isTokenIndex(value) {
   if (typeof value !== "object" || value === null || Array.isArray(value))
@@ -125130,11 +125359,11 @@ function isTokenIndex(value) {
   return Object.values(value).every((entry) => typeof entry === "string");
 }
 function getIndexPath(storageDir) {
-  return join119(storageDir, INDEX_FILE_NAME);
+  return join121(storageDir, INDEX_FILE_NAME);
 }
 function readTokenIndex(storageDir) {
   const indexPath = getIndexPath(storageDir);
-  if (!existsSync101(indexPath))
+  if (!existsSync102(indexPath))
     return {};
   try {
     const parsed = JSON.parse(readFileSync67(indexPath, "utf-8"));
@@ -125167,16 +125396,16 @@ function saveTokenIndexEntry(storageDir, hash, key) {
 var STORAGE_DIR_NAME = "mcp-oauth";
 var LEGACY_STORAGE_FILE_NAME = "mcp-oauth.json";
 function getMcpOauthStorageDir() {
-  return join120(getOpenCodeCliConfigDir(), STORAGE_DIR_NAME);
+  return join122(getOpenCodeCliConfigDir(), STORAGE_DIR_NAME);
 }
 function getMcpOauthServerHash(serverHost, resource) {
   return createHash6("sha256").update(buildKey(serverHost, resource)).digest("hex").slice(0, 32);
 }
 function getMcpOauthStoragePath(serverHost, resource) {
-  return join120(getMcpOauthStorageDir(), `${getMcpOauthServerHash(serverHost, resource)}.json`);
+  return join122(getMcpOauthStorageDir(), `${getMcpOauthServerHash(serverHost, resource)}.json`);
 }
 function getLegacyStoragePath() {
-  return join120(getOpenCodeCliConfigDir(), LEGACY_STORAGE_FILE_NAME);
+  return join122(getOpenCodeCliConfigDir(), LEGACY_STORAGE_FILE_NAME);
 }
 function normalizeHost(serverHost) {
   let host = serverHost.trim();
@@ -125237,7 +125466,7 @@ function isOAuthTokenData(value) {
   return clientSecret === undefined || typeof clientSecret === "string";
 }
 function readTokenFile(filePath) {
-  if (!existsSync102(filePath))
+  if (!existsSync103(filePath))
     return null;
   try {
     const parsed = JSON.parse(readFileSync68(filePath, "utf-8"));
@@ -125250,7 +125479,7 @@ function readTokenFile(filePath) {
 }
 function readLegacyStore() {
   const filePath = getLegacyStoragePath();
-  if (!existsSync102(filePath))
+  if (!existsSync103(filePath))
     return null;
   try {
     const parsed = JSON.parse(readFileSync68(filePath, "utf-8"));
@@ -125270,8 +125499,8 @@ function readLegacyStore() {
 }
 function writeTokenFile(filePath, token) {
   try {
-    const dir = dirname39(filePath);
-    if (!existsSync102(dir)) {
+    const dir = dirname40(filePath);
+    if (!existsSync103(dir)) {
       mkdirSync20(dir, { recursive: true });
     }
     const tempPath = `${filePath}.tmp.${Date.now()}`;
@@ -130664,15 +130893,15 @@ init_logger2();
 
 // packages/omo-opencode/src/features/tui-sidebar/mirror-io.ts
 import { mkdirSync as mkdirSync21, readFileSync as readFileSync69 } from "fs";
-import { dirname as dirname40 } from "path";
+import { dirname as dirname41 } from "path";
 
 // packages/omo-opencode/src/features/tui-sidebar/mirror-path.ts
 import { createHash as createHash8 } from "crypto";
 import { realpathSync as realpathSync18 } from "fs";
 import { homedir as homedir33 } from "os";
-import { join as join121, resolve as resolve37 } from "path";
+import { join as join123, resolve as resolve37 } from "path";
 function mirrorStorageDir() {
-  return join121(process.env.XDG_DATA_HOME ?? join121(homedir33(), ".local", "share"), "opencode", "storage", "oh-my-openagent", MIRROR_DIR_NAME);
+  return join123(process.env.XDG_DATA_HOME ?? join123(homedir33(), ".local", "share"), "opencode", "storage", "oh-my-openagent", MIRROR_DIR_NAME);
 }
 function canonicalProjectDir(projectDir) {
   try {
@@ -130686,7 +130915,7 @@ function canonicalProjectDir(projectDir) {
 }
 function mirrorFilePath(projectDir) {
   const projectHash = createHash8("sha1").update(canonicalProjectDir(projectDir)).digest("hex").slice(0, 16);
-  return join121(mirrorStorageDir(), `${projectHash}.json`);
+  return join123(mirrorStorageDir(), `${projectHash}.json`);
 }
 
 // packages/omo-opencode/src/features/tui-sidebar/snapshot-schema.ts
@@ -130739,13 +130968,13 @@ var TuiRuntimeSnapshotSchema = z9.object({
 function writeMirror(projectDir, snapshot) {
   const filePath = mirrorFilePath(projectDir);
   const content = JSON.stringify(snapshot);
-  mkdirSync21(dirname40(filePath), { recursive: true });
+  mkdirSync21(dirname41(filePath), { recursive: true });
   writeFileAtomically2(filePath, content, { mode: 384 });
 }
 
 // packages/omo-opencode/src/features/tui-sidebar/loop-reader.ts
 import { readdirSync as readdirSync28, readFileSync as readFileSync70, statSync as statSync13 } from "fs";
-import { join as join122 } from "path";
+import { join as join124 } from "path";
 import { z as z10 } from "zod";
 var CriterionSchema = z10.object({
   status: z10.string()
@@ -130775,7 +131004,7 @@ function enumerateCandidates(projectDir) {
   return [...currentLoopCandidates(projectDir), legacyLoopCandidate(projectDir)].filter((candidate) => candidate !== null);
 }
 function currentLoopCandidates(projectDir) {
-  const loopRoot = join122(projectDir, ".omo", "ulw-loop");
+  const loopRoot = join124(projectDir, ".omo", "ulw-loop");
   let entries;
   try {
     entries = readdirSync28(loopRoot, { withFileTypes: true });
@@ -130785,10 +131014,10 @@ function currentLoopCandidates(projectDir) {
     }
     throw error;
   }
-  return entries.filter((entry) => entry.isDirectory()).map((entry) => statCandidate(join122(loopRoot, entry.name, "goals.json"))).filter((candidate) => candidate !== null);
+  return entries.filter((entry) => entry.isDirectory()).map((entry) => statCandidate(join124(loopRoot, entry.name, "goals.json"))).filter((candidate) => candidate !== null);
 }
 function legacyLoopCandidate(projectDir) {
-  return statCandidate(join122(projectDir, ".omo", "loop", "goals.json"));
+  return statCandidate(join124(projectDir, ".omo", "loop", "goals.json"));
 }
 function statCandidate(path22) {
   try {
@@ -133538,7 +133767,7 @@ async function isTmuxAvailableWithDeps(deps) {
 import {
   appendFileSync as appendFileSync7,
   chmodSync as chmodSync5,
-  existsSync as existsSync104,
+  existsSync as existsSync105,
   renameSync as renameSync10,
   statSync as statSync14,
   unlinkSync as unlinkSync17,
@@ -133546,31 +133775,31 @@ import {
 } from "fs";
 
 // packages/openclaw-core/src/reply-listener-paths.ts
-import { existsSync as existsSync103, mkdirSync as mkdirSync22 } from "fs";
+import { existsSync as existsSync104, mkdirSync as mkdirSync22 } from "fs";
 import { homedir as homedir34 } from "os";
-import { join as join123 } from "path";
+import { join as join125 } from "path";
 var REPLY_LISTENER_SECURE_FILE_MODE = 384;
 function resolveReplyListenerHomeDir() {
   return process.env.HOME ?? process.env.USERPROFILE ?? homedir34();
 }
 function getReplyListenerStateDir() {
-  return join123(resolveReplyListenerHomeDir(), ".omo", "openclaw", "state");
+  return join125(resolveReplyListenerHomeDir(), ".omo", "openclaw", "state");
 }
 function getReplyListenerPidFilePath() {
-  return join123(getReplyListenerStateDir(), "reply-listener.pid");
+  return join125(getReplyListenerStateDir(), "reply-listener.pid");
 }
 function getReplyListenerStateFilePath() {
-  return join123(getReplyListenerStateDir(), "reply-listener-state.json");
+  return join125(getReplyListenerStateDir(), "reply-listener-state.json");
 }
 function getReplyListenerConfigFilePath() {
-  return join123(getReplyListenerStateDir(), "reply-listener-config.json");
+  return join125(getReplyListenerStateDir(), "reply-listener-config.json");
 }
 function getReplyListenerLogFilePath() {
-  return join123(getReplyListenerStateDir(), "reply-listener.log");
+  return join125(getReplyListenerStateDir(), "reply-listener.log");
 }
 function ensureReplyListenerStateDir() {
   const stateDir = getReplyListenerStateDir();
-  if (!existsSync103(stateDir)) {
+  if (!existsSync104(stateDir)) {
     mkdirSync22(stateDir, { recursive: true, mode: 448 });
   }
 }
@@ -133593,13 +133822,13 @@ function writeSecureReplyListenerFile(filePath, content) {
 }
 function rotateReplyListenerLogIfNeeded(logPath) {
   try {
-    if (!existsSync104(logPath))
+    if (!existsSync105(logPath))
       return;
     const stats = statSync14(logPath);
     if (stats.size <= MAX_REPLY_LISTENER_LOG_SIZE_BYTES)
       return;
     const backupPath = `${logPath}.old`;
-    if (existsSync104(backupPath)) {
+    if (existsSync105(backupPath)) {
       unlinkSync17(backupPath);
     }
     renameSync10(logPath, backupPath);
@@ -133626,7 +133855,7 @@ import { constants as constants24, closeSync as closeSync5, openSync as openSync
 
 // packages/openclaw-core/src/session-registry-paths.ts
 init_src();
-import { join as join124 } from "path";
+import { join as join126 } from "path";
 var SECURE_FILE_MODE = 384;
 var MAX_AGE_MS = 24 * 60 * 60 * 1000;
 var LOCK_TIMEOUT_MS = 2000;
@@ -133637,16 +133866,16 @@ var cachedRegistryPaths = null;
 function resolveRegistryPaths() {
   if (cachedRegistryPaths !== null)
     return cachedRegistryPaths;
-  const openClawStorageDir = join124(getOpenCodeStorageDir2(), "openclaw");
+  const openClawStorageDir = join126(getOpenCodeStorageDir2(), "openclaw");
   cachedRegistryPaths = {
     openClawStorageDir,
-    registryPath: join124(openClawStorageDir, "reply-session-registry.jsonl"),
-    registryLockPath: join124(openClawStorageDir, "reply-session-registry.lock")
+    registryPath: join126(openClawStorageDir, "reply-session-registry.jsonl"),
+    registryLockPath: join126(openClawStorageDir, "reply-session-registry.lock")
   };
   return cachedRegistryPaths;
 }
 function getOpenCodeStorageDir2() {
-  return join124(resolveXdgDataDir("opencode"), "opencode", "storage");
+  return join126(resolveXdgDataDir("opencode"), "opencode", "storage");
 }
 function getRegistryPath() {
   return resolveRegistryPaths().registryPath;
@@ -133656,12 +133885,12 @@ function getRegistryLockPath() {
 }
 
 // packages/openclaw-core/src/session-registry-lock.ts
-import { constants as constants23, closeSync as closeSync4, existsSync as existsSync106, openSync as openSync4, readFileSync as readFileSync72, statSync as statSync15, unlinkSync as unlinkSync18, writeSync } from "fs";
+import { constants as constants23, closeSync as closeSync4, existsSync as existsSync107, openSync as openSync4, readFileSync as readFileSync72, statSync as statSync15, unlinkSync as unlinkSync18, writeSync } from "fs";
 import { randomUUID as randomUUID10 } from "crypto";
 
 // packages/openclaw-core/src/session-registry-storage.ts
-import { existsSync as existsSync105, mkdirSync as mkdirSync23, readFileSync as readFileSync71, writeFileSync as writeFileSync23 } from "fs";
-import { dirname as dirname41 } from "path";
+import { existsSync as existsSync106, mkdirSync as mkdirSync23, readFileSync as readFileSync71, writeFileSync as writeFileSync23 } from "fs";
+import { dirname as dirname42 } from "path";
 function isSessionMapping(value) {
   if (typeof value !== "object" || value === null)
     return false;
@@ -133682,14 +133911,14 @@ function isSessionMapping(value) {
   return true;
 }
 function ensureRegistryDir() {
-  const registryDir = dirname41(getRegistryPath());
-  if (!existsSync105(registryDir)) {
+  const registryDir = dirname42(getRegistryPath());
+  if (!existsSync106(registryDir)) {
     mkdirSync23(registryDir, { recursive: true, mode: 448 });
   }
 }
 function readAllMappingsUnsafe() {
   const registryPath = getRegistryPath();
-  if (!existsSync105(registryPath))
+  if (!existsSync106(registryPath))
     return [];
   try {
     const content = readFileSync71(registryPath, "utf-8");
@@ -133743,7 +133972,7 @@ function isPidAlive2(pid) {
 function readLockSnapshot() {
   try {
     const registryLockPath = getRegistryLockPath();
-    if (!existsSync106(registryLockPath))
+    if (!existsSync107(registryLockPath))
       return null;
     const raw = readFileSync72(registryLockPath, "utf-8");
     const trimmed = raw.trim();
@@ -133774,7 +134003,7 @@ function readLockSnapshot() {
 function removeLockIfUnchanged(snapshot) {
   try {
     const registryLockPath = getRegistryLockPath();
-    if (!existsSync106(registryLockPath))
+    if (!existsSync107(registryLockPath))
       return false;
     const currentRaw = readFileSync72(registryLockPath, "utf-8");
     if (currentRaw !== snapshot.raw)
@@ -133946,7 +134175,7 @@ class ReplyListenerRateLimiter {
 }
 
 // packages/openclaw-core/src/reply-listener-state.ts
-import { existsSync as existsSync107, readFileSync as readFileSync73, unlinkSync as unlinkSync19 } from "fs";
+import { existsSync as existsSync108, readFileSync as readFileSync73, unlinkSync as unlinkSync19 } from "fs";
 var REPLY_LISTENER_STARTUP_TOKEN_ENV = "OMO_OPENCLAW_REPLY_LISTENER_STARTUP_TOKEN";
 function ignoreReplyListenerStateReadError(error) {
   if (error instanceof Error)
@@ -134013,7 +134242,7 @@ function createPendingReplyListenerState(startupToken) {
 function readReplyListenerDaemonState() {
   try {
     const stateFilePath = getReplyListenerStateFilePath();
-    if (!existsSync107(stateFilePath))
+    if (!existsSync108(stateFilePath))
       return null;
     return normalizeReplyListenerState(JSON.parse(readFileSync73(stateFilePath, "utf-8")));
   } catch (error) {
@@ -134031,7 +134260,7 @@ function writeReplyListenerDaemonState(state3) {
 function readReplyListenerDaemonConfig() {
   try {
     const configFilePath = getReplyListenerConfigFilePath();
-    if (!existsSync107(configFilePath))
+    if (!existsSync108(configFilePath))
       return null;
     return JSON.parse(readFileSync73(configFilePath, "utf-8"));
   } catch (error) {
@@ -134045,7 +134274,7 @@ function writeReplyListenerDaemonConfig(config) {
 function readReplyListenerPid() {
   try {
     const pidFilePath = getReplyListenerPidFilePath();
-    if (!existsSync107(pidFilePath))
+    if (!existsSync108(pidFilePath))
       return null;
     const pid = Number.parseInt(readFileSync73(pidFilePath, "utf-8").trim(), 10);
     return Number.isNaN(pid) ? null : pid;
@@ -134059,7 +134288,7 @@ function writeReplyListenerPid(pid) {
 }
 function removeReplyListenerPid() {
   const pidFilePath = getReplyListenerPidFilePath();
-  if (existsSync107(pidFilePath)) {
+  if (existsSync108(pidFilePath)) {
     unlinkSync19(pidFilePath);
   }
 }
@@ -134087,8 +134316,8 @@ function getReplyListenerRuntimeSignature(config) {
 // packages/openclaw-core/src/reply-listener-poll-loop.ts
 var PRUNE_INTERVAL_MS = 60 * 60 * 1000;
 // packages/openclaw-core/src/reply-listener-start.ts
-import { dirname as dirname42, join as join125 } from "path";
-import { fileURLToPath as fileURLToPath6 } from "url";
+import { dirname as dirname43, join as join127 } from "path";
+import { fileURLToPath as fileURLToPath7 } from "url";
 
 // packages/openclaw-core/src/reply-listener-spawn.ts
 init_runtime();
@@ -134328,8 +134557,8 @@ function createStartFailureResult(message, state3) {
   };
 }
 function resolveReplyListenerDaemonScript(currentFileUrl) {
-  const currentFilePath = fileURLToPath6(currentFileUrl);
-  return currentFilePath.endsWith(".ts") ? join125(dirname42(currentFilePath), "daemon.ts") : join125(dirname42(currentFilePath), "daemon.js");
+  const currentFilePath = fileURLToPath7(currentFileUrl);
+  return currentFilePath.endsWith(".ts") ? join127(dirname43(currentFilePath), "daemon.ts") : join127(dirname43(currentFilePath), "daemon.js");
 }
 async function startReplyListener(config) {
   const normalizedConfig = getNormalizedReplyListenerConfig(config);
@@ -134752,25 +134981,25 @@ async function createRuntimeSkillSourceServer(options, runtimeEnv = runtime6) {
   };
 }
 // packages/claude-code-compat-core/src/features/claude-code-mcp-loader/loader.ts
-import { existsSync as existsSync108, readFileSync as readFileSync75 } from "fs";
-import { join as join126 } from "path";
+import { existsSync as existsSync109, readFileSync as readFileSync75 } from "fs";
+import { join as join128 } from "path";
 import { homedir as homedir35 } from "os";
 function getMcpConfigPaths() {
   const claudeConfigDir = getClaudeConfigDir3();
   const homeDir = getHomeDir();
   const cwd = process.cwd();
   return [
-    { path: join126(homeDir, ".claude.json"), scope: "user" },
-    { path: join126(claudeConfigDir, ".mcp.json"), scope: "user" },
-    { path: join126(cwd, ".mcp.json"), scope: "project" },
-    { path: join126(cwd, ".claude", ".mcp.json"), scope: "local" }
+    { path: join128(homeDir, ".claude.json"), scope: "user" },
+    { path: join128(claudeConfigDir, ".mcp.json"), scope: "user" },
+    { path: join128(cwd, ".mcp.json"), scope: "project" },
+    { path: join128(cwd, ".claude", ".mcp.json"), scope: "local" }
   ];
 }
 function getHomeDir() {
   return process.env.HOME || process.env.USERPROFILE || homedir35();
 }
 async function loadMcpConfigFile(filePath) {
-  if (!existsSync108(filePath)) {
+  if (!existsSync109(filePath)) {
     return null;
   }
   try {
@@ -134790,7 +135019,7 @@ function getSystemMcpServerNames() {
   const paths2 = getMcpConfigPaths();
   const cwd = process.cwd();
   for (const { path: path22 } of paths2) {
-    if (!existsSync108(path22))
+    if (!existsSync109(path22))
       continue;
     try {
       const content = readFileSync75(path22, "utf-8");
@@ -138936,40 +139165,52 @@ ${styleBlock}`;
 
 // packages/omo-opencode/src/agents/sisyphus-agent-factory.ts
 var MODE = "primary";
+function resolveSisyphusPromptFamily(model) {
+  if (isKimiK27Model(model))
+    return "kimi-k2-7";
+  if (isKimiK2Model(model))
+    return "kimi-k2-6";
+  if (isGpt5_5Model(model))
+    return "gpt-5-5";
+  if (isGptNativeSisyphusModel(model))
+    return "gpt-5-4";
+  if (isClaudeFable5Model(model))
+    return "claude-fable-5";
+  if (isClaudeOpus48Model(model))
+    return "claude-opus-4-8";
+  if (isClaudeOpus47Model(model))
+    return "claude-opus-4-7";
+  if (isGlmModel(model))
+    return "glm-5-2";
+  return "fallback";
+}
 function createSisyphusAgent(model, availableAgents, availableToolNames, availableSkills, availableCategories, useTaskSystem = false) {
   const tools = availableToolNames ? categorizeTools(availableToolNames) : [];
   const skills = availableSkills ?? [];
   const categories = availableCategories ?? [];
   const agents = availableAgents ?? [];
-  if (isKimiK27Model(model)) {
-    return buildGptSisyphusAgentConfig(MODE, model, buildKimiK27SisyphusPrompt(model, agents, tools, skills, categories, useTaskSystem));
-  }
-  if (isKimiK2Model(model)) {
-    return buildGptSisyphusAgentConfig(MODE, model, buildKimiK26SisyphusPrompt(model, agents, tools, skills, categories, useTaskSystem));
-  }
-  if (isGpt5_5Model(model)) {
-    return buildGptSisyphusAgentConfig(MODE, model, buildGpt55SisyphusPrompt(model, agents, tools, skills, categories, useTaskSystem));
-  }
-  if (isGptNativeSisyphusModel(model)) {
-    return buildGptSisyphusAgentConfig(MODE, model, buildGpt54SisyphusPrompt(model, agents, tools, skills, categories, useTaskSystem));
-  }
-  if (isClaudeFable5Model(model)) {
-    return buildClaudeSisyphusAgentConfig(MODE, model, buildClaudeFable5SisyphusPrompt(model, agents, tools, skills, categories, useTaskSystem));
-  }
-  if (isClaudeOpus48Model(model)) {
-    return buildClaudeSisyphusAgentConfig(MODE, model, buildClaudeOpus48SisyphusPrompt(model, agents, tools, skills, categories, useTaskSystem));
-  }
-  if (isClaudeOpus47Model(model)) {
-    return buildClaudeSisyphusAgentConfig(MODE, model, buildClaudeOpus47SisyphusPrompt(model, agents, tools, skills, categories, useTaskSystem));
-  }
-  if (isGlmModel(model)) {
-    return buildGlmSisyphusAgentConfig(MODE, model, buildGlm52SisyphusPrompt(model, agents, tools, skills, categories, useTaskSystem));
-  }
-  const prompt = buildFallbackSisyphusPrompt(model, agents, tools, skills, categories, useTaskSystem);
-  if (isGptModel(model)) {
-    return buildGptSisyphusAgentConfig(MODE, model, prompt);
+  switch (resolveSisyphusPromptFamily(model)) {
+    case "kimi-k2-7":
+      return buildGptSisyphusAgentConfig(MODE, model, buildKimiK27SisyphusPrompt(model, agents, tools, skills, categories, useTaskSystem));
+    case "kimi-k2-6":
+      return buildGptSisyphusAgentConfig(MODE, model, buildKimiK26SisyphusPrompt(model, agents, tools, skills, categories, useTaskSystem));
+    case "gpt-5-5":
+      return buildGptSisyphusAgentConfig(MODE, model, buildGpt55SisyphusPrompt(model, agents, tools, skills, categories, useTaskSystem));
+    case "gpt-5-4":
+      return buildGptSisyphusAgentConfig(MODE, model, buildGpt54SisyphusPrompt(model, agents, tools, skills, categories, useTaskSystem));
+    case "claude-fable-5":
+      return buildClaudeSisyphusAgentConfig(MODE, model, buildClaudeFable5SisyphusPrompt(model, agents, tools, skills, categories, useTaskSystem));
+    case "claude-opus-4-8":
+      return buildClaudeSisyphusAgentConfig(MODE, model, buildClaudeOpus48SisyphusPrompt(model, agents, tools, skills, categories, useTaskSystem));
+    case "claude-opus-4-7":
+      return buildClaudeSisyphusAgentConfig(MODE, model, buildClaudeOpus47SisyphusPrompt(model, agents, tools, skills, categories, useTaskSystem));
+    case "glm-5-2":
+      return buildGlmSisyphusAgentConfig(MODE, model, buildGlm52SisyphusPrompt(model, agents, tools, skills, categories, useTaskSystem));
+    case "fallback": {
+      const prompt = buildFallbackSisyphusPrompt(model, agents, tools, skills, categories, useTaskSystem);
+      return isGptModel(model) ? buildGptSisyphusAgentConfig(MODE, model, prompt) : buildClaudeSisyphusAgentConfig(MODE, model, prompt);
+    }
   }
-  return buildClaudeSisyphusAgentConfig(MODE, model, prompt);
 }
 createSisyphusAgent.mode = MODE;
 // packages/omo-opencode/src/agents/oracle.ts
@@ -141695,15 +141936,15 @@ function createHephaestusAgent(model, availableAgents, availableToolNames, avail
 }
 createHephaestusAgent.mode = MODE9;
 // packages/omo-opencode/src/agents/builtin-agents/resolve-file-uri.ts
-import { existsSync as existsSync109, readFileSync as readFileSync76 } from "fs";
+import { existsSync as existsSync110, readFileSync as readFileSync76 } from "fs";
 import { homedir as homedir36 } from "os";
-import { isAbsolute as isAbsolute20, join as join127, resolve as resolve38 } from "path";
+import { isAbsolute as isAbsolute20, join as join129, resolve as resolve38 } from "path";
 init_logger2();
 var ALLOWED_HOME_SUBDIRS = [
-  join127(homedir36(), ".config", "opencode"),
-  join127(homedir36(), ".config", "oh-my-openagent"),
-  join127(homedir36(), ".omo"),
-  join127(homedir36(), ".opencode")
+  join129(homedir36(), ".config", "opencode"),
+  join129(homedir36(), ".config", "oh-my-openagent"),
+  join129(homedir36(), ".omo"),
+  join129(homedir36(), ".opencode")
 ];
 function isWithinAllowedPaths(filePath, projectRoot) {
   if (isWithinProject(filePath, projectRoot))
@@ -141739,7 +141980,7 @@ function resolvePromptAppend(promptAppend, configDir) {
     });
     return `[WARNING: Path rejected: ${promptAppend} (resolved outside project root ${projectRoot} and allowed home directories; file:// prompts must reside within the project directory, ~/.config/opencode/, ~/.config/oh-my-openagent/, ~/.omo/, or ~/.opencode/)]`;
   }
-  if (!existsSync109(filePath)) {
+  if (!existsSync110(filePath)) {
     return `[WARNING: Could not resolve file URI: ${promptAppend}]`;
   }
   try {
@@ -143231,28 +143472,6 @@ function applyEnvironmentContext(config, directory, options = {}) {
   return { ...config, prompt: config.prompt + envContext };
 }
 
-// packages/omo-opencode/src/agents/builtin-agents/model-resolution.ts
-function applyModelResolution(input) {
-  const { uiSelectedModel, userModel, requirement, availableModels, systemDefaultModel } = input;
-  return resolveModelPipeline2({
-    intent: { uiSelectedModel, userModel },
-    constraints: { availableModels },
-    policy: { fallbackChain: requirement?.fallbackChain, systemDefaultModel }
-  });
-}
-function getFirstFallbackModel(requirement) {
-  const entry = requirement?.fallbackChain?.[0];
-  if (!entry || entry.providers.length === 0)
-    return;
-  const provider = entry.providers[0];
-  const transformedModel = transformModelForProvider(provider, entry.model);
-  return {
-    model: `${provider}/${transformedModel}`,
-    provenance: "provider-fallback",
-    variant: entry.variant
-  };
-}
-
 // packages/omo-opencode/src/agents/builtin-agents/general-agents.ts
 init_logger2();
 function collectPendingBuiltinAgents(input) {
@@ -143349,6 +143568,33 @@ function collectPendingBuiltinAgents(input) {
 
 // packages/omo-opencode/src/agents/builtin-agents/sisyphus-agent.ts
 init_logger2();
+
+// packages/omo-opencode/src/agents/sisyphus-runtime-prompt-reconciler.ts
+var context;
+function setSisyphusRuntimePromptContext(ctx) {
+  context = ctx;
+}
+function reconcileSisyphusRuntimePrompt(system, runtimeModel) {
+  if (!runtimeModel || !context)
+    return false;
+  if (resolveSisyphusPromptFamily(runtimeModel) === resolveSisyphusPromptFamily(context.configuredModel)) {
+    return false;
+  }
+  const rebuilt = context.rebuildPromptForModel(runtimeModel);
+  if (rebuilt === context.bakedPrompt)
+    return false;
+  let swapped = false;
+  for (let i = 0;i < system.length; i++) {
+    const part = system[i];
+    if (part.includes(context.bakedPrompt)) {
+      system[i] = part.split(context.bakedPrompt).join(rebuilt);
+      swapped = true;
+    }
+  }
+  return swapped;
+}
+
+// packages/omo-opencode/src/agents/builtin-agents/sisyphus-agent.ts
 function maybeCreateSisyphusConfig(input) {
   const {
     disabledAgents,
@@ -143404,6 +143650,16 @@ function maybeCreateSisyphusConfig(input) {
   sisyphusConfig = applyEnvironmentContext(sisyphusConfig, directory, {
     disableOmoEnv
   });
+  setSisyphusRuntimePromptContext({
+    configuredModel: sisyphusModel,
+    bakedPrompt: sisyphusConfig.prompt ?? "",
+    rebuildPromptForModel: (runtimeModel) => {
+      let rebuilt = createSisyphusAgent(runtimeModel, availableAgents, undefined, availableSkills, availableCategories, useTaskSystem);
+      rebuilt = applyOverrides(rebuilt, sisyphusOverride, mergedCategories, directory);
+      rebuilt = applyEnvironmentContext(rebuilt, directory, { disableOmoEnv });
+      return rebuilt.prompt ?? "";
+    }
+  });
   return sisyphusConfig;
 }
 
@@ -143700,7 +143956,7 @@ function isDisabledConfigSkillEntryName(name, disabledSkills) {
   return disabledSkills.has(normalizeSkillAliasName2(name));
 }
 async function createSkillContext(args) {
-  const { directory, pluginConfig } = args;
+  const { directory, pluginConfig, hostSkills } = args;
   const browserProvider = pluginConfig.browser_automation_engine?.provider ?? "playwright";
   const disabledSkills = collectDisabledSkillAliases(pluginConfig);
   const builtinSkills = resolveActiveBuiltinSkills({
@@ -143710,7 +143966,7 @@ async function createSkillContext(args) {
     systemMcpNames: getSystemMcpServerNames()
   });
   const includeClaudeSkills = pluginConfig.claude_code?.skills !== false;
-  const hostSkillConfig = adaptHostSkillConfig(readOpencodeConfigSkills(directory));
+  const hostSkillConfig = adaptHostSkillConfig(hostSkills ?? readOpencodeConfigSkills(directory));
   const [
     configSourceSkills,
     hostConfigSkills,
@@ -144394,7 +144650,7 @@ async function applyAgentConfig(params) {
 }
 // packages/claude-code-compat-core/src/features/claude-code-command-loader/loader.ts
 import { promises as fs23 } from "fs";
-import { join as join128, basename as basename24 } from "path";
+import { join as join130, basename as basename24 } from "path";
 
 // packages/claude-code-compat-core/src/features/claude-code-command-loader/loader-cache.ts
 var commandLoaderCache = new Map;
@@ -144442,7 +144698,7 @@ async function loadCommandsFromDir(commandsDir, scope, visited = new Set, prefix
         continue;
       if (entry.name.startsWith("."))
         continue;
-      const subDirPath = join128(commandsDir, entry.name);
+      const subDirPath = join130(commandsDir, entry.name);
       const subPrefix = prefix ? `${prefix}/${entry.name}` : entry.name;
       const subCommands = await loadCommandsFromDir(subDirPath, scope, visited, subPrefix);
       commands.push(...subCommands);
@@ -144450,7 +144706,7 @@ async function loadCommandsFromDir(commandsDir, scope, visited = new Set, prefix
     }
     if (!isMarkdownFile(entry))
       continue;
-    const commandPath = join128(commandsDir, entry.name);
+    const commandPath = join130(commandsDir, entry.name);
     const baseCommandName = basename24(entry.name, ".md");
     const commandName = prefix ? `${prefix}/${baseCommandName}` : baseCommandName;
     try {
@@ -144513,12 +144769,12 @@ function commandsToRecord(commands) {
   return result;
 }
 async function loadUserCommands() {
-  const userCommandsDir = join128(getClaudeConfigDir3(), "commands");
+  const userCommandsDir = join130(getClaudeConfigDir3(), "commands");
   const commands = await loadCommandsFromDir(userCommandsDir, "user");
   return commandsToRecord(commands);
 }
 async function loadProjectCommands(directory) {
-  const projectCommandsDir = join128(directory ?? process.cwd(), ".claude", "commands");
+  const projectCommandsDir = join130(directory ?? process.cwd(), ".claude", "commands");
   const commands = await loadCommandsFromDir(projectCommandsDir, "project");
   return commandsToRecord(commands);
 }
@@ -144695,8 +144951,8 @@ var grep_app = {
 
 // packages/omo-opencode/src/mcp/codegraph.ts
 init_src();
-import { existsSync as existsSync110 } from "fs";
-import { join as join129 } from "path";
+import { existsSync as existsSync111 } from "fs";
+import { join as join131 } from "path";
 
 // packages/omo-opencode/src/mcp/runtime-executable.ts
 init_bun_which_shim();
@@ -144743,7 +144999,7 @@ function createWhichResolver(resolveExecutable) {
 function provisionedBinFromInstallDir2(installDir, fileExists2) {
   if (installDir === undefined)
     return null;
-  const candidate = join129(installDir, "bin", process.platform === "win32" ? "codegraph.cmd" : "codegraph");
+  const candidate = join131(installDir, "bin", process.platform === "win32" ? "codegraph.cmd" : "codegraph");
   return fileExists2(candidate) ? candidate : null;
 }
 function codegraphEnvForConfig(config, homeDir) {
@@ -144754,7 +145010,7 @@ function createCodegraphMcpConfig(options = {}) {
   const env2 = options.env ?? process.env;
   const resolveExecutable = options.resolveExecutable ?? resolveRuntimeExecutable;
   const which2 = createWhichResolver(resolveExecutable);
-  const fileExists2 = options.fileExists ?? existsSync110;
+  const fileExists2 = options.fileExists ?? existsSync111;
   const resolvedCommand = resolveCodegraphCommand({
     env: env2,
     fileExists: fileExists2,
@@ -144780,9 +145036,9 @@ function createCodegraphMcpConfig(options = {}) {
 }
 
 // packages/omo-opencode/src/mcp/lsp.ts
-import { existsSync as existsSync111 } from "fs";
-import { delimiter as delimiter2, dirname as dirname43, resolve as resolve40 } from "path";
-import { fileURLToPath as fileURLToPath7 } from "url";
+import { existsSync as existsSync112 } from "fs";
+import { delimiter as delimiter2, dirname as dirname44, resolve as resolve40 } from "path";
+import { fileURLToPath as fileURLToPath8 } from "url";
 
 // packages/omo-opencode/src/mcp/cli-suffix.ts
 function normalizeCliPath(path22) {
@@ -144868,7 +145124,7 @@ var LSP_BOOTSTRAP_SCRIPT = [
 ].join(";");
 function getModuleDirectory(moduleUrl) {
   try {
-    return dirname43(fileURLToPath7(moduleUrl));
+    return dirname44(fileURLToPath8(moduleUrl));
   } catch (error) {
     if (!(error instanceof Error))
       throw error;
@@ -144892,7 +145148,7 @@ function createBootstrapCandidate(root, pathExists, resolveExecutable) {
   };
 }
 function resolveLspCommand(options = {}) {
-  const pathExists = options.exists ?? existsSync111;
+  const pathExists = options.exists ?? existsSync112;
   const resolveExecutable = options.resolveExecutable ?? resolveRuntimeExecutable;
   const moduleDirectory = getModuleDirectory(options.moduleUrl ?? import.meta.url);
   const candidates = moduleDirectory ? createAncestorCliCandidates({
@@ -145528,6 +145784,37 @@ function createTeamModeToolsRecord(args) {
   };
 }
 
+// packages/omo-opencode/src/plugin/runtime-skill-resolver.ts
+async function readRuntimeHostSkills(client3) {
+  try {
+    const result = await client3.config.get();
+    const skills = result.data?.skills;
+    if (skills && typeof skills === "object") {
+      return skills;
+    }
+  } catch {}
+  return;
+}
+function createRuntimeSkillsResolver(args) {
+  const { baseSkills, readRuntimeHostSkills: readHostSkills, buildMergedSkills } = args;
+  let inflight;
+  const resolve41 = async () => {
+    const hostSkills = await readHostSkills();
+    if (!hostSkills)
+      return baseSkills;
+    try {
+      return await buildMergedSkills(hostSkills);
+    } catch {
+      return baseSkills;
+    }
+  };
+  return () => {
+    if (!inflight)
+      inflight = resolve41();
+    return inflight;
+  };
+}
+
 // packages/omo-opencode/src/plugin/tool-registry-core-tools.ts
 function createCoreTools(args) {
   const { ctx, pluginConfig, managers, skillContext, availableCategories, factories } = args;
@@ -145581,9 +145868,14 @@ function createCoreTools(args) {
     }
   });
   const getSessionIDForMcp = () => getMainSessionID();
+  const getLoadedSkillsForMcp = createRuntimeSkillsResolver({
+    baseSkills: skillContext.mergedSkills,
+    readRuntimeHostSkills: () => readRuntimeHostSkills(ctx.client),
+    buildMergedSkills: async (hostSkills) => (await createSkillContext({ directory: ctx.directory, pluginConfig, hostSkills })).mergedSkills
+  });
   const skillMcpTool = factories.createSkillMcpTool({
     manager: managers.skillMcpManager,
-    getLoadedSkills: () => skillContext.mergedSkills,
+    getLoadedSkills: getLoadedSkillsForMcp,
     getSessionID: getSessionIDForMcp
   });
   const commands2 = factories.discoverCommandsSync(ctx.directory, {
@@ -147821,8 +148113,8 @@ function createChatHeadersHandler(args) {
 }
 
 // packages/omo-opencode/src/plugin/ultrawork-db-model-override.ts
-import { join as join130 } from "path";
-import { existsSync as existsSync112 } from "fs";
+import { join as join132 } from "path";
+import { existsSync as existsSync113 } from "fs";
 async function importBunSqlite() {
   if (typeof globalThis.Bun === "undefined") {
     return null;
@@ -147838,7 +148130,7 @@ async function importBunSqlite() {
   }
 }
 function getDbPath() {
-  return join130(getDataDir(), "opencode", "opencode.db");
+  return join132(getDataDir(), "opencode", "opencode.db");
 }
 var MAX_MICROTASK_RETRIES = 10;
 function logCaughtDbError(message, metadata, error) {
@@ -147941,7 +148233,7 @@ async function scheduleDeferredModelOverride(messageId, targetModel, variant) {
     return;
   }
   const dbPath = getDbPath();
-  if (!existsSync112(dbPath)) {
+  if (!existsSync113(dbPath)) {
     log2("[ultrawork-db-override] DB not found, skipping deferred override");
     return;
   }
@@ -148642,6 +148934,7 @@ function isFalsy(value) {
 var ULTRAWORK_MODE_TAG = "<ultrawork-mode>";
 function createSystemTransformHandler(defaultMode, getUltraworkMessage2, env2 = process.env) {
   return async (input, output) => {
+    reconcileSisyphusRuntimePrompt(output.system, input.model?.id);
     const sparkshellAwareness = getSparkShellRuntimeAwareness(env2);
     if (sparkshellAwareness.length > 0 && !output.system.some(hasSparkShellRuntimeAwareness)) {
       output.system.push(sparkshellAwareness);
@@ -150718,6 +151011,7 @@ var ClaudeCodeConfigSchema = z22.object({
 // packages/omo-opencode/src/config/schema/codegraph.ts
 import { z as z23 } from "zod";
 var CodegraphConfigSchema = z23.object({
+  auto_init: z23.boolean().default(true),
   auto_provision: z23.boolean().default(true),
   enabled: z23.boolean().default(true),
   install_dir: z23.string().optional(),
@@ -150962,7 +151256,8 @@ var RuntimeFallbackConfigSchema = z39.object({
   max_fallback_attempts: z39.number().min(1).max(20).optional(),
   cooldown_seconds: z39.number().min(0).optional(),
   timeout_seconds: z39.number().min(0).optional(),
-  notify_on_fallback: z39.boolean().optional()
+  notify_on_fallback: z39.boolean().optional(),
+  restore_primary_after_cooldown: z39.boolean().optional()
 });
 
 // packages/team-core/src/config.ts
@@ -151528,9 +151823,9 @@ function createSessionCompactingHandler(hooks2) {
     });
     await runCompactionStep("compactionContextInjector.inject", input.sessionID, () => {
       const inject = hooks2.compactionContextInjector?.inject;
-      const context = inject ? inject(input.sessionID) : undefined;
-      if (context) {
-        output.context.push(context);
+      const context2 = inject ? inject(input.sessionID) : undefined;
+      if (context2) {
+        output.context.push(context2);
       }
     });
   };