oh-my-opencode 4.18.1 → 4.18.2

package/dist/index.js

@@ -9046,10 +9046,10 @@ async function runTmuxCommandOnce(tmuxPath, args, timeoutMs) {
   try {
     const exitCodeOrTimeout = timeoutMs === undefined ? await subprocess.exited : await Promise.race([
       subprocess.exited,
-      new Promise((resolve11) => {
+      new Promise((resolve10) => {
         timeoutId = setTimeout(() => {
           abortController.abort();
-          resolve11("timeout");
+          resolve10("timeout");
         }, timeoutMs);
       })
     ]);
@@ -9109,7 +9109,7 @@ function getCurrentPaneId() {
 
 // packages/tmux-core/src/tmux-utils/server-health.ts
 function delay(milliseconds) {
-  return new Promise((resolve11) => setTimeout(resolve11, milliseconds));
+  return new Promise((resolve10) => setTimeout(resolve10, milliseconds));
 }
 function markServerRunningInProcess() {
   globalThis[SERVER_RUNNING_KEY] = true;
@@ -9309,7 +9309,7 @@ var init_pane_spawn = __esm(() => {
 
 // packages/tmux-core/src/tmux-utils/pane-close.ts
 function delay2(milliseconds) {
-  return new Promise((resolve11) => setTimeout(resolve11, milliseconds));
+  return new Promise((resolve10) => setTimeout(resolve10, milliseconds));
 }
 async function closeTmuxPane(paneId) {
   const [{ isInsideTmux: isInsideTmux2 }, { runTmuxCommand: runTmuxCommand2 }] = await Promise.all([
@@ -10141,7 +10141,7 @@ __export(exports_pane_close, {
   closeTmuxPane: () => closeTmuxPane2
 });
 function delay3(milliseconds) {
-  return new Promise((resolve11) => setTimeout(resolve11, milliseconds));
+  return new Promise((resolve10) => setTimeout(resolve10, milliseconds));
 }
 async function closeTmuxPane2(paneId) {
   const [{ log: log4 }, { isInsideTmux: isInsideTmux2 }, { getTmuxPath: getTmuxPath2 }, { runTmuxCommand: runTmuxCommand2 }] = await Promise.all([
@@ -10594,12 +10594,12 @@ var require_isexe = __commonJS((exports, module) => {
       if (typeof Promise !== "function") {
         throw new TypeError("callback not provided");
       }
-      return new Promise(function(resolve11, reject) {
+      return new Promise(function(resolve10, reject) {
         isexe(path8, options || {}, function(er, is) {
           if (er) {
             reject(er);
           } else {
-            resolve11(is);
+            resolve10(is);
           }
         });
       });
@@ -10661,27 +10661,27 @@ var require_which = __commonJS((exports, module) => {
       opt = {};
     const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
     const found = [];
-    const step = (i) => new Promise((resolve11, reject) => {
+    const step = (i) => new Promise((resolve10, reject) => {
       if (i === pathEnv.length)
-        return opt.all && found.length ? resolve11(found) : reject(getNotFoundError(cmd));
+        return opt.all && found.length ? resolve10(found) : reject(getNotFoundError(cmd));
       const ppRaw = pathEnv[i];
       const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
       const pCmd = path8.join(pathPart, cmd);
       const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
-      resolve11(subStep(p, i, 0));
+      resolve10(subStep(p, i, 0));
     });
-    const subStep = (p, i, ii) => new Promise((resolve11, reject) => {
+    const subStep = (p, i, ii) => new Promise((resolve10, reject) => {
       if (ii === pathExt.length)
-        return resolve11(step(i + 1));
+        return resolve10(step(i + 1));
       const ext = pathExt[ii];
       isexe(p + ext, { pathExt: pathExtExe }, (er, is) => {
         if (!er && is) {
           if (opt.all)
             found.push(p + ext);
           else
-            return resolve11(p + ext);
+            return resolve10(p + ext);
         }
-        return resolve11(subStep(p, i, ii + 1));
+        return resolve10(subStep(p, i, ii + 1));
       });
     });
     return cb ? step(0).then((res) => cb(null, res), cb) : step(0);
@@ -13005,7 +13005,7 @@ var init_types2 = __esm(() => {
 
 // packages/team-core/src/team-registry/paths.ts
 import { mkdir as mkdir3, readdir as readdir2, stat as stat2, chmod as chmod3 } from "fs/promises";
-import { homedir as homedir23 } from "os";
+import { homedir as homedir22 } from "os";
 import path14 from "path";
 function getTeamDirectory(baseDir, teamName, scope, projectRoot) {
   if (scope === "project") {
@@ -13028,14 +13028,14 @@ function resolveContainedPath2(baseDir, pathSegments) {
   return resolvedPath;
 }
 function resolveBaseDir(config) {
-  return expandHomeDirectory(config.base_dir ?? path14.join(homedir23(), ".omo"));
+  return expandHomeDirectory(config.base_dir ?? path14.join(homedir22(), ".omo"));
 }
 function expandHomeDirectory(directoryPath) {
   if (directoryPath === "~") {
-    return homedir23();
+    return homedir22();
   }
   if (directoryPath.startsWith("~/") || directoryPath.startsWith("~\\")) {
-    return path14.join(homedir23(), directoryPath.slice(2));
+    return path14.join(homedir22(), directoryPath.slice(2));
   }
   return directoryPath;
 }
@@ -13187,8 +13187,8 @@ import { randomUUID as randomUUID5 } from "crypto";
 import { access as access3, open, readFile as readFile4, rename as rename3, rm as rm3, unlink as unlink2 } from "fs/promises";
 import { dirname as dirname24 } from "path";
 function delay4(ms) {
-  return new Promise((resolve20) => {
-    setTimeout(resolve20, ms);
+  return new Promise((resolve19) => {
+    setTimeout(resolve19, ms);
   });
 }
 function buildOwnerContent(ownerTag) {
@@ -16591,7 +16591,7 @@ var require_compile = __commonJS((exports) => {
     const schOrFunc = root.refs[ref];
     if (schOrFunc)
       return schOrFunc;
-    let _sch = resolve36.call(this, root, ref);
+    let _sch = resolve35.call(this, root, ref);
     if (_sch === undefined) {
       const schema = (_a = root.localRefs) === null || _a === undefined ? undefined : _a[ref];
       const { schemaId } = this.opts;
@@ -16618,7 +16618,7 @@ var require_compile = __commonJS((exports) => {
   function sameSchemaEnv(s1, s2) {
     return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId;
   }
-  function resolve36(root, ref) {
+  function resolve35(root, ref) {
     let sch;
     while (typeof (sch = this.refs[ref]) == "string")
       ref = sch;
@@ -17204,7 +17204,7 @@ var require_fast_uri = __commonJS((exports, module) => {
     }
     return uri;
   }
-  function resolve36(baseURI, relativeURI, options) {
+  function resolve35(baseURI, relativeURI, options) {
     const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
     const resolved = resolveComponent(parse3(baseURI, schemelessOptions), parse3(relativeURI, schemelessOptions), schemelessOptions, true);
     schemelessOptions.skipEscape = true;
@@ -17463,7 +17463,7 @@ var require_fast_uri = __commonJS((exports, module) => {
   var fastUri = {
     SCHEMES,
     normalize: normalize4,
-    resolve: resolve36,
+    resolve: resolve35,
     resolveComponent,
     equal,
     serialize,
@@ -20867,7 +20867,7 @@ function resolveFilePath(filePath, cwd) {
 }
 function readFileContent(resolvedPath) {
   if (!existsSync11(resolvedPath)) {
-    return `[file not found: ${resolvedPath}]`;
+    return null;
   }
   const stat2 = statSync4(resolvedPath);
   if (stat2.isDirectory()) {
@@ -20897,13 +20897,16 @@ async function resolveFileReferencesInText(text, cwd = process.cwd(), depth = 0,
       continue;
     }
     const content = readFileContent(resolvedPath);
+    if (content === null) {
+      continue;
+    }
     replacements.set(match.fullMatch, content);
   }
   let resolved = text;
   for (const [pattern, replacement] of replacements.entries()) {
     resolved = resolved.replaceAll(pattern, replacement);
   }
-  if (findFileReferences(resolved).length > 0 && depth + 1 < maxDepth) {
+  if (replacements.size > 0 && findFileReferences(resolved).length > 0 && depth + 1 < maxDepth) {
     return resolveFileReferencesInText(resolved, cwd, depth + 1, maxDepth);
   }
   return resolved;
@@ -20941,7 +20944,7 @@ var AGENT_MODEL_REQUIREMENTS = {
   hephaestus: {
     fallbackChain: [
       {
-        providers: ["openai", "vercel"],
+        providers: ["openai", "github-copilot", "vercel"],
         model: "gpt-5.6-sol",
         variant: "high"
       },
@@ -21052,6 +21055,11 @@ var AGENT_MODEL_REQUIREMENTS = {
         model: "gpt-5.6-sol",
         variant: "xhigh"
       },
+      {
+        providers: ["github-copilot"],
+        model: "gpt-5.6-sol",
+        variant: "high"
+      },
       {
         providers: ["openai", "github-copilot", "opencode", "vercel"],
         model: "gpt-5.5",
@@ -21126,6 +21134,11 @@ var CATEGORY_MODEL_REQUIREMENTS = {
         model: "gpt-5.6-sol",
         variant: "xhigh"
       },
+      {
+        providers: ["github-copilot"],
+        model: "gpt-5.6-sol",
+        variant: "high"
+      },
       {
         providers: ["openai", "opencode", "vercel"],
         model: "gpt-5.5",
@@ -21152,7 +21165,12 @@ var CATEGORY_MODEL_REQUIREMENTS = {
         variant: "xhigh"
       },
       {
-        providers: ["openai", "vercel"],
+        providers: ["github-copilot"],
+        model: "gpt-5.6-terra",
+        variant: "high"
+      },
+      {
+        providers: ["openai", "github-copilot", "vercel"],
         model: "gpt-5.6-sol",
         variant: "high"
       },
@@ -21219,6 +21237,11 @@ var CATEGORY_MODEL_REQUIREMENTS = {
         model: "gpt-5.6-luna",
         variant: "xhigh"
       },
+      {
+        providers: ["github-copilot"],
+        model: "gpt-5.6-luna",
+        variant: "high"
+      },
       {
         providers: ["anthropic", "github-copilot", "opencode", "vercel"],
         model: "claude-sonnet-4-6"
@@ -21381,6 +21404,14 @@ var EXACT_ALIAS_RULES = [
 ];
 var EXACT_ALIAS_RULES_BY_MODEL = new Map(EXACT_ALIAS_RULES.map((rule) => [rule.aliasModelID, rule]));
 var PATTERN_ALIAS_RULES = [
+  {
+    ruleID: "openai-gpt-5.6-fast-service-tier-alias",
+    description: "Normalizes OpenCode's OpenAI GPT-5.6 fast service-tier IDs to canonical snapshot IDs.",
+    providerIDs: ["openai"],
+    allowedSubproviderHosts: ["vercel"],
+    match: (normalizedModelID) => /^gpt-5\.6-(?:sol|terra|luna)-fast$/.test(normalizedModelID),
+    canonicalize: (normalizedModelID) => normalizedModelID.slice(0, -"-fast".length)
+  },
   {
     ruleID: "claude-thinking-legacy-alias",
     description: "Normalizes the legacy claude-opus-4-7-thinking id to the canonical snapshot ID.",
@@ -21404,9 +21435,12 @@ function stripProviderPrefixForAliasLookup(normalizedModelID) {
   }
   return normalizedModelID.slice(slashIndex + 1);
 }
-function resolveModelIDAlias(modelID) {
+function resolveModelIDAlias(modelID, providerID) {
   const requestedModelID = normalizeLookupModelID(modelID);
   const aliasLookupModelID = stripProviderPrefixForAliasLookup(requestedModelID);
+  const normalizedProviderID = providerID ? normalizeLookupModelID(providerID) : undefined;
+  const providerPrefixEnd = requestedModelID.indexOf("/");
+  const embeddedProviderID = providerPrefixEnd > 0 ? requestedModelID.slice(0, providerPrefixEnd) : undefined;
   const exactRule = EXACT_ALIAS_RULES_BY_MODEL.get(aliasLookupModelID);
   if (exactRule) {
     return {
@@ -21417,6 +21451,13 @@ function resolveModelIDAlias(modelID) {
     };
   }
   for (const rule of PATTERN_ALIAS_RULES) {
+    if (rule.providerIDs) {
+      const matchesProviderID = normalizedProviderID !== undefined && rule.providerIDs.includes(normalizedProviderID);
+      const matchesEmbeddedProviderID = normalizedProviderID !== undefined && rule.allowedSubproviderHosts?.includes(normalizedProviderID) === true && embeddedProviderID !== undefined && rule.providerIDs.includes(embeddedProviderID);
+      if (!matchesProviderID && !matchesEmbeddedProviderID) {
+        continue;
+      }
+    }
     if (!rule.match(aliasLookupModelID)) {
       continue;
     }
@@ -21922,21 +21963,25 @@ function resolveModelPipeline(request, providerCache = {
     } else {
       for (const entry of fallbackChain) {
         for (const provider of entry.providers) {
-          const fullModel = `${provider}/${entry.model}`;
-          const match = deps.fuzzyMatchModel(fullModel, availableModels, [provider]);
-          if (match) {
-            log3("Model resolved via fallback chain (availability confirmed)", {
-              provider,
-              model: entry.model,
-              match,
-              variant: entry.variant
-            });
-            return {
-              model: match,
-              provenance: "provider-fallback",
-              variant: entry.variant,
-              attempted
-            };
+          const transformedModelId = deps.transformModelForProvider(provider, entry.model);
+          const candidateModelIds = transformedModelId === entry.model ? [entry.model] : [entry.model, transformedModelId];
+          for (const modelID of candidateModelIds) {
+            const fullModel = `${provider}/${modelID}`;
+            const match = deps.fuzzyMatchModel(fullModel, availableModels, [provider]);
+            if (match) {
+              log3("Model resolved via fallback chain (availability confirmed)", {
+                provider,
+                model: entry.model,
+                match,
+                variant: entry.variant
+              });
+              return {
+                model: match,
+                provenance: "provider-fallback",
+                variant: entry.variant,
+                attempted
+              };
+            }
           }
         }
       }
@@ -22855,7 +22900,7 @@ function getProviderOverride(providerID, modelID) {
   return GITHUB_COPILOT_GPT5_MODEL.test(normalizeLookupModelID2(modelID)) ? GITHUB_COPILOT_GPT5_OVERRIDE : undefined;
 }
 function getModelCapabilities(input) {
-  const canonicalization = resolveModelIDAlias(input.modelID);
+  const canonicalization = resolveModelIDAlias(input.modelID, input.providerID);
   const override = getOverride(input.modelID);
   const providerOverride = getProviderOverride(input.providerID, canonicalization.canonicalModelID);
   const runtimeModel = readRuntimeModel(input.runtimeModel ?? input.providerCache?.findProviderModelMetadata(input.providerID, input.modelID));
@@ -24611,34 +24656,18 @@ function migrateAgentConfig(config) {
 }
 // packages/omo-opencode/src/shared/load-opencode-plugins.ts
 import * as fs6 from "fs";
-import * as os4 from "os";
 import * as path6 from "path";
 var opencodePluginsCache = new Map;
-function getWindowsAppdataDir() {
-  return process.env.APPDATA || null;
-}
 function getConfigPaths(directory) {
-  const crossPlatformDir = path6.join(os4.homedir(), ".config");
-  const paths = [
+  const configDirs = getOpenCodeConfigDirs({ binary: "opencode" });
+  return [
     path6.join(directory, ".opencode", "opencode.json"),
     path6.join(directory, ".opencode", "opencode.jsonc"),
-    path6.join(crossPlatformDir, "opencode", "opencode.json"),
-    path6.join(crossPlatformDir, "opencode", "opencode.jsonc")
+    ...configDirs.flatMap((dir) => [
+      path6.join(dir, "opencode.json"),
+      path6.join(dir, "opencode.jsonc")
+    ])
   ];
-  const customConfigDir = process.env.OPENCODE_CONFIG_DIR?.trim();
-  if (customConfigDir) {
-    const resolvedCustomConfigDir = path6.resolve(customConfigDir);
-    paths.push(path6.join(resolvedCustomConfigDir, "opencode.json"));
-    paths.push(path6.join(resolvedCustomConfigDir, "opencode.jsonc"));
-  }
-  if (process.platform === "win32") {
-    const appdataDir = getWindowsAppdataDir();
-    if (appdataDir) {
-      paths.push(path6.join(appdataDir, "opencode", "opencode.json"));
-      paths.push(path6.join(appdataDir, "opencode", "opencode.jsonc"));
-    }
-  }
-  return Array.from(new Set(paths));
 }
 function loadOpencodePlugins(directory) {
   const cachedPluginEntries = opencodePluginsCache.get(directory);
@@ -76477,7 +76506,7 @@ init_route_resolver();
 // node_modules/.bun/@opencode-ai+sdk@1.15.13/node_modules/@opencode-ai/sdk/dist/gen/core/serverSentEvents.gen.js
 var createSseClient = ({ onSseError, onSseEvent, responseTransformer, responseValidator, sseDefaultRetryDelay, sseMaxRetryAttempts, sseMaxRetryDelay, sseSleepFn, url, ...options }) => {
   let lastEventId;
-  const sleep2 = sseSleepFn ?? ((ms) => new Promise((resolve11) => setTimeout(resolve11, ms)));
+  const sleep2 = sseSleepFn ?? ((ms) => new Promise((resolve10) => setTimeout(resolve10, ms)));
   const createStream = async function* () {
     let retryDelay = sseDefaultRetryDelay ?? 3000;
     let attempt = 0;
@@ -78674,11 +78703,11 @@ function getOpenCodeCommandDirs(options) {
 // packages/omo-opencode/src/shared/project-discovery-dirs.ts
 import { execFileSync as execFileSync3 } from "child_process";
 import { existsSync as existsSync21, realpathSync as realpathSync7 } from "fs";
-import { dirname as dirname7, join as join30, resolve as resolve11, win32 as win323 } from "path";
+import { dirname as dirname7, join as join30, resolve as resolve10, win32 as win323 } from "path";
 init_plugin_identity();
 var worktreePathCache = new Map;
 function normalizePath2(path8) {
-  const resolvedPath = process.platform !== "win32" && win323.isAbsolute(path8) ? path8 : resolve11(path8);
+  const resolvedPath = process.platform !== "win32" && win323.isAbsolute(path8) ? path8 : resolve10(path8);
   if (!existsSync21(resolvedPath)) {
     return resolvedPath;
   }
@@ -78746,7 +78775,7 @@ function findAncestorDirectories(startDirectory, targetPaths, stopDirectory) {
   }
 }
 function detectWorktreePath(directory) {
-  const resolvedDirectory = resolve11(directory);
+  const resolvedDirectory = resolve10(directory);
   const cacheKey = pathKey(normalizePath2(resolvedDirectory));
   if (worktreePathCache.has(cacheKey)) {
     return worktreePathCache.get(cacheKey);
@@ -78879,7 +78908,7 @@ var log4 = logger4.log;
 var getLogFilePath2 = logger4.getLogFilePath;
 
 // packages/claude-code-compat-core/src/features/claude-code-plugin-loader/scope-filter.ts
-import { homedir as homedir14 } from "os";
+import { homedir as homedir13 } from "os";
 import { join as join31 } from "path";
 
 // packages/claude-code-compat-core/src/shared/contains-path.ts
@@ -78888,10 +78917,10 @@ init_src();
 // packages/claude-code-compat-core/src/features/claude-code-plugin-loader/scope-filter.ts
 function expandTilde(inputPath) {
   if (inputPath === "~") {
-    return homedir14();
+    return homedir13();
   }
   if (inputPath.startsWith("~/") || inputPath.startsWith("~\\")) {
-    return join31(homedir14(), inputPath.slice(2));
+    return join31(homedir13(), inputPath.slice(2));
   }
   return inputPath;
 }
@@ -78906,13 +78935,13 @@ function shouldLoadPluginForCwd(installation, cwd = process.cwd()) {
 }
 
 // packages/claude-code-compat-core/src/features/claude-code-plugin-loader/discovery-paths.ts
-import { homedir as homedir15 } from "os";
+import { homedir as homedir14 } from "os";
 import { join as join32 } from "path";
 function getPluginsBaseDir() {
   if (process.env.CLAUDE_PLUGINS_HOME) {
     return process.env.CLAUDE_PLUGINS_HOME;
   }
-  return join32(homedir15(), ".claude", "plugins");
+  return join32(homedir14(), ".claude", "plugins");
 }
 function getInstalledPluginsPath(pluginsBaseDir) {
   return join32(pluginsBaseDir ?? getPluginsBaseDir(), "installed_plugins.json");
@@ -78921,7 +78950,7 @@ function getClaudeSettingsPath() {
   if (process.env.CLAUDE_SETTINGS_PATH) {
     return process.env.CLAUDE_SETTINGS_PATH;
   }
-  return join32(homedir15(), ".claude", "settings.json");
+  return join32(homedir14(), ".claude", "settings.json");
 }
 
 // packages/claude-code-compat-core/src/features/claude-code-plugin-loader/installed-plugin-database.ts
@@ -79335,7 +79364,7 @@ import { existsSync as existsSync28, readdirSync as readdirSync7, readFileSync a
 import { join as join37 } from "path";
 
 // packages/utils/src/skill-path-resolver.ts
-import { isAbsolute as isAbsolute6, posix as posix3, relative as relative4, resolve as resolve12, win32 as win324 } from "path";
+import { isAbsolute as isAbsolute6, posix as posix3, relative as relative4, resolve as resolve11, win32 as win324 } from "path";
 function toDisplayPath(path8) {
   return path8.replaceAll("\\", "/");
 }
@@ -79374,7 +79403,7 @@ function resolveSkillPathReferences(content, basePath) {
       }
       return relativePath.endsWith("/") && !resolvedPath2.endsWith("/") ? `${resolvedPath2}/` : resolvedPath2;
     }
-    const resolvedPath = resolve12(normalizedBase, relativePath);
+    const resolvedPath = resolve11(normalizedBase, relativePath);
     const relativePathFromBase = relative4(normalizedBase, resolvedPath);
     if (relativePathFromBase.startsWith("..") || isAbsolute6(relativePathFromBase)) {
       return match;
@@ -80546,6 +80575,13 @@ ${todoList}`;
     log2(`[${HOOK_NAME}] Skipped injection: session was cancelled before prompt`, { sessionID });
     return;
   }
+  if (injectionState?.continuationBlockReason) {
+    log2(`[${HOOK_NAME}] Skipped injection: continuation paused at turn boundary`, {
+      sessionID,
+      reason: injectionState.continuationBlockReason
+    });
+    return;
+  }
   if (injectionState) {
     injectionState.inFlight = true;
   }
@@ -80585,6 +80621,9 @@ ${todoList}`;
           injectionState.inFlight = false;
           injectionState.lastInjectedAt = Date.now();
           injectionState.awaitingPostInjectionProgressCheck = true;
+          injectionState.continuationResponseObserved = false;
+          injectionState.continuationBlockReason = undefined;
+          injectionState.pendingUserMessageID = undefined;
           injectionState.consecutiveFailures = 0;
         }
         return;
@@ -80603,6 +80642,9 @@ ${todoList}`;
       injectionState.inFlight = false;
       injectionState.lastInjectedAt = Date.now();
       injectionState.awaitingPostInjectionProgressCheck = true;
+      injectionState.continuationResponseObserved = false;
+      injectionState.continuationBlockReason = undefined;
+      injectionState.pendingUserMessageID = undefined;
       injectionState.consecutiveFailures = 0;
     }
   } catch (error) {
@@ -80930,6 +80972,14 @@ async function handleSessionIdle(args) {
     return;
   }
   const progressUpdate = sessionStateStore.trackContinuationProgress(sessionID, incompleteCount, todos);
+  if (state2.continuationBlockReason) {
+    log2(`[${HOOK_NAME}] Skipped: continuation paused at turn boundary`, {
+      sessionID,
+      reason: state2.continuationBlockReason,
+      hasProgressed: progressUpdate.hasProgressed
+    });
+    return;
+  }
   if (shouldStopForStagnation({ sessionID, incompleteCount, progressUpdate })) {
     return;
   }
@@ -80968,6 +81018,39 @@ function resolveEventParts(properties) {
 function hasInternalSystemDirective(parts) {
   return (parts ?? []).some((part) => part.type === "text" && typeof part.text === "string" && isSystemDirective(part.text));
 }
+function hasAcceptedContinuationLifecycle(state2) {
+  return state2.awaitingPostInjectionProgressCheck === true || state2.continuationResponseObserved === true || state2.continuationBlockReason === "directive-response";
+}
+function markContinuationResponseObserved(state2) {
+  if (state2?.awaitingPostInjectionProgressCheck === true) {
+    state2.continuationResponseObserved = true;
+  }
+}
+function pauseForGenuineUserInterruption(args) {
+  const { state: state2, sessionID, sessionStateStore } = args;
+  state2.continuationBlockReason = "user-interruption";
+  state2.continuationResponseObserved = false;
+  state2.pendingUserMessageID = undefined;
+  state2.abortDetectedAt = undefined;
+  state2.wasCancelled = false;
+  state2.tokenLimitDetected = false;
+  sessionStateStore.cancelCountdown(sessionID);
+  log2(`[${HOOK_NAME}] Paused continuation after genuine user interruption`, { sessionID });
+}
+function resolveUpdatedPart(properties) {
+  const part = properties?.part;
+  if (!isEventPart(part)) {
+    return;
+  }
+  const messageID = part.messageID;
+  if (messageID !== undefined && typeof messageID !== "string") {
+    return;
+  }
+  return {
+    ...part,
+    ...messageID ? { messageID } : {}
+  };
+}
 function handleNonIdleEvent(args) {
   const { eventType, properties, sessionStateStore } = args;
   if (eventType === "message.updated") {
@@ -80988,6 +81071,19 @@ function handleNonIdleEvent(args) {
         return;
       }
       const state2 = sessionStateStore.getExistingState(sessionID);
+      const messageID = typeof info?.id === "string" ? info.id : undefined;
+      if (parts === undefined && state2 && hasAcceptedContinuationLifecycle(state2) && messageID) {
+        state2.pendingUserMessageID = messageID;
+        log2(`[${HOOK_NAME}] Deferred user interruption classification until message part`, {
+          sessionID,
+          messageID
+        });
+        return;
+      }
+      if (state2 && hasAcceptedContinuationLifecycle(state2)) {
+        pauseForGenuineUserInterruption({ state: state2, sessionID, sessionStateStore });
+        return;
+      }
       if (state2?.countdownStartedAt) {
         const elapsed = Date.now() - state2.countdownStartedAt;
         if (elapsed < COUNTDOWN_GRACE_PERIOD_MS) {
@@ -81006,6 +81102,7 @@ function handleNonIdleEvent(args) {
     if (role === "assistant") {
       const state2 = sessionStateStore.getExistingState(sessionID);
       if (state2) {
+        markContinuationResponseObserved(state2);
         state2.abortDetectedAt = undefined;
         state2.wasCancelled = false;
       }
@@ -81019,6 +81116,27 @@ function handleNonIdleEvent(args) {
     if (targetSessionID) {
       const state2 = sessionStateStore.getExistingState(targetSessionID);
       if (state2) {
+        const part = resolveUpdatedPart(properties);
+        if (part?.messageID && part.messageID === state2.pendingUserMessageID) {
+          state2.pendingUserMessageID = undefined;
+          if (isSyntheticOrInternalOnlyTextParts([part])) {
+            log2(`[${HOOK_NAME}] Ignoring synthetic/internal split user message`, {
+              sessionID: targetSessionID,
+              messageID: part.messageID
+            });
+          } else if (hasAcceptedContinuationLifecycle(state2)) {
+            pauseForGenuineUserInterruption({
+              state: state2,
+              sessionID: targetSessionID,
+              sessionStateStore
+            });
+          }
+          return;
+        }
+        const info = properties?.info;
+        if (info?.role === "assistant") {
+          markContinuationResponseObserved(state2);
+        }
         state2.abortDetectedAt = undefined;
       }
       sessionStateStore.cancelCountdown(targetSessionID);
@@ -81030,6 +81148,10 @@ function handleNonIdleEvent(args) {
     if (sessionID) {
       const state2 = sessionStateStore.getExistingState(sessionID);
       if (state2) {
+        const info = properties?.info;
+        if (info?.role === "assistant") {
+          markContinuationResponseObserved(state2);
+        }
         state2.abortDetectedAt = undefined;
         state2.wasCancelled = false;
       }
@@ -81042,6 +81164,7 @@ function handleNonIdleEvent(args) {
     if (sessionID) {
       const state2 = sessionStateStore.getExistingState(sessionID);
       if (state2) {
+        markContinuationResponseObserved(state2);
         state2.abortDetectedAt = undefined;
         state2.wasCancelled = false;
       }
@@ -81115,6 +81238,9 @@ function createTodoContinuationHandler(args) {
         state2.lastIncompleteCount = undefined;
         state2.lastInjectedAt = undefined;
         state2.awaitingPostInjectionProgressCheck = false;
+        state2.continuationResponseObserved = false;
+        state2.continuationBlockReason = undefined;
+        state2.pendingUserMessageID = undefined;
         state2.stagnationCount = 0;
         state2.consecutiveFailures = 0;
         shouldCancelCountdown = true;
@@ -81261,6 +81387,9 @@ function createSessionStateStore() {
     if (hasProgressed) {
       state2.stagnationCount = 0;
       state2.awaitingPostInjectionProgressCheck = false;
+      state2.continuationResponseObserved = false;
+      state2.continuationBlockReason = undefined;
+      state2.pendingUserMessageID = undefined;
       return {
         previousIncompleteCount,
         previousStagnationCount,
@@ -81279,6 +81408,11 @@ function createSessionStateStore() {
       };
     }
     state2.awaitingPostInjectionProgressCheck = false;
+    if (state2.continuationResponseObserved === true && state2.continuationBlockReason !== "user-interruption") {
+      state2.continuationBlockReason = "directive-response";
+    }
+    state2.continuationResponseObserved = false;
+    state2.pendingUserMessageID = undefined;
     state2.stagnationCount += 1;
     return {
       previousIncompleteCount,
@@ -81297,6 +81431,9 @@ function createSessionStateStore() {
     state2.lastIncompleteCount = undefined;
     state2.stagnationCount = 0;
     state2.awaitingPostInjectionProgressCheck = false;
+    state2.continuationResponseObserved = false;
+    state2.continuationBlockReason = undefined;
+    state2.pendingUserMessageID = undefined;
     state2.allTodosCompletedAt = undefined;
     trackedSession.lastCompletedCount = undefined;
     trackedSession.lastTodoSnapshot = undefined;
@@ -82358,13 +82495,13 @@ async function runCommentChecker(input, options) {
   process3.stdin.end();
   let timeoutId = null;
   let graceId = null;
-  const timeoutPromise = new Promise((resolve13) => {
+  const timeoutPromise = new Promise((resolve12) => {
     timeoutId = setTimer(() => {
       killProcessSafely(process3, "SIGTERM");
       graceId = setTimer(() => {
         killProcessSafely(process3, "SIGKILL");
       }, killGraceMs);
-      resolve13("timeout");
+      resolve12("timeout");
     }, timeoutMs);
   });
   try {
@@ -82401,7 +82538,7 @@ async function runCommentChecker(input, options) {
 // packages/omo-opencode/src/hooks/comment-checker/downloader.ts
 import { existsSync as existsSync38, appendFileSync as appendFileSync3 } from "fs";
 import { join as join45 } from "path";
-import { homedir as homedir16, tmpdir as tmpdir3 } from "os";
+import { homedir as homedir15, tmpdir as tmpdir3 } from "os";
 import { createRequire as createRequire3 } from "module";
 init_logger2();
 init_plugin_identity();
@@ -82425,11 +82562,11 @@ var PLATFORM_MAP = {
 function getCacheDir2() {
   if (process.platform === "win32") {
     const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
-    const base2 = localAppData || join45(homedir16(), "AppData", "Local");
+    const base2 = localAppData || join45(homedir15(), "AppData", "Local");
     return join45(base2, CACHE_DIR_NAME, "bin");
   }
   const xdgCache = process.env.XDG_CACHE_HOME;
-  const base = xdgCache || join45(homedir16(), ".cache");
+  const base = xdgCache || join45(homedir15(), ".cache");
   return join45(base, CACHE_DIR_NAME, "bin");
 }
 function getBinaryName() {
@@ -82463,8 +82600,8 @@ async function downloadCommentChecker() {
     return binaryPath;
   }
   const version = getPackageVersion();
-  const { os: os5, arch, ext } = platformInfo;
-  const assetName = `comment-checker_v${version}_${os5}_${arch}.${ext}`;
+  const { os: os4, arch, ext } = platformInfo;
+  const assetName = `comment-checker_v${version}_${os4}_${arch}.${ext}`;
   const downloadUrl = `https://github.com/${REPO}/releases/download/v${version}/${assetName}`;
   debugLog(`Downloading from: ${downloadUrl}`);
   log2(`[${PUBLISHED_PACKAGE_NAME}] Downloading comment-checker binary...`);
@@ -82784,13 +82921,20 @@ function debugLog3(...args) {
     fs9.appendFileSync(DEBUG_FILE3, msg);
   }
 }
-function createCommentCheckerHooks(config) {
+function createCommentCheckerHooks(config, cliRunner) {
+  const runner3 = cliRunner ?? {
+    initializeCommentCheckerCli,
+    getCommentCheckerCliPathPromise,
+    isCliPathUsable,
+    processWithCli,
+    processApplyPatchEditsWithCli
+  };
   debugLog3("createCommentCheckerHooks called", { config });
   return {
     "tool.execute.before": async (input, output) => {
       ensureCommentCheckerInitialization(() => {
         startPendingCallCleanup();
-        initializeCommentCheckerCli(debugLog3);
+        runner3.initializeCommentCheckerCli(debugLog3);
       });
       debugLog3("tool.execute.before:", {
         tool: input.tool,
@@ -82844,13 +82988,13 @@ function createCommentCheckerHooks(config) {
           return;
         }
         try {
-          const cliPath = await getCommentCheckerCliPathPromise();
-          if (!isCliPathUsable(cliPath)) {
+          const cliPath = await runner3.getCommentCheckerCliPathPromise();
+          if (!runner3.isCliPathUsable(cliPath)) {
             debugLog3("CLI not available, skipping comment check");
             return;
           }
           debugLog3("using CLI for apply_patch:", cliPath);
-          await processApplyPatchEditsWithCli(input.sessionID, edits, output, cliPath, config?.custom_prompt, debugLog3);
+          await runner3.processApplyPatchEditsWithCli(input.sessionID, edits, output, cliPath, config?.custom_prompt, debugLog3);
         } catch (err) {
           debugLog3("apply_patch comment check failed:", err);
         }
@@ -82863,13 +83007,13 @@ function createCommentCheckerHooks(config) {
       }
       debugLog3("processing pendingCall:", pendingCall);
       try {
-        const cliPath = await getCommentCheckerCliPathPromise();
-        if (!isCliPathUsable(cliPath)) {
+        const cliPath = await runner3.getCommentCheckerCliPathPromise();
+        if (!runner3.isCliPathUsable(cliPath)) {
           debugLog3("CLI not available, skipping comment check");
           return;
         }
         debugLog3("using CLI:", cliPath);
-        await processWithCli(input, pendingCall, output, cliPath, config?.custom_prompt, debugLog3);
+        await runner3.processWithCli(input, pendingCall, output, cliPath, config?.custom_prompt, debugLog3);
       } catch (err) {
         debugLog3("tool.execute.after failed:", err);
       }
@@ -82950,7 +83094,7 @@ function createAgentsMdCache() {
 }
 // packages/rules-engine/src/agents-md.ts
 import { existsSync as existsSync41, realpathSync as realpathSync8, statSync as statSync5 } from "fs";
-import { dirname as dirname11, isAbsolute as isAbsolute7, join as join48, relative as relative6, resolve as resolve13 } from "path";
+import { dirname as dirname11, isAbsolute as isAbsolute7, join as join48, relative as relative6, resolve as resolve12 } from "path";
 
 // packages/rules-engine/src/constants.ts
 var PROJECT_MARKERS = [".git", "pyproject.toml", "package.json", "Cargo.toml", "go.mod", ".venv"];
@@ -83019,7 +83163,7 @@ function canonicalizePath(path8) {
     return realpathSync8(path8);
   } catch (error) {
     if (error instanceof Error)
-      return resolve13(path8);
+      return resolve12(path8);
     throw error;
   }
 }
@@ -83041,8 +83185,8 @@ function isSameOrChildPath(childPath, parentPath) {
 }
 // packages/rules-engine/src/finder.ts
 import { existsSync as existsSync43, statSync as statSync6 } from "fs";
-import { homedir as homedir17 } from "os";
-import { dirname as dirname13, isAbsolute as isAbsolute9, join as join50, relative as relative8, resolve as resolve14 } from "path";
+import { homedir as homedir16 } from "os";
+import { dirname as dirname13, isAbsolute as isAbsolute9, join as join50, relative as relative8, resolve as resolve13 } from "path";
 
 // packages/rules-engine/src/ordering.ts
 function sortCandidates(candidates) {
@@ -83129,7 +83273,7 @@ function setSisyphusRuleDeprecationLogger(logger6) {
   logSisyphusRuleDeprecation = logger6;
 }
 function findRuleFiles(projectRoot, homeDir, currentFile, options, cache) {
-  const startDir = dirname13(resolve14(currentFile));
+  const startDir = dirname13(resolve13(currentFile));
   const skipClaudeUserRules = options?.skipClaudeUserRules ?? false;
   const effectiveProjectRoot = resolveEffectiveProjectRoot(projectRoot, options?.workspaceDirectory, startDir);
   const cacheKey = [projectRoot ?? "", effectiveProjectRoot, startDir, skipClaudeUserRules ? "1" : "0"].join("\x00");
@@ -83140,7 +83284,7 @@ function findRuleFiles(projectRoot, homeDir, currentFile, options, cache) {
   const seenRealPaths = new Set;
   addProjectRuleCandidates(effectiveProjectRoot, startDir, candidates, seenRealPaths, cache);
   addProjectSingleFileCandidates(effectiveProjectRoot, candidates, seenRealPaths);
-  addUserRuleCandidates(homeDir || homedir17(), skipClaudeUserRules, candidates, seenRealPaths, cache);
+  addUserRuleCandidates(homeDir || homedir16(), skipClaudeUserRules, candidates, seenRealPaths, cache);
   const sorted = sortCandidates(candidates);
   cache?.set(cacheKey, sorted);
   return sorted;
@@ -83150,7 +83294,7 @@ function resolveEffectiveProjectRoot(projectRoot, workspaceDirectory, startDir)
     return projectRoot;
   if (!workspaceDirectory)
     return startDir;
-  const workspaceRoot = resolve14(workspaceDirectory);
+  const workspaceRoot = resolve13(workspaceDirectory);
   return isSameOrChildPath2(startDir, workspaceRoot) ? workspaceRoot : startDir;
 }
 function addProjectRuleCandidates(projectRoot, startDir, candidates, seenRealPaths, cache) {
@@ -83398,11 +83542,11 @@ var TRUNCATION_NOTICE_PREFIX = `
 var TRUNCATION_NOTICE_SUFFIX = "]";
 // packages/agents-md-core/src/finder.ts
 import { realpathSync as realpathSync10 } from "fs";
-import { isAbsolute as isAbsolute10, relative as relative10, resolve as resolve15 } from "path";
+import { isAbsolute as isAbsolute10, relative as relative10, resolve as resolve14 } from "path";
 function resolveFilePath2(rootDirectory, path8) {
   if (!path8)
     return null;
-  const resolved = isAbsolute10(path8) ? path8 : resolve15(rootDirectory, path8);
+  const resolved = isAbsolute10(path8) ? path8 : resolve14(rootDirectory, path8);
   const canonicalRoot = canonicalizePath2(rootDirectory);
   const canonicalResolved = canonicalizePath2(resolved);
   return isSameOrChildPath3(canonicalResolved, canonicalRoot) ? canonicalResolved : null;
@@ -83412,7 +83556,7 @@ function canonicalizePath2(path8) {
     return realpathSync10(path8);
   } catch (error) {
     if (error instanceof Error) {
-      return resolve15(path8);
+      return resolve14(path8);
     }
     throw error;
   }
@@ -83592,7 +83736,7 @@ import { dirname as dirname17 } from "path";
 
 // packages/omo-opencode/src/hooks/directory-readme-injector/finder.ts
 import { access as access2 } from "fs/promises";
-import { dirname as dirname16, isAbsolute as isAbsolute11, join as join55, resolve as resolve16 } from "path";
+import { dirname as dirname16, isAbsolute as isAbsolute11, join as join55, resolve as resolve15 } from "path";
 
 // packages/omo-opencode/src/hooks/directory-readme-injector/constants.ts
 import { join as join54 } from "path";
@@ -83605,7 +83749,7 @@ function resolveFilePath3(rootDirectory, path8) {
     return null;
   if (isAbsolute11(path8))
     return path8;
-  return resolve16(rootDirectory, path8);
+  return resolve15(rootDirectory, path8);
 }
 async function findReadmeMdUp(input) {
   const found = [];
@@ -84919,18 +85063,23 @@ async function findEmptyMessageByIndexFromSDK(client3, sessionID, targetIndex) {
     return null;
   }
 }
-async function fixEmptyMessagesWithSDK(params) {
+var defaultStorage = {
+  replaceEmptyTextPartsAsync,
+  findMessagesWithEmptyTextPartsFromSDK,
+  injectTextPartAsync
+};
+async function fixEmptyMessagesWithSDK(params, storage2 = defaultStorage) {
   let fixed = false;
   const fixedMessageIds = [];
   if (params.messageIndex !== undefined) {
     const targetMessageId = await findEmptyMessageByIndexFromSDK(params.client, params.sessionID, params.messageIndex);
     if (targetMessageId) {
-      const replaced = await replaceEmptyTextPartsAsync(params.client, params.sessionID, targetMessageId, params.placeholderText);
+      const replaced = await storage2.replaceEmptyTextPartsAsync(params.client, params.sessionID, targetMessageId, params.placeholderText);
       if (replaced) {
         fixed = true;
         fixedMessageIds.push(targetMessageId);
       } else {
-        const injected = await injectTextPartAsync(params.client, params.sessionID, targetMessageId, params.placeholderText);
+        const injected = await storage2.injectTextPartAsync(params.client, params.sessionID, targetMessageId, params.placeholderText);
         if (injected) {
           fixed = true;
           fixedMessageIds.push(targetMessageId);
@@ -84942,19 +85091,19 @@ async function fixEmptyMessagesWithSDK(params) {
     return { fixed, fixedMessageIds, scannedEmptyCount: 0 };
   }
   const emptyMessageIds = await findEmptyMessagesFromSDK(params.client, params.sessionID);
-  const emptyTextPartIds = await findMessagesWithEmptyTextPartsFromSDK(params.client, params.sessionID);
+  const emptyTextPartIds = await storage2.findMessagesWithEmptyTextPartsFromSDK(params.client, params.sessionID);
   const additionalIds = emptyTextPartIds.filter((id) => !emptyMessageIds.includes(id));
   const allTargetIds = [...emptyMessageIds, ...additionalIds];
   if (allTargetIds.length === 0) {
     return { fixed: false, fixedMessageIds: [], scannedEmptyCount: 0 };
   }
   for (const messageID of allTargetIds) {
-    const replaced = await replaceEmptyTextPartsAsync(params.client, params.sessionID, messageID, params.placeholderText);
+    const replaced = await storage2.replaceEmptyTextPartsAsync(params.client, params.sessionID, messageID, params.placeholderText);
     if (replaced) {
       fixed = true;
       fixedMessageIds.push(messageID);
     } else {
-      const injected = await injectTextPartAsync(params.client, params.sessionID, messageID, params.placeholderText);
+      const injected = await storage2.injectTextPartAsync(params.client, params.sessionID, messageID, params.placeholderText);
       if (injected) {
         fixed = true;
         fixedMessageIds.push(messageID);
@@ -86604,14 +86753,14 @@ import { existsSync as existsSync54 } from "fs";
 import { join as join64 } from "path";
 var CONFIG_CACHE_TTL_MS2 = 30000;
 var configCache2 = new Map;
-function getUserConfigPath() {
-  return join64(getOpenCodeConfigDir({ binary: "opencode" }), "opencode-cc-plugin.json");
+function getUserConfigPaths() {
+  return getOpenCodeConfigDirs({ binary: "opencode" }).map((dir) => join64(dir, "opencode-cc-plugin.json"));
 }
 function getProjectConfigPath() {
   return join64(process.cwd(), ".opencode", "opencode-cc-plugin.json");
 }
 function getCacheKey2() {
-  return `${process.cwd()}::${getUserConfigPath()}`;
+  return `${process.cwd()}::${getUserConfigPaths().join("|")}`;
 }
 function getCachedConfig2(cacheKey) {
   const cachedEntry = configCache2.get(cacheKey);
@@ -86666,16 +86815,26 @@ async function loadPluginExtendedConfig() {
   if (cachedConfig) {
     return cachedConfig;
   }
-  const userConfig = await loadConfigFromPath(getUserConfigPath());
+  const userPaths = [...getUserConfigPaths()].reverse();
+  let mergedDisabledHooks = {};
+  for (const userPath of userPaths) {
+    const userConfig = await loadConfigFromPath(userPath);
+    if (userConfig?.disabledHooks) {
+      mergedDisabledHooks = mergeDisabledHooks(mergedDisabledHooks, userConfig.disabledHooks);
+    }
+  }
   const projectConfig = await loadConfigFromPath(getProjectConfigPath());
+  if (projectConfig?.disabledHooks) {
+    mergedDisabledHooks = mergeDisabledHooks(mergedDisabledHooks, projectConfig.disabledHooks);
+  }
   const merged = {
-    disabledHooks: mergeDisabledHooks(userConfig?.disabledHooks, projectConfig?.disabledHooks)
+    disabledHooks: mergedDisabledHooks
   };
-  if (userConfig || projectConfig) {
+  if (Object.keys(mergedDisabledHooks).length > 0 || projectConfig) {
     log2("Plugin extended config loaded", {
-      userConfigExists: userConfig !== null,
+      userConfigPaths: getUserConfigPaths(),
       projectConfigExists: projectConfig !== null,
-      mergedDisabledHooks: merged.disabledHooks
+      mergedDisabledHooks
     });
   }
   configCache2.set(cacheKey, {
@@ -88114,12 +88273,12 @@ function readCurrentTopLevelTask(planPath) {
 }
 // packages/boulder-state/src/storage/path.ts
 import { existsSync as existsSync57 } from "fs";
-import { isAbsolute as isAbsolute12, join as join67, relative as relative11, resolve as resolve17 } from "path";
+import { isAbsolute as isAbsolute12, join as join67, relative as relative11, resolve as resolve16 } from "path";
 function getBoulderFilePath(directory) {
   return join67(directory, BOULDER_DIR, BOULDER_FILE);
 }
 function resolveTrackedPath(baseDirectory, trackedPath) {
-  return isAbsolute12(trackedPath) ? resolve17(trackedPath) : resolve17(baseDirectory, trackedPath);
+  return isAbsolute12(trackedPath) ? resolve16(trackedPath) : resolve16(baseDirectory, trackedPath);
 }
 function resolveBoulderPlanPath(directory, state3) {
   const absolutePlanPath = resolveTrackedPath(directory, state3.active_plan);
@@ -88127,13 +88286,13 @@ function resolveBoulderPlanPath(directory, state3) {
   if (!worktreePath) {
     return absolutePlanPath;
   }
-  const absoluteDirectory = resolve17(directory);
+  const absoluteDirectory = resolve16(directory);
   const relativePlanPath = relative11(absoluteDirectory, absolutePlanPath);
   if (relativePlanPath.length === 0 || relativePlanPath.startsWith("..") || isAbsolute12(relativePlanPath)) {
     return absolutePlanPath;
   }
   const absoluteWorktreePath = resolveTrackedPath(directory, worktreePath);
-  const worktreePlanPath = resolve17(absoluteWorktreePath, relativePlanPath);
+  const worktreePlanPath = resolve16(absoluteWorktreePath, relativePlanPath);
   return existsSync57(worktreePlanPath) ? worktreePlanPath : absolutePlanPath;
 }
 function resolveBoulderPlanPathForWork(directory, work) {
@@ -89001,7 +89160,7 @@ function createSessionRuleScanCacheStore() {
 }
 
 // packages/omo-opencode/src/hooks/rules-injector/injection-processor.ts
-import { homedir as homedir18 } from "os";
+import { homedir as homedir17 } from "os";
 // packages/omo-opencode/src/hooks/rules-injector/rule-file-finder.ts
 init_logger2();
 setSisyphusRuleDeprecationLogger(log2);
@@ -89107,13 +89266,13 @@ function setParsedRuleCacheEntry(realPath, entry) {
 }
 
 // packages/omo-opencode/src/hooks/rules-injector/path-resolution.ts
-import { resolve as resolve18 } from "path";
+import { resolve as resolve17 } from "path";
 function resolveFilePath4(workspaceDirectory, path8) {
   if (!path8)
     return null;
   if (path8.startsWith("/"))
     return path8;
-  return resolve18(workspaceDirectory, path8);
+  return resolve17(workspaceDirectory, path8);
 }
 
 // packages/omo-opencode/src/hooks/rules-injector/rule-match-reason.ts
@@ -89147,7 +89306,7 @@ function createRuleInjectionProcessor(deps) {
     getSessionCache: getSessionCache3,
     getSessionRuleScanCache,
     ruleFinderOptions,
-    homedir: getHomeDir = homedir18,
+    homedir: getHomeDir = homedir17,
     shouldApplyRule: shouldApplyRuleImpl = shouldApplyRule,
     isDuplicateByRealPath: isDuplicateByRealPathImpl = isDuplicateByRealPath,
     createContentHash: createContentHashImpl = createContentHash,
@@ -89434,7 +89593,7 @@ import { fileURLToPath as fileURLToPath2 } from "url";
 
 // packages/omo-opencode/src/hooks/auto-update-checker/constants.ts
 import * as path8 from "path";
-import * as os5 from "os";
+import * as os4 from "os";
 init_plugin_identity();
 var PACKAGE_NAME = PUBLISHED_PACKAGE_NAME;
 var ACCEPTED_PACKAGE_NAMES2 = ACCEPTED_PACKAGE_NAMES;
@@ -89443,10 +89602,10 @@ var NPM_FETCH_TIMEOUT = 5000;
 var CACHE_ROOT_DIR = getOpenCodeCacheDir();
 var CACHE_DIR = path8.join(CACHE_ROOT_DIR, "packages");
 var VERSION_FILE = path8.join(CACHE_ROOT_DIR, "version");
-function getWindowsAppdataDir2() {
+function getWindowsAppdataDir() {
   if (process.platform !== "win32")
     return null;
-  return process.env.APPDATA ?? path8.join(os5.homedir(), "AppData", "Roaming");
+  return process.env.APPDATA ?? path8.join(os4.homedir(), "AppData", "Roaming");
 }
 function getUserConfigDir() {
   return getOpenCodeConfigDir({ binary: "opencode" });
@@ -89461,7 +89620,7 @@ var INSTALLED_PACKAGE_JSON = path8.join(CACHE_DIR, "node_modules", PACKAGE_NAME,
 var INSTALLED_PACKAGE_JSON_CANDIDATES = ACCEPTED_PACKAGE_NAMES2.map((name) => path8.join(CACHE_DIR, "node_modules", name, "package.json"));
 
 // packages/omo-opencode/src/hooks/auto-update-checker/checker/config-paths.ts
-import * as os6 from "os";
+import * as os5 from "os";
 import * as path9 from "path";
 function getConfigPaths2(directory) {
   const userConfigDir = getUserConfigDir();
@@ -89472,8 +89631,8 @@ function getConfigPaths2(directory) {
     getUserOpencodeConfigJsonc()
   ];
   if (process.platform === "win32") {
-    const crossPlatformDir = path9.join(os6.homedir(), ".config");
-    const appdataDir = getWindowsAppdataDir2();
+    const crossPlatformDir = path9.join(os5.homedir(), ".config");
+    const appdataDir = getWindowsAppdataDir();
     if (appdataDir) {
       const alternateDir = userConfigDir === crossPlatformDir ? appdataDir : crossPlatformDir;
       const alternateConfig = path9.join(alternateDir, "opencode", "opencode.json");
@@ -89673,7 +89832,7 @@ function getCachedVersion(options = {}) {
 // package.json
 var package_default = {
   name: "oh-my-opencode",
-  version: "4.18.1",
+  version: "4.18.2",
   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",
@@ -89885,18 +90044,18 @@ var package_default = {
     typescript: "^6.0.3"
   },
   optionalDependencies: {
-    "oh-my-opencode-darwin-arm64": "4.18.1",
-    "oh-my-opencode-darwin-x64": "4.18.1",
-    "oh-my-opencode-darwin-x64-baseline": "4.18.1",
-    "oh-my-opencode-linux-arm64": "4.18.1",
-    "oh-my-opencode-linux-arm64-musl": "4.18.1",
-    "oh-my-opencode-linux-x64": "4.18.1",
-    "oh-my-opencode-linux-x64-baseline": "4.18.1",
-    "oh-my-opencode-linux-x64-musl": "4.18.1",
-    "oh-my-opencode-linux-x64-musl-baseline": "4.18.1",
-    "oh-my-opencode-windows-arm64": "4.18.1",
-    "oh-my-opencode-windows-x64": "4.18.1",
-    "oh-my-opencode-windows-x64-baseline": "4.18.1"
+    "oh-my-opencode-darwin-arm64": "4.18.2",
+    "oh-my-opencode-darwin-x64": "4.18.2",
+    "oh-my-opencode-darwin-x64-baseline": "4.18.2",
+    "oh-my-opencode-linux-arm64": "4.18.2",
+    "oh-my-opencode-linux-arm64-musl": "4.18.2",
+    "oh-my-opencode-linux-x64": "4.18.2",
+    "oh-my-opencode-linux-x64-baseline": "4.18.2",
+    "oh-my-opencode-linux-x64-musl": "4.18.2",
+    "oh-my-opencode-linux-x64-musl-baseline": "4.18.2",
+    "oh-my-opencode-windows-arm64": "4.18.2",
+    "oh-my-opencode-windows-x64": "4.18.2",
+    "oh-my-opencode-windows-x64-baseline": "4.18.2"
   },
   overrides: {
     "@earendil-works/pi-agent-core": "0.80.3",
@@ -90193,8 +90352,8 @@ function toReadableStream2(stream) {
 function wrapNodeProcess2(proc) {
   let resolveExited;
   let exitCode = null;
-  const exited = new Promise((resolve19, reject) => {
-    resolveExited = resolve19;
+  const exited = new Promise((resolve18, reject) => {
+    resolveExited = resolve18;
     proc.on("error", (error) => {
       if (exitCode === null) {
         exitCode = 1;
@@ -90293,8 +90452,8 @@ async function runBunInstallWithDetails(options) {
     });
     const outputPromise = Promise.all([readProcessOutput(proc.stdout), readProcessOutput(proc.stderr)]).then(([stdout, stderr]) => ({ stdout, stderr }));
     let timeoutId;
-    const timeoutPromise = new Promise((resolve19) => {
-      timeoutId = setTimeout(() => resolve19("timeout"), BUN_INSTALL_TIMEOUT_MS);
+    const timeoutPromise = new Promise((resolve18) => {
+      timeoutId = setTimeout(() => resolve18("timeout"), BUN_INSTALL_TIMEOUT_MS);
     });
     const exitPromise = proc.exited.then(() => "completed");
     const result = await Promise.race([exitPromise, timeoutPromise]);
@@ -90788,7 +90947,7 @@ async function showSpinnerToast(ctx, version, message) {
         duration: frameInterval + 50
       }
     }).catch(ignoreToastError);
-    await new Promise((resolve19) => setTimeout(resolve19, frameInterval));
+    await new Promise((resolve18) => setTimeout(resolve18, frameInterval));
   }
 }
 
@@ -90888,7 +91047,7 @@ v${latestVersion} available. Restart OpenCode to apply.` : "OpenCode is now on S
 // packages/omo-opencode/src/hooks/codegraph-bootstrap/hook.ts
 init_src();
 import { existsSync as existsSync71 } from "fs";
-import { homedir as homedir21 } from "os";
+import { homedir as homedir20 } from "os";
 import { join as join80 } from "path";
 
 // packages/omo-opencode/src/hooks/codegraph-bootstrap/command-runner.ts
@@ -90911,7 +91070,7 @@ function resolveExitCode(error) {
 async function runCodegraphCommand(projectRoot, command, args, options) {
   const { execFile: execFile3 } = await import("child_process");
   const invocation = resolveCodegraphCommandInvocation(command, args);
-  return new Promise((resolve19) => {
+  return new Promise((resolve18) => {
     execFile3(invocation.command, [...invocation.args], {
       cwd: projectRoot,
       encoding: "utf8",
@@ -90921,10 +91080,10 @@ async function runCodegraphCommand(projectRoot, command, args, options) {
       windowsHide: true
     }, (error, stdout, stderr) => {
       if (error === null) {
-        resolve19({ exitCode: 0, stderr: toOutputText(stderr), stdout: toOutputText(stdout), timedOut: false });
+        resolve18({ exitCode: 0, stderr: toOutputText(stderr), stdout: toOutputText(stdout), timedOut: false });
         return;
       }
-      resolve19({
+      resolve18({
         exitCode: resolveExitCode(error),
         stderr: toOutputText(stderr),
         stdout: toOutputText(stdout),
@@ -90946,7 +91105,7 @@ function resolveCodegraphCommandInvocation(command, args, platform2 = process.pl
 
 // packages/omo-opencode/src/hooks/codegraph-bootstrap/project-root.ts
 init_src();
-import { resolve as resolve19 } from "path";
+import { resolve as resolve18 } from "path";
 var PROJECT_ROOT_KEYS = ["directory", "worktree", "cwd", "projectRoot", "projectPath"];
 function readStringField(record, key) {
   const value = record[key];
@@ -90979,8 +91138,8 @@ function readRecordRoot(record) {
 }
 function resolveCodegraphProjectRoot(properties, fallbackDirectory) {
   if (!isRecord(properties))
-    return resolve19(fallbackDirectory);
-  return resolve19(readRecordRoot(properties) ?? fallbackDirectory);
+    return resolve18(fallbackDirectory);
+  return resolve18(readRecordRoot(properties) ?? fallbackDirectory);
 }
 
 // packages/omo-opencode/src/hooks/codegraph-bootstrap/status.ts
@@ -91042,7 +91201,7 @@ function defaultSchedule(task) {
   timer.unref?.();
 }
 function defaultInstallDir2() {
-  return join80(homedir21(), ".omo", "codegraph");
+  return join80(homedir20(), ".omo", "codegraph");
 }
 function provisionedBinFromInstallDir(installDir) {
   if (installDir === undefined)
@@ -91181,7 +91340,7 @@ function createCodegraphBootstrapHook(ctx, config, depsOverride = {}) {
 }
 // packages/omo-opencode/src/hooks/ast-grep-sg-provision/hook.ts
 init_src();
-import { homedir as homedir22 } from "os";
+import { homedir as homedir21 } from "os";
 import { join as join81 } from "path";
 var provisionedTargets = new Set;
 function defaultSchedule2(task) {
@@ -91201,7 +91360,7 @@ async function runProvision(targetDir, deps) {
 }
 var defaultDeps5 = {
   findSgBinary: findSgBinarySync,
-  homeDir: homedir22,
+  homeDir: homedir21,
   log: log2,
   provisionSgBinary,
   schedule: defaultSchedule2
@@ -97113,6 +97272,27 @@ var DELEGATION_TOOLS = new Set([
   "task",
   "call_omo_agent"
 ]);
+function findLatestReminderTarget(messages, sessionStates) {
+  for (let messageIndex = messages.length - 1;messageIndex >= 0; messageIndex -= 1) {
+    const message = messages[messageIndex];
+    if (message?.info.role !== "user")
+      continue;
+    const sessionID = message.info.sessionID;
+    const messageID = message.info.id;
+    if (typeof sessionID !== "string" || typeof messageID !== "string")
+      continue;
+    const state3 = sessionStates.get(sessionID);
+    if (!state3?.reminderPending || state3.reminderShown || state3.delegationUsed)
+      continue;
+    for (let partIndex = message.parts.length - 1;partIndex >= 0; partIndex -= 1) {
+      const part = message.parts[partIndex];
+      if (part && isRealUserTextPart(part)) {
+        return { message, messageID, sessionID, state: state3, textPartIndex: partIndex };
+      }
+    }
+  }
+  return;
+}
 function createCategorySkillReminderHook(_ctx, availableSkills = []) {
   const sessionStates = new Map;
   const reminderMessage = buildReminderMessage(availableSkills);
@@ -97120,6 +97300,7 @@ function createCategorySkillReminderHook(_ctx, availableSkills = []) {
     if (!sessionStates.has(sessionID)) {
       sessionStates.set(sessionID, {
         delegationUsed: false,
+        reminderPending: false,
         reminderShown: false,
         toolCallCount: 0
       });
@@ -97133,7 +97314,7 @@ function createCategorySkillReminderHook(_ctx, availableSkills = []) {
     const agentKey = getAgentConfigKey(agent);
     return TARGET_AGENTS.has(agentKey) || agentKey.includes("sisyphus") || agentKey.includes("atlas");
   }
-  const toolExecuteAfter = async (input, output) => {
+  const toolExecuteAfter = async (input, _output) => {
     const { tool, sessionID } = input;
     const toolLower = tool.toLowerCase();
     if (!isTargetAgent(sessionID, input.agent)) {
@@ -97142,6 +97323,7 @@ function createCategorySkillReminderHook(_ctx, availableSkills = []) {
     const state3 = getOrCreateState2(sessionID);
     if (DELEGATION_TOOLS.has(toolLower)) {
       state3.delegationUsed = true;
+      state3.reminderPending = false;
       log2("[category-skill-reminder] Delegation tool used", { sessionID, tool });
       return;
     }
@@ -97149,15 +97331,32 @@ function createCategorySkillReminderHook(_ctx, availableSkills = []) {
       return;
     }
     state3.toolCallCount++;
-    if (state3.toolCallCount >= 3 && !state3.delegationUsed && !state3.reminderShown) {
-      output.output += reminderMessage;
-      state3.reminderShown = true;
-      log2("[category-skill-reminder] Reminder injected", {
+    if (state3.toolCallCount >= 3 && !state3.delegationUsed && !state3.reminderPending && !state3.reminderShown) {
+      state3.reminderPending = true;
+      log2("[category-skill-reminder] Reminder queued", {
         sessionID,
         toolCallCount: state3.toolCallCount
       });
     }
   };
+  const messagesTransform = async (_input, output) => {
+    const target = findLatestReminderTarget(output.messages, sessionStates);
+    if (!target)
+      return;
+    target.message.parts.splice(target.textPartIndex, 0, {
+      id: `prt_category_skill_reminder_${target.messageID}`,
+      sessionID: target.sessionID,
+      messageID: target.messageID,
+      type: "text",
+      text: reminderMessage,
+      synthetic: true
+    });
+    target.state.reminderPending = false;
+    target.state.reminderShown = true;
+    log2("[category-skill-reminder] Reminder injected", {
+      sessionID: target.sessionID
+    });
+  };
   const eventHandler = async ({ event }) => {
     const props = event.properties;
     if (event.type === "session.deleted") {
@@ -97169,6 +97368,7 @@ function createCategorySkillReminderHook(_ctx, availableSkills = []) {
   };
   return {
     "tool.execute.after": toolExecuteAfter,
+    "experimental.chat.messages.transform": messagesTransform,
     event: eventHandler
   };
 }
@@ -97375,7 +97575,7 @@ async function withTimeout(promise, timeoutMs) {
 var USER_MESSAGE_IN_PROGRESS_WINDOW_MS = 2000;
 var RAPID_IDLE_DEDUP_MS = 500;
 function sleep2(ms) {
-  return ms > 0 ? new Promise((resolve20) => setTimeout(resolve20, ms)) : Promise.resolve();
+  return ms > 0 ? new Promise((resolve19) => setTimeout(resolve19, ms)) : Promise.resolve();
 }
 function hasActiveBackgroundTasks(backgroundManager, sessionID) {
   return backgroundManager ? backgroundManager.getTasksByParentSession(sessionID).some((task) => task.status === "pending" || task.status === "running") : false;
@@ -99415,8 +99615,8 @@ import { basename as basename14, dirname as dirname26, join as join89 } from "pa
 
 // packages/skills-loader-core/src/shared/opencode-config-dir.ts
 import { existsSync as existsSync76, realpathSync as realpathSync12 } from "fs";
-import { homedir as homedir24 } from "os";
-import { join as join88, posix as posix4, resolve as resolve20, win32 as win325 } from "path";
+import { homedir as homedir23 } from "os";
+import { join as join88, posix as posix4, resolve as resolve19, win32 as win325 } from "path";
 
 // packages/skills-loader-core/src/shared/plugin-identity.ts
 init_src();
@@ -99449,14 +99649,14 @@ function getTauriConfigDir2(identifier) {
   const platform2 = process.platform;
   switch (platform2) {
     case "darwin":
-      return join88(homedir24(), "Library", "Application Support", identifier);
+      return join88(homedir23(), "Library", "Application Support", identifier);
     case "win32": {
-      const appData = process.env.APPDATA || join88(homedir24(), "AppData", "Roaming");
+      const appData = process.env.APPDATA || join88(homedir23(), "AppData", "Roaming");
       return win325.join(appData, identifier);
     }
     case "linux":
     default: {
-      const xdgConfig = process.env.XDG_CONFIG_HOME || join88(homedir24(), ".config");
+      const xdgConfig = process.env.XDG_CONFIG_HOME || join88(homedir23(), ".config");
       return join88(xdgConfig, identifier);
     }
   }
@@ -99465,7 +99665,7 @@ function resolveConfigPath2(pathValue) {
   if (isWslEnvironment2() && pathValue.startsWith("/")) {
     return posix4.normalize(pathValue);
   }
-  const resolvedPath = resolve20(pathValue);
+  const resolvedPath = resolve19(pathValue);
   if (!existsSync76(resolvedPath))
     return resolvedPath;
   try {
@@ -99500,7 +99700,7 @@ function getWslLinuxHomeDir2(windowsConfigRoot) {
 function getCliDefaultConfigDir2() {
   const envXdgConfig = process.env.XDG_CONFIG_HOME?.trim();
   const shouldIgnoreWindowsXdg = envXdgConfig !== undefined && envXdgConfig.length > 0 && isWslEnvironment2() && isWindowsUserConfigRoot2(envXdgConfig);
-  const xdgConfig = shouldIgnoreWindowsXdg ? posix4.join(getWslLinuxHomeDir2(envXdgConfig) ?? "/home", ".config") : envXdgConfig || join88(homedir24(), ".config");
+  const xdgConfig = shouldIgnoreWindowsXdg ? posix4.join(getWslLinuxHomeDir2(envXdgConfig) ?? "/home", ".config") : envXdgConfig || join88(homedir23(), ".config");
   const configDir = isWslEnvironment2() ? posix4.join(xdgConfig, "opencode") : join88(xdgConfig, "opencode");
   return resolveConfigPath2(configDir);
 }
@@ -99567,10 +99767,10 @@ function getOpenCodeSkillDirs(options) {
 // packages/skills-loader-core/src/shared/project-discovery-dirs.ts
 import { execFileSync as execFileSync4 } from "child_process";
 import { existsSync as existsSync77, realpathSync as realpathSync13 } from "fs";
-import { dirname as dirname27, join as join90, resolve as resolve21, win32 as win326 } from "path";
+import { dirname as dirname27, join as join90, resolve as resolve20, win32 as win326 } from "path";
 var worktreePathCache2 = new Map;
 function normalizePath4(path17) {
-  const resolvedPath = process.platform !== "win32" && win326.isAbsolute(path17) ? path17 : resolve21(path17);
+  const resolvedPath = process.platform !== "win32" && win326.isAbsolute(path17) ? path17 : resolve20(path17);
   if (!existsSync77(resolvedPath)) {
     return resolvedPath;
   }
@@ -99625,7 +99825,7 @@ function findAncestorDirectories2(startDirectory, targetPaths, stopDirectory) {
   }
 }
 function detectWorktreePath2(directory) {
-  const resolvedDirectory = resolve21(directory);
+  const resolvedDirectory = resolve20(directory);
   const cacheKey = pathKey2(normalizePath4(resolvedDirectory));
   if (worktreePathCache2.has(cacheKey)) {
     return worktreePathCache2.get(cacheKey);
@@ -100157,21 +100357,21 @@ function builtinToLoadedSkill(builtin) {
 // packages/skills-loader-core/src/features/opencode-skill-loader/merger/config-skill-entry-loader.ts
 init_src();
 import { existsSync as existsSync79, readFileSync as readFileSync50 } from "fs";
-import { dirname as dirname28, isAbsolute as isAbsolute13, resolve as resolve22 } from "path";
-import { homedir as homedir25 } from "os";
+import { dirname as dirname28, isAbsolute as isAbsolute13, resolve as resolve21 } from "path";
+import { homedir as homedir24 } from "os";
 function resolveFilePath5(from, configDir) {
   let filePath = from;
   if (filePath.startsWith("{file:") && filePath.endsWith("}")) {
     filePath = filePath.slice(6, -1);
   }
   if (filePath.startsWith("~/")) {
-    return resolve22(homedir25(), filePath.slice(2));
+    return resolve21(homedir24(), filePath.slice(2));
   }
   if (isAbsolute13(filePath)) {
     return filePath;
   }
   const baseDir = configDir || process.cwd();
-  return resolve22(baseDir, filePath);
+  return resolve21(baseDir, filePath);
 }
 function loadSkillFromFile(filePath) {
   try {
@@ -103409,7 +103609,7 @@ function isDisabledSkillName(name, disabledSkills) {
 init_src();
 var import_picomatch2 = __toESM(require_picomatch2(), 1);
 import * as fs20 from "fs/promises";
-import { homedir as homedir26 } from "os";
+import { homedir as homedir25 } from "os";
 import { dirname as dirname30, extname as extname2, isAbsolute as isAbsolute14, join as join97, relative as relative12 } from "path";
 var MAX_RECURSIVE_DEPTH = 10;
 function isHttpUrl(path17) {
@@ -103417,10 +103617,10 @@ function isHttpUrl(path17) {
 }
 function toAbsolutePath(path17, configDir) {
   if (path17 === "~") {
-    return homedir26();
+    return homedir25();
   }
   if (path17.startsWith("~/")) {
-    return join97(homedir26(), path17.slice(2));
+    return join97(homedir25(), path17.slice(2));
   }
   if (isAbsolute14(path17)) {
     return path17;
@@ -103508,12 +103708,14 @@ init_src();
 import * as fs21 from "fs";
 import * as path17 from "path";
 function getConfigPaths3(directory) {
-  const globalConfigDir = getOpenCodeConfigDir2({ binary: "opencode" });
+  const globalConfigDirs = getOpenCodeConfigDirs2({ binary: "opencode" });
   return [
     path17.join(directory, ".opencode", "opencode.json"),
     path17.join(directory, ".opencode", "opencode.jsonc"),
-    path17.join(globalConfigDir, "opencode.json"),
-    path17.join(globalConfigDir, "opencode.jsonc")
+    ...globalConfigDirs.flatMap((dir) => [
+      path17.join(dir, "opencode.json"),
+      path17.join(dir, "opencode.jsonc")
+    ])
   ];
 }
 function toStringArray(value) {
@@ -105720,9 +105922,9 @@ function isPrometheusAgent(agentName) {
 }
 
 // packages/omo-opencode/src/hooks/prometheus-md-only/path-policy.ts
-import { relative as relative13, resolve as resolve23, isAbsolute as isAbsolute15 } from "path";
+import { relative as relative13, resolve as resolve22, isAbsolute as isAbsolute15 } from "path";
 function isAllowedFile(filePath, workspaceRoot) {
-  const resolved = resolve23(workspaceRoot, filePath);
+  const resolved = resolve22(workspaceRoot, filePath);
   const rel = relative13(workspaceRoot, resolved);
   if (rel.startsWith("..") || isAbsolute15(rel)) {
     return false;
@@ -105873,9 +106075,9 @@ init_logger2();
 // packages/omo-opencode/src/hooks/start-work/worktree-detector.ts
 import { execFileSync as execFileSync5 } from "child_process";
 import { existsSync as existsSync82, realpathSync as realpathSync14 } from "fs";
-import { resolve as resolve24, win32 as win327 } from "path";
+import { resolve as resolve23, win32 as win327 } from "path";
 function normalizePath5(path18) {
-  const resolvedPath = process.platform !== "win32" && win327.isAbsolute(path18) ? path18 : resolve24(path18);
+  const resolvedPath = process.platform !== "win32" && win327.isAbsolute(path18) ? path18 : resolve23(path18);
   if (!existsSync82(resolvedPath)) {
     return resolvedPath;
   }
@@ -107766,7 +107968,7 @@ async function validateSubagentSessionId(input) {
 }
 
 // packages/omo-opencode/src/hooks/atlas/tool-execute-after-direct-work.ts
-import { resolve as resolve25 } from "path";
+import { resolve as resolve24 } from "path";
 init_logger2();
 
 // packages/omo-opencode/src/hooks/atlas/omo-path.ts
@@ -107876,7 +108078,7 @@ async function handleDirectWorkToolAfter(input) {
     const sessionWork = getWorkForSession(ctx.directory, toolInput.sessionID);
     if (sessionWork) {
       const planPath = resolveBoulderPlanPathForWork(ctx.directory, sessionWork);
-      if (resolve25(filePath) === resolve25(planPath) && planSnapshot !== undefined) {
+      if (resolve24(filePath) === resolve24(planPath) && planSnapshot !== undefined) {
         const beforeCheckedKeys = parseCheckedTopLevelTaskKeys(planSnapshot);
         const afterCheckedKeys = readCheckedTaskKeysFromPlan(planPath);
         for (const taskKey of afterCheckedKeys) {
@@ -108625,7 +108827,7 @@ function createToolExecuteAfterHandler2(input) {
 // packages/omo-opencode/src/hooks/atlas/tool-execute-before.ts
 init_logger2();
 import { existsSync as existsSync85, readFileSync as readFileSync58 } from "fs";
-import { resolve as resolve26 } from "path";
+import { resolve as resolve25 } from "path";
 var TASK_SECTION_HEADER_PATTERN = /^##\s*1\.\s*TASK\s*$/i;
 var TODO_TASK_LINE_PATTERN = /^(?:[-*]\s*\[\s*\]\s*)?(\d+)\.\s+(.+)$/;
 var FINAL_WAVE_TASK_LINE_PATTERN = /^(?:[-*]\s*\[\s*\]\s*)?(F\d+)\.\s+(.+)$/i;
@@ -108683,7 +108885,7 @@ function createToolExecuteBeforeHandler2(input) {
       const sessionWork = sessionID ? getWorkForSession(ctx.directory, sessionID) : null;
       const state3 = sessionWork ? null : readBoulderState(ctx.directory);
       const planPath = sessionWork ? resolveBoulderPlanPathForWork(ctx.directory, sessionWork) : state3 ? resolveBoulderPlanPath(ctx.directory, state3) : null;
-      if (planPath && resolve26(filePath) === resolve26(planPath) && pendingPlanSnapshots) {
+      if (planPath && resolve25(filePath) === resolve25(planPath) && pendingPlanSnapshots) {
         try {
           if (existsSync85(planPath)) {
             pendingPlanSnapshots.set(toolInput.callID, readFileSync58(planPath, "utf-8"));
@@ -109055,9 +109257,10 @@ function resolveModelForDelegateTask(input, deps) {
         }
       }
     } else {
-      for (const entry of fallbackChain) {
+      for (const [entryIndex, entry] of fallbackChain.entries()) {
         for (const provider of entry.providers) {
-          const fullModel = `${provider}/${entry.model}`;
+          const transformedModelId = transformModelForProvider(provider, entry.model);
+          const fullModel = `${provider}/${transformedModelId}`;
           const match = fuzzyMatchModel(fullModel, new Set(input.availableModels), [provider]);
           if (match) {
             if (explicitHighModel && entry.variant === "high" && match === explicitHighBaseModel) {
@@ -109066,7 +109269,12 @@ function resolveModelForDelegateTask(input, deps) {
             return { model: match, variant: entry.variant, fallbackEntry: entry, matchedFallback: true };
           }
         }
-        const crossProviderMatch = fuzzyMatchModel(entry.model, new Set(input.availableModels));
+        const laterRungProviders = new Set(fallbackChain.slice(entryIndex + 1).filter((candidate) => candidate.model === entry.model).flatMap((candidate) => candidate.providers));
+        const crossProviderCandidates = new Set([...input.availableModels].filter((model) => {
+          const [provider] = model.split("/");
+          return provider !== undefined && !laterRungProviders.has(provider);
+        }));
+        const crossProviderMatch = fuzzyMatchModel(entry.model, crossProviderCandidates);
         if (crossProviderMatch) {
           if (explicitHighModel && entry.variant === "high" && crossProviderMatch === explicitHighBaseModel) {
             return { model: explicitHighModel, fallbackEntry: entry, matchedFallback: true };
@@ -111281,10 +111489,19 @@ function getRawFallbackModelsForSession(sessionID, agent, pluginConfig) {
     }
     return;
   };
+  const shouldInheritPlanFallback = pluginConfig.sisyphus_agent?.disabled !== true && pluginConfig.sisyphus_agent?.planner_enabled !== false && pluginConfig.sisyphus_agent?.replace_plan !== false;
+  const tryGetPrometheusFallbackForPlan = (agentName) => {
+    if (agentName.toLowerCase() !== "plan" || !shouldInheritPlanFallback)
+      return;
+    return tryGetFallbackFromAgent("prometheus");
+  };
   if (agent) {
     const result = tryGetFallbackFromAgent(agent);
     if (result)
       return result;
+    const planFallback = tryGetPrometheusFallbackForPlan(agent);
+    if (planFallback)
+      return planFallback;
   }
   const sessionAgentMatch = sessionID.match(agentPattern);
   if (sessionAgentMatch) {
@@ -111292,6 +111509,9 @@ function getRawFallbackModelsForSession(sessionID, agent, pluginConfig) {
     const result = tryGetFallbackFromAgent(detectedAgent);
     if (result)
       return result;
+    const planFallback = tryGetPrometheusFallbackForPlan(detectedAgent);
+    if (planFallback)
+      return planFallback;
   }
   log2(`[${HOOK_NAME11}] No category/agent fallback models resolved for session`, { sessionID, agent });
   return;
@@ -112584,7 +112804,7 @@ function createRuntimeFallbackHook(ctx, options, factoryOverrides = {}) {
 }
 // packages/omo-opencode/src/hooks/write-existing-file-guard/hook.ts
 import { existsSync as existsSync87, realpathSync as realpathSync15 } from "fs";
-import { basename as basename17, dirname as dirname32, isAbsolute as isAbsolute16, join as join101, normalize as normalize2, relative as relative14, resolve as resolve27 } from "path";
+import { basename as basename17, dirname as dirname32, isAbsolute as isAbsolute16, join as join101, normalize as normalize2, relative as relative14, resolve as resolve26 } from "path";
 
 // packages/omo-opencode/src/hooks/write-existing-file-guard/tool-execute-before-handler.ts
 import { existsSync as existsSync86 } from "fs";
@@ -112756,7 +112976,7 @@ function getPathFromArgs(args) {
   return args?.filePath ?? args?.path ?? args?.file_path;
 }
 function resolveInputPath(ctx, inputPath) {
-  return normalize2(isAbsolute16(inputPath) ? inputPath : resolve27(ctx.directory, inputPath));
+  return normalize2(isAbsolute16(inputPath) ? inputPath : resolve26(ctx.directory, inputPath));
 }
 function isPathInsideDirectory(pathToCheck, directory) {
   const relativePath = relative14(directory, pathToCheck);
@@ -115744,7 +115964,7 @@ function createNotepadWriteGuardHook() {
 }
 // packages/omo-opencode/src/hooks/plan-format-validator/hook.ts
 import { existsSync as existsSync89, readFileSync as readFileSync60 } from "fs";
-import { resolve as resolve28 } from "path";
+import { resolve as resolve27 } from "path";
 init_logger2();
 var WRITE_TOOLS = new Set(["Write", "Edit", "write", "edit"]);
 var CHECKBOX_PATTERN = /^[-*]\s*\[[ xX]\]/m;
@@ -115826,7 +116046,7 @@ function createPlanFormatValidatorHook(_ctx) {
         return;
       if (!isPlanFilePath(filePath))
         return;
-      const resolvedPath = resolve28(_ctx.directory, filePath);
+      const resolvedPath = resolve27(_ctx.directory, filePath);
       if (!existsSync89(resolvedPath))
         return;
       const content = readFileSync60(resolvedPath, "utf-8");
@@ -115928,7 +116148,7 @@ function createMonitorStatusInjectorHook(monitorManager, config) {
   };
 }
 // packages/omo-opencode/src/tools/grep/tools.ts
-import { resolve as resolve29 } from "path";
+import { resolve as resolve28 } from "path";
 
 // node_modules/.bun/@opencode-ai+plugin@1.15.13+8002cb46da36e070/node_modules/@opencode-ai/plugin/dist/tool.js
 import { z as z3 } from "zod";
@@ -116175,10 +116395,10 @@ class Semaphore {
       this.running++;
       return;
     }
-    return new Promise((resolve29) => {
+    return new Promise((resolve28) => {
       this.queue.push(() => {
         this.running++;
-        resolve29();
+        resolve28();
       });
     });
   }
@@ -116493,7 +116713,7 @@ function createGrepTools(ctx) {
         const globs = args.include ? [args.include] : undefined;
         const runtimeCtx = context;
         const dir = typeof runtimeCtx.directory === "string" ? runtimeCtx.directory : ctx.directory;
-        const searchPath = args.path ? resolve29(dir, args.path) : dir;
+        const searchPath = args.path ? resolve28(dir, args.path) : dir;
         const paths = [searchPath];
         const outputMode = args.output_mode ?? "files_with_matches";
         const headLimit = args.head_limit ?? 0;
@@ -116524,11 +116744,11 @@ function createGrepTools(ctx) {
   return { grep };
 }
 // packages/omo-opencode/src/tools/glob/tools.ts
-import { resolve as resolve31 } from "path";
+import { resolve as resolve30 } from "path";
 
 // packages/omo-opencode/src/tools/glob/cli.ts
 init_bun_spawn_shim();
-import { resolve as resolve30 } from "path";
+import { resolve as resolve29 } from "path";
 
 // packages/omo-opencode/src/tools/glob/constants.ts
 var DEFAULT_TIMEOUT_MS3 = 60000;
@@ -116656,7 +116876,7 @@ async function runRgFilesInternal(options, resolvedCli, processSpawner = spawn)
       }
       let filePath;
       if (isRg) {
-        filePath = cwd ? resolve30(cwd, line) : line;
+        filePath = cwd ? resolve29(cwd, line) : line;
       } else if (isWindows2) {
         filePath = line.trim();
       } else {
@@ -116716,7 +116936,7 @@ function createGlobTools(ctx) {
         const cli = await resolveGrepCliWithAutoInstall();
         const runtimeCtx = context;
         const dir = typeof runtimeCtx.directory === "string" ? runtimeCtx.directory : ctx.directory;
-        const searchPath = args.path ? resolve31(dir, args.path) : dir;
+        const searchPath = args.path ? resolve30(dir, args.path) : dir;
         const result = await runRgFiles({
           pattern: args.pattern,
           paths: [searchPath]
@@ -118592,7 +118812,7 @@ init_logger2();
 
 // packages/omo-opencode/src/tools/background-task/delay.ts
 function delay5(ms) {
-  return new Promise((resolve32) => setTimeout(resolve32, ms));
+  return new Promise((resolve31) => setTimeout(resolve31, ms));
 }
 // packages/omo-opencode/src/tools/background-task/create-background-output.ts
 init_logger2();
@@ -119438,19 +119658,19 @@ import { existsSync as existsSync97, readdirSync as readdirSync23 } from "fs";
 import { join as join112 } from "path";
 
 // packages/claude-code-compat-core/src/shared/claude-config-dir.ts
-import { homedir as homedir27 } from "os";
+import { homedir as homedir26 } from "os";
 import { join as join107 } from "path";
 function getClaudeConfigDir3() {
   const envConfigDir = process.env.CLAUDE_CONFIG_DIR;
   if (envConfigDir) {
     return envConfigDir;
   }
-  return join107(process.env.HOME || process.env.USERPROFILE || homedir27(), ".claude");
+  return join107(process.env.HOME || process.env.USERPROFILE || homedir26(), ".claude");
 }
 // packages/claude-code-compat-core/src/shared/opencode-config-dir.ts
 import { existsSync as existsSync93, realpathSync as realpathSync16 } from "fs";
-import { homedir as homedir28 } from "os";
-import { join as join108, posix as posix6, resolve as resolve32, win32 as win329 } from "path";
+import { homedir as homedir27 } from "os";
+import { join as join108, posix as posix6, resolve as resolve31, win32 as win329 } from "path";
 var TAURI_APP_IDENTIFIER3 = "ai.opencode.desktop";
 var TAURI_APP_IDENTIFIER_DEV3 = "ai.opencode.desktop.dev";
 function isDevBuild3(version) {
@@ -119462,14 +119682,14 @@ function getTauriConfigDir3(identifier) {
   const platform2 = process.platform;
   switch (platform2) {
     case "darwin":
-      return join108(homedir28(), "Library", "Application Support", identifier);
+      return join108(homedir27(), "Library", "Application Support", identifier);
     case "win32": {
-      const appData = process.env.APPDATA || join108(homedir28(), "AppData", "Roaming");
+      const appData = process.env.APPDATA || join108(homedir27(), "AppData", "Roaming");
       return win329.join(appData, identifier);
     }
     case "linux":
     default: {
-      const xdgConfig = process.env.XDG_CONFIG_HOME || join108(homedir28(), ".config");
+      const xdgConfig = process.env.XDG_CONFIG_HOME || join108(homedir27(), ".config");
       return join108(xdgConfig, identifier);
     }
   }
@@ -119478,7 +119698,7 @@ function resolveConfigPath3(pathValue) {
   if (isWslEnvironment3() && pathValue.startsWith("/")) {
     return posix6.normalize(pathValue);
   }
-  const resolvedPath = resolve32(pathValue);
+  const resolvedPath = resolve31(pathValue);
   if (!existsSync93(resolvedPath))
     return resolvedPath;
   try {
@@ -119513,7 +119733,7 @@ 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 ? posix6.join(getWslLinuxHomeDir3(envXdgConfig) ?? "/home", ".config") : envXdgConfig || join108(homedir28(), ".config");
+  const xdgConfig = shouldIgnoreWindowsXdg ? posix6.join(getWslLinuxHomeDir3(envXdgConfig) ?? "/home", ".config") : envXdgConfig || join108(homedir27(), ".config");
   const configDir = isWslEnvironment3() ? posix6.join(xdgConfig, "opencode") : join108(xdgConfig, "opencode");
   return resolveConfigPath3(configDir);
 }
@@ -119558,12 +119778,12 @@ function getOpenCodeConfigDir3(options) {
 // packages/claude-code-compat-core/src/shared/jsonc-parser.ts
 init_src();
 // packages/claude-code-compat-core/src/shared/resolve-agent-definition-paths.ts
-import { homedir as homedir29 } from "os";
-import { isAbsolute as isAbsolute17, join as join109, resolve as resolve33 } from "path";
+import { homedir as homedir28 } from "os";
+import { isAbsolute as isAbsolute17, join as join109, resolve as resolve32 } from "path";
 function resolveAgentDefinitionPaths2(paths, baseDir, containmentDir) {
   return paths.flatMap((p) => {
-    const expanded = p.startsWith("~/") ? join109(homedir29(), p.slice(2)) : p;
-    const resolved = isAbsolute17(expanded) ? expanded : resolve33(baseDir, expanded);
+    const expanded = p.startsWith("~/") ? join109(homedir28(), p.slice(2)) : p;
+    const resolved = isAbsolute17(expanded) ? expanded : resolve32(baseDir, expanded);
     if (containmentDir !== null && !isWithinProject(resolved, containmentDir)) {
       log4(`agent_definitions path rejected (outside project boundary): ${p} -> ${resolved}`);
       return [];
@@ -119614,10 +119834,10 @@ function getOpenCodeCommandDirs2(options) {
 // packages/claude-code-compat-core/src/shared/project-discovery-dirs.ts
 import { execFileSync as execFileSync6 } from "child_process";
 import { existsSync as existsSync94, realpathSync as realpathSync17 } from "fs";
-import { dirname as dirname37, join as join111, resolve as resolve34, win32 as win3210 } from "path";
+import { dirname as dirname37, join as join111, resolve as resolve33, win32 as win3210 } from "path";
 var worktreePathCache3 = new Map;
 function normalizePath6(path18) {
-  const resolvedPath = process.platform !== "win32" && win3210.isAbsolute(path18) ? path18 : resolve34(path18);
+  const resolvedPath = process.platform !== "win32" && win3210.isAbsolute(path18) ? path18 : resolve33(path18);
   if (!existsSync94(resolvedPath)) {
     return resolvedPath;
   }
@@ -119642,7 +119862,7 @@ function pathKey3(path18) {
   return process.platform === "win32" ? normalized.toLowerCase() : normalized;
 }
 function detectWorktreePath4(directory) {
-  const resolvedDirectory = resolve34(directory);
+  const resolvedDirectory = resolve33(directory);
   const cacheKey = pathKey3(normalizePath6(resolvedDirectory));
   if (worktreePathCache3.has(cacheKey)) {
     return worktreePathCache3.get(cacheKey);
@@ -119892,14 +120112,15 @@ function loadOpencodeProjectAgents(directory) {
 import * as fs22 from "fs";
 import * as path18 from "path";
 function getConfigPaths4(directory) {
-  const globalConfigDir = getOpenCodeConfigDir3({ binary: "opencode" });
-  const paths = [
+  const globalConfigDirs = getOpenCodeConfigDirs3({ binary: "opencode" });
+  return [
     path18.join(directory, ".opencode", "opencode.json"),
     path18.join(directory, ".opencode", "opencode.jsonc"),
-    path18.join(globalConfigDir, "opencode.json"),
-    path18.join(globalConfigDir, "opencode.jsonc")
+    ...globalConfigDirs.flatMap((dir) => [
+      path18.join(dir, "opencode.json"),
+      path18.join(dir, "opencode.jsonc")
+    ])
   ];
-  return paths;
 }
 function convertInlineAgent(agentData) {
   if (!agentData || typeof agentData !== "object") {
@@ -120079,7 +120300,7 @@ Task ID: ${task.id}`;
       if (toolContext.abort?.aborted) {
         break;
       }
-      await new Promise((resolve35) => setTimeout(resolve35, WAIT_FOR_SESSION_INTERVAL_MS));
+      await new Promise((resolve34) => setTimeout(resolve34, WAIT_FOR_SESSION_INTERVAL_MS));
     }
     await toolContext.metadata?.({
       title: args.description,
@@ -120159,7 +120380,7 @@ async function waitForCompletion(sessionID, toolContext, ctx) {
       log2(`[call_omo_agent] Aborted by user`);
       throw new Error("Task aborted.");
     }
-    await new Promise((resolve35) => setTimeout(resolve35, POLL_INTERVAL_MS));
+    await new Promise((resolve34) => setTimeout(resolve34, POLL_INTERVAL_MS));
     const statusResult = await ctx.client.session.status();
     const allStatuses = normalizeSDKResponse(statusResult, {});
     const sessionStatus = allStatuses[sessionID];
@@ -121362,7 +121583,7 @@ async function waitForLookAtSessionResult(client3, sessionID, options) {
         sawNonIdleStatus
       });
     }
-    await new Promise((resolve35) => setTimeout(resolve35, pollInterval));
+    await new Promise((resolve34) => setTimeout(resolve34, pollInterval));
   }
   throw new Error(`[look_at] Polling timed out after ${timeout}ms waiting for session ${sessionID} to become idle`);
 }
@@ -123076,7 +123297,7 @@ async function executeUnstableAgentTask(args, ctx, executorCtx, parentContext, a
 
 Task ID: ${task.id}`;
       }
-      await new Promise((resolve35) => setTimeout(resolve35, timing.WAIT_FOR_SESSION_INTERVAL_MS));
+      await new Promise((resolve34) => setTimeout(resolve34, timing.WAIT_FOR_SESSION_INTERVAL_MS));
       const updated = manager.getTask(task.id);
       sessionID = updated?.sessionId;
     }
@@ -123138,7 +123359,7 @@ Session ID: ${sessionID}`;
       }
       const timeoutBudgetMs = syncPollTimeoutMs ?? DEFAULT_SYNC_POLL_TIMEOUT_MS;
       const remainingBudgetMs = timeoutBudgetMs - (Date.now() - pollStart);
-      await new Promise((resolve35) => setTimeout(resolve35, Math.min(timingCfg.POLL_INTERVAL_MS, Math.max(1, remainingBudgetMs))));
+      await new Promise((resolve34) => setTimeout(resolve34, Math.min(timingCfg.POLL_INTERVAL_MS, Math.max(1, remainingBudgetMs))));
       const statusResult = await client3.session.status();
       const allStatuses = normalizeSDKResponse(statusResult, {});
       const sessionStatus = allStatuses[sessionID];
@@ -123277,7 +123498,7 @@ function continueSessionSetup(args) {
   (async () => {
     const waitStart = Date.now();
     while (Date.now() - waitStart < args.timing.WAIT_FOR_SESSION_TIMEOUT_MS) {
-      await new Promise((resolve35) => setTimeout(resolve35, args.timing.WAIT_FOR_SESSION_INTERVAL_MS));
+      await new Promise((resolve34) => setTimeout(resolve34, args.timing.WAIT_FOR_SESSION_INTERVAL_MS));
       const updated = args.manager.getTask(args.taskID);
       if (!updated) {
         return;
@@ -123315,7 +123536,7 @@ async function waitForBackgroundSessionStart(args) {
       args.onAbort();
       return;
     }
-    await new Promise((resolve35) => setTimeout(resolve35, args.timing.WAIT_FOR_SESSION_INTERVAL_MS));
+    await new Promise((resolve34) => setTimeout(resolve34, args.timing.WAIT_FOR_SESSION_INTERVAL_MS));
   }
   return sessionId;
 }
@@ -127080,9 +127301,9 @@ async function abortWithTimeout(client3, sessionID, timeoutMs = 1e4) {
         });
         return "failed";
       }),
-      new Promise((resolve35) => {
+      new Promise((resolve34) => {
         timeoutHandle = setTimeout(() => {
-          resolve35("timed_out");
+          resolve34("timed_out");
         }, timeoutMs);
       })
     ]);
@@ -127484,7 +127705,7 @@ class ConcurrencyManager {
       this.counts.set(key, current + 1);
       return;
     }
-    return new Promise((resolve35, reject) => {
+    return new Promise((resolve34, reject) => {
       const queue = this.queues.get(key) ?? [];
       const entry = {
         taskId,
@@ -127492,7 +127713,7 @@ class ConcurrencyManager {
           if (entry.settled)
             return;
           entry.settled = true;
-          resolve35();
+          resolve34();
         },
         rawReject: reject,
         settled: false
@@ -132208,10 +132429,10 @@ The task was re-queued on a fallback model after a retryable failure.
     return this.scheduledFlushSettledCounts.get(sessionID) ?? 0;
   }
   awaitScheduledFlush(sessionID, sinceCount) {
-    return new Promise((resolve35) => {
+    return new Promise((resolve34) => {
       const arm = () => {
         if ((this.scheduledFlushSettledCounts.get(sessionID) ?? 0) > sinceCount) {
-          resolve35();
+          resolve34();
           return;
         }
         const waiters = this.scheduledFlushSettledWaiters.get(sessionID) ?? [];
@@ -133318,8 +133539,8 @@ function spawnMonitoredProcess(opts, deps) {
   let watchdogTimer;
   let graceTimer;
   let resolvePublicExit = () => {};
-  const publicExit = new Promise((resolve35) => {
-    resolvePublicExit = resolve35;
+  const publicExit = new Promise((resolve34) => {
+    resolvePublicExit = resolve34;
   });
   function clearWatchdog() {
     if (watchdogTimer !== undefined) {
@@ -133808,10 +134029,10 @@ import { basename as basename22, dirname as dirname41, join as join124 } from "p
 
 // packages/mcp-client-core/src/config-dir.ts
 import { existsSync as existsSync102, realpathSync as realpathSync18 } from "fs";
-import { homedir as homedir30 } from "os";
-import { join as join122, resolve as resolve35 } from "path";
+import { homedir as homedir29 } from "os";
+import { join as join122, resolve as resolve34 } from "path";
 function resolveConfigPath4(pathValue) {
-  const resolvedPath = resolve35(pathValue);
+  const resolvedPath = resolve34(pathValue);
   if (!existsSync102(resolvedPath))
     return resolvedPath;
   try {
@@ -133827,7 +134048,7 @@ function getOpenCodeCliConfigDir(env2 = process.env) {
   if (customConfigDir) {
     return resolveConfigPath4(customConfigDir);
   }
-  const xdgConfigDir = env2["XDG_CONFIG_HOME"]?.trim() || join122(homedir30(), ".config");
+  const xdgConfigDir = env2["XDG_CONFIG_HOME"]?.trim() || join122(homedir29(), ".config");
   return resolveConfigPath4(join122(xdgConfigDir, "opencode"));
 }
 
@@ -134207,7 +134428,7 @@ function buildAuthorizationUrl(authorizationEndpoint, options) {
 }
 var CALLBACK_TIMEOUT_MS = 5 * 60 * 1000;
 function startCallbackServer(port) {
-  return new Promise((resolve36, reject) => {
+  return new Promise((resolve35, reject) => {
     let timeoutId;
     const server2 = createServer2((request, response) => {
       clearTimeout(timeoutId);
@@ -134233,7 +134454,7 @@ function startCallbackServer(port) {
       response.writeHead(200, { "content-type": "text/html" });
       response.end("<html><body><h1>Authorization successful. You can close this tab.</h1></body></html>");
       server2.close();
-      resolve36({ code, state: state3 });
+      resolve35({ code, state: state3 });
     });
     timeoutId = setTimeout(() => {
       server2.close();
@@ -136008,7 +136229,7 @@ class Protocol {
           return;
         }
         const pollInterval = task2.pollInterval ?? this._options?.defaultTaskPollInterval ?? 1000;
-        await new Promise((resolve36) => setTimeout(resolve36, pollInterval));
+        await new Promise((resolve35) => setTimeout(resolve35, pollInterval));
         options?.signal?.throwIfAborted();
       }
     } catch (error) {
@@ -136020,7 +136241,7 @@ class Protocol {
   }
   request(request, resultSchema, options) {
     const { relatedRequestId, resumptionToken, onresumptiontoken, task, relatedTask } = options ?? {};
-    return new Promise((resolve36, reject) => {
+    return new Promise((resolve35, reject) => {
       const earlyReject = (error) => {
         reject(error);
       };
@@ -136098,7 +136319,7 @@ class Protocol {
           if (!parseResult.success) {
             reject(parseResult.error);
           } else {
-            resolve36(parseResult.data);
+            resolve35(parseResult.data);
           }
         } catch (error) {
           reject(error);
@@ -136289,12 +136510,12 @@ class Protocol {
         interval = task.pollInterval;
       }
     } catch {}
-    return new Promise((resolve36, reject) => {
+    return new Promise((resolve35, reject) => {
       if (signal.aborted) {
         reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
         return;
       }
-      const timeoutId = setTimeout(resolve36, interval);
+      const timeoutId = setTimeout(resolve35, interval);
       signal.addEventListener("abort", () => {
         clearTimeout(timeoutId);
         reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
@@ -138823,7 +139044,7 @@ class StdioClientTransport {
     if (this._process) {
       throw new Error("StdioClientTransport already started! If using Client class, note that connect() calls start() automatically.");
     }
-    return new Promise((resolve36, reject) => {
+    return new Promise((resolve35, reject) => {
       this._process = import_cross_spawn2.default(this._serverParams.command, this._serverParams.args ?? [], {
         env: {
           ...getDefaultEnvironment(),
@@ -138839,7 +139060,7 @@ class StdioClientTransport {
         this.onerror?.(error);
       });
       this._process.on("spawn", () => {
-        resolve36();
+        resolve35();
       });
       this._process.on("close", (_code) => {
         this._process = undefined;
@@ -138886,20 +139107,20 @@ class StdioClientTransport {
     if (this._process) {
       const processToClose = this._process;
       this._process = undefined;
-      const closePromise = new Promise((resolve36) => {
+      const closePromise = new Promise((resolve35) => {
         processToClose.once("close", () => {
-          resolve36();
+          resolve35();
         });
       });
       try {
         processToClose.stdin?.end();
       } catch {}
-      await Promise.race([closePromise, new Promise((resolve36) => setTimeout(resolve36, 2000).unref())]);
+      await Promise.race([closePromise, new Promise((resolve35) => setTimeout(resolve35, 2000).unref())]);
       if (processToClose.exitCode === null) {
         try {
           processToClose.kill("SIGTERM");
         } catch {}
-        await Promise.race([closePromise, new Promise((resolve36) => setTimeout(resolve36, 2000).unref())]);
+        await Promise.race([closePromise, new Promise((resolve35) => setTimeout(resolve35, 2000).unref())]);
       }
       if (processToClose.exitCode === null) {
         try {
@@ -138910,15 +139131,15 @@ class StdioClientTransport {
     this._readBuffer.clear();
   }
   send(message) {
-    return new Promise((resolve36) => {
+    return new Promise((resolve35) => {
       if (!this._process?.stdin) {
         throw new Error("Not connected");
       }
       const json = serializeMessage(message);
       if (this._process.stdin.write(json)) {
-        resolve36();
+        resolve35();
       } else {
-        this._process.stdin.once("drain", resolve36);
+        this._process.stdin.once("drain", resolve35);
       }
     });
   }
@@ -139380,17 +139601,17 @@ import { dirname as dirname42 } from "path";
 // packages/omo-opencode/src/features/tui-sidebar/mirror-path.ts
 import { createHash as createHash8 } from "crypto";
 import { realpathSync as realpathSync19 } from "fs";
-import { homedir as homedir31 } from "os";
-import { join as join125, resolve as resolve36 } from "path";
+import { homedir as homedir30 } from "os";
+import { join as join125, resolve as resolve35 } from "path";
 function mirrorStorageDir() {
-  return join125(process.env.XDG_DATA_HOME ?? join125(homedir31(), ".local", "share"), "opencode", "storage", "oh-my-openagent", MIRROR_DIR_NAME);
+  return join125(process.env.XDG_DATA_HOME ?? join125(homedir30(), ".local", "share"), "opencode", "storage", "oh-my-openagent", MIRROR_DIR_NAME);
 }
 function canonicalProjectDir(projectDir) {
   try {
     return realpathSync19.native(projectDir);
   } catch (error) {
     if (error instanceof Error) {
-      return resolve36(projectDir);
+      return resolve35(projectDir);
     }
     throw error;
   }
@@ -140665,8 +140886,8 @@ async function waitForSessionReady(params) {
     } catch (error) {
       log2("[tmux-session-manager] session status check error", { error: String(error) });
     }
-    await new Promise((resolve37) => {
-      setTimeout(resolve37, SESSION_READY_POLL_INTERVAL_MS);
+    await new Promise((resolve36) => {
+      setTimeout(resolve36, SESSION_READY_POLL_INTERVAL_MS);
     });
   }
   log2("[tmux-session-manager] session ready timeout", {
@@ -142256,11 +142477,11 @@ import {
 
 // packages/openclaw-core/src/reply-listener-paths.ts
 import { existsSync as existsSync105, mkdirSync as mkdirSync22 } from "fs";
-import { homedir as homedir32 } from "os";
+import { homedir as homedir31 } from "os";
 import { join as join127 } from "path";
 var REPLY_LISTENER_SECURE_FILE_MODE = 384;
 function resolveReplyListenerHomeDir() {
-  return process.env.HOME ?? process.env.USERPROFILE ?? homedir32();
+  return process.env.HOME ?? process.env.USERPROFILE ?? homedir31();
 }
 function getReplyListenerStateDir() {
   return join127(resolveReplyListenerHomeDir(), ".omo", "openclaw", "state");
@@ -142785,7 +143006,7 @@ function markReplyListenerStopped(state3, error) {
 
 // packages/openclaw-core/src/reply-listener-sleep.ts
 function sleep3(ms) {
-  return new Promise((resolve37) => setTimeout(resolve37, ms));
+  return new Promise((resolve36) => setTimeout(resolve36, ms));
 }
 
 // packages/openclaw-core/src/reply-listener-signature.ts
@@ -143428,11 +143649,11 @@ async function createRuntimeSkillSourceServer(options, runtimeEnv = runtime6) {
         response.end(error instanceof Error ? error.message : String(error));
       }
     });
-    await new Promise((resolve37, reject) => {
+    await new Promise((resolve36, reject) => {
       const onError = (error) => reject(error);
       const onListening = () => {
         server3.off("error", onError);
-        resolve37();
+        resolve36();
       };
       server3.once("error", onError);
       server3.once("listening", onListening);
@@ -143463,7 +143684,7 @@ async function createRuntimeSkillSourceServer(options, runtimeEnv = runtime6) {
 // packages/claude-code-compat-core/src/features/claude-code-mcp-loader/loader.ts
 import { existsSync as existsSync110, readFileSync as readFileSync76 } from "fs";
 import { join as join130 } from "path";
-import { homedir as homedir33 } from "os";
+import { homedir as homedir32 } from "os";
 function getMcpConfigPaths() {
   const claudeConfigDir = getClaudeConfigDir3();
   const homeDir = getHomeDir();
@@ -143476,7 +143697,7 @@ function getMcpConfigPaths() {
   ];
 }
 function getHomeDir() {
-  return process.env.HOME || process.env.USERPROFILE || homedir33();
+  return process.env.HOME || process.env.USERPROFILE || homedir32();
 }
 async function loadMcpConfigFile(filePath) {
   if (!existsSync110(filePath)) {
@@ -150382,7 +150603,7 @@ Write the final message and stop **only when** Success Criteria are all true. Un
 function buildGpt55HephaestusPrompt(availableAgents, _availableTools = [], availableSkills = [], availableCategories = [], useTaskSystem = false) {
   const taskSystemGuide = buildTaskSystemGuide2(useTaskSystem);
   const categorySkillsGuide = buildCategorySkillsDelegationGuide(availableCategories, availableSkills);
-  const delegationTable = buildDelegationTable(availableAgents);
+  const delegationTable = buildDelegationTable(availableAgents.filter((agent) => ["explore", "librarian", "oracle"].includes(agent.name)));
   const oracleSection = buildOracleSection(availableAgents);
   const frontendGuidance = buildFrontendGuidanceSection(availableCategories);
   return HEPHAESTUS_GPT_5_5_TEMPLATE.replace("{{ taskSystemGuide }}", taskSystemGuide).replace("{{ categorySkillsGuide }}", categorySkillsGuide).replace("{{ delegationTable }}", delegationTable).replace("{{ oracleSection }}", oracleSection).replace("{{ frontendGuidance }}", frontendGuidance);
@@ -150431,6 +150652,8 @@ Once you delegate exploration to background agents, do not search the same thing
 
 Independent tool calls run in the same response; serial is the exception and requires a real dependency. Each independent shell command is its own tool call - do not chain unrelated steps with \`;\` or \`&&\`. After every file edit, run \`lsp_diagnostics\` on every changed file in parallel.
 
+Waiting is not free: a status poll replays the whole accumulated context through the model. Run a long command (install, build, suite, CI watch) to completion in one call with a timeout sized to the expected wait - or send output to a log file read once on a completion signal - never re-poll the same surface with empty reads or sub-minute waits. If two consecutive checks show no state change, double the wait or switch to a completion signal.
+
 # Operating Loop
 
 **Explore -> Plan -> Implement -> Verify -> Manually QA.**
@@ -150438,7 +150661,7 @@ Independent tool calls run in the same response; serial is the exception and req
 - **Explore** per Discovery & Retrieval.
 - **Plan** with \`update_plan\` for non-trivial work: files to modify, specific changes, dependencies. Skip planning for the easiest 25%; never make single-step plans.
 - **Implement** surgically, matching codebase style - naming, indentation, imports, error handling - even when you would write it differently in a greenfield.
-- **Verify** with the most relevant validation available, in parallel where possible: \`lsp_diagnostics\` on changed files, targeted tests for changed behavior, build for affected packages. If validation cannot run, say why and name the next best check.
+- **Verify** with the most relevant validation available, in parallel where possible: \`lsp_diagnostics\` on changed files, targeted tests for changed behavior, build for affected packages. If validation cannot run, say why and name the next best check. Re-run a validation command only when its inputs changed since its last green run; one full pass at the end replaces repeated identical reruns.
 - **Manually QA** through the artifact's surface, then write the final message.
 
 # Manual QA Gate
@@ -150545,7 +150768,7 @@ Write the final message and stop only when Success Criteria are all true. Until
 function buildGpt56HephaestusPrompt(availableAgents, _availableTools = [], availableSkills = [], availableCategories = [], useTaskSystem = false) {
   const taskSystemGuide = buildTaskSystemGuide3(useTaskSystem);
   const categorySkillsGuide = buildCategorySkillsDelegationGuide(availableCategories, availableSkills);
-  const delegationTable = buildDelegationTable(availableAgents);
+  const delegationTable = buildDelegationTable(availableAgents.filter((agent) => ["explore", "librarian", "oracle"].includes(agent.name)));
   const oracleSection = buildOracleSection(availableAgents);
   const frontendGuidance = buildFrontendGuidanceSection(availableCategories);
   return HEPHAESTUS_GPT_5_6_TEMPLATE.replace("{{ taskSystemGuide }}", taskSystemGuide).replace("{{ categorySkillsGuide }}", categorySkillsGuide).replace("{{ delegationTable }}", delegationTable).replace("{{ oracleSection }}", oracleSection).replace("{{ frontendGuidance }}", frontendGuidance);
@@ -150649,14 +150872,14 @@ function createHephaestusAgent(model, availableAgents, availableToolNames, avail
 createHephaestusAgent.mode = MODE9;
 // packages/omo-opencode/src/agents/builtin-agents/resolve-file-uri.ts
 import { existsSync as existsSync111, readFileSync as readFileSync77 } from "fs";
-import { homedir as homedir34 } from "os";
-import { isAbsolute as isAbsolute19, join as join131, resolve as resolve37 } from "path";
+import { homedir as homedir33 } from "os";
+import { isAbsolute as isAbsolute19, join as join131, resolve as resolve36 } from "path";
 init_logger2();
 var ALLOWED_HOME_SUBDIRS = [
-  join131(homedir34(), ".config", "opencode"),
-  join131(homedir34(), ".config", "oh-my-openagent"),
-  join131(homedir34(), ".omo"),
-  join131(homedir34(), ".opencode")
+  join131(homedir33(), ".config", "opencode"),
+  join131(homedir33(), ".config", "oh-my-openagent"),
+  join131(homedir33(), ".omo"),
+  join131(homedir33(), ".opencode")
 ];
 function isWithinAllowedPaths(filePath, projectRoot) {
   if (isWithinProject(filePath, projectRoot))
@@ -150674,8 +150897,8 @@ function resolvePromptAppend(promptAppend, configDir) {
   let filePath;
   try {
     const decoded = decodeURIComponent(encoded);
-    const expanded = decoded.startsWith("~/") ? decoded.replace(/^~\//, `${homedir34()}/`) : decoded;
-    filePath = isAbsolute19(expanded) ? expanded : resolve37(configDir ?? process.cwd(), expanded);
+    const expanded = decoded.startsWith("~/") ? decoded.replace(/^~\//, `${homedir33()}/`) : decoded;
+    filePath = isAbsolute19(expanded) ? expanded : resolve36(configDir ?? process.cwd(), expanded);
   } catch (error) {
     if (!(error instanceof Error)) {
       throw error;
@@ -152783,7 +153006,8 @@ var MODEL_SETTINGS_KEYS = [
   "thinking",
   "reasoningEffort",
   "textVerbosity",
-  "providerOptions"
+  "providerOptions",
+  "fallback_models"
 ];
 function buildPlanDemoteConfig(prometheusConfig, planOverride) {
   const modelSettings = {};
@@ -152858,6 +153082,7 @@ async function buildPrometheusAgentConfig(params) {
   const temperatureToUse = params.pluginPrometheusOverride?.temperature ?? categoryConfig?.temperature;
   const topPToUse = params.pluginPrometheusOverride?.top_p ?? categoryConfig?.top_p;
   const maxTokensToUse = params.pluginPrometheusOverride?.maxTokens ?? categoryConfig?.maxTokens;
+  const fallbackModelsToUse = params.pluginPrometheusOverride?.fallback_models ?? categoryConfig?.fallback_models;
   const base = {
     ...resolvedModel ? { model: resolvedModel } : {},
     ...variantToUse ? { variant: variantToUse } : {},
@@ -152869,6 +153094,7 @@ async function buildPrometheusAgentConfig(params) {
     ...temperatureToUse !== undefined ? { temperature: temperatureToUse } : {},
     ...topPToUse !== undefined ? { top_p: topPToUse } : {},
     ...maxTokensToUse !== undefined ? { maxTokens: maxTokensToUse } : {},
+    ...fallbackModelsToUse !== undefined ? { fallback_models: fallbackModelsToUse } : {},
     ...categoryConfig?.tools ? { tools: categoryConfig.tools } : {},
     ...thinkingToUse ? { thinking: thinkingToUse } : {},
     ...reasoningEffortToUse !== undefined ? { reasoningEffort: reasoningEffortToUse } : {},
@@ -153762,7 +153988,7 @@ function createCodegraphMcpConfig(options = {}) {
 
 // packages/omo-opencode/src/mcp/lsp.ts
 import { existsSync as existsSync113, readFileSync as readFileSync78 } from "fs";
-import { delimiter as delimiter2, dirname as dirname45, resolve as resolve39 } from "path";
+import { delimiter as delimiter2, dirname as dirname45, resolve as resolve38 } from "path";
 import { fileURLToPath as fileURLToPath8 } from "url";
 import { z as z11 } from "zod";
 
@@ -153775,7 +154001,7 @@ function hasCliSuffix(candidatePath, suffix) {
 }
 
 // packages/omo-opencode/src/mcp/shared/ancestor-cli-resolver.ts
-import { resolve as resolve38 } from "path";
+import { resolve as resolve37 } from "path";
 function resolveJavaScriptRuntime(resolveExecutable) {
   const node = resolveExecutable("node");
   return node.available ? node : resolveExecutable("bun");
@@ -153783,9 +154009,9 @@ function resolveJavaScriptRuntime(resolveExecutable) {
 function createAncestorCliCandidates(options) {
   const candidates = [];
   const seenPaths = new Set;
-  let currentDirectory = resolve38(options.startDirectory);
+  let currentDirectory = resolve37(options.startDirectory);
   while (true) {
-    const distCliPath = resolve38(currentDirectory, options.packageRel, options.distCliRel);
+    const distCliPath = resolve37(currentDirectory, options.packageRel, options.distCliRel);
     if (!seenPaths.has(distCliPath)) {
       const runtime7 = resolveJavaScriptRuntime(options.resolveExecutable);
       seenPaths.add(distCliPath);
@@ -153797,7 +154023,7 @@ function createAncestorCliCandidates(options) {
         runtimeAvailable: runtime7.available
       });
     }
-    const sourceCliPath = resolve38(currentDirectory, options.packageRel, options.sourceCliRel);
+    const sourceCliPath = resolve37(currentDirectory, options.packageRel, options.sourceCliRel);
     if (!seenPaths.has(sourceCliPath)) {
       const runtime7 = options.resolveExecutable("bun");
       const sourceCandidateAvailable = options.isSourceCandidateAvailable?.({
@@ -153814,7 +154040,7 @@ function createAncestorCliCandidates(options) {
         runtimeAvailable: runtime7.available
       });
     }
-    const parentDirectory = resolve38(currentDirectory, "..");
+    const parentDirectory = resolve37(currentDirectory, "..");
     if (parentDirectory === currentDirectory)
       return candidates;
     currentDirectory = parentDirectory;
@@ -153867,11 +154093,11 @@ function getModuleDirectory(moduleUrl) {
   }
 }
 function findBootstrapRoot(candidates, pathExists) {
-  return candidates.find((candidate) => pathExists(resolve39(candidate.root, "package.json")))?.root ?? process.cwd();
+  return candidates.find((candidate) => pathExists(resolve38(candidate.root, "package.json")))?.root ?? process.cwd();
 }
 function readDaemonPackageVersion(root) {
   try {
-    const packageJson = JSON.parse(readFileSync78(resolve39(root, PACKAGE_REL, "package.json"), "utf-8"));
+    const packageJson = JSON.parse(readFileSync78(resolve38(root, PACKAGE_REL, "package.json"), "utf-8"));
     return DaemonPackageSchema.parse(packageJson).version;
   } catch (error) {
     if (!(error instanceof Error))
@@ -153883,11 +154109,11 @@ function createBootstrapCandidate(root, pathExists, resolveExecutable) {
   const runtime7 = resolveJavaScriptRuntime(resolveExecutable);
   const bun = resolveExecutable("bun");
   const npm = resolveExecutable("npm");
-  const packageManifestPath = resolve39(root, PACKAGE_REL, "package.json");
+  const packageManifestPath = resolve38(root, PACKAGE_REL, "package.json");
   return {
     command: [runtime7.command, "-e", LSP_BOOTSTRAP_SCRIPT, root, npm.command, bun.command],
     root,
-    path: resolve39(root, PACKAGE_REL, DIST_CLI_REL),
+    path: resolve38(root, PACKAGE_REL, DIST_CLI_REL),
     exists: runtime7.available && npm.available && pathExists(packageManifestPath),
     runtimeAvailable: runtime7.available
   };
@@ -153903,7 +154129,7 @@ function resolveLspCommand(options = {}) {
     sourceCliRel: SOURCE_CLI_REL,
     pathExists,
     resolveExecutable,
-    isSourceCandidateAvailable: ({ root }) => pathExists(resolve39(root, LSP_TOOLS_PACKAGE_REL, DIST_CLI_REL)) && readDaemonPackageVersion(root) !== null
+    isSourceCandidateAvailable: ({ root }) => pathExists(resolve38(root, LSP_TOOLS_PACKAGE_REL, DIST_CLI_REL)) && readDaemonPackageVersion(root) !== null
   }) : [];
   const distCandidate = candidates.find((candidate) => hasCliSuffix(candidate.path, DIST_CLI_REL) && candidate.exists);
   if (distCandidate) {
@@ -153917,7 +154143,7 @@ function resolveLspCommand(options = {}) {
 }
 function createLspMcpConfig(options = {}) {
   const resolvedCommand = resolveLspCommand(options);
-  const cwd = resolve39(options.cwd ?? process.cwd());
+  const cwd = resolve38(options.cwd ?? process.cwd());
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
   const sourceVersion = hasCliSuffix(resolvedCommand.path, SOURCE_CLI_REL) ? readDaemonPackageVersion(resolvedCommand.root) : null;
   return {
@@ -153925,9 +154151,9 @@ function createLspMcpConfig(options = {}) {
     command: resolvedCommand.command,
     enabled: resolvedCommand.exists,
     environment: {
-      LSP_TOOLS_MCP_PROJECT_CONFIG: PROJECT_LSP_CONFIGS.map((configPath) => resolve39(cwd, configPath)).join(delimiter2),
-      LSP_TOOLS_MCP_USER_CONFIG: resolve39(configDir, "lsp.json"),
-      LSP_TOOLS_MCP_INSTALL_DECISIONS: resolve39(configDir, "lsp-install-decisions.json"),
+      LSP_TOOLS_MCP_PROJECT_CONFIG: PROJECT_LSP_CONFIGS.map((configPath) => resolve38(cwd, configPath)).join(delimiter2),
+      LSP_TOOLS_MCP_USER_CONFIG: resolve38(configDir, "lsp.json"),
+      LSP_TOOLS_MCP_INSTALL_DECISIONS: resolve38(configDir, "lsp-install-decisions.json"),
       ...sourceVersion ? {
         [OMO_LSP_DAEMON_CLI]: resolvedCommand.path,
         [OMO_LSP_DAEMON_VERSION]: sourceVersion
@@ -154542,7 +154768,7 @@ function createTeamModeToolsRecord(args) {
 // node_modules/.bun/@opencode-ai+sdk@1.15.13/node_modules/@opencode-ai/sdk/dist/v2/gen/core/serverSentEvents.gen.js
 var createSseClient2 = ({ onRequest, onSseError, onSseEvent, responseTransformer, responseValidator, sseDefaultRetryDelay, sseMaxRetryAttempts, sseMaxRetryDelay, sseSleepFn, url: url2, ...options }) => {
   let lastEventId;
-  const sleep4 = sseSleepFn ?? ((ms) => new Promise((resolve40) => setTimeout(resolve40, ms)));
+  const sleep4 = sseSleepFn ?? ((ms) => new Promise((resolve39) => setTimeout(resolve39, ms)));
   const createStream = async function* () {
     let retryDelay = sseDefaultRetryDelay ?? 3000;
     let attempt = 0;
@@ -158091,7 +158317,7 @@ async function readRuntimeHostSkills(client5) {
 function createRuntimeSkillsResolver(args) {
   const { baseSkills, readRuntimeHostSkills: readHostSkills, buildMergedSkills } = args;
   let inflight;
-  const resolve40 = async () => {
+  const resolve39 = async () => {
     const hostSkills = await readHostSkills();
     if (!hostSkills)
       return baseSkills;
@@ -158103,7 +158329,7 @@ function createRuntimeSkillsResolver(args) {
   };
   return () => {
     if (!inflight)
-      inflight = resolve40();
+      inflight = resolve39();
     return inflight;
   };
 }
@@ -158943,7 +159169,7 @@ async function waitForTaskSessionId(bgMgr, task, deadlineAt) {
     }
     sessionId = updatedTask?.sessionId;
     if (!sessionId)
-      await new Promise((resolve40) => setTimeout(resolve40, SESSION_ID_POLL_MS));
+      await new Promise((resolve39) => setTimeout(resolve39, SESSION_ID_POLL_MS));
   }
   return sessionId;
 }
@@ -160431,13 +160657,13 @@ function logCaughtDbError(message, metadata, error) {
   log2(message, { ...metadata, error: String(error) });
 }
 function nextMicrotask() {
-  return new Promise((resolve40) => {
-    queueMicrotask(resolve40);
+  return new Promise((resolve39) => {
+    queueMicrotask(resolve39);
   });
 }
 function nextTimerTick() {
-  return new Promise((resolve40) => {
-    setTimeout(resolve40, 0);
+  return new Promise((resolve39) => {
+    setTimeout(resolve39, 0);
   });
 }
 function closeDbWithLog(db, message, metadata) {
@@ -161055,7 +161281,8 @@ var MESSAGES_TRANSFORM_HOOKS = [
   { key: "teamModeStatusInjector", name: "teamModeStatusInjector" },
   { key: "teamMailboxInjector", name: "teamMailboxInjector" },
   { key: "toolPairValidator", name: "toolPairValidator" },
-  { key: "monitorStatusInjector", name: "monitorStatusInjector" }
+  { key: "monitorStatusInjector", name: "monitorStatusInjector" },
+  { key: "categorySkillReminder", name: "categorySkillReminder" }
 ];
 function getSessionID2(message) {
   return message.info.sessionID;
@@ -163062,7 +163289,7 @@ function createPluginInterface(args) {
 
 // packages/omo-opencode/src/plugin-config/layered-config-loader.ts
 import * as fs25 from "fs";
-import { homedir as homedir35 } from "os";
+import { homedir as homedir34 } from "os";
 import * as path27 from "path";
 
 // packages/omo-opencode/src/config/schema/agent-names.ts
@@ -163907,7 +164134,7 @@ function loadConfigFromPath2(configPath, _ctx) {
 
 // packages/omo-opencode/src/plugin-config/layered-config-loader.ts
 function resolveHomeDirectory() {
-  return process.env.HOME ?? process.env.USERPROFILE ?? homedir35();
+  return process.env.HOME ?? process.env.USERPROFILE ?? homedir34();
 }
 function resolveConfigPathAfterLegacyMigration(detectedPath) {
   if (!path27.basename(detectedPath).startsWith(LEGACY_CONFIG_BASENAME)) {
@@ -164308,9 +164535,9 @@ function getTelemetryHost(env2 = process.env, defaultHost = DEFAULT_POSTHOG_HOST
 
 // packages/telemetry-core/src/machine-id.ts
 import { createHash as createHash9 } from "crypto";
-import os7 from "os";
+import os6 from "os";
 function getDefaultTelemetryOsProvider() {
-  return os7;
+  return os6;
 }
 function getTelemetryDistinctId(machineIdPrefix, osProvider = getDefaultTelemetryOsProvider()) {
   return createHash9("sha256").update(`${machineIdPrefix}${osProvider.hostname()}`).digest("hex");
@@ -167013,14 +167240,14 @@ async function addSourceContext(frames) {
   return frames;
 }
 function getContextLinesFromFile(path28, ranges, output) {
-  return new Promise((resolve40) => {
+  return new Promise((resolve39) => {
     const stream = createReadStream(path28);
     const lineReaded = createInterface({
       input: stream
     });
     function destroyStreamAndResolve() {
       stream.destroy();
-      resolve40();
+      resolve39();
     }
     let lineNumber = 0;
     let currentRangeIndex = 0;
@@ -168471,9 +168698,9 @@ class PostHogBackendClient extends PostHogCoreStateless {
     if (this.disabled || this.optedOut)
       return;
     if (!this._waitUntilCycle) {
-      let resolve40;
+      let resolve39;
       const promise2 = new Promise((r) => {
-        resolve40 = r;
+        resolve39 = r;
       });
       try {
         waitUntil(promise2);
@@ -168481,7 +168708,7 @@ class PostHogBackendClient extends PostHogCoreStateless {
         return;
       }
       this._waitUntilCycle = {
-        resolve: resolve40,
+        resolve: resolve39,
         startedAt: Date.now(),
         timer: undefined
       };
@@ -168507,11 +168734,11 @@ class PostHogBackendClient extends PostHogCoreStateless {
     return cycle?.resolve;
   }
   async resolveWaitUntilFlush() {
-    const resolve40 = this._consumeWaitUntilCycle();
+    const resolve39 = this._consumeWaitUntilCycle();
     try {
       await super.flush();
     } catch {} finally {
-      resolve40?.();
+      resolve39?.();
     }
   }
   getPersistedProperty(key) {
@@ -168611,15 +168838,15 @@ class PostHogBackendClient extends PostHogCoreStateless {
       return true;
     if (this.featureFlagsPoller === undefined)
       return false;
-    return new Promise((resolve40) => {
+    return new Promise((resolve39) => {
       const timeout = setTimeout(() => {
         cleanup();
-        resolve40(false);
+        resolve39(false);
       }, timeoutMs);
       const cleanup = this._events.on("localEvaluationFlagsLoaded", (count) => {
         clearTimeout(timeout);
         cleanup();
-        resolve40(count > 0);
+        resolve39(count > 0);
       });
     });
   }
@@ -169125,13 +169352,13 @@ class PostHogBackendClient extends PostHogCoreStateless {
     this.context?.enter(data, options);
   }
   async _shutdown(shutdownTimeoutMs) {
-    const resolve40 = this._consumeWaitUntilCycle();
+    const resolve39 = this._consumeWaitUntilCycle();
     await this.featureFlagsPoller?.stopPoller(shutdownTimeoutMs);
     this.errorTracking.shutdown();
     try {
       return await super._shutdown(shutdownTimeoutMs);
     } finally {
-      resolve40?.();
+      resolve39?.();
     }
   }
   async _requestRemoteConfigPayload(flagKey) {