oh-my-opencode 3.17.2 → 3.17.3

package/dist/index.js

@@ -2649,8 +2649,8 @@ var require_semaphore = __commonJS((exports) => {
       this._waiting = [];
     }
     lock(thunk) {
-      return new Promise((resolve13, reject) => {
-        this._waiting.push({ thunk, resolve: resolve13, reject });
+      return new Promise((resolve14, reject) => {
+        this._waiting.push({ thunk, resolve: resolve14, reject });
         this.runNext();
       });
     }
@@ -4141,9 +4141,9 @@ ${JSON.stringify(message, null, 4)}`);
         if (typeof cancellationStrategy.sender.enableCancellation === "function") {
           cancellationStrategy.sender.enableCancellation(requestMessage);
         }
-        return new Promise(async (resolve13, reject) => {
+        return new Promise(async (resolve14, reject) => {
           const resolveWithCleanup = (r) => {
-            resolve13(r);
+            resolve14(r);
             cancellationStrategy.sender.cleanup(id);
             disposable?.dispose();
           };
@@ -4552,10 +4552,10 @@ var require_ril = __commonJS((exports) => {
       return api_1.Disposable.create(() => this.stream.off("end", listener));
     }
     write(data, encoding) {
-      return new Promise((resolve13, reject) => {
+      return new Promise((resolve14, reject) => {
         const callback = (error48) => {
           if (error48 === undefined || error48 === null) {
-            resolve13();
+            resolve14();
           } else {
             reject(error48);
           }
@@ -4814,10 +4814,10 @@ var require_main = __commonJS((exports) => {
   exports.generateRandomPipeName = generateRandomPipeName;
   function createClientPipeTransport(pipeName, encoding = "utf-8") {
     let connectResolve;
-    const connected = new Promise((resolve13, _reject) => {
-      connectResolve = resolve13;
+    const connected = new Promise((resolve14, _reject) => {
+      connectResolve = resolve14;
     });
-    return new Promise((resolve13, reject) => {
+    return new Promise((resolve14, reject) => {
       let server = (0, net_1.createServer)((socket) => {
         server.close();
         connectResolve([
@@ -4828,7 +4828,7 @@ var require_main = __commonJS((exports) => {
       server.on("error", reject);
       server.listen(pipeName, () => {
         server.removeListener("error", reject);
-        resolve13({
+        resolve14({
           onConnected: () => {
             return connected;
           }
@@ -4847,10 +4847,10 @@ var require_main = __commonJS((exports) => {
   exports.createServerPipeTransport = createServerPipeTransport;
   function createClientSocketTransport(port, encoding = "utf-8") {
     let connectResolve;
-    const connected = new Promise((resolve13, _reject) => {
-      connectResolve = resolve13;
+    const connected = new Promise((resolve14, _reject) => {
+      connectResolve = resolve14;
     });
-    return new Promise((resolve13, reject) => {
+    return new Promise((resolve14, reject) => {
       const server = (0, net_1.createServer)((socket) => {
         server.close();
         connectResolve([
@@ -4861,7 +4861,7 @@ var require_main = __commonJS((exports) => {
       server.on("error", reject);
       server.listen(port, "127.0.0.1", () => {
         server.removeListener("error", reject);
-        resolve13({
+        resolve14({
           onConnected: () => {
             return connected;
           }
@@ -8439,7 +8439,7 @@ var require_compile = __commonJS((exports) => {
     const schOrFunc = root.refs[ref];
     if (schOrFunc)
       return schOrFunc;
-    let _sch = resolve20.call(this, root, ref);
+    let _sch = resolve21.call(this, root, ref);
     if (_sch === undefined) {
       const schema2 = (_a2 = root.localRefs) === null || _a2 === undefined ? undefined : _a2[ref];
       const { schemaId } = this.opts;
@@ -8466,7 +8466,7 @@ var require_compile = __commonJS((exports) => {
   function sameSchemaEnv(s1, s2) {
     return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId;
   }
-  function resolve20(root, ref) {
+  function resolve21(root, ref) {
     let sch;
     while (typeof (sch = this.refs[ref]) == "string")
       ref = sch;
@@ -8677,8 +8677,8 @@ var require_utils2 = __commonJS((exports, module) => {
     }
     return ind;
   }
-  function removeDotSegments(path14) {
-    let input = path14;
+  function removeDotSegments(path15) {
+    let input = path15;
     const output = [];
     let nextSlash = -1;
     let len = 0;
@@ -8868,8 +8868,8 @@ var require_schemes = __commonJS((exports, module) => {
       wsComponent.secure = undefined;
     }
     if (wsComponent.resourceName) {
-      const [path14, query] = wsComponent.resourceName.split("?");
-      wsComponent.path = path14 && path14 !== "/" ? path14 : undefined;
+      const [path15, query] = wsComponent.resourceName.split("?");
+      wsComponent.path = path15 && path15 !== "/" ? path15 : undefined;
       wsComponent.query = query;
       wsComponent.resourceName = undefined;
     }
@@ -8996,7 +8996,7 @@ var require_fast_uri = __commonJS((exports, module) => {
     }
     return uri;
   }
-  function resolve20(baseURI, relativeURI, options) {
+  function resolve21(baseURI, relativeURI, options) {
     const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
     const resolved = resolveComponent(parse11(baseURI, schemelessOptions), parse11(relativeURI, schemelessOptions), schemelessOptions, true);
     schemelessOptions.skipEscape = true;
@@ -9224,7 +9224,7 @@ var require_fast_uri = __commonJS((exports, module) => {
   var fastUri = {
     SCHEMES,
     normalize: normalize3,
-    resolve: resolve20,
+    resolve: resolve21,
     resolveComponent,
     equal,
     serialize,
@@ -12013,12 +12013,12 @@ var require_dist = __commonJS((exports, module) => {
       throw new Error(`Unknown format "${name}"`);
     return f;
   };
-  function addFormats(ajv, list, fs20, exportName) {
+  function addFormats(ajv, list, fs21, exportName) {
     var _a2;
     var _b;
     (_a2 = (_b = ajv.opts.code).formats) !== null && _a2 !== undefined || (_b.formats = (0, codegen_1._)`require("ajv-formats/dist/formats").${exportName}`);
     for (const f of list)
-      ajv.addFormat(f, fs20[f]);
+      ajv.addFormat(f, fs21[f]);
   }
   module.exports = exports = formatsPlugin;
   Object.defineProperty(exports, "__esModule", { value: true });
@@ -12029,8 +12029,8 @@ var require_dist = __commonJS((exports, module) => {
 var require_windows = __commonJS((exports, module) => {
   module.exports = isexe;
   isexe.sync = sync;
-  var fs20 = __require("fs");
-  function checkPathExt(path14, options) {
+  var fs21 = __require("fs");
+  function checkPathExt(path15, options) {
     var pathext = options.pathExt !== undefined ? options.pathExt : process.env.PATHEXT;
     if (!pathext) {
       return true;
@@ -12041,25 +12041,25 @@ var require_windows = __commonJS((exports, module) => {
     }
     for (var i2 = 0;i2 < pathext.length; i2++) {
       var p = pathext[i2].toLowerCase();
-      if (p && path14.substr(-p.length).toLowerCase() === p) {
+      if (p && path15.substr(-p.length).toLowerCase() === p) {
         return true;
       }
     }
     return false;
   }
-  function checkStat(stat2, path14, options) {
+  function checkStat(stat2, path15, options) {
     if (!stat2.isSymbolicLink() && !stat2.isFile()) {
       return false;
     }
-    return checkPathExt(path14, options);
+    return checkPathExt(path15, options);
   }
-  function isexe(path14, options, cb) {
-    fs20.stat(path14, function(er, stat2) {
-      cb(er, er ? false : checkStat(stat2, path14, options));
+  function isexe(path15, options, cb) {
+    fs21.stat(path15, function(er, stat2) {
+      cb(er, er ? false : checkStat(stat2, path15, options));
     });
   }
-  function sync(path14, options) {
-    return checkStat(fs20.statSync(path14), path14, options);
+  function sync(path15, options) {
+    return checkStat(fs21.statSync(path15), path15, options);
   }
 });
 
@@ -12067,14 +12067,14 @@ var require_windows = __commonJS((exports, module) => {
 var require_mode = __commonJS((exports, module) => {
   module.exports = isexe;
   isexe.sync = sync;
-  var fs20 = __require("fs");
-  function isexe(path14, options, cb) {
-    fs20.stat(path14, function(er, stat2) {
+  var fs21 = __require("fs");
+  function isexe(path15, options, cb) {
+    fs21.stat(path15, function(er, stat2) {
       cb(er, er ? false : checkStat(stat2, options));
     });
   }
-  function sync(path14, options) {
-    return checkStat(fs20.statSync(path14), options);
+  function sync(path15, options) {
+    return checkStat(fs21.statSync(path15), options);
   }
   function checkStat(stat2, options) {
     return stat2.isFile() && checkMode(stat2, options);
@@ -12096,7 +12096,7 @@ var require_mode = __commonJS((exports, module) => {
 
 // node_modules/isexe/index.js
 var require_isexe = __commonJS((exports, module) => {
-  var fs20 = __require("fs");
+  var fs21 = __require("fs");
   var core4;
   if (process.platform === "win32" || global.TESTING_WINDOWS) {
     core4 = require_windows();
@@ -12105,7 +12105,7 @@ var require_isexe = __commonJS((exports, module) => {
   }
   module.exports = isexe;
   isexe.sync = sync;
-  function isexe(path14, options, cb) {
+  function isexe(path15, options, cb) {
     if (typeof options === "function") {
       cb = options;
       options = {};
@@ -12114,17 +12114,17 @@ var require_isexe = __commonJS((exports, module) => {
       if (typeof Promise !== "function") {
         throw new TypeError("callback not provided");
       }
-      return new Promise(function(resolve20, reject) {
-        isexe(path14, options || {}, function(er, is) {
+      return new Promise(function(resolve21, reject) {
+        isexe(path15, options || {}, function(er, is) {
           if (er) {
             reject(er);
           } else {
-            resolve20(is);
+            resolve21(is);
           }
         });
       });
     }
-    core4(path14, options || {}, function(er, is) {
+    core4(path15, options || {}, function(er, is) {
       if (er) {
         if (er.code === "EACCES" || options && options.ignoreErrors) {
           er = null;
@@ -12134,9 +12134,9 @@ var require_isexe = __commonJS((exports, module) => {
       cb(er, is);
     });
   }
-  function sync(path14, options) {
+  function sync(path15, options) {
     try {
-      return core4.sync(path14, options || {});
+      return core4.sync(path15, options || {});
     } catch (er) {
       if (options && options.ignoreErrors || er.code === "EACCES") {
         return false;
@@ -12150,7 +12150,7 @@ var require_isexe = __commonJS((exports, module) => {
 // node_modules/which/which.js
 var require_which = __commonJS((exports, module) => {
   var isWindows2 = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
-  var path14 = __require("path");
+  var path15 = __require("path");
   var COLON = isWindows2 ? ";" : ":";
   var isexe = require_isexe();
   var getNotFoundError = (cmd) => Object.assign(new Error(`not found: ${cmd}`), { code: "ENOENT" });
@@ -12181,27 +12181,27 @@ var require_which = __commonJS((exports, module) => {
       opt = {};
     const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
     const found = [];
-    const step = (i2) => new Promise((resolve20, reject) => {
+    const step = (i2) => new Promise((resolve21, reject) => {
       if (i2 === pathEnv.length)
-        return opt.all && found.length ? resolve20(found) : reject(getNotFoundError(cmd));
+        return opt.all && found.length ? resolve21(found) : reject(getNotFoundError(cmd));
       const ppRaw = pathEnv[i2];
       const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-      const pCmd = path14.join(pathPart, cmd);
+      const pCmd = path15.join(pathPart, cmd);
       const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
-      resolve20(subStep(p, i2, 0));
+      resolve21(subStep(p, i2, 0));
     });
-    const subStep = (p, i2, ii) => new Promise((resolve20, reject) => {
+    const subStep = (p, i2, ii) => new Promise((resolve21, reject) => {
       if (ii === pathExt.length)
-        return resolve20(step(i2 + 1));
+        return resolve21(step(i2 + 1));
       const ext = pathExt[ii];
       isexe(p + ext, { pathExt: pathExtExe }, (er, is) => {
         if (!er && is) {
           if (opt.all)
             found.push(p + ext);
           else
-            return resolve20(p + ext);
+            return resolve21(p + ext);
         }
-        return resolve20(subStep(p, i2, ii + 1));
+        return resolve21(subStep(p, i2, ii + 1));
       });
     });
     return cb ? step(0).then((res) => cb(null, res), cb) : step(0);
@@ -12213,7 +12213,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 = path14.join(pathPart, cmd);
+      const pCmd = path15.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];
@@ -12254,7 +12254,7 @@ var require_path_key = __commonJS((exports, module) => {
 
 // node_modules/cross-spawn/lib/util/resolveCommand.js
 var require_resolveCommand = __commonJS((exports, module) => {
-  var path14 = __require("path");
+  var path15 = __require("path");
   var which = require_which();
   var getPathKey = require_path_key();
   function resolveCommandAttempt(parsed, withoutPathExt) {
@@ -12271,7 +12271,7 @@ var require_resolveCommand = __commonJS((exports, module) => {
     try {
       resolved = which.sync(parsed.command, {
         path: env[getPathKey({ env })],
-        pathExt: withoutPathExt ? path14.delimiter : undefined
+        pathExt: withoutPathExt ? path15.delimiter : undefined
       });
     } catch (e) {} finally {
       if (shouldSwitchCwd) {
@@ -12279,7 +12279,7 @@ var require_resolveCommand = __commonJS((exports, module) => {
       }
     }
     if (resolved) {
-      resolved = path14.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
+      resolved = path15.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
     }
     return resolved;
   }
@@ -12324,8 +12324,8 @@ var require_shebang_command = __commonJS((exports, module) => {
     if (!match) {
       return null;
     }
-    const [path14, argument] = match[0].replace(/#! ?/, "").split(" ");
-    const binary2 = path14.split("/").pop();
+    const [path15, argument] = match[0].replace(/#! ?/, "").split(" ");
+    const binary2 = path15.split("/").pop();
     if (binary2 === "env") {
       return argument;
     }
@@ -12335,16 +12335,16 @@ var require_shebang_command = __commonJS((exports, module) => {
 
 // node_modules/cross-spawn/lib/util/readShebang.js
 var require_readShebang = __commonJS((exports, module) => {
-  var fs20 = __require("fs");
+  var fs21 = __require("fs");
   var shebangCommand = require_shebang_command();
   function readShebang(command) {
     const size = 150;
     const buffer2 = Buffer.alloc(size);
     let fd;
     try {
-      fd = fs20.openSync(command, "r");
-      fs20.readSync(fd, buffer2, 0, size, 0);
-      fs20.closeSync(fd);
+      fd = fs21.openSync(command, "r");
+      fs21.readSync(fd, buffer2, 0, size, 0);
+      fs21.closeSync(fd);
     } catch (e) {}
     return shebangCommand(buffer2.toString());
   }
@@ -12353,7 +12353,7 @@ var require_readShebang = __commonJS((exports, module) => {
 
 // node_modules/cross-spawn/lib/parse.js
 var require_parse2 = __commonJS((exports, module) => {
-  var path14 = __require("path");
+  var path15 = __require("path");
   var resolveCommand = require_resolveCommand();
   var escape2 = require_escape();
   var readShebang = require_readShebang();
@@ -12378,7 +12378,7 @@ var require_parse2 = __commonJS((exports, module) => {
     const needsShell = !isExecutableRegExp.test(commandFile);
     if (parsed.options.forceShell || needsShell) {
       const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile);
-      parsed.command = path14.normalize(parsed.command);
+      parsed.command = path15.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(" ");
@@ -17570,20 +17570,28 @@ function migrateConfigFile(configPath, rawConfig) {
     }
   }
   if (needsWrite) {
+    let finalConfig = JSON.parse(JSON.stringify(copy));
+    const newContent = JSON.stringify(finalConfig, null, 2) + `
+`;
+    let existingContent;
+    try {
+      existingContent = fs4.readFileSync(configPath, "utf-8");
+    } catch {}
+    const contentChanged = existingContent !== newContent;
     const timestamp2 = new Date().toISOString().replace(/[:.]/g, "-");
     const backupPath = `${configPath}.bak.${timestamp2}`;
     let backupSucceeded = false;
-    try {
-      fs4.copyFileSync(configPath, backupPath);
-      backupSucceeded = true;
-    } catch {
-      backupSucceeded = false;
+    if (contentChanged) {
+      try {
+        fs4.copyFileSync(configPath, backupPath);
+        backupSucceeded = true;
+      } catch {
+        backupSucceeded = false;
+      }
     }
     let writeSucceeded = false;
-    let finalConfig = JSON.parse(JSON.stringify(copy));
     try {
-      writeFileAtomically(configPath, JSON.stringify(finalConfig, null, 2) + `
-`);
+      writeFileAtomically(configPath, newContent);
       writeSucceeded = true;
     } catch (err) {
       log(`Failed to write migrated config to ${configPath}:`, err);
@@ -17690,6 +17698,21 @@ function getOpenCodeConfigPaths(options) {
     omoConfig: join6(configDir, `${CONFIG_BASENAME}.json`)
   };
 }
+// src/shared/resolve-agent-definition-paths.ts
+import { homedir as homedir5 } from "os";
+import { isAbsolute as isAbsolute3, resolve as resolve4 } from "path";
+init_logger();
+function resolveAgentDefinitionPaths(paths, baseDir, containmentDir) {
+  return paths.flatMap((p) => {
+    const expanded = p.startsWith("~/") ? p.replace(/^~\//, `${homedir5()}/`) : p;
+    const resolved = isAbsolute3(expanded) ? expanded : resolve4(baseDir, expanded);
+    if (containmentDir !== null && !isWithinProject(resolved, containmentDir)) {
+      log(`agent_definitions path rejected (outside project boundary): ${p} -> ${resolved}`);
+      return [];
+    }
+    return [resolved];
+  });
+}
 // src/shared/opencode-version.ts
 import { execSync } from "child_process";
 var OPENCODE_NATIVE_AGENTS_INJECTION_VERSION = "1.1.37";
@@ -17947,7 +17970,7 @@ var {spawn: spawn7, spawnSync: spawnSync3 } = globalThis.Bun;
 import { release } from "os";
 
 // src/shared/archive-entry-validator.ts
-import { dirname as dirname3, isAbsolute as isAbsolute3, relative as relative2, resolve as resolve4, sep } from "path";
+import { dirname as dirname3, isAbsolute as isAbsolute4, relative as relative2, resolve as resolve5, sep } from "path";
 function normalizeArchivePath(filePath) {
   return filePath.replaceAll("\\", "/");
 }
@@ -17956,11 +17979,11 @@ function containsTraversalSegment(filePath) {
 }
 function isArchiveAbsolutePath(filePath) {
   const normalizedPath = normalizeArchivePath(filePath);
-  return isAbsolute3(normalizedPath) || /^[A-Za-z]:\//.test(normalizedPath) || normalizedPath.startsWith("//");
+  return isAbsolute4(normalizedPath) || /^[A-Za-z]:\//.test(normalizedPath) || normalizedPath.startsWith("//");
 }
 function escapesDirectory(rootDir, candidatePath) {
   const relativePath = relative2(rootDir, candidatePath);
-  return relativePath === ".." || relativePath.startsWith(`..${sep}`) || isAbsolute3(relativePath);
+  return relativePath === ".." || relativePath.startsWith(`..${sep}`) || isAbsolute4(relativePath);
 }
 function resolveContainedPath(rootDir, filePath, errorLabel) {
   const normalizedPath = normalizeArchivePath(filePath);
@@ -17970,14 +17993,14 @@ function resolveContainedPath(rootDir, filePath, errorLabel) {
   if (containsTraversalSegment(normalizedPath)) {
     throw new Error(`Unsafe archive entry: ${errorLabel} contains path traversal (${filePath})`);
   }
-  const resolvedPath = resolve4(rootDir, normalizedPath);
+  const resolvedPath = resolve5(rootDir, normalizedPath);
   if (escapesDirectory(rootDir, resolvedPath)) {
     throw new Error(`Unsafe archive entry: ${errorLabel} contains path traversal (${filePath})`);
   }
   return resolvedPath;
 }
 function validateArchiveEntries(entries, destDir) {
-  const resolvedDestDir = resolve4(destDir);
+  const resolvedDestDir = resolve5(destDir);
   for (const entry of entries) {
     const resolvedEntryPath = resolveContainedPath(resolvedDestDir, entry.path, "path");
     if (entry.type !== "symlink" && entry.type !== "hardlink") {
@@ -17994,7 +18017,7 @@ function validateArchiveEntries(entries, destDir) {
     if (containsTraversalSegment(normalizedLinkPath)) {
       throw new Error(`Unsafe archive entry: ${linkTypeLabel} contains path traversal (${entry.linkPath})`);
     }
-    const resolvedLinkPath = resolve4(dirname3(resolvedEntryPath), normalizedLinkPath);
+    const resolvedLinkPath = resolve5(dirname3(resolvedEntryPath), normalizedLinkPath);
     if (escapesDirectory(resolvedDestDir, resolvedLinkPath)) {
       throw new Error(`Unsafe archive entry: ${linkTypeLabel} escapes extraction directory (${entry.linkPath})`);
     }
@@ -18427,6 +18450,9 @@ async function listTarEntries(archivePath, cwd) {
   }
   return stdout.split(/\r?\n/).map((line) => line.trim()).filter(Boolean).map((line) => parseTarEntry(line)).filter((entry) => entry !== null);
 }
+// src/shared/agent-variant.ts
+init_agent_display_names();
+
 // src/shared/model-requirements.ts
 var AGENT_MODEL_REQUIREMENTS = {
   sisyphus: {
@@ -18832,6 +18858,9 @@ function detectShellType() {
     }
     return "unix";
   }
+  if (process.env.MSYSTEM) {
+    return "unix";
+  }
   if (process.env.PSModulePath) {
     return "powershell";
   }
@@ -18913,6 +18942,7 @@ var SystemDirectiveTypes = {
   PROMETHEUS_READ_ONLY: "PROMETHEUS READ-ONLY"
 };
 // src/shared/agent-tool-restrictions.ts
+init_agent_display_names();
 var EXPLORATION_AGENT_DENYLIST = {
   write: false,
   edit: false,
@@ -18946,7 +18976,8 @@ var AGENT_RESTRICTIONS = {
   }
 };
 function getAgentToolRestrictions(agentName) {
-  return AGENT_RESTRICTIONS[agentName] ?? Object.entries(AGENT_RESTRICTIONS).find(([key]) => key.toLowerCase() === agentName.toLowerCase())?.[1] ?? {};
+  const stripped = stripInvisibleAgentCharacters(agentName);
+  return AGENT_RESTRICTIONS[stripped] ?? Object.entries(AGENT_RESTRICTIONS).find(([key]) => key.toLowerCase() === stripped.toLowerCase())?.[1] ?? {};
 }
 // src/shared/model-normalization.ts
 function normalizeModel(model) {
@@ -18965,7 +18996,7 @@ init_logger();
 
 // src/shared/json-file-cache-store.ts
 init_logger();
-import { existsSync as existsSync10, mkdirSync as mkdirSync4, readFileSync as readFileSync5, writeFileSync as writeFileSync2 } from "fs";
+import { existsSync as existsSync10, mkdirSync as mkdirSync4, readFileSync as readFileSync6, writeFileSync as writeFileSync2 } from "fs";
 import { join as join10 } from "path";
 function toLogLabel(cacheLabel) {
   return cacheLabel.toLowerCase();
@@ -18992,7 +19023,7 @@ function createJsonFileCacheStore(options) {
       return null;
     }
     try {
-      const content = readFileSync5(cacheFile, "utf-8");
+      const content = readFileSync6(cacheFile, "utf-8");
       const value = JSON.parse(content);
       memoryValue = value;
       log(`[${options.logPrefix}] Read ${toLogLabel(options.cacheLabel)}`, options.describe(value));
@@ -19169,7 +19200,7 @@ var {
 
 // src/shared/model-availability.ts
 init_logger();
-import { existsSync as existsSync11, readFileSync as readFileSync6 } from "fs";
+import { existsSync as existsSync11, readFileSync as readFileSync7 } from "fs";
 import { join as join11 } from "path";
 function normalizeModelName(name) {
   return name.toLowerCase().replace(/claude-(opus|sonnet|haiku)-(\d+)[.-](\d+)/g, "claude-$1-$2.$3");
@@ -19311,7 +19342,7 @@ async function fetchAvailableModels(client, options) {
     log("[fetchAvailableModels] models.json cache file not found, falling back to client");
   } else {
     try {
-      const content = readFileSync6(cacheFile, "utf-8");
+      const content = readFileSync7(cacheFile, "utf-8");
       const data = JSON.parse(content);
       const providerIds = Object.keys(data);
       log("[fetchAvailableModels] providers found in models.json", { count: providerIds.length, providers: providerIds.slice(0, 10) });
@@ -61020,13 +61051,13 @@ function isAnyProviderConnected(providers, availableModels) {
   return false;
 }
 // src/features/hook-message-injector/injector.ts
-import { existsSync as existsSync13, mkdirSync as mkdirSync5, readFileSync as readFileSync8, readdirSync as readdirSync2, writeFileSync as writeFileSync3 } from "fs";
+import { existsSync as existsSync13, mkdirSync as mkdirSync5, readFileSync as readFileSync9, readdirSync as readdirSync2, writeFileSync as writeFileSync3 } from "fs";
 import { randomBytes } from "crypto";
 import { join as join14 } from "path";
 init_logger();
 
 // src/shared/compaction-marker.ts
-import { existsSync as existsSync12, readdirSync, readFileSync as readFileSync7 } from "fs";
+import { existsSync as existsSync12, readdirSync, readFileSync as readFileSync8 } from "fs";
 import { join as join13 } from "path";
 
 // src/shared/opencode-storage-paths.ts
@@ -61063,7 +61094,7 @@ function hasCompactionPartInStorage(messageID) {
   try {
     return readdirSync(partDir).filter((fileName) => fileName.endsWith(".json")).some((fileName) => {
       try {
-        const content = readFileSync7(join13(partDir, fileName), "utf-8");
+        const content = readFileSync8(join13(partDir, fileName), "utf-8");
         return isCompactionPart(JSON.parse(content));
       } catch {
         return false;
@@ -61156,7 +61187,7 @@ function findNearestMessageWithFields(messageDir) {
   try {
     const messages = readdirSync2(messageDir).filter((f) => f.endsWith(".json")).map((fileName) => {
       try {
-        const content = readFileSync8(join14(messageDir, fileName), "utf-8");
+        const content = readFileSync9(join14(messageDir, fileName), "utf-8");
         const msg = JSON.parse(content);
         return {
           fileName,
@@ -61196,7 +61227,7 @@ function findFirstMessageWithAgent(messageDir) {
   try {
     const messages = readdirSync2(messageDir).filter((f) => f.endsWith(".json")).map((fileName) => {
       try {
-        const content = readFileSync8(join14(messageDir, fileName), "utf-8");
+        const content = readFileSync9(join14(messageDir, fileName), "utf-8");
         const msg = JSON.parse(content);
         return {
           fileName,
@@ -61302,7 +61333,7 @@ var serverAvailable = null;
 var serverCheckUrl = null;
 var SERVER_RUNNING_KEY = Symbol.for("oh-my-opencode:server-running-in-process");
 function delay(milliseconds) {
-  return new Promise((resolve5) => setTimeout(resolve5, milliseconds));
+  return new Promise((resolve6) => setTimeout(resolve6, milliseconds));
 }
 function markServerRunningInProcess() {
   globalThis[SERVER_RUNNING_KEY] = true;
@@ -61472,7 +61503,7 @@ async function spawnTmuxPane(sessionId, description, config, serverUrl, targetPa
 // src/shared/tmux/tmux-utils/pane-close.ts
 var {spawn: spawn11 } = globalThis.Bun;
 function delay2(milliseconds) {
-  return new Promise((resolve5) => setTimeout(resolve5, milliseconds));
+  return new Promise((resolve6) => setTimeout(resolve6, milliseconds));
 }
 async function closeTmuxPane(paneId) {
   const { log: log2 } = await Promise.resolve().then(() => (init_logger(), exports_logger));
@@ -62296,7 +62327,7 @@ function parseGitDiffNumstat(output, statusMap) {
 }
 // src/shared/git-worktree/collect-git-diff-stats.ts
 import { execFileSync } from "child_process";
-import { readFileSync as readFileSync9 } from "fs";
+import { readFileSync as readFileSync10 } from "fs";
 import { join as join16 } from "path";
 function collectGitDiffStats(directory) {
   try {
@@ -62321,7 +62352,7 @@ function collectGitDiffStats(directory) {
     const untrackedNumstat = untrackedOutput ? untrackedOutput.split(`
 `).filter(Boolean).map((filePath) => {
       try {
-        const content = readFileSync9(join16(directory, filePath), "utf-8");
+        const content = readFileSync10(join16(directory, filePath), "utf-8");
         const lineCount = content.split(`
 `).length - (content.endsWith(`
 `) ? 1 : 0);
@@ -62427,9 +62458,9 @@ function getOpenCodeSkillDirs(options) {
 // src/shared/project-discovery-dirs.ts
 import { execFileSync as execFileSync2 } from "child_process";
 import { existsSync as existsSync15, realpathSync as realpathSync4 } from "fs";
-import { dirname as dirname5, join as join18, resolve as resolve5 } from "path";
+import { dirname as dirname5, join as join18, resolve as resolve6 } from "path";
 function normalizePath(path6) {
-  const resolvedPath = resolve5(path6);
+  const resolvedPath = resolve6(path6);
   if (!existsSync15(resolvedPath)) {
     return resolvedPath;
   }
@@ -62549,20 +62580,20 @@ init_logger();
 
 // src/features/claude-code-plugin-loader/discovery.ts
 init_logger();
-import { existsSync as existsSync16, readFileSync as readFileSync10 } from "fs";
-import { homedir as homedir7 } from "os";
+import { existsSync as existsSync16, readFileSync as readFileSync11 } from "fs";
+import { homedir as homedir8 } from "os";
 import { basename as basename3, join as join20 } from "path";
 import { fileURLToPath } from "url";
 
 // src/features/claude-code-plugin-loader/scope-filter.ts
-import { homedir as homedir6 } from "os";
+import { homedir as homedir7 } from "os";
 import { join as join19 } from "path";
 function expandTilde(inputPath) {
   if (inputPath === "~") {
-    return homedir6();
+    return homedir7();
   }
   if (inputPath.startsWith("~/") || inputPath.startsWith("~\\")) {
-    return join19(homedir6(), inputPath.slice(2));
+    return join19(homedir7(), inputPath.slice(2));
   }
   return inputPath;
 }
@@ -62581,7 +62612,7 @@ function getPluginsBaseDir() {
   if (process.env.CLAUDE_PLUGINS_HOME) {
     return process.env.CLAUDE_PLUGINS_HOME;
   }
-  return join20(homedir7(), ".claude", "plugins");
+  return join20(homedir8(), ".claude", "plugins");
 }
 function getInstalledPluginsPath(pluginsBaseDir) {
   return join20(pluginsBaseDir ?? getPluginsBaseDir(), "installed_plugins.json");
@@ -62592,7 +62623,7 @@ function loadInstalledPlugins(pluginsBaseDir) {
     return null;
   }
   try {
-    const content = readFileSync10(dbPath, "utf-8");
+    const content = readFileSync11(dbPath, "utf-8");
     return JSON.parse(content);
   } catch (error) {
     log("Failed to load installed plugins database", error);
@@ -62603,7 +62634,7 @@ function getClaudeSettingsPath() {
   if (process.env.CLAUDE_SETTINGS_PATH) {
     return process.env.CLAUDE_SETTINGS_PATH;
   }
-  return join20(homedir7(), ".claude", "settings.json");
+  return join20(homedir8(), ".claude", "settings.json");
 }
 function loadClaudeSettings() {
   const settingsPath = getClaudeSettingsPath();
@@ -62611,7 +62642,7 @@ function loadClaudeSettings() {
     return null;
   }
   try {
-    const content = readFileSync10(settingsPath, "utf-8");
+    const content = readFileSync11(settingsPath, "utf-8");
     return JSON.parse(content);
   } catch (error) {
     log("Failed to load Claude settings", error);
@@ -62624,7 +62655,7 @@ function loadPluginManifest(installPath) {
     return null;
   }
   try {
-    const content = readFileSync10(manifestPath, "utf-8");
+    const content = readFileSync11(manifestPath, "utf-8");
     return JSON.parse(content);
   } catch (error) {
     log(`Failed to load plugin manifest from ${manifestPath}`, error);
@@ -62764,7 +62795,7 @@ function discoverInstalledPlugins(options) {
 }
 
 // src/features/claude-code-plugin-loader/command-loader.ts
-import { existsSync as existsSync17, readdirSync as readdirSync4, readFileSync as readFileSync11 } from "fs";
+import { existsSync as existsSync17, readdirSync as readdirSync4, readFileSync as readFileSync12 } from "fs";
 import { basename as basename4, join as join21 } from "path";
 init_logger();
 function loadPluginCommands(plugins) {
@@ -62780,7 +62811,7 @@ function loadPluginCommands(plugins) {
       const commandName = basename4(entry.name, ".md");
       const namespacedName = `${plugin.name}:${commandName}`;
       try {
-        const content = readFileSync11(commandPath, "utf-8");
+        const content = readFileSync12(commandPath, "utf-8");
         const { data, body } = parseFrontmatter(content);
         const wrappedTemplate = `<command-instruction>
 ${body.trim()}
@@ -62811,11 +62842,11 @@ $ARGUMENTS
 }
 
 // src/features/claude-code-plugin-loader/skill-loader.ts
-import { existsSync as existsSync18, readdirSync as readdirSync5, readFileSync as readFileSync12 } from "fs";
+import { existsSync as existsSync18, readdirSync as readdirSync5, readFileSync as readFileSync13 } from "fs";
 import { join as join22 } from "path";
 
 // src/shared/skill-path-resolver.ts
-import { isAbsolute as isAbsolute4, relative as relative3, resolve as resolve6, sep as sep2 } from "path";
+import { isAbsolute as isAbsolute5, relative as relative3, resolve as resolve7, sep as sep2 } from "path";
 function looksLikeFilePath(path6) {
   if (path6.endsWith("/"))
     return true;
@@ -62827,9 +62858,9 @@ function resolveSkillPathReferences(content, basePath) {
   return content.replace(/(?<![a-zA-Z0-9="\(])@([a-zA-Z0-9_-]+\/[a-zA-Z0-9_.\-\/]*)/g, (match, relativePath) => {
     if (!looksLikeFilePath(relativePath))
       return match;
-    const resolvedPath = resolve6(normalizedBase, relativePath);
+    const resolvedPath = resolve7(normalizedBase, relativePath);
     const relativePathFromBase = relative3(normalizedBase, resolvedPath);
-    if (relativePathFromBase.startsWith("..") || isAbsolute4(relativePathFromBase)) {
+    if (relativePathFromBase.startsWith("..") || isAbsolute5(relativePathFromBase)) {
       return match;
     }
     if (relativePath.endsWith("/") && !resolvedPath.endsWith(sep2)) {
@@ -62858,7 +62889,7 @@ function loadPluginSkillsAsCommands(plugins) {
       if (!existsSync18(skillMdPath))
         continue;
       try {
-        const content = readFileSync12(skillMdPath, "utf-8");
+        const content = readFileSync13(skillMdPath, "utf-8");
         const { data, body } = parseFrontmatter(content);
         const skillName = data.name || entry.name;
         const namespacedName = `${plugin.name}:${skillName}`;
@@ -62893,10 +62924,31 @@ $ARGUMENTS
 }
 
 // src/features/claude-code-plugin-loader/agent-loader.ts
-import { existsSync as existsSync19, readdirSync as readdirSync6, readFileSync as readFileSync13 } from "fs";
+import { existsSync as existsSync19, readdirSync as readdirSync6, readFileSync as readFileSync14 } from "fs";
 import { basename as basename5, join as join23 } from "path";
 init_logger();
 
+// src/shared/parse-tools-config.ts
+function parseToolsConfig(toolsValue) {
+  if (!toolsValue)
+    return;
+  let items;
+  if (typeof toolsValue === "string") {
+    items = toolsValue.split(",").map((t) => t.trim()).filter(Boolean);
+  } else if (Array.isArray(toolsValue)) {
+    items = toolsValue.filter((t) => typeof t === "string" && t.trim().length > 0).map((t) => t.trim());
+  } else {
+    return;
+  }
+  if (items.length === 0)
+    return;
+  const result = {};
+  for (const tool of items) {
+    result[tool.toLowerCase()] = true;
+  }
+  return result;
+}
+
 // src/shared/model-format-normalizer.ts
 function normalizeModelFormat(model) {
   if (!model) {
@@ -62951,18 +63003,6 @@ function mapClaudeModelToOpenCode(model) {
 }
 
 // src/features/claude-code-plugin-loader/agent-loader.ts
-function parseToolsConfig(toolsStr) {
-  if (!toolsStr)
-    return;
-  const tools = toolsStr.split(",").map((tool) => tool.trim()).filter(Boolean);
-  if (tools.length === 0)
-    return;
-  const result = {};
-  for (const tool of tools) {
-    result[tool.toLowerCase()] = true;
-  }
-  return result;
-}
 function loadPluginAgents(plugins) {
   const agents = {};
   for (const plugin of plugins) {
@@ -62976,7 +63016,7 @@ function loadPluginAgents(plugins) {
       const agentName = basename5(entry.name, ".md");
       const namespacedName = `${plugin.name}:${agentName}`;
       try {
-        const content = readFileSync13(agentPath, "utf-8");
+        const content = readFileSync14(agentPath, "utf-8");
         const { data, body } = parseFrontmatter(content);
         const originalDescription = data.description || "";
         const formattedDescription = `(plugin: ${plugin.name}) ${originalDescription}`;
@@ -63209,14 +63249,14 @@ async function loadPluginMcpServers(plugins) {
 
 // src/features/claude-code-plugin-loader/hook-loader.ts
 init_logger();
-import { existsSync as existsSync21, readFileSync as readFileSync14 } from "fs";
+import { existsSync as existsSync21, readFileSync as readFileSync15 } from "fs";
 function loadPluginHooksConfigs(plugins) {
   const configs = [];
   for (const plugin of plugins) {
     if (!plugin.hooksPath || !existsSync21(plugin.hooksPath))
       continue;
     try {
-      const content = readFileSync14(plugin.hooksPath, "utf-8");
+      const content = readFileSync15(plugin.hooksPath, "utf-8");
       let config = JSON.parse(content);
       config = resolvePluginPaths(config, plugin.installPath);
       configs.push(config);
@@ -63334,7 +63374,7 @@ var SessionCategoryRegistry = {
 init_plugin_identity();
 
 // src/shared/legacy-plugin-warning.ts
-import { existsSync as existsSync22, readFileSync as readFileSync15 } from "fs";
+import { existsSync as existsSync22, readFileSync as readFileSync16 } from "fs";
 import { join as join24 } from "path";
 init_plugin_identity();
 function getOpenCodeConfigPath(overrideConfigDir) {
@@ -63366,7 +63406,7 @@ function checkForLegacyPluginEntry(overrideConfigDir) {
     return { hasLegacyEntry: false, hasCanonicalEntry: false, legacyEntries: [], configPath: null };
   }
   try {
-    const content = readFileSync15(configPath, "utf-8");
+    const content = readFileSync16(configPath, "utf-8");
     const parseResult = parseJsoncSafe(content);
     if (!parseResult.data) {
       return { hasLegacyEntry: false, hasCanonicalEntry: false, legacyEntries: [], configPath };
@@ -63388,7 +63428,7 @@ function checkForLegacyPluginEntry(overrideConfigDir) {
 init_logger();
 
 // src/shared/migrate-legacy-plugin-entry.ts
-import { closeSync as closeSync2, existsSync as existsSync23, fsyncSync as fsyncSync2, openSync as openSync2, readFileSync as readFileSync16, renameSync as renameSync2, writeFileSync as writeFileSync4 } from "fs";
+import { closeSync as closeSync2, existsSync as existsSync23, fsyncSync as fsyncSync2, openSync as openSync2, readFileSync as readFileSync17, renameSync as renameSync2, writeFileSync as writeFileSync4 } from "fs";
 init_logger();
 init_plugin_identity();
 
@@ -63436,7 +63476,7 @@ function migrateLegacyPluginEntry(configPath) {
   if (!existsSync23(configPath))
     return false;
   try {
-    const content = readFileSync16(configPath, "utf-8");
+    const content = readFileSync17(configPath, "utf-8");
     if (!content.includes(LEGACY_PLUGIN_NAME))
       return false;
     const parseResult = parseJsoncSafe(content);
@@ -63530,7 +63570,7 @@ var FAILURE_RESET_WINDOW_MS = 5 * 60 * 1000;
 // src/features/run-continuation-state/constants.ts
 var CONTINUATION_MARKER_DIR = ".sisyphus/run-continuation";
 // src/features/run-continuation-state/storage.ts
-import { existsSync as existsSync24, mkdirSync as mkdirSync6, readFileSync as readFileSync17, rmSync, writeFileSync as writeFileSync5 } from "fs";
+import { existsSync as existsSync24, mkdirSync as mkdirSync6, readFileSync as readFileSync18, rmSync, writeFileSync as writeFileSync5 } from "fs";
 import { join as join25 } from "path";
 function getMarkerPath(directory, sessionID) {
   return join25(directory, CONTINUATION_MARKER_DIR, `${sessionID}.json`);
@@ -63540,7 +63580,7 @@ function readContinuationMarker(directory, sessionID) {
   if (!existsSync24(markerPath))
     return null;
   try {
-    const raw = readFileSync17(markerPath, "utf-8");
+    const raw = readFileSync18(markerPath, "utf-8");
     const parsed = JSON.parse(raw);
     if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
       return null;
@@ -63649,7 +63689,17 @@ function resolveRegisteredAgentName(name) {
     return;
   }
   const normalizedName = normalizeRegisteredAgentName(name);
-  return registeredAgentAliases.get(normalizedName) ?? normalizeStoredAgentName(name);
+  const directMatch = registeredAgentAliases.get(normalizedName);
+  if (directMatch !== undefined)
+    return directMatch;
+  const configKey = getAgentConfigKey(name);
+  const normalizedConfigKey = normalizeRegisteredAgentName(configKey);
+  if (normalizedConfigKey !== normalizedName) {
+    const aliasMatch = registeredAgentAliases.get(normalizedConfigKey);
+    if (aliasMatch !== undefined)
+      return aliasMatch;
+  }
+  return normalizeStoredAgentName(name);
 }
 var sessionAgentMap = new Map;
 function setSessionAgent(sessionID, agent) {
@@ -65426,7 +65476,7 @@ function generatePartId() {
   return `prt_${timestamp2}${random}`;
 }
 // src/hooks/session-recovery/storage/messages-reader.ts
-import { existsSync as existsSync25, readdirSync as readdirSync7, readFileSync as readFileSync18 } from "fs";
+import { existsSync as existsSync25, readdirSync as readdirSync7, readFileSync as readFileSync19 } from "fs";
 import { join as join26 } from "path";
 function readMessages(sessionID) {
   if (isSqliteBackend())
@@ -65439,7 +65489,7 @@ function readMessages(sessionID) {
     if (!file.endsWith(".json"))
       continue;
     try {
-      const content = readFileSync18(join26(messageDir, file), "utf-8");
+      const content = readFileSync19(join26(messageDir, file), "utf-8");
       messages.push(JSON.parse(content));
     } catch {
       continue;
@@ -65454,7 +65504,7 @@ function readMessages(sessionID) {
   });
 }
 // src/hooks/session-recovery/storage/parts-reader.ts
-import { existsSync as existsSync26, readdirSync as readdirSync8, readFileSync as readFileSync19 } from "fs";
+import { existsSync as existsSync26, readdirSync as readdirSync8, readFileSync as readFileSync20 } from "fs";
 import { join as join27 } from "path";
 
 // src/hooks/session-recovery/constants.ts
@@ -65474,7 +65524,7 @@ function readParts(messageID) {
     if (!file.endsWith(".json"))
       continue;
     try {
-      const content = readFileSync19(join27(partDir, file), "utf-8");
+      const content = readFileSync20(join27(partDir, file), "utf-8");
       parts.push(JSON.parse(content));
     } catch {
       continue;
@@ -65583,7 +65633,7 @@ function findEmptyMessageByIndex(sessionID, targetIndex) {
   return null;
 }
 // src/hooks/session-recovery/storage/empty-text.ts
-import { existsSync as existsSync28, readdirSync as readdirSync9, readFileSync as readFileSync20, writeFileSync as writeFileSync7 } from "fs";
+import { existsSync as existsSync28, readdirSync as readdirSync9, readFileSync as readFileSync21, writeFileSync as writeFileSync7 } from "fs";
 import { join as join29 } from "path";
 function replaceEmptyTextParts(messageID, replacementText) {
   if (isSqliteBackend()) {
@@ -65599,7 +65649,7 @@ function replaceEmptyTextParts(messageID, replacementText) {
       continue;
     try {
       const filePath = join29(partDir, file);
-      const content = readFileSync20(filePath, "utf-8");
+      const content = readFileSync21(filePath, "utf-8");
       const part = JSON.parse(content);
       if (part.type === "text") {
         const textPart = part;
@@ -65860,7 +65910,7 @@ async function prependThinkingPartAsync(client, sessionID, messageID, deps = thi
   }
 }
 // src/hooks/session-recovery/storage/thinking-strip.ts
-import { existsSync as existsSync30, readdirSync as readdirSync10, readFileSync as readFileSync21, unlinkSync as unlinkSync3 } from "fs";
+import { existsSync as existsSync30, readdirSync as readdirSync10, readFileSync as readFileSync22, unlinkSync as unlinkSync3 } from "fs";
 import { join as join31 } from "path";
 function stripThinkingParts(messageID) {
   if (isSqliteBackend()) {
@@ -65876,7 +65926,7 @@ function stripThinkingParts(messageID) {
       continue;
     try {
       const filePath = join31(partDir, file);
-      const content = readFileSync21(filePath, "utf-8");
+      const content = readFileSync22(filePath, "utf-8");
       const part = JSON.parse(content);
       if (THINKING_TYPES.has(part.type)) {
         unlinkSync3(filePath);
@@ -79894,7 +79944,7 @@ import { tmpdir as tmpdir4 } from "os";
 // src/hooks/comment-checker/downloader.ts
 import { existsSync as existsSync31, appendFileSync as appendFileSync2 } from "fs";
 import { join as join32 } from "path";
-import { homedir as homedir8, tmpdir as tmpdir3 } from "os";
+import { homedir as homedir9, tmpdir as tmpdir3 } from "os";
 import { createRequire } from "module";
 init_logger();
 init_plugin_identity();
@@ -79918,11 +79968,11 @@ var PLATFORM_MAP = {
 function getCacheDir2() {
   if (process.platform === "win32") {
     const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
-    const base2 = localAppData || join32(homedir8(), "AppData", "Local");
+    const base2 = localAppData || join32(homedir9(), "AppData", "Local");
     return join32(base2, CACHE_DIR_NAME, "bin");
   }
   const xdgCache = process.env.XDG_CACHE_HOME;
-  const base = xdgCache || join32(homedir8(), ".cache");
+  const base = xdgCache || join32(homedir9(), ".cache");
   return join32(base, CACHE_DIR_NAME, "bin");
 }
 function getBinaryName() {
@@ -80096,7 +80146,7 @@ async function runCommentChecker(input, cliPath, customPrompt) {
       stderr: "pipe"
     });
     let timeoutId = null;
-    const timeoutPromise = new Promise((resolve7) => {
+    const timeoutPromise = new Promise((resolve8) => {
       timeoutId = setTimeout(async () => {
         didTimeout = true;
         debugLog2("comment-checker timed out after 30s; sending SIGTERM");
@@ -80115,7 +80165,7 @@ async function runCommentChecker(input, cliPath, customPrompt) {
           await proc.exited;
         } catch {}
         clearTimeout(graceTimer);
-        resolve7("timeout");
+        resolve8("timeout");
       }, 30000);
     });
     try {
@@ -80448,12 +80498,12 @@ function createToolOutputTruncatorHook(ctx, options) {
   };
 }
 // src/hooks/directory-agents-injector/injector.ts
-import { readFileSync as readFileSync23 } from "fs";
+import { readFileSync as readFileSync24 } from "fs";
 import { dirname as dirname8 } from "path";
 
 // src/hooks/directory-agents-injector/finder.ts
 import { existsSync as existsSync34 } from "fs";
-import { dirname as dirname7, isAbsolute as isAbsolute5, join as join36, resolve as resolve7 } from "path";
+import { dirname as dirname7, isAbsolute as isAbsolute6, join as join36, resolve as resolve8 } from "path";
 
 // src/hooks/directory-agents-injector/constants.ts
 import { join as join35 } from "path";
@@ -80464,9 +80514,9 @@ var AGENTS_FILENAME = "AGENTS.md";
 function resolveFilePath2(rootDirectory, path6) {
   if (!path6)
     return null;
-  if (isAbsolute5(path6))
+  if (isAbsolute6(path6))
     return path6;
-  return resolve7(rootDirectory, path6);
+  return resolve8(rootDirectory, path6);
 }
 function findAgentsMdUp(input) {
   const found = [];
@@ -80495,7 +80545,7 @@ function findAgentsMdUp(input) {
 import {
   existsSync as existsSync35,
   mkdirSync as mkdirSync9,
-  readFileSync as readFileSync22,
+  readFileSync as readFileSync23,
   unlinkSync as unlinkSync4,
   writeFileSync as writeFileSync9
 } from "fs";
@@ -80507,7 +80557,7 @@ function createInjectedPathsStorage(storageDir) {
     if (!existsSync35(filePath))
       return new Set;
     try {
-      const content = readFileSync22(filePath, "utf-8");
+      const content = readFileSync23(filePath, "utf-8");
       const data = JSON.parse(content);
       return new Set(data.injectedPaths);
     } catch {
@@ -80565,7 +80615,7 @@ async function processFilePathForAgentsInjection(input) {
     if (cache.has(agentsDir))
       continue;
     try {
-      const content = readFileSync23(agentsPath, "utf-8");
+      const content = readFileSync24(agentsPath, "utf-8");
       const { result, truncated } = await input.truncator.truncate(input.sessionID, content);
       const truncationNotice = truncated ? `
 
@@ -80624,12 +80674,12 @@ function createDirectoryAgentsInjectorHook(ctx, modelCacheState) {
   };
 }
 // src/hooks/directory-readme-injector/injector.ts
-import { readFileSync as readFileSync24 } from "fs";
+import { readFileSync as readFileSync25 } from "fs";
 import { dirname as dirname10 } from "path";
 
 // src/hooks/directory-readme-injector/finder.ts
 import { existsSync as existsSync36 } from "fs";
-import { dirname as dirname9, isAbsolute as isAbsolute6, join as join39, resolve as resolve8 } from "path";
+import { dirname as dirname9, isAbsolute as isAbsolute7, join as join39, resolve as resolve9 } from "path";
 
 // src/hooks/directory-readme-injector/constants.ts
 import { join as join38 } from "path";
@@ -80640,9 +80690,9 @@ var README_FILENAME = "README.md";
 function resolveFilePath3(rootDirectory, path6) {
   if (!path6)
     return null;
-  if (isAbsolute6(path6))
+  if (isAbsolute7(path6))
     return path6;
-  return resolve8(rootDirectory, path6);
+  return resolve9(rootDirectory, path6);
 }
 function findReadmeMdUp(input) {
   const found = [];
@@ -80691,7 +80741,7 @@ async function processFilePathForReadmeInjection(input) {
     if (cache.has(readmeDir))
       continue;
     try {
-      const content = readFileSync24(readmePath, "utf-8");
+      const content = readFileSync25(readmePath, "utf-8");
       const { result, truncated } = await input.truncator.truncate(input.sessionID, content);
       const truncationNotice = truncated ? `
 
@@ -81023,7 +81073,7 @@ function incrementEmptyContentAttempt(autoCompactState, sessionID) {
 }
 
 // src/hooks/anthropic-context-window-limit-recovery/tool-result-storage.ts
-import { existsSync as existsSync38, readdirSync as readdirSync12, readFileSync as readFileSync25, writeFileSync as writeFileSync10 } from "fs";
+import { existsSync as existsSync38, readdirSync as readdirSync12, readFileSync as readFileSync26, writeFileSync as writeFileSync10 } from "fs";
 import { join as join40 } from "path";
 
 // src/hooks/anthropic-context-window-limit-recovery/message-storage-directory.ts
@@ -81060,7 +81110,7 @@ function findToolResultsBySize(sessionID) {
         continue;
       try {
         const partPath = join40(partDir, file2);
-        const content = readFileSync25(partPath, "utf-8");
+        const content = readFileSync26(partPath, "utf-8");
         const part = JSON.parse(content);
         if (part.type === "tool" && part.state?.output && !part.truncated) {
           results.push({
@@ -81087,7 +81137,7 @@ function truncateToolResult(partPath) {
     return { success: false };
   }
   try {
-    const content = readFileSync25(partPath, "utf-8");
+    const content = readFileSync26(partPath, "utf-8");
     const part = JSON.parse(content);
     if (!part.state?.output) {
       return { success: false };
@@ -81889,7 +81939,7 @@ async function executeCompact(sessionID, msg, autoCompactState, client, director
 }
 
 // src/hooks/anthropic-context-window-limit-recovery/pruning-deduplication.ts
-import { readdirSync as readdirSync13, readFileSync as readFileSync26 } from "fs";
+import { readdirSync as readdirSync13, readFileSync as readFileSync27 } from "fs";
 import { join as join41 } from "path";
 
 // src/hooks/anthropic-context-window-limit-recovery/pruning-types.ts
@@ -81926,7 +81976,7 @@ function readMessages2(sessionID) {
   try {
     const files = readdirSync13(messageDir).filter((f) => f.endsWith(".json"));
     for (const file2 of files) {
-      const content = readFileSync26(join41(messageDir, file2), "utf-8");
+      const content = readFileSync27(join41(messageDir, file2), "utf-8");
       const data = JSON.parse(content);
       if (data.parts) {
         messages.push(data);
@@ -82031,7 +82081,7 @@ function findToolOutput(messages, callID) {
 }
 
 // src/hooks/anthropic-context-window-limit-recovery/pruning-tool-output-truncation.ts
-import { existsSync as existsSync39, readdirSync as readdirSync14, readFileSync as readFileSync27 } from "fs";
+import { existsSync as existsSync39, readdirSync as readdirSync14, readFileSync as readFileSync28 } from "fs";
 import { join as join42 } from "path";
 init_logger();
 function getPartStorage() {
@@ -82068,7 +82118,7 @@ async function truncateToolOutputsByCallId(sessionID, callIds, client) {
         continue;
       const partPath = join42(partDir, file2);
       try {
-        const content = readFileSync27(partPath, "utf-8");
+        const content = readFileSync28(partPath, "utf-8");
         const part = JSON.parse(content);
         if (part.type !== "tool" || !part.callID)
           continue;
@@ -84299,7 +84349,7 @@ function getRuleInjectionFilePath(output) {
 import {
   existsSync as existsSync43,
   mkdirSync as mkdirSync11,
-  readFileSync as readFileSync28,
+  readFileSync as readFileSync29,
   writeFileSync as writeFileSync12,
   unlinkSync as unlinkSync6
 } from "fs";
@@ -84339,7 +84389,7 @@ function loadInjectedRules(sessionID) {
   if (!existsSync43(filePath))
     return { contentHashes: new Set, realPaths: new Set };
   try {
-    const content = readFileSync28(filePath, "utf-8");
+    const content = readFileSync29(filePath, "utf-8");
     const data = JSON.parse(content);
     return {
       contentHashes: new Set(data.injectedHashes),
@@ -84385,9 +84435,9 @@ function createSessionCacheStore() {
 }
 
 // src/hooks/rules-injector/injector.ts
-import { readFileSync as readFileSync29, statSync as statSync4 } from "fs";
-import { homedir as homedir9 } from "os";
-import { relative as relative5, resolve as resolve9 } from "path";
+import { readFileSync as readFileSync30, statSync as statSync4 } from "fs";
+import { homedir as homedir10 } from "os";
+import { relative as relative5, resolve as resolve10 } from "path";
 
 // src/hooks/rules-injector/project-root-finder.ts
 import { existsSync as existsSync44, statSync as statSync2 } from "fs";
@@ -84708,7 +84758,7 @@ function resolveFilePath4(workspaceDirectory, path6) {
     return null;
   if (path6.startsWith("/"))
     return path6;
-  return resolve9(workspaceDirectory, path6);
+  return resolve10(workspaceDirectory, path6);
 }
 function createRuleInjectionProcessor(deps) {
   const {
@@ -84716,9 +84766,9 @@ function createRuleInjectionProcessor(deps) {
     truncator,
     getSessionCache: getSessionCache3,
     ruleFinderOptions,
-    readFileSync: readRuleFileSync = readFileSync29,
+    readFileSync: readRuleFileSync = readFileSync30,
     statSync: statRuleSync = statSync4,
-    homedir: getHomeDir = homedir9,
+    homedir: getHomeDir = homedir10,
     shouldApplyRule: shouldApplyRuleImpl = shouldApplyRule,
     isDuplicateByRealPath: isDuplicateByRealPathImpl = isDuplicateByRealPath,
     createContentHash: createContentHashImpl = createContentHash,
@@ -85227,7 +85277,7 @@ import { join as join59 } from "path";
 // src/shared/migrate-legacy-config-file.ts
 init_logger();
 init_plugin_identity();
-import { existsSync as existsSync52, readFileSync as readFileSync36, renameSync as renameSync4, rmSync as rmSync2 } from "fs";
+import { existsSync as existsSync52, readFileSync as readFileSync37, renameSync as renameSync4, rmSync as rmSync2 } from "fs";
 import { join as join56, dirname as dirname16, basename as basename6 } from "path";
 function buildCanonicalPath(legacyPath) {
   const dir = dirname16(legacyPath);
@@ -85272,7 +85322,7 @@ function migrateLegacyConfigFile(legacyPath) {
   if (existsSync52(canonicalPath))
     return false;
   try {
-    const content = readFileSync36(legacyPath, "utf-8");
+    const content = readFileSync37(legacyPath, "utf-8");
     writeFileAtomically(canonicalPath, content);
     const archivedLegacyConfig = archiveLegacyConfigFile(legacyPath);
     log("[migrateLegacyConfigFile] Migrated legacy config to canonical path", {
@@ -85302,8 +85352,8 @@ function toReadableStream(stream) {
 function wrapNodeProcess(proc) {
   let resolveExited;
   let exitCode = null;
-  const exited = new Promise((resolve10) => {
-    resolveExited = resolve10;
+  const exited = new Promise((resolve11) => {
+    resolveExited = resolve11;
   });
   proc.on("exit", (code) => {
     exitCode = code ?? 1;
@@ -85394,8 +85444,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((resolve10) => {
-      timeoutId = setTimeout(() => resolve10("timeout"), BUN_INSTALL_TIMEOUT_MS);
+    const timeoutPromise = new Promise((resolve11) => {
+      timeoutId = setTimeout(() => resolve11("timeout"), BUN_INSTALL_TIMEOUT_MS);
     });
     const exitPromise = proc.exited.then(() => "completed");
     const result = await Promise.race([exitPromise, timeoutPromise]);
@@ -85790,7 +85840,7 @@ async function showSpinnerToast(ctx, version2, message) {
         duration: frameInterval + 50
       }
     }).catch(() => {});
-    await new Promise((resolve10) => setTimeout(resolve10, frameInterval));
+    await new Promise((resolve11) => setTimeout(resolve11, frameInterval));
   }
 }
 
@@ -85878,7 +85928,7 @@ v${latestVersion} available. Restart OpenCode to apply.` : "OpenCode is now on S
 import {
   existsSync as existsSync56,
   mkdirSync as mkdirSync13,
-  readFileSync as readFileSync38,
+  readFileSync as readFileSync39,
   writeFileSync as writeFileSync15,
   unlinkSync as unlinkSync9
 } from "fs";
@@ -85939,7 +85989,7 @@ function loadAgentUsageState(sessionID) {
   if (!existsSync56(filePath))
     return null;
   try {
-    const content = readFileSync38(filePath, "utf-8");
+    const content = readFileSync39(filePath, "utf-8");
     return JSON.parse(content);
   } catch {
     return null;
@@ -86212,7 +86262,7 @@ Each TODO item MUST include:
 
 | Wave | Tasks | Dispatch Command |
 |------|-------|------------------|
-| 1 | 1, 4 | \`task(category="...", load_skills=[...], run_in_background=false)\` \xD7 2 |
+| 1 | 1, 4 | \`task(category="...", load_skills=[...], run_in_background=true)\` \xD7 2 |
 | 2 | 2, 3, 5 | \`task(...)\` \xD7 3 after Wave 1 completes |
 | 3 | 6 | \`task(...)\` final integration |
 
@@ -86296,9 +86346,9 @@ Use these when they provide clear value based on the decision framework above:
 |----------|-------------|------------|
 | explore agent | Need codebase patterns you don't have | \`task(subagent_type="explore", load_skills=[], run_in_background=true, ...)\` |
 | librarian agent | External library docs, OSS examples | \`task(subagent_type="librarian", load_skills=[], run_in_background=true, ...)\` |
-| oracle agent | Stuck on architecture/debugging after 2+ attempts | \`task(subagent_type="oracle", load_skills=[], ...)\` |
-| plan agent | Complex multi-step with dependencies (5+ steps) | \`task(subagent_type="plan", load_skills=[], ...)\` |
-| task category | Specialized work matching a category | \`task(category="...", load_skills=[...])\` |
+| oracle agent | Stuck on architecture/debugging after 2+ attempts | \`task(subagent_type="oracle", load_skills=[], run_in_background=false, ...)\` |
+| plan agent | Complex multi-step with dependencies (5+ steps) | \`task(subagent_type="plan", load_skills=[], run_in_background=false, ...)\` |
+| task category | Specialized work matching a category | \`task(category="...", load_skills=[...], run_in_background=true)\` |
 
 <tool_usage_rules>
 - Prefer tools over internal knowledge for fresh or user-specific data
@@ -86538,7 +86588,7 @@ TELL THE USER WHAT AGENTS YOU WILL LEVERAGE NOW TO SATISFY USER'S REQUEST.
 | Architecture decision needed | MUST call plan agent |
 
 \`\`\`
-task(subagent_type="plan", load_skills=[], prompt="<gathered context + user request>")
+task(subagent_type="plan", load_skills=[], run_in_background=false, prompt="<gathered context + user request>")
 \`\`\`
 
 ### SESSION CONTINUITY WITH PLAN AGENT (CRITICAL)
@@ -86547,9 +86597,9 @@ task(subagent_type="plan", load_skills=[], prompt="<gathered context + user requ
 
 | Scenario | Action |
 |----------|--------|
-| Plan agent asks clarifying questions | \`task(session_id="{returned_session_id}", load_skills=[], prompt="<your answer>")\` |
-| Need to refine the plan | \`task(session_id="{returned_session_id}", load_skills=[], prompt="Please adjust: <feedback>")\` |
-| Plan needs more detail | \`task(session_id="{returned_session_id}", load_skills=[], prompt="Add more detail to Task N")\` |
+| Plan agent asks clarifying questions | \`task(session_id="{returned_session_id}", load_skills=[], run_in_background=false, prompt="<your answer>")\` |
+| Need to refine the plan | \`task(session_id="{returned_session_id}", load_skills=[], run_in_background=false, prompt="Please adjust: <feedback>")\` |
+| Plan needs more detail | \`task(session_id="{returned_session_id}", load_skills=[], run_in_background=false, prompt="Add more detail to Task N")\` |
 
 **FAILURE TO CALL PLAN AGENT = INCOMPLETE WORK.**
 
@@ -86565,10 +86615,10 @@ task(subagent_type="plan", load_skills=[], prompt="<gathered context + user requ
 |-----------|--------|-----|
 | Codebase exploration | task(subagent_type="explore", load_skills=[], run_in_background=true) | Parallel, context-efficient |
 | Documentation lookup | task(subagent_type="librarian", load_skills=[], run_in_background=true) | Specialized knowledge |
-| Planning | task(subagent_type="plan", load_skills=[]) | Parallel task graph + structured TODO list |
-| Hard problem (conventional) | task(subagent_type="oracle", load_skills=[]) | Architecture, debugging, complex logic |
-| Hard problem (non-conventional) | task(category="artistry", load_skills=[...]) | Different approach needed |
-| Implementation | task(category="...", load_skills=[...]) | Domain-optimized models |
+| Planning | task(subagent_type="plan", load_skills=[], run_in_background=false) | Parallel task graph + structured TODO list |
+| Hard problem (conventional) | task(subagent_type="oracle", load_skills=[], run_in_background=false) | Architecture, debugging, complex logic |
+| Hard problem (non-conventional) | task(category="artistry", load_skills=[...], run_in_background=true) | Different approach needed |
+| Implementation | task(category="...", load_skills=[...], run_in_background=true) | Domain-optimized models |
 
 **YOU SHOULD ONLY DO IT YOURSELF WHEN:**
 - Task is trivially simple (1-2 lines, obvious change)
@@ -86767,7 +86817,7 @@ TELL THE USER WHAT AGENTS YOU WILL LEVERAGE NOW TO SATISFY USER'S REQUEST.
 | Architecture decision needed | MUST call plan agent |
 
 \`\`\`
-task(subagent_type="plan", load_skills=[], prompt="<gathered context + user request>")
+task(subagent_type="plan", load_skills=[], run_in_background=false, prompt="<gathered context + user request>")
 \`\`\`
 
 **WHY PLAN AGENT IS MANDATORY:**
@@ -86782,9 +86832,9 @@ task(subagent_type="plan", load_skills=[], prompt="<gathered context + user requ
 
 | Scenario | Action |
 |----------|--------|
-| Plan agent asks clarifying questions | \`task(session_id="{returned_session_id}", load_skills=[], prompt="<your answer>")\` |
-| Need to refine the plan | \`task(session_id="{returned_session_id}", load_skills=[], prompt="Please adjust: <feedback>")\` |
-| Plan needs more detail | \`task(session_id="{returned_session_id}", load_skills=[], prompt="Add more detail to Task N")\` |
+| Plan agent asks clarifying questions | \`task(session_id="{returned_session_id}", load_skills=[], run_in_background=false, prompt="<your answer>")\` |
+| Need to refine the plan | \`task(session_id="{returned_session_id}", load_skills=[], run_in_background=false, prompt="Please adjust: <feedback>")\` |
+| Plan needs more detail | \`task(session_id="{returned_session_id}", load_skills=[], run_in_background=false, prompt="Add more detail to Task N")\` |
 
 **WHY SESSION_ID IS CRITICAL:**
 - Plan agent retains FULL conversation context
@@ -86794,10 +86844,10 @@ task(subagent_type="plan", load_skills=[], prompt="<gathered context + user requ
 
 \`\`\`
 // WRONG: Starting fresh loses all context
-task(subagent_type="plan", load_skills=[], prompt="Here's more info...")
+task(subagent_type="plan", load_skills=[], run_in_background=false, prompt="Here's more info...")
 
 // CORRECT: Resume preserves everything
-task(session_id="ses_abc123", load_skills=[], prompt="Here's my answer to your question: ...")
+task(session_id="ses_abc123", load_skills=[], run_in_background=false, prompt="Here's my answer to your question: ...")
 \`\`\`
 
 **FAILURE TO CALL PLAN AGENT = INCOMPLETE WORK.**
@@ -86812,21 +86862,21 @@ task(session_id="ses_abc123", load_skills=[], prompt="Here's my answer to your q
 |-----------|--------|-----|
 | Codebase exploration | task(subagent_type="explore", load_skills=[], run_in_background=true) | Parallel, context-efficient |
 | Documentation lookup | task(subagent_type="librarian", load_skills=[], run_in_background=true) | Specialized knowledge |
-| Planning | task(subagent_type="plan", load_skills=[]) | Parallel task graph + structured TODO list |
-| Hard problem (conventional) | task(subagent_type="oracle", load_skills=[]) | Architecture, debugging, complex logic |
-| Hard problem (non-conventional) | task(category="artistry", load_skills=[...]) | Different approach needed |
-| Implementation | task(category="...", load_skills=[...]) | Domain-optimized models |
+| Planning | task(subagent_type="plan", load_skills=[], run_in_background=false) | Parallel task graph + structured TODO list |
+| Hard problem (conventional) | task(subagent_type="oracle", load_skills=[], run_in_background=false) | Architecture, debugging, complex logic |
+| Hard problem (non-conventional) | task(category="artistry", load_skills=[...], run_in_background=true) | Different approach needed |
+| Implementation | task(category="...", load_skills=[...], run_in_background=true) | Domain-optimized models |
 
 **CATEGORY + SKILL DELEGATION:**
 \`\`\`
 // Frontend work
-task(category="visual-engineering", load_skills=["frontend-ui-ux"])
+task(category="visual-engineering", load_skills=["frontend-ui-ux"], run_in_background=true)
 
 // Complex logic
-task(category="ultrabrain", load_skills=["typescript-programmer"])
+task(category="ultrabrain", load_skills=["typescript-programmer"], run_in_background=true)
 
 // Quick fixes
-task(category="quick", load_skills=["git-master"])
+task(category="quick", load_skills=["git-master"], run_in_background=true)
 \`\`\`
 
 **YOU SHOULD ONLY DO IT YOURSELF WHEN:**
@@ -87232,7 +87282,7 @@ function createNonInteractiveEnvHook(_ctx) {
 import {
   existsSync as existsSync57,
   mkdirSync as mkdirSync14,
-  readFileSync as readFileSync39,
+  readFileSync as readFileSync40,
   writeFileSync as writeFileSync16,
   unlinkSync as unlinkSync10
 } from "fs";
@@ -87259,7 +87309,7 @@ function loadInteractiveBashSessionState(sessionID) {
   if (!existsSync57(filePath))
     return null;
   try {
-    const content = readFileSync39(filePath, "utf-8");
+    const content = readFileSync40(filePath, "utf-8");
     const serialized = JSON.parse(content);
     return {
       sessionID: serialized.sessionID,
@@ -87794,7 +87844,7 @@ var ULTRAWORK_MAX_ITERATIONS = 500;
 var DEFAULT_COMPLETION_PROMISE = "DONE";
 var ULTRAWORK_VERIFICATION_PROMISE = "VERIFIED";
 // src/hooks/ralph-loop/storage.ts
-import { existsSync as existsSync58, readFileSync as readFileSync40, writeFileSync as writeFileSync17, unlinkSync as unlinkSync11, mkdirSync as mkdirSync15 } from "fs";
+import { existsSync as existsSync58, readFileSync as readFileSync41, writeFileSync as writeFileSync17, unlinkSync as unlinkSync11, mkdirSync as mkdirSync15 } from "fs";
 import { dirname as dirname17, join as join64 } from "path";
 function getStateFilePath(directory, customPath) {
   return customPath ? join64(directory, customPath) : join64(directory, DEFAULT_STATE_FILE);
@@ -87805,7 +87855,7 @@ function readState(directory, customPath) {
     return null;
   }
   try {
-    const content = readFileSync40(filePath, "utf-8");
+    const content = readFileSync41(filePath, "utf-8");
     const { data, body } = parseFrontmatter(content);
     const active = data.active;
     const iteration = data.iteration;
@@ -88224,9 +88274,10 @@ async function handleDetectedCompletion(ctx, input) {
 
 // src/hooks/ralph-loop/completion-promise-detector.ts
 init_logger();
-import { existsSync as existsSync59, readFileSync as readFileSync41 } from "fs";
+import { existsSync as existsSync59, readFileSync as readFileSync42 } from "fs";
 
 // src/hooks/ralph-loop/oracle-verification-detector.ts
+init_agent_display_names();
 var AGENT_LINE_PATTERN = /^Agent:[ \t]*(\S+)$/im;
 var PROMISE_TAG_PATTERN = /<promise>[ \t]*(\S+?)[ \t]*<\/promise>/is;
 var TASK_METADATA_PATTERN = /<task_metadata>[ \t]*([\s\S]*?)[ \t]*<\/task_metadata>/is;
@@ -88268,13 +88319,13 @@ function isOracleVerified(text) {
   if (!evidence) {
     return false;
   }
-  const isOracleAgent = evidence.agent.toLowerCase() === "oracle";
+  const isOracleAgent = stripInvisibleAgentCharacters(evidence.agent).toLowerCase() === "oracle";
   const isVerifiedPromise = evidence.promise === ULTRAWORK_VERIFICATION_PROMISE;
   return isOracleAgent && isVerifiedPromise;
 }
 function extractOracleSessionID(text) {
   const evidence = parseOracleVerificationEvidence(text);
-  if (!evidence || evidence.agent.toLowerCase() !== "oracle") {
+  if (!evidence || stripInvisibleAgentCharacters(evidence.agent).toLowerCase() !== "oracle") {
     return;
   }
   return evidence.sessionID;
@@ -88320,7 +88371,7 @@ function detectCompletionInTranscript(transcriptPath, promise2, startedAt) {
   try {
     if (!existsSync59(transcriptPath))
       return false;
-    const content = readFileSync41(transcriptPath, "utf-8");
+    const content = readFileSync42(transcriptPath, "utf-8");
     const pattern = buildPromisePattern(promise2);
     const lines = content.split(`
 `).filter((line) => line.trim());
@@ -89042,7 +89093,7 @@ function findSlashCommandPartIndex(parts) {
 import { dirname as dirname20 } from "path";
 // src/features/opencode-skill-loader/loader.ts
 import { join as join67 } from "path";
-import { homedir as homedir12 } from "os";
+import { homedir as homedir13 } from "os";
 
 // src/features/opencode-skill-loader/skill-definition-record.ts
 function skillsToCommandDefinitionRecord(skills) {
@@ -89131,7 +89182,7 @@ async function loadSkillFromPath(options) {
     const frontmatterMcp = parseSkillMcpConfigFromFrontmatter(content);
     const mcpJsonMcp = await loadMcpJsonFromDir(options.resolvedPath);
     const mcpConfig = mcpJsonMcp || frontmatterMcp;
-    const baseName = data.name || options.defaultName;
+    const baseName = String(data.name || options.defaultName);
     const skillName = namePrefix ? `${namePrefix}/${baseName}` : baseName;
     const originalDescription = data.description || "";
     const isOpencodeSource = options.scope === "opencode" || options.scope === "opencode-project";
@@ -89285,7 +89336,7 @@ async function loadProjectAgentsSkills(directory) {
   return skillsToCommandDefinitionRecord(deduplicateSkillsByName(allSkills.flat()));
 }
 async function loadGlobalAgentsSkills() {
-  const agentsGlobalDir = join67(homedir12(), ".agents", "skills");
+  const agentsGlobalDir = join67(homedir13(), ".agents", "skills");
   const skills = await loadSkillsFromDir({ skillsDir: agentsGlobalDir, scope: "user" });
   return skillsToCommandDefinitionRecord(skills);
 }
@@ -89356,7 +89407,7 @@ async function discoverProjectAgentsSkills(directory) {
   return deduplicateSkillsByName(allSkills.flat());
 }
 async function discoverGlobalAgentsSkills() {
-  const agentsGlobalDir = join67(homedir12(), ".agents", "skills");
+  const agentsGlobalDir = join67(homedir13(), ".agents", "skills");
   return loadSkillsFromDir({ skillsDir: agentsGlobalDir, scope: "user" });
 }
 // src/features/opencode-skill-loader/merger/builtin-skill-converter.ts
@@ -89383,9 +89434,9 @@ function builtinToLoadedSkill(builtin) {
 }
 
 // src/features/opencode-skill-loader/merger/config-skill-entry-loader.ts
-import { existsSync as existsSync60, readFileSync as readFileSync42 } from "fs";
-import { dirname as dirname18, isAbsolute as isAbsolute7, resolve as resolve10 } from "path";
-import { homedir as homedir13 } from "os";
+import { existsSync as existsSync60, readFileSync as readFileSync43 } from "fs";
+import { dirname as dirname18, isAbsolute as isAbsolute8, resolve as resolve11 } from "path";
+import { homedir as homedir14 } from "os";
 init_logger();
 function resolveFilePath5(from, configDir) {
   let filePath = from;
@@ -89393,19 +89444,19 @@ function resolveFilePath5(from, configDir) {
     filePath = filePath.slice(6, -1);
   }
   if (filePath.startsWith("~/")) {
-    return resolve10(homedir13(), filePath.slice(2));
+    return resolve11(homedir14(), filePath.slice(2));
   }
-  if (isAbsolute7(filePath)) {
+  if (isAbsolute8(filePath)) {
     return filePath;
   }
   const baseDir = configDir || process.cwd();
-  return resolve10(baseDir, filePath);
+  return resolve11(baseDir, filePath);
 }
 function loadSkillFromFile(filePath) {
   try {
     if (!existsSync60(filePath))
       return null;
-    const content = readFileSync42(filePath, "utf-8");
+    const content = readFileSync43(filePath, "utf-8");
     const { data, body } = parseFrontmatter(content);
     return { template: body, metadata: data };
   } catch {
@@ -92459,13 +92510,13 @@ async function getAllSkills(options) {
   return allSkills;
 }
 // src/features/opencode-skill-loader/loaded-skill-template-extractor.ts
-import { readFileSync as readFileSync43 } from "fs";
+import { readFileSync as readFileSync44 } from "fs";
 function extractSkillTemplate(skill) {
   if (skill.scope === "config" && skill.definition.template) {
     return skill.definition.template;
   }
   if (skill.path) {
-    const content = readFileSync43(skill.path, "utf-8");
+    const content = readFileSync44(skill.path, "utf-8");
     const { body } = parseFrontmatter(content);
     return body.trim();
   }
@@ -92829,6 +92880,10 @@ var NotificationConfigSchema = exports_external.object({
 var McpNameSchema = exports_external.enum(["websearch", "context7", "grep_app"]);
 var AnyMcpNameSchema = exports_external.string().min(1);
 
+// src/config/schema/agent-definitions.ts
+var AgentDefinitionPathSchema = exports_external.string().min(1);
+var AgentDefinitionsConfigSchema = exports_external.array(AgentDefinitionPathSchema).optional();
+
 // src/config/schema/openclaw.ts
 var OpenClawGatewaySchema = exports_external.object({
   type: exports_external.enum(["http", "command"]).default("http"),
@@ -92970,6 +93025,7 @@ var OhMyOpenCodeConfigSchema = exports_external.object({
   $schema: exports_external.string().optional(),
   new_task_system_enabled: exports_external.boolean().optional(),
   default_run_agent: exports_external.string().optional(),
+  agent_definitions: AgentDefinitionsConfigSchema,
   disabled_mcps: exports_external.array(AnyMcpNameSchema).optional(),
   disabled_agents: exports_external.array(exports_external.string()).optional(),
   disabled_skills: exports_external.array(BuiltinSkillNameSchema).optional(),
@@ -93169,20 +93225,20 @@ async function resolveMultipleSkillsAsync(skillNames, options) {
 // src/features/opencode-skill-loader/config-source-discovery.ts
 var import_picomatch2 = __toESM(require_picomatch2(), 1);
 import { promises as fs18 } from "fs";
-import { homedir as homedir14 } from "os";
-import { dirname as dirname19, extname, isAbsolute as isAbsolute8, join as join68, relative as relative6 } from "path";
+import { homedir as homedir15 } from "os";
+import { dirname as dirname19, extname, isAbsolute as isAbsolute9, join as join68, relative as relative6 } from "path";
 var MAX_RECURSIVE_DEPTH = 10;
 function isHttpUrl(path12) {
   return path12.startsWith("http://") || path12.startsWith("https://");
 }
 function toAbsolutePath(path12, configDir) {
   if (path12 === "~") {
-    return homedir14();
+    return homedir15();
   }
   if (path12.startsWith("~/")) {
-    return join68(homedir14(), path12.slice(2));
+    return join68(homedir15(), path12.slice(2));
   }
-  if (isAbsolute8(path12)) {
+  if (isAbsolute9(path12)) {
     return path12;
   }
   return join68(configDir, path12);
@@ -93255,7 +93311,7 @@ async function discoverConfigSourceSkills(options) {
   return deduplicateSkillsByName(loadedBySource.flat());
 }
 // src/tools/slashcommand/command-discovery.ts
-import { existsSync as existsSync61, readdirSync as readdirSync16, readFileSync as readFileSync44, statSync as statSync6 } from "fs";
+import { existsSync as existsSync61, readdirSync as readdirSync16, readFileSync as readFileSync45, statSync as statSync6 } from "fs";
 import { basename as basename8, join as join69 } from "path";
 // src/features/builtin-commands/templates/init-deep.ts
 var INIT_DEEP_TEMPLATE = `# /init-deep
@@ -94816,7 +94872,7 @@ function discoverCommandsFromDir(commandsDir, scope, prefix = "") {
     const baseCommandName = basename8(entry.name, ".md");
     const commandName = prefix ? `${prefix}${NESTED_COMMAND_SEPARATOR}${baseCommandName}` : baseCommandName;
     try {
-      const content = readFileSync44(commandPath, "utf-8");
+      const content = readFileSync45(commandPath, "utf-8");
       const { data, body } = parseFrontmatter(content);
       const isOpencodeSource = scope === "opencode" || scope === "opencode-project";
       const metadata = {
@@ -95355,7 +95411,7 @@ var NOTEPAD_DIR = "notepads";
 var NOTEPAD_BASE_PATH = `${BOULDER_DIR}/${NOTEPAD_DIR}`;
 var PROMETHEUS_PLANS_DIR = ".sisyphus/plans";
 // src/features/boulder-state/storage.ts
-import { existsSync as existsSync62, readFileSync as readFileSync45, writeFileSync as writeFileSync18, mkdirSync as mkdirSync16, readdirSync as readdirSync17 } from "fs";
+import { existsSync as existsSync62, readFileSync as readFileSync46, writeFileSync as writeFileSync18, mkdirSync as mkdirSync16, readdirSync as readdirSync17 } from "fs";
 import { dirname as dirname21, join as join70, basename as basename9 } from "path";
 var RESERVED_KEYS = new Set(["__proto__", "prototype", "constructor"]);
 function getBoulderFilePath(directory) {
@@ -95367,7 +95423,7 @@ function readBoulderState(directory) {
     return null;
   }
   try {
-    const content = readFileSync45(filePath, "utf-8");
+    const content = readFileSync46(filePath, "utf-8");
     const parsed = JSON.parse(content);
     if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
       return null;
@@ -95506,7 +95562,7 @@ function getPlanProgress(planPath) {
     return { total: 0, completed: 0, isComplete: true };
   }
   try {
-    const content = readFileSync45(planPath, "utf-8");
+    const content = readFileSync46(planPath, "utf-8");
     const lines = content.split(/\r?\n/);
     const hasStructuredSections = lines.some((line) => TODO_HEADING_PATTERN.test(line) || FINAL_VERIFICATION_HEADING_PATTERN.test(line));
     if (hasStructuredSections) {
@@ -95582,7 +95638,7 @@ function createBoulderState(planPath, sessionId, agent, worktreePath) {
   };
 }
 // src/features/boulder-state/top-level-task.ts
-import { existsSync as existsSync63, readFileSync as readFileSync46 } from "fs";
+import { existsSync as existsSync63, readFileSync as readFileSync47 } from "fs";
 var TODO_HEADING_PATTERN2 = /^##\s+TODOs\b/i;
 var FINAL_VERIFICATION_HEADING_PATTERN2 = /^##\s+Final Verification Wave\b/i;
 var SECOND_LEVEL_HEADING_PATTERN2 = /^##\s+/;
@@ -95609,7 +95665,7 @@ function readCurrentTopLevelTask(planPath) {
     return null;
   }
   try {
-    const content = readFileSync46(planPath, "utf-8");
+    const content = readFileSync47(planPath, "utf-8");
     const lines = content.split(/\r?\n/);
     let section = "other";
     for (const line of lines) {
@@ -95678,11 +95734,11 @@ function isPrometheusAgent(agentName) {
 }
 
 // src/hooks/prometheus-md-only/path-policy.ts
-import { relative as relative7, resolve as resolve11, isAbsolute as isAbsolute9 } from "path";
+import { relative as relative7, resolve as resolve12, isAbsolute as isAbsolute10 } from "path";
 function isAllowedFile(filePath, workspaceRoot) {
-  const resolved = resolve11(workspaceRoot, filePath);
+  const resolved = resolve12(workspaceRoot, filePath);
   const rel = relative7(workspaceRoot, resolved);
-  if (rel.startsWith("..") || isAbsolute9(rel)) {
+  if (rel.startsWith("..") || isAbsolute10(rel)) {
     return false;
   }
   if (!/\.sisyphus[/\\]/i.test(rel)) {
@@ -96218,7 +96274,7 @@ function isAbortError(error48) {
 }
 
 // src/hooks/atlas/session-last-agent.ts
-import { readFileSync as readFileSync47, readdirSync as readdirSync18 } from "fs";
+import { readFileSync as readFileSync48, readdirSync as readdirSync18 } from "fs";
 import { join as join71 } from "path";
 var defaultSessionLastAgentDeps = {
   getMessageDir,
@@ -96267,7 +96323,7 @@ async function getLastAgentFromSession(sessionID, client, deps = {}) {
   try {
     const messages = readdirSync18(messageDir).filter((fileName) => fileName.endsWith(".json")).map((fileName) => {
       try {
-        const content = readFileSync47(join71(messageDir, fileName), "utf-8");
+        const content = readFileSync48(join71(messageDir, fileName), "utf-8");
         const parsed = JSON.parse(content);
         return {
           fileName,
@@ -97138,7 +97194,7 @@ async function resolveFallbackTrackedSessionId(input) {
 }
 
 // src/hooks/atlas/final-wave-plan-state.ts
-import { existsSync as existsSync64, readFileSync as readFileSync48 } from "fs";
+import { existsSync as existsSync64, readFileSync as readFileSync49 } from "fs";
 var TODO_HEADING_PATTERN3 = /^##\s+TODOs\b/i;
 var FINAL_VERIFICATION_HEADING_PATTERN3 = /^##\s+Final Verification Wave\b/i;
 var SECOND_LEVEL_HEADING_PATTERN3 = /^##\s+/;
@@ -97150,7 +97206,7 @@ function readFinalWavePlanState(planPath) {
     return null;
   }
   try {
-    const content = readFileSync48(planPath, "utf-8");
+    const content = readFileSync49(planPath, "utf-8");
     const lines = content.split(/\r?\n/);
     let section = "other";
     let pendingImplementationTaskCount = 0;
@@ -98086,6 +98142,7 @@ function trackAssistantOutput(state3, messageID) {
 init_logger();
 
 // src/hooks/compaction-context-injector/recovery-prompt-config.ts
+init_agent_display_names();
 function isCompactionAgent4(agent) {
   return agent?.trim().toLowerCase() === "compaction";
 }
@@ -98119,7 +98176,7 @@ function createExpectedRecoveryPromptConfig(checkpoint, currentPromptConfig) {
 }
 function isPromptConfigRecovered(actualPromptConfig, expectedPromptConfig) {
   const actualAgent = actualPromptConfig.agent;
-  const agentMatches = typeof actualAgent === "string" && !isCompactionAgent4(actualAgent) && actualAgent.toLowerCase() === expectedPromptConfig.agent.toLowerCase();
+  const agentMatches = typeof actualAgent === "string" && !isCompactionAgent4(actualAgent) && stripInvisibleAgentCharacters(actualAgent).toLowerCase() === stripInvisibleAgentCharacters(expectedPromptConfig.agent).toLowerCase();
   return agentMatches && matchesExpectedModel(actualPromptConfig.model, expectedPromptConfig.model) && matchesExpectedTools(actualPromptConfig.tools, expectedPromptConfig.tools);
 }
 
@@ -99133,7 +99190,8 @@ var PARTIAL_STRING_ARRAY_KEYS = new Set([
   "disabled_hooks",
   "disabled_commands",
   "disabled_tools",
-  "mcp_env_allowlist"
+  "mcp_env_allowlist",
+  "agent_definitions"
 ]);
 function parseConfigPartially(rawConfig) {
   const fullResult = OhMyOpenCodeConfigSchema.safeParse(rawConfig);
@@ -99205,6 +99263,12 @@ function mergeConfigs(base, override) {
     ...override,
     agents: deepMerge(base.agents, override.agents),
     categories: deepMerge(base.categories, override.categories),
+    agent_definitions: [
+      ...new Set([
+        ...base.agent_definitions ?? [],
+        ...override.agent_definitions ?? []
+      ])
+    ],
     disabled_agents: [
       ...new Set([
         ...base.disabled_agents ?? [],
@@ -99285,10 +99349,16 @@ function loadPluginConfig(directory, ctx) {
   }
   const userConfig = loadConfigFromPath2(userConfigPath, ctx);
   const userGitMasterOverrides = loadExplicitGitMasterOverrides(userConfigPath);
+  if (userConfig?.agent_definitions) {
+    userConfig.agent_definitions = resolveAgentDefinitionPaths(userConfig.agent_definitions, configDir, null);
+  }
   let config2 = userConfig ?? OhMyOpenCodeConfigSchema.parse({});
   const defaultGitMaster = OhMyOpenCodeConfigSchema.parse({}).git_master;
   const projectConfig = loadConfigFromPath2(projectConfigPath, ctx);
   const projectGitMasterOverrides = loadExplicitGitMasterOverrides(projectConfigPath);
+  if (projectConfig?.agent_definitions) {
+    projectConfig.agent_definitions = resolveAgentDefinitionPaths(projectConfig.agent_definitions, projectBasePath, directory);
+  }
   if (projectConfig) {
     config2 = mergeConfigs(config2, projectConfig);
   }
@@ -100605,7 +100675,7 @@ function createRuntimeFallbackHook(ctx, options) {
 }
 // src/hooks/write-existing-file-guard/hook.ts
 import { existsSync as existsSync67, realpathSync as realpathSync7 } from "fs";
-import { basename as basename11, dirname as dirname23, isAbsolute as isAbsolute10, join as join73, normalize as normalize2, relative as relative8, resolve as resolve12 } from "path";
+import { basename as basename11, dirname as dirname23, isAbsolute as isAbsolute11, join as join73, normalize as normalize2, relative as relative8, resolve as resolve13 } from "path";
 
 // src/hooks/write-existing-file-guard/tool-execute-before-handler.ts
 import { existsSync as existsSync66 } from "fs";
@@ -100763,11 +100833,11 @@ function getPathFromArgs(args) {
   return args?.filePath ?? args?.path ?? args?.file_path;
 }
 function resolveInputPath(ctx, inputPath) {
-  return normalize2(isAbsolute10(inputPath) ? inputPath : resolve12(ctx.directory, inputPath));
+  return normalize2(isAbsolute11(inputPath) ? inputPath : resolve13(ctx.directory, inputPath));
 }
 function isPathInsideDirectory(pathToCheck, directory) {
   const relativePath = relative8(directory, pathToCheck);
-  return relativePath === "" || !relativePath.startsWith("..") && !isAbsolute10(relativePath);
+  return relativePath === "" || !relativePath.startsWith("..") && !isAbsolute11(relativePath);
 }
 function toCanonicalPath2(absolutePath) {
   let canonicalPath = absolutePath;
@@ -102056,7 +102126,7 @@ init_logger();
 init_plugin_identity();
 
 // src/hooks/legacy-plugin-toast/auto-migrate.ts
-import { existsSync as existsSync68, readFileSync as readFileSync50 } from "fs";
+import { existsSync as existsSync68, readFileSync as readFileSync51 } from "fs";
 import { join as join74 } from "path";
 init_plugin_identity();
 function detectOpenCodeConfigPath(overrideConfigDir) {
@@ -102081,7 +102151,7 @@ function autoMigrateLegacyPluginEntry(overrideConfigDir) {
   if (!configPath)
     return { migrated: false, from: null, to: null, configPath: null };
   try {
-    const content = readFileSync50(configPath, "utf-8");
+    const content = readFileSync51(configPath, "utf-8");
     const parseResult = parseJsoncSafe(content);
     if (!parseResult.data?.plugin)
       return { migrated: false, from: null, to: null, configPath };
@@ -102484,13 +102554,13 @@ var DEFAULT_MAX_SYMBOLS = 200;
 var DEFAULT_MAX_DIAGNOSTICS = 200;
 var DEFAULT_MAX_DIRECTORY_FILES = 50;
 // src/tools/lsp/server-config-loader.ts
-import { existsSync as existsSync69, readFileSync as readFileSync51 } from "fs";
+import { existsSync as existsSync69, readFileSync as readFileSync52 } from "fs";
 import { join as join75 } from "path";
 function loadJsonFile(path13) {
   if (!existsSync69(path13))
     return null;
   try {
-    return parseJsonc(readFileSync51(path13, "utf-8"));
+    return parseJsonc(readFileSync52(path13, "utf-8"));
   } catch {
     return null;
   }
@@ -102700,8 +102770,8 @@ function validateCwd(cwd) {
 function wrapNodeProcess2(proc) {
   let resolveExited;
   let exitCode = null;
-  const exitedPromise = new Promise((resolve13) => {
-    resolveExited = resolve13;
+  const exitedPromise = new Promise((resolve14) => {
+    resolveExited = resolve14;
   });
   proc.on("exit", (code) => {
     exitCode = code ?? 1;
@@ -102721,9 +102791,9 @@ function wrapNodeProcess2(proc) {
       nodeStream.on("data", (chunk) => {
         const uint8 = new Uint8Array(chunk);
         if (waitingResolve) {
-          const resolve13 = waitingResolve;
+          const resolve14 = waitingResolve;
           waitingResolve = null;
-          resolve13({ done: false, value: uint8 });
+          resolve14({ done: false, value: uint8 });
         } else {
           chunks.push(uint8);
         }
@@ -102731,17 +102801,17 @@ function wrapNodeProcess2(proc) {
       nodeStream.on("end", () => {
         streamEnded = true;
         if (waitingResolve) {
-          const resolve13 = waitingResolve;
+          const resolve14 = waitingResolve;
           waitingResolve = null;
-          resolve13({ done: true, value: undefined });
+          resolve14({ done: true, value: undefined });
         }
       });
       nodeStream.on("error", () => {
         streamEnded = true;
         if (waitingResolve) {
-          const resolve13 = waitingResolve;
+          const resolve14 = waitingResolve;
           waitingResolve = null;
-          resolve13({ done: true, value: undefined });
+          resolve14({ done: true, value: undefined });
         }
       });
     } else {
@@ -102749,13 +102819,13 @@ function wrapNodeProcess2(proc) {
     }
     return {
       read() {
-        return new Promise((resolve13) => {
+        return new Promise((resolve14) => {
           if (chunks.length > 0) {
-            resolve13({ done: false, value: chunks.shift() });
+            resolve14({ done: false, value: chunks.shift() });
           } else if (streamEnded) {
-            resolve13({ done: true, value: undefined });
+            resolve14({ done: true, value: undefined });
           } else {
-            waitingResolve = resolve13;
+            waitingResolve = resolve14;
           }
         });
       }
@@ -102817,8 +102887,8 @@ function spawnProcess(command, options) {
   return proc;
 }
 // src/tools/lsp/lsp-client.ts
-import { readFileSync as readFileSync52 } from "fs";
-import { extname as extname4, resolve as resolve13 } from "path";
+import { readFileSync as readFileSync53 } from "fs";
+import { extname as extname4, resolve as resolve14 } from "path";
 import { pathToFileURL as pathToFileURL2 } from "url";
 
 // src/tools/lsp/lsp-client-connection.ts
@@ -102862,7 +102932,7 @@ class LSPClientTransport {
       throw new Error(`Failed to spawn LSP server: ${this.server.command.join(" ")}`);
     }
     this.startStderrReading();
-    await new Promise((resolve13) => setTimeout(resolve13, 100));
+    await new Promise((resolve14) => setTimeout(resolve14, 100));
     if (this.proc.exitCode !== null) {
       const stderr = this.stderrBuffer.join(`
 `);
@@ -102994,8 +103064,8 @@ recent stderr: ${stderr}` : "")));
       try {
         proc.kill();
         let timeoutId;
-        const timeoutPromise = new Promise((resolve13) => {
-          timeoutId = setTimeout(resolve13, 5000);
+        const timeoutPromise = new Promise((resolve14) => {
+          timeoutId = setTimeout(resolve14, 5000);
         });
         await Promise.race([
           proc.exited.then(() => {
@@ -103007,7 +103077,7 @@ recent stderr: ${stderr}` : "")));
           log("[LSPClient] Process did not exit within timeout, escalating to SIGKILL");
           try {
             proc.kill("SIGKILL");
-            await Promise.race([proc.exited, new Promise((resolve13) => setTimeout(resolve13, 1000))]);
+            await Promise.race([proc.exited, new Promise((resolve14) => setTimeout(resolve14, 1000))]);
           } catch {}
         }
       } catch {}
@@ -103087,9 +103157,9 @@ class LSPClient extends LSPClientConnection {
   documentVersions = new Map;
   lastSyncedText = new Map;
   async openFile(filePath) {
-    const absPath = resolve13(filePath);
+    const absPath = resolve14(filePath);
     const uri = pathToFileURL2(absPath).href;
-    const text = readFileSync52(absPath, "utf-8");
+    const text = readFileSync53(absPath, "utf-8");
     if (!this.openedFiles.has(absPath)) {
       const ext = extname4(absPath);
       const languageId = getLanguageId(ext);
@@ -103125,7 +103195,7 @@ class LSPClient extends LSPClientConnection {
     });
   }
   async definition(filePath, line, character) {
-    const absPath = resolve13(filePath);
+    const absPath = resolve14(filePath);
     await this.openFile(absPath);
     return this.sendRequest("textDocument/definition", {
       textDocument: { uri: pathToFileURL2(absPath).href },
@@ -103133,7 +103203,7 @@ class LSPClient extends LSPClientConnection {
     });
   }
   async references(filePath, line, character, includeDeclaration = true) {
-    const absPath = resolve13(filePath);
+    const absPath = resolve14(filePath);
     await this.openFile(absPath);
     return this.sendRequest("textDocument/references", {
       textDocument: { uri: pathToFileURL2(absPath).href },
@@ -103142,7 +103212,7 @@ class LSPClient extends LSPClientConnection {
     });
   }
   async documentSymbols(filePath) {
-    const absPath = resolve13(filePath);
+    const absPath = resolve14(filePath);
     await this.openFile(absPath);
     return this.sendRequest("textDocument/documentSymbol", {
       textDocument: { uri: pathToFileURL2(absPath).href }
@@ -103152,7 +103222,7 @@ class LSPClient extends LSPClientConnection {
     return this.sendRequest("workspace/symbol", { query });
   }
   async diagnostics(filePath) {
-    const absPath = resolve13(filePath);
+    const absPath = resolve14(filePath);
     const uri = pathToFileURL2(absPath).href;
     await this.openFile(absPath);
     await new Promise((r) => setTimeout(r, 500));
@@ -103167,7 +103237,7 @@ class LSPClient extends LSPClientConnection {
     return { items: this.diagnosticsStore.get(uri) ?? [] };
   }
   async prepareRename(filePath, line, character) {
-    const absPath = resolve13(filePath);
+    const absPath = resolve14(filePath);
     await this.openFile(absPath);
     return this.sendRequest("textDocument/prepareRename", {
       textDocument: { uri: pathToFileURL2(absPath).href },
@@ -103175,7 +103245,7 @@ class LSPClient extends LSPClientConnection {
     });
   }
   async rename(filePath, line, character, newName) {
-    const absPath = resolve13(filePath);
+    const absPath = resolve14(filePath);
     await this.openFile(absPath);
     return this.sendRequest("textDocument/rename", {
       textDocument: { uri: pathToFileURL2(absPath).href },
@@ -103445,7 +103515,7 @@ class LSPServerManager {
 }
 var lspManager = LSPServerManager.getInstance();
 // src/tools/lsp/lsp-client-wrapper.ts
-import { extname as extname5, resolve as resolve14 } from "path";
+import { extname as extname5, resolve as resolve15 } from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 import { existsSync as existsSync72, statSync as statSync9 } from "fs";
 init_plugin_identity();
@@ -103459,7 +103529,7 @@ function uriToPath(uri) {
   return fileURLToPath4(uri);
 }
 function findWorkspaceRoot(filePath) {
-  let dir = resolve14(filePath);
+  let dir = resolve15(filePath);
   if (!existsSync72(dir) || !isDirectoryPath(dir)) {
     dir = __require("path").dirname(dir);
   }
@@ -103474,7 +103544,7 @@ function findWorkspaceRoot(filePath) {
     prevDir = dir;
     dir = __require("path").dirname(dir);
   }
-  return __require("path").dirname(resolve14(filePath));
+  return __require("path").dirname(resolve15(filePath));
 }
 function formatServerLookupError(result) {
   if (result.status === "not_installed") {
@@ -103512,7 +103582,7 @@ function formatServerLookupError(result) {
 `);
 }
 async function withLspClient(filePath, fn) {
-  const absPath = resolve14(filePath);
+  const absPath = resolve15(filePath);
   if (isDirectoryPath(absPath)) {
     throw new Error(`Directory paths are not supported by this LSP tool. ` + `Use lsp_diagnostics with the 'extension' parameter for directory diagnostics.`);
   }
@@ -103642,10 +103712,10 @@ function formatApplyResult(result) {
 `);
 }
 // src/tools/lsp/workspace-edit.ts
-import { readFileSync as readFileSync53, writeFileSync as writeFileSync19 } from "fs";
+import { readFileSync as readFileSync54, writeFileSync as writeFileSync19 } from "fs";
 function applyTextEditsToFile(filePath, edits) {
   try {
-    let content = readFileSync53(filePath, "utf-8");
+    let content = readFileSync54(filePath, "utf-8");
     const lines = content.split(`
 `);
     const sortedEdits = [...edits].sort((a, b) => {
@@ -103711,7 +103781,7 @@ function applyWorkspaceEdit(edit) {
           try {
             const oldPath = uriToPath(change.oldUri);
             const newPath = uriToPath(change.newUri);
-            const content = readFileSync53(oldPath, "utf-8");
+            const content = readFileSync54(oldPath, "utf-8");
             writeFileSync19(newPath, content, "utf-8");
             __require("fs").unlinkSync(oldPath);
             result.filesModified.push(newPath);
@@ -116191,11 +116261,11 @@ var lsp_symbols = tool({
   }
 });
 // src/tools/lsp/diagnostics-tool.ts
-import { resolve as resolve16 } from "path";
+import { resolve as resolve17 } from "path";
 
 // src/tools/lsp/directory-diagnostics.ts
 import { existsSync as existsSync73, lstatSync as lstatSync2, readdirSync as readdirSync19 } from "fs";
-import { extname as extname6, join as join78, resolve as resolve15 } from "path";
+import { extname as extname6, join as join78, resolve as resolve16 } from "path";
 var SKIP_DIRECTORIES = new Set(["node_modules", ".git", "dist", "build", ".next", "out"]);
 function collectFilesWithExtension(dir, extension, maxFiles) {
   const files = [];
@@ -116239,7 +116309,7 @@ async function aggregateDiagnosticsForDirectory(directory, extension, severity,
   if (!extension.startsWith(".")) {
     throw new Error(`Extension must start with a dot (e.g., ".ts", not "${extension}"). ` + `Use ".${extension}" instead.`);
   }
-  const absDir = resolve15(directory);
+  const absDir = resolve16(directory);
   if (!existsSync73(absDir)) {
     throw new Error(`Directory does not exist: ${absDir}`);
   }
@@ -116380,7 +116450,7 @@ var lsp_diagnostics = tool({
       if (!args.filePath) {
         throw new Error("'filePath' parameter is required.");
       }
-      const absPath = resolve16(args.filePath);
+      const absPath = resolve17(args.filePath);
       if (isDirectoryPath(absPath)) {
         const extension = inferExtensionFromDirectory(absPath);
         if (!extension) {
@@ -116503,7 +116573,7 @@ import { existsSync as existsSync75, statSync as statSync10 } from "fs";
 // src/tools/ast-grep/downloader.ts
 import { existsSync as existsSync74 } from "fs";
 import { join as join80 } from "path";
-import { homedir as homedir15 } from "os";
+import { homedir as homedir16 } from "os";
 import { createRequire as createRequire3 } from "module";
 init_logger();
 init_plugin_identity();
@@ -116530,11 +116600,11 @@ var PLATFORM_MAP2 = {
 function getCacheDir3() {
   if (process.platform === "win32") {
     const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
-    const base2 = localAppData || join80(homedir15(), "AppData", "Local");
+    const base2 = localAppData || join80(homedir16(), "AppData", "Local");
     return join80(base2, CACHE_DIR_NAME, "bin");
   }
   const xdgCache = process.env.XDG_CACHE_HOME;
-  const base = xdgCache || join80(homedir15(), ".cache");
+  const base = xdgCache || join80(homedir16(), ".cache");
   return join80(base, CACHE_DIR_NAME, "bin");
 }
 function getBinaryName3() {
@@ -117022,7 +117092,7 @@ ${hint}`;
   return { ast_grep_search, ast_grep_replace };
 }
 // src/tools/grep/tools.ts
-import { resolve as resolve17 } from "path";
+import { resolve as resolve18 } from "path";
 
 // src/tools/grep/cli.ts
 var {spawn: spawn18 } = globalThis.Bun;
@@ -117246,10 +117316,10 @@ class Semaphore {
       this.running++;
       return;
     }
-    return new Promise((resolve17) => {
+    return new Promise((resolve18) => {
       this.queue.push(() => {
         this.running++;
-        resolve17();
+        resolve18();
       });
     });
   }
@@ -117342,7 +117412,8 @@ function parseOutput(output, filesOnly = false) {
   const matches = [];
   const lines = output.split(`
 `);
-  for (const line of lines) {
+  for (let line of lines) {
+    line = line.replace(/\r$/, "");
     if (!line.trim())
       continue;
     if (filesOnly) {
@@ -117353,7 +117424,7 @@ function parseOutput(output, filesOnly = false) {
       });
       continue;
     }
-    const match = line.match(/^(.+?):(\d+):(.*)$/);
+    const match = line.match(/^([A-Za-z]:[\\\/].*?|.+?):(\d+):(.*)$/);
     if (match) {
       matches.push({
         file: match[1],
@@ -117370,10 +117441,11 @@ function parseCountOutput(output) {
   const results = [];
   const lines = output.split(`
 `);
-  for (const line of lines) {
+  for (let line of lines) {
+    line = line.replace(/\r$/, "");
     if (!line.trim())
       continue;
-    const match = line.match(/^(.+?):(\d+)$/);
+    const match = line.match(/^([A-Za-z]:[\\\/].*?|.+?):(\d+)$/);
     if (match) {
       results.push({
         file: match[1],
@@ -117552,7 +117624,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 ? resolve17(dir, args.path) : dir;
+        const searchPath = args.path ? resolve18(dir, args.path) : dir;
         const paths = [searchPath];
         const outputMode = args.output_mode ?? "files_with_matches";
         const headLimit = args.head_limit ?? 0;
@@ -117583,10 +117655,10 @@ function createGrepTools(ctx) {
   return { grep };
 }
 // src/tools/glob/tools.ts
-import { resolve as resolve19 } from "path";
+import { resolve as resolve20 } from "path";
 
 // src/tools/glob/cli.ts
-import { resolve as resolve18 } from "path";
+import { resolve as resolve19 } from "path";
 var {spawn: spawn19 } = globalThis.Bun;
 
 // src/tools/glob/constants.ts
@@ -117720,7 +117792,7 @@ async function runRgFilesInternal(options, resolvedCli) {
       }
       let filePath;
       if (isRg) {
-        filePath = cwd ? resolve18(cwd, line) : line;
+        filePath = cwd ? resolve19(cwd, line) : line;
       } else if (isWindows2) {
         filePath = line.trim();
       } else {
@@ -117780,7 +117852,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 ? resolve19(dir, args.path) : dir;
+        const searchPath = args.path ? resolve20(dir, args.path) : dir;
         const result = await runRgFiles({
           pattern: args.pattern,
           paths: [searchPath]
@@ -119428,7 +119500,7 @@ init_logger();
 
 // src/tools/background-task/delay.ts
 function delay3(ms) {
-  return new Promise((resolve20) => setTimeout(resolve20, ms));
+  return new Promise((resolve21) => setTimeout(resolve21, ms));
 }
 // src/tools/background-task/session-messages.ts
 function getErrorMessage4(value) {
@@ -120041,9 +120113,12 @@ var ALLOWED_AGENTS = [
   "momus",
   "multimodal-looker"
 ];
-var CALL_OMO_AGENT_DESCRIPTION = `Spawn explore/librarian agent. run_in_background REQUIRED (true=async with task_id, false=sync).
+var CALL_OMO_AGENT_DESCRIPTION = `Spawn explore/librarian agent or custom agents. run_in_background REQUIRED (true=async with task_id, false=sync).
 
-Available: {agents}
+Built-in agents:
+{agents}
+
+Custom agents registered via user or project agent directories are also supported.
 
 Pass \`session_id=<id>\` to continue previous agent with full context. Nested subagent depth is tracked automatically and blocked past the configured limit. Prompts MUST be in English. Use \`background_output\` for async results.`;
 // src/tools/call-omo-agent/tools.ts
@@ -120182,7 +120257,7 @@ Task ID: ${task.id}`;
       if (toolContext.abort?.aborted) {
         break;
       }
-      await new Promise((resolve20) => setTimeout(resolve20, WAIT_FOR_SESSION_INTERVAL_MS));
+      await new Promise((resolve21) => setTimeout(resolve21, WAIT_FOR_SESSION_INTERVAL_MS));
     }
     await toolContext.metadata?.({
       title: args.description,
@@ -120265,7 +120340,7 @@ async function waitForCompletion(sessionID, toolContext, ctx) {
       log(`[call_omo_agent] Aborted by user`);
       throw new Error("Task aborted.");
     }
-    await new Promise((resolve20) => setTimeout(resolve20, POLL_INTERVAL_MS));
+    await new Promise((resolve21) => setTimeout(resolve21, POLL_INTERVAL_MS));
     const statusResult = await ctx.client.session.status();
     const allStatuses = normalizeSDKResponse(statusResult, {});
     const sessionStatus = allStatuses[sessionID];
@@ -120503,6 +120578,33 @@ session_id: ${sessionID}
   }
 }
 
+// src/tools/call-omo-agent/agent-resolver.ts
+init_logger();
+var callableAgentsCache = new Map;
+var CACHE_TTL_MS = 30000;
+async function resolveCallableAgents(client2, sessionId) {
+  const cacheKey = sessionId ?? "__default__";
+  const cached3 = callableAgentsCache.get(cacheKey);
+  if (cached3 && Date.now() - cached3.timestamp < CACHE_TTL_MS) {
+    return cached3.agents;
+  }
+  try {
+    const agentsResult = await client2.app.agents();
+    const agents = normalizeSDKResponse(agentsResult, [], {
+      preferResponseOnMissingData: true
+    });
+    const dynamicAgents = agents.filter((a) => a && typeof a.name === "string" && a.name.trim().length > 0 && a.mode !== "primary").map((a) => a.name.trim().toLowerCase());
+    const merged = new Set([...ALLOWED_AGENTS, ...dynamicAgents]);
+    const result = [...merged];
+    callableAgentsCache.set(cacheKey, { agents: result, timestamp: Date.now() });
+    return result;
+  } catch (error92) {
+    const message = error92 instanceof Error ? error92.message : String(error92);
+    log("[call_omo_agent] Failed to resolve dynamic agents, falling back to built-in list", { error: message });
+    return [...ALLOWED_AGENTS];
+  }
+}
+
 // src/tools/call-omo-agent/tools.ts
 function resolveModelAndFallbackChain(args) {
   const { subagentType, agentOverrides, userCategories } = args;
@@ -120552,19 +120654,21 @@ function createCallOmoAgent(ctx, backgroundManager, disabledAgents = [], agentOv
     args: {
       description: tool.schema.string().describe("A short (3-5 words) description of the task"),
       prompt: tool.schema.string().describe("The task for the agent to perform"),
-      subagent_type: tool.schema.string().describe("The type of specialized agent to use for this task (explore or librarian only)"),
+      subagent_type: tool.schema.string().describe("The agent to invoke. Supports built-in agents and any custom agents registered at runtime."),
       run_in_background: tool.schema.boolean().describe("REQUIRED. true: run asynchronously (use background_output to get results), false: run synchronously and wait for completion"),
       session_id: tool.schema.string().describe("Existing Task session to continue").optional()
     },
     async execute(args, toolContext) {
       const toolCtx = toolContext;
       log(`[call_omo_agent] Starting with agent: ${args.subagent_type}, background: ${args.run_in_background}`);
-      if (!ALLOWED_AGENTS.some((name) => name.toLowerCase() === args.subagent_type.toLowerCase())) {
-        return `Error: Invalid agent type "${args.subagent_type}". Only ${ALLOWED_AGENTS.join(", ")} are allowed.`;
+      const callableAgents = await resolveCallableAgents(ctx.client);
+      const strippedAgentType = stripInvisibleAgentCharacters(args.subagent_type);
+      if (!callableAgents.some((name) => name.toLowerCase() === strippedAgentType.toLowerCase())) {
+        return `Error: Invalid agent type "${args.subagent_type}". Only ${callableAgents.join(", ")} are allowed.`;
       }
-      const normalizedAgent = args.subagent_type.toLowerCase();
+      const normalizedAgent = strippedAgentType.toLowerCase();
       args = { ...args, subagent_type: normalizedAgent };
-      if (disabledAgents.some((disabled) => disabled.toLowerCase() === normalizedAgent)) {
+      if (disabledAgents.some((disabled) => stripInvisibleAgentCharacters(disabled).toLowerCase() === normalizedAgent)) {
         return `Error: Agent "${normalizedAgent}" is disabled via disabled_agents configuration. Remove it from disabled_agents in your ${CONFIG_BASENAME}.json to use it.`;
       }
       const { model: resolvedModel, fallbackChain } = resolveModelAndFallbackChain({
@@ -120813,7 +120917,7 @@ async function resolveMultimodalLookerAgentMetadata(ctx) {
 
 // src/tools/look-at/image-converter.ts
 import * as childProcess from "child_process";
-import { existsSync as existsSync81, mkdtempSync, readFileSync as readFileSync54, rmSync as rmSync4, unlinkSync as unlinkSync12, writeFileSync as writeFileSync20 } from "fs";
+import { existsSync as existsSync81, mkdtempSync, readFileSync as readFileSync55, rmSync as rmSync4, unlinkSync as unlinkSync12, writeFileSync as writeFileSync20 } from "fs";
 import { tmpdir as tmpdir7 } from "os";
 import { dirname as dirname28, join as join86 } from "path";
 var SUPPORTED_FORMATS = new Set([
@@ -120933,7 +121037,7 @@ function convertBase64ImageToJpeg(base64Data, mimeType) {
     log(`[image-converter] Converting Base64 ${mimeType} to JPEG`);
     const outputPath = convertImageToJpeg(inputPath, mimeType);
     tempFiles.push(outputPath);
-    const convertedBuffer = readFileSync54(outputPath);
+    const convertedBuffer = readFileSync55(outputPath);
     const convertedBase64 = convertedBuffer.toString("base64");
     log(`[image-converter] Base64 conversion successful`);
     return { base64: convertedBase64, tempFiles };
@@ -121898,7 +122002,7 @@ async function executeUnstableAgentTask(args, ctx, executorCtx, parentContext, a
 
 Task ID: ${task.id}`;
       }
-      await new Promise((resolve20) => setTimeout(resolve20, timing.WAIT_FOR_SESSION_INTERVAL_MS));
+      await new Promise((resolve21) => setTimeout(resolve21, timing.WAIT_FOR_SESSION_INTERVAL_MS));
       const updated = manager.getTask(task.id);
       sessionID = updated?.sessionID;
     }
@@ -121944,7 +122048,7 @@ Task ID: ${task.id}`;
 
 Session ID: ${sessionID}`;
       }
-      await new Promise((resolve20) => setTimeout(resolve20, timingCfg.POLL_INTERVAL_MS));
+      await new Promise((resolve21) => setTimeout(resolve21, timingCfg.POLL_INTERVAL_MS));
       const currentTask = manager.getTask(task.id);
       if (currentTask && (currentTask.status === "interrupt" || currentTask.status === "error" || currentTask.status === "cancelled")) {
         terminalStatus = { status: currentTask.status, error: currentTask.error };
@@ -122082,7 +122186,7 @@ function continueSessionSetup(args) {
   (async () => {
     const waitStart = Date.now();
     while (Date.now() - waitStart < args.timing.WAIT_FOR_SESSION_TIMEOUT_MS) {
-      await new Promise((resolve20) => setTimeout(resolve20, args.timing.WAIT_FOR_SESSION_INTERVAL_MS));
+      await new Promise((resolve21) => setTimeout(resolve21, args.timing.WAIT_FOR_SESSION_INTERVAL_MS));
       const updated = args.manager.getTask(args.taskID);
       if (!updated) {
         return;
@@ -122148,7 +122252,7 @@ Task ID: ${task.id}`;
         });
         break;
       }
-      await new Promise((resolve20) => setTimeout(resolve20, timing.WAIT_FOR_SESSION_INTERVAL_MS));
+      await new Promise((resolve21) => setTimeout(resolve21, timing.WAIT_FOR_SESSION_INTERVAL_MS));
     }
     if (sessionId) {
       setSessionFallbackChain(sessionId, fallbackChain);
@@ -122227,6 +122331,7 @@ async function createSyncSession(client2, input) {
 
 // src/tools/delegate-task/sync-prompt-sender.ts
 init_constants();
+init_agent_display_names();
 var sendSyncPromptDeps = {
   promptWithModelSuggestionRetry,
   promptSyncWithModelSuggestionRetry
@@ -122247,7 +122352,7 @@ function buildPromptGenerationParams2(model) {
   };
 }
 function isOracleAgent(agentToUse) {
-  return agentToUse.toLowerCase() === "oracle";
+  return stripInvisibleAgentCharacters(agentToUse).toLowerCase() === "oracle";
 }
 function isUnexpectedEofError(error92) {
   const message = error92 instanceof Error ? error92.message : String(error92);
@@ -122269,7 +122374,7 @@ async function sendSyncPrompt(client2, input, deps = sendSyncPromptDeps) {
   const promptArgs = {
     path: { id: input.sessionID },
     body: {
-      agent: input.agentToUse.replace(/^\u200B+/, ""),
+      agent: stripInvisibleAgentCharacters(input.agentToUse),
       system: input.systemContent,
       tools,
       parts: [createInternalAgentTextPart(effectivePrompt)],
@@ -123051,22 +123156,118 @@ function applyFallbackEntrySettings(input) {
 // src/tools/delegate-task/subagent-discovery.ts
 init_agent_display_names();
 // src/features/claude-code-agent-loader/loader.ts
-import { existsSync as existsSync82, readdirSync as readdirSync22, readFileSync as readFileSync55 } from "fs";
-import { join as join87, basename as basename13 } from "path";
-function parseToolsConfig2(toolsStr) {
-  if (!toolsStr)
-    return;
-  const tools = toolsStr.split(",").map((t) => t.trim()).filter(Boolean);
-  if (tools.length === 0)
-    return;
-  const result = {};
-  for (const tool3 of tools) {
-    result[tool3.toLowerCase()] = true;
+import { existsSync as existsSync84, readdirSync as readdirSync22 } from "fs";
+import { join as join87 } from "path";
+
+// src/features/claude-code-agent-loader/agent-definitions-loader.ts
+import { existsSync as existsSync83, readFileSync as readFileSync57 } from "fs";
+import { basename as basename13, extname as extname8 } from "path";
+init_logger();
+
+// src/features/claude-code-agent-loader/json-agent-loader.ts
+import { existsSync as existsSync82, readFileSync as readFileSync56 } from "fs";
+function parseJsonAgentFile(filePath, scope) {
+  try {
+    if (!existsSync82(filePath)) {
+      return null;
+    }
+    const content = readFileSync56(filePath, "utf-8");
+    const { data } = parseJsoncSafe(content);
+    if (!data) {
+      return null;
+    }
+    if (!data.name || !data.prompt) {
+      return null;
+    }
+    const originalDescription = data.description ?? "";
+    const formattedDescription = `(${scope}) ${originalDescription}`;
+    const mappedModelOverride = mapClaudeModelToOpenCode(data.model);
+    const modelString = mappedModelOverride ? `${mappedModelOverride.providerID}/${mappedModelOverride.modelID}` : undefined;
+    const config4 = {
+      description: formattedDescription,
+      mode: data.mode ?? "subagent",
+      prompt: data.prompt.trim(),
+      ...modelString ? { model: modelString } : {}
+    };
+    const toolsConfig = parseToolsConfig(data.tools);
+    if (toolsConfig) {
+      config4.tools = toolsConfig;
+    }
+    return {
+      name: data.name,
+      path: filePath,
+      config: config4,
+      scope
+    };
+  } catch {
+    return null;
+  }
+}
+
+// src/features/claude-code-agent-loader/agent-definitions-loader.ts
+function parseMarkdownAgentFile(filePath, scope) {
+  try {
+    if (!existsSync83(filePath)) {
+      return null;
+    }
+    const content = readFileSync57(filePath, "utf-8");
+    const { data, body } = parseFrontmatter(content);
+    const fileName = basename13(filePath);
+    const agentName = fileName.replace(/\.md$/i, "");
+    const name = data.name || agentName;
+    const originalDescription = data.description || "";
+    const formattedDescription = `(${scope}) ${originalDescription}`;
+    const mappedModelOverride = mapClaudeModelToOpenCode(data.model);
+    const modelString = mappedModelOverride ? `${mappedModelOverride.providerID}/${mappedModelOverride.modelID}` : undefined;
+    const config4 = {
+      description: formattedDescription,
+      mode: data.mode || "subagent",
+      prompt: body.trim(),
+      ...modelString ? { model: modelString } : {}
+    };
+    const toolsConfig = parseToolsConfig(data.tools);
+    if (toolsConfig) {
+      config4.tools = toolsConfig;
+    }
+    return {
+      name,
+      path: filePath,
+      config: config4,
+      scope
+    };
+  } catch {
+    return null;
+  }
+}
+function loadAgentDefinitions(paths, scope) {
+  const result = Object.create(null);
+  for (const filePath of paths) {
+    if (!existsSync83(filePath)) {
+      log(`[agent-definitions-loader] File not found, skipping: ${filePath}`);
+      continue;
+    }
+    const ext = extname8(filePath).toLowerCase();
+    let agent = null;
+    if (ext === ".md") {
+      agent = parseMarkdownAgentFile(filePath, scope);
+    } else if (ext === ".json" || ext === ".jsonc") {
+      agent = parseJsonAgentFile(filePath, scope);
+    } else {
+      log(`[agent-definitions-loader] Unsupported file extension: ${ext} for ${filePath}`);
+      continue;
+    }
+    if (!agent) {
+      log(`[agent-definitions-loader] Failed to parse agent file: ${filePath}`);
+      continue;
+    }
+    result[agent.name] = agent.config;
   }
   return result;
 }
+
+// src/features/claude-code-agent-loader/loader.ts
 function loadAgentsFromDir(agentsDir, scope) {
-  if (!existsSync82(agentsDir)) {
+  if (!existsSync84(agentsDir)) {
     return [];
   }
   const entries = readdirSync22(agentsDir, { withFileTypes: true });
@@ -123075,33 +123276,9 @@ function loadAgentsFromDir(agentsDir, scope) {
     if (!isMarkdownFile(entry))
       continue;
     const agentPath = join87(agentsDir, entry.name);
-    const agentName = basename13(entry.name, ".md");
-    try {
-      const content = readFileSync55(agentPath, "utf-8");
-      const { data, body } = parseFrontmatter(content);
-      const name = data.name || agentName;
-      const originalDescription = data.description || "";
-      const formattedDescription = `(${scope}) ${originalDescription}`;
-      const mappedModelOverride = mapClaudeModelToOpenCode(data.model);
-      const modelString = mappedModelOverride ? `${mappedModelOverride.providerID}/${mappedModelOverride.modelID}` : undefined;
-      const config4 = {
-        description: formattedDescription,
-        mode: data.mode || "subagent",
-        prompt: body.trim(),
-        ...modelString ? { model: modelString } : {}
-      };
-      const toolsConfig = parseToolsConfig2(data.tools);
-      if (toolsConfig) {
-        config4.tools = toolsConfig;
-      }
-      agents.push({
-        name,
-        path: agentPath,
-        config: config4,
-        scope
-      });
-    } catch {
-      continue;
+    const agent = parseMarkdownAgentFile(agentPath, scope);
+    if (agent) {
+      agents.push(agent);
     }
   }
   return agents;
@@ -123109,7 +123286,7 @@ function loadAgentsFromDir(agentsDir, scope) {
 function loadUserAgents() {
   const userAgentsDir = join87(getClaudeConfigDir(), "agents");
   const agents = loadAgentsFromDir(userAgentsDir, "user");
-  const result = {};
+  const result = Object.create(null);
   for (const agent of agents) {
     result[agent.name] = agent.config;
   }
@@ -123118,12 +123295,114 @@ function loadUserAgents() {
 function loadProjectAgents(directory) {
   const projectAgentsDir = join87(directory ?? process.cwd(), ".claude", "agents");
   const agents = loadAgentsFromDir(projectAgentsDir, "project");
-  const result = {};
+  const result = Object.create(null);
+  for (const agent of agents) {
+    result[agent.name] = agent.config;
+  }
+  return result;
+}
+function loadOpencodeGlobalAgents() {
+  const configDir = getOpenCodeConfigDir({ binary: "opencode" });
+  const opencodeAgentsDir = join87(configDir, "agents");
+  const agents = loadAgentsFromDir(opencodeAgentsDir, "opencode");
+  const result = Object.create(null);
   for (const agent of agents) {
     result[agent.name] = agent.config;
   }
   return result;
 }
+function loadOpencodeProjectAgents(directory) {
+  const opencodeProjectDir = join87(directory ?? process.cwd(), ".opencode", "agents");
+  const agents = loadAgentsFromDir(opencodeProjectDir, "opencode-project");
+  const result = Object.create(null);
+  for (const agent of agents) {
+    result[agent.name] = agent.config;
+  }
+  return result;
+}
+// src/features/claude-code-agent-loader/opencode-config-agents-reader.ts
+import * as fs20 from "fs";
+import * as path13 from "path";
+function getConfigPaths4(directory) {
+  const globalConfigDir = getOpenCodeConfigDir({ binary: "opencode" });
+  const paths = [
+    path13.join(directory, ".opencode", "opencode.json"),
+    path13.join(directory, ".opencode", "opencode.jsonc"),
+    path13.join(globalConfigDir, "opencode.json"),
+    path13.join(globalConfigDir, "opencode.jsonc")
+  ];
+  return paths;
+}
+function convertInlineAgent(agentData) {
+  if (!agentData || typeof agentData !== "object") {
+    return null;
+  }
+  const agent = agentData;
+  const description = agent.description ? `(opencode-config) ${String(agent.description)}` : "(opencode-config) ";
+  const mappedModel = mapClaudeModelToOpenCode(agent.model ? String(agent.model) : undefined);
+  const modelString = mappedModel ? `${mappedModel.providerID}/${mappedModel.modelID}` : undefined;
+  const VALID_MODES = ["subagent", "primary", "all"];
+  const rawMode = typeof agent.mode === "string" ? agent.mode : undefined;
+  const mode = rawMode && VALID_MODES.includes(rawMode) ? rawMode : "subagent";
+  const config4 = {
+    description,
+    mode,
+    prompt: agent.prompt ? String(agent.prompt) : "",
+    ...modelString ? { model: modelString } : {}
+  };
+  const toolsConfig = parseToolsConfig(agent.tools);
+  if (toolsConfig) {
+    config4.tools = toolsConfig;
+  }
+  return config4;
+}
+function readOpencodeConfigAgents(directory) {
+  const result = Object.create(null);
+  for (const configPath of getConfigPaths4(directory)) {
+    try {
+      if (!fs20.existsSync(configPath))
+        continue;
+      const content = fs20.readFileSync(configPath, "utf-8");
+      const parseResult = parseJsoncSafe(content);
+      if (!parseResult.data)
+        continue;
+      const configDir = path13.dirname(configPath);
+      const agentsToLoad = parseResult.data.agents || parseResult.data.agent;
+      if (agentsToLoad && typeof agentsToLoad === "object") {
+        for (const [agentName, agentData] of Object.entries(agentsToLoad)) {
+          if (Object.hasOwn(result, agentName))
+            continue;
+          const converted = convertInlineAgent(agentData);
+          if (converted) {
+            result[agentName] = converted;
+          }
+        }
+      }
+      if (parseResult.data.agent_definitions) {
+        const definitionPaths = extractDefinitionPaths(parseResult.data.agent_definitions);
+        const resolvedPaths = resolveAgentDefinitionPaths(definitionPaths, configDir, directory);
+        const definitionAgents = loadAgentDefinitions(resolvedPaths, "opencode-config");
+        for (const [name, config4] of Object.entries(definitionAgents)) {
+          if (!Object.hasOwn(result, name)) {
+            result[name] = config4;
+          }
+        }
+      }
+    } catch {
+      continue;
+    }
+  }
+  return result;
+}
+function extractDefinitionPaths(definitionPaths) {
+  if (typeof definitionPaths === "string") {
+    return [definitionPaths];
+  }
+  if (Array.isArray(definitionPaths)) {
+    return definitionPaths.filter((p) => typeof p === "string").map((p) => p);
+  }
+  return [];
+}
 // src/tools/delegate-task/subagent-discovery.ts
 function sanitizeSubagentType(subagentType) {
   return subagentType.trim().replace(/^[\\\/"']+|[\\\/"']+$/g, "").trim();
@@ -123526,7 +123805,7 @@ function createDelegateTask(options) {
 // src/tools/delegate-task/index.ts
 init_constants();
 // src/tools/task/task-create.ts
-import { join as join89 } from "path";
+import { join as join90 } from "path";
 
 // src/tools/task/types.ts
 var TaskStatusSchema = exports_external.enum(["pending", "in_progress", "completed", "deleted"]);
@@ -123580,18 +123859,18 @@ var TaskDeleteInputSchema = exports_external.object({
 });
 
 // src/features/claude-tasks/storage.ts
-import { join as join88, dirname as dirname29, basename as basename14, isAbsolute as isAbsolute11 } from "path";
-import { existsSync as existsSync83, mkdirSync as mkdirSync17, readFileSync as readFileSync56, writeFileSync as writeFileSync21, renameSync as renameSync5, unlinkSync as unlinkSync13, readdirSync as readdirSync23 } from "fs";
+import { join as join89, dirname as dirname30, basename as basename14, isAbsolute as isAbsolute12 } from "path";
+import { existsSync as existsSync86, mkdirSync as mkdirSync17, readFileSync as readFileSync59, writeFileSync as writeFileSync21, renameSync as renameSync5, unlinkSync as unlinkSync13, readdirSync as readdirSync23 } from "fs";
 import { randomUUID as randomUUID3 } from "crypto";
 function getTaskDir(config4 = {}) {
   const tasksConfig = config4.sisyphus?.tasks;
   const storagePath = tasksConfig?.storage_path;
   if (storagePath) {
-    return isAbsolute11(storagePath) ? storagePath : join88(process.cwd(), storagePath);
+    return isAbsolute12(storagePath) ? storagePath : join89(process.cwd(), storagePath);
   }
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
   const listId = resolveTaskListId(config4);
-  return join88(configDir, "tasks", listId);
+  return join89(configDir, "tasks", listId);
 }
 function sanitizePathSegment(value) {
   return value.replace(/[^a-zA-Z0-9_-]/g, "-") || "default";
@@ -123609,16 +123888,16 @@ function resolveTaskListId(config4 = {}) {
   return sanitizePathSegment(basename14(process.cwd()));
 }
 function ensureDir(dirPath) {
-  if (!existsSync83(dirPath)) {
+  if (!existsSync86(dirPath)) {
     mkdirSync17(dirPath, { recursive: true });
   }
 }
 function readJsonSafe(filePath, schema2) {
   try {
-    if (!existsSync83(filePath)) {
+    if (!existsSync86(filePath)) {
       return null;
     }
-    const content = readFileSync56(filePath, "utf-8");
+    const content = readFileSync59(filePath, "utf-8");
     const parsed = JSON.parse(content);
     const result = schema2.safeParse(parsed);
     if (!result.success) {
@@ -123630,7 +123909,7 @@ function readJsonSafe(filePath, schema2) {
   }
 }
 function writeJsonAtomic(filePath, data) {
-  const dir = dirname29(filePath);
+  const dir = dirname30(filePath);
   ensureDir(dir);
   const tempPath = `${filePath}.tmp.${Date.now()}`;
   try {
@@ -123638,7 +123917,7 @@ function writeJsonAtomic(filePath, data) {
     renameSync5(tempPath, filePath);
   } catch (error92) {
     try {
-      if (existsSync83(tempPath)) {
+      if (existsSync86(tempPath)) {
         unlinkSync13(tempPath);
       }
     } catch {}
@@ -123650,7 +123929,7 @@ function generateTaskId() {
   return `T-${randomUUID3()}`;
 }
 function acquireLock(dirPath) {
-  const lockPath = join88(dirPath, ".lock");
+  const lockPath = join89(dirPath, ".lock");
   const lockId = randomUUID3();
   const createLock = (timestamp2) => {
     writeFileSync21(lockPath, JSON.stringify({ id: lockId, timestamp: timestamp2 }), {
@@ -123660,7 +123939,7 @@ function acquireLock(dirPath) {
   };
   const isStale = () => {
     try {
-      const lockContent = readFileSync56(lockPath, "utf-8");
+      const lockContent = readFileSync59(lockPath, "utf-8");
       const lockData = JSON.parse(lockContent);
       const lockAge = Date.now() - lockData.timestamp;
       return lockAge > STALE_LOCK_THRESHOLD_MS;
@@ -123698,9 +123977,9 @@ function acquireLock(dirPath) {
     acquired: true,
     release: () => {
       try {
-        if (!existsSync83(lockPath))
+        if (!existsSync86(lockPath))
           return;
-        const lockContent = readFileSync56(lockPath, "utf-8");
+        const lockContent = readFileSync59(lockPath, "utf-8");
         const lockData = JSON.parse(lockContent);
         if (lockData.id !== lockId)
           return;
@@ -123863,7 +124142,7 @@ async function handleCreate(args, config4, ctx, context) {
         threadID: context.sessionID
       };
       const validatedTask = TaskObjectSchema.parse(task);
-      writeJsonAtomic(join89(taskDir, `${taskId}.json`), validatedTask);
+      writeJsonAtomic(join90(taskDir, `${taskId}.json`), validatedTask);
       await syncTaskTodoUpdate(ctx, validatedTask, context.sessionID);
       return JSON.stringify({
         task: {
@@ -123885,7 +124164,7 @@ async function handleCreate(args, config4, ctx, context) {
   }
 }
 // src/tools/task/task-get.ts
-import { join as join90 } from "path";
+import { join as join91 } from "path";
 var TASK_ID_PATTERN = /^T-[A-Za-z0-9-]+$/;
 function parseTaskId(id) {
   if (!TASK_ID_PATTERN.test(id))
@@ -123910,7 +124189,7 @@ Returns null if the task does not exist or the file is invalid.`,
           return JSON.stringify({ error: "invalid_task_id" });
         }
         const taskDir = getTaskDir(config4);
-        const taskPath = join90(taskDir, `${taskId}.json`);
+        const taskPath = join91(taskDir, `${taskId}.json`);
         const task = readJsonSafe(taskPath, TaskObjectSchema);
         return JSON.stringify({ task: task ?? null });
       } catch (error92) {
@@ -123923,8 +124202,8 @@ Returns null if the task does not exist or the file is invalid.`,
   });
 }
 // src/tools/task/task-list.ts
-import { join as join91 } from "path";
-import { existsSync as existsSync84, readdirSync as readdirSync24 } from "fs";
+import { join as join92 } from "path";
+import { existsSync as existsSync87, readdirSync as readdirSync24 } from "fs";
 function createTaskList(config4) {
   return tool({
     description: `List all active tasks with summary information.
@@ -123935,7 +124214,7 @@ Returns summary format: id, subject, status, owner, blockedBy (not full descript
     args: {},
     execute: async () => {
       const taskDir = getTaskDir(config4);
-      if (!existsSync84(taskDir)) {
+      if (!existsSync87(taskDir)) {
         return JSON.stringify({ tasks: [] });
       }
       const files = readdirSync24(taskDir).filter((f) => f.endsWith(".json") && f.startsWith("T-")).map((f) => f.replace(".json", ""));
@@ -123944,7 +124223,7 @@ Returns summary format: id, subject, status, owner, blockedBy (not full descript
       }
       const allTasks = [];
       for (const fileId of files) {
-        const task = readJsonSafe(join91(taskDir, `${fileId}.json`), TaskObjectSchema);
+        const task = readJsonSafe(join92(taskDir, `${fileId}.json`), TaskObjectSchema);
         if (task) {
           allTasks.push(task);
         }
@@ -123972,7 +124251,7 @@ Returns summary format: id, subject, status, owner, blockedBy (not full descript
   });
 }
 // src/tools/task/task-update.ts
-import { join as join92 } from "path";
+import { join as join93 } from "path";
 var TASK_ID_PATTERN2 = /^T-[A-Za-z0-9-]+$/;
 function parseTaskId2(id) {
   if (!TASK_ID_PATTERN2.test(id))
@@ -124020,7 +124299,7 @@ async function handleUpdate(args, config4, ctx, context) {
       return JSON.stringify({ error: "task_lock_unavailable" });
     }
     try {
-      const taskPath = join92(taskDir, `${taskId}.json`);
+      const taskPath = join93(taskDir, `${taskId}.json`);
       const task = readJsonSafe(taskPath, TaskObjectSchema);
       if (!task) {
         return JSON.stringify({ error: "task_not_found" });
@@ -124814,16 +125093,16 @@ class Diff {
       }
     }
   }
-  addToPath(path13, added, removed, oldPosInc, options) {
-    const last = path13.lastComponent;
+  addToPath(path14, added, removed, oldPosInc, options) {
+    const last = path14.lastComponent;
     if (last && !options.oneChangePerToken && last.added === added && last.removed === removed) {
       return {
-        oldPos: path13.oldPos + oldPosInc,
+        oldPos: path14.oldPos + oldPosInc,
         lastComponent: { count: last.count + 1, added, removed, previousComponent: last.previousComponent }
       };
     } else {
       return {
-        oldPos: path13.oldPos + oldPosInc,
+        oldPos: path14.oldPos + oldPosInc,
         lastComponent: { count: 1, added, removed, previousComponent: last }
       };
     }
@@ -125315,10 +125594,10 @@ function normalizeHashlineEdits(rawEdits) {
 }
 
 // src/tools/hashline-edit/formatter-trigger.ts
-import path13 from "path";
+import path14 from "path";
 var cachedFormattersByDirectory = new Map;
 function getFormatterCacheKey(directory) {
-  return path13.resolve(directory);
+  return path14.resolve(directory);
 }
 async function resolveFormatters(client2, directory) {
   const cacheKey = getFormatterCacheKey(directory);
@@ -125369,7 +125648,7 @@ function buildFormatterCommand(command, filePath) {
   return command.map((arg) => arg.replace(/\$FILE/g, filePath));
 }
 async function runFormattersForFile(client2, directory, filePath) {
-  const ext = path13.extname(filePath);
+  const ext = path14.extname(filePath);
   if (!ext)
     return;
   const formatters = await resolveFormatters(client2, directory);
@@ -126077,8 +126356,8 @@ function createUnstableAgentBabysitter(args) {
     directory: ctx.directory,
     client: {
       session: {
-        messages: async ({ path: path14 }) => {
-          const result = await ctx.client.session.messages({ path: path14 });
+        messages: async ({ path: path15 }) => {
+          const result = await ctx.client.session.messages({ path: path15 });
           if (Array.isArray(result))
             return result;
           if (typeof result === "object" && result !== null) {
@@ -126367,14 +126646,14 @@ class ConcurrencyManager {
       this.counts.set(model, current + 1);
       return;
     }
-    return new Promise((resolve20, reject) => {
+    return new Promise((resolve21, reject) => {
       const queue = this.queues.get(model) ?? [];
       const entry = {
         resolve: () => {
           if (entry.settled)
             return;
           entry.settled = true;
-          resolve20();
+          resolve21();
         },
         rawReject: reject,
         settled: false
@@ -126581,9 +126860,9 @@ async function abortWithTimeout(client2, sessionID, timeoutMs = 1e4) {
   try {
     const result = await Promise.race([
       client2.session.abort({ path: { id: sessionID } }).then(() => "aborted"),
-      new Promise((resolve20) => {
+      new Promise((resolve21) => {
         timeoutHandle = setTimeout(() => {
-          resolve20("timed_out");
+          resolve21("timed_out");
         }, timeoutMs);
       })
     ]);
@@ -126766,8 +127045,8 @@ function unregisterManagerForCleanup(manager) {
 }
 
 // src/features/background-agent/compaction-aware-message-resolver.ts
-import { readdirSync as readdirSync25, readFileSync as readFileSync57 } from "fs";
-import { join as join93 } from "path";
+import { readdirSync as readdirSync25, readFileSync as readFileSync60 } from "fs";
+import { join as join94 } from "path";
 function hasFullAgentAndModel(message) {
   return !!message.agent && !isCompactionAgent(message.agent) && !!message.model?.providerID && !!message.model?.modelID;
 }
@@ -126846,7 +127125,7 @@ function findNearestMessageExcludingCompaction(messageDir, sessionID) {
     const messages = [];
     for (const file3 of files) {
       try {
-        const content = readFileSync57(join93(messageDir, file3), "utf-8");
+        const content = readFileSync60(join94(messageDir, file3), "utf-8");
         const parsed = JSON.parse(content);
         if (hasCompactionPartInStorage(parsed.id) || isCompactionAgent(parsed.agent)) {
           continue;
@@ -126936,7 +127215,7 @@ function handleSessionIdleBackgroundEvent(args) {
 }
 
 // src/features/background-agent/manager.ts
-import { join as join94 } from "path";
+import { join as join95 } from "path";
 
 // src/features/background-agent/task-poller.ts
 init_plugin_identity();
@@ -128612,7 +128891,7 @@ ${originalText}`;
             parentSessionID: task.parentSessionID
           });
         }
-        const messageDir = join94(MESSAGE_STORAGE, task.parentSessionID);
+        const messageDir = join95(MESSAGE_STORAGE, task.parentSessionID);
         const currentMessage = messageDir ? findNearestMessageExcludingCompaction(messageDir, task.parentSessionID) : null;
         agent = currentMessage?.agent ?? task.parentAgent;
         model = currentMessage?.model?.providerID && currentMessage?.model?.modelID ? { providerID: currentMessage.model.providerID, modelID: currentMessage.model.modelID } : undefined;
@@ -128943,11 +129222,11 @@ ${originalText}`;
   }
 }
 // src/features/mcp-oauth/storage.ts
-import { chmodSync as chmodSync2, existsSync as existsSync85, mkdirSync as mkdirSync18, readFileSync as readFileSync58, renameSync as renameSync6, unlinkSync as unlinkSync14, writeFileSync as writeFileSync22 } from "fs";
-import { dirname as dirname30, join as join95 } from "path";
+import { chmodSync as chmodSync2, existsSync as existsSync88, mkdirSync as mkdirSync18, readFileSync as readFileSync61, renameSync as renameSync6, unlinkSync as unlinkSync14, writeFileSync as writeFileSync22 } from "fs";
+import { dirname as dirname31, join as join96 } from "path";
 var STORAGE_FILE_NAME = "mcp-oauth.json";
 function getMcpOauthStoragePath() {
-  return join95(getOpenCodeConfigDir({ binary: "opencode" }), STORAGE_FILE_NAME);
+  return join96(getOpenCodeConfigDir({ binary: "opencode" }), STORAGE_FILE_NAME);
 }
 function normalizeHost(serverHost) {
   let host = serverHost.trim();
@@ -128984,11 +129263,11 @@ function buildKey(serverHost, resource) {
 }
 function readStore() {
   const filePath = getMcpOauthStoragePath();
-  if (!existsSync85(filePath)) {
+  if (!existsSync88(filePath)) {
     return null;
   }
   try {
-    const content = readFileSync58(filePath, "utf-8");
+    const content = readFileSync61(filePath, "utf-8");
     return JSON.parse(content);
   } catch {
     return null;
@@ -128997,8 +129276,8 @@ function readStore() {
 function writeStore(store2) {
   const filePath = getMcpOauthStoragePath();
   try {
-    const dir = dirname30(filePath);
-    if (!existsSync85(dir)) {
+    const dir = dirname31(filePath);
+    if (!existsSync88(dir)) {
       mkdirSync18(dir, { recursive: true });
     }
     const tempPath = `${filePath}.tmp.${Date.now()}`;
@@ -129215,7 +129494,7 @@ function buildAuthorizationUrl(authorizationEndpoint, options) {
 }
 var CALLBACK_TIMEOUT_MS = 5 * 60 * 1000;
 function startCallbackServer(port) {
-  return new Promise((resolve20, reject) => {
+  return new Promise((resolve21, reject) => {
     let timeoutId;
     const server = createServer((request, response) => {
       clearTimeout(timeoutId);
@@ -129241,7 +129520,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>");
       server.close();
-      resolve20({ code, state: state3 });
+      resolve21({ code, state: state3 });
     });
     timeoutId = setTimeout(() => {
       server.close();
@@ -130978,7 +131257,7 @@ class Protocol {
           return;
         }
         const pollInterval = task2.pollInterval ?? this._options?.defaultTaskPollInterval ?? 1000;
-        await new Promise((resolve20) => setTimeout(resolve20, pollInterval));
+        await new Promise((resolve21) => setTimeout(resolve21, pollInterval));
         options?.signal?.throwIfAborted();
       }
     } catch (error92) {
@@ -130990,7 +131269,7 @@ class Protocol {
   }
   request(request, resultSchema, options) {
     const { relatedRequestId, resumptionToken, onresumptiontoken, task, relatedTask } = options ?? {};
-    return new Promise((resolve20, reject) => {
+    return new Promise((resolve21, reject) => {
       const earlyReject = (error92) => {
         reject(error92);
       };
@@ -131068,7 +131347,7 @@ class Protocol {
           if (!parseResult.success) {
             reject(parseResult.error);
           } else {
-            resolve20(parseResult.data);
+            resolve21(parseResult.data);
           }
         } catch (error92) {
           reject(error92);
@@ -131259,12 +131538,12 @@ class Protocol {
         interval = task.pollInterval;
       }
     } catch {}
-    return new Promise((resolve20, reject) => {
+    return new Promise((resolve21, reject) => {
       if (signal.aborted) {
         reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
         return;
       }
-      const timeoutId = setTimeout(resolve20, interval);
+      const timeoutId = setTimeout(resolve21, interval);
       signal.addEventListener("abort", () => {
         clearTimeout(timeoutId);
         reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
@@ -133656,7 +133935,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((resolve20, reject) => {
+    return new Promise((resolve21, reject) => {
       this._process = import_cross_spawn.default(this._serverParams.command, this._serverParams.args ?? [], {
         env: {
           ...getDefaultEnvironment(),
@@ -133672,7 +133951,7 @@ class StdioClientTransport {
         this.onerror?.(error92);
       });
       this._process.on("spawn", () => {
-        resolve20();
+        resolve21();
       });
       this._process.on("close", (_code) => {
         this._process = undefined;
@@ -133719,20 +133998,20 @@ class StdioClientTransport {
     if (this._process) {
       const processToClose = this._process;
       this._process = undefined;
-      const closePromise = new Promise((resolve20) => {
+      const closePromise = new Promise((resolve21) => {
         processToClose.once("close", () => {
-          resolve20();
+          resolve21();
         });
       });
       try {
         processToClose.stdin?.end();
       } catch {}
-      await Promise.race([closePromise, new Promise((resolve20) => setTimeout(resolve20, 2000).unref())]);
+      await Promise.race([closePromise, new Promise((resolve21) => setTimeout(resolve21, 2000).unref())]);
       if (processToClose.exitCode === null) {
         try {
           processToClose.kill("SIGTERM");
         } catch {}
-        await Promise.race([closePromise, new Promise((resolve20) => setTimeout(resolve20, 2000).unref())]);
+        await Promise.race([closePromise, new Promise((resolve21) => setTimeout(resolve21, 2000).unref())]);
       }
       if (processToClose.exitCode === null) {
         try {
@@ -133743,15 +134022,15 @@ class StdioClientTransport {
     this._readBuffer.clear();
   }
   send(message) {
-    return new Promise((resolve20) => {
+    return new Promise((resolve21) => {
       if (!this._process?.stdin) {
         throw new Error("Not connected");
       }
       const json4 = serializeMessage(message);
       if (this._process.stdin.write(json4)) {
-        resolve20();
+        resolve21();
       } else {
-        this._process.stdin.once("drain", resolve20);
+        this._process.stdin.once("drain", resolve21);
       }
     });
   }
@@ -135357,7 +135636,7 @@ class TmuxSessionManager {
       } catch (err) {
         log("[tmux-session-manager] session status check error", { error: String(err) });
       }
-      await new Promise((resolve20) => setTimeout(resolve20, SESSION_READY_POLL_INTERVAL_MS));
+      await new Promise((resolve21) => setTimeout(resolve21, SESSION_READY_POLL_INTERVAL_MS));
     }
     log("[tmux-session-manager] session ready timeout", {
       sessionId,
@@ -135935,13 +136214,13 @@ async function isTmuxAvailable() {
 }
 
 // src/openclaw/reply-listener.ts
-import { dirname as dirname32, join as join98 } from "path";
+import { dirname as dirname33, join as join99 } from "path";
 
 // src/openclaw/session-registry.ts
 import {
-  existsSync as existsSync86,
+  existsSync as existsSync89,
   mkdirSync as mkdirSync19,
-  readFileSync as readFileSync59,
+  readFileSync as readFileSync62,
   writeFileSync as writeFileSync23,
   openSync as openSync3,
   closeSync as closeSync3,
@@ -135950,11 +136229,11 @@ import {
   statSync as statSync11,
   constants as constants20
 } from "fs";
-import { join as join96, dirname as dirname31 } from "path";
+import { join as join97, dirname as dirname32 } from "path";
 import { randomUUID as randomUUID4 } from "crypto";
-var OPENCLAW_STORAGE_DIR = join96(getOpenCodeStorageDir(), "openclaw");
-var REGISTRY_PATH = join96(OPENCLAW_STORAGE_DIR, "reply-session-registry.jsonl");
-var REGISTRY_LOCK_PATH = join96(OPENCLAW_STORAGE_DIR, "reply-session-registry.lock");
+var OPENCLAW_STORAGE_DIR = join97(getOpenCodeStorageDir(), "openclaw");
+var REGISTRY_PATH = join97(OPENCLAW_STORAGE_DIR, "reply-session-registry.jsonl");
+var REGISTRY_LOCK_PATH = join97(OPENCLAW_STORAGE_DIR, "reply-session-registry.lock");
 var SECURE_FILE_MODE = 384;
 var MAX_AGE_MS = 24 * 60 * 60 * 1000;
 var LOCK_TIMEOUT_MS = 2000;
@@ -135962,8 +136241,8 @@ var LOCK_WAIT_TIMEOUT_MS = 4000;
 var LOCK_RETRY_MS = 20;
 var LOCK_STALE_MS = 1e4;
 function ensureRegistryDir() {
-  const registryDir = dirname31(REGISTRY_PATH);
-  if (!existsSync86(registryDir)) {
+  const registryDir = dirname32(REGISTRY_PATH);
+  if (!existsSync89(registryDir)) {
     mkdirSync19(registryDir, { recursive: true, mode: 448 });
   }
 }
@@ -135982,9 +136261,9 @@ function isPidAlive(pid) {
 }
 function readLockSnapshot() {
   try {
-    if (!existsSync86(REGISTRY_LOCK_PATH))
+    if (!existsSync89(REGISTRY_LOCK_PATH))
       return null;
-    const raw = readFileSync59(REGISTRY_LOCK_PATH, "utf-8");
+    const raw = readFileSync62(REGISTRY_LOCK_PATH, "utf-8");
     const trimmed = raw.trim();
     if (!trimmed)
       return { raw, pid: null, token: null };
@@ -136008,9 +136287,9 @@ function readLockSnapshot() {
 }
 function removeLockIfUnchanged(snapshot) {
   try {
-    if (!existsSync86(REGISTRY_LOCK_PATH))
+    if (!existsSync89(REGISTRY_LOCK_PATH))
       return false;
-    const currentRaw = readFileSync59(REGISTRY_LOCK_PATH, "utf-8");
+    const currentRaw = readFileSync62(REGISTRY_LOCK_PATH, "utf-8");
     if (currentRaw !== snapshot.raw)
       return false;
     unlinkSync15(REGISTRY_LOCK_PATH);
@@ -136114,10 +136393,10 @@ function withRegistryLock(onLocked, onLockUnavailable) {
   }
 }
 function readAllMappingsUnsafe() {
-  if (!existsSync86(REGISTRY_PATH))
+  if (!existsSync89(REGISTRY_PATH))
     return [];
   try {
-    const content = readFileSync59(REGISTRY_PATH, "utf-8");
+    const content = readFileSync62(REGISTRY_PATH, "utf-8");
     return content.split(`
 `).filter((line) => line.trim()).map((line) => {
       try {
@@ -136172,7 +136451,7 @@ function removeSession(sessionId) {
 import {
   appendFileSync as appendFileSync6,
   chmodSync as chmodSync3,
-  existsSync as existsSync88,
+  existsSync as existsSync91,
   renameSync as renameSync7,
   statSync as statSync12,
   unlinkSync as unlinkSync16,
@@ -136180,31 +136459,31 @@ import {
 } from "fs";
 
 // src/openclaw/reply-listener-paths.ts
-import { existsSync as existsSync87, mkdirSync as mkdirSync20 } from "fs";
-import { homedir as homedir16 } from "os";
-import { join as join97 } from "path";
+import { existsSync as existsSync90, mkdirSync as mkdirSync20 } from "fs";
+import { homedir as homedir17 } from "os";
+import { join as join98 } from "path";
 var REPLY_LISTENER_SECURE_FILE_MODE = 384;
 function resolveReplyListenerHomeDir() {
-  return process.env.HOME ?? process.env.USERPROFILE ?? homedir16();
+  return process.env.HOME ?? process.env.USERPROFILE ?? homedir17();
 }
 function getReplyListenerStateDir() {
-  return join97(resolveReplyListenerHomeDir(), ".omx", "state");
+  return join98(resolveReplyListenerHomeDir(), ".omx", "state");
 }
 function getReplyListenerPidFilePath() {
-  return join97(getReplyListenerStateDir(), "reply-listener.pid");
+  return join98(getReplyListenerStateDir(), "reply-listener.pid");
 }
 function getReplyListenerStateFilePath() {
-  return join97(getReplyListenerStateDir(), "reply-listener-state.json");
+  return join98(getReplyListenerStateDir(), "reply-listener-state.json");
 }
 function getReplyListenerConfigFilePath() {
-  return join97(getReplyListenerStateDir(), "reply-listener-config.json");
+  return join98(getReplyListenerStateDir(), "reply-listener-config.json");
 }
 function getReplyListenerLogFilePath() {
-  return join97(getReplyListenerStateDir(), "reply-listener.log");
+  return join98(getReplyListenerStateDir(), "reply-listener.log");
 }
 function ensureReplyListenerStateDir() {
   const stateDir = getReplyListenerStateDir();
-  if (!existsSync87(stateDir)) {
+  if (!existsSync90(stateDir)) {
     mkdirSync20(stateDir, { recursive: true, mode: 448 });
   }
 }
@@ -136220,13 +136499,13 @@ function writeSecureReplyListenerFile(filePath, content) {
 }
 function rotateReplyListenerLogIfNeeded(logPath) {
   try {
-    if (!existsSync88(logPath))
+    if (!existsSync91(logPath))
       return;
     const stats = statSync12(logPath);
     if (stats.size <= MAX_REPLY_LISTENER_LOG_SIZE_BYTES)
       return;
     const backupPath = `${logPath}.old`;
-    if (existsSync88(backupPath)) {
+    if (existsSync91(backupPath)) {
       unlinkSync16(backupPath);
     }
     renameSync7(logPath, backupPath);
@@ -136267,7 +136546,7 @@ class ReplyListenerRateLimiter {
 }
 
 // src/openclaw/reply-listener-state.ts
-import { existsSync as existsSync89, readFileSync as readFileSync60, unlinkSync as unlinkSync17 } from "fs";
+import { existsSync as existsSync92, readFileSync as readFileSync63, unlinkSync as unlinkSync17 } from "fs";
 var REPLY_LISTENER_STARTUP_TOKEN_ENV = "OMO_OPENCLAW_REPLY_LISTENER_STARTUP_TOKEN";
 function createDefaultReplyListenerState() {
   return {
@@ -136329,9 +136608,9 @@ function createPendingReplyListenerState(startupToken) {
 function readReplyListenerDaemonState() {
   try {
     const stateFilePath = getReplyListenerStateFilePath();
-    if (!existsSync89(stateFilePath))
+    if (!existsSync92(stateFilePath))
       return null;
-    return normalizeReplyListenerState(JSON.parse(readFileSync60(stateFilePath, "utf-8")));
+    return normalizeReplyListenerState(JSON.parse(readFileSync63(stateFilePath, "utf-8")));
   } catch {
     return null;
   }
@@ -136346,9 +136625,9 @@ function writeReplyListenerDaemonState(state3) {
 function readReplyListenerDaemonConfig() {
   try {
     const configFilePath = getReplyListenerConfigFilePath();
-    if (!existsSync89(configFilePath))
+    if (!existsSync92(configFilePath))
       return null;
-    return JSON.parse(readFileSync60(configFilePath, "utf-8"));
+    return JSON.parse(readFileSync63(configFilePath, "utf-8"));
   } catch {
     return null;
   }
@@ -136359,9 +136638,9 @@ function writeReplyListenerDaemonConfig(config4) {
 function readReplyListenerPid() {
   try {
     const pidFilePath = getReplyListenerPidFilePath();
-    if (!existsSync89(pidFilePath))
+    if (!existsSync92(pidFilePath))
       return null;
-    const pid = Number.parseInt(readFileSync60(pidFilePath, "utf-8").trim(), 10);
+    const pid = Number.parseInt(readFileSync63(pidFilePath, "utf-8").trim(), 10);
     return Number.isNaN(pid) ? null : pid;
   } catch {
     return null;
@@ -136372,7 +136651,7 @@ function writeReplyListenerPid(pid) {
 }
 function removeReplyListenerPid() {
   const pidFilePath = getReplyListenerPidFilePath();
-  if (existsSync89(pidFilePath)) {
+  if (existsSync92(pidFilePath)) {
     unlinkSync17(pidFilePath);
   }
 }
@@ -136388,7 +136667,7 @@ function markReplyListenerStopped(state3, error92) {
 }
 
 // src/openclaw/reply-listener-process.ts
-import { readFileSync as readFileSync61 } from "fs";
+import { readFileSync as readFileSync64 } from "fs";
 var {spawn: spawn25 } = globalThis.Bun;
 var REPLY_LISTENER_DAEMON_IDENTITY_MARKER = "--openclaw-reply-listener-daemon";
 var REPLY_LISTENER_DAEMON_ENV_ALLOWLIST = [
@@ -136444,7 +136723,7 @@ function isReplyListenerProcessRunning(pid) {
 async function isReplyListenerDaemonProcess(pid) {
   try {
     if (process.platform === "linux") {
-      const cmdline = readFileSync61(`/proc/${pid}/cmdline`, "utf-8");
+      const cmdline = readFileSync64(`/proc/${pid}/cmdline`, "utf-8");
       return cmdline.includes(REPLY_LISTENER_DAEMON_IDENTITY_MARKER);
     }
     const processInfo = spawn25(["ps", "-p", String(pid), "-o", "args="], {
@@ -136509,7 +136788,7 @@ async function waitForReplyListenerReady(options) {
 var PRUNE_INTERVAL_MS = 60 * 60 * 1000;
 var REPLY_LISTENER_STOP_TIMEOUT_MS = 1000;
 function sleep(ms) {
-  return new Promise((resolve20) => setTimeout(resolve20, ms));
+  return new Promise((resolve21) => setTimeout(resolve21, ms));
 }
 async function terminateReplyListenerProcess(pid) {
   if (!isReplyListenerProcessRunning(pid))
@@ -136606,7 +136885,7 @@ async function startReplyListener(config4) {
   pendingState.configSignature = getReplyListenerRuntimeSignature(normalizedConfig);
   writeReplyListenerDaemonState(pendingState);
   const currentFile = import.meta.url;
-  const daemonScript = currentFile.endsWith(".ts") ? join98(dirname32(new URL(currentFile).pathname), "daemon.ts") : join98(dirname32(new URL(currentFile).pathname), "daemon.js");
+  const daemonScript = currentFile.endsWith(".ts") ? join99(dirname33(new URL(currentFile).pathname), "daemon.ts") : join99(dirname33(new URL(currentFile).pathname), "daemon.js");
   try {
     const processInfo = spawnReplyListenerDaemon(daemonScript, startupToken);
     processInfo.unref();
@@ -136877,22 +137156,22 @@ async function dispatchOpenClawEvent(params) {
   return result;
 }
 // src/features/claude-code-mcp-loader/loader.ts
-import { existsSync as existsSync90, readFileSync as readFileSync62 } from "fs";
-import { join as join99 } from "path";
-import { homedir as homedir17 } from "os";
+import { existsSync as existsSync93, readFileSync as readFileSync65 } from "fs";
+import { join as join100 } from "path";
+import { homedir as homedir18 } from "os";
 init_logger();
 function getMcpConfigPaths() {
   const claudeConfigDir = getClaudeConfigDir();
   const cwd = process.cwd();
   return [
-    { path: join99(homedir17(), ".claude.json"), scope: "user" },
-    { path: join99(claudeConfigDir, ".mcp.json"), scope: "user" },
-    { path: join99(cwd, ".mcp.json"), scope: "project" },
-    { path: join99(cwd, ".claude", ".mcp.json"), scope: "local" }
+    { path: join100(homedir18(), ".claude.json"), scope: "user" },
+    { path: join100(claudeConfigDir, ".mcp.json"), scope: "user" },
+    { path: join100(cwd, ".mcp.json"), scope: "project" },
+    { path: join100(cwd, ".claude", ".mcp.json"), scope: "local" }
   ];
 }
 async function loadMcpConfigFile(filePath) {
-  if (!existsSync90(filePath)) {
+  if (!existsSync93(filePath)) {
     return null;
   }
   try {
@@ -136907,11 +137186,11 @@ function getSystemMcpServerNames() {
   const names = new Set;
   const paths = getMcpConfigPaths();
   const cwd = process.cwd();
-  for (const { path: path14 } of paths) {
-    if (!existsSync90(path14))
+  for (const { path: path15 } of paths) {
+    if (!existsSync93(path15))
       continue;
     try {
-      const content = readFileSync62(path14, "utf-8");
+      const content = readFileSync65(path15, "utf-8");
       const config4 = JSON.parse(content);
       if (!config4?.mcpServers)
         continue;
@@ -136936,30 +137215,30 @@ async function loadMcpConfigs(disabledMcps = []) {
   const paths = getMcpConfigPaths();
   const disabledSet = new Set(disabledMcps);
   const cwd = process.cwd();
-  for (const { path: path14, scope } of paths) {
-    const config4 = await loadMcpConfigFile(path14);
+  for (const { path: path15, scope } of paths) {
+    const config4 = await loadMcpConfigFile(path15);
     if (!config4?.mcpServers)
       continue;
     for (const [name, serverConfig] of Object.entries(config4.mcpServers)) {
       if (disabledSet.has(name)) {
-        log(`Skipping MCP "${name}" (in disabled_mcps)`, { path: path14 });
+        log(`Skipping MCP "${name}" (in disabled_mcps)`, { path: path15 });
         continue;
       }
       if (!shouldLoadMcpServer(serverConfig, cwd)) {
         log(`Skipping MCP server "${name}" because local scope does not match cwd`, {
-          path: path14,
+          path: path15,
           projectPath: serverConfig.projectPath,
           cwd
         });
         continue;
       }
       if (serverConfig.disabled) {
-        log(`Disabling MCP server "${name}"`, { path: path14 });
+        log(`Disabling MCP server "${name}"`, { path: path15 });
         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: path14 });
+          log(`Removed previously loaded MCP server "${name}"`, { path: path15 });
         }
         continue;
       }
@@ -136971,7 +137250,7 @@ async function loadMcpConfigs(disabledMcps = []) {
           loadedServers.splice(existingIndex, 1);
         }
         loadedServers.push({ name, scope, config: transformed });
-        log(`Loaded MCP server "${name}" from ${scope}`, { path: path14 });
+        log(`Loaded MCP server "${name}" from ${scope}`, { path: path15 });
       } catch (error92) {
         log(`Failed to transform MCP server "${name}"`, error92);
       }
@@ -142306,9 +142585,9 @@ function createHephaestusAgent2(model, availableAgents, availableToolNames, avai
 }
 createHephaestusAgent2.mode = MODE10;
 // src/agents/builtin-agents/resolve-file-uri.ts
-import { existsSync as existsSync91, readFileSync as readFileSync63 } from "fs";
-import { homedir as homedir18 } from "os";
-import { isAbsolute as isAbsolute12, resolve as resolve20 } from "path";
+import { existsSync as existsSync94, readFileSync as readFileSync66 } from "fs";
+import { homedir as homedir19 } from "os";
+import { isAbsolute as isAbsolute13, resolve as resolve21 } from "path";
 init_logger();
 function resolvePromptAppend(promptAppend, configDir) {
   if (!promptAppend.startsWith("file://"))
@@ -142317,8 +142596,8 @@ function resolvePromptAppend(promptAppend, configDir) {
   let filePath;
   try {
     const decoded = decodeURIComponent(encoded);
-    const expanded = decoded.startsWith("~/") ? decoded.replace(/^~\//, `${homedir18()}/`) : decoded;
-    filePath = isAbsolute12(expanded) ? expanded : resolve20(configDir ?? process.cwd(), expanded);
+    const expanded = decoded.startsWith("~/") ? decoded.replace(/^~\//, `${homedir19()}/`) : decoded;
+    filePath = isAbsolute13(expanded) ? expanded : resolve21(configDir ?? process.cwd(), expanded);
   } catch {
     return `[WARNING: Malformed file URI (invalid percent-encoding): ${promptAppend}]`;
   }
@@ -142331,11 +142610,11 @@ function resolvePromptAppend(promptAppend, configDir) {
     });
     return `[WARNING: Path rejected: ${promptAppend}]`;
   }
-  if (!existsSync91(filePath)) {
+  if (!existsSync94(filePath)) {
     return `[WARNING: Could not resolve file URI: ${promptAppend}]`;
   }
   try {
-    return readFileSync63(filePath, "utf8");
+    return readFileSync66(filePath, "utf8");
   } catch {
     return `[WARNING: Could not read file: ${promptAppend}]`;
   }
@@ -145968,7 +146247,11 @@ async function applyAgentConfig(params) {
   const includeClaudeAgents = params.pluginConfig.claude_code?.agents ?? true;
   const userAgents = includeClaudeAgents ? loadUserAgents() : {};
   const projectAgents = includeClaudeAgents ? loadProjectAgents(params.ctx.directory) : {};
+  const opencodeGlobalAgents = loadOpencodeGlobalAgents();
+  const opencodeProjectAgents = loadOpencodeProjectAgents(params.ctx.directory);
   const rawPluginAgents = params.pluginComponents.agents;
+  const agentDefinitionAgents = params.pluginConfig.agent_definitions ? loadAgentDefinitions(params.pluginConfig.agent_definitions, "definition-file") : {};
+  const opencodeConfigAgents = readOpencodeConfigAgents(params.ctx.directory);
   const pluginAgents = Object.fromEntries(Object.entries(rawPluginAgents).map(([key, value]) => {
     if (!value)
       return [key, value];
@@ -145982,11 +146265,25 @@ async function applyAgentConfig(params) {
     ...Object.entries(configAgent ?? {}),
     ...Object.entries(userAgents),
     ...Object.entries(projectAgents),
-    ...Object.entries(pluginAgents).filter(([, config4]) => config4 !== undefined)
+    ...Object.entries(opencodeGlobalAgents),
+    ...Object.entries(opencodeProjectAgents),
+    ...Object.entries(pluginAgents).filter(([, config4]) => config4 !== undefined),
+    ...Object.entries(agentDefinitionAgents),
+    ...Object.entries(opencodeConfigAgents)
   ].filter(([, config4]) => config4 != null).map(([name, config4]) => ({
     name,
     description: typeof config4?.description === "string" ? config4.description : ""
   }));
+  log("[agent-config-handler] Agent sources loaded", {
+    user: Object.keys(userAgents).length,
+    project: Object.keys(projectAgents).length,
+    opencodeGlobal: Object.keys(opencodeGlobalAgents).length,
+    opencodeProject: Object.keys(opencodeProjectAgents).length,
+    plugin: Object.keys(pluginAgents).length,
+    agentDefinitions: Object.keys(agentDefinitionAgents).length,
+    opencodeConfig: Object.keys(opencodeConfigAgents).length,
+    config: Object.keys(configAgent ?? {}).length
+  });
   const builtinAgents = await createBuiltinAgents(migratedDisabledAgents, params.pluginConfig.agents, params.ctx.directory, currentModel, params.pluginConfig.categories, params.pluginConfig.git_master, allDiscoveredSkills, customAgentSummaries, browserProvider, currentModel, disabledSkills, useTaskSystem, disableOmoEnv);
   const disabledAgentNames = new Set((migratedDisabledAgents ?? []).map((a) => a.toLowerCase()));
   const filterDisabledAgents = (agents) => Object.fromEntries(Object.entries(agents).filter(([name]) => !disabledAgentNames.has(name.toLowerCase())));
@@ -146057,12 +146354,20 @@ async function applyAgentConfig(params) {
     const filteredUserAgents = filterProtectedAgentOverrides(userAgents, protectedBuiltinAgentNames);
     const filteredProjectAgents = filterProtectedAgentOverrides(projectAgents, protectedBuiltinAgentNames);
     const filteredPluginAgents = filterProtectedAgentOverrides(pluginAgents, protectedBuiltinAgentNames);
+    const filteredOpencodeGlobalAgents = filterProtectedAgentOverrides(opencodeGlobalAgents, protectedBuiltinAgentNames);
+    const filteredOpencodeProjectAgents = filterProtectedAgentOverrides(opencodeProjectAgents, protectedBuiltinAgentNames);
+    const filteredAgentDefinitionAgents = filterProtectedAgentOverrides(agentDefinitionAgents, protectedBuiltinAgentNames);
+    const filteredOpencodeConfigAgents = filterProtectedAgentOverrides(opencodeConfigAgents, protectedBuiltinAgentNames);
     params.config.agent = {
       ...agentConfig,
       ...Object.fromEntries(Object.entries(builtinAgents).filter(([key]) => key !== "sisyphus" && key !== "hephaestus" && key !== "atlas")),
+      ...filterDisabledAgents(filteredPluginAgents),
       ...filterDisabledAgents(filteredUserAgents),
+      ...filterDisabledAgents(filteredOpencodeGlobalAgents),
       ...filterDisabledAgents(filteredProjectAgents),
-      ...filterDisabledAgents(filteredPluginAgents),
+      ...filterDisabledAgents(filteredOpencodeProjectAgents),
+      ...filterDisabledAgents(filteredAgentDefinitionAgents),
+      ...filterDisabledAgents(filteredOpencodeConfigAgents),
       ...filteredConfigAgents,
       build: { ...migratedBuild, mode: "subagent", hidden: true },
       ...planDemoteConfig ? { plan: planDemoteConfig } : {}
@@ -146072,6 +146377,10 @@ async function applyAgentConfig(params) {
     const filteredUserAgents = filterProtectedAgentOverrides(userAgents, protectedBuiltinAgentNames);
     const filteredProjectAgents = filterProtectedAgentOverrides(projectAgents, protectedBuiltinAgentNames);
     const filteredPluginAgents = filterProtectedAgentOverrides(pluginAgents, protectedBuiltinAgentNames);
+    const filteredOpencodeGlobalAgents = filterProtectedAgentOverrides(opencodeGlobalAgents, protectedBuiltinAgentNames);
+    const filteredOpencodeProjectAgents = filterProtectedAgentOverrides(opencodeProjectAgents, protectedBuiltinAgentNames);
+    const filteredAgentDefinitionAgents = filterProtectedAgentOverrides(agentDefinitionAgents, protectedBuiltinAgentNames);
+    const filteredOpencodeConfigAgents = filterProtectedAgentOverrides(opencodeConfigAgents, protectedBuiltinAgentNames);
     const defaultedConfigAgents = configAgent ? Object.fromEntries(Object.entries(configAgent).map(([key, value]) => {
       if (!value)
         return [key, value];
@@ -146082,9 +146391,13 @@ async function applyAgentConfig(params) {
     })) : {};
     params.config.agent = {
       ...builtinAgents,
+      ...filterDisabledAgents(filteredPluginAgents),
       ...filterDisabledAgents(filteredUserAgents),
+      ...filterDisabledAgents(filteredOpencodeGlobalAgents),
       ...filterDisabledAgents(filteredProjectAgents),
-      ...filterDisabledAgents(filteredPluginAgents),
+      ...filterDisabledAgents(filteredOpencodeProjectAgents),
+      ...filterDisabledAgents(filteredAgentDefinitionAgents),
+      ...filterDisabledAgents(filteredOpencodeConfigAgents),
       ...defaultedConfigAgents
     };
   }
@@ -146103,18 +146416,18 @@ async function applyAgentConfig(params) {
 // src/plugin-handlers/command-config-handler.ts
 init_agent_display_names();
 // src/features/claude-code-command-loader/loader.ts
-import { promises as fs20 } from "fs";
-import { join as join100, basename as basename16 } from "path";
+import { promises as fs21 } from "fs";
+import { join as join101, basename as basename16 } from "path";
 init_logger();
 async function loadCommandsFromDir(commandsDir, scope, visited = new Set, prefix = "") {
   try {
-    await fs20.access(commandsDir);
+    await fs21.access(commandsDir);
   } catch {
     return [];
   }
   let realPath;
   try {
-    realPath = await fs20.realpath(commandsDir);
+    realPath = await fs21.realpath(commandsDir);
   } catch (error92) {
     log(`Failed to resolve command directory: ${commandsDir}`, error92);
     return [];
@@ -146125,7 +146438,7 @@ async function loadCommandsFromDir(commandsDir, scope, visited = new Set, prefix
   visited.add(realPath);
   let entries;
   try {
-    entries = await fs20.readdir(commandsDir, { withFileTypes: true });
+    entries = await fs21.readdir(commandsDir, { withFileTypes: true });
   } catch (error92) {
     log(`Failed to read command directory: ${commandsDir}`, error92);
     return [];
@@ -146135,7 +146448,7 @@ async function loadCommandsFromDir(commandsDir, scope, visited = new Set, prefix
     if (entry.isDirectory()) {
       if (entry.name.startsWith("."))
         continue;
-      const subDirPath = join100(commandsDir, entry.name);
+      const subDirPath = join101(commandsDir, entry.name);
       const subPrefix = prefix ? `${prefix}/${entry.name}` : entry.name;
       const subCommands = await loadCommandsFromDir(subDirPath, scope, visited, subPrefix);
       commands3.push(...subCommands);
@@ -146143,11 +146456,11 @@ async function loadCommandsFromDir(commandsDir, scope, visited = new Set, prefix
     }
     if (!isMarkdownFile(entry))
       continue;
-    const commandPath = join100(commandsDir, entry.name);
+    const commandPath = join101(commandsDir, entry.name);
     const baseCommandName = basename16(entry.name, ".md");
     const commandName = prefix ? `${prefix}/${baseCommandName}` : baseCommandName;
     try {
-      const content = await fs20.readFile(commandPath, "utf-8");
+      const content = await fs21.readFile(commandPath, "utf-8");
       const { data, body } = parseFrontmatter(content);
       const wrappedTemplate = `<command-instruction>
 ${body.trim()}
@@ -146202,12 +146515,12 @@ function commandsToRecord(commands3) {
   return result;
 }
 async function loadUserCommands() {
-  const userCommandsDir = join100(getClaudeConfigDir(), "commands");
+  const userCommandsDir = join101(getClaudeConfigDir(), "commands");
   const commands3 = await loadCommandsFromDir(userCommandsDir, "user");
   return commandsToRecord(commands3);
 }
 async function loadProjectCommands(directory) {
-  const projectCommandsDir = join100(directory ?? process.cwd(), ".claude", "commands");
+  const projectCommandsDir = join101(directory ?? process.cwd(), ".claude", "commands");
   const commands3 = await loadCommandsFromDir(projectCommandsDir, "project");
   return commandsToRecord(commands3);
 }
@@ -147258,10 +147571,10 @@ init_agent_display_names();
 
 // src/plugin/ultrawork-db-model-override.ts
 import { Database } from "bun:sqlite";
-import { join as join101 } from "path";
-import { existsSync as existsSync92 } from "fs";
+import { join as join102 } from "path";
+import { existsSync as existsSync95 } from "fs";
 function getDbPath() {
-  return join101(getDataDir(), "opencode", "opencode.db");
+  return join102(getDataDir(), "opencode", "opencode.db");
 }
 var MAX_MICROTASK_RETRIES = 10;
 function tryUpdateMessageModel(db, messageId, targetModel, variant) {
@@ -147338,7 +147651,7 @@ function retryViaMicrotask(db, messageId, targetModel, variant, attempt) {
 function scheduleDeferredModelOverride(messageId, targetModel, variant) {
   queueMicrotask(() => {
     const dbPath = getDbPath();
-    if (!existsSync92(dbPath)) {
+    if (!existsSync95(dbPath)) {
       log("[ultrawork-db-override] DB not found, skipping deferred override");
       return;
     }
@@ -148282,6 +148595,7 @@ function createEventHandler2(args) {
 }
 
 // src/plugin/tool-execute-after.ts
+init_agent_display_names();
 var VERIFICATION_ATTEMPT_PATTERN = /<ulw_verification_attempt_id>(.*?)<\/ulw_verification_attempt_id>/i;
 function getMetadataString(metadata, keys) {
   for (const key of keys) {
@@ -148319,7 +148633,7 @@ function createToolExecuteAfterHandler3(args) {
       const prompt = getMetadataString(output.metadata, ["prompt"]);
       const verificationAttemptId = prompt?.match(VERIFICATION_ATTEMPT_PATTERN)?.[1]?.trim();
       const loopState = directory ? readState(directory) : null;
-      const isVerificationContext = agent === "oracle" && !!sessionId && !!directory && loopState?.active === true && loopState.ultrawork === true && loopState.verification_pending === true && loopState.session_id === input.sessionID;
+      const isVerificationContext = (agent ? stripInvisibleAgentCharacters(agent) : agent) === "oracle" && !!sessionId && !!directory && loopState?.active === true && loopState.ultrawork === true && loopState.verification_pending === true && loopState.session_id === input.sessionID;
       log("[tool-execute-after] ULW verification tracking check", {
         tool: input.tool,
         agent,
@@ -148401,6 +148715,7 @@ function createToolExecuteAfterHandler3(args) {
 
 // src/plugin/tool-execute-before.ts
 import { randomUUID as randomUUID6 } from "crypto";
+init_agent_display_names();
 
 // src/plugin/session-agent-resolver.ts
 async function resolveSessionAgent(client2, sessionId) {
@@ -148502,7 +148817,7 @@ function createToolExecuteBeforeHandler3(args) {
         const resolvedAgent = await resolveSessionAgent(ctx.client, sessionId);
         argsObject.subagent_type = resolvedAgent ?? "continue";
       }
-      const normalizedSubagentType = typeof argsObject.subagent_type === "string" ? argsObject.subagent_type : undefined;
+      const normalizedSubagentType = typeof argsObject.subagent_type === "string" ? stripInvisibleAgentCharacters(argsObject.subagent_type) : undefined;
       const prompt = typeof argsObject.prompt === "string" ? argsObject.prompt : "";
       const loopState = typeof ctx.directory === "string" ? readState(ctx.directory) : null;
       const shouldInjectOracleVerification = normalizedSubagentType === "oracle" && loopState?.active === true && loopState.ultrawork === true && loopState.verification_pending === true && loopState.session_id === input.sessionID;
@@ -148696,7 +149011,7 @@ import os6 from "os";
 import { createHash as createHash3 } from "crypto";
 
 // node_modules/posthog-node/dist/extensions/error-tracking/modifiers/module.node.mjs
-import { dirname as dirname33, posix, sep as sep3 } from "path";
+import { dirname as dirname34, posix, sep as sep3 } from "path";
 function createModulerModifier() {
   const getModuleFromFileName = createGetModuleFromFilename();
   return async (frames) => {
@@ -148705,7 +149020,7 @@ function createModulerModifier() {
     return frames;
   };
 }
-function createGetModuleFromFilename(basePath = process.argv[1] ? dirname33(process.argv[1]) : process.cwd(), isWindows2 = sep3 === "\\") {
+function createGetModuleFromFilename(basePath = process.argv[1] ? dirname34(process.argv[1]) : process.cwd(), isWindows2 = sep3 === "\\") {
   const normalizedBase = isWindows2 ? normalizeWindowsPath(basePath) : basePath;
   return (filename) => {
     if (!filename)
@@ -148727,8 +149042,8 @@ function createGetModuleFromFilename(basePath = process.argv[1] ? dirname33(proc
     return decodedFile;
   };
 }
-function normalizeWindowsPath(path14) {
-  return path14.replace(/^[A-Z]:/, "").replace(/\\/g, "/");
+function normalizeWindowsPath(path15) {
+  return path15.replace(/^[A-Z]:/, "").replace(/\\/g, "/");
 }
 
 // node_modules/@posthog/core/dist/featureFlagUtils.mjs
@@ -151043,15 +151358,15 @@ async function addSourceContext(frames) {
   LRU_FILE_CONTENTS_CACHE.reduce();
   return frames;
 }
-function getContextLinesFromFile(path14, ranges, output) {
-  return new Promise((resolve21) => {
-    const stream = createReadStream(path14);
+function getContextLinesFromFile(path15, ranges, output) {
+  return new Promise((resolve22) => {
+    const stream = createReadStream(path15);
     const lineReaded = createInterface({
       input: stream
     });
     function destroyStreamAndResolve() {
       stream.destroy();
-      resolve21();
+      resolve22();
     }
     let lineNumber = 0;
     let currentRangeIndex = 0;
@@ -151061,7 +151376,7 @@ function getContextLinesFromFile(path14, ranges, output) {
     let rangeStart = range[0];
     let rangeEnd = range[1];
     function onStreamError() {
-      LRU_FILE_CONTENTS_FS_READ_FAILED.set(path14, 1);
+      LRU_FILE_CONTENTS_FS_READ_FAILED.set(path15, 1);
       lineReaded.close();
       lineReaded.removeAllListeners();
       destroyStreamAndResolve();
@@ -151129,8 +151444,8 @@ function clearLineContext(frame) {
   delete frame.context_line;
   delete frame.post_context;
 }
-function shouldSkipContextLinesForFile(path14) {
-  return path14.startsWith("node:") || path14.endsWith(".min.js") || path14.endsWith(".min.cjs") || path14.endsWith(".min.mjs") || path14.startsWith("data:");
+function shouldSkipContextLinesForFile(path15) {
+  return path15.startsWith("node:") || path15.endsWith(".min.js") || path15.endsWith(".min.cjs") || path15.endsWith(".min.mjs") || path15.startsWith("data:");
 }
 function shouldSkipContextLinesForFrame(frame) {
   if (frame.lineno !== undefined && frame.lineno > MAX_CONTEXTLINES_LINENO)
@@ -152291,9 +152606,9 @@ class PostHogBackendClient extends PostHogCoreStateless {
     if (this.disabled || this.optedOut)
       return;
     if (!this._waitUntilCycle) {
-      let resolve21;
+      let resolve22;
       const promise4 = new Promise((r) => {
-        resolve21 = r;
+        resolve22 = r;
       });
       try {
         waitUntil(promise4);
@@ -152301,7 +152616,7 @@ class PostHogBackendClient extends PostHogCoreStateless {
         return;
       }
       this._waitUntilCycle = {
-        resolve: resolve21,
+        resolve: resolve22,
         startedAt: Date.now(),
         timer: undefined
       };
@@ -152327,11 +152642,11 @@ class PostHogBackendClient extends PostHogCoreStateless {
     return cycle?.resolve;
   }
   async resolveWaitUntilFlush() {
-    const resolve21 = this._consumeWaitUntilCycle();
+    const resolve22 = this._consumeWaitUntilCycle();
     try {
       await super.flush();
     } catch {} finally {
-      resolve21?.();
+      resolve22?.();
     }
   }
   getPersistedProperty(key) {
@@ -152431,15 +152746,15 @@ class PostHogBackendClient extends PostHogCoreStateless {
       return true;
     if (this.featureFlagsPoller === undefined)
       return false;
-    return new Promise((resolve21) => {
+    return new Promise((resolve22) => {
       const timeout = setTimeout(() => {
         cleanup2();
-        resolve21(false);
+        resolve22(false);
       }, timeoutMs);
       const cleanup2 = this._events.on("localEvaluationFlagsLoaded", (count) => {
         clearTimeout(timeout);
         cleanup2();
-        resolve21(count > 0);
+        resolve22(count > 0);
       });
     });
   }
@@ -152783,13 +153098,13 @@ class PostHogBackendClient extends PostHogCoreStateless {
     this.context?.enter(data, options);
   }
   async _shutdown(shutdownTimeoutMs) {
-    const resolve21 = this._consumeWaitUntilCycle();
+    const resolve22 = this._consumeWaitUntilCycle();
     await this.featureFlagsPoller?.stopPoller(shutdownTimeoutMs);
     this.errorTracking.shutdown();
     try {
       return await super._shutdown(shutdownTimeoutMs);
     } finally {
-      resolve21?.();
+      resolve22?.();
     }
   }
   async _requestRemoteConfigPayload(flagKey) {
@@ -153137,7 +153452,7 @@ class PostHog extends PostHogBackendClient {
 // package.json
 var package_default = {
   name: "oh-my-opencode",
-  version: "3.17.2",
+  version: "3.17.3",
   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",
@@ -153216,17 +153531,17 @@ var package_default = {
     typescript: "^5.7.3"
   },
   optionalDependencies: {
-    "oh-my-opencode-darwin-arm64": "3.17.2",
-    "oh-my-opencode-darwin-x64": "3.17.2",
-    "oh-my-opencode-darwin-x64-baseline": "3.17.2",
-    "oh-my-opencode-linux-arm64": "3.17.2",
-    "oh-my-opencode-linux-arm64-musl": "3.17.2",
-    "oh-my-opencode-linux-x64": "3.17.2",
-    "oh-my-opencode-linux-x64-baseline": "3.17.2",
-    "oh-my-opencode-linux-x64-musl": "3.17.2",
-    "oh-my-opencode-linux-x64-musl-baseline": "3.17.2",
-    "oh-my-opencode-windows-x64": "3.17.2",
-    "oh-my-opencode-windows-x64-baseline": "3.17.2"
+    "oh-my-opencode-darwin-arm64": "3.17.3",
+    "oh-my-opencode-darwin-x64": "3.17.3",
+    "oh-my-opencode-darwin-x64-baseline": "3.17.3",
+    "oh-my-opencode-linux-arm64": "3.17.3",
+    "oh-my-opencode-linux-arm64-musl": "3.17.3",
+    "oh-my-opencode-linux-x64": "3.17.3",
+    "oh-my-opencode-linux-x64-baseline": "3.17.3",
+    "oh-my-opencode-linux-x64-musl": "3.17.3",
+    "oh-my-opencode-linux-x64-musl-baseline": "3.17.3",
+    "oh-my-opencode-windows-x64": "3.17.3",
+    "oh-my-opencode-windows-x64-baseline": "3.17.3"
   },
   overrides: {},
   trustedDependencies: [
@@ -153240,13 +153555,13 @@ var package_default = {
 init_plugin_identity();
 
 // src/shared/posthog-activity-state.ts
-import { existsSync as existsSync93, mkdirSync as mkdirSync21, readFileSync as readFileSync64 } from "fs";
-import { join as join102 } from "path";
+import { existsSync as existsSync96, mkdirSync as mkdirSync21, readFileSync as readFileSync67 } from "fs";
+import { join as join103 } from "path";
 init_logger();
 init_plugin_identity();
 var POSTHOG_ACTIVITY_STATE_FILE = "posthog-activity.json";
 function getPostHogActivityStateFilePath() {
-  return join102(getDataDir(), CACHE_DIR_NAME, POSTHOG_ACTIVITY_STATE_FILE);
+  return join103(getDataDir(), CACHE_DIR_NAME, POSTHOG_ACTIVITY_STATE_FILE);
 }
 function getUtcDayString(date10) {
   return date10.toISOString().slice(0, 10);
@@ -153259,11 +153574,11 @@ function isPostHogActivityState(value) {
 }
 function readPostHogActivityState() {
   const stateFilePath = getPostHogActivityStateFilePath();
-  if (!existsSync93(stateFilePath)) {
+  if (!existsSync96(stateFilePath)) {
     return {};
   }
   try {
-    const content = readFileSync64(stateFilePath, "utf-8");
+    const content = readFileSync67(stateFilePath, "utf-8");
     const parsed = JSON.parse(content);
     if (!isPostHogActivityState(parsed)) {
       return {};
@@ -153280,7 +153595,7 @@ function readPostHogActivityState() {
 function writePostHogActivityState(nextState) {
   const stateFilePath = getPostHogActivityStateFilePath();
   try {
-    mkdirSync21(join102(getDataDir(), CACHE_DIR_NAME), { recursive: true });
+    mkdirSync21(join103(getDataDir(), CACHE_DIR_NAME), { recursive: true });
     writeFileAtomically(stateFilePath, `${JSON.stringify(nextState, null, 2)}
 `);
   } catch (error92) {
@@ -153432,7 +153747,7 @@ function getPostHogDistinctId() {
 }
 function createPluginPostHog() {
   return createPostHogClient("plugin", {
-    enableExceptionAutocapture: true,
+    enableExceptionAutocapture: false,
     flushAt: 1,
     flushInterval: 0
   });