oh-my-opencode 2.12.2 → 2.12.3

package/dist/index.js

@@ -549,7 +549,7 @@ var require_scan = __commonJS((exports, module) => {
 
 // node_modules/picomatch/lib/parse.js
 var require_parse = __commonJS((exports, module) => {
-  var constants = require_constants();
+  var constants2 = require_constants();
   var utils = require_utils();
   var {
     MAX_LENGTH,
@@ -557,7 +557,7 @@ var require_parse = __commonJS((exports, module) => {
     REGEX_NON_SPECIAL_CHARS,
     REGEX_SPECIAL_CHARS_BACKREF,
     REPLACEMENTS
-  } = constants;
+  } = constants2;
   var expandRange = (args, options) => {
     if (typeof options.expandRange === "function") {
       return options.expandRange(...args, options);
@@ -588,8 +588,8 @@ var require_parse = __commonJS((exports, module) => {
     const bos = { type: "bos", value: "", output: opts.prepend || "" };
     const tokens = [bos];
     const capture = opts.capture ? "" : "?:";
-    const PLATFORM_CHARS = constants.globChars(opts.windows);
-    const EXTGLOB_CHARS = constants.extglobChars(PLATFORM_CHARS);
+    const PLATFORM_CHARS = constants2.globChars(opts.windows);
+    const EXTGLOB_CHARS = constants2.extglobChars(PLATFORM_CHARS);
     const {
       DOT_LITERAL,
       PLUS_LITERAL,
@@ -1267,7 +1267,7 @@ var require_parse = __commonJS((exports, module) => {
       NO_DOTS_SLASH,
       STAR,
       START_ANCHOR
-    } = constants.globChars(opts.windows);
+    } = constants2.globChars(opts.windows);
     const nodot = opts.dot ? NO_DOTS : NO_DOT;
     const slashDot = opts.dot ? NO_DOTS_SLASH : NO_DOT;
     const capture = opts.capture ? "" : "?:";
@@ -1325,7 +1325,7 @@ var require_picomatch = __commonJS((exports, module) => {
   var scan = require_scan();
   var parse3 = require_parse();
   var utils = require_utils();
-  var constants = require_constants();
+  var constants2 = require_constants();
   var isObject2 = (val) => val && typeof val === "object" && !Array.isArray(val);
   var picomatch = (glob, options, returnState = false) => {
     if (Array.isArray(glob)) {
@@ -1456,7 +1456,7 @@ var require_picomatch = __commonJS((exports, module) => {
       return /$^/;
     }
   };
-  picomatch.constants = constants;
+  picomatch.constants = constants2;
   module.exports = picomatch;
 });
 
@@ -7925,12 +7925,12 @@ var require_dist = __commonJS((exports, module) => {
       throw new Error(`Unknown format "${name}"`);
     return f;
   };
-  function addFormats(ajv, list, fs9, exportName) {
+  function addFormats(ajv, list, fs10, exportName) {
     var _a;
     var _b;
     (_a = (_b = ajv.opts.code).formats) !== null && _a !== undefined || (_b.formats = (0, codegen_1._)`require("ajv-formats/dist/formats").${exportName}`);
     for (const f of list)
-      ajv.addFormat(f, fs9[f]);
+      ajv.addFormat(f, fs10[f]);
   }
   module.exports = exports = formatsPlugin;
   Object.defineProperty(exports, "__esModule", { value: true });
@@ -7941,7 +7941,7 @@ var require_dist = __commonJS((exports, module) => {
 var require_windows = __commonJS((exports, module) => {
   module.exports = isexe;
   isexe.sync = sync;
-  var fs9 = __require("fs");
+  var fs10 = __require("fs");
   function checkPathExt(path7, options) {
     var pathext = options.pathExt !== undefined ? options.pathExt : process.env.PATHEXT;
     if (!pathext) {
@@ -7966,12 +7966,12 @@ var require_windows = __commonJS((exports, module) => {
     return checkPathExt(path7, options);
   }
   function isexe(path7, options, cb) {
-    fs9.stat(path7, function(er, stat2) {
+    fs10.stat(path7, function(er, stat2) {
       cb(er, er ? false : checkStat(stat2, path7, options));
     });
   }
   function sync(path7, options) {
-    return checkStat(fs9.statSync(path7), path7, options);
+    return checkStat(fs10.statSync(path7), path7, options);
   }
 });
 
@@ -7979,14 +7979,14 @@ var require_windows = __commonJS((exports, module) => {
 var require_mode = __commonJS((exports, module) => {
   module.exports = isexe;
   isexe.sync = sync;
-  var fs9 = __require("fs");
+  var fs10 = __require("fs");
   function isexe(path7, options, cb) {
-    fs9.stat(path7, function(er, stat2) {
+    fs10.stat(path7, function(er, stat2) {
       cb(er, er ? false : checkStat(stat2, options));
     });
   }
   function sync(path7, options) {
-    return checkStat(fs9.statSync(path7), options);
+    return checkStat(fs10.statSync(path7), options);
   }
   function checkStat(stat2, options) {
     return stat2.isFile() && checkMode(stat2, options);
@@ -8008,7 +8008,7 @@ var require_mode = __commonJS((exports, module) => {
 
 // node_modules/isexe/index.js
 var require_isexe = __commonJS((exports, module) => {
-  var fs9 = __require("fs");
+  var fs10 = __require("fs");
   var core3;
   if (process.platform === "win32" || global.TESTING_WINDOWS) {
     core3 = require_windows();
@@ -8247,16 +8247,16 @@ var require_shebang_command = __commonJS((exports, module) => {
 
 // node_modules/cross-spawn/lib/util/readShebang.js
 var require_readShebang = __commonJS((exports, module) => {
-  var fs9 = __require("fs");
+  var fs10 = __require("fs");
   var shebangCommand = require_shebang_command();
   function readShebang(command) {
     const size = 150;
     const buffer = Buffer.alloc(size);
     let fd;
     try {
-      fd = fs9.openSync(command, "r");
-      fs9.readSync(fd, buffer, 0, size, 0);
-      fs9.closeSync(fd);
+      fd = fs10.openSync(command, "r");
+      fs10.readSync(fd, buffer, 0, size, 0);
+      fs10.closeSync(fd);
     } catch (e) {}
     return shebangCommand(buffer.toString());
   }
@@ -8571,29 +8571,21 @@ function getMessageDir(sessionID) {
   }
   return null;
 }
-function isAbortError(error) {
-  if (!error)
-    return false;
-  if (typeof error === "object") {
-    const errObj = error;
-    const name = errObj.name;
-    const message = errObj.message?.toLowerCase() ?? "";
-    if (name === "MessageAbortedError" || name === "AbortError")
-      return true;
-    if (name === "DOMException" && message.includes("abort"))
-      return true;
-    if (message.includes("aborted") || message.includes("cancelled") || message.includes("interrupted"))
-      return true;
-  }
-  if (typeof error === "string") {
-    const lower = error.toLowerCase();
-    return lower.includes("abort") || lower.includes("cancel") || lower.includes("interrupt");
-  }
-  return false;
-}
 function getIncompleteCount(todos) {
   return todos.filter((t) => t.status !== "completed" && t.status !== "cancelled").length;
 }
+function isLastAssistantMessageAborted(messages) {
+  if (!messages || messages.length === 0)
+    return false;
+  const assistantMessages = messages.filter((m) => m.info?.role === "assistant");
+  if (assistantMessages.length === 0)
+    return false;
+  const lastAssistant = assistantMessages[assistantMessages.length - 1];
+  const errorName = lastAssistant.info?.error?.name;
+  if (!errorName)
+    return false;
+  return errorName === "MessageAbortedError" || errorName === "AbortError";
+}
 function createTodoContinuationEnforcer(ctx, options = {}) {
   const { backgroundManager } = options;
   const sessions = new Map;
@@ -8726,11 +8718,8 @@ function createTodoContinuationEnforcer(ctx, options = {}) {
       const sessionID = props?.sessionID;
       if (!sessionID)
         return;
-      const state2 = getState(sessionID);
-      const isAbort = isAbortError(props?.error);
-      state2.lastEventWasAbortError = isAbort;
       cancelCountdown(sessionID);
-      log(`[${HOOK_NAME}] session.error`, { sessionID, isAbort });
+      log(`[${HOOK_NAME}] session.error`, { sessionID });
       return;
     }
     if (event.type === "session.idle") {
@@ -8750,16 +8739,24 @@ function createTodoContinuationEnforcer(ctx, options = {}) {
         log(`[${HOOK_NAME}] Skipped: in recovery`, { sessionID });
         return;
       }
-      if (state2.lastEventWasAbortError) {
-        state2.lastEventWasAbortError = false;
-        log(`[${HOOK_NAME}] Skipped: abort error immediately before idle`, { sessionID });
-        return;
-      }
       const hasRunningBgTasks = backgroundManager ? backgroundManager.getTasksByParentSession(sessionID).some((t) => t.status === "running") : false;
       if (hasRunningBgTasks) {
         log(`[${HOOK_NAME}] Skipped: background tasks running`, { sessionID });
         return;
       }
+      try {
+        const messagesResp = await ctx.client.session.messages({
+          path: { id: sessionID },
+          query: { directory: ctx.directory }
+        });
+        const messages = messagesResp.data ?? [];
+        if (isLastAssistantMessageAborted(messages)) {
+          log(`[${HOOK_NAME}] Skipped: last assistant message was aborted`, { sessionID });
+          return;
+        }
+      } catch (err) {
+        log(`[${HOOK_NAME}] Messages fetch failed, continuing`, { sessionID, error: String(err) });
+      }
       let todos = [];
       try {
         const response = await ctx.client.session.todo({ path: { id: sessionID } });
@@ -8786,11 +8783,8 @@ function createTodoContinuationEnforcer(ctx, options = {}) {
       const role = info?.role;
       if (!sessionID)
         return;
-      const state2 = sessions.get(sessionID);
-      if (state2) {
-        state2.lastEventWasAbortError = false;
-      }
       if (role === "user") {
+        const state2 = sessions.get(sessionID);
         if (state2?.countdownStartedAt) {
           const elapsed = Date.now() - state2.countdownStartedAt;
           if (elapsed < COUNTDOWN_GRACE_PERIOD_MS) {
@@ -8799,7 +8793,6 @@ function createTodoContinuationEnforcer(ctx, options = {}) {
           }
         }
         cancelCountdown(sessionID);
-        log(`[${HOOK_NAME}] User message: cleared abort state`, { sessionID });
       }
       if (role === "assistant") {
         cancelCountdown(sessionID);
@@ -8811,10 +8804,6 @@ function createTodoContinuationEnforcer(ctx, options = {}) {
       const sessionID = info?.sessionID;
       const role = info?.role;
       if (sessionID && role === "assistant") {
-        const state2 = sessions.get(sessionID);
-        if (state2) {
-          state2.lastEventWasAbortError = false;
-        }
         cancelCountdown(sessionID);
       }
       return;
@@ -8822,10 +8811,6 @@ function createTodoContinuationEnforcer(ctx, options = {}) {
     if (event.type === "tool.execute.before" || event.type === "tool.execute.after") {
       const sessionID = props?.sessionID;
       if (sessionID) {
-        const state2 = sessions.get(sessionID);
-        if (state2) {
-          state2.lastEventWasAbortError = false;
-        }
         cancelCountdown(sessionID);
       }
       return;
@@ -8847,7 +8832,7 @@ function createTodoContinuationEnforcer(ctx, options = {}) {
 }
 // src/hooks/context-window-monitor.ts
 var ANTHROPIC_DISPLAY_LIMIT = 1e6;
-var ANTHROPIC_ACTUAL_LIMIT = 200000;
+var ANTHROPIC_ACTUAL_LIMIT = process.env.ANTHROPIC_1M_CONTEXT === "true" || process.env.VERTEX_ANTHROPIC_1M_CONTEXT === "true" ? 1e6 : 200000;
 var CONTEXT_WARNING_THRESHOLD = 0.7;
 var CONTEXT_REMINDER = `[SYSTEM REMINDER - 1M Context Window]
 
@@ -10210,7 +10195,7 @@ ${result.message}`;
   }
 }
 // src/shared/dynamic-truncator.ts
-var ANTHROPIC_ACTUAL_LIMIT2 = 200000;
+var ANTHROPIC_ACTUAL_LIMIT2 = process.env.ANTHROPIC_1M_CONTEXT === "true" || process.env.VERTEX_ANTHROPIC_1M_CONTEXT === "true" ? 1e6 : 200000;
 var CHARS_PER_TOKEN_ESTIMATE = 4;
 var DEFAULT_TARGET_MAX_TOKENS = 50000;
 function estimateTokens(text) {
@@ -10319,6 +10304,8 @@ function createDynamicTruncator(ctx) {
 }
 
 // src/hooks/tool-output-truncator.ts
+var DEFAULT_MAX_TOKENS = 50000;
+var WEBFETCH_MAX_TOKENS = 1e4;
 var TRUNCATABLE_TOOLS = [
   "grep",
   "Grep",
@@ -10337,6 +10324,10 @@ var TRUNCATABLE_TOOLS = [
   "webfetch",
   "WebFetch"
 ];
+var TOOL_SPECIFIC_MAX_TOKENS = {
+  webfetch: WEBFETCH_MAX_TOKENS,
+  WebFetch: WEBFETCH_MAX_TOKENS
+};
 function createToolOutputTruncatorHook(ctx, options) {
   const truncator = createDynamicTruncator(ctx);
   const truncateAll = options?.experimental?.truncate_all_tool_outputs ?? false;
@@ -10344,7 +10335,8 @@ function createToolOutputTruncatorHook(ctx, options) {
     if (!truncateAll && !TRUNCATABLE_TOOLS.includes(input.tool))
       return;
     try {
-      const { result, truncated } = await truncator.truncate(input.sessionID, output.output);
+      const targetMaxTokens = TOOL_SPECIFIC_MAX_TOKENS[input.tool] ?? DEFAULT_MAX_TOKENS;
+      const { result, truncated } = await truncator.truncate(input.sessionID, output.output, { targetMaxTokens });
       if (truncated) {
         output.output = result;
       }
@@ -12077,7 +12069,7 @@ var COMPACTION_COOLDOWN_MS = 60000;
 
 // src/hooks/preemptive-compaction/index.ts
 var CLAUDE_MODEL_PATTERN = /claude-(opus|sonnet|haiku)/i;
-var CLAUDE_DEFAULT_CONTEXT_LIMIT = 200000;
+var CLAUDE_DEFAULT_CONTEXT_LIMIT = process.env.ANTHROPIC_1M_CONTEXT === "true" || process.env.VERTEX_ANTHROPIC_1M_CONTEXT === "true" ? 1e6 : 200000;
 function isSupportedModel(modelID) {
   return CLAUDE_MODEL_PATTERN.test(modelID);
 }
@@ -12410,6 +12402,16 @@ function extractPromptText(parts) {
 }
 
 // src/hooks/think-mode/switcher.ts
+function extractModelPrefix(modelID) {
+  const slashIndex = modelID.indexOf("/");
+  if (slashIndex === -1) {
+    return { prefix: "", base: modelID };
+  }
+  return {
+    prefix: modelID.slice(0, slashIndex + 1),
+    base: modelID.slice(slashIndex + 1)
+  };
+}
 function normalizeModelID(modelID) {
   return modelID.replace(/\.(\d+)/g, "-$1");
 }
@@ -12495,20 +12497,27 @@ var THINKING_CAPABLE_MODELS = {
 };
 function getHighVariant(modelID) {
   const normalized = normalizeModelID(modelID);
-  if (ALREADY_HIGH.has(normalized)) {
+  const { prefix, base } = extractModelPrefix(normalized);
+  if (ALREADY_HIGH.has(base) || base.endsWith("-high")) {
+    return null;
+  }
+  const highBase = HIGH_VARIANT_MAP[base];
+  if (!highBase) {
     return null;
   }
-  return HIGH_VARIANT_MAP[normalized] ?? null;
+  return prefix + highBase;
 }
 function isAlreadyHighVariant(modelID) {
   const normalized = normalizeModelID(modelID);
-  return ALREADY_HIGH.has(normalized) || normalized.endsWith("-high");
+  const { base } = extractModelPrefix(normalized);
+  return ALREADY_HIGH.has(base) || base.endsWith("-high");
 }
 function isThinkingProvider(provider) {
   return provider in THINKING_CONFIGS;
 }
 function getThinkingConfig(providerID, modelID) {
   const normalized = normalizeModelID(modelID);
+  const { base } = extractModelPrefix(normalized);
   if (isAlreadyHighVariant(normalized)) {
     return null;
   }
@@ -12518,8 +12527,8 @@ function getThinkingConfig(providerID, modelID) {
   }
   const config = THINKING_CONFIGS[resolvedProvider];
   const capablePatterns = THINKING_CAPABLE_MODELS[resolvedProvider];
-  const modelLower = normalized.toLowerCase();
-  const isCapable = capablePatterns.some((pattern) => modelLower.includes(pattern.toLowerCase()));
+  const baseLower = base.toLowerCase();
+  const isCapable = capablePatterns.some((pattern) => baseLower.includes(pattern.toLowerCase()));
   return isCapable ? config : null;
 }
 
@@ -15213,16 +15222,16 @@ function parseFrontmatter(content) {
   const frontmatterRegex = /^---\r?\n([\s\S]*?)\r?\n?---\r?\n([\s\S]*)$/;
   const match = content.match(frontmatterRegex);
   if (!match) {
-    return { data: {}, body: content };
+    return { data: {}, body: content, hadFrontmatter: false, parseError: false };
   }
   const yamlContent = match[1];
   const body = match[2];
   try {
     const parsed = jsYaml.load(yamlContent, { schema: jsYaml.JSON_SCHEMA });
     const data = parsed ?? {};
-    return { data, body };
+    return { data, body, hadFrontmatter: true, parseError: false };
   } catch {
-    return { data: {}, body };
+    return { data: {}, body, hadFrontmatter: true, parseError: true };
   }
 }
 // src/shared/command-executor.ts
@@ -16535,6 +16544,167 @@ function migrateConfigFile(configPath, rawConfig) {
   }
   return needsWrite;
 }
+// src/shared/opencode-config-dir.ts
+import { existsSync as existsSync21 } from "fs";
+import { homedir as homedir6 } from "os";
+import { join as join26 } from "path";
+var TAURI_APP_IDENTIFIER = "ai.opencode.desktop";
+var TAURI_APP_IDENTIFIER_DEV = "ai.opencode.desktop.dev";
+function isDevBuild(version) {
+  if (!version)
+    return false;
+  return version.includes("-dev") || version.includes(".dev");
+}
+function getTauriConfigDir(identifier) {
+  const platform2 = process.platform;
+  switch (platform2) {
+    case "darwin":
+      return join26(homedir6(), "Library", "Application Support", identifier);
+    case "win32": {
+      const appData = process.env.APPDATA || join26(homedir6(), "AppData", "Roaming");
+      return join26(appData, identifier);
+    }
+    case "linux":
+    default: {
+      const xdgConfig = process.env.XDG_CONFIG_HOME || join26(homedir6(), ".config");
+      return join26(xdgConfig, identifier);
+    }
+  }
+}
+function getCliConfigDir() {
+  if (process.platform === "win32") {
+    const crossPlatformDir = join26(homedir6(), ".config", "opencode");
+    const crossPlatformConfig = join26(crossPlatformDir, "opencode.json");
+    if (existsSync21(crossPlatformConfig)) {
+      return crossPlatformDir;
+    }
+    const appData = process.env.APPDATA || join26(homedir6(), "AppData", "Roaming");
+    const appdataDir = join26(appData, "opencode");
+    const appdataConfig = join26(appdataDir, "opencode.json");
+    if (existsSync21(appdataConfig)) {
+      return appdataDir;
+    }
+    return crossPlatformDir;
+  }
+  const xdgConfig = process.env.XDG_CONFIG_HOME || join26(homedir6(), ".config");
+  return join26(xdgConfig, "opencode");
+}
+function getOpenCodeConfigDir(options) {
+  const { binary: binary2, version, checkExisting = true } = options;
+  if (binary2 === "opencode") {
+    return getCliConfigDir();
+  }
+  const identifier = isDevBuild(version) ? TAURI_APP_IDENTIFIER_DEV : TAURI_APP_IDENTIFIER;
+  const tauriDir = getTauriConfigDir(identifier);
+  if (checkExisting) {
+    const legacyDir = getCliConfigDir();
+    const legacyConfig = join26(legacyDir, "opencode.json");
+    const legacyConfigC = join26(legacyDir, "opencode.jsonc");
+    if (existsSync21(legacyConfig) || existsSync21(legacyConfigC)) {
+      return legacyDir;
+    }
+  }
+  return tauriDir;
+}
+function getOpenCodeConfigPaths(options) {
+  const configDir = getOpenCodeConfigDir(options);
+  return {
+    configDir,
+    configJson: join26(configDir, "opencode.json"),
+    configJsonc: join26(configDir, "opencode.jsonc"),
+    packageJson: join26(configDir, "package.json"),
+    omoConfig: join26(configDir, "oh-my-opencode.json")
+  };
+}
+// src/shared/opencode-version.ts
+import { execSync } from "child_process";
+var PERMISSION_BREAKING_VERSION = "1.1.1";
+var NOT_CACHED = Symbol("NOT_CACHED");
+var cachedVersion = NOT_CACHED;
+function parseVersion(version) {
+  const cleaned = version.replace(/^v/, "").split("-")[0];
+  return cleaned.split(".").map((n) => parseInt(n, 10) || 0);
+}
+function compareVersions(a, b) {
+  const partsA = parseVersion(a);
+  const partsB = parseVersion(b);
+  const maxLen = Math.max(partsA.length, partsB.length);
+  for (let i2 = 0;i2 < maxLen; i2++) {
+    const numA = partsA[i2] ?? 0;
+    const numB = partsB[i2] ?? 0;
+    if (numA < numB)
+      return -1;
+    if (numA > numB)
+      return 1;
+  }
+  return 0;
+}
+function isVersionGte(a, b) {
+  return compareVersions(a, b) >= 0;
+}
+function getOpenCodeVersion() {
+  if (cachedVersion !== NOT_CACHED) {
+    return cachedVersion;
+  }
+  try {
+    const result = execSync("opencode --version", {
+      encoding: "utf-8",
+      timeout: 5000,
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+    const versionMatch = result.match(/(\d+\.\d+\.\d+(?:-[\w.]+)?)/);
+    cachedVersion = versionMatch?.[1] ?? null;
+    return cachedVersion;
+  } catch {
+    cachedVersion = null;
+    return null;
+  }
+}
+function supportsNewPermissionSystem() {
+  const version = getOpenCodeVersion();
+  if (!version)
+    return true;
+  return isVersionGte(version, PERMISSION_BREAKING_VERSION);
+}
+// src/shared/permission-compat.ts
+function createAgentToolRestrictions(denyTools) {
+  if (supportsNewPermissionSystem()) {
+    return {
+      permission: Object.fromEntries(denyTools.map((tool) => [tool, "deny"]))
+    };
+  }
+  return {
+    tools: Object.fromEntries(denyTools.map((tool) => [tool, false]))
+  };
+}
+function migrateToolsToPermission(tools) {
+  return Object.fromEntries(Object.entries(tools).map(([key, value]) => [
+    key,
+    value ? "allow" : "deny"
+  ]));
+}
+function migratePermissionToTools(permission) {
+  return Object.fromEntries(Object.entries(permission).filter(([, value]) => value !== "ask").map(([key, value]) => [key, value === "allow"]));
+}
+function migrateAgentConfig(config) {
+  const result = { ...config };
+  if (supportsNewPermissionSystem()) {
+    if (result.tools && typeof result.tools === "object") {
+      const existingPermission = result.permission || {};
+      const migratedPermission = migrateToolsToPermission(result.tools);
+      result.permission = { ...migratedPermission, ...existingPermission };
+      delete result.tools;
+    }
+  } else {
+    if (result.permission && typeof result.permission === "object") {
+      const existingTools = result.tools || {};
+      const migratedTools = migratePermissionToTools(result.permission);
+      result.tools = { ...migratedTools, ...existingTools };
+      delete result.permission;
+    }
+  }
+  return result;
+}
 // src/hooks/think-mode/index.ts
 var thinkModeState = new Map;
 function createThinkModeHook() {
@@ -16598,8 +16768,8 @@ function createThinkModeHook() {
   };
 }
 // src/hooks/claude-code-hooks/config.ts
-import { join as join26 } from "path";
-import { existsSync as existsSync21 } from "fs";
+import { join as join27 } from "path";
+import { existsSync as existsSync22 } from "fs";
 function normalizeHookMatcher(raw) {
   return {
     matcher: raw.matcher ?? raw.pattern ?? "*",
@@ -16625,11 +16795,11 @@ function normalizeHooksConfig(raw) {
 function getClaudeSettingsPaths(customPath) {
   const claudeConfigDir = getClaudeConfigDir();
   const paths = [
-    join26(claudeConfigDir, "settings.json"),
-    join26(process.cwd(), ".claude", "settings.json"),
-    join26(process.cwd(), ".claude", "settings.local.json")
+    join27(claudeConfigDir, "settings.json"),
+    join27(process.cwd(), ".claude", "settings.json"),
+    join27(process.cwd(), ".claude", "settings.local.json")
   ];
-  if (customPath && existsSync21(customPath)) {
+  if (customPath && existsSync22(customPath)) {
     paths.unshift(customPath);
   }
   return paths;
@@ -16654,7 +16824,7 @@ async function loadClaudeHooksConfig(customSettingsPath) {
   const paths = getClaudeSettingsPaths(customSettingsPath);
   let mergedConfig = {};
   for (const settingsPath of paths) {
-    if (existsSync21(settingsPath)) {
+    if (existsSync22(settingsPath)) {
       try {
         const content = await Bun.file(settingsPath).text();
         const settings = JSON.parse(content);
@@ -16671,15 +16841,15 @@ async function loadClaudeHooksConfig(customSettingsPath) {
 }
 
 // src/hooks/claude-code-hooks/config-loader.ts
-import { existsSync as existsSync22 } from "fs";
-import { homedir as homedir6 } from "os";
-import { join as join27 } from "path";
-var USER_CONFIG_PATH = join27(homedir6(), ".config", "opencode", "opencode-cc-plugin.json");
+import { existsSync as existsSync23 } from "fs";
+import { homedir as homedir7 } from "os";
+import { join as join28 } from "path";
+var USER_CONFIG_PATH = join28(homedir7(), ".config", "opencode", "opencode-cc-plugin.json");
 function getProjectConfigPath() {
-  return join27(process.cwd(), ".opencode", "opencode-cc-plugin.json");
+  return join28(process.cwd(), ".opencode", "opencode-cc-plugin.json");
 }
 async function loadConfigFromPath(path4) {
-  if (!existsSync22(path4)) {
+  if (!existsSync23(path4)) {
     return null;
   }
   try {
@@ -16859,16 +17029,16 @@ async function executePreToolUseHooks(ctx, config, extendedConfig) {
 }
 
 // src/hooks/claude-code-hooks/transcript.ts
-import { join as join28 } from "path";
-import { mkdirSync as mkdirSync6, appendFileSync as appendFileSync5, existsSync as existsSync23, writeFileSync as writeFileSync8, unlinkSync as unlinkSync5 } from "fs";
+import { join as join29 } from "path";
+import { mkdirSync as mkdirSync6, appendFileSync as appendFileSync5, existsSync as existsSync24, writeFileSync as writeFileSync8, unlinkSync as unlinkSync5 } from "fs";
 import { tmpdir as tmpdir5 } from "os";
 import { randomUUID } from "crypto";
-var TRANSCRIPT_DIR = join28(getClaudeConfigDir(), "transcripts");
+var TRANSCRIPT_DIR = join29(getClaudeConfigDir(), "transcripts");
 function getTranscriptPath(sessionId) {
-  return join28(TRANSCRIPT_DIR, `${sessionId}.jsonl`);
+  return join29(TRANSCRIPT_DIR, `${sessionId}.jsonl`);
 }
 function ensureTranscriptDir() {
-  if (!existsSync23(TRANSCRIPT_DIR)) {
+  if (!existsSync24(TRANSCRIPT_DIR)) {
     mkdirSync6(TRANSCRIPT_DIR, { recursive: true });
   }
 }
@@ -16955,7 +17125,7 @@ async function buildTranscriptFromSession(client, sessionId, directory, currentT
       }
     };
     entries.push(JSON.stringify(currentEntry));
-    const tempPath = join28(tmpdir5(), `opencode-transcript-${sessionId}-${randomUUID()}.jsonl`);
+    const tempPath = join29(tmpdir5(), `opencode-transcript-${sessionId}-${randomUUID()}.jsonl`);
     writeFileSync8(tempPath, entries.join(`
 `) + `
 `);
@@ -16975,7 +17145,7 @@ async function buildTranscriptFromSession(client, sessionId, directory, currentT
           ]
         }
       };
-      const tempPath = join28(tmpdir5(), `opencode-transcript-${sessionId}-${randomUUID()}.jsonl`);
+      const tempPath = join29(tmpdir5(), `opencode-transcript-${sessionId}-${randomUUID()}.jsonl`);
       writeFileSync8(tempPath, JSON.stringify(currentEntry) + `
 `);
       return tempPath;
@@ -17187,10 +17357,10 @@ ${USER_PROMPT_SUBMIT_TAG_CLOSE}`);
 }
 
 // src/hooks/claude-code-hooks/todo.ts
-import { join as join29 } from "path";
-var TODO_DIR = join29(getClaudeConfigDir(), "todos");
+import { join as join30 } from "path";
+var TODO_DIR = join30(getClaudeConfigDir(), "todos");
 function getTodoPath(sessionId) {
-  return join29(TODO_DIR, `${sessionId}-agent-${sessionId}.json`);
+  return join30(TODO_DIR, `${sessionId}-agent-${sessionId}.json`);
 }
 
 // src/hooks/claude-code-hooks/stop.ts
@@ -17349,6 +17519,172 @@ setInterval(() => {
   }
 }, CACHE_TTL);
 
+// src/hooks/keyword-detector/constants.ts
+var CODE_BLOCK_PATTERN2 = /```[\s\S]*?```/g;
+var INLINE_CODE_PATTERN2 = /`[^`]+`/g;
+var KEYWORD_DETECTORS = [
+  {
+    pattern: /(ultrawork|ulw)/i,
+    message: `<ultrawork-mode>
+
+## TODO IS YOUR LIFELINE (NON-NEGOTIABLE)
+
+**USE TodoWrite OBSESSIVELY. This is the #1 most important tool.**
+
+### TODO Rules
+1. **BEFORE any action**: Create TODOs FIRST. Break down into atomic, granular steps.
+2. **Be excessively detailed**: 10 small TODOs > 3 vague TODOs. Err on the side of too many.
+3. **Real-time updates**: Mark \`in_progress\` before starting, \`completed\` IMMEDIATELY after. NEVER batch.
+4. **One at a time**: Only ONE TODO should be \`in_progress\` at any moment.
+5. **Sub-tasks**: Complex TODO? Break it into sub-TODOs. Keep granularity high.
+6. **Questions too**: User asks a question? TODO: "Answer with evidence: [question]"
+
+### Example TODO Granularity
+BAD: "Implement user auth"
+GOOD:
+- "Read existing auth patterns in codebase"
+- "Create auth schema types"  
+- "Implement login endpoint"
+- "Implement token validation middleware"
+- "Add auth tests - login success case"
+- "Add auth tests - login failure case"
+- "Verify LSP diagnostics clean"
+
+**YOUR WORK IS INVISIBLE WITHOUT TODOs. USE THEM.**
+
+## TDD WORKFLOW (MANDATORY when tests exist)
+
+Check for test infrastructure FIRST. If exists, follow strictly:
+
+1. **RED**: Write failing test FIRST \u2192 \`bun test\` must FAIL
+2. **GREEN**: Write MINIMAL code to pass \u2192 \`bun test\` must PASS
+3. **REFACTOR**: Clean up, tests stay green \u2192 \`bun test\` still PASS
+4. **REPEAT**: Next test case, loop until complete
+
+**NEVER write implementation before test. NEVER delete failing tests.**
+
+## AGENT DEPLOYMENT
+
+Fire available agents in PARALLEL via background tasks. Use explore/librarian agents liberally (multiple concurrent if needed).
+
+## EVIDENCE-BASED ANSWERS
+
+- Every claim: code snippet + file path + line number
+- No "I think..." - find and SHOW actual code
+- Local search fails? \u2192 librarian for external sources
+- **NEVER acceptable**: "I couldn't find it"
+
+## ZERO TOLERANCE FOR SHORTCUTS (RIGOROUS & HONEST EXECUTION)
+
+**CORE PRINCIPLE**: Execute user's ORIGINAL INTENT with maximum rigor. No shortcuts. No compromises. No matter how large the task.
+
+### ABSOLUTE PROHIBITIONS
+| Violation | Why It's Forbidden |
+|-----------|-------------------|
+| **Mocking/Stubbing** | Never use mocks, stubs, or fake implementations unless explicitly requested. Real implementation only. |
+| **Scope Reduction** | Never make "demo", "skeleton", "simplified", "basic", "minimal" versions. Deliver FULL implementation. |
+| **Partial Completion** | Never stop at 60-80% saying "you can extend this...", "as an exercise...", "you can add...". Finish 100%. |
+| **Lazy Placeholders** | Never use "// TODO", "...", "etc.", "and so on" in actual code. Complete everything. |
+| **Assumed Shortcuts** | Never skip requirements deemed "optional" or "can be added later". All requirements are mandatory. |
+| **Test Deletion** | Never delete or skip failing tests. Fix the code, not the tests. |
+| **Evidence-Free Claims** | Never say "I think...", "probably...", "should work...". Show actual code/output. |
+
+### RIGOROUS EXECUTION MANDATE
+1. **Parse Original Intent**: What did the user ACTUALLY want? Not what's convenient. The REAL, COMPLETE request.
+2. **No Task Too Large**: If the task requires 100 files, modify 100 files. If it needs 1000 lines, write 1000 lines. Size is irrelevant.
+3. **Honest Assessment**: If you cannot complete something, say so BEFORE starting. Don't fake completion.
+4. **Evidence-Based Verification**: Every claim backed by code snippets, file paths, line numbers, and actual outputs.
+5. **Complete Verification**: Re-read original request after completion. Check EVERY requirement was met.
+
+### FAILURE RECOVERY
+If you realize you've taken shortcuts:
+1. STOP immediately
+2. Identify what you skipped/faked
+3. Create TODOs for ALL remaining work
+4. Execute to TRUE completion - not "good enough"
+
+**THE USER ASKED FOR X. DELIVER EXACTLY X. COMPLETELY. HONESTLY. NO MATTER THE SIZE.**
+
+## SUCCESS = All TODOs Done + All Requirements Met + Evidence Provided
+
+</ultrawork-mode>
+
+---
+
+`
+  },
+  {
+    pattern: /\b(search|find|locate|lookup|look\s*up|explore|discover|scan|grep|query|browse|detect|trace|seek|track|pinpoint|hunt)\b|where\s+is|show\s+me|list\s+all|\uAC80\uC0C9|\uCC3E\uC544|\uD0D0\uC0C9|\uC870\uD68C|\uC2A4\uCE94|\uC11C\uCE58|\uB4A4\uC838|\uCC3E\uAE30|\uC5B4\uB514|\uCD94\uC801|\uD0D0\uC9C0|\uCC3E\uC544\uBD10|\uCC3E\uC544\uB0B4|\uBCF4\uC5EC\uC918|\uBAA9\uB85D|\u691C\u7D22|\u63A2\u3057\u3066|\u898B\u3064\u3051\u3066|\u30B5\u30FC\u30C1|\u63A2\u7D22|\u30B9\u30AD\u30E3\u30F3|\u3069\u3053|\u767A\u898B|\u635C\u7D22|\u898B\u3064\u3051\u51FA\u3059|\u4E00\u89A7|\u641C\u7D22|\u67E5\u627E|\u5BFB\u627E|\u67E5\u8BE2|\u68C0\u7D22|\u5B9A\u4F4D|\u626B\u63CF|\u53D1\u73B0|\u5728\u54EA\u91CC|\u627E\u51FA\u6765|\u5217\u51FA|t\u00ECm ki\u1EBFm|tra c\u1EE9u|\u0111\u1ECBnh v\u1ECB|qu\u00E9t|ph\u00E1t hi\u1EC7n|truy t\u00ECm|t\u00ECm ra|\u1EDF \u0111\u00E2u|li\u1EC7t k\u00EA/i,
+    message: `[search-mode]
+MAXIMIZE SEARCH EFFORT. Launch multiple background agents IN PARALLEL:
+- explore agents (codebase patterns, file structures, ast-grep)
+- librarian agents (remote repos, official docs, GitHub examples)
+Plus direct tools: Grep, ripgrep (rg), ast-grep (sg)
+NEVER stop at first result - be exhaustive.`
+  },
+  {
+    pattern: /\b(analyze|analyse|investigate|examine|research|study|deep[\s-]?dive|inspect|audit|evaluate|assess|review|diagnose|scrutinize|dissect|debug|comprehend|interpret|breakdown|understand)\b|why\s+is|how\s+does|how\s+to|\uBD84\uC11D|\uC870\uC0AC|\uD30C\uC545|\uC5F0\uAD6C|\uAC80\uD1A0|\uC9C4\uB2E8|\uC774\uD574|\uC124\uBA85|\uC6D0\uC778|\uC774\uC720|\uB72F\uC5B4\uBD10|\uB530\uC838\uBD10|\uD3C9\uAC00|\uD574\uC11D|\uB514\uBC84\uAE45|\uB514\uBC84\uADF8|\uC5B4\uB5BB\uAC8C|\uC65C|\uC0B4\uD3B4|\u5206\u6790|\u8ABF\u67FB|\u89E3\u6790|\u691C\u8A0E|\u7814\u7A76|\u8A3A\u65AD|\u7406\u89E3|\u8AAC\u660E|\u691C\u8A3C|\u7CBE\u67FB|\u7A76\u660E|\u30C7\u30D0\u30C3\u30B0|\u306A\u305C|\u3069\u3046|\u4ED5\u7D44\u307F|\u8C03\u67E5|\u68C0\u67E5|\u5256\u6790|\u6DF1\u5165|\u8BCA\u65AD|\u89E3\u91CA|\u8C03\u8BD5|\u4E3A\u4EC0\u4E48|\u539F\u7406|\u641E\u6E05\u695A|\u5F04\u660E\u767D|ph\u00E2n t\u00EDch|\u0111i\u1EC1u tra|nghi\u00EAn c\u1EE9u|ki\u1EC3m tra|xem x\u00E9t|ch\u1EA9n \u0111o\u00E1n|gi\u1EA3i th\u00EDch|t\u00ECm hi\u1EC3u|g\u1EE1 l\u1ED7i|t\u1EA1i sao/i,
+    message: `[analyze-mode]
+ANALYSIS MODE. Gather context before diving deep:
+
+CONTEXT GATHERING (parallel):
+- 1-2 explore agents (codebase patterns, implementations)
+- 1-2 librarian agents (if external library involved)
+- Direct tools: Grep, AST-grep, LSP for targeted searches
+
+IF COMPLEX (architecture, multi-system, debugging after 2+ failures):
+- Consult oracle for strategic guidance
+
+SYNTHESIZE findings before proceeding.`
+  }
+];
+
+// src/hooks/keyword-detector/detector.ts
+function removeCodeBlocks2(text) {
+  return text.replace(CODE_BLOCK_PATTERN2, "").replace(INLINE_CODE_PATTERN2, "");
+}
+function detectKeywordsWithType(text) {
+  const textWithoutCode = removeCodeBlocks2(text);
+  const types3 = ["ultrawork", "search", "analyze"];
+  return KEYWORD_DETECTORS.map(({ pattern, message }, index) => ({
+    matches: pattern.test(textWithoutCode),
+    type: types3[index],
+    message
+  })).filter((result) => result.matches).map(({ type: type2, message }) => ({ type: type2, message }));
+}
+function extractPromptText2(parts) {
+  return parts.filter((p) => p.type === "text").map((p) => p.text || "").join(" ");
+}
+
+// src/hooks/keyword-detector/index.ts
+function createKeywordDetectorHook(ctx) {
+  return {
+    "chat.message": async (input, output) => {
+      const promptText = extractPromptText2(output.parts);
+      const detectedKeywords = detectKeywordsWithType(removeCodeBlocks2(promptText));
+      if (detectedKeywords.length === 0) {
+        return;
+      }
+      const hasUltrawork = detectedKeywords.some((k) => k.type === "ultrawork");
+      if (hasUltrawork) {
+        log(`[keyword-detector] Ultrawork mode activated`, { sessionID: input.sessionID });
+        ctx.client.tui.showToast({
+          body: {
+            title: "Ultrawork Mode Activated",
+            message: "Maximum precision engaged. All agents at your disposal.",
+            variant: "success",
+            duration: 3000
+          }
+        }).catch((err) => log(`[keyword-detector] Failed to show toast`, { error: err, sessionID: input.sessionID }));
+      }
+      log(`[keyword-detector] Detected ${detectedKeywords.length} keywords`, {
+        sessionID: input.sessionID,
+        types: detectedKeywords.map((k) => k.type)
+      });
+    }
+  };
+}
+
 // src/hooks/claude-code-hooks/index.ts
 var sessionFirstMessageProcessed = new Set;
 var sessionErrorState = new Map;
@@ -17423,11 +17759,20 @@ function createClaudeCodeHooksHook(ctx, config = {}) {
           log("chat.message injection skipped - interrupted during hooks", { sessionID: input.sessionID });
           return;
         }
-        if (result.messages.length > 0) {
-          const hookContent = result.messages.join(`
+        const detectedKeywords = detectKeywordsWithType(removeCodeBlocks2(prompt));
+        const keywordMessages = detectedKeywords.map((k) => k.message);
+        if (keywordMessages.length > 0) {
+          log("[claude-code-hooks] Detected keywords", {
+            sessionID: input.sessionID,
+            types: detectedKeywords.map((k) => k.type)
+          });
+        }
+        const allMessages = [...keywordMessages, ...result.messages];
+        if (allMessages.length > 0) {
+          const hookContent = allMessages.join(`
 
 `);
-          log(`[claude-code-hooks] Injecting ${result.messages.length} hook messages`, { sessionID: input.sessionID, contentLength: hookContent.length, isFirstMessage });
+          log(`[claude-code-hooks] Injecting ${allMessages.length} messages (${keywordMessages.length} keyword + ${result.messages.length} hook)`, { sessionID: input.sessionID, contentLength: hookContent.length, isFirstMessage });
           if (isFirstMessage) {
             const idx = output.parts.findIndex((p) => p.type === "text" && p.text);
             if (idx >= 0) {
@@ -17621,22 +17966,22 @@ ${result.message}`;
 }
 // src/hooks/rules-injector/index.ts
 import { readFileSync as readFileSync15 } from "fs";
-import { homedir as homedir7 } from "os";
+import { homedir as homedir8 } from "os";
 import { relative as relative3, resolve as resolve4 } from "path";
 
 // src/hooks/rules-injector/finder.ts
 import {
-  existsSync as existsSync24,
+  existsSync as existsSync25,
   readdirSync as readdirSync10,
   realpathSync,
   statSync as statSync2
 } from "fs";
-import { dirname as dirname4, join as join31, relative } from "path";
+import { dirname as dirname4, join as join32, relative } from "path";
 
 // src/hooks/rules-injector/constants.ts
-import { join as join30 } from "path";
+import { join as join31 } from "path";
 var OPENCODE_STORAGE6 = getOpenCodeStorageDir();
-var RULES_INJECTOR_STORAGE = join30(OPENCODE_STORAGE6, "rules-injector");
+var RULES_INJECTOR_STORAGE = join31(OPENCODE_STORAGE6, "rules-injector");
 var PROJECT_MARKERS = [
   ".git",
   "pyproject.toml",
@@ -17677,8 +18022,8 @@ function findProjectRoot(startPath) {
   }
   while (true) {
     for (const marker of PROJECT_MARKERS) {
-      const markerPath = join31(current, marker);
-      if (existsSync24(markerPath)) {
+      const markerPath = join32(current, marker);
+      if (existsSync25(markerPath)) {
         return current;
       }
     }
@@ -17690,12 +18035,12 @@ function findProjectRoot(startPath) {
   }
 }
 function findRuleFilesRecursive(dir, results) {
-  if (!existsSync24(dir))
+  if (!existsSync25(dir))
     return;
   try {
     const entries = readdirSync10(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join31(dir, entry.name);
+      const fullPath = join32(dir, entry.name);
       if (entry.isDirectory()) {
         findRuleFilesRecursive(fullPath, results);
       } else if (entry.isFile()) {
@@ -17720,7 +18065,7 @@ function findRuleFiles(projectRoot, homeDir, currentFile) {
   let distance = 0;
   while (true) {
     for (const [parent, subdir] of PROJECT_RULE_SUBDIRS) {
-      const ruleDir = join31(currentDir, parent, subdir);
+      const ruleDir = join32(currentDir, parent, subdir);
       const files = [];
       findRuleFilesRecursive(ruleDir, files);
       for (const filePath of files) {
@@ -17746,8 +18091,8 @@ function findRuleFiles(projectRoot, homeDir, currentFile) {
   }
   if (projectRoot) {
     for (const ruleFile of PROJECT_RULE_FILES) {
-      const filePath = join31(projectRoot, ruleFile);
-      if (existsSync24(filePath)) {
+      const filePath = join32(projectRoot, ruleFile);
+      if (existsSync25(filePath)) {
         try {
           const stat = statSync2(filePath);
           if (stat.isFile()) {
@@ -17767,7 +18112,7 @@ function findRuleFiles(projectRoot, homeDir, currentFile) {
       }
     }
   }
-  const userRuleDir = join31(homeDir, USER_RULE_DIR);
+  const userRuleDir = join32(homeDir, USER_RULE_DIR);
   const userFiles = [];
   findRuleFilesRecursive(userRuleDir, userFiles);
   for (const filePath of userFiles) {
@@ -17956,19 +18301,19 @@ function mergeGlobs(existing, newValue) {
 
 // src/hooks/rules-injector/storage.ts
 import {
-  existsSync as existsSync25,
+  existsSync as existsSync26,
   mkdirSync as mkdirSync7,
   readFileSync as readFileSync14,
   writeFileSync as writeFileSync9,
   unlinkSync as unlinkSync6
 } from "fs";
-import { join as join32 } from "path";
+import { join as join33 } from "path";
 function getStoragePath3(sessionID) {
-  return join32(RULES_INJECTOR_STORAGE, `${sessionID}.json`);
+  return join33(RULES_INJECTOR_STORAGE, `${sessionID}.json`);
 }
 function loadInjectedRules(sessionID) {
   const filePath = getStoragePath3(sessionID);
-  if (!existsSync25(filePath))
+  if (!existsSync26(filePath))
     return { contentHashes: new Set, realPaths: new Set };
   try {
     const content = readFileSync14(filePath, "utf-8");
@@ -17982,7 +18327,7 @@ function loadInjectedRules(sessionID) {
   }
 }
 function saveInjectedRules(sessionID, data) {
-  if (!existsSync25(RULES_INJECTOR_STORAGE)) {
+  if (!existsSync26(RULES_INJECTOR_STORAGE)) {
     mkdirSync7(RULES_INJECTOR_STORAGE, { recursive: true });
   }
   const storageData = {
@@ -17995,7 +18340,7 @@ function saveInjectedRules(sessionID, data) {
 }
 function clearInjectedRules(sessionID) {
   const filePath = getStoragePath3(sessionID);
-  if (existsSync25(filePath)) {
+  if (existsSync26(filePath)) {
     unlinkSync6(filePath);
   }
 }
@@ -18025,7 +18370,7 @@ function createRulesInjectorHook(ctx) {
       return;
     const projectRoot = findProjectRoot(resolved);
     const cache2 = getSessionCache(sessionID);
-    const home = homedir7();
+    const home = homedir8();
     const ruleFileCandidates = findRuleFiles(projectRoot, home, resolved);
     const toInject = [];
     for (const candidate of ruleFileCandidates) {
@@ -18450,13 +18795,17 @@ function invalidatePackage(packageName = PACKAGE_NAME) {
 }
 
 // src/cli/config-manager.ts
-import { homedir as homedir10 } from "os";
-import { join as join36 } from "path";
-var OPENCODE_CONFIG_DIR = join36(homedir10(), ".config", "opencode");
-var OPENCODE_JSON = join36(OPENCODE_CONFIG_DIR, "opencode.json");
-var OPENCODE_JSONC = join36(OPENCODE_CONFIG_DIR, "opencode.jsonc");
-var OPENCODE_PACKAGE_JSON = join36(OPENCODE_CONFIG_DIR, "package.json");
-var OMO_CONFIG = join36(OPENCODE_CONFIG_DIR, "oh-my-opencode.json");
+var configContext = null;
+function getConfigContext() {
+  if (!configContext) {
+    const paths = getOpenCodeConfigPaths({ binary: "opencode", version: null });
+    configContext = { binary: "opencode", version: null, paths };
+  }
+  return configContext;
+}
+function getConfigDir() {
+  return getConfigContext().paths.configDir;
+}
 var BUN_INSTALL_TIMEOUT_SECONDS = 60;
 var BUN_INSTALL_TIMEOUT_MS = BUN_INSTALL_TIMEOUT_SECONDS * 1000;
 async function runBunInstall() {
@@ -18466,7 +18815,7 @@ async function runBunInstall() {
 async function runBunInstallWithDetails() {
   try {
     const proc = Bun.spawn(["bun", "install"], {
-      cwd: OPENCODE_CONFIG_DIR,
+      cwd: getConfigDir(),
       stdout: "pipe",
       stderr: "pipe"
     });
@@ -18524,9 +18873,9 @@ v${latestVersion} available. Restart OpenCode to apply.` : `OpenCode is now on S
         return;
       hasChecked = true;
       setTimeout(async () => {
-        const cachedVersion = getCachedVersion();
+        const cachedVersion2 = getCachedVersion();
         const localDevVersion = getLocalDevVersion(ctx.directory);
-        const displayVersion = localDevVersion ?? cachedVersion;
+        const displayVersion = localDevVersion ?? cachedVersion2;
         await showConfigErrorsIfAny(ctx);
         if (localDevVersion) {
           if (showStartupToast) {
@@ -18551,8 +18900,8 @@ async function runBackgroundUpdateCheck(ctx, autoUpdate, getToastMessage) {
     log("[auto-update-checker] Plugin not found in config");
     return;
   }
-  const cachedVersion = getCachedVersion();
-  const currentVersion = cachedVersion ?? pluginInfo.pinnedVersion;
+  const cachedVersion2 = getCachedVersion();
+  const currentVersion = cachedVersion2 ?? pluginInfo.pinnedVersion;
   if (!currentVersion) {
     log("[auto-update-checker] No version found (cached or pinned)");
     return;
@@ -18671,7 +19020,7 @@ async function showLocalDevToast(ctx, version, isSisyphusEnabled) {
 }
 // src/hooks/agent-usage-reminder/storage.ts
 import {
-  existsSync as existsSync29,
+  existsSync as existsSync30,
   mkdirSync as mkdirSync8,
   readFileSync as readFileSync18,
   writeFileSync as writeFileSync12,
@@ -18731,7 +19080,7 @@ function getStoragePath4(sessionID) {
 }
 function loadAgentUsageState(sessionID) {
   const filePath = getStoragePath4(sessionID);
-  if (!existsSync29(filePath))
+  if (!existsSync30(filePath))
     return null;
   try {
     const content = readFileSync18(filePath, "utf-8");
@@ -18741,7 +19090,7 @@ function loadAgentUsageState(sessionID) {
   }
 }
 function saveAgentUsageState(state2) {
-  if (!existsSync29(AGENT_USAGE_REMINDER_STORAGE)) {
+  if (!existsSync30(AGENT_USAGE_REMINDER_STORAGE)) {
     mkdirSync8(AGENT_USAGE_REMINDER_STORAGE, { recursive: true });
   }
   const filePath = getStoragePath4(state2.sessionID);
@@ -18749,7 +19098,7 @@ function saveAgentUsageState(state2) {
 }
 function clearAgentUsageState(sessionID) {
   const filePath = getStoragePath4(sessionID);
-  if (existsSync29(filePath)) {
+  if (existsSync30(filePath)) {
     unlinkSync7(filePath);
   }
 }
@@ -18819,163 +19168,6 @@ function createAgentUsageReminderHook(_ctx) {
     event: eventHandler
   };
 }
-// src/hooks/keyword-detector/constants.ts
-var CODE_BLOCK_PATTERN2 = /```[\s\S]*?```/g;
-var INLINE_CODE_PATTERN2 = /`[^`]+`/g;
-var KEYWORD_DETECTORS = [
-  {
-    pattern: /(ultrawork|ulw)/i,
-    message: `<ultrawork-mode>
-[CODE RED] Maximum precision required. Ultrathink before acting.
-
-YOU MUST LEVERAGE ALL AVAILABLE AGENTS TO THEIR FULLEST POTENTIAL.
-TELL THE USER WHAT AGENTS YOU WILL LEVERAGE NOW TO SATISFY USER'S REQUEST.
-
-## AGENT UTILIZATION PRINCIPLES (by capability, not by name)
-- **Codebase Exploration**: Spawn exploration agents using BACKGROUND TASKS for file patterns, internal implementations, project structure
-- **Documentation & References**: Use librarian-type agents via BACKGROUND TASKS for API references, examples, external library docs
-- **Planning & Strategy**: NEVER plan yourself - ALWAYS spawn a dedicated planning agent for work breakdown
-- **High-IQ Reasoning**: Leverage specialized agents for architecture decisions, code review, strategic planning
-- **Frontend/UI Tasks**: Delegate to UI-specialized agents for design and implementation
-
-## EXECUTION RULES
-- **TODO**: Track EVERY step. Mark complete IMMEDIATELY after each.
-- **PARALLEL**: Fire independent agent calls simultaneously via background_task - NEVER wait sequentially.
-- **BACKGROUND FIRST**: Use background_task for exploration/research agents (10+ concurrent if needed).
-- **VERIFY**: Re-read request after completion. Check ALL requirements met before reporting done.
-- **DELEGATE**: Don't do everything yourself - orchestrate specialized agents for their strengths.
-
-## WORKFLOW
-1. Analyze the request and identify required capabilities
-2. Spawn exploration/librarian agents via background_task in PARALLEL (10+ if needed)
-3. Always Use Plan agent with gathered context to create detailed work breakdown
-4. Execute with continuous verification against original requirements
-
-## TDD (if test infrastructure exists)
-
-1. Write spec (requirements)
-2. Write tests (failing)
-3. RED: tests fail
-4. Implement minimal code
-5. GREEN: tests pass
-6. Refactor if needed (must stay green)
-7. Next feature, repeat
-
-## ZERO TOLERANCE FAILURES
-- **NO Scope Reduction**: Never make "demo", "skeleton", "simplified", "basic" versions - deliver FULL implementation
-- **NO MockUp Work**: When user asked you to do "port A", you must "port A", fully, 100%. No Extra feature, No reduced feature, no mock data, fully working 100% port.
-- **NO Partial Completion**: Never stop at 60-80% saying "you can extend this..." - finish 100%
-- **NO Assumed Shortcuts**: Never skip requirements you deem "optional" or "can be added later"
-- **NO Premature Stopping**: Never declare done until ALL TODOs are completed and verified
-- **NO TEST DELETION**: Never delete or skip failing tests to make the build pass. Fix the code, not the tests.
-
-THE USER ASKED FOR X. DELIVER EXACTLY X. NOT A SUBSET. NOT A DEMO. NOT A STARTING POINT.
-
-</ultrawork-mode>
-
----
-
-`
-  },
-  {
-    pattern: /\b(search|find|locate|lookup|look\s*up|explore|discover|scan|grep|query|browse|detect|trace|seek|track|pinpoint|hunt)\b|where\s+is|show\s+me|list\s+all|\uAC80\uC0C9|\uCC3E\uC544|\uD0D0\uC0C9|\uC870\uD68C|\uC2A4\uCE94|\uC11C\uCE58|\uB4A4\uC838|\uCC3E\uAE30|\uC5B4\uB514|\uCD94\uC801|\uD0D0\uC9C0|\uCC3E\uC544\uBD10|\uCC3E\uC544\uB0B4|\uBCF4\uC5EC\uC918|\uBAA9\uB85D|\u691C\u7D22|\u63A2\u3057\u3066|\u898B\u3064\u3051\u3066|\u30B5\u30FC\u30C1|\u63A2\u7D22|\u30B9\u30AD\u30E3\u30F3|\u3069\u3053|\u767A\u898B|\u635C\u7D22|\u898B\u3064\u3051\u51FA\u3059|\u4E00\u89A7|\u641C\u7D22|\u67E5\u627E|\u5BFB\u627E|\u67E5\u8BE2|\u68C0\u7D22|\u5B9A\u4F4D|\u626B\u63CF|\u53D1\u73B0|\u5728\u54EA\u91CC|\u627E\u51FA\u6765|\u5217\u51FA|t\u00ECm ki\u1EBFm|tra c\u1EE9u|\u0111\u1ECBnh v\u1ECB|qu\u00E9t|ph\u00E1t hi\u1EC7n|truy t\u00ECm|t\u00ECm ra|\u1EDF \u0111\u00E2u|li\u1EC7t k\u00EA/i,
-    message: `[search-mode]
-MAXIMIZE SEARCH EFFORT. Launch multiple background agents IN PARALLEL:
-- explore agents (codebase patterns, file structures, ast-grep)
-- librarian agents (remote repos, official docs, GitHub examples)
-Plus direct tools: Grep, ripgrep (rg), ast-grep (sg)
-NEVER stop at first result - be exhaustive.`
-  },
-  {
-    pattern: /\b(analyze|analyse|investigate|examine|research|study|deep[\s-]?dive|inspect|audit|evaluate|assess|review|diagnose|scrutinize|dissect|debug|comprehend|interpret|breakdown|understand)\b|why\s+is|how\s+does|how\s+to|\uBD84\uC11D|\uC870\uC0AC|\uD30C\uC545|\uC5F0\uAD6C|\uAC80\uD1A0|\uC9C4\uB2E8|\uC774\uD574|\uC124\uBA85|\uC6D0\uC778|\uC774\uC720|\uB72F\uC5B4\uBD10|\uB530\uC838\uBD10|\uD3C9\uAC00|\uD574\uC11D|\uB514\uBC84\uAE45|\uB514\uBC84\uADF8|\uC5B4\uB5BB\uAC8C|\uC65C|\uC0B4\uD3B4|\u5206\u6790|\u8ABF\u67FB|\u89E3\u6790|\u691C\u8A0E|\u7814\u7A76|\u8A3A\u65AD|\u7406\u89E3|\u8AAC\u660E|\u691C\u8A3C|\u7CBE\u67FB|\u7A76\u660E|\u30C7\u30D0\u30C3\u30B0|\u306A\u305C|\u3069\u3046|\u4ED5\u7D44\u307F|\u8C03\u67E5|\u68C0\u67E5|\u5256\u6790|\u6DF1\u5165|\u8BCA\u65AD|\u89E3\u91CA|\u8C03\u8BD5|\u4E3A\u4EC0\u4E48|\u539F\u7406|\u641E\u6E05\u695A|\u5F04\u660E\u767D|ph\u00E2n t\u00EDch|\u0111i\u1EC1u tra|nghi\u00EAn c\u1EE9u|ki\u1EC3m tra|xem x\u00E9t|ch\u1EA9n \u0111o\u00E1n|gi\u1EA3i th\u00EDch|t\u00ECm hi\u1EC3u|g\u1EE1 l\u1ED7i|t\u1EA1i sao/i,
-    message: `[analyze-mode]
-ANALYSIS MODE. Gather context before diving deep:
-
-CONTEXT GATHERING (parallel):
-- 1-2 explore agents (codebase patterns, implementations)
-- 1-2 librarian agents (if external library involved)
-- Direct tools: Grep, AST-grep, LSP for targeted searches
-
-IF COMPLEX (architecture, multi-system, debugging after 2+ failures):
-- Consult oracle for strategic guidance
-
-SYNTHESIZE findings before proceeding.`
-  }
-];
-
-// src/hooks/keyword-detector/detector.ts
-function removeCodeBlocks2(text) {
-  return text.replace(CODE_BLOCK_PATTERN2, "").replace(INLINE_CODE_PATTERN2, "");
-}
-function detectKeywordsWithType(text) {
-  const textWithoutCode = removeCodeBlocks2(text);
-  const types3 = ["ultrawork", "search", "analyze"];
-  return KEYWORD_DETECTORS.map(({ pattern, message }, index) => ({
-    matches: pattern.test(textWithoutCode),
-    type: types3[index],
-    message
-  })).filter((result) => result.matches).map(({ type: type2, message }) => ({ type: type2, message }));
-}
-function extractPromptText2(parts) {
-  return parts.filter((p) => p.type === "text").map((p) => p.text || "").join(" ");
-}
-
-// src/hooks/keyword-detector/index.ts
-var sessionFirstMessageProcessed2 = new Set;
-var sessionUltraworkNotified = new Set;
-function createKeywordDetectorHook(ctx) {
-  return {
-    "chat.message": async (input, output) => {
-      const isFirstMessage = !sessionFirstMessageProcessed2.has(input.sessionID);
-      sessionFirstMessageProcessed2.add(input.sessionID);
-      const promptText = extractPromptText2(output.parts);
-      const detectedKeywords = detectKeywordsWithType(promptText);
-      const messages = detectedKeywords.map((k) => k.message);
-      if (messages.length === 0) {
-        return;
-      }
-      const hasUltrawork = detectedKeywords.some((k) => k.type === "ultrawork");
-      if (hasUltrawork && !sessionUltraworkNotified.has(input.sessionID)) {
-        sessionUltraworkNotified.add(input.sessionID);
-        log(`[keyword-detector] Ultrawork mode activated`, { sessionID: input.sessionID });
-        ctx.client.tui.showToast({
-          body: {
-            title: "Ultrawork Mode Activated",
-            message: "Maximum precision engaged. All agents at your disposal.",
-            variant: "success",
-            duration: 3000
-          }
-        }).catch((err) => log(`[keyword-detector] Failed to show toast`, { error: err, sessionID: input.sessionID }));
-      }
-      const context = messages.join(`
-`);
-      if (isFirstMessage) {
-        log(`Keywords detected on first message, transforming parts directly`, { sessionID: input.sessionID, keywordCount: messages.length });
-        const idx = output.parts.findIndex((p) => p.type === "text" && p.text);
-        if (idx >= 0) {
-          output.parts[idx].text = `${context}
-
----
-
-${output.parts[idx].text ?? ""}`;
-        }
-        return;
-      }
-      log(`Keywords detected: ${messages.length}`, { sessionID: input.sessionID });
-      const message = output.message;
-      log(`[keyword-detector] Injecting context for ${messages.length} keywords`, { sessionID: input.sessionID, contextLength: context.length });
-      const success = injectHookMessage(input.sessionID, context, {
-        agent: message.agent,
-        model: message.model,
-        path: message.path,
-        tools: message.tools
-      });
-      if (success) {
-        log("Keyword context injected", { sessionID: input.sessionID });
-      }
-    }
-  };
-}
 // src/hooks/non-interactive-env/constants.ts
 var HOOK_NAME2 = "non-interactive-env";
 var NON_INTERACTIVE_ENV = {
@@ -19058,7 +19250,8 @@ function shellEscape(value) {
   return value;
 }
 function buildEnvPrefix(env) {
-  return Object.entries(env).map(([key, value]) => `${key}=${shellEscape(value)}`).join(" \\\n");
+  const exports = Object.entries(env).map(([key, value]) => `${key}=${shellEscape(value)}`).join(" ");
+  return `export ${exports};`;
 }
 function createNonInteractiveEnvHook(_ctx) {
   return {
@@ -19089,7 +19282,7 @@ function createNonInteractiveEnvHook(_ctx) {
 }
 // src/hooks/interactive-bash-session/storage.ts
 import {
-  existsSync as existsSync30,
+  existsSync as existsSync31,
   mkdirSync as mkdirSync9,
   readFileSync as readFileSync19,
   writeFileSync as writeFileSync13,
@@ -19116,7 +19309,7 @@ function getStoragePath5(sessionID) {
 }
 function loadInteractiveBashSessionState(sessionID) {
   const filePath = getStoragePath5(sessionID);
-  if (!existsSync30(filePath))
+  if (!existsSync31(filePath))
     return null;
   try {
     const content = readFileSync19(filePath, "utf-8");
@@ -19131,7 +19324,7 @@ function loadInteractiveBashSessionState(sessionID) {
   }
 }
 function saveInteractiveBashSessionState(state2) {
-  if (!existsSync30(INTERACTIVE_BASH_SESSION_STORAGE)) {
+  if (!existsSync31(INTERACTIVE_BASH_SESSION_STORAGE)) {
     mkdirSync9(INTERACTIVE_BASH_SESSION_STORAGE, { recursive: true });
   }
   const filePath = getStoragePath5(state2.sessionID);
@@ -19144,7 +19337,7 @@ function saveInteractiveBashSessionState(state2) {
 }
 function clearInteractiveBashSessionState(sessionID) {
   const filePath = getStoragePath5(sessionID);
-  if (existsSync30(filePath)) {
+  if (existsSync31(filePath)) {
     unlinkSync8(filePath);
   }
 }
@@ -19475,10 +19668,10 @@ function createThinkingBlockValidatorHook() {
   };
 }
 // src/hooks/ralph-loop/index.ts
-import { existsSync as existsSync32, readFileSync as readFileSync21 } from "fs";
+import { existsSync as existsSync33, readFileSync as readFileSync21 } from "fs";
 
 // src/hooks/ralph-loop/storage.ts
-import { existsSync as existsSync31, readFileSync as readFileSync20, writeFileSync as writeFileSync14, unlinkSync as unlinkSync9, mkdirSync as mkdirSync10 } from "fs";
+import { existsSync as existsSync32, readFileSync as readFileSync20, writeFileSync as writeFileSync14, unlinkSync as unlinkSync9, mkdirSync as mkdirSync10 } from "fs";
 import { dirname as dirname6, join as join41 } from "path";
 
 // src/hooks/ralph-loop/constants.ts
@@ -19493,7 +19686,7 @@ function getStateFilePath(directory, customPath) {
 }
 function readState(directory, customPath) {
   const filePath = getStateFilePath(directory, customPath);
-  if (!existsSync31(filePath)) {
+  if (!existsSync32(filePath)) {
     return null;
   }
   try {
@@ -19530,7 +19723,7 @@ function writeState(directory, state2, customPath) {
   const filePath = getStateFilePath(directory, customPath);
   try {
     const dir = dirname6(filePath);
-    if (!existsSync31(dir)) {
+    if (!existsSync32(dir)) {
       mkdirSync10(dir, { recursive: true });
     }
     const sessionIdLine = state2.session_id ? `session_id: "${state2.session_id}"
@@ -19553,7 +19746,7 @@ ${state2.prompt}
 function clearState(directory, customPath) {
   const filePath = getStateFilePath(directory, customPath);
   try {
-    if (existsSync31(filePath)) {
+    if (existsSync32(filePath)) {
       unlinkSync9(filePath);
     }
     return true;
@@ -19592,6 +19785,7 @@ function createRalphLoopHook(ctx, options) {
   const stateDir = config?.state_dir;
   const getTranscriptPath2 = options?.getTranscriptPath ?? getTranscriptPath;
   const apiTimeout = options?.apiTimeout ?? DEFAULT_API_TIMEOUT;
+  const checkSessionExists = options?.checkSessionExists;
   function getSessionState(sessionID) {
     let state2 = sessions.get(sessionID);
     if (!state2) {
@@ -19604,7 +19798,7 @@ function createRalphLoopHook(ctx, options) {
     if (!transcriptPath)
       return false;
     try {
-      if (!existsSync32(transcriptPath))
+      if (!existsSync33(transcriptPath))
         return false;
       const content = readFileSync21(transcriptPath, "utf-8");
       const pattern = new RegExp(`<promise>\\s*${escapeRegex(promise)}\\s*</promise>`, "is");
@@ -19693,6 +19887,24 @@ function createRalphLoopHook(ctx, options) {
         return;
       }
       if (state2.session_id && state2.session_id !== sessionID) {
+        if (checkSessionExists) {
+          try {
+            const originalSessionExists = await checkSessionExists(state2.session_id);
+            if (!originalSessionExists) {
+              clearState(ctx.directory, stateDir);
+              log(`[${HOOK_NAME3}] Cleared orphaned state from deleted session`, {
+                orphanedSessionId: state2.session_id,
+                currentSessionId: sessionID
+              });
+              return;
+            }
+          } catch (err) {
+            log(`[${HOOK_NAME3}] Failed to check session existence`, {
+              sessionId: state2.session_id,
+              error: String(err)
+            });
+          }
+        }
         return;
       }
       const transcriptPath = getTranscriptPath2(sessionID);
@@ -19861,11 +20073,12 @@ function extractPromptText3(parts) {
 }
 
 // src/hooks/auto-slash-command/executor.ts
-import { existsSync as existsSync35, readdirSync as readdirSync12, readFileSync as readFileSync24 } from "fs";
+import { existsSync as existsSync36, readdirSync as readdirSync12, readFileSync as readFileSync24 } from "fs";
 import { join as join43, basename as basename2, dirname as dirname8 } from "path";
 import { homedir as homedir13 } from "os";
 // src/features/opencode-skill-loader/loader.ts
-import { existsSync as existsSync33, readdirSync as readdirSync11, readFileSync as readFileSync22 } from "fs";
+import { existsSync as existsSync34, readdirSync as readdirSync11, readFileSync as readFileSync22 } from "fs";
+import { promises as fs9 } from "fs";
 import { join as join42, basename } from "path";
 import { homedir as homedir11 } from "os";
 function parseSkillMcpConfigFromFrontmatter(content) {
@@ -19884,7 +20097,7 @@ function parseSkillMcpConfigFromFrontmatter(content) {
 }
 function loadMcpJsonFromDir(skillDir) {
   const mcpJsonPath = join42(skillDir, "mcp.json");
-  if (!existsSync33(mcpJsonPath))
+  if (!existsSync34(mcpJsonPath))
     return;
   try {
     const content = readFileSync22(mcpJsonPath, "utf-8");
@@ -19911,7 +20124,66 @@ function parseAllowedTools(allowedTools) {
 function loadSkillFromPath(skillPath, resolvedPath, defaultName, scope) {
   try {
     const content = readFileSync22(skillPath, "utf-8");
-    const { data, body } = parseFrontmatter(content);
+    const { data } = parseFrontmatter(content);
+    const frontmatterMcp = parseSkillMcpConfigFromFrontmatter(content);
+    const mcpJsonMcp = loadMcpJsonFromDir(resolvedPath);
+    const mcpConfig = mcpJsonMcp || frontmatterMcp;
+    const skillName = data.name || defaultName;
+    const originalDescription = data.description || "";
+    const isOpencodeSource = scope === "opencode" || scope === "opencode-project";
+    const formattedDescription = `(${scope} - Skill) ${originalDescription}`;
+    const lazyContent = {
+      loaded: false,
+      content: undefined,
+      load: async () => {
+        if (!lazyContent.loaded) {
+          const fileContent = await fs9.readFile(skillPath, "utf-8");
+          const { body } = parseFrontmatter(fileContent);
+          lazyContent.content = `<skill-instruction>
+Base directory for this skill: ${resolvedPath}/
+File references (@path) in this skill are relative to this directory.
+
+${body.trim()}
+</skill-instruction>
+
+<user-request>
+$ARGUMENTS
+</user-request>`;
+          lazyContent.loaded = true;
+        }
+        return lazyContent.content;
+      }
+    };
+    const definition = {
+      name: skillName,
+      description: formattedDescription,
+      template: "",
+      model: sanitizeModelField(data.model, isOpencodeSource ? "opencode" : "claude-code"),
+      agent: data.agent,
+      subtask: data.subtask,
+      argumentHint: data["argument-hint"]
+    };
+    return {
+      name: skillName,
+      path: skillPath,
+      resolvedPath,
+      definition,
+      scope,
+      license: data.license,
+      compatibility: data.compatibility,
+      metadata: data.metadata,
+      allowedTools: parseAllowedTools(data["allowed-tools"]),
+      mcpConfig,
+      lazyContent
+    };
+  } catch {
+    return null;
+  }
+}
+async function loadSkillFromPathAsync(skillPath, resolvedPath, defaultName, scope) {
+  try {
+    const content = await fs9.readFile(skillPath, "utf-8");
+    const { data } = parseFrontmatter(content);
     const frontmatterMcp = parseSkillMcpConfigFromFrontmatter(content);
     const mcpJsonMcp = loadMcpJsonFromDir(resolvedPath);
     const mcpConfig = mcpJsonMcp || frontmatterMcp;
@@ -19919,7 +20191,14 @@ function loadSkillFromPath(skillPath, resolvedPath, defaultName, scope) {
     const originalDescription = data.description || "";
     const isOpencodeSource = scope === "opencode" || scope === "opencode-project";
     const formattedDescription = `(${scope} - Skill) ${originalDescription}`;
-    const wrappedTemplate = `<skill-instruction>
+    const lazyContent = {
+      loaded: false,
+      content: undefined,
+      load: async () => {
+        if (!lazyContent.loaded) {
+          const fileContent = await fs9.readFile(skillPath, "utf-8");
+          const { body } = parseFrontmatter(fileContent);
+          lazyContent.content = `<skill-instruction>
 Base directory for this skill: ${resolvedPath}/
 File references (@path) in this skill are relative to this directory.
 
@@ -19929,10 +20208,15 @@ ${body.trim()}
 <user-request>
 $ARGUMENTS
 </user-request>`;
+          lazyContent.loaded = true;
+        }
+        return lazyContent.content;
+      }
+    };
     const definition = {
       name: skillName,
       description: formattedDescription,
-      template: wrappedTemplate,
+      template: "",
       model: sanitizeModelField(data.model, isOpencodeSource ? "opencode" : "claude-code"),
       agent: data.agent,
       subtask: data.subtask,
@@ -19948,14 +20232,15 @@ $ARGUMENTS
       compatibility: data.compatibility,
       metadata: data.metadata,
       allowedTools: parseAllowedTools(data["allowed-tools"]),
-      mcpConfig
+      mcpConfig,
+      lazyContent
     };
   } catch {
     return null;
   }
 }
 function loadSkillsFromDir(skillsDir, scope) {
-  if (!existsSync33(skillsDir)) {
+  if (!existsSync34(skillsDir)) {
     return [];
   }
   const entries = readdirSync11(skillsDir, { withFileTypes: true });
@@ -19968,14 +20253,14 @@ function loadSkillsFromDir(skillsDir, scope) {
       const resolvedPath = resolveSymlink(entryPath);
       const dirName = entry.name;
       const skillMdPath = join42(resolvedPath, "SKILL.md");
-      if (existsSync33(skillMdPath)) {
+      if (existsSync34(skillMdPath)) {
         const skill = loadSkillFromPath(skillMdPath, resolvedPath, dirName, scope);
         if (skill)
           skills.push(skill);
         continue;
       }
       const namedSkillMdPath = join42(resolvedPath, `${dirName}.md`);
-      if (existsSync33(namedSkillMdPath)) {
+      if (existsSync34(namedSkillMdPath)) {
         const skill = loadSkillFromPath(namedSkillMdPath, resolvedPath, dirName, scope);
         if (skill)
           skills.push(skill);
@@ -19992,6 +20277,43 @@ function loadSkillsFromDir(skillsDir, scope) {
   }
   return skills;
 }
+async function loadSkillsFromDirAsync(skillsDir, scope) {
+  const entries = await fs9.readdir(skillsDir, { withFileTypes: true }).catch(() => []);
+  const skills = [];
+  for (const entry of entries) {
+    if (entry.name.startsWith("."))
+      continue;
+    const entryPath = join42(skillsDir, entry.name);
+    if (entry.isDirectory() || entry.isSymbolicLink()) {
+      const resolvedPath = resolveSymlink(entryPath);
+      const dirName = entry.name;
+      const skillMdPath = join42(resolvedPath, "SKILL.md");
+      try {
+        await fs9.access(skillMdPath);
+        const skill = await loadSkillFromPathAsync(skillMdPath, resolvedPath, dirName, scope);
+        if (skill)
+          skills.push(skill);
+        continue;
+      } catch {}
+      const namedSkillMdPath = join42(resolvedPath, `${dirName}.md`);
+      try {
+        await fs9.access(namedSkillMdPath);
+        const skill = await loadSkillFromPathAsync(namedSkillMdPath, resolvedPath, dirName, scope);
+        if (skill)
+          skills.push(skill);
+        continue;
+      } catch {}
+      continue;
+    }
+    if (isMarkdownFile(entry)) {
+      const skillName = basename(entry.name, ".md");
+      const skill = await loadSkillFromPathAsync(entryPath, skillsDir, skillName, scope);
+      if (skill)
+        skills.push(skill);
+    }
+  }
+  return skills;
+}
 function skillsToRecord(skills) {
   const result = {};
   for (const skill of skills) {
@@ -20046,24 +20368,24 @@ function discoverSkills(options = {}) {
   const userSkills = loadSkillsFromDir(userDir, "user");
   return [...opencodeProjectSkills, ...projectSkills, ...opencodeGlobalSkills, ...userSkills];
 }
-function discoverUserClaudeSkills() {
+async function discoverUserClaudeSkillsAsync() {
   const userSkillsDir = join42(getClaudeConfigDir(), "skills");
-  return loadSkillsFromDir(userSkillsDir, "user");
+  return loadSkillsFromDirAsync(userSkillsDir, "user");
 }
-function discoverProjectClaudeSkills() {
+async function discoverProjectClaudeSkillsAsync() {
   const projectSkillsDir = join42(process.cwd(), ".claude", "skills");
-  return loadSkillsFromDir(projectSkillsDir, "project");
+  return loadSkillsFromDirAsync(projectSkillsDir, "project");
 }
-function discoverOpencodeGlobalSkills() {
+async function discoverOpencodeGlobalSkillsAsync() {
   const opencodeSkillsDir = join42(homedir11(), ".config", "opencode", "skill");
-  return loadSkillsFromDir(opencodeSkillsDir, "opencode");
+  return loadSkillsFromDirAsync(opencodeSkillsDir, "opencode");
 }
-function discoverOpencodeProjectSkills() {
+async function discoverOpencodeProjectSkillsAsync() {
   const opencodeProjectDir = join42(process.cwd(), ".opencode", "skill");
-  return loadSkillsFromDir(opencodeProjectDir, "opencode-project");
+  return loadSkillsFromDirAsync(opencodeProjectDir, "opencode-project");
 }
 // src/features/opencode-skill-loader/merger.ts
-import { readFileSync as readFileSync23, existsSync as existsSync34 } from "fs";
+import { readFileSync as readFileSync23, existsSync as existsSync35 } from "fs";
 import { dirname as dirname7, resolve as resolve5, isAbsolute as isAbsolute2 } from "path";
 import { homedir as homedir12 } from "os";
 var SCOPE_PRIORITY = {
@@ -20111,7 +20433,7 @@ function resolveFilePath2(from, configDir) {
 }
 function loadSkillFromFile(filePath) {
   try {
-    if (!existsSync34(filePath))
+    if (!existsSync35(filePath))
       return null;
     const content = readFileSync23(filePath, "utf-8");
     const { data, body } = parseFrontmatter(content);
@@ -20267,7 +20589,7 @@ function mergeSkills(builtinSkills, config, userClaudeSkills, userOpencodeSkills
 }
 // src/hooks/auto-slash-command/executor.ts
 function discoverCommandsFromDir(commandsDir, scope) {
-  if (!existsSync35(commandsDir)) {
+  if (!existsSync36(commandsDir)) {
     return [];
   }
   const entries = readdirSync12(commandsDir, { withFileTypes: true });
@@ -20490,6 +20812,147 @@ ${EDIT_ERROR_REMINDER}`;
     }
   };
 }
+// src/features/context-injector/collector.ts
+var PRIORITY_ORDER = {
+  critical: 0,
+  high: 1,
+  normal: 2,
+  low: 3
+};
+var CONTEXT_SEPARATOR = `
+
+---
+
+`;
+
+class ContextCollector {
+  sessions = new Map;
+  register(sessionID, options) {
+    if (!this.sessions.has(sessionID)) {
+      this.sessions.set(sessionID, new Map);
+    }
+    const sessionMap = this.sessions.get(sessionID);
+    const key = `${options.source}:${options.id}`;
+    const entry = {
+      id: options.id,
+      source: options.source,
+      content: options.content,
+      priority: options.priority ?? "normal",
+      timestamp: Date.now(),
+      metadata: options.metadata
+    };
+    sessionMap.set(key, entry);
+  }
+  getPending(sessionID) {
+    const sessionMap = this.sessions.get(sessionID);
+    if (!sessionMap || sessionMap.size === 0) {
+      return {
+        merged: "",
+        entries: [],
+        hasContent: false
+      };
+    }
+    const entries = this.sortEntries([...sessionMap.values()]);
+    const merged = entries.map((e) => e.content).join(CONTEXT_SEPARATOR);
+    return {
+      merged,
+      entries,
+      hasContent: entries.length > 0
+    };
+  }
+  consume(sessionID) {
+    const pending = this.getPending(sessionID);
+    this.clear(sessionID);
+    return pending;
+  }
+  clear(sessionID) {
+    this.sessions.delete(sessionID);
+  }
+  hasPending(sessionID) {
+    const sessionMap = this.sessions.get(sessionID);
+    return sessionMap !== undefined && sessionMap.size > 0;
+  }
+  sortEntries(entries) {
+    return entries.sort((a, b) => {
+      const priorityDiff = PRIORITY_ORDER[a.priority] - PRIORITY_ORDER[b.priority];
+      if (priorityDiff !== 0)
+        return priorityDiff;
+      return a.timestamp - b.timestamp;
+    });
+  }
+}
+var contextCollector = new ContextCollector;
+// src/features/context-injector/injector.ts
+function createContextInjectorHook(collector) {
+  return {
+    "chat.message": async (_input, _output) => {}
+  };
+}
+function createContextInjectorMessagesTransformHook(collector) {
+  return {
+    "experimental.chat.messages.transform": async (_input, output) => {
+      const { messages } = output;
+      if (messages.length === 0) {
+        return;
+      }
+      let lastUserMessageIndex = -1;
+      for (let i2 = messages.length - 1;i2 >= 0; i2--) {
+        if (messages[i2].info.role === "user") {
+          lastUserMessageIndex = i2;
+          break;
+        }
+      }
+      if (lastUserMessageIndex === -1) {
+        return;
+      }
+      const lastUserMessage = messages[lastUserMessageIndex];
+      const sessionID = lastUserMessage.info.sessionID;
+      if (!sessionID) {
+        return;
+      }
+      if (!collector.hasPending(sessionID)) {
+        return;
+      }
+      const pending = collector.consume(sessionID);
+      if (!pending.hasContent) {
+        return;
+      }
+      const refInfo = lastUserMessage.info;
+      const syntheticMessageId = `synthetic_ctx_${Date.now()}`;
+      const syntheticPartId = `synthetic_ctx_part_${Date.now()}`;
+      const now = Date.now();
+      const syntheticMessage = {
+        info: {
+          id: syntheticMessageId,
+          sessionID,
+          role: "user",
+          time: { created: now },
+          agent: refInfo.agent ?? "Sisyphus",
+          model: refInfo.model ?? { providerID: "unknown", modelID: "unknown" },
+          path: refInfo.path ?? { cwd: "/", root: "/" }
+        },
+        parts: [
+          {
+            id: syntheticPartId,
+            sessionID,
+            messageID: syntheticMessageId,
+            type: "text",
+            text: pending.merged,
+            synthetic: true,
+            time: { start: now, end: now }
+          }
+        ]
+      };
+      messages.splice(lastUserMessageIndex, 0, syntheticMessage);
+      log("[context-injector] Injected synthetic message from collector", {
+        sessionID,
+        insertIndex: lastUserMessageIndex,
+        contextLength: pending.merged.length,
+        newMessageCount: messages.length
+      });
+    }
+  };
+}
 // src/auth/antigravity/constants.ts
 var ANTIGRAVITY_CLIENT_ID = "1071006060591-tmhssin2h21lcre235vtolojh4g403ep.apps.googleusercontent.com";
 var ANTIGRAVITY_CLIENT_SECRET = "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";
@@ -22337,7 +22800,7 @@ function createBuiltinSkills() {
   return [playwrightSkill];
 }
 // src/features/claude-code-mcp-loader/loader.ts
-import { existsSync as existsSync36, readFileSync as readFileSync25 } from "fs";
+import { existsSync as existsSync37, readFileSync as readFileSync25 } from "fs";
 import { join as join44 } from "path";
 
 // src/features/claude-code-mcp-loader/env-expander.ts
@@ -22413,7 +22876,7 @@ function getMcpConfigPaths() {
   ];
 }
 async function loadMcpConfigFile(filePath) {
-  if (!existsSync36(filePath)) {
+  if (!existsSync37(filePath)) {
     return null;
   }
   try {
@@ -22428,7 +22891,7 @@ function getSystemMcpServerNames() {
   const names = new Set;
   const paths = getMcpConfigPaths();
   for (const { path: path7 } of paths) {
-    if (!existsSync36(path7))
+    if (!existsSync37(path7))
       continue;
     try {
       const content = readFileSync25(path7, "utf-8");
@@ -22541,7 +23004,18 @@ var LSP_INSTALL_HINTS = {
   "lua-ls": "See https://github.com/LuaLS/lua-language-server",
   php: "npm install -g intelephense",
   dart: "Included with Dart SDK",
-  "terraform-ls": "See https://github.com/hashicorp/terraform-ls"
+  "terraform-ls": "See https://github.com/hashicorp/terraform-ls",
+  terraform: "See https://github.com/hashicorp/terraform-ls",
+  prisma: "npm install -g prisma",
+  "ocaml-lsp": "opam install ocaml-lsp-server",
+  texlab: "See https://github.com/latex-lsp/texlab",
+  dockerfile: "npm install -g dockerfile-language-server-nodejs",
+  gleam: "See https://gleam.run/getting-started/installing/",
+  "clojure-lsp": "See https://clojure-lsp.io/installation/",
+  nixd: "nix profile install nixpkgs#nixd",
+  tinymist: "See https://github.com/Myriad-Dreamin/tinymist",
+  "haskell-language-server": "ghcup install hls",
+  bash: "npm install -g bash-language-server"
 };
 var BUILTIN_SERVERS = {
   typescript: {
@@ -22646,6 +23120,10 @@ var BUILTIN_SERVERS = {
     command: ["astro-ls", "--stdio"],
     extensions: [".astro"]
   },
+  bash: {
+    command: ["bash-language-server", "start"],
+    extensions: [".sh", ".bash", ".zsh", ".ksh"]
+  },
   "bash-ls": {
     command: ["bash-language-server", "start"],
     extensions: [".sh", ".bash", ".zsh", ".ksh"]
@@ -22670,9 +23148,49 @@ var BUILTIN_SERVERS = {
     command: ["dart", "language-server", "--lsp"],
     extensions: [".dart"]
   },
+  terraform: {
+    command: ["terraform-ls", "serve"],
+    extensions: [".tf", ".tfvars"]
+  },
   "terraform-ls": {
     command: ["terraform-ls", "serve"],
     extensions: [".tf", ".tfvars"]
+  },
+  prisma: {
+    command: ["prisma", "language-server"],
+    extensions: [".prisma"]
+  },
+  "ocaml-lsp": {
+    command: ["ocamllsp"],
+    extensions: [".ml", ".mli"]
+  },
+  texlab: {
+    command: ["texlab"],
+    extensions: [".tex", ".bib"]
+  },
+  dockerfile: {
+    command: ["docker-langserver", "--stdio"],
+    extensions: [".dockerfile"]
+  },
+  gleam: {
+    command: ["gleam", "lsp"],
+    extensions: [".gleam"]
+  },
+  "clojure-lsp": {
+    command: ["clojure-lsp", "listen"],
+    extensions: [".clj", ".cljs", ".cljc", ".edn"]
+  },
+  nixd: {
+    command: ["nixd"],
+    extensions: [".nix"]
+  },
+  tinymist: {
+    command: ["tinymist"],
+    extensions: [".typ", ".typc"]
+  },
+  "haskell-language-server": {
+    command: ["haskell-language-server-wrapper", "--lsp"],
+    extensions: [".hs", ".lhs"]
   }
 };
 var EXT_TO_LANG = {
@@ -22788,6 +23306,14 @@ var EXT_TO_LANG = {
   ".tf": "terraform",
   ".tfvars": "terraform-vars",
   ".hcl": "hcl",
+  ".nix": "nix",
+  ".typ": "typst",
+  ".typc": "typst",
+  ".ets": "typescript",
+  ".lhs": "haskell",
+  ".kt": "kotlin",
+  ".kts": "kotlin",
+  ".prisma": "prisma",
   ".h": "c",
   ".hpp": "cpp",
   ".hh": "cpp",
@@ -22800,11 +23326,11 @@ var EXT_TO_LANG = {
   ".gql": "graphql"
 };
 // src/tools/lsp/config.ts
-import { existsSync as existsSync37, readFileSync as readFileSync26 } from "fs";
+import { existsSync as existsSync38, readFileSync as readFileSync26 } from "fs";
 import { join as join45 } from "path";
 import { homedir as homedir14 } from "os";
 function loadJsonFile(path7) {
-  if (!existsSync37(path7))
+  if (!existsSync38(path7))
     return null;
   try {
     return JSON.parse(readFileSync26(path7, "utf-8"));
@@ -22930,7 +23456,7 @@ function isServerInstalled(command) {
     return false;
   const cmd = command[0];
   if (cmd.includes("/") || cmd.includes("\\")) {
-    if (existsSync37(cmd))
+    if (existsSync38(cmd))
       return true;
   }
   const isWindows2 = process.platform === "win32";
@@ -22939,7 +23465,7 @@ function isServerInstalled(command) {
   const pathSeparator = isWindows2 ? ";" : ":";
   const paths = pathEnv.split(pathSeparator);
   for (const p of paths) {
-    if (existsSync37(join45(p, cmd)) || existsSync37(join45(p, cmd + ext))) {
+    if (existsSync38(join45(p, cmd)) || existsSync38(join45(p, cmd + ext))) {
       return true;
     }
   }
@@ -22953,7 +23479,7 @@ function isServerInstalled(command) {
     join45(homedir14(), ".config", "opencode", "node_modules", ".bin", cmd + ext)
   ];
   for (const p of additionalPaths) {
-    if (existsSync37(p)) {
+    if (existsSync38(p)) {
       return true;
     }
   }
@@ -23552,16 +24078,16 @@ ${msg}`);
 // src/tools/lsp/utils.ts
 import { extname as extname2, resolve as resolve7 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
-import { existsSync as existsSync38, readFileSync as readFileSync28, writeFileSync as writeFileSync15 } from "fs";
+import { existsSync as existsSync39, readFileSync as readFileSync28, writeFileSync as writeFileSync15 } from "fs";
 function findWorkspaceRoot(filePath) {
   let dir = resolve7(filePath);
-  if (!existsSync38(dir) || !__require("fs").statSync(dir).isDirectory()) {
+  if (!existsSync39(dir) || !__require("fs").statSync(dir).isDirectory()) {
     dir = __require("path").dirname(dir);
   }
   const markers = [".git", "package.json", "pyproject.toml", "Cargo.toml", "go.mod", "pom.xml", "build.gradle"];
   while (dir !== "/") {
     for (const marker of markers) {
-      if (existsSync38(__require("path").join(dir, marker))) {
+      if (existsSync39(__require("path").join(dir, marker))) {
         return dir;
       }
     }
@@ -36525,11 +37051,11 @@ var lsp_code_action_resolve = tool({
 // src/tools/ast-grep/constants.ts
 import { createRequire as createRequire4 } from "module";
 import { dirname as dirname9, join as join47 } from "path";
-import { existsSync as existsSync40, statSync as statSync4 } from "fs";
+import { existsSync as existsSync41, statSync as statSync4 } from "fs";
 
 // src/tools/ast-grep/downloader.ts
 var {spawn: spawn6 } = globalThis.Bun;
-import { existsSync as existsSync39, mkdirSync as mkdirSync11, chmodSync as chmodSync2, unlinkSync as unlinkSync10 } from "fs";
+import { existsSync as existsSync40, mkdirSync as mkdirSync11, chmodSync as chmodSync2, unlinkSync as unlinkSync10 } from "fs";
 import { join as join46 } from "path";
 import { homedir as homedir15 } from "os";
 import { createRequire as createRequire3 } from "module";
@@ -36568,7 +37094,7 @@ function getBinaryName3() {
 }
 function getCachedBinaryPath2() {
   const binaryPath = join46(getCacheDir3(), getBinaryName3());
-  return existsSync39(binaryPath) ? binaryPath : null;
+  return existsSync40(binaryPath) ? binaryPath : null;
 }
 async function extractZip2(archivePath, destDir) {
   const proc = process.platform === "win32" ? spawn6([
@@ -36595,7 +37121,7 @@ async function downloadAstGrep(version2 = DEFAULT_VERSION) {
   const cacheDir = getCacheDir3();
   const binaryName = getBinaryName3();
   const binaryPath = join46(cacheDir, binaryName);
-  if (existsSync39(binaryPath)) {
+  if (existsSync40(binaryPath)) {
     return binaryPath;
   }
   const { arch, os: os6 } = platformInfo;
@@ -36603,7 +37129,7 @@ async function downloadAstGrep(version2 = DEFAULT_VERSION) {
   const downloadUrl = `https://github.com/${REPO2}/releases/download/${version2}/${assetName}`;
   console.log(`[oh-my-opencode] Downloading ast-grep binary...`);
   try {
-    if (!existsSync39(cacheDir)) {
+    if (!existsSync40(cacheDir)) {
       mkdirSync11(cacheDir, { recursive: true });
     }
     const response2 = await fetch(downloadUrl, { redirect: "follow" });
@@ -36614,10 +37140,10 @@ async function downloadAstGrep(version2 = DEFAULT_VERSION) {
     const arrayBuffer = await response2.arrayBuffer();
     await Bun.write(archivePath, arrayBuffer);
     await extractZip2(archivePath, cacheDir);
-    if (existsSync39(archivePath)) {
+    if (existsSync40(archivePath)) {
       unlinkSync10(archivePath);
     }
-    if (process.platform !== "win32" && existsSync39(binaryPath)) {
+    if (process.platform !== "win32" && existsSync40(binaryPath)) {
       chmodSync2(binaryPath, 493);
     }
     console.log(`[oh-my-opencode] ast-grep binary ready.`);
@@ -36669,7 +37195,7 @@ function findSgCliPathSync() {
     const cliPkgPath = require2.resolve("@ast-grep/cli/package.json");
     const cliDir = dirname9(cliPkgPath);
     const sgPath = join47(cliDir, binaryName);
-    if (existsSync40(sgPath) && isValidBinary(sgPath)) {
+    if (existsSync41(sgPath) && isValidBinary(sgPath)) {
       return sgPath;
     }
   } catch {}
@@ -36681,7 +37207,7 @@ function findSgCliPathSync() {
       const pkgDir = dirname9(pkgPath);
       const astGrepName = process.platform === "win32" ? "ast-grep.exe" : "ast-grep";
       const binaryPath = join47(pkgDir, astGrepName);
-      if (existsSync40(binaryPath) && isValidBinary(binaryPath)) {
+      if (existsSync41(binaryPath) && isValidBinary(binaryPath)) {
         return binaryPath;
       }
     } catch {}
@@ -36689,7 +37215,7 @@ function findSgCliPathSync() {
   if (process.platform === "darwin") {
     const homebrewPaths = ["/opt/homebrew/bin/sg", "/usr/local/bin/sg"];
     for (const path7 of homebrewPaths) {
-      if (existsSync40(path7) && isValidBinary(path7)) {
+      if (existsSync41(path7) && isValidBinary(path7)) {
         return path7;
       }
     }
@@ -36744,11 +37270,11 @@ var DEFAULT_MAX_MATCHES = 500;
 
 // src/tools/ast-grep/cli.ts
 var {spawn: spawn7 } = globalThis.Bun;
-import { existsSync as existsSync41 } from "fs";
+import { existsSync as existsSync42 } from "fs";
 var resolvedCliPath3 = null;
 var initPromise2 = null;
 async function getAstGrepPath() {
-  if (resolvedCliPath3 !== null && existsSync41(resolvedCliPath3)) {
+  if (resolvedCliPath3 !== null && existsSync42(resolvedCliPath3)) {
     return resolvedCliPath3;
   }
   if (initPromise2) {
@@ -36756,7 +37282,7 @@ async function getAstGrepPath() {
   }
   initPromise2 = (async () => {
     const syncPath = findSgCliPathSync();
-    if (syncPath && existsSync41(syncPath)) {
+    if (syncPath && existsSync42(syncPath)) {
       resolvedCliPath3 = syncPath;
       setSgCliPath(syncPath);
       return syncPath;
@@ -36790,7 +37316,7 @@ async function runSg(options) {
   const paths = options.paths && options.paths.length > 0 ? options.paths : ["."];
   args.push(...paths);
   let cliPath = getSgCliPath();
-  if (!existsSync41(cliPath) && cliPath !== "sg") {
+  if (!existsSync42(cliPath) && cliPath !== "sg") {
     const downloadedPath = await getAstGrepPath();
     if (downloadedPath) {
       cliPath = downloadedPath;
@@ -37054,12 +37580,12 @@ var ast_grep_replace = tool({
 var {spawn: spawn9 } = globalThis.Bun;
 
 // src/tools/grep/constants.ts
-import { existsSync as existsSync43 } from "fs";
+import { existsSync as existsSync44 } from "fs";
 import { join as join49, dirname as dirname10 } from "path";
 import { spawnSync } from "child_process";
 
 // src/tools/grep/downloader.ts
-import { existsSync as existsSync42, mkdirSync as mkdirSync12, chmodSync as chmodSync3, unlinkSync as unlinkSync11, readdirSync as readdirSync13 } from "fs";
+import { existsSync as existsSync43, mkdirSync as mkdirSync12, chmodSync as chmodSync3, unlinkSync as unlinkSync11, readdirSync as readdirSync13 } from "fs";
 import { join as join48 } from "path";
 var {spawn: spawn8 } = globalThis.Bun;
 function findFileRecursive(dir, filename) {
@@ -37169,7 +37695,7 @@ async function downloadAndInstallRipgrep() {
   }
   const installDir = getInstallDir();
   const rgPath = getRgPath();
-  if (existsSync42(rgPath)) {
+  if (existsSync43(rgPath)) {
     return rgPath;
   }
   mkdirSync12(installDir, { recursive: true });
@@ -37186,12 +37712,12 @@ async function downloadAndInstallRipgrep() {
     if (process.platform !== "win32") {
       chmodSync3(rgPath, 493);
     }
-    if (!existsSync42(rgPath)) {
+    if (!existsSync43(rgPath)) {
       throw new Error("ripgrep binary not found after extraction");
     }
     return rgPath;
   } finally {
-    if (existsSync42(archivePath)) {
+    if (existsSync43(archivePath)) {
       try {
         unlinkSync11(archivePath);
       } catch {}
@@ -37200,7 +37726,7 @@ async function downloadAndInstallRipgrep() {
 }
 function getInstalledRipgrepPath() {
   const rgPath = getRgPath();
-  return existsSync42(rgPath) ? rgPath : null;
+  return existsSync43(rgPath) ? rgPath : null;
 }
 
 // src/tools/grep/constants.ts
@@ -37231,7 +37757,7 @@ function getOpenCodeBundledRg() {
     join49(execDir, "..", "libexec", rgName)
   ];
   for (const candidate of candidates) {
-    if (existsSync43(candidate)) {
+    if (existsSync44(candidate)) {
       return candidate;
     }
   }
@@ -37684,10 +38210,10 @@ var glob = tool({
   }
 });
 // src/tools/slashcommand/tools.ts
-import { existsSync as existsSync44, readdirSync as readdirSync14, readFileSync as readFileSync29 } from "fs";
+import { existsSync as existsSync45, readdirSync as readdirSync14, readFileSync as readFileSync29 } from "fs";
 import { join as join50, basename as basename3, dirname as dirname11 } from "path";
 function discoverCommandsFromDir2(commandsDir, scope) {
-  if (!existsSync44(commandsDir)) {
+  if (!existsSync45(commandsDir)) {
     return [];
   }
   const entries = readdirSync14(commandsDir, { withFileTypes: true });
@@ -37936,11 +38462,11 @@ Has Todos: Yes (12 items, 8 completed)
 Has Transcript: Yes (234 entries)`;
 
 // src/tools/session-manager/storage.ts
-import { existsSync as existsSync45, readdirSync as readdirSync15 } from "fs";
+import { existsSync as existsSync46, readdirSync as readdirSync15 } from "fs";
 import { readdir, readFile } from "fs/promises";
 import { join as join52 } from "path";
 async function getMainSessions(options) {
-  if (!existsSync45(SESSION_STORAGE))
+  if (!existsSync46(SESSION_STORAGE))
     return [];
   const sessions = [];
   try {
@@ -37972,7 +38498,7 @@ async function getMainSessions(options) {
   return sessions.sort((a, b) => b.time.updated - a.time.updated);
 }
 async function getAllSessions() {
-  if (!existsSync45(MESSAGE_STORAGE4))
+  if (!existsSync46(MESSAGE_STORAGE4))
     return [];
   const sessions = [];
   async function scanDirectory(dir) {
@@ -37997,16 +38523,16 @@ async function getAllSessions() {
   return [...new Set(sessions)];
 }
 function getMessageDir9(sessionID) {
-  if (!existsSync45(MESSAGE_STORAGE4))
+  if (!existsSync46(MESSAGE_STORAGE4))
     return "";
   const directPath = join52(MESSAGE_STORAGE4, sessionID);
-  if (existsSync45(directPath)) {
+  if (existsSync46(directPath)) {
     return directPath;
   }
   try {
     for (const dir of readdirSync15(MESSAGE_STORAGE4)) {
       const sessionPath = join52(MESSAGE_STORAGE4, dir, sessionID);
-      if (existsSync45(sessionPath)) {
+      if (existsSync46(sessionPath)) {
         return sessionPath;
       }
     }
@@ -38020,7 +38546,7 @@ function sessionExists(sessionID) {
 }
 async function readSessionMessages(sessionID) {
   const messageDir = getMessageDir9(sessionID);
-  if (!messageDir || !existsSync45(messageDir))
+  if (!messageDir || !existsSync46(messageDir))
     return [];
   const messages = [];
   try {
@@ -38056,7 +38582,7 @@ async function readSessionMessages(sessionID) {
 }
 async function readParts2(messageID) {
   const partDir = join52(PART_STORAGE4, messageID);
-  if (!existsSync45(partDir))
+  if (!existsSync46(partDir))
     return [];
   const parts = [];
   try {
@@ -38077,7 +38603,7 @@ async function readParts2(messageID) {
   return parts.sort((a, b) => a.id.localeCompare(b.id));
 }
 async function readSessionTodos(sessionID) {
-  if (!existsSync45(TODO_DIR2))
+  if (!existsSync46(TODO_DIR2))
     return [];
   try {
     const allFiles = await readdir(TODO_DIR2);
@@ -38104,10 +38630,10 @@ async function readSessionTodos(sessionID) {
   return [];
 }
 async function readSessionTranscript(sessionID) {
-  if (!existsSync45(TRANSCRIPT_DIR2))
+  if (!existsSync46(TRANSCRIPT_DIR2))
     return 0;
   const transcriptFile = join52(TRANSCRIPT_DIR2, `${sessionID}.jsonl`);
-  if (!existsSync45(transcriptFile))
+  if (!existsSync46(transcriptFile))
     return 0;
   try {
     const content = await readFile(transcriptFile, "utf-8");
@@ -38487,6 +39013,12 @@ async function getTmuxPath() {
 function getCachedTmuxPath() {
   return tmuxPath;
 }
+function startBackgroundCheck2() {
+  if (!initPromise3) {
+    initPromise3 = getTmuxPath();
+    initPromise3.catch(() => {});
+  }
+}
 
 // src/tools/interactive-bash/tools.ts
 function tokenizeCommand2(cmd) {
@@ -38614,7 +39146,12 @@ function formatSkillsXml(skills) {
 ${skillsXml}
 </available_skills>`;
 }
-function extractSkillBody(skill) {
+async function extractSkillBody(skill) {
+  if (skill.lazyContent) {
+    const fullTemplate = await skill.lazyContent.load();
+    const templateMatch2 = fullTemplate.match(/<skill-instruction>([\s\S]*?)<\/skill-instruction>/);
+    return templateMatch2 ? templateMatch2[1].trim() : fullTemplate;
+  }
   if (skill.path) {
     const content = readFileSync30(skill.path, "utf-8");
     const { body } = parseFrontmatter(content);
@@ -38698,7 +39235,7 @@ function createSkillTool(options = {}) {
         const available = skills.map((s) => s.name).join(", ");
         throw new Error(`Skill "${args.name}" not found. Available skills: ${available || "none"}`);
       }
-      const body = extractSkillBody(skill);
+      const body = await extractSkillBody(skill);
       const dir = skill.path ? dirname12(skill.path) : skill.resolvedPath || process.cwd();
       const output = [
         `## Skill: ${skill.name}`,
@@ -38864,7 +39401,7 @@ function createSkillMcpTool(options) {
   });
 }
 // src/tools/background-task/tools.ts
-import { existsSync as existsSync46, readdirSync as readdirSync16 } from "fs";
+import { existsSync as existsSync47, readdirSync as readdirSync16 } from "fs";
 import { join as join53 } from "path";
 
 // src/tools/background-task/constants.ts
@@ -38876,14 +39413,14 @@ var BACKGROUND_CANCEL_DESCRIPTION = `Cancel running background task(s). Use all=
 
 // src/tools/background-task/tools.ts
 function getMessageDir10(sessionID) {
-  if (!existsSync46(MESSAGE_STORAGE))
+  if (!existsSync47(MESSAGE_STORAGE))
     return null;
   const directPath = join53(MESSAGE_STORAGE, sessionID);
-  if (existsSync46(directPath))
+  if (existsSync47(directPath))
     return directPath;
   for (const dir of readdirSync16(MESSAGE_STORAGE)) {
     const sessionPath = join53(MESSAGE_STORAGE, dir, sessionID);
-    if (existsSync46(sessionPath))
+    if (existsSync47(sessionPath))
       return sessionPath;
   }
   return null;
@@ -39469,18 +40006,18 @@ var builtinTools = {
   session_info
 };
 // src/features/background-agent/manager.ts
-import { existsSync as existsSync47, readdirSync as readdirSync17 } from "fs";
+import { existsSync as existsSync48, readdirSync as readdirSync17 } from "fs";
 import { join as join54 } from "path";
 var TASK_TTL_MS = 30 * 60 * 1000;
 function getMessageDir11(sessionID) {
-  if (!existsSync47(MESSAGE_STORAGE))
+  if (!existsSync48(MESSAGE_STORAGE))
     return null;
   const directPath = join54(MESSAGE_STORAGE, sessionID);
-  if (existsSync47(directPath))
+  if (existsSync48(directPath))
     return directPath;
   for (const dir of readdirSync17(MESSAGE_STORAGE)) {
     const sessionPath = join54(MESSAGE_STORAGE, dir, sessionID);
-    if (existsSync47(sessionPath))
+    if (existsSync48(sessionPath))
       return sessionPath;
   }
   return null;
@@ -42399,21 +42936,89 @@ function isElectron() {
   return "type" in process2;
 }
 
+// src/features/skill-mcp-manager/env-cleaner.ts
+var EXCLUDED_ENV_PATTERNS = [
+  /^NPM_CONFIG_/i,
+  /^npm_config_/,
+  /^YARN_/,
+  /^PNPM_/,
+  /^NO_UPDATE_NOTIFIER$/
+];
+function createCleanMcpEnvironment(customEnv = {}) {
+  const cleanEnv = {};
+  for (const [key, value] of Object.entries(process.env)) {
+    if (value === undefined)
+      continue;
+    const shouldExclude = EXCLUDED_ENV_PATTERNS.some((pattern) => pattern.test(key));
+    if (!shouldExclude) {
+      cleanEnv[key] = value;
+    }
+  }
+  Object.assign(cleanEnv, customEnv);
+  return cleanEnv;
+}
+
 // src/features/skill-mcp-manager/manager.ts
 class SkillMcpManager {
   clients = new Map;
+  pendingConnections = new Map;
+  cleanupRegistered = false;
+  cleanupInterval = null;
+  IDLE_TIMEOUT = 5 * 60 * 1000;
   getClientKey(info) {
     return `${info.sessionID}:${info.skillName}:${info.serverName}`;
   }
+  registerProcessCleanup() {
+    if (this.cleanupRegistered)
+      return;
+    this.cleanupRegistered = true;
+    const cleanup = async () => {
+      for (const [, managed] of this.clients) {
+        try {
+          await managed.client.close();
+        } catch {}
+        try {
+          await managed.transport.close();
+        } catch {}
+      }
+      this.clients.clear();
+      this.pendingConnections.clear();
+    };
+    process.on("SIGINT", async () => {
+      await cleanup();
+      process.exit(0);
+    });
+    process.on("SIGTERM", async () => {
+      await cleanup();
+      process.exit(0);
+    });
+    if (process.platform === "win32") {
+      process.on("SIGBREAK", async () => {
+        await cleanup();
+        process.exit(0);
+      });
+    }
+  }
   async getOrCreateClient(info, config3) {
     const key = this.getClientKey(info);
     const existing = this.clients.get(key);
     if (existing) {
+      existing.lastUsedAt = Date.now();
       return existing.client;
     }
+    const pending = this.pendingConnections.get(key);
+    if (pending) {
+      return pending;
+    }
     const expandedConfig = expandEnvVarsInObject(config3);
-    const client2 = await this.createClient(info, expandedConfig);
-    return client2;
+    const connectionPromise = this.createClient(info, expandedConfig);
+    this.pendingConnections.set(key, connectionPromise);
+    try {
+      const client2 = await connectionPromise;
+      return client2;
+    } finally {
+      this.pendingConnections.delete(key);
+    }
   }
   async createClient(info, config3) {
     const key = this.getClientKey(info);
@@ -42430,14 +43035,8 @@ class SkillMcpManager {
     }
     const command = config3.command;
     const args = config3.args || [];
-    const mergedEnv = {};
-    for (const [key2, value] of Object.entries(process.env)) {
-      if (value !== undefined)
-        mergedEnv[key2] = value;
-    }
-    if (config3.env) {
-      Object.assign(mergedEnv, config3.env);
-    }
+    const mergedEnv = createCleanMcpEnvironment(config3.env);
+    this.registerProcessCleanup();
     const transport = new StdioClientTransport({
       command,
       args,
@@ -42448,6 +43047,9 @@ class SkillMcpManager {
     try {
       await client2.connect(transport);
     } catch (error45) {
+      try {
+        await transport.close();
+      } catch {}
       const errorMessage = error45 instanceof Error ? error45.message : String(error45);
       throw new Error(`Failed to connect to MCP server "${info.serverName}".
 
@@ -42459,7 +43061,8 @@ class SkillMcpManager {
 ` + `  - Check if the MCP server package exists
 ` + `  - Verify the args are correct for this server`);
     }
-    this.clients.set(key, { client: client2, transport, skillName: info.skillName });
+    this.clients.set(key, { client: client2, transport, skillName: info.skillName, lastUsedAt: Date.now() });
+    this.startCleanupTimer();
     return client2;
   }
   async disconnectSession(sessionID) {
@@ -42467,22 +43070,56 @@ class SkillMcpManager {
     for (const [key, managed] of this.clients.entries()) {
       if (key.startsWith(`${sessionID}:`)) {
         keysToRemove.push(key);
+        this.clients.delete(key);
         try {
           await managed.client.close();
         } catch {}
+        try {
+          await managed.transport.close();
+        } catch {}
       }
     }
-    for (const key of keysToRemove) {
-      this.clients.delete(key);
-    }
   }
   async disconnectAll() {
-    for (const [, managed] of this.clients.entries()) {
+    this.stopCleanupTimer();
+    const clients = Array.from(this.clients.values());
+    this.clients.clear();
+    for (const managed of clients) {
       try {
         await managed.client.close();
       } catch {}
+      try {
+        await managed.transport.close();
+      } catch {}
+    }
+  }
+  startCleanupTimer() {
+    if (this.cleanupInterval)
+      return;
+    this.cleanupInterval = setInterval(() => {
+      this.cleanupIdleClients();
+    }, 60000);
+    this.cleanupInterval.unref();
+  }
+  stopCleanupTimer() {
+    if (this.cleanupInterval) {
+      clearInterval(this.cleanupInterval);
+      this.cleanupInterval = null;
+    }
+  }
+  async cleanupIdleClients() {
+    const now = Date.now();
+    for (const [key, managed] of this.clients) {
+      if (now - managed.lastUsedAt > this.IDLE_TIMEOUT) {
+        this.clients.delete(key);
+        try {
+          await managed.client.close();
+        } catch {}
+        try {
+          await managed.transport.close();
+        } catch {}
+      }
     }
-    this.clients.clear();
   }
   async listTools(info, context) {
     const client2 = await this.getOrCreateClientWithRetry(info, context.config);
@@ -42521,10 +43158,13 @@ class SkillMcpManager {
       const key = this.getClientKey(info);
       const existing = this.clients.get(key);
       if (existing) {
+        this.clients.delete(key);
         try {
           await existing.client.close();
         } catch {}
-        this.clients.delete(key);
+        try {
+          await existing.transport.close();
+        } catch {}
         return await this.getOrCreateClient(info, config3);
       }
       throw error45;
@@ -42538,7 +43178,7 @@ class SkillMcpManager {
   }
 }
 // src/plugin-config.ts
-import * as fs9 from "fs";
+import * as fs10 from "fs";
 import * as path7 from "path";
 
 // src/mcp/types.ts
@@ -42758,8 +43398,8 @@ var OhMyOpenCodeConfigSchema = exports_external.object({
 // src/plugin-config.ts
 function loadConfigFromPath2(configPath, ctx) {
   try {
-    if (fs9.existsSync(configPath)) {
-      const content = fs9.readFileSync(configPath, "utf-8");
+    if (fs10.existsSync(configPath)) {
+      const content = fs10.readFileSync(configPath, "utf-8");
       const rawConfig = parseJsonc(content);
       migrateConfigFile(configPath, rawConfig);
       const result = OhMyOpenCodeConfigSchema.safeParse(rawConfig);
@@ -43663,12 +44303,18 @@ Organize your final answer in three tiers:
 
 Your response goes directly to the user with no intermediate processing. Make your final message self-contained: a clear recommendation they can act on immediately, covering both what to do and why.`;
 function createOracleAgent(model = DEFAULT_MODEL2) {
+  const restrictions = createAgentToolRestrictions([
+    "write",
+    "edit",
+    "task",
+    "background_task"
+  ]);
   const base = {
     description: "Expert technical advisor with deep reasoning for architecture decisions, code analysis, and engineering guidance.",
     mode: "subagent",
     model,
     temperature: 0.1,
-    tools: { write: false, edit: false, task: false, background_task: false },
+    ...restrictions,
     prompt: ORACLE_SYSTEM_PROMPT
   };
   if (isGptModel(model)) {
@@ -43697,12 +44343,17 @@ var LIBRARIAN_PROMPT_METADATA = {
   ]
 };
 function createLibrarianAgent(model = DEFAULT_MODEL3) {
+  const restrictions = createAgentToolRestrictions([
+    "write",
+    "edit",
+    "background_task"
+  ]);
   return {
     description: "Specialized codebase understanding agent for multi-repository analysis, searching remote codebases, retrieving official documentation, and finding implementation examples using GitHub CLI, Context7, and Web Search. MUST BE USED when users ask to look up code in remote repositories, explain library internals, or find usage examples in open source.",
     mode: "subagent",
     model,
     temperature: 0.1,
-    tools: { write: false, edit: false, background_task: false },
+    ...restrictions,
     prompt: `# THE LIBRARIAN
 
 You are **THE LIBRARIAN**, a specialized open-source codebase understanding agent.
@@ -43959,12 +44610,17 @@ var EXPLORE_PROMPT_METADATA = {
   ]
 };
 function createExploreAgent(model = DEFAULT_MODEL4) {
+  const restrictions = createAgentToolRestrictions([
+    "write",
+    "edit",
+    "background_task"
+  ]);
   return {
     description: 'Contextual grep for codebases. Answers "Where is X?", "Which file has Y?", "Find the code that does Z". Fire multiple in parallel for broad searches. Specify thoroughness: "quick" for basic, "medium" for moderate, "very thorough" for comprehensive analysis.',
     mode: "subagent",
     model,
     temperature: 0.1,
-    tools: { write: false, edit: false, background_task: false },
+    ...restrictions,
     prompt: `You are a codebase search specialist. Your job: find files and code, return actionable results.
 
 ## Your Mission
@@ -44065,11 +44721,12 @@ var FRONTEND_PROMPT_METADATA = {
   ]
 };
 function createFrontendUiUxEngineerAgent(model = DEFAULT_MODEL5) {
+  const restrictions = createAgentToolRestrictions(["background_task"]);
   return {
     description: "A designer-turned-developer who crafts stunning UI/UX even without design mockups. Code may be a bit messy, but the visual output is always fire.",
     mode: "subagent",
     model,
-    tools: { background_task: false },
+    ...restrictions,
     prompt: `# Role: Designer-Turned-Developer
 
 You are a designer who learned to code. You see what pure developers miss\u2014spacing, color harmony, micro-interactions, that indefinable "feel" that makes interfaces memorable. Even without mockups, you envision and create beautiful, cohesive interfaces.
@@ -44158,11 +44815,12 @@ var DOCUMENT_WRITER_PROMPT_METADATA = {
   ]
 };
 function createDocumentWriterAgent(model = DEFAULT_MODEL6) {
+  const restrictions = createAgentToolRestrictions(["background_task"]);
   return {
     description: "A technical writer who crafts clear, comprehensive documentation. Specializes in README files, API docs, architecture docs, and user guides. MUST BE USED when executing documentation tasks from ai-todo list plans.",
     mode: "subagent",
     model,
-    tools: { background_task: false },
+    ...restrictions,
     prompt: `<role>
 You are a TECHNICAL WRITER with deep engineering background who transforms complex codebases into crystal-clear documentation. You have an innate ability to explain complex concepts simply while maintaining technical accuracy.
 
@@ -44370,12 +45028,18 @@ var MULTIMODAL_LOOKER_PROMPT_METADATA = {
   triggers: []
 };
 function createMultimodalLookerAgent(model = DEFAULT_MODEL7) {
+  const restrictions = createAgentToolRestrictions([
+    "write",
+    "edit",
+    "bash",
+    "background_task"
+  ]);
   return {
     description: "Analyze media files (PDFs, images, diagrams) that require interpretation beyond raw text. Extracts specific information or summaries from documents, describes visual content. Use when you need analyzed/extracted data rather than literal file contents.",
     mode: "subagent",
     model,
     temperature: 0.1,
-    tools: { write: false, edit: false, bash: false, background_task: false },
+    ...restrictions,
     prompt: `You interpret media files that cannot be read as plain text.
 
 Your job: examine the attached file and extract ONLY what was requested.
@@ -44506,10 +45170,10 @@ function createBuiltinAgents(disabledAgents = [], agentOverrides = {}, directory
   return result;
 }
 // src/features/claude-code-command-loader/loader.ts
-import { existsSync as existsSync49, readdirSync as readdirSync18, readFileSync as readFileSync32, realpathSync as realpathSync2 } from "fs";
+import { existsSync as existsSync50, readdirSync as readdirSync18, readFileSync as readFileSync32, realpathSync as realpathSync2 } from "fs";
 import { join as join56, basename as basename5 } from "path";
 function loadCommandsFromDir(commandsDir, scope, visited = new Set, prefix = "") {
-  if (!existsSync49(commandsDir)) {
+  if (!existsSync50(commandsDir)) {
     return [];
   }
   let realPath;
@@ -44993,7 +45657,7 @@ function loadBuiltinCommands(disabledCommands) {
   return commands;
 }
 // src/features/claude-code-agent-loader/loader.ts
-import { existsSync as existsSync50, readdirSync as readdirSync19, readFileSync as readFileSync33 } from "fs";
+import { existsSync as existsSync51, readdirSync as readdirSync19, readFileSync as readFileSync33 } from "fs";
 import { join as join57, basename as basename6 } from "path";
 function parseToolsConfig(toolsStr) {
   if (!toolsStr)
@@ -45008,7 +45672,7 @@ function parseToolsConfig(toolsStr) {
   return result;
 }
 function loadAgentsFromDir(agentsDir, scope) {
-  if (!existsSync50(agentsDir)) {
+  if (!existsSync51(agentsDir)) {
     return [];
   }
   const entries = readdirSync19(agentsDir, { withFileTypes: true });
@@ -45064,7 +45728,7 @@ function loadProjectAgents() {
   return result;
 }
 // src/features/claude-code-plugin-loader/loader.ts
-import { existsSync as existsSync51, readdirSync as readdirSync20, readFileSync as readFileSync34 } from "fs";
+import { existsSync as existsSync52, readdirSync as readdirSync20, readFileSync as readFileSync34 } from "fs";
 import { homedir as homedir16 } from "os";
 import { join as join58, basename as basename7 } from "path";
 var CLAUDE_PLUGIN_ROOT_VAR = "${CLAUDE_PLUGIN_ROOT}";
@@ -45100,7 +45764,7 @@ function resolvePluginPaths(obj, pluginRoot) {
 }
 function loadInstalledPlugins() {
   const dbPath = getInstalledPluginsPath();
-  if (!existsSync51(dbPath)) {
+  if (!existsSync52(dbPath)) {
     return null;
   }
   try {
@@ -45119,7 +45783,7 @@ function getClaudeSettingsPath() {
 }
 function loadClaudeSettings() {
   const settingsPath = getClaudeSettingsPath();
-  if (!existsSync51(settingsPath)) {
+  if (!existsSync52(settingsPath)) {
     return null;
   }
   try {
@@ -45132,7 +45796,7 @@ function loadClaudeSettings() {
 }
 function loadPluginManifest(installPath) {
   const manifestPath = join58(installPath, ".claude-plugin", "plugin.json");
-  if (!existsSync51(manifestPath)) {
+  if (!existsSync52(manifestPath)) {
     return null;
   }
   try {
@@ -45183,7 +45847,7 @@ function discoverInstalledPlugins(options) {
       continue;
     }
     const { installPath, scope, version: version2 } = installation;
-    if (!existsSync51(installPath)) {
+    if (!existsSync52(installPath)) {
       errors3.push({
         pluginKey,
         installPath,
@@ -45201,21 +45865,21 @@ function discoverInstalledPlugins(options) {
       pluginKey,
       manifest: manifest ?? undefined
     };
-    if (existsSync51(join58(installPath, "commands"))) {
+    if (existsSync52(join58(installPath, "commands"))) {
       loadedPlugin.commandsDir = join58(installPath, "commands");
     }
-    if (existsSync51(join58(installPath, "agents"))) {
+    if (existsSync52(join58(installPath, "agents"))) {
       loadedPlugin.agentsDir = join58(installPath, "agents");
     }
-    if (existsSync51(join58(installPath, "skills"))) {
+    if (existsSync52(join58(installPath, "skills"))) {
       loadedPlugin.skillsDir = join58(installPath, "skills");
     }
     const hooksPath = join58(installPath, "hooks", "hooks.json");
-    if (existsSync51(hooksPath)) {
+    if (existsSync52(hooksPath)) {
       loadedPlugin.hooksPath = hooksPath;
     }
     const mcpPath = join58(installPath, ".mcp.json");
-    if (existsSync51(mcpPath)) {
+    if (existsSync52(mcpPath)) {
       loadedPlugin.mcpPath = mcpPath;
     }
     plugins.push(loadedPlugin);
@@ -45226,7 +45890,7 @@ function discoverInstalledPlugins(options) {
 function loadPluginCommands(plugins) {
   const commands2 = {};
   for (const plugin2 of plugins) {
-    if (!plugin2.commandsDir || !existsSync51(plugin2.commandsDir))
+    if (!plugin2.commandsDir || !existsSync52(plugin2.commandsDir))
       continue;
     const entries = readdirSync20(plugin2.commandsDir, { withFileTypes: true });
     for (const entry of entries) {
@@ -45268,7 +45932,7 @@ $ARGUMENTS
 function loadPluginSkillsAsCommands(plugins) {
   const skills = {};
   for (const plugin2 of plugins) {
-    if (!plugin2.skillsDir || !existsSync51(plugin2.skillsDir))
+    if (!plugin2.skillsDir || !existsSync52(plugin2.skillsDir))
       continue;
     const entries = readdirSync20(plugin2.skillsDir, { withFileTypes: true });
     for (const entry of entries) {
@@ -45279,7 +45943,7 @@ function loadPluginSkillsAsCommands(plugins) {
         continue;
       const resolvedPath = resolveSymlink(skillPath);
       const skillMdPath = join58(resolvedPath, "SKILL.md");
-      if (!existsSync51(skillMdPath))
+      if (!existsSync52(skillMdPath))
         continue;
       try {
         const content = readFileSync34(skillMdPath, "utf-8");
@@ -45329,7 +45993,7 @@ function parseToolsConfig2(toolsStr) {
 function loadPluginAgents(plugins) {
   const agents = {};
   for (const plugin2 of plugins) {
-    if (!plugin2.agentsDir || !existsSync51(plugin2.agentsDir))
+    if (!plugin2.agentsDir || !existsSync52(plugin2.agentsDir))
       continue;
     const entries = readdirSync20(plugin2.agentsDir, { withFileTypes: true });
     for (const entry of entries) {
@@ -45365,7 +46029,7 @@ function loadPluginAgents(plugins) {
 async function loadPluginMcpServers(plugins) {
   const servers = {};
   for (const plugin2 of plugins) {
-    if (!plugin2.mcpPath || !existsSync51(plugin2.mcpPath))
+    if (!plugin2.mcpPath || !existsSync52(plugin2.mcpPath))
       continue;
     try {
       const content = await Bun.file(plugin2.mcpPath).text();
@@ -45397,7 +46061,7 @@ async function loadPluginMcpServers(plugins) {
 function loadPluginHooksConfigs(plugins) {
   const configs = [];
   for (const plugin2 of plugins) {
-    if (!plugin2.hooksPath || !existsSync51(plugin2.hooksPath))
+    if (!plugin2.hooksPath || !existsSync52(plugin2.hooksPath))
       continue;
     try {
       const content = readFileSync34(plugin2.hooksPath, "utf-8");
@@ -45413,11 +46077,13 @@ function loadPluginHooksConfigs(plugins) {
 }
 async function loadAllPluginComponents(options) {
   const { plugins, errors: errors3 } = discoverInstalledPlugins(options);
-  const commands2 = loadPluginCommands(plugins);
-  const skills = loadPluginSkillsAsCommands(plugins);
-  const agents = loadPluginAgents(plugins);
-  const mcpServers = await loadPluginMcpServers(plugins);
-  const hooksConfigs = loadPluginHooksConfigs(plugins);
+  const [commands2, skills, agents, mcpServers, hooksConfigs] = await Promise.all([
+    Promise.resolve(loadPluginCommands(plugins)),
+    Promise.resolve(loadPluginSkillsAsCommands(plugins)),
+    Promise.resolve(loadPluginAgents(plugins)),
+    loadPluginMcpServers(plugins),
+    Promise.resolve(loadPluginHooksConfigs(plugins))
+  ]);
   log(`Loaded ${plugins.length} plugins with ${Object.keys(commands2).length} commands, ${Object.keys(skills).length} skills, ${Object.keys(agents).length} agents, ${Object.keys(mcpServers).length} MCP servers`);
   return {
     commands: commands2,
@@ -45577,9 +46243,21 @@ function createConfigHandler(deps) {
       log(`Plugin load errors`, { errors: pluginComponents.errors });
     }
     const builtinAgents = createBuiltinAgents(pluginConfig.disabled_agents, pluginConfig.agents, ctx.directory, config3.model);
-    const userAgents = pluginConfig.claude_code?.agents ?? true ? loadUserAgents() : {};
-    const projectAgents = pluginConfig.claude_code?.agents ?? true ? loadProjectAgents() : {};
-    const pluginAgents = pluginComponents.agents;
+    const rawUserAgents = pluginConfig.claude_code?.agents ?? true ? loadUserAgents() : {};
+    const rawProjectAgents = pluginConfig.claude_code?.agents ?? true ? loadProjectAgents() : {};
+    const rawPluginAgents = pluginComponents.agents;
+    const userAgents = Object.fromEntries(Object.entries(rawUserAgents).map(([k, v]) => [
+      k,
+      v ? migrateAgentConfig(v) : v
+    ]));
+    const projectAgents = Object.fromEntries(Object.entries(rawProjectAgents).map(([k, v]) => [
+      k,
+      v ? migrateAgentConfig(v) : v
+    ]));
+    const pluginAgents = Object.fromEntries(Object.entries(rawPluginAgents).map(([k, v]) => [
+      k,
+      v ? migrateAgentConfig(v) : v
+    ]));
     const isSisyphusEnabled = pluginConfig.sisyphus_agent?.disabled !== true;
     const builderEnabled = pluginConfig.sisyphus_agent?.default_builder_enabled ?? false;
     const plannerEnabled = pluginConfig.sisyphus_agent?.planner_enabled ?? true;
@@ -45592,18 +46270,21 @@ function createConfigHandler(deps) {
       };
       if (builderEnabled) {
         const { name: _buildName, ...buildConfigWithoutName } = configAgent?.build ?? {};
+        const migratedBuildConfig = migrateAgentConfig(buildConfigWithoutName);
         const openCodeBuilderOverride = pluginConfig.agents?.["OpenCode-Builder"];
         const openCodeBuilderBase = {
-          ...buildConfigWithoutName,
+          ...migratedBuildConfig,
           description: `${configAgent?.build?.description ?? "Build agent"} (OpenCode default)`
         };
         agentConfig["OpenCode-Builder"] = openCodeBuilderOverride ? { ...openCodeBuilderBase, ...openCodeBuilderOverride } : openCodeBuilderBase;
       }
       if (plannerEnabled) {
         const { name: _planName, ...planConfigWithoutName } = configAgent?.plan ?? {};
+        const migratedPlanConfig = migrateAgentConfig(planConfigWithoutName);
         const plannerSisyphusOverride = pluginConfig.agents?.["Planner-Sisyphus"];
         const plannerSisyphusBase = {
-          ...planConfigWithoutName,
+          ...migratedPlanConfig,
+          mode: "primary",
           prompt: PLAN_SYSTEM_PROMPT,
           permission: PLAN_PERMISSION,
           description: `${configAgent?.plan?.description ?? "Plan agent"} (OhMyOpenCode version)`,
@@ -45617,7 +46298,12 @@ function createConfigHandler(deps) {
         if (key === "plan" && replacePlan)
           return false;
         return true;
-      })) : {};
+      }).map(([key, value]) => [
+        key,
+        value ? migrateAgentConfig(value) : value
+      ])) : {};
+      const migratedBuild = configAgent?.build ? migrateAgentConfig(configAgent.build) : {};
+      const planDemoteConfig = replacePlan ? { disable: true } : undefined;
       config3.agent = {
         ...agentConfig,
         ...Object.fromEntries(Object.entries(builtinAgents).filter(([k]) => k !== "Sisyphus")),
@@ -45625,8 +46311,8 @@ function createConfigHandler(deps) {
         ...projectAgents,
         ...pluginAgents,
         ...filteredConfigAgents,
-        build: { ...configAgent?.build, mode: "subagent" },
-        ...replacePlan ? { plan: { ...configAgent?.plan, mode: "subagent" } } : {}
+        build: { ...migratedBuild, mode: "subagent", hidden: true },
+        ...planDemoteConfig ? { plan: planDemoteConfig } : {}
       };
     } else {
       config3.agent = {
@@ -45703,6 +46389,7 @@ function createConfigHandler(deps) {
 }
 // src/index.ts
 var OhMyOpenCodePlugin = async (ctx) => {
+  startBackgroundCheck2();
   const pluginConfig = loadPluginConfig(ctx.directory, ctx);
   const disabledHooks = new Set(pluginConfig.disabled_hooks ?? []);
   const isHookEnabled = (hookName) => !disabledHooks.has(hookName);
@@ -45738,12 +46425,17 @@ var OhMyOpenCodePlugin = async (ctx) => {
     autoUpdate: pluginConfig.auto_update ?? true
   }) : null;
   const keywordDetector = isHookEnabled("keyword-detector") ? createKeywordDetectorHook(ctx) : null;
+  const contextInjector = createContextInjectorHook(contextCollector);
+  const contextInjectorMessagesTransform = createContextInjectorMessagesTransformHook(contextCollector);
   const agentUsageReminder = isHookEnabled("agent-usage-reminder") ? createAgentUsageReminderHook(ctx) : null;
   const nonInteractiveEnv = isHookEnabled("non-interactive-env") ? createNonInteractiveEnvHook(ctx) : null;
   const interactiveBashSession = isHookEnabled("interactive-bash-session") ? createInteractiveBashSessionHook(ctx) : null;
   const emptyMessageSanitizer = isHookEnabled("empty-message-sanitizer") ? createEmptyMessageSanitizerHook() : null;
   const thinkingBlockValidator = isHookEnabled("thinking-block-validator") ? createThinkingBlockValidatorHook() : null;
-  const ralphLoop = isHookEnabled("ralph-loop") ? createRalphLoopHook(ctx, { config: pluginConfig.ralph_loop }) : null;
+  const ralphLoop = isHookEnabled("ralph-loop") ? createRalphLoopHook(ctx, {
+    config: pluginConfig.ralph_loop,
+    checkSessionExists: async (sessionId) => sessionExists(sessionId)
+  }) : null;
   const autoSlashCommand = isHookEnabled("auto-slash-command") ? createAutoSlashCommandHook() : null;
   const editErrorRecovery = isHookEnabled("edit-error-recovery") ? createEditErrorRecoveryHook(ctx) : null;
   const backgroundManager = new BackgroundManager(ctx);
@@ -45770,7 +46462,13 @@ var OhMyOpenCodePlugin = async (ctx) => {
     return true;
   });
   const includeClaudeSkills = pluginConfig.claude_code?.skills !== false;
-  const mergedSkills = mergeSkills(builtinSkills, pluginConfig.skills, includeClaudeSkills ? discoverUserClaudeSkills() : [], discoverOpencodeGlobalSkills(), includeClaudeSkills ? discoverProjectClaudeSkills() : [], discoverOpencodeProjectSkills());
+  const [userSkills, globalSkills, projectSkills, opencodeProjectSkills] = await Promise.all([
+    includeClaudeSkills ? discoverUserClaudeSkillsAsync() : Promise.resolve([]),
+    discoverOpencodeGlobalSkillsAsync(),
+    includeClaudeSkills ? discoverProjectClaudeSkillsAsync() : Promise.resolve([]),
+    discoverOpencodeProjectSkillsAsync()
+  ]);
+  const mergedSkills = mergeSkills(builtinSkills, pluginConfig.skills, userSkills, globalSkills, projectSkills, opencodeProjectSkills);
   const skillMcpManager = new SkillMcpManager;
   const getSessionIDForMcp = () => getMainSessionID() || "";
   const skillTool = createSkillTool({
@@ -45784,7 +46482,6 @@ var OhMyOpenCodePlugin = async (ctx) => {
     getSessionID: getSessionIDForMcp
   });
   const googleAuthHooks = pluginConfig.google_auth !== false ? await createGoogleAntigravityAuthPlugin(ctx) : null;
-  const tmuxAvailable = await getTmuxPath();
   const configHandler = createConfigHandler({
     ctx,
     pluginConfig,
@@ -45799,11 +46496,12 @@ var OhMyOpenCodePlugin = async (ctx) => {
       look_at: lookAt,
       skill: skillTool,
       skill_mcp: skillMcpTool,
-      ...tmuxAvailable ? { interactive_bash } : {}
+      interactive_bash
     },
     "chat.message": async (input, output) => {
       await claudeCodeHooks["chat.message"]?.(input, output);
       await keywordDetector?.["chat.message"]?.(input, output);
+      await contextInjector["chat.message"]?.(input, output);
       await autoSlashCommand?.["chat.message"]?.(input, output);
       if (ralphLoop) {
         const parts = output.parts;
@@ -45835,6 +46533,7 @@ var OhMyOpenCodePlugin = async (ctx) => {
       }
     },
     "experimental.chat.messages.transform": async (input, output) => {
+      await contextInjectorMessagesTransform?.["experimental.chat.messages.transform"]?.(input, output);
       await thinkingBlockValidator?.["experimental.chat.messages.transform"]?.(input, output);
       await emptyMessageSanitizer?.["experimental.chat.messages.transform"]?.(input, output);
     },