oh-my-opencode-gpt-slim 0.1.2 → 0.1.3

package/dist/index.js

@@ -277,8 +277,8 @@ var require_utils = __commonJS((exports) => {
     }
     return output;
   };
-  exports.basename = (path4, { windows } = {}) => {
-    const segs = path4.split(windows ? /[\\/]/ : "/");
+  exports.basename = (path3, { windows } = {}) => {
+    const segs = path3.split(windows ? /[\\/]/ : "/");
     const last = segs[segs.length - 1];
     if (last === "") {
       return segs[segs.length - 2];
@@ -4653,8 +4653,8 @@ var require_utils2 = __commonJS((exports, module) => {
     }
     return ind;
   }
-  function removeDotSegments(path4) {
-    let input = path4;
+  function removeDotSegments(path3) {
+    let input = path3;
     const output = [];
     let nextSlash = -1;
     let len = 0;
@@ -4844,8 +4844,8 @@ var require_schemes = __commonJS((exports, module) => {
       wsComponent.secure = undefined;
     }
     if (wsComponent.resourceName) {
-      const [path4, query] = wsComponent.resourceName.split("?");
-      wsComponent.path = path4 && path4 !== "/" ? path4 : undefined;
+      const [path3, query] = wsComponent.resourceName.split("?");
+      wsComponent.path = path3 && path3 !== "/" ? path3 : undefined;
       wsComponent.query = query;
       wsComponent.resourceName = undefined;
     }
@@ -8006,7 +8006,7 @@ var require_windows = __commonJS((exports, module) => {
   module.exports = isexe;
   isexe.sync = sync;
   var fs5 = __require("fs");
-  function checkPathExt(path4, options) {
+  function checkPathExt(path3, options) {
     var pathext = options.pathExt !== undefined ? options.pathExt : process.env.PATHEXT;
     if (!pathext) {
       return true;
@@ -8017,25 +8017,25 @@ var require_windows = __commonJS((exports, module) => {
     }
     for (var i2 = 0;i2 < pathext.length; i2++) {
       var p = pathext[i2].toLowerCase();
-      if (p && path4.substr(-p.length).toLowerCase() === p) {
+      if (p && path3.substr(-p.length).toLowerCase() === p) {
         return true;
       }
     }
     return false;
   }
-  function checkStat(stat, path4, options) {
+  function checkStat(stat, path3, options) {
     if (!stat.isSymbolicLink() && !stat.isFile()) {
       return false;
     }
-    return checkPathExt(path4, options);
+    return checkPathExt(path3, options);
   }
-  function isexe(path4, options, cb) {
-    fs5.stat(path4, function(er, stat) {
-      cb(er, er ? false : checkStat(stat, path4, options));
+  function isexe(path3, options, cb) {
+    fs5.stat(path3, function(er, stat) {
+      cb(er, er ? false : checkStat(stat, path3, options));
     });
   }
-  function sync(path4, options) {
-    return checkStat(fs5.statSync(path4), path4, options);
+  function sync(path3, options) {
+    return checkStat(fs5.statSync(path3), path3, options);
   }
 });
 
@@ -8044,13 +8044,13 @@ var require_mode = __commonJS((exports, module) => {
   module.exports = isexe;
   isexe.sync = sync;
   var fs5 = __require("fs");
-  function isexe(path4, options, cb) {
-    fs5.stat(path4, function(er, stat) {
+  function isexe(path3, options, cb) {
+    fs5.stat(path3, function(er, stat) {
       cb(er, er ? false : checkStat(stat, options));
     });
   }
-  function sync(path4, options) {
-    return checkStat(fs5.statSync(path4), options);
+  function sync(path3, options) {
+    return checkStat(fs5.statSync(path3), options);
   }
   function checkStat(stat, options) {
     return stat.isFile() && checkMode(stat, options);
@@ -8081,7 +8081,7 @@ var require_isexe = __commonJS((exports, module) => {
   }
   module.exports = isexe;
   isexe.sync = sync;
-  function isexe(path4, options, cb) {
+  function isexe(path3, options, cb) {
     if (typeof options === "function") {
       cb = options;
       options = {};
@@ -8091,7 +8091,7 @@ var require_isexe = __commonJS((exports, module) => {
         throw new TypeError("callback not provided");
       }
       return new Promise(function(resolve6, reject) {
-        isexe(path4, options || {}, function(er, is) {
+        isexe(path3, options || {}, function(er, is) {
           if (er) {
             reject(er);
           } else {
@@ -8100,7 +8100,7 @@ var require_isexe = __commonJS((exports, module) => {
         });
       });
     }
-    core3(path4, options || {}, function(er, is) {
+    core3(path3, options || {}, function(er, is) {
       if (er) {
         if (er.code === "EACCES" || options && options.ignoreErrors) {
           er = null;
@@ -8110,9 +8110,9 @@ var require_isexe = __commonJS((exports, module) => {
       cb(er, is);
     });
   }
-  function sync(path4, options) {
+  function sync(path3, options) {
     try {
-      return core3.sync(path4, options || {});
+      return core3.sync(path3, options || {});
     } catch (er) {
       if (options && options.ignoreErrors || er.code === "EACCES") {
         return false;
@@ -8126,7 +8126,7 @@ var require_isexe = __commonJS((exports, module) => {
 // node_modules/which/which.js
 var require_which = __commonJS((exports, module) => {
   var isWindows = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
-  var path4 = __require("path");
+  var path3 = __require("path");
   var COLON = isWindows ? ";" : ":";
   var isexe = require_isexe();
   var getNotFoundError = (cmd) => Object.assign(new Error(`not found: ${cmd}`), { code: "ENOENT" });
@@ -8162,7 +8162,7 @@ var require_which = __commonJS((exports, module) => {
         return opt.all && found.length ? resolve6(found) : reject(getNotFoundError(cmd));
       const ppRaw = pathEnv[i2];
       const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-      const pCmd = path4.join(pathPart, cmd);
+      const pCmd = path3.join(pathPart, cmd);
       const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
       resolve6(subStep(p, i2, 0));
     });
@@ -8189,7 +8189,7 @@ var require_which = __commonJS((exports, module) => {
     for (let i2 = 0;i2 < pathEnv.length; i2++) {
       const ppRaw = pathEnv[i2];
       const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-      const pCmd = path4.join(pathPart, cmd);
+      const pCmd = path3.join(pathPart, cmd);
       const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
       for (let j = 0;j < pathExt.length; j++) {
         const cur = p + pathExt[j];
@@ -8230,7 +8230,7 @@ var require_path_key = __commonJS((exports, module) => {
 
 // node_modules/cross-spawn/lib/util/resolveCommand.js
 var require_resolveCommand = __commonJS((exports, module) => {
-  var path4 = __require("path");
+  var path3 = __require("path");
   var which2 = require_which();
   var getPathKey = require_path_key();
   function resolveCommandAttempt(parsed, withoutPathExt) {
@@ -8247,7 +8247,7 @@ var require_resolveCommand = __commonJS((exports, module) => {
     try {
       resolved = which2.sync(parsed.command, {
         path: env[getPathKey({ env })],
-        pathExt: withoutPathExt ? path4.delimiter : undefined
+        pathExt: withoutPathExt ? path3.delimiter : undefined
       });
     } catch (e) {} finally {
       if (shouldSwitchCwd) {
@@ -8255,7 +8255,7 @@ var require_resolveCommand = __commonJS((exports, module) => {
       }
     }
     if (resolved) {
-      resolved = path4.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
+      resolved = path3.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
     }
     return resolved;
   }
@@ -8300,8 +8300,8 @@ var require_shebang_command = __commonJS((exports, module) => {
     if (!match) {
       return null;
     }
-    const [path4, argument] = match[0].replace(/#! ?/, "").split(" ");
-    const binary2 = path4.split("/").pop();
+    const [path3, argument] = match[0].replace(/#! ?/, "").split(" ");
+    const binary2 = path3.split("/").pop();
     if (binary2 === "env") {
       return argument;
     }
@@ -8329,7 +8329,7 @@ var require_readShebang = __commonJS((exports, module) => {
 
 // node_modules/cross-spawn/lib/parse.js
 var require_parse2 = __commonJS((exports, module) => {
-  var path4 = __require("path");
+  var path3 = __require("path");
   var resolveCommand = require_resolveCommand();
   var escape2 = require_escape();
   var readShebang = require_readShebang();
@@ -8354,7 +8354,7 @@ var require_parse2 = __commonJS((exports, module) => {
     const needsShell = !isExecutableRegExp.test(commandFile);
     if (parsed.options.forceShell || needsShell) {
       const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile);
-      parsed.command = path4.normalize(parsed.command);
+      parsed.command = path3.normalize(parsed.command);
       parsed.command = escape2.command(parsed.command);
       parsed.args = parsed.args.map((arg) => escape2.argument(arg, needsDoubleEscapeMetaChars));
       const shellCommand = [parsed.command].concat(parsed.args).join(" ");
@@ -11981,7 +11981,7 @@ var require_main = __commonJS((exports) => {
   exports.createMessageConnection = exports.createServerSocketTransport = exports.createClientSocketTransport = exports.createServerPipeTransport = exports.createClientPipeTransport = exports.generateRandomPipeName = exports.StreamMessageWriter = exports.StreamMessageReader = exports.SocketMessageWriter = exports.SocketMessageReader = exports.PortMessageWriter = exports.PortMessageReader = exports.IPCMessageWriter = exports.IPCMessageReader = undefined;
   var ril_1 = require_ril();
   ril_1.default.install();
-  var path4 = __require("path");
+  var path3 = __require("path");
   var os3 = __require("os");
   var crypto_1 = __require("crypto");
   var net_1 = __require("net");
@@ -12123,9 +12123,9 @@ var require_main = __commonJS((exports) => {
     }
     let result;
     if (XDG_RUNTIME_DIR) {
-      result = path4.join(XDG_RUNTIME_DIR, `vscode-ipc-${randomSuffix}.sock`);
+      result = path3.join(XDG_RUNTIME_DIR, `vscode-ipc-${randomSuffix}.sock`);
     } else {
-      result = path4.join(os3.tmpdir(), `vscode-${randomSuffix}.sock`);
+      result = path3.join(os3.tmpdir(), `vscode-${randomSuffix}.sock`);
     }
     const limit = safeIpcPathLengths.get(process.platform);
     if (limit !== undefined && result.length > limit) {
@@ -12308,7 +12308,7 @@ function initConfigContext(binary, version) {
 // package.json
 var package_default = {
   name: "oh-my-opencode-gpt-slim",
-  version: "0.1.2",
+  version: "0.1.3",
   description: "GPT-optimized lean fork of oh-my-openagent \u2014 33 hooks removed, 5 tools removed, Sisyphus prompt rewritten based on OpenAI Codex prompt.md",
   main: "dist/index.js",
   types: "dist/index.d.ts",
@@ -12386,15 +12386,15 @@ var package_default = {
     typescript: "^5.7.3"
   },
   optionalDependencies: {
-    "oh-my-opencode-gpt-slim-darwin-arm64": "0.1.2",
-    "oh-my-opencode-gpt-slim-darwin-x64": "0.1.2",
-    "oh-my-opencode-gpt-slim-darwin-x64-baseline": "0.1.2",
-    "oh-my-opencode-gpt-slim-linux-arm64": "0.1.2",
-    "oh-my-opencode-gpt-slim-linux-arm64-musl": "0.1.2",
-    "oh-my-opencode-gpt-slim-linux-x64": "0.1.2",
-    "oh-my-opencode-gpt-slim-linux-x64-baseline": "0.1.2",
-    "oh-my-opencode-gpt-slim-linux-x64-musl": "0.1.2",
-    "oh-my-opencode-gpt-slim-linux-x64-musl-baseline": "0.1.2"
+    "oh-my-opencode-gpt-slim-darwin-arm64": "0.1.3",
+    "oh-my-opencode-gpt-slim-darwin-x64": "0.1.3",
+    "oh-my-opencode-gpt-slim-darwin-x64-baseline": "0.1.3",
+    "oh-my-opencode-gpt-slim-linux-arm64": "0.1.3",
+    "oh-my-opencode-gpt-slim-linux-arm64-musl": "0.1.3",
+    "oh-my-opencode-gpt-slim-linux-x64": "0.1.3",
+    "oh-my-opencode-gpt-slim-linux-x64-baseline": "0.1.3",
+    "oh-my-opencode-gpt-slim-linux-x64-musl": "0.1.3",
+    "oh-my-opencode-gpt-slim-linux-x64-musl-baseline": "0.1.3"
   },
   overrides: {
     "@opencode-ai/sdk": "^1.2.17"
@@ -16393,6 +16393,18 @@ function detectConfigFile(basePath) {
   }
   return { format: "none", path: jsonPath };
 }
+// src/shared/omo-config-file.ts
+import { join as join6 } from "path";
+var OMO_CONFIG_FILENAME = "oh-my-opencode-gpt-slim.json";
+function getOmoConfigFilePath(directory) {
+  return join6(directory, OMO_CONFIG_FILENAME);
+}
+function getProjectOmoConfigFilePath(projectRoot) {
+  return getOmoConfigFilePath(join6(projectRoot, ".opencode"));
+}
+function parseOmoConfigJson(content) {
+  return JSON.parse(content);
+}
 // src/shared/migration/agent-names.ts
 var AGENT_NAME_MAP = {
   omo: "sisyphus",
@@ -16723,7 +16735,7 @@ function isOpenCodeVersionAtLeast(version) {
 }
 // src/shared/opencode-storage-detection.ts
 import { existsSync as existsSync4 } from "fs";
-import { join as join6 } from "path";
+import { join as join7 } from "path";
 var NOT_CACHED2 = Symbol("NOT_CACHED");
 var FALSE_PENDING_RETRY = Symbol("FALSE_PENDING_RETRY");
 var cachedResult = NOT_CACHED2;
@@ -16734,7 +16746,7 @@ function isSqliteBackend() {
     return false;
   const check = () => {
     const versionOk = isOpenCodeVersionAtLeast(OPENCODE_SQLITE_VERSION);
-    const dbPath = join6(getDataDir(), "opencode", "opencode.db");
+    const dbPath = join7(getDataDir(), "opencode", "opencode.db");
     return versionOk && existsSync4(dbPath);
   };
   if (cachedResult === FALSE_PENDING_RETRY) {
@@ -17234,11 +17246,11 @@ init_logger();
 // src/shared/connected-providers-cache.ts
 init_logger();
 import { existsSync as existsSync6, readFileSync as readFileSync3, writeFileSync as writeFileSync2, mkdirSync as mkdirSync2 } from "fs";
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 var CONNECTED_PROVIDERS_CACHE_FILE = "connected-providers.json";
 var PROVIDER_MODELS_CACHE_FILE = "provider-models.json";
 function getCacheFilePath(filename) {
-  return join7(getOmoOpenCodeCacheDir(), filename);
+  return join8(getOmoOpenCodeCacheDir(), filename);
 }
 function readConnectedProvidersCache() {
   const cacheFile = getCacheFilePath(CONNECTED_PROVIDERS_CACHE_FILE);
@@ -17283,7 +17295,7 @@ function readProviderModelsCache() {
 // src/shared/model-availability.ts
 init_logger();
 import { existsSync as existsSync7, readFileSync as readFileSync4 } from "fs";
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 function normalizeModelName(name) {
   return name.toLowerCase().replace(/claude-(opus|sonnet|haiku)-(\d+)[.-](\d+)/g, "claude-$1-$2.$3");
 }
@@ -17419,7 +17431,7 @@ async function fetchAvailableModels(client, options) {
     }
   }
   log("[fetchAvailableModels] provider-models cache not found, falling back to models.json");
-  const cacheFile = join8(getOpenCodeCacheDir(), "models.json");
+  const cacheFile = join9(getOpenCodeCacheDir(), "models.json");
   if (!existsSync7(cacheFile)) {
     log("[fetchAvailableModels] models.json cache file not found, falling back to client");
   } else {
@@ -17710,7 +17722,7 @@ function isAnyFallbackModelAvailable(fallbackChain, availableModels) {
 // src/features/hook-message-injector/injector.ts
 import { existsSync as existsSync8, mkdirSync as mkdirSync3, readFileSync as readFileSync5, readdirSync, writeFileSync as writeFileSync3 } from "fs";
 import { randomBytes } from "crypto";
-import { join as join9 } from "path";
+import { join as join10 } from "path";
 init_logger();
 var processPrefix = randomBytes(4).toString("hex");
 function convertSDKMessageToStoredMessage(msg) {
@@ -17779,7 +17791,7 @@ function findNearestMessageWithFields(messageDir) {
     const files = readdirSync(messageDir).filter((f) => f.endsWith(".json")).sort().reverse();
     for (const file of files) {
       try {
-        const content = readFileSync5(join9(messageDir, file), "utf-8");
+        const content = readFileSync5(join10(messageDir, file), "utf-8");
         const msg = JSON.parse(content);
         if (msg.agent && msg.model?.providerID && msg.model?.modelID) {
           return msg;
@@ -17790,7 +17802,7 @@ function findNearestMessageWithFields(messageDir) {
     }
     for (const file of files) {
       try {
-        const content = readFileSync5(join9(messageDir, file), "utf-8");
+        const content = readFileSync5(join10(messageDir, file), "utf-8");
         const msg = JSON.parse(content);
         if (msg.agent || msg.model?.providerID && msg.model?.modelID) {
           return msg;
@@ -17812,7 +17824,7 @@ function findFirstMessageWithAgent(messageDir) {
     const files = readdirSync(messageDir).filter((f) => f.endsWith(".json")).sort();
     for (const file of files) {
       try {
-        const content = readFileSync5(join9(messageDir, file), "utf-8");
+        const content = readFileSync5(join10(messageDir, file), "utf-8");
         const msg = JSON.parse(content);
         if (msg.agent) {
           return msg.agent;
@@ -17838,14 +17850,14 @@ async function resolveMessageContext(sessionID, client, messageDir) {
 }
 // src/shared/opencode-message-dir.ts
 import { existsSync as existsSync9, readdirSync as readdirSync2 } from "fs";
-import { join as join11 } from "path";
+import { join as join12 } from "path";
 
 // src/shared/opencode-storage-paths.ts
-import { join as join10 } from "path";
+import { join as join11 } from "path";
 var OPENCODE_STORAGE = getOpenCodeStorageDir();
-var MESSAGE_STORAGE = join10(OPENCODE_STORAGE, "message");
-var PART_STORAGE = join10(OPENCODE_STORAGE, "part");
-var SESSION_STORAGE = join10(OPENCODE_STORAGE, "session");
+var MESSAGE_STORAGE = join11(OPENCODE_STORAGE, "message");
+var PART_STORAGE = join11(OPENCODE_STORAGE, "part");
+var SESSION_STORAGE = join11(OPENCODE_STORAGE, "session");
 
 // src/shared/opencode-message-dir.ts
 init_logger();
@@ -17858,13 +17870,13 @@ function getMessageDir(sessionID) {
     return null;
   if (!existsSync9(MESSAGE_STORAGE))
     return null;
-  const directPath = join11(MESSAGE_STORAGE, sessionID);
+  const directPath = join12(MESSAGE_STORAGE, sessionID);
   if (existsSync9(directPath)) {
     return directPath;
   }
   try {
     for (const dir of readdirSync2(MESSAGE_STORAGE)) {
-      const sessionPath = join11(MESSAGE_STORAGE, dir, sessionID);
+      const sessionPath = join12(MESSAGE_STORAGE, dir, sessionID);
       if (existsSync9(sessionPath)) {
         return sessionPath;
       }
@@ -18702,15 +18714,15 @@ init_logger();
 init_logger();
 import { existsSync as existsSync10, readFileSync as readFileSync6 } from "fs";
 import { homedir as homedir4 } from "os";
-import { join as join12 } from "path";
+import { join as join13 } from "path";
 function getPluginsBaseDir() {
   if (process.env.CLAUDE_PLUGINS_HOME) {
     return process.env.CLAUDE_PLUGINS_HOME;
   }
-  return join12(homedir4(), ".claude", "plugins");
+  return join13(homedir4(), ".claude", "plugins");
 }
 function getInstalledPluginsPath() {
-  return join12(getPluginsBaseDir(), "installed_plugins.json");
+  return join13(getPluginsBaseDir(), "installed_plugins.json");
 }
 function loadInstalledPlugins() {
   const dbPath = getInstalledPluginsPath();
@@ -18729,7 +18741,7 @@ function getClaudeSettingsPath() {
   if (process.env.CLAUDE_SETTINGS_PATH) {
     return process.env.CLAUDE_SETTINGS_PATH;
   }
-  return join12(homedir4(), ".claude", "settings.json");
+  return join13(homedir4(), ".claude", "settings.json");
 }
 function loadClaudeSettings() {
   const settingsPath = getClaudeSettingsPath();
@@ -18745,7 +18757,7 @@ function loadClaudeSettings() {
   }
 }
 function loadPluginManifest(installPath) {
-  const manifestPath = join12(installPath, ".claude-plugin", "plugin.json");
+  const manifestPath = join13(installPath, ".claude-plugin", "plugin.json");
   if (!existsSync10(manifestPath)) {
     return null;
   }
@@ -18812,20 +18824,20 @@ function discoverInstalledPlugins(options) {
       pluginKey,
       manifest: manifest ?? undefined
     };
-    if (existsSync10(join12(installPath, "commands"))) {
-      loadedPlugin.commandsDir = join12(installPath, "commands");
+    if (existsSync10(join13(installPath, "commands"))) {
+      loadedPlugin.commandsDir = join13(installPath, "commands");
     }
-    if (existsSync10(join12(installPath, "agents"))) {
-      loadedPlugin.agentsDir = join12(installPath, "agents");
+    if (existsSync10(join13(installPath, "agents"))) {
+      loadedPlugin.agentsDir = join13(installPath, "agents");
     }
-    if (existsSync10(join12(installPath, "skills"))) {
-      loadedPlugin.skillsDir = join12(installPath, "skills");
+    if (existsSync10(join13(installPath, "skills"))) {
+      loadedPlugin.skillsDir = join13(installPath, "skills");
     }
-    const hooksPath = join12(installPath, "hooks", "hooks.json");
+    const hooksPath = join13(installPath, "hooks", "hooks.json");
     if (existsSync10(hooksPath)) {
       loadedPlugin.hooksPath = hooksPath;
     }
-    const mcpPath = join12(installPath, ".mcp.json");
+    const mcpPath = join13(installPath, ".mcp.json");
     if (existsSync10(mcpPath)) {
       loadedPlugin.mcpPath = mcpPath;
     }
@@ -18840,7 +18852,7 @@ function discoverInstalledPlugins(options) {
 
 // src/features/claude-code-plugin-loader/command-loader.ts
 import { existsSync as existsSync11, readdirSync as readdirSync3, readFileSync as readFileSync7 } from "fs";
-import { basename, join as join13 } from "path";
+import { basename, join as join14 } from "path";
 init_logger();
 function loadPluginCommands(plugins) {
   const commands = {};
@@ -18851,7 +18863,7 @@ function loadPluginCommands(plugins) {
     for (const entry of entries) {
       if (!isMarkdownFile(entry))
         continue;
-      const commandPath = join13(plugin.commandsDir, entry.name);
+      const commandPath = join14(plugin.commandsDir, entry.name);
       const commandName = basename(entry.name, ".md");
       const namespacedName = `${plugin.name}:${commandName}`;
       try {
@@ -18887,13 +18899,13 @@ $ARGUMENTS
 
 // src/features/claude-code-plugin-loader/skill-loader.ts
 import { existsSync as existsSync12, readdirSync as readdirSync4, readFileSync as readFileSync8 } from "fs";
-import { join as join15 } from "path";
+import { join as join16 } from "path";
 
 // src/shared/skill-path-resolver.ts
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 function resolveSkillPathReferences(content, basePath) {
   const normalizedBase = basePath.endsWith("/") ? basePath.slice(0, -1) : basePath;
-  return content.replace(/(?<![a-zA-Z0-9])@([a-zA-Z0-9_-]+\/[a-zA-Z0-9_.\-\/]*)/g, (_, relativePath) => join14(normalizedBase, relativePath));
+  return content.replace(/(?<![a-zA-Z0-9])@([a-zA-Z0-9_-]+\/[a-zA-Z0-9_.\-\/]*)/g, (_, relativePath) => join15(normalizedBase, relativePath));
 }
 
 // src/features/claude-code-plugin-loader/skill-loader.ts
@@ -18907,11 +18919,11 @@ function loadPluginSkillsAsCommands(plugins) {
     for (const entry of entries) {
       if (entry.name.startsWith("."))
         continue;
-      const skillPath = join15(plugin.skillsDir, entry.name);
+      const skillPath = join16(plugin.skillsDir, entry.name);
       if (!entry.isDirectory() && !entry.isSymbolicLink())
         continue;
       const resolvedPath = resolveSymlink(skillPath);
-      const skillMdPath = join15(resolvedPath, "SKILL.md");
+      const skillMdPath = join16(resolvedPath, "SKILL.md");
       if (!existsSync12(skillMdPath))
         continue;
       try {
@@ -18951,7 +18963,7 @@ $ARGUMENTS
 
 // src/features/claude-code-plugin-loader/agent-loader.ts
 import { existsSync as existsSync13, readdirSync as readdirSync5, readFileSync as readFileSync9 } from "fs";
-import { basename as basename2, join as join16 } from "path";
+import { basename as basename2, join as join17 } from "path";
 init_logger();
 function parseToolsConfig(toolsStr) {
   if (!toolsStr)
@@ -18974,7 +18986,7 @@ function loadPluginAgents(plugins) {
     for (const entry of entries) {
       if (!isMarkdownFile(entry))
         continue;
-      const agentPath = join16(plugin.agentsDir, entry.name);
+      const agentPath = join17(plugin.agentsDir, entry.name);
       const agentName = basename2(entry.name, ".md");
       const namespacedName = `${plugin.name}:${agentName}`;
       try {
@@ -19326,16 +19338,16 @@ init_logger();
 // src/hooks/auto-update-checker/cache.ts
 init_logger();
 import { existsSync as existsSync17, rmSync, unlinkSync as unlinkSync2 } from "fs";
-import { join as join18 } from "path";
+import { join as join19 } from "path";
 
 // src/hooks/auto-update-checker/constants.ts
-import { join as join17 } from "path";
+import { join as join18 } from "path";
 var PACKAGE_NAME = PLUGIN_PACKAGE_NAME;
 var NPM_REGISTRY_URL = `https://registry.npmjs.org/-/package/${PACKAGE_NAME}/dist-tags`;
 var NPM_FETCH_TIMEOUT = 5000;
 var CACHE_DIR = getOpenCodeCacheDir();
 var USER_CONFIG_DIR = getOpenCodeConfigDir({ binary: "opencode" });
-var INSTALLED_PACKAGE_JSON = join17(CACHE_DIR, "node_modules", PACKAGE_NAME, "package.json");
+var INSTALLED_PACKAGE_JSON = join18(CACHE_DIR, "node_modules", PACKAGE_NAME, "package.json");
 
 // src/hooks/auto-update-checker/cache.ts
 function deleteLockfile(lockPath) {
@@ -19352,16 +19364,16 @@ function deleteLockfile(lockPath) {
 function invalidatePackage(packageName = PACKAGE_NAME) {
   let changed = false;
   for (const packageDir of [
-    join18(USER_CONFIG_DIR, "node_modules", packageName),
-    join18(CACHE_DIR, "node_modules", packageName)
+    join19(USER_CONFIG_DIR, "node_modules", packageName),
+    join19(CACHE_DIR, "node_modules", packageName)
   ]) {
     if (!existsSync17(packageDir))
       continue;
     rmSync(packageDir, { recursive: true, force: true });
     changed = true;
   }
-  changed = deleteLockfile(join18(CACHE_DIR, "bun.lock")) || changed;
-  changed = deleteLockfile(join18(CACHE_DIR, "bun.lockb")) || changed;
+  changed = deleteLockfile(join19(CACHE_DIR, "bun.lock")) || changed;
+  changed = deleteLockfile(join19(CACHE_DIR, "bun.lockb")) || changed;
   return changed;
 }
 
@@ -19369,12 +19381,12 @@ function invalidatePackage(packageName = PACKAGE_NAME) {
 import { existsSync as existsSync18, readFileSync as readFileSync11 } from "fs";
 
 // src/hooks/auto-update-checker/checker/config-paths.ts
-import { join as join19 } from "path";
+import { join as join20 } from "path";
 function getConfigPaths(directory) {
   const userPaths = getOpenCodeConfigPaths({ binary: "opencode", version: null });
   return [
-    join19(directory, ".opencode", "opencode.jsonc"),
-    join19(directory, ".opencode", "opencode.json"),
+    join20(directory, ".opencode", "opencode.jsonc"),
+    join20(directory, ".opencode", "opencode.json"),
     userPaths.configJsonc,
     userPaths.configJson
   ];
@@ -20087,7 +20099,6 @@ init_logger();
 
 // src/plugin-config.ts
 import * as fs4 from "fs";
-import * as path3 from "path";
 
 // node_modules/zod/v4/classic/external.js
 var exports_external = {};
@@ -34046,7 +34057,9 @@ function parseConfigPartially(rawConfig) {
   const partialConfig = {};
   const invalidSections = [];
   for (const key of Object.keys(rawConfig)) {
-    const sectionResult = OhMyOpenCodeConfigSchema.safeParse({ [key]: rawConfig[key] });
+    const sectionResult = OhMyOpenCodeConfigSchema.safeParse({
+      [key]: rawConfig[key]
+    });
     if (sectionResult.success) {
       const parsed = sectionResult.data;
       if (parsed[key] !== undefined) {
@@ -34068,7 +34081,7 @@ function loadConfigFromPath(configPath, _ctx) {
   try {
     if (fs4.existsSync(configPath)) {
       const content = fs4.readFileSync(configPath, "utf-8");
-      const rawConfig = parseJsonc(content);
+      const rawConfig = parseOmoConfigJson(content);
       migrateConfigFile(configPath, rawConfig);
       const result = OhMyOpenCodeConfigSchema.safeParse(rawConfig);
       if (result.success) {
@@ -34083,7 +34096,9 @@ function loadConfigFromPath(configPath, _ctx) {
       });
       const partialResult = parseConfigPartially(rawConfig);
       if (partialResult) {
-        log(`Partial config loaded from ${configPath}`, { agents: partialResult.agents });
+        log(`Partial config loaded from ${configPath}`, {
+          agents: partialResult.agents
+        });
         return partialResult;
       }
       return null;
@@ -34135,13 +34150,11 @@ function mergeConfigs(base, override) {
   };
 }
 function loadPluginConfig(directory, ctx) {
-  const configDir = getOpenCodeConfigDir({ binary: "opencode" });
-  const userBasePath = path3.join(configDir, "oh-my-opencode-gpt-slim");
-  const userDetected = detectConfigFile(userBasePath);
-  const userConfigPath = userDetected.format !== "none" ? userDetected.path : userBasePath + ".json";
-  const projectBasePath = path3.join(directory, ".opencode", "oh-my-opencode-gpt-slim");
-  const projectDetected = detectConfigFile(projectBasePath);
-  const projectConfigPath = projectDetected.format !== "none" ? projectDetected.path : projectBasePath + ".json";
+  const userConfigPath = getOpenCodeConfigPaths({
+    binary: "opencode",
+    version: null
+  }).omoConfig;
+  const projectConfigPath = getProjectOmoConfigFilePath(directory);
   let config2 = loadConfigFromPath(userConfigPath, ctx) ?? {};
   const projectConfig = loadConfigFromPath(projectConfigPath, ctx);
   if (projectConfig) {
@@ -35913,12 +35926,12 @@ var AGENTS_INJECTOR_STORAGE = join25(OPENCODE_STORAGE, "directory-agents");
 var AGENTS_FILENAME = "AGENTS.md";
 
 // src/hooks/directory-agents-injector/finder.ts
-function resolveFilePath2(rootDirectory, path4) {
-  if (!path4)
+function resolveFilePath2(rootDirectory, path3) {
+  if (!path3)
     return null;
-  if (isAbsolute2(path4))
-    return path4;
-  return resolve2(rootDirectory, path4);
+  if (isAbsolute2(path3))
+    return path3;
+  return resolve2(rootDirectory, path3);
 }
 function findAgentsMdUp(input) {
   const found = [];
@@ -36091,12 +36104,12 @@ var README_INJECTOR_STORAGE = join28(OPENCODE_STORAGE, "directory-readme");
 var README_FILENAME = "README.md";
 
 // src/hooks/directory-readme-injector/finder.ts
-function resolveFilePath3(rootDirectory, path4) {
-  if (!path4)
+function resolveFilePath3(rootDirectory, path3) {
+  if (!path3)
     return null;
-  if (isAbsolute3(path4))
-    return path4;
-  return resolve3(rootDirectory, path4);
+  if (isAbsolute3(path3))
+    return path3;
+  return resolve3(rootDirectory, path3);
 }
 function findReadmeMdUp(input) {
   const found = [];
@@ -36641,12 +36654,12 @@ function getCachedParsedRule(filePath, realPath) {
     return parseRuleFrontmatter(rawContent);
   }
 }
-function resolveFilePath4(workspaceDirectory, path4) {
-  if (!path4)
+function resolveFilePath4(workspaceDirectory, path3) {
+  if (!path3)
     return null;
-  if (path4.startsWith("/"))
-    return path4;
-  return resolve4(workspaceDirectory, path4);
+  if (path3.startsWith("/"))
+    return path3;
+  return resolve4(workspaceDirectory, path3);
 }
 function createRuleInjectionProcessor(deps) {
   const { workspaceDirectory, truncator, getSessionCache: getSessionCache3 } = deps;
@@ -37021,16 +37034,16 @@ class Diff {
       }
     }
   }
-  addToPath(path4, added, removed, oldPosInc, options) {
-    const last = path4.lastComponent;
+  addToPath(path3, added, removed, oldPosInc, options) {
+    const last = path3.lastComponent;
     if (last && !options.oneChangePerToken && last.added === added && last.removed === removed) {
       return {
-        oldPos: path4.oldPos + oldPosInc,
+        oldPos: path3.oldPos + oldPosInc,
         lastComponent: { count: last.count + 1, added, removed, previousComponent: last.previousComponent }
       };
     } else {
       return {
-        oldPos: path4.oldPos + oldPosInc,
+        oldPos: path3.oldPos + oldPosInc,
         lastComponent: { count: 1, added, removed, previousComponent: last }
       };
     }
@@ -45870,196 +45883,6 @@ function isGeminiModel(model) {
   const modelName = extractModelName(model).toLowerCase();
   return modelName.startsWith("gemini-");
 }
-// src/agents/sisyphus/gemini.ts
-function buildGeminiToolMandate() {
-  return `<TOOL_CALL_MANDATE>
-## YOU MUST USE TOOLS. THIS IS NOT OPTIONAL.
-
-**The user expects you to ACT using tools, not REASON internally.** Every response to a task MUST contain tool_use blocks. A response without tool calls is a FAILED response.
-
-**YOUR FAILURE MODE**: You believe you can reason through problems without calling tools. You CANNOT. Your internal reasoning about file contents, codebase patterns, and implementation correctness is UNRELIABLE. The ONLY reliable information comes from actual tool calls.
-
-**RULES (VIOLATION = BROKEN RESPONSE):**
-
-1. **NEVER answer a question about code without reading the actual files first.** Your memory of files you "recently read" decays rapidly. Read them AGAIN.
-2. **NEVER claim a task is done without running \`lsp_diagnostics\`.** Your confidence that "this should work" is WRONG more often than right.
-3. **NEVER skip delegation because you think you can do it faster yourself.** You CANNOT. Specialists with domain-specific skills produce better results. USE THEM.
-4. **NEVER reason about what a file "probably contains."** READ IT. Tool calls are cheap. Wrong answers are expensive.
-5. **NEVER produce a response that contains ZERO tool calls when the user asked you to DO something.** Thinking is not doing.
-
-**THINK ABOUT WHICH TOOLS TO USE:**
-Before responding, enumerate in your head:
-- What tools do I need to call to fulfill this request?
-- What information am I assuming that I should verify with a tool call?
-- Am I about to skip a tool call because I "already know" the answer?
-
-Then ACTUALLY CALL those tools using the JSON tool schema. Produce the tool_use blocks. Execute.
-</TOOL_CALL_MANDATE>`;
-}
-function buildGeminiToolGuide() {
-  return `<GEMINI_TOOL_GUIDE>
-## Tool Usage Guide \u2014 WHEN and HOW to Call Each Tool
-
-You have access to tools via function calling. This guide defines WHEN to call each one.
-**Violating these patterns = failed response.**
-
-### Reading & Search (parallelize)
-- \`Read\`: before ANY claim about file contents; before editing any file
-- \`Grep\`: find patterns, imports, usages; verify "X is used in Y"
-- \`Glob\`: verify file existence by name/extension pattern
-- \`AstGrepSearch\`: structural code pattern search
-
-### Code Intelligence (parallelize on different files)
-- \`LspDiagnostics\`: AFTER EVERY edit; BEFORE claiming done; MANDATORY
-- \`LspGotoDefinition\`: find where a symbol is defined
-- \`LspFindReferences\`: find all usages across workspace
-- \`LspSymbols\`: file outline or workspace symbol search
-
-### Editing (sequential)
-- \`Edit\`: modify existing files; MUST Read first for LINE#ID anchors
-- \`Write\`: create new files or fully overwrite files
-
-### Execution & Delegation
-- \`Bash\`: tests, builds, git commands; usually sequential
-- \`Task\`: ANY non-trivial implementation; research via explore/librarian; fire in background
-
-### Correct Sequences (MANDATORY \u2014 follow these exactly):
-
-1. **Answer about code**: Read \u2192 (analyze) \u2192 Answer
-2. **Edit code**: Read \u2192 Edit \u2192 LspDiagnostics \u2192 Report
-3. **Find something**: Grep/Glob (parallel) \u2192 Read results \u2192 Report
-4. **Implement feature**: Task(delegate) \u2192 Verify results \u2192 Report
-5. **Debug**: Read error \u2192 Read file \u2192 Grep related \u2192 Fix \u2192 LspDiagnostics
-
-### PARALLEL RULES:
-
-- **Independent reads/searches**: ALWAYS call simultaneously in ONE response
-- **Dependent operations**: Call sequentially (Edit AFTER Read, LspDiagnostics AFTER Edit)
-- **Background agents**: ALWAYS \`run_in_background=true\`, continue working
-</GEMINI_TOOL_GUIDE>`;
-}
-function buildGeminiToolCallExamples() {
-  return `<GEMINI_TOOL_CALL_EXAMPLES>
-## Correct Tool Calling Patterns \u2014 Follow These Examples
-
-### Example 1: User asks about code \u2192 Read FIRST, then answer
-**User**: "How does the auth middleware work?"
-**CORRECT**:
-\`\`\`
-\u2192 Call Read(filePath="/src/middleware/auth.ts")
-\u2192 Call Read(filePath="/src/config/auth.ts")  // parallel with above
-\u2192 (After reading) Answer based on ACTUAL file contents
-\`\`\`
-**WRONG**:
-\`\`\`
-\u2192 "The auth middleware likely validates JWT tokens by..." \u2190 HALLUCINATION. You didn't read the file.
-\`\`\`
-
-### Example 2: User asks to edit code \u2192 Read, Edit, Verify
-**User**: "Fix the type error in user.ts"
-**CORRECT**:
-\`\`\`
-\u2192 Call Read(filePath="/src/models/user.ts")
-\u2192 Call LspDiagnostics(filePath="/src/models/user.ts")  // parallel with Read
-\u2192 (After reading) Call Edit with LINE#ID anchors
-\u2192 Call LspDiagnostics(filePath="/src/models/user.ts")  // verify fix
-\u2192 Report: "Fixed. Diagnostics clean."
-\`\`\`
-**WRONG**:
-\`\`\`
-\u2192 Call Edit without reading first \u2190 No LINE#ID anchors = WILL FAIL
-\u2192 Skip LspDiagnostics after edit \u2190 UNVERIFIED
-\`\`\`
-
-### Example 3: Investigation \u2260 Implementation
-**User**: "Look into why the tests are failing"
-**CORRECT**:
-\`\`\`
-\u2192 Call Bash(command="npm test")  // see actual failures
-\u2192 Call Read on failing test files
-\u2192 Call Read on source files under test
-\u2192 Report: "Tests fail because X. Root cause: Y. Proposed fix: Z."
-\u2192 STOP \u2014 wait for user to say "fix it"
-\`\`\`
-**WRONG**:
-\`\`\`
-\u2192 Start editing source files immediately \u2190 "look into" \u2260 "fix"
-\`\`\`
-</GEMINI_TOOL_CALL_EXAMPLES>`;
-}
-function buildGeminiDelegationOverride() {
-  return `<GEMINI_DELEGATION_OVERRIDE>
-## DELEGATION IS MANDATORY \u2014 YOU ARE NOT AN IMPLEMENTER
-
-**You have a strong tendency to do work yourself. RESIST THIS.**
-
-You are an ORCHESTRATOR. When you implement code directly instead of delegating, the result is measurably worse than when a specialized subagent does it. This is not opinion \u2014 subagents have domain-specific configurations, loaded skills, and tuned prompts that you lack.
-
-**EVERY TIME you are about to write code or make changes directly:**
-\u2192 STOP. Ask: "Is there a category + skills combination for this?"
-\u2192 If YES (almost always): delegate via \`task()\`
-\u2192 If NO (extremely rare): proceed, but this should happen less than 5% of the time
-
-**The user chose an orchestrator model specifically because they want delegation and parallel execution. If you do work yourself, you are failing your purpose.**
-</GEMINI_DELEGATION_OVERRIDE>`;
-}
-function buildGeminiVerificationOverride() {
-  return `<GEMINI_VERIFICATION_OVERRIDE>
-## YOUR SELF-ASSESSMENT IS UNRELIABLE \u2014 VERIFY WITH TOOLS
-
-**When you believe something is "done" or "correct" \u2014 you are probably wrong.**
-
-Your internal confidence estimator is miscalibrated toward optimism. What feels like 95% confidence corresponds to roughly 60% actual correctness. This is a known characteristic, not an insult.
-
-**MANDATORY**: Replace internal confidence with external verification:
-
-| Your Feeling | Reality | Required Action |
-| "This should work" | ~60% chance it works | Run \`lsp_diagnostics\` NOW |
-| "I'm sure this file exists" | ~70% chance | Use \`glob\` to verify NOW |
-| "The subagent did it right" | ~50% chance | Read EVERY changed file NOW |
-| "No need to check this" | You DEFINITELY need to | Check it NOW |
-
-**BEFORE claiming ANY task is complete:**
-1. Run \`lsp_diagnostics\` on ALL changed files \u2014 ACTUALLY clean, not "probably clean"
-2. If tests exist, run them \u2014 ACTUALLY pass, not "they should pass"
-3. Read the output of every command \u2014 ACTUALLY read, not skim
-4. If you delegated, read EVERY file the subagent touched \u2014 not trust their claims
-</GEMINI_VERIFICATION_OVERRIDE>`;
-}
-function buildGeminiIntentGateEnforcement() {
-  return `<GEMINI_INTENT_GATE_ENFORCEMENT>
-## YOU MUST CLASSIFY INTENT BEFORE ACTING. NO EXCEPTIONS.
-
-**Your failure mode: You skip intent classification and jump straight to implementation.**
-
-You see a user message and your instinct is to immediately start working. WRONG. You MUST first determine WHAT KIND of work the user wants. Getting this wrong wastes everything that follows.
-
-**MANDATORY FIRST OUTPUT \u2014 before ANY tool call or action:**
-
-\`\`\`
-I detect [TYPE] intent \u2014 [REASON].
-My approach: [ROUTING DECISION].
-\`\`\`
-
-Where TYPE is one of: research | implementation | investigation | evaluation | fix | open-ended
-
-**SELF-CHECK (answer honestly before proceeding):**
-
-1. Did the user EXPLICITLY ask me to implement/build/create something? \u2192 If NO, do NOT implement.
-2. Did the user say "look into", "check", "investigate", "explain"? \u2192 That means RESEARCH, not implementation.
-3. Did the user ask "what do you think?" \u2192 That means EVALUATION \u2014 propose and WAIT, do not execute.
-4. Did the user report an error? \u2192 That means MINIMAL FIX, not refactoring.
-
-**COMMON MISTAKES YOU MAKE (AND MUST NOT):**
-- "explain how X works" \u2192 Research X, explain it, STOP
-- "look into this bug" \u2192 Investigate, report findings, WAIT for go-ahead
-- "what do you think about approach X?" \u2192 Evaluate X, propose alternatives, WAIT
-- "improve the tests" \u2192 Assess current tests FIRST, propose approach, THEN implement
-
-**IF YOU SKIPPED THE INTENT CLASSIFICATION ABOVE:** STOP. Go back. Do it now. Your next tool call is INVALID without it.
-</GEMINI_INTENT_GATE_ENFORCEMENT>`;
-}
-
 // src/agents/dynamic-agent-prompt-builder.ts
 function categorizeTools(toolNames) {
   return toolNames.map((name) => {
@@ -46094,6 +45917,136 @@ function formatToolsForPrompt(tools) {
   }
   return parts.join(", ");
 }
+function hasAgent(agents, name) {
+  return agents.some((agent) => agent.name === name);
+}
+function buildSearchGuidance(tools = []) {
+  const searchTools = tools.filter((tool) => tool.category === "search").map((tool) => `\`${tool.name}\``);
+  const hasLspTools = tools.some((tool) => tool.category === "lsp");
+  const availableSearch = [...searchTools, ...hasLspTools ? ["`lsp_*`"] : []];
+  if (availableSearch.length === 0) {
+    return "Use repo-native search tools first, then read known files directly";
+  }
+  return `Use repo-native search first (${availableSearch.join(", ")}), then read known files directly`;
+}
+function buildDefaultResearchFlow(agents) {
+  const hasExplore = hasAgent(agents, "explore");
+  const hasLibrarian = hasAgent(agents, "librarian");
+  if (hasExplore && hasLibrarian) {
+    return "**Default flow**: explore/librarian (background) + tools \u2192 oracle (if required)";
+  }
+  if (hasExplore) {
+    return "**Default flow**: explore (background) + repo-native tools \u2192 oracle (if required)";
+  }
+  if (hasLibrarian) {
+    return "**Default flow**: librarian (background) + repo-native tools \u2192 oracle (if required)";
+  }
+  return "**Default flow**: repo-native tools \u2192 oracle (if required)";
+}
+function buildExplorationParallelGuidance(agents) {
+  const hasExplore = hasAgent(agents, "explore");
+  const hasLibrarian = hasAgent(agents, "librarian");
+  if (hasExplore && hasLibrarian) {
+    return "Parallelize EVERYTHING independent. Fire 2-5 explore/librarian agents (always `run_in_background=true`) for any non-trivial codebase question.";
+  }
+  if (hasExplore) {
+    return "Parallelize EVERYTHING independent. Fire 2-5 explore agents (always `run_in_background=true`) for non-trivial repo discovery.";
+  }
+  if (hasLibrarian) {
+    return "Parallelize EVERYTHING independent. Use librarian (always `run_in_background=true`) for external docs/code questions, and use repo-native tools for repo discovery.";
+  }
+  return "Parallelize EVERYTHING independent. Use repo-native tools aggressively for discovery when no research agents are available.";
+}
+function buildResearchDelegationThresholds(agents) {
+  const hasExplore = hasAgent(agents, "explore");
+  const hasLibrarian = hasAgent(agents, "librarian");
+  if (hasExplore && hasLibrarian) {
+    return "- need to discover files, symbols, or patterns first \u2192 `explore`\n- unfamiliar or version-sensitive library/API behavior \u2192 `librarian`";
+  }
+  if (hasExplore) {
+    return "- need to discover files, symbols, or patterns first \u2192 `explore`\n- library/API uncertainty without external research support \u2192 use repo-native tools first and avoid guessing";
+  }
+  if (hasLibrarian) {
+    return "- need repo discovery first \u2192 use repo-native tools\n- unfamiliar or version-sensitive library/API behavior \u2192 `librarian`";
+  }
+  return `- need to discover files, symbols, or patterns first \u2192 use repo-native tools
+- library/API uncertainty without research agents \u2192 rely on available repo context and avoid guessing`;
+}
+function buildResearchAnswerRouting(agents) {
+  const hasExplore = hasAgent(agents, "explore");
+  const hasLibrarian = hasAgent(agents, "librarian");
+  if (hasExplore && hasLibrarian) {
+    return "explore/librarian \u2192 synthesize \u2192 answer";
+  }
+  if (hasExplore) {
+    return "explore + repo-native tools \u2192 synthesize \u2192 answer";
+  }
+  if (hasLibrarian) {
+    return "librarian + repo-native tools \u2192 synthesize \u2192 answer";
+  }
+  return "repo-native tools \u2192 synthesize \u2192 answer";
+}
+function buildInvestigationRouting(agents) {
+  return hasAgent(agents, "explore") ? "explore \u2192 report findings" : "repo-native tools \u2192 report findings";
+}
+function buildResearchToolUsageRules(agents) {
+  const hasExplore = hasAgent(agents, "explore");
+  const hasLibrarian = hasAgent(agents, "librarian");
+  if (hasExplore && hasLibrarian) {
+    return "- Explore/Librarian = background research. ALWAYS `run_in_background=true`, ALWAYS parallel\n- Fire 2-5 explore/librarian agents in parallel for any non-trivial codebase question";
+  }
+  if (hasExplore) {
+    return "- Explore = background repo research. ALWAYS `run_in_background=true`, ALWAYS parallel\n- Fire 2-5 explore agents in parallel for non-trivial repo discovery; use repo-native tools for the rest";
+  }
+  if (hasLibrarian) {
+    return "- Librarian = background external research. ALWAYS `run_in_background=true`; use repo-native tools for repo discovery\n- Fire librarian proactively for library/docs questions, but keep direct repo inspection in tools";
+  }
+  return "- No research agents available. Use repo-native tools in parallel for discovery and avoid guessing from memory";
+}
+function buildBackgroundResearchExamples(agents) {
+  const hasExplore = hasAgent(agents, "explore");
+  const hasLibrarian = hasAgent(agents, "librarian");
+  if (hasExplore && hasLibrarian) {
+    return `**Research agents = background grep, not consultants.**
+
+
+~~~typescript
+// CORRECT: Always background, always parallel.
+task(subagent_type="explore", run_in_background=true, load_skills=[], description="Find auth patterns", prompt="[CONTEXT] Adding JWT auth in src/api/routes/. [GOAL] Match existing middleware and token-flow conventions. [DOWNSTREAM] Use findings to choose middleware structure and validation flow. [REQUEST] Find auth middleware, login/signup handlers, token generation, and credential validation. Focus on src/, skip tests, return file paths with pattern summaries.")
+task(subagent_type="librarian", run_in_background=true, load_skills=[], description="Find JWT security guidance", prompt="[CONTEXT] Implementing JWT auth and choosing token storage plus expiration policy. [GOAL] Get current production security guidance. [DOWNSTREAM] Use findings to choose storage, lifetime, and refresh strategy. [REQUEST] Find OWASP guidance, token lifetime recommendations, refresh rotation strategies, and common JWT vulnerabilities. Skip tutorials, return concise production-focused recommendations.")
+
+// WRONG: Never block on explore/librarian.
+result = task(..., run_in_background=false)
+~~~
+`;
+  }
+  if (hasExplore) {
+    return `**Explore = background repo grep. Use repo-native tools for anything outside the repo.**
+
+
+~~~typescript
+// CORRECT: Use explore in background for repo discovery.
+task(subagent_type="explore", run_in_background=true, load_skills=[], description="Find auth patterns", prompt="[CONTEXT] Adding JWT auth in src/api/routes/. [GOAL] Match existing middleware and token-flow conventions. [DOWNSTREAM] Use findings to choose middleware structure and validation flow. [REQUEST] Find auth middleware, login/signup handlers, token generation, and credential validation. Focus on src/, skip tests, return file paths with pattern summaries.")
+
+// WRONG: Never block on explore.
+result = task(..., run_in_background=false)
+~~~
+`;
+  }
+  if (hasLibrarian) {
+    return `**Librarian = background external research. Use repo-native tools for repo discovery.**
+
+
+~~~typescript
+// CORRECT: Use librarian in background for external docs/code guidance.
+task(subagent_type="librarian", run_in_background=true, load_skills=[], description="Find JWT security guidance", prompt="[CONTEXT] Implementing JWT auth and choosing token storage plus expiration policy. [GOAL] Get current production security guidance. [DOWNSTREAM] Use findings to choose storage, lifetime, and refresh strategy. [REQUEST] Find OWASP guidance, token lifetime recommendations, refresh rotation strategies, and common JWT vulnerabilities. Skip tutorials, return concise production-focused recommendations.")
+
+// WRONG: Use repo-native tools, not librarian, for files you can inspect directly.
+~~~
+`;
+  }
+  return "**No research agents are available. Use repo-native tools directly and parallelize reads/searches aggressively.**";
+}
 function buildKeyTriggersSection(agents, _skills = []) {
   const keyTriggers = agents.filter((a) => a.metadata.keyTrigger).map((a) => `- ${a.metadata.keyTrigger}`);
   if (keyTriggers.length === 0)
@@ -46120,7 +46073,7 @@ function buildToolSelectionTable(agents, tools = [], _skills = []) {
     rows.push(`- \`${agent.name}\` agent \u2014 **${agent.metadata.cost}** \u2014 ${shortDesc}`);
   }
   rows.push("");
-  rows.push("**Default flow**: explore/librarian (background) + tools \u2192 oracle (if required)");
+  rows.push(buildDefaultResearchFlow(agents));
   return rows.join(`
 `);
 }
@@ -46309,9 +46262,9 @@ function buildAntiPatternsSection() {
 ${patterns.join(`
 `)}`;
 }
-function buildNonClaudePlannerSection(model) {
+function buildNonClaudePlannerSection(model, agents = []) {
   const isNonClaude = !model.toLowerCase().includes("claude");
-  if (!isNonClaude)
+  if (!isNonClaude || !hasAgent(agents, "plan"))
     return "";
   return `### Plan Agent Dependency (Non-Claude)
 
@@ -46344,9 +46297,309 @@ Each delegation prompt must include GOAL + success criteria, file paths + constr
 **Your value is orchestration, decomposition, and quality control.**`;
 }
 
+// src/agents/sisyphus/default.ts
+function buildTaskManagementSection(useTaskSystem) {
+  if (useTaskSystem) {
+    return `<Task_Management>
+## Task Management (CRITICAL)
+
+**DEFAULT BEHAVIOR**: Create tasks BEFORE starting any non-trivial task. This is your PRIMARY coordination mechanism.
+
+### When to Create Tasks (MANDATORY)
+
+- Multi-step task (2+ steps) \u2192 ALWAYS \`task_create\` first
+- Uncertain scope \u2192 ALWAYS (tasks clarify thinking)
+- User request with multiple items \u2192 ALWAYS
+- Complex single task \u2192 \`task_create\` to break down
+
+### Workflow (NON-NEGOTIABLE)
+
+1. **IMMEDIATELY on receiving request**: \`task_create\` to plan atomic steps.
+   - ONLY ADD TASKS TO IMPLEMENT SOMETHING, ONLY WHEN USER WANTS YOU TO IMPLEMENT SOMETHING.
+2. **Before starting each step**: \`task_update(task_id="...", status="in_progress")\` (only ONE at a time)
+3. **After completing each step**: \`task_update(task_id="...", status="completed")\` IMMEDIATELY (NEVER batch)
+4. **If scope changes**: Update tasks before proceeding
+
+### Why This Is Non-Negotiable
+
+- **User visibility**: User sees real-time progress, not a black box
+- **Prevents drift**: Tasks anchor you to the actual request
+- **Recovery**: If interrupted, tasks enable seamless continuation
+- **Accountability**: Each task = explicit commitment
+
+### Anti-Patterns (BLOCKING)
+
+- Skipping tasks on multi-step tasks \u2014 user has no visibility, steps get forgotten
+- Batch-completing multiple tasks \u2014 defeats real-time tracking purpose
+- Proceeding without marking in_progress \u2014 no indication of what you're working on
+- Finishing without completing tasks \u2014 task appears incomplete to user
+
+**FAILURE TO USE TASKS ON NON-TRIVIAL TASKS = INCOMPLETE WORK.**
+
+### Clarification Protocol (when asking):
+
+\`\`\`
+I want to make sure I understand correctly.
+
+**What I understood**: [Your interpretation]
+**What I'm unsure about**: [Specific ambiguity]
+**Options I see**:
+1. [Option A] - [effort/implications]
+2. [Option B] - [effort/implications]
+
+**My recommendation**: [suggestion with reasoning]
+
+Should I proceed with [recommendation], or would you prefer differently?
+\`\`\`
+</Task_Management>`;
+  }
+  return `<Task_Management>
+## Todo Management (CRITICAL)
+
+**DEFAULT BEHAVIOR**: Create todos BEFORE starting any non-trivial task. This is your PRIMARY coordination mechanism.
+
+### When to Create Todos (MANDATORY)
+
+- Multi-step task (2+ steps) \u2192 ALWAYS create todos first
+- Uncertain scope \u2192 ALWAYS (todos clarify thinking)
+- User request with multiple items \u2192 ALWAYS
+- Complex single task \u2192 Create todos to break down
+
+### Workflow (NON-NEGOTIABLE)
+
+1. **IMMEDIATELY on receiving request**: \`todowrite\` to plan atomic steps.
+   - ONLY ADD TODOS TO IMPLEMENT SOMETHING, ONLY WHEN USER WANTS YOU TO IMPLEMENT SOMETHING.
+2. **Before starting each step**: Mark \`in_progress\` (only ONE at a time)
+3. **After completing each step**: Mark \`completed\` IMMEDIATELY (NEVER batch)
+4. **If scope changes**: Update todos before proceeding
+
+### Why This Is Non-Negotiable
+
+- **User visibility**: User sees real-time progress, not a black box
+- **Prevents drift**: Todos anchor you to the actual request
+- **Recovery**: If interrupted, todos enable seamless continuation
+- **Accountability**: Each todo = explicit commitment
+
+### Anti-Patterns (BLOCKING)
+
+- Skipping todos on multi-step tasks \u2014 user has no visibility, steps get forgotten
+- Batch-completing multiple todos \u2014 defeats real-time tracking purpose
+- Proceeding without marking in_progress \u2014 no indication of what you're working on
+- Finishing without completing todos \u2014 task appears incomplete to user
+
+**FAILURE TO USE TODOS ON NON-TRIVIAL TASKS = INCOMPLETE WORK.**
+
+### Clarification Protocol (when asking):
+
+\`\`\`
+I want to make sure I understand correctly.
+
+**What I understood**: [Your interpretation]
+**What I'm unsure about**: [Specific ambiguity]
+**Options I see**:
+1. [Option A] - [effort/implications]
+2. [Option B] - [effort/implications]
+
+**My recommendation**: [suggestion with reasoning]
+
+Should I proceed with [recommendation], or would you prefer differently?
+\`\`\`
+</Task_Management>`;
+}
+
+// src/agents/sisyphus/gemini.ts
+function buildGeminiToolMandate() {
+  return `<TOOL_CALL_MANDATE>
+## YOU MUST USE TOOLS. THIS IS NOT OPTIONAL.
+
+**The user expects you to ACT using tools, not REASON internally.** Every response to a task MUST contain tool_use blocks. A response without tool calls is a FAILED response.
+
+**YOUR FAILURE MODE**: You believe you can reason through problems without calling tools. You CANNOT. Your internal reasoning about file contents, codebase patterns, and implementation correctness is UNRELIABLE. The ONLY reliable information comes from actual tool calls.
+
+**RULES (VIOLATION = BROKEN RESPONSE):**
+
+1. **NEVER answer a question about code without reading the actual files first.** Your memory of files you "recently read" decays rapidly. Read them AGAIN.
+2. **NEVER claim a task is done without running \`lsp_diagnostics\`.** Your confidence that "this should work" is WRONG more often than right.
+3. **NEVER skip delegation because you think you can do it faster yourself.** You CANNOT. Specialists with domain-specific skills produce better results. USE THEM.
+4. **NEVER reason about what a file "probably contains."** READ IT. Tool calls are cheap. Wrong answers are expensive.
+5. **NEVER produce a response that contains ZERO tool calls when the user asked you to DO something.** Thinking is not doing.
+
+**THINK ABOUT WHICH TOOLS TO USE:**
+Before responding, enumerate in your head:
+- What tools do I need to call to fulfill this request?
+- What information am I assuming that I should verify with a tool call?
+- Am I about to skip a tool call because I "already know" the answer?
+
+Then ACTUALLY CALL those tools using the JSON tool schema. Produce the tool_use blocks. Execute.
+</TOOL_CALL_MANDATE>`;
+}
+function buildGeminiToolGuide() {
+  return `<GEMINI_TOOL_GUIDE>
+## Tool Usage Guide \u2014 WHEN and HOW to Call Each Tool
+
+You have access to tools via function calling. This guide defines WHEN to call each one.
+**Violating these patterns = failed response.**
+
+### Reading & Search (parallelize)
+- \`Read\`: before ANY claim about file contents; before editing any file
+- \`Grep\`: find patterns, imports, usages; verify "X is used in Y"
+- \`Glob\`: verify file existence by name/extension pattern
+- \`AstGrepSearch\`: structural code pattern search
+
+### Code Intelligence (parallelize on different files)
+- \`LspDiagnostics\`: AFTER EVERY edit; BEFORE claiming done; MANDATORY
+- \`LspGotoDefinition\`: find where a symbol is defined
+- \`LspFindReferences\`: find all usages across workspace
+- \`LspSymbols\`: file outline or workspace symbol search
+
+### Editing (sequential)
+- \`Edit\`: modify existing files; MUST Read first for LINE#ID anchors
+- \`Write\`: create new files or fully overwrite files
+
+### Execution & Delegation
+- \`Bash\`: tests, builds, git commands; usually sequential
+- \`Task\`: ANY non-trivial implementation; research via explore/librarian; fire in background
+
+### Correct Sequences (MANDATORY \u2014 follow these exactly):
+
+1. **Answer about code**: Read \u2192 (analyze) \u2192 Answer
+2. **Edit code**: Read \u2192 Edit \u2192 LspDiagnostics \u2192 Report
+3. **Find something**: Grep/Glob (parallel) \u2192 Read results \u2192 Report
+4. **Implement feature**: Task(delegate) \u2192 Verify results \u2192 Report
+5. **Debug**: Read error \u2192 Read file \u2192 Grep related \u2192 Fix \u2192 LspDiagnostics
+
+### PARALLEL RULES:
+
+- **Independent reads/searches**: ALWAYS call simultaneously in ONE response
+- **Dependent operations**: Call sequentially (Edit AFTER Read, LspDiagnostics AFTER Edit)
+- **Background agents**: ALWAYS \`run_in_background=true\`, continue working
+</GEMINI_TOOL_GUIDE>`;
+}
+function buildGeminiToolCallExamples() {
+  return `<GEMINI_TOOL_CALL_EXAMPLES>
+## Correct Tool Calling Patterns \u2014 Follow These Examples
+
+### Example 1: User asks about code \u2192 Read FIRST, then answer
+**User**: "How does the auth middleware work?"
+**CORRECT**:
+\`\`\`
+\u2192 Call Read(filePath="/src/middleware/auth.ts")
+\u2192 Call Read(filePath="/src/config/auth.ts")  // parallel with above
+\u2192 (After reading) Answer based on ACTUAL file contents
+\`\`\`
+**WRONG**:
+\`\`\`
+\u2192 "The auth middleware likely validates JWT tokens by..." \u2190 HALLUCINATION. You didn't read the file.
+\`\`\`
+
+### Example 2: User asks to edit code \u2192 Read, Edit, Verify
+**User**: "Fix the type error in user.ts"
+**CORRECT**:
+\`\`\`
+\u2192 Call Read(filePath="/src/models/user.ts")
+\u2192 Call LspDiagnostics(filePath="/src/models/user.ts")  // parallel with Read
+\u2192 (After reading) Call Edit with LINE#ID anchors
+\u2192 Call LspDiagnostics(filePath="/src/models/user.ts")  // verify fix
+\u2192 Report: "Fixed. Diagnostics clean."
+\`\`\`
+**WRONG**:
+\`\`\`
+\u2192 Call Edit without reading first \u2190 No LINE#ID anchors = WILL FAIL
+\u2192 Skip LspDiagnostics after edit \u2190 UNVERIFIED
+\`\`\`
+
+### Example 3: Investigation \u2260 Implementation
+**User**: "Look into why the tests are failing"
+**CORRECT**:
+\`\`\`
+\u2192 Call Bash(command="npm test")  // see actual failures
+\u2192 Call Read on failing test files
+\u2192 Call Read on source files under test
+\u2192 Report: "Tests fail because X. Root cause: Y. Proposed fix: Z."
+\u2192 STOP \u2014 wait for user to say "fix it"
+\`\`\`
+**WRONG**:
+\`\`\`
+\u2192 Start editing source files immediately \u2190 "look into" \u2260 "fix"
+\`\`\`
+</GEMINI_TOOL_CALL_EXAMPLES>`;
+}
+function buildGeminiDelegationOverride() {
+  return `<GEMINI_DELEGATION_OVERRIDE>
+## DELEGATION IS MANDATORY \u2014 YOU ARE NOT AN IMPLEMENTER
+
+**You have a strong tendency to do work yourself. RESIST THIS.**
+
+You are an ORCHESTRATOR. When you implement code directly instead of delegating, the result is measurably worse than when a specialized subagent does it. This is not opinion \u2014 subagents have domain-specific configurations, loaded skills, and tuned prompts that you lack.
+
+**EVERY TIME you are about to write code or make changes directly:**
+\u2192 STOP. Ask: "Is there a category + skills combination for this?"
+\u2192 If YES (almost always): delegate via \`task()\`
+\u2192 If NO (extremely rare): proceed, but this should happen less than 5% of the time
+
+**The user chose an orchestrator model specifically because they want delegation and parallel execution. If you do work yourself, you are failing your purpose.**
+</GEMINI_DELEGATION_OVERRIDE>`;
+}
+function buildGeminiVerificationOverride() {
+  return `<GEMINI_VERIFICATION_OVERRIDE>
+## YOUR SELF-ASSESSMENT IS UNRELIABLE \u2014 VERIFY WITH TOOLS
+
+**When you believe something is "done" or "correct" \u2014 you are probably wrong.**
+
+Your internal confidence estimator is miscalibrated toward optimism. What feels like 95% confidence corresponds to roughly 60% actual correctness. This is a known characteristic, not an insult.
+
+**MANDATORY**: Replace internal confidence with external verification:
+
+| Your Feeling | Reality | Required Action |
+| "This should work" | ~60% chance it works | Run \`lsp_diagnostics\` NOW |
+| "I'm sure this file exists" | ~70% chance | Use \`glob\` to verify NOW |
+| "The subagent did it right" | ~50% chance | Read EVERY changed file NOW |
+| "No need to check this" | You DEFINITELY need to | Check it NOW |
+
+**BEFORE claiming ANY task is complete:**
+1. Run \`lsp_diagnostics\` on ALL changed files \u2014 ACTUALLY clean, not "probably clean"
+2. If tests exist, run them \u2014 ACTUALLY pass, not "they should pass"
+3. Read the output of every command \u2014 ACTUALLY read, not skim
+4. If you delegated, read EVERY file the subagent touched \u2014 not trust their claims
+</GEMINI_VERIFICATION_OVERRIDE>`;
+}
+function buildGeminiIntentGateEnforcement() {
+  return `<GEMINI_INTENT_GATE_ENFORCEMENT>
+## YOU MUST CLASSIFY INTENT BEFORE ACTING. NO EXCEPTIONS.
+
+**Your failure mode: You skip intent classification and jump straight to implementation.**
+
+You see a user message and your instinct is to immediately start working. WRONG. You MUST first determine WHAT KIND of work the user wants. Getting this wrong wastes everything that follows.
+
+**MANDATORY FIRST OUTPUT \u2014 before ANY tool call or action:**
+
+\`\`\`
+I detect [TYPE] intent \u2014 [REASON].
+My approach: [ROUTING DECISION].
+\`\`\`
+
+Where TYPE is one of: research | implementation | investigation | evaluation | fix | open-ended
+
+**SELF-CHECK (answer honestly before proceeding):**
+
+1. Did the user EXPLICITLY ask me to implement/build/create something? \u2192 If NO, do NOT implement.
+2. Did the user say "look into", "check", "investigate", "explain"? \u2192 That means RESEARCH, not implementation.
+3. Did the user ask "what do you think?" \u2192 That means EVALUATION \u2014 propose and WAIT, do not execute.
+4. Did the user report an error? \u2192 That means MINIMAL FIX, not refactoring.
+
+**COMMON MISTAKES YOU MAKE (AND MUST NOT):**
+- "explain how X works" \u2192 Research X, explain it, STOP
+- "look into this bug" \u2192 Investigate, report findings, WAIT for go-ahead
+- "what do you think about approach X?" \u2192 Evaluate X, propose alternatives, WAIT
+- "improve the tests" \u2192 Assess current tests FIRST, propose approach, THEN implement
+
+**IF YOU SKIPPED THE INTENT CLASSIFICATION ABOVE:** STOP. Go back. Do it now. Your next tool call is INVALID without it.
+</GEMINI_INTENT_GATE_ENFORCEMENT>`;
+}
+
 // src/agents/sisyphus/gpt-5-4.ts
 function buildTasksSection(useTaskSystem) {
-  const tool = useTaskSystem ? "TaskCreate / TaskUpdate" : "todowrite";
+  const tool = useTaskSystem ? "task_create / task_update" : "todowrite";
   return `## Tasks
 Create ${useTaskSystem ? "tasks" : "todos"} before starting any non-trivial work (multi-step, uncertain scope, complex breakdown).
 Use \`${tool}\` with atomic steps. Mark each step in_progress \u2192 completed immediately. Never batch.`;
@@ -46356,12 +46609,15 @@ function buildGpt54SisyphusPrompt(model, availableAgents, availableTools = [], a
   const toolSelection = buildToolSelectionTable(availableAgents, availableTools, availableSkills);
   const exploreSection = buildExploreSection(availableAgents);
   const librarianSection = buildLibrarianSection(availableAgents);
+  const explorationParallelGuidance = buildExplorationParallelGuidance(availableAgents);
+  const researchDelegationThresholds = buildResearchDelegationThresholds(availableAgents);
+  const searchGuidance = buildSearchGuidance(availableTools);
   const categorySkillsGuide = buildCategorySkillsDelegationGuide(availableCategories, availableSkills);
   const delegationTable = buildDelegationTable(availableAgents);
   const oracleSection = buildOracleSection(availableAgents);
   const hardBlocks = buildHardBlocksSection();
   const antiPatterns = buildAntiPatternsSection();
-  const nonClaudePlannerSection = buildNonClaudePlannerSection(model);
+  const nonClaudePlannerSection = buildNonClaudePlannerSection(model, availableAgents);
   const tasksSection = buildTasksSection(useTaskSystem);
   const identity = `You are Sisyphus, an AI coding orchestrator running in OhMyOpenCode. You are expected to be precise, safe, and helpful.
 
@@ -46404,7 +46660,7 @@ ${exploreSection}
 
 ${librarianSection}
 
-Parallelize EVERYTHING independent. Fire 2-5 explore/librarian agents (always \`run_in_background=true\`) for any non-trivial codebase question.
+${explorationParallelGuidance}
 
 Each agent prompt needs: [CONTEXT] [GOAL] [DOWNSTREAM] [REQUEST].
 
@@ -46418,7 +46674,7 @@ Coding guidelines:
 - Avoid unneeded complexity
 - Keep changes minimal and consistent with existing style
 - Do not fix unrelated bugs or broken tests (mention them in final message)
-- Use \`rg\` for searching (faster than grep)
+- ${searchGuidance}
 - Use \`git log\` / \`git blame\` for history context
 - Do NOT git commit unless explicitly asked
 - Do NOT add copyright/license headers unless asked
@@ -46433,8 +46689,7 @@ Coding guidelines:
   - no user-facing UI/UX, styling, layout, animation, or polish requirement
   - no meaningful parallelization opportunity
 - Delegate when ANY are true:
-  - need to discover files, symbols, or patterns first \u2192 \`explore\`
-  - unfamiliar or version-sensitive library/API behavior \u2192 \`librarian\`
+${researchDelegationThresholds}
   - architecture tradeoff, security/performance risk, or 2+ failed attempts \u2192 \`oracle\`
   - user-facing UI/UX, layout, styling, animation, or polish \u2192 \`visual-engineering\`
   - likely 2+ files, or one file plus tightly coupled tests/config/docs \u2192 delegate via category
@@ -46500,116 +46755,6 @@ ${tasksSection}
 ${style}`;
 }
 
-// src/agents/sisyphus/default.ts
-function buildTaskManagementSection(useTaskSystem) {
-  if (useTaskSystem) {
-    return `<Task_Management>
-## Task Management (CRITICAL)
-
-**DEFAULT BEHAVIOR**: Create tasks BEFORE starting any non-trivial task. This is your PRIMARY coordination mechanism.
-
-### When to Create Tasks (MANDATORY)
-
-- Multi-step task (2+ steps) \u2192 ALWAYS \`TaskCreate\` first
-- Uncertain scope \u2192 ALWAYS (tasks clarify thinking)
-- User request with multiple items \u2192 ALWAYS
-- Complex single task \u2192 \`TaskCreate\` to break down
-
-### Workflow (NON-NEGOTIABLE)
-
-1. **IMMEDIATELY on receiving request**: \`TaskCreate\` to plan atomic steps.
-   - ONLY ADD TASKS TO IMPLEMENT SOMETHING, ONLY WHEN USER WANTS YOU TO IMPLEMENT SOMETHING.
-2. **Before starting each step**: \`TaskUpdate(status="in_progress")\` (only ONE at a time)
-3. **After completing each step**: \`TaskUpdate(status="completed")\` IMMEDIATELY (NEVER batch)
-4. **If scope changes**: Update tasks before proceeding
-
-### Why This Is Non-Negotiable
-
-- **User visibility**: User sees real-time progress, not a black box
-- **Prevents drift**: Tasks anchor you to the actual request
-- **Recovery**: If interrupted, tasks enable seamless continuation
-- **Accountability**: Each task = explicit commitment
-
-### Anti-Patterns (BLOCKING)
-
-- Skipping tasks on multi-step tasks \u2014 user has no visibility, steps get forgotten
-- Batch-completing multiple tasks \u2014 defeats real-time tracking purpose
-- Proceeding without marking in_progress \u2014 no indication of what you're working on
-- Finishing without completing tasks \u2014 task appears incomplete to user
-
-**FAILURE TO USE TASKS ON NON-TRIVIAL TASKS = INCOMPLETE WORK.**
-
-### Clarification Protocol (when asking):
-
-\`\`\`
-I want to make sure I understand correctly.
-
-**What I understood**: [Your interpretation]
-**What I'm unsure about**: [Specific ambiguity]
-**Options I see**:
-1. [Option A] - [effort/implications]
-2. [Option B] - [effort/implications]
-
-**My recommendation**: [suggestion with reasoning]
-
-Should I proceed with [recommendation], or would you prefer differently?
-\`\`\`
-</Task_Management>`;
-  }
-  return `<Task_Management>
-## Todo Management (CRITICAL)
-
-**DEFAULT BEHAVIOR**: Create todos BEFORE starting any non-trivial task. This is your PRIMARY coordination mechanism.
-
-### When to Create Todos (MANDATORY)
-
-- Multi-step task (2+ steps) \u2192 ALWAYS create todos first
-- Uncertain scope \u2192 ALWAYS (todos clarify thinking)
-- User request with multiple items \u2192 ALWAYS
-- Complex single task \u2192 Create todos to break down
-
-### Workflow (NON-NEGOTIABLE)
-
-1. **IMMEDIATELY on receiving request**: \`todowrite\` to plan atomic steps.
-   - ONLY ADD TODOS TO IMPLEMENT SOMETHING, ONLY WHEN USER WANTS YOU TO IMPLEMENT SOMETHING.
-2. **Before starting each step**: Mark \`in_progress\` (only ONE at a time)
-3. **After completing each step**: Mark \`completed\` IMMEDIATELY (NEVER batch)
-4. **If scope changes**: Update todos before proceeding
-
-### Why This Is Non-Negotiable
-
-- **User visibility**: User sees real-time progress, not a black box
-- **Prevents drift**: Todos anchor you to the actual request
-- **Recovery**: If interrupted, todos enable seamless continuation
-- **Accountability**: Each todo = explicit commitment
-
-### Anti-Patterns (BLOCKING)
-
-- Skipping todos on multi-step tasks \u2014 user has no visibility, steps get forgotten
-- Batch-completing multiple todos \u2014 defeats real-time tracking purpose
-- Proceeding without marking in_progress \u2014 no indication of what you're working on
-- Finishing without completing todos \u2014 task appears incomplete to user
-
-**FAILURE TO USE TODOS ON NON-TRIVIAL TASKS = INCOMPLETE WORK.**
-
-### Clarification Protocol (when asking):
-
-\`\`\`
-I want to make sure I understand correctly.
-
-**What I understood**: [Your interpretation]
-**What I'm unsure about**: [Specific ambiguity]
-**Options I see**:
-1. [Option A] - [effort/implications]
-2. [Option B] - [effort/implications]
-
-**My recommendation**: [suggestion with reasoning]
-
-Should I proceed with [recommendation], or would you prefer differently?
-\`\`\`
-</Task_Management>`;
-}
-
 // src/agents/sisyphus.ts
 var MODE = "all";
 function buildDynamicSisyphusPrompt(model, availableAgents, availableTools = [], availableSkills = [], availableCategories = [], useTaskSystem = false) {
@@ -46623,7 +46768,12 @@ function buildDynamicSisyphusPrompt(model, availableAgents, availableTools = [],
   const hardBlocks = buildHardBlocksSection();
   const antiPatterns = buildAntiPatternsSection();
   const parallelDelegationSection = buildParallelDelegationSection(model, availableCategories);
-  const nonClaudePlannerSection = buildNonClaudePlannerSection(model);
+  const nonClaudePlannerSection = buildNonClaudePlannerSection(model, availableAgents);
+  const researchAnswerRouting = buildResearchAnswerRouting(availableAgents);
+  const investigationRouting = buildInvestigationRouting(availableAgents);
+  const researchDelegationThresholds = buildResearchDelegationThresholds(availableAgents);
+  const researchToolUsageRules = buildResearchToolUsageRules(availableAgents);
+  const backgroundResearchExamples = buildBackgroundResearchExamples(availableAgents);
   const taskManagementSection = buildTaskManagementSection(useTaskSystem);
   const todoHookNote = useTaskSystem ? "YOUR TASK CREATION WOULD BE TRACKED BY HOOK([SYSTEM REMINDER - TASK CONTINUATION])" : "YOUR TODO CREATION WOULD BE TRACKED BY HOOK([SYSTEM REMINDER - TODO CONTINUATION])";
   return `<Role>
@@ -46659,9 +46809,9 @@ Before classifying the task, identify what the user actually wants from you as a
 
 | Surface Form | True Intent | Your Routing |
 |---|---|---|
-| "explain X", "how does Y work" | Research/understanding | explore/librarian \u2192 synthesize \u2192 answer |
+| "explain X", "how does Y work" | Research/understanding | ${researchAnswerRouting} |
 | "implement X", "add Y", "create Z" | Implementation (explicit) | plan \u2192 delegate or execute |
-| "look into X", "check Y", "investigate" | Investigation | explore \u2192 report findings |
+| "look into X", "check Y", "investigate" | Investigation | ${investigationRouting} |
 | "what do you think about X?" | Evaluation | evaluate \u2192 propose \u2192 **wait for confirmation** |
 | "I'm seeing error X" / "Y is broken" | Fix needed | diagnose \u2192 fix minimally |
 | "refactor", "improve", "clean up" | Open-ended change | assess codebase first \u2192 propose approach |
@@ -46707,8 +46857,7 @@ Work yourself only when ALL are true:
 - no meaningful parallelization opportunity
 
 Delegate when ANY are true:
-- need to discover files, symbols, or patterns first \u2192 \`explore\`
-- unfamiliar or version-sensitive library/API behavior \u2192 \`librarian\`
+${researchDelegationThresholds}
 - architecture tradeoff, security/performance risk, or 2+ failed attempts \u2192 \`oracle\`
 - user-facing UI/UX, layout, styling, animation, or polish \u2192 \`visual-engineering\`
 - likely 2+ files, or one file plus tightly coupled tests/config/docs \u2192 delegate via category
@@ -46774,29 +46923,13 @@ ${librarianSection}
 
 <tool_usage_rules>
 - Parallelize independent tool calls: multiple file reads, grep searches, agent fires \u2014 all at once
-- Explore/Librarian = background grep. ALWAYS \`run_in_background=true\`, ALWAYS parallel
-- Fire 2-5 explore/librarian agents in parallel for any non-trivial codebase question
+${researchToolUsageRules}
 - Parallelize independent file reads \u2014 don't read files one at a time
 - After any write/edit tool call, briefly restate what changed, where, and what validation follows
 - Prefer tools over internal knowledge whenever you need specific data (files, configs, patterns)
 </tool_usage_rules>
 
-**Explore/Librarian = Grep, not consultants.
-
-\`\`\`typescript
-// CORRECT: Always background, always parallel.
-// Prompt structure:
-//   [CONTEXT]: task context, modules/files involved, approach
-//   [GOAL]: the outcome needed - what decision/action this unblocks
-//   [DOWNSTREAM]: how results will be used after the search
-//   [REQUEST]: exactly what to find, what to skip, and what format to return
-
-task(subagent_type="explore", run_in_background=true, load_skills=[], description="Find auth patterns", prompt="[CONTEXT] Adding JWT auth in src/api/routes/. [GOAL] Match existing middleware and token-flow conventions. [DOWNSTREAM] Use findings to choose middleware structure and validation flow. [REQUEST] Find auth middleware, login/signup handlers, token generation, and credential validation. Focus on src/, skip tests, return file paths with pattern summaries.")
-task(subagent_type="librarian", run_in_background=true, load_skills=[], description="Find JWT security guidance", prompt="[CONTEXT] Implementing JWT auth and choosing token storage plus expiration policy. [GOAL] Get current production security guidance. [DOWNSTREAM] Use findings to choose storage, lifetime, and refresh strategy. [REQUEST] Find OWASP guidance, token lifetime recommendations, refresh rotation strategies, and common JWT vulnerabilities. Skip tutorials, return concise production-focused recommendations.")
-
-// WRONG: Never block on explore/librarian.
-result = task(..., run_in_background=false)
-\`\`\`
+${backgroundResearchExamples}
 
 ### Background Result Collection:
 1. Launch parallel agents \u2192 receive task_ids
@@ -52991,17 +53124,17 @@ Task NOT complete without:
 </Style>`;
   if (!promptAppend)
     return prompt;
-  return prompt + `
+  return `${prompt}
 
-` + resolvePromptAppend(promptAppend);
+${resolvePromptAppend(promptAppend)}`;
 }
 function buildTodoDisciplineSection(useTaskSystem) {
   if (useTaskSystem) {
     return `<Task_Discipline>
 TASK OBSESSION (NON-NEGOTIABLE):
 - 2+ steps \u2192 task_create FIRST, atomic breakdown
-- task_update(status="in_progress") before starting (ONE at a time)
-- task_update(status="completed") IMMEDIATELY after each step
+- task_update(task_id="...", status="in_progress") before starting (ONE at a time)
+- task_update(task_id="...", status="completed") IMMEDIATELY after each step
 - NEVER batch completions
 
 No tasks on multi-step work = INCOMPLETE WORK.
@@ -53129,17 +53262,17 @@ Style:
 3. After 3 DIFFERENT approaches fail \u2192 STOP and report what you tried clearly`;
   if (!promptAppend)
     return prompt;
-  return prompt + `
+  return `${prompt}
 
-` + resolvePromptAppend(promptAppend);
+${resolvePromptAppend(promptAppend)}`;
 }
 function buildGptTaskDisciplineSection(useTaskSystem) {
   if (useTaskSystem) {
     return `## Task Discipline (NON-NEGOTIABLE)
 
 - **2+ steps** \u2014 task_create FIRST, atomic breakdown
-- **Starting step** \u2014 task_update(status="in_progress") \u2014 ONE at a time
-- **Completing step** \u2014 task_update(status="completed") IMMEDIATELY
+- **Starting step** \u2014 task_update(task_id="...", status="in_progress") \u2014 ONE at a time
+- **Completing step** \u2014 task_update(task_id="...", status="completed") IMMEDIATELY
 - **Batching** \u2014 NEVER batch completions
 
 No tasks on multi-step work = INCOMPLETE WORK.`;
@@ -53268,17 +53401,17 @@ Style:
 3. After 3 DIFFERENT approaches fail \u2192 STOP and report what you tried clearly`;
   if (!promptAppend)
     return prompt;
-  return prompt + `
+  return `${prompt}
 
-` + resolvePromptAppend(promptAppend);
+${resolvePromptAppend(promptAppend)}`;
 }
 function buildGpt54TaskDisciplineSection(useTaskSystem) {
   if (useTaskSystem) {
     return `## Task Discipline (NON-NEGOTIABLE)
 
 - **2+ steps** \u2014 task_create FIRST, atomic breakdown
-- **Starting step** \u2014 task_update(status="in_progress") \u2014 ONE at a time
-- **Completing step** \u2014 task_update(status="completed") IMMEDIATELY
+- **Starting step** \u2014 task_update(task_id="...", status="in_progress") \u2014 ONE at a time
+- **Completing step** \u2014 task_update(task_id="...", status="completed") IMMEDIATELY
 - **Batching** \u2014 NEVER batch completions
 
 No tasks on multi-step work = INCOMPLETE WORK.`;
@@ -53404,17 +53537,17 @@ Style:
 3. After 3 DIFFERENT approaches fail \u2192 STOP and report what you tried clearly`;
   if (!promptAppend)
     return prompt;
-  return prompt + `
+  return `${prompt}
 
-` + resolvePromptAppend(promptAppend);
+${resolvePromptAppend(promptAppend)}`;
 }
 function buildGpt53CodexTaskDisciplineSection(useTaskSystem) {
   if (useTaskSystem) {
     return `## Task Discipline (NON-NEGOTIABLE)
 
 - **2+ steps** \u2014 task_create FIRST, atomic breakdown
-- **Starting step** \u2014 task_update(status="in_progress") \u2014 ONE at a time
-- **Completing step** \u2014 task_update(status="completed") IMMEDIATELY
+- **Starting step** \u2014 task_update(task_id="...", status="in_progress") \u2014 ONE at a time
+- **Completing step** \u2014 task_update(task_id="...", status="completed") IMMEDIATELY
 - **Batching** \u2014 NEVER batch completions
 
 No tasks on multi-step work = INCOMPLETE WORK.`;
@@ -53574,9 +53707,9 @@ If ANY answer is no \u2192 GO BACK AND DO IT. Do not claim completion.
 3. After 3 DIFFERENT approaches fail \u2192 STOP and report what you tried clearly`;
   if (!promptAppend)
     return prompt;
-  return prompt + `
+  return `${prompt}
 
-` + resolvePromptAppend(promptAppend);
+${resolvePromptAppend(promptAppend)}`;
 }
 function buildGeminiTaskDisciplineSection(useTaskSystem) {
   if (useTaskSystem) {
@@ -53585,8 +53718,8 @@ function buildGeminiTaskDisciplineSection(useTaskSystem) {
 **You WILL forget to track tasks if not forced. This section forces you.**
 
 - **2+ steps** \u2014 task_create FIRST, atomic breakdown. DO THIS BEFORE ANY IMPLEMENTATION.
-- **Starting step** \u2014 task_update(status="in_progress") \u2014 ONE at a time
-- **Completing step** \u2014 task_update(status="completed") IMMEDIATELY after verification passes
+- **Starting step** \u2014 task_update(task_id="...", status="in_progress") \u2014 ONE at a time
+- **Completing step** \u2014 task_update(task_id="...", status="completed") IMMEDIATELY after verification passes
 - **Batching** \u2014 NEVER batch completions. Mark EACH task individually.
 
 No tasks on multi-step work = INCOMPLETE WORK. The user tracks your progress through tasks.`;
@@ -53899,20 +54032,20 @@ var import_picomatch2 = __toESM(require_picomatch2(), 1);
 import { promises as fs8 } from "fs";
 import { dirname as dirname10, extname, isAbsolute as isAbsolute7, join as join42, relative as relative4 } from "path";
 var MAX_RECURSIVE_DEPTH = 10;
-function isHttpUrl(path4) {
-  return path4.startsWith("http://") || path4.startsWith("https://");
+function isHttpUrl(path3) {
+  return path3.startsWith("http://") || path3.startsWith("https://");
 }
-function toAbsolutePath(path4, configDir) {
-  if (isAbsolute7(path4)) {
-    return path4;
+function toAbsolutePath(path3, configDir) {
+  if (isAbsolute7(path3)) {
+    return path3;
   }
-  return join42(configDir, path4);
+  return join42(configDir, path3);
 }
-function isMarkdownPath(path4) {
-  return extname(path4).toLowerCase() === ".md";
+function isMarkdownPath(path3) {
+  return extname(path3).toLowerCase() === ".md";
 }
-function normalizePathForGlob(path4) {
-  return path4.split("\\").join("/");
+function normalizePathForGlob(path3) {
+  return path3.split("\\").join("/");
 }
 function filterByGlob(skills2, sourceBaseDir, globPattern) {
   if (!globPattern)
@@ -58062,11 +58195,11 @@ async function loadMcpConfigFile(filePath) {
 function getSystemMcpServerNames() {
   const names = new Set;
   const paths = getMcpConfigPaths();
-  for (const { path: path4 } of paths) {
-    if (!existsSync38(path4))
+  for (const { path: path3 } of paths) {
+    if (!existsSync38(path3))
       continue;
     try {
-      const content = readFileSync29(path4, "utf-8");
+      const content = readFileSync29(path3, "utf-8");
       const config2 = JSON.parse(content);
       if (!config2?.mcpServers)
         continue;
@@ -58086,22 +58219,22 @@ async function loadMcpConfigs(disabledMcps = []) {
   const loadedServers = [];
   const paths = getMcpConfigPaths();
   const disabledSet = new Set(disabledMcps);
-  for (const { path: path4, scope } of paths) {
-    const config2 = await loadMcpConfigFile(path4);
+  for (const { path: path3, scope } of paths) {
+    const config2 = await loadMcpConfigFile(path3);
     if (!config2?.mcpServers)
       continue;
     for (const [name, serverConfig] of Object.entries(config2.mcpServers)) {
       if (disabledSet.has(name)) {
-        log(`Skipping MCP "${name}" (in disabled_mcps)`, { path: path4 });
+        log(`Skipping MCP "${name}" (in disabled_mcps)`, { path: path3 });
         continue;
       }
       if (serverConfig.disabled) {
-        log(`Disabling MCP server "${name}"`, { path: path4 });
+        log(`Disabling MCP server "${name}"`, { path: path3 });
         delete servers[name];
         const existingIndex = loadedServers.findIndex((s) => s.name === name);
         if (existingIndex !== -1) {
           loadedServers.splice(existingIndex, 1);
-          log(`Removed previously loaded MCP server "${name}"`, { path: path4 });
+          log(`Removed previously loaded MCP server "${name}"`, { path: path3 });
         }
         continue;
       }
@@ -58113,7 +58246,7 @@ async function loadMcpConfigs(disabledMcps = []) {
           loadedServers.splice(existingIndex, 1);
         }
         loadedServers.push({ name, scope, config: transformed });
-        log(`Loaded MCP server "${name}" from ${scope}`, { path: path4 });
+        log(`Loaded MCP server "${name}" from ${scope}`, { path: path3 });
       } catch (error48) {
         log(`Failed to transform MCP server "${name}"`, error48);
       }
@@ -58769,11 +58902,20 @@ var DEFAULT_MAX_DIRECTORY_FILES = 50;
 // src/tools/lsp/server-config-loader.ts
 import { existsSync as existsSync39, readFileSync as readFileSync30 } from "fs";
 import { join as join46 } from "path";
-function loadJsonFile(path4) {
-  if (!existsSync39(path4))
+function loadJsonFile(path3) {
+  if (!existsSync39(path3))
+    return null;
+  try {
+    return parseOmoConfigJson(readFileSync30(path3, "utf-8"));
+  } catch {
+    return null;
+  }
+}
+function loadOpenCodeConfigFile(path3) {
+  if (!existsSync39(path3))
     return null;
   try {
-    return parseJsonc(readFileSync30(path4, "utf-8"));
+    return parseJsonc(readFileSync30(path3, "utf-8"));
   } catch {
     return null;
   }
@@ -58782,8 +58924,8 @@ function getConfigPaths2() {
   const cwd = process.cwd();
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
   return {
-    project: detectConfigFile(join46(cwd, ".opencode", "oh-my-opencode-gpt-slim")).path,
-    user: detectConfigFile(join46(configDir, "oh-my-opencode-gpt-slim")).path,
+    project: getProjectOmoConfigFilePath(cwd),
+    user: getOmoConfigFilePath(configDir),
     opencode: detectConfigFile(join46(configDir, "opencode")).path
   };
 }
@@ -58796,7 +58938,7 @@ function loadAllConfigs() {
   const user = loadJsonFile(paths.user);
   if (user)
     configs.set("user", user);
-  const opencode = loadJsonFile(paths.opencode);
+  const opencode = loadOpenCodeConfigFile(paths.opencode);
   if (opencode)
     configs.set("opencode", opencode);
   return configs;
@@ -58845,7 +58987,11 @@ function getMergedServers() {
   }
   return servers.sort((a, b) => {
     if (a.source !== b.source) {
-      const order = { project: 0, user: 1, opencode: 2 };
+      const order = {
+        project: 0,
+        user: 1,
+        opencode: 2
+      };
       return order[a.source] - order[b.source];
     }
     return b.priority - a.priority;
@@ -60724,10 +60870,10 @@ function mergeDefs2(...defs) {
 function cloneDef2(schema2) {
   return mergeDefs2(schema2._zod.def);
 }
-function getElementAtPath2(obj, path4) {
-  if (!path4)
+function getElementAtPath2(obj, path3) {
+  if (!path3)
     return obj;
-  return path4.reduce((acc, key) => acc?.[key], obj);
+  return path3.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject2(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -61086,11 +61232,11 @@ function aborted2(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues2(path4, issues) {
+function prefixIssues2(path3, issues) {
   return issues.map((iss) => {
     var _a2;
     (_a2 = iss).path ?? (_a2.path = []);
-    iss.path.unshift(path4);
+    iss.path.unshift(path3);
     return iss;
   });
 }
@@ -61258,7 +61404,7 @@ function treeifyError2(error48, _mapper) {
     return issue3.message;
   };
   const result = { errors: [] };
-  const processError = (error49, path4 = []) => {
+  const processError = (error49, path3 = []) => {
     var _a2, _b;
     for (const issue3 of error49.issues) {
       if (issue3.code === "invalid_union" && issue3.errors.length) {
@@ -61268,7 +61414,7 @@ function treeifyError2(error48, _mapper) {
       } else if (issue3.code === "invalid_element") {
         processError({ issues: issue3.issues }, issue3.path);
       } else {
-        const fullpath = [...path4, ...issue3.path];
+        const fullpath = [...path3, ...issue3.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue3));
           continue;
@@ -61300,8 +61446,8 @@ function treeifyError2(error48, _mapper) {
 }
 function toDotPath2(_path) {
   const segs = [];
-  const path4 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path4) {
+  const path3 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path3) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")