oh-my-opencode 3.15.0 → 3.15.2

package/dist/index.js

@@ -17496,7 +17496,7 @@ function getOpenCodeConfigPaths(options) {
     configJson: join6(configDir, "opencode.json"),
     configJsonc: join6(configDir, "opencode.jsonc"),
     packageJson: join6(configDir, "package.json"),
-    omoConfig: join6(configDir, "oh-my-opencode.json")
+    omoConfig: join6(configDir, `${CONFIG_BASENAME}.json`)
   };
 }
 // src/shared/opencode-version.ts
@@ -60911,8 +60911,6 @@ function getMessageDir(sessionID) {
     return null;
   if (/[/\\]|\.\./.test(sessionID))
     return null;
-  if (isSqliteBackend())
-    return null;
   if (!existsSync12(MESSAGE_STORAGE))
     return null;
   const directPath = join14(MESSAGE_STORAGE, sessionID);
@@ -62296,11 +62294,11 @@ function getPluginsBaseDir() {
   }
   return join18(homedir6(), ".claude", "plugins");
 }
-function getInstalledPluginsPath() {
-  return join18(getPluginsBaseDir(), "installed_plugins.json");
+function getInstalledPluginsPath(pluginsBaseDir) {
+  return join18(pluginsBaseDir ?? getPluginsBaseDir(), "installed_plugins.json");
 }
-function loadInstalledPlugins() {
-  const dbPath = getInstalledPluginsPath();
+function loadInstalledPlugins(pluginsBaseDir) {
+  const dbPath = getInstalledPluginsPath(pluginsBaseDir);
   if (!existsSync14(dbPath)) {
     return null;
   }
@@ -62404,7 +62402,8 @@ function extractPluginEntries(db) {
   return Object.entries(db.plugins).map(([key, installations]) => [key, installations[0]]);
 }
 function discoverInstalledPlugins(options) {
-  const db = loadInstalledPlugins();
+  const pluginsBaseDir = options?.pluginsHomeOverride ?? getPluginsBaseDir();
+  const db = loadInstalledPlugins(pluginsBaseDir);
   const settings = loadClaudeSettings();
   const plugins = [];
   const errors = [];
@@ -62413,6 +62412,7 @@ function discoverInstalledPlugins(options) {
   }
   const settingsEnabledPlugins = settings?.enabledPlugins;
   const overrideEnabledPlugins = options?.enabledPluginsOverride;
+  const pluginManifestLoader = options?.loadPluginManifestOverride ?? loadPluginManifest;
   for (const [pluginKey, installation] of extractPluginEntries(db)) {
     if (!installation)
       continue;
@@ -62429,7 +62429,7 @@ function discoverInstalledPlugins(options) {
       });
       continue;
     }
-    const manifest = loadPluginManifest(installPath);
+    const manifest = pluginManifestLoader(installPath);
     const pluginName = manifest?.name || derivePluginNameFromKey(pluginKey);
     const loadedPlugin = {
       name: pluginName,
@@ -62930,11 +62930,21 @@ function loadPluginHooksConfigs(plugins) {
 }
 
 // src/features/claude-code-plugin-loader/loader.ts
+var cachedPluginComponentsByKey = new Map;
+function clonePluginComponentsResult(result) {
+  return structuredClone(result);
+}
 function isClaudeCodePluginsDisabled() {
   const disableFlag = process.env.OPENCODE_DISABLE_CLAUDE_CODE;
   const disablePluginsFlag = process.env.OPENCODE_DISABLE_CLAUDE_CODE_PLUGINS;
   return disableFlag === "true" || disableFlag === "1" || disablePluginsFlag === "true" || disablePluginsFlag === "1";
 }
+function getPluginComponentsCacheKey(options) {
+  const overrideEntries = Object.entries(options?.enabledPluginsOverride ?? {}).sort(([leftKey], [rightKey]) => leftKey.localeCompare(rightKey));
+  return JSON.stringify({
+    enabledPluginsOverride: overrideEntries
+  });
+}
 async function loadAllPluginComponents(options) {
   if (isClaudeCodePluginsDisabled()) {
     log("Claude Code plugin loading disabled via OPENCODE_DISABLE_CLAUDE_CODE env var");
@@ -62948,6 +62958,11 @@ async function loadAllPluginComponents(options) {
       errors: []
     };
   }
+  const cacheKey = getPluginComponentsCacheKey(options);
+  const cachedPluginComponents = cachedPluginComponentsByKey.get(cacheKey);
+  if (cachedPluginComponents) {
+    return clonePluginComponentsResult(cachedPluginComponents);
+  }
   const { plugins, errors } = discoverInstalledPlugins(options);
   const [commands, skills, agents, mcpServers, hooksConfigs] = await Promise.all([
     Promise.resolve(loadPluginCommands(plugins)),
@@ -62957,7 +62972,7 @@ async function loadAllPluginComponents(options) {
     Promise.resolve(loadPluginHooksConfigs(plugins))
   ]);
   log(`Loaded ${plugins.length} plugins with ${Object.keys(commands).length} commands, ${Object.keys(skills).length} skills, ${Object.keys(agents).length} agents, ${Object.keys(mcpServers).length} MCP servers`);
-  return {
+  const result = {
     commands,
     skills,
     agents,
@@ -62966,6 +62981,8 @@ async function loadAllPluginComponents(options) {
     plugins,
     errors
   };
+  cachedPluginComponentsByKey.set(cacheKey, clonePluginComponentsResult(result));
+  return clonePluginComponentsResult(result);
 }
 // src/shared/plugin-command-discovery.ts
 function discoverPluginCommandDefinitions(options) {
@@ -63600,6 +63617,12 @@ function startCountdown(args) {
 }
 
 // src/hooks/todo-continuation-enforcer/idle-event.ts
+function shouldAllowActivityProgress(modelID) {
+  if (!modelID) {
+    return false;
+  }
+  return !modelID.toLowerCase().includes("codex");
+}
 async function handleSessionIdle(args) {
   const {
     ctx,
@@ -63731,7 +63754,7 @@ async function handleSessionIdle(args) {
     log(`[${HOOK_NAME}] Skipped: continuation stopped for session`, { sessionID });
     return;
   }
-  const progressUpdate = sessionStateStore.trackContinuationProgress(sessionID, incompleteCount, todos);
+  const progressUpdate = sessionStateStore.trackContinuationProgress(sessionID, incompleteCount, todos, { allowActivityProgress: shouldAllowActivityProgress(resolvedInfo?.model?.modelID) });
   if (shouldStopForStagnation({ sessionID, incompleteCount, progressUpdate })) {
     return;
   }
@@ -63770,6 +63793,7 @@ function handleNonIdleEvent(args) {
       if (state2) {
         state2.abortDetectedAt = undefined;
         state2.wasCancelled = false;
+        sessionStateStore.recordActivity(sessionID);
       }
       sessionStateStore.cancelCountdown(sessionID);
       return;
@@ -63779,6 +63803,7 @@ function handleNonIdleEvent(args) {
       if (state2) {
         state2.abortDetectedAt = undefined;
         state2.wasCancelled = false;
+        sessionStateStore.recordActivity(sessionID);
       }
       sessionStateStore.cancelCountdown(sessionID);
       return;
@@ -63792,8 +63817,10 @@ function handleNonIdleEvent(args) {
     const targetSessionID = sessionID ?? legacySessionID;
     if (targetSessionID) {
       const state2 = sessionStateStore.getExistingState(targetSessionID);
-      if (state2)
+      if (state2) {
         state2.abortDetectedAt = undefined;
+        sessionStateStore.recordActivity(targetSessionID);
+      }
       sessionStateStore.cancelCountdown(targetSessionID);
     }
     return;
@@ -63805,6 +63832,7 @@ function handleNonIdleEvent(args) {
       if (state2) {
         state2.abortDetectedAt = undefined;
         state2.wasCancelled = false;
+        sessionStateStore.recordActivity(sessionID);
       }
       sessionStateStore.cancelCountdown(sessionID);
     }
@@ -63817,6 +63845,7 @@ function handleNonIdleEvent(args) {
       if (state2) {
         state2.abortDetectedAt = undefined;
         state2.wasCancelled = false;
+        sessionStateStore.recordActivity(sessionID);
       }
       sessionStateStore.cancelCountdown(sessionID);
     }
@@ -63953,7 +63982,8 @@ function createSessionStateStore() {
     };
     const trackedSession = {
       state: rawState,
-      lastAccessedAt: Date.now()
+      lastAccessedAt: Date.now(),
+      activitySignalCount: 0
     };
     sessions.set(sessionID, trackedSession);
     return trackedSession;
@@ -63969,15 +63999,21 @@ function createSessionStateStore() {
     }
     return;
   }
-  function trackContinuationProgress(sessionID, incompleteCount, todos) {
+  function recordActivity(sessionID) {
+    const trackedSession = getTrackedSession(sessionID);
+    trackedSession.activitySignalCount += 1;
+  }
+  function trackContinuationProgress(sessionID, incompleteCount, todos, options = {}) {
     const trackedSession = getTrackedSession(sessionID);
     const state2 = trackedSession.state;
     const previousIncompleteCount = state2.lastIncompleteCount;
     const previousStagnationCount = state2.stagnationCount;
     const currentCompletedCount = todos?.filter((todo) => todo.status === "completed").length;
     const currentTodoSnapshot = todos ? getTodoSnapshot(todos) : undefined;
+    const currentActivitySignalCount = trackedSession.activitySignalCount;
     const hasCompletedMoreTodos = currentCompletedCount !== undefined && trackedSession.lastCompletedCount !== undefined && currentCompletedCount > trackedSession.lastCompletedCount;
     const hasTodoSnapshotChanged = currentTodoSnapshot !== undefined && trackedSession.lastTodoSnapshot !== undefined && currentTodoSnapshot !== trackedSession.lastTodoSnapshot;
+    const hasObservedExternalActivity = options.allowActivityProgress === true && trackedSession.lastObservedActivitySignalCount !== undefined && currentActivitySignalCount > trackedSession.lastObservedActivitySignalCount;
     const hadSuccessfulInjectionAwaitingProgressCheck = state2.awaitingPostInjectionProgressCheck === true;
     state2.lastIncompleteCount = incompleteCount;
     if (currentCompletedCount !== undefined) {
@@ -63986,6 +64022,7 @@ function createSessionStateStore() {
     if (currentTodoSnapshot !== undefined) {
       trackedSession.lastTodoSnapshot = currentTodoSnapshot;
     }
+    trackedSession.lastObservedActivitySignalCount = currentActivitySignalCount;
     if (previousIncompleteCount === undefined) {
       state2.stagnationCount = 0;
       return {
@@ -63996,7 +64033,7 @@ function createSessionStateStore() {
         progressSource: "none"
       };
     }
-    const progressSource = incompleteCount < previousIncompleteCount || hasCompletedMoreTodos || hasTodoSnapshotChanged ? "todo" : "none";
+    const progressSource = incompleteCount < previousIncompleteCount || hasCompletedMoreTodos || hasTodoSnapshotChanged ? "todo" : hasObservedExternalActivity ? "activity" : "none";
     if (progressSource !== "none") {
       state2.stagnationCount = 0;
       state2.awaitingPostInjectionProgressCheck = false;
@@ -64038,6 +64075,8 @@ function createSessionStateStore() {
     state2.awaitingPostInjectionProgressCheck = false;
     trackedSession.lastCompletedCount = undefined;
     trackedSession.lastTodoSnapshot = undefined;
+    trackedSession.activitySignalCount = 0;
+    trackedSession.lastObservedActivitySignalCount = undefined;
   }
   function cancelCountdown(sessionID) {
     const tracked = sessions.get(sessionID);
@@ -64074,6 +64113,7 @@ function createSessionStateStore() {
   return {
     getState,
     getExistingState,
+    recordActivity,
     trackContinuationProgress,
     resetContinuationProgress,
     cancelCountdown,
@@ -82148,11 +82188,13 @@ async function applyFallbackToChatMessage(params) {
 var RETRYABLE_ERROR_NAMES = new Set([
   "providermodelnotfounderror",
   "ratelimiterror",
-  "quotaexceedederror",
-  "insufficientcreditserror",
   "modelunavailableerror",
   "providerconnectionerror",
-  "authenticationerror",
+  "authenticationerror"
+]);
+var STOP_ERROR_NAMES = new Set([
+  "quotaexceedederror",
+  "insufficientcreditserror",
   "freeusagelimiterror"
 ]);
 var NON_RETRYABLE_ERROR_NAMES = new Set([
@@ -82180,6 +82222,7 @@ var RETRYABLE_MESSAGE_PATTERNS = [
   "over limit",
   "overloaded",
   "bad gateway",
+  "bad request",
   "unknown provider",
   "provider not found",
   "model_not_supported",
@@ -82223,6 +82266,9 @@ function isRetryableModelError(error48) {
     if (NON_RETRYABLE_ERROR_NAMES.has(errorNameLower)) {
       return false;
     }
+    if (STOP_ERROR_NAMES.has(errorNameLower)) {
+      return false;
+    }
     if (RETRYABLE_ERROR_NAMES.has(errorNameLower)) {
       return true;
     }
@@ -82503,13 +82549,15 @@ init_logger();
 import { existsSync as existsSync39 } from "fs";
 import { join as join42 } from "path";
 var CONFIG_CACHE_TTL_MS2 = 30000;
-var USER_CONFIG_PATH = join42(getOpenCodeConfigDir({ binary: "opencode" }), "opencode-cc-plugin.json");
 var configCache2 = new Map;
+function getUserConfigPath() {
+  return join42(getOpenCodeConfigDir({ binary: "opencode" }), "opencode-cc-plugin.json");
+}
 function getProjectConfigPath() {
   return join42(process.cwd(), ".opencode", "opencode-cc-plugin.json");
 }
 function getCacheKey2() {
-  return process.cwd();
+  return `${process.cwd()}::${getUserConfigPath()}`;
 }
 function getCachedConfig2(cacheKey) {
   const cachedEntry = configCache2.get(cacheKey);
@@ -82556,7 +82604,7 @@ async function loadPluginExtendedConfig() {
   if (cachedConfig) {
     return cachedConfig;
   }
-  const userConfig = await loadConfigFromPath(USER_CONFIG_PATH);
+  const userConfig = await loadConfigFromPath(getUserConfigPath());
   const projectConfig = await loadConfigFromPath(getProjectConfigPath());
   const merged = {
     disabledHooks: mergeDisabledHooks(userConfig?.disabledHooks, projectConfig?.disabledHooks)
@@ -84390,36 +84438,44 @@ import { fileURLToPath as fileURLToPath2 } from "url";
 // src/hooks/auto-update-checker/constants.ts
 import * as path5 from "path";
 import * as os4 from "os";
-var PACKAGE_NAME = "oh-my-opencode";
+var PACKAGE_NAME = "oh-my-openagent";
 var NPM_REGISTRY_URL = `https://registry.npmjs.org/-/package/${PACKAGE_NAME}/dist-tags`;
 var NPM_FETCH_TIMEOUT = 5000;
-var CACHE_DIR = getOpenCodeCacheDir();
-var VERSION_FILE = path5.join(CACHE_DIR, "version");
+var CACHE_ROOT_DIR = getOpenCodeCacheDir();
+var CACHE_DIR = path5.join(CACHE_ROOT_DIR, "packages");
+var VERSION_FILE = path5.join(CACHE_ROOT_DIR, "version");
 function getWindowsAppdataDir2() {
   if (process.platform !== "win32")
     return null;
   return process.env.APPDATA ?? path5.join(os4.homedir(), "AppData", "Roaming");
 }
-var USER_CONFIG_DIR = getOpenCodeConfigDir({ binary: "opencode" });
-var USER_OPENCODE_CONFIG = path5.join(USER_CONFIG_DIR, "opencode.json");
-var USER_OPENCODE_CONFIG_JSONC = path5.join(USER_CONFIG_DIR, "opencode.jsonc");
+function getUserConfigDir() {
+  return getOpenCodeConfigDir({ binary: "opencode" });
+}
+function getUserOpencodeConfig() {
+  return path5.join(getUserConfigDir(), "opencode.json");
+}
+function getUserOpencodeConfigJsonc() {
+  return path5.join(getUserConfigDir(), "opencode.jsonc");
+}
 var INSTALLED_PACKAGE_JSON = path5.join(CACHE_DIR, "node_modules", PACKAGE_NAME, "package.json");
 
 // src/hooks/auto-update-checker/checker/config-paths.ts
 import * as os5 from "os";
 import * as path6 from "path";
 function getConfigPaths2(directory) {
+  const userConfigDir = getUserConfigDir();
   const paths = [
     path6.join(directory, ".opencode", "opencode.json"),
     path6.join(directory, ".opencode", "opencode.jsonc"),
-    USER_OPENCODE_CONFIG,
-    USER_OPENCODE_CONFIG_JSONC
+    getUserOpencodeConfig(),
+    getUserOpencodeConfigJsonc()
   ];
   if (process.platform === "win32") {
     const crossPlatformDir = path6.join(os5.homedir(), ".config");
     const appdataDir = getWindowsAppdataDir2();
     if (appdataDir) {
-      const alternateDir = USER_CONFIG_DIR === crossPlatformDir ? appdataDir : crossPlatformDir;
+      const alternateDir = userConfigDir === crossPlatformDir ? appdataDir : crossPlatformDir;
       const alternateConfig = path6.join(alternateDir, "opencode", "opencode.json");
       const alternateConfigJsonc = path6.join(alternateDir, "opencode", "opencode.jsonc");
       if (!paths.includes(alternateConfig)) {
@@ -84642,11 +84698,28 @@ function getIntentVersion(pluginInfo) {
   }
   return pluginInfo.pinnedVersion;
 }
+function writeCachePackageJson(cachePackageJsonPath, pkgJson) {
+  const tmpPath = `${cachePackageJsonPath}.${crypto2.randomUUID()}`;
+  try {
+    fs12.mkdirSync(path9.dirname(cachePackageJsonPath), { recursive: true });
+    fs12.writeFileSync(tmpPath, JSON.stringify(pkgJson, null, 2));
+    fs12.renameSync(tmpPath, cachePackageJsonPath);
+    return { synced: true, error: null };
+  } catch (err) {
+    log("[auto-update-checker] Failed to write cache package.json:", err);
+    safeUnlink(tmpPath);
+    return { synced: false, error: "write_error", message: "Failed to write cache package.json" };
+  }
+}
 function syncCachePackageJsonToIntent(pluginInfo) {
   const cachePackageJsonPath = path9.join(CACHE_DIR, "package.json");
+  const intentVersion = getIntentVersion(pluginInfo);
   if (!fs12.existsSync(cachePackageJsonPath)) {
-    log("[auto-update-checker] Cache package.json not found, nothing to sync");
-    return { synced: false, error: "file_not_found", message: "Cache package.json not found" };
+    log("[auto-update-checker] Cache package.json missing, creating workspace package.json", { intentVersion });
+    return {
+      ...writeCachePackageJson(cachePackageJsonPath, { dependencies: { [PACKAGE_NAME]: intentVersion } }),
+      message: `Created cache package.json with: ${intentVersion}`
+    };
   }
   let content;
   let pkgJson;
@@ -84663,11 +84736,20 @@ function syncCachePackageJsonToIntent(pluginInfo) {
     return { synced: false, error: "parse_error", message: "Failed to parse cache package.json (malformed JSON)" };
   }
   if (!pkgJson || !pkgJson.dependencies?.[PACKAGE_NAME]) {
-    log("[auto-update-checker] Plugin not in cache package.json dependencies, nothing to sync");
-    return { synced: false, error: "plugin_not_in_deps", message: "Plugin not in cache package.json dependencies" };
+    log("[auto-update-checker] Plugin missing from cache package.json dependencies, adding dependency", { intentVersion });
+    const nextPkgJson = {
+      ...pkgJson ?? {},
+      dependencies: {
+        ...pkgJson?.dependencies ?? {},
+        [PACKAGE_NAME]: intentVersion
+      }
+    };
+    return {
+      ...writeCachePackageJson(cachePackageJsonPath, nextPkgJson),
+      message: `Added ${PACKAGE_NAME}: ${intentVersion}`
+    };
   }
   const currentVersion = pkgJson.dependencies[PACKAGE_NAME];
-  const intentVersion = getIntentVersion(pluginInfo);
   if (currentVersion === intentVersion) {
     log("[auto-update-checker] Cache package.json already matches intent:", intentVersion);
     return { synced: false, error: null, message: `Already matches intent: ${intentVersion}` };
@@ -84680,20 +84762,14 @@ function syncCachePackageJsonToIntent(pluginInfo) {
     log(`[auto-update-checker] Updating cache package.json: "${currentVersion}" \u2192 "${intentVersion}"`);
   }
   pkgJson.dependencies[PACKAGE_NAME] = intentVersion;
-  const tmpPath = `${cachePackageJsonPath}.${crypto2.randomUUID()}`;
-  try {
-    fs12.writeFileSync(tmpPath, JSON.stringify(pkgJson, null, 2));
-    fs12.renameSync(tmpPath, cachePackageJsonPath);
-    return { synced: true, error: null, message: `Updated: "${currentVersion}" \u2192 "${intentVersion}"` };
-  } catch (err) {
-    log("[auto-update-checker] Failed to write cache package.json:", err);
-    safeUnlink(tmpPath);
-    return { synced: false, error: "write_error", message: "Failed to write cache package.json" };
-  }
+  return {
+    ...writeCachePackageJson(cachePackageJsonPath, pkgJson),
+    message: `Updated: "${currentVersion}" \u2192 "${intentVersion}"`
+  };
 }
 // src/hooks/auto-update-checker/hook/background-update-check.ts
 import { existsSync as existsSync52 } from "fs";
-import { join as join55 } from "path";
+import { join as join56 } from "path";
 // src/shared/spawn-with-windows-hide.ts
 var {spawn: bunSpawn } = globalThis.Bun;
 import { spawn as nodeSpawn } from "child_process";
@@ -84754,9 +84830,13 @@ function spawnWithWindowsHide(command, options) {
 }
 // src/cli/config-manager/bun-install.ts
 import { existsSync as existsSync50 } from "fs";
+import { join as join54 } from "path";
 init_logger();
 var BUN_INSTALL_TIMEOUT_SECONDS = 60;
 var BUN_INSTALL_TIMEOUT_MS = BUN_INSTALL_TIMEOUT_SECONDS * 1000;
+function getDefaultWorkspaceDir() {
+  return join54(getOpenCodeCacheDir(), "packages");
+}
 function readProcessOutput(stream) {
   if (!stream) {
     return Promise.resolve("");
@@ -84779,7 +84859,7 @@ function logCapturedOutputOnFailure(outputMode, output) {
 }
 async function runBunInstallWithDetails(options) {
   const outputMode = options?.outputMode ?? "pipe";
-  const cacheDir = options?.workspaceDir ?? getOpenCodeCacheDir();
+  const cacheDir = options?.workspaceDir ?? getDefaultWorkspaceDir();
   const packageJsonPath = `${cacheDir}/package.json`;
   if (!existsSync50(packageJsonPath)) {
     return {
@@ -84886,8 +84966,9 @@ function removeFromBunLock(packageName) {
 }
 function invalidatePackage(packageName = PACKAGE_NAME) {
   try {
+    const userConfigDir = getUserConfigDir();
     const pkgDirs = [
-      path10.join(USER_CONFIG_DIR, "node_modules", packageName),
+      path10.join(userConfigDir, "node_modules", packageName),
       path10.join(CACHE_DIR, "node_modules", packageName)
     ];
     let packageRemoved = false;
@@ -84938,9 +85019,12 @@ Restart OpenCode to apply.`,
 }
 
 // src/hooks/auto-update-checker/hook/background-update-check.ts
+function getCacheWorkspaceDir(deps) {
+  return deps.join(deps.getOpenCodeCacheDir(), "packages");
+}
 var defaultDeps = {
   existsSync: existsSync52,
-  join: join55,
+  join: join56,
   runBunInstallWithDetails,
   log,
   getOpenCodeCacheDir,
@@ -84959,7 +85043,7 @@ function getPinnedVersionToastMessage(latestVersion) {
 }
 function resolveActiveInstallWorkspace(deps) {
   const configPaths = deps.getOpenCodeConfigPaths({ binary: "opencode" });
-  const cacheDir = deps.getOpenCodeCacheDir();
+  const cacheDir = getCacheWorkspaceDir(deps);
   const configInstallPath = deps.join(configPaths.configDir, "node_modules", PACKAGE_NAME, "package.json");
   const cacheInstallPath = deps.join(cacheDir, "node_modules", PACKAGE_NAME, "package.json");
   if (deps.existsSync(configInstallPath)) {
@@ -84970,6 +85054,11 @@ function resolveActiveInstallWorkspace(deps) {
     deps.log(`[auto-update-checker] Active workspace: cache-dir (${cacheDir})`);
     return cacheDir;
   }
+  const cachePackageJsonPath = deps.join(cacheDir, "package.json");
+  if (deps.existsSync(cachePackageJsonPath)) {
+    deps.log(`[auto-update-checker] Active workspace: cache-dir (${cacheDir}, package.json present)`);
+    return cacheDir;
+  }
   deps.log(`[auto-update-checker] Active workspace: config-dir (default, no install detected)`);
   return configPaths.configDir;
 }
@@ -84986,6 +85075,14 @@ async function runBunInstallSafe(workspaceDir, deps) {
     return false;
   }
 }
+async function primeCacheWorkspace(activeWorkspace, deps) {
+  const cacheWorkspace = getCacheWorkspaceDir(deps);
+  if (activeWorkspace === cacheWorkspace) {
+    return true;
+  }
+  deps.log(`[auto-update-checker] Priming cache workspace after install: ${cacheWorkspace}`);
+  return runBunInstallSafe(cacheWorkspace, deps);
+}
 function createBackgroundUpdateCheckRunner(overrides = {}) {
   const deps = { ...defaultDeps, ...overrides };
   return async function runBackgroundUpdateCheck(ctx, autoUpdate, getToastMessage) {
@@ -85031,6 +85128,12 @@ function createBackgroundUpdateCheckRunner(overrides = {}) {
     const activeWorkspace = resolveActiveInstallWorkspace(deps);
     const installSuccess = await runBunInstallSafe(activeWorkspace, deps);
     if (installSuccess) {
+      const cachePrimed = await primeCacheWorkspace(activeWorkspace, deps);
+      if (!cachePrimed) {
+        await deps.showUpdateAvailableToast(ctx, latestVersion, getToastMessage);
+        deps.log("[auto-update-checker] cache workspace priming failed after install");
+        return;
+      }
       await deps.showAutoUpdatedToast(ctx, currentVersion, latestVersion);
       deps.log(`[auto-update-checker] Update installed: ${currentVersion} \u2192 ${latestVersion}`);
       return;
@@ -85243,16 +85346,16 @@ v${latestVersion} available. Restart OpenCode to apply.` : "OpenCode is now on S
 // src/hooks/agent-usage-reminder/storage.ts
 import {
   existsSync as existsSync53,
-  mkdirSync as mkdirSync11,
+  mkdirSync as mkdirSync12,
   readFileSync as readFileSync35,
   writeFileSync as writeFileSync15,
   unlinkSync as unlinkSync8
 } from "fs";
-import { join as join57 } from "path";
+import { join as join58 } from "path";
 
 // src/hooks/agent-usage-reminder/constants.ts
-import { join as join56 } from "path";
-var AGENT_USAGE_REMINDER_STORAGE = join56(OPENCODE_STORAGE, "agent-usage-reminder");
+import { join as join57 } from "path";
+var AGENT_USAGE_REMINDER_STORAGE = join57(OPENCODE_STORAGE, "agent-usage-reminder");
 var TARGET_TOOLS = new Set([
   "grep",
   "safe_grep",
@@ -85298,7 +85401,7 @@ ALWAYS prefer: Multiple parallel task calls > Direct tool calls
 
 // src/hooks/agent-usage-reminder/storage.ts
 function getStoragePath2(sessionID) {
-  return join57(AGENT_USAGE_REMINDER_STORAGE, `${sessionID}.json`);
+  return join58(AGENT_USAGE_REMINDER_STORAGE, `${sessionID}.json`);
 }
 function loadAgentUsageState(sessionID) {
   const filePath = getStoragePath2(sessionID);
@@ -85313,7 +85416,7 @@ function loadAgentUsageState(sessionID) {
 }
 function saveAgentUsageState(state3) {
   if (!existsSync53(AGENT_USAGE_REMINDER_STORAGE)) {
-    mkdirSync11(AGENT_USAGE_REMINDER_STORAGE, { recursive: true });
+    mkdirSync12(AGENT_USAGE_REMINDER_STORAGE, { recursive: true });
   }
   const filePath = getStoragePath2(state3.sessionID);
   writeFileSync15(filePath, JSON.stringify(state3, null, 2));
@@ -86596,16 +86699,16 @@ function createNonInteractiveEnvHook(_ctx) {
 // src/hooks/interactive-bash-session/storage.ts
 import {
   existsSync as existsSync54,
-  mkdirSync as mkdirSync12,
+  mkdirSync as mkdirSync13,
   readFileSync as readFileSync36,
   writeFileSync as writeFileSync16,
   unlinkSync as unlinkSync9
 } from "fs";
-import { join as join59 } from "path";
+import { join as join60 } from "path";
 
 // src/hooks/interactive-bash-session/constants.ts
-import { join as join58 } from "path";
-var INTERACTIVE_BASH_SESSION_STORAGE = join58(OPENCODE_STORAGE, "interactive-bash-session");
+import { join as join59 } from "path";
+var INTERACTIVE_BASH_SESSION_STORAGE = join59(OPENCODE_STORAGE, "interactive-bash-session");
 var OMO_SESSION_PREFIX = "omo-";
 function buildSessionReminderMessage(sessions) {
   if (sessions.length === 0)
@@ -86617,7 +86720,7 @@ function buildSessionReminderMessage(sessions) {
 
 // src/hooks/interactive-bash-session/storage.ts
 function getStoragePath3(sessionID) {
-  return join59(INTERACTIVE_BASH_SESSION_STORAGE, `${sessionID}.json`);
+  return join60(INTERACTIVE_BASH_SESSION_STORAGE, `${sessionID}.json`);
 }
 function loadInteractiveBashSessionState(sessionID) {
   const filePath = getStoragePath3(sessionID);
@@ -86637,7 +86740,7 @@ function loadInteractiveBashSessionState(sessionID) {
 }
 function saveInteractiveBashSessionState(state3) {
   if (!existsSync54(INTERACTIVE_BASH_SESSION_STORAGE)) {
-    mkdirSync12(INTERACTIVE_BASH_SESSION_STORAGE, { recursive: true });
+    mkdirSync13(INTERACTIVE_BASH_SESSION_STORAGE, { recursive: true });
   }
   const filePath = getStoragePath3(state3.sessionID);
   const serialized = {
@@ -87155,10 +87258,10 @@ var DEFAULT_MAX_ITERATIONS = 100;
 var DEFAULT_COMPLETION_PROMISE = "DONE";
 var ULTRAWORK_VERIFICATION_PROMISE = "VERIFIED";
 // src/hooks/ralph-loop/storage.ts
-import { existsSync as existsSync55, readFileSync as readFileSync37, writeFileSync as writeFileSync17, unlinkSync as unlinkSync10, mkdirSync as mkdirSync13 } from "fs";
-import { dirname as dirname14, join as join60 } from "path";
+import { existsSync as existsSync55, readFileSync as readFileSync37, writeFileSync as writeFileSync17, unlinkSync as unlinkSync10, mkdirSync as mkdirSync14 } from "fs";
+import { dirname as dirname15, join as join61 } from "path";
 function getStateFilePath(directory, customPath) {
-  return customPath ? join60(directory, customPath) : join60(directory, DEFAULT_STATE_FILE);
+  return customPath ? join61(directory, customPath) : join61(directory, DEFAULT_STATE_FILE);
 }
 function readState(directory, customPath) {
   const filePath = getStateFilePath(directory, customPath);
@@ -87207,9 +87310,9 @@ function readState(directory, customPath) {
 function writeState(directory, state3, customPath) {
   const filePath = getStateFilePath(directory, customPath);
   try {
-    const dir = dirname14(filePath);
+    const dir = dirname15(filePath);
     if (!existsSync55(dir)) {
-      mkdirSync13(dir, { recursive: true });
+      mkdirSync14(dir, { recursive: true });
     }
     const sessionIdLine = state3.session_id ? `session_id: "${state3.session_id}"
 ` : "";
@@ -88336,9 +88439,9 @@ function findSlashCommandPartIndex(parts) {
   return -1;
 }
 // src/hooks/auto-slash-command/executor.ts
-import { dirname as dirname17 } from "path";
+import { dirname as dirname18 } from "path";
 // src/features/opencode-skill-loader/loader.ts
-import { join as join63 } from "path";
+import { join as join64 } from "path";
 import { homedir as homedir11 } from "os";
 
 // src/features/opencode-skill-loader/skill-definition-record.ts
@@ -88366,7 +88469,7 @@ function deduplicateSkillsByName(skills) {
 
 // src/features/opencode-skill-loader/skill-directory-loader.ts
 import { promises as fs16 } from "fs";
-import { join as join62 } from "path";
+import { join as join63 } from "path";
 
 // src/features/opencode-skill-loader/loaded-skill-from-path.ts
 import { promises as fs15 } from "fs";
@@ -88384,7 +88487,7 @@ function parseAllowedTools(allowedTools) {
 
 // src/features/opencode-skill-loader/skill-mcp-config.ts
 import { promises as fs14 } from "fs";
-import { join as join61 } from "path";
+import { join as join62 } from "path";
 function parseSkillMcpConfigFromFrontmatter(content) {
   const frontmatterMatch = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
   if (!frontmatterMatch)
@@ -88400,7 +88503,7 @@ function parseSkillMcpConfigFromFrontmatter(content) {
   return;
 }
 async function loadMcpJsonFromDir(skillDir) {
-  const mcpJsonPath = join61(skillDir, "mcp.json");
+  const mcpJsonPath = join62(skillDir, "mcp.json");
   try {
     const content = await fs14.readFile(mcpJsonPath, "utf-8");
     const parsed = JSON.parse(content);
@@ -88489,10 +88592,10 @@ async function loadSkillsFromDir(options) {
   const directories = entries.filter((entry) => !entry.name.startsWith(".") && (entry.isDirectory() || entry.isSymbolicLink()));
   const files = entries.filter((entry) => !entry.name.startsWith(".") && !entry.isDirectory() && !entry.isSymbolicLink() && isMarkdownFile(entry));
   for (const entry of directories) {
-    const entryPath = join62(options.skillsDir, entry.name);
+    const entryPath = join63(options.skillsDir, entry.name);
     const resolvedPath = await resolveSymlinkAsync(entryPath);
     const dirName = entry.name;
-    const skillMdPath = join62(resolvedPath, "SKILL.md");
+    const skillMdPath = join63(resolvedPath, "SKILL.md");
     try {
       await fs16.access(skillMdPath);
       const skill = await loadSkillFromPath({
@@ -88507,7 +88610,7 @@ async function loadSkillsFromDir(options) {
       }
       continue;
     } catch {}
-    const namedSkillMdPath = join62(resolvedPath, `${dirName}.md`);
+    const namedSkillMdPath = join63(resolvedPath, `${dirName}.md`);
     try {
       await fs16.access(namedSkillMdPath);
       const skill = await loadSkillFromPath({
@@ -88539,7 +88642,7 @@ async function loadSkillsFromDir(options) {
     }
   }
   for (const entry of files) {
-    const entryPath = join62(options.skillsDir, entry.name);
+    const entryPath = join63(options.skillsDir, entry.name);
     const baseName = inferSkillNameFromFileName(entryPath);
     const skill = await loadSkillFromPath({
       skillPath: entryPath,
@@ -88557,7 +88660,7 @@ async function loadSkillsFromDir(options) {
 
 // src/features/opencode-skill-loader/loader.ts
 async function loadUserSkills() {
-  const userSkillsDir = join63(getClaudeConfigDir(), "skills");
+  const userSkillsDir = join64(getClaudeConfigDir(), "skills");
   const skills = await loadSkillsFromDir({ skillsDir: userSkillsDir, scope: "user" });
   return skillsToCommandDefinitionRecord(skills);
 }
@@ -88582,7 +88685,7 @@ async function loadProjectAgentsSkills(directory) {
   return skillsToCommandDefinitionRecord(deduplicateSkillsByName(allSkills.flat()));
 }
 async function loadGlobalAgentsSkills() {
-  const agentsGlobalDir = join63(homedir11(), ".agents", "skills");
+  const agentsGlobalDir = join64(homedir11(), ".agents", "skills");
   const skills = await loadSkillsFromDir({ skillsDir: agentsGlobalDir, scope: "user" });
   return skillsToCommandDefinitionRecord(skills);
 }
@@ -88629,7 +88732,7 @@ async function discoverSkills(options = {}) {
   ]);
 }
 async function discoverUserClaudeSkills() {
-  const userSkillsDir = join63(getClaudeConfigDir(), "skills");
+  const userSkillsDir = join64(getClaudeConfigDir(), "skills");
   return loadSkillsFromDir({ skillsDir: userSkillsDir, scope: "user" });
 }
 async function discoverProjectClaudeSkills(directory) {
@@ -88653,7 +88756,7 @@ async function discoverProjectAgentsSkills(directory) {
   return deduplicateSkillsByName(allSkills.flat());
 }
 async function discoverGlobalAgentsSkills() {
-  const agentsGlobalDir = join63(homedir11(), ".agents", "skills");
+  const agentsGlobalDir = join64(homedir11(), ".agents", "skills");
   return loadSkillsFromDir({ skillsDir: agentsGlobalDir, scope: "user" });
 }
 // src/features/opencode-skill-loader/merger/builtin-skill-converter.ts
@@ -88681,7 +88784,7 @@ function builtinToLoadedSkill(builtin) {
 
 // src/features/opencode-skill-loader/merger/config-skill-entry-loader.ts
 import { existsSync as existsSync57, readFileSync as readFileSync39 } from "fs";
-import { dirname as dirname15, isAbsolute as isAbsolute7, resolve as resolve10 } from "path";
+import { dirname as dirname16, isAbsolute as isAbsolute7, resolve as resolve10 } from "path";
 import { homedir as homedir12 } from "os";
 init_logger();
 function resolveFilePath5(from, configDir) {
@@ -88736,7 +88839,7 @@ function configEntryToLoadedSkill(name, entry, configDir) {
     return null;
   }
   const description = entry.description || fileMetadata.description || "";
-  const resolvedPath = sourcePath ? dirname15(sourcePath) : configDir || process.cwd();
+  const resolvedPath = sourcePath ? dirname16(sourcePath) : configDir || process.cwd();
   const resolvedTemplate = resolveSkillPathReferences(template.trim(), resolvedPath);
   const wrappedTemplate = `<skill-instruction>
 Base directory for this skill: ${resolvedPath}/
@@ -92467,7 +92570,7 @@ async function resolveMultipleSkillsAsync(skillNames, options) {
 var import_picomatch2 = __toESM(require_picomatch2(), 1);
 import { promises as fs17 } from "fs";
 import { homedir as homedir13 } from "os";
-import { dirname as dirname16, extname, isAbsolute as isAbsolute8, join as join64, relative as relative6 } from "path";
+import { dirname as dirname17, extname, isAbsolute as isAbsolute8, join as join65, relative as relative6 } from "path";
 var MAX_RECURSIVE_DEPTH = 10;
 function isHttpUrl(path11) {
   return path11.startsWith("http://") || path11.startsWith("https://");
@@ -92477,12 +92580,12 @@ function toAbsolutePath(path11, configDir) {
     return homedir13();
   }
   if (path11.startsWith("~/")) {
-    return join64(homedir13(), path11.slice(2));
+    return join65(homedir13(), path11.slice(2));
   }
   if (isAbsolute8(path11)) {
     return path11;
   }
-  return join64(configDir, path11);
+  return join65(configDir, path11);
 }
 function isMarkdownPath(path11) {
   return extname(path11).toLowerCase() === ".md";
@@ -92513,13 +92616,13 @@ async function loadSourcePath(options) {
       return [];
     const loaded = await loadSkillFromPath({
       skillPath: absolutePath,
-      resolvedPath: dirname16(absolutePath),
+      resolvedPath: dirname17(absolutePath),
       defaultName: inferSkillNameFromFileName(absolutePath),
       scope: "config"
     });
     if (!loaded)
       return [];
-    return filterByGlob([loaded], dirname16(absolutePath), options.globPattern);
+    return filterByGlob([loaded], dirname17(absolutePath), options.globPattern);
   }
   if (!stat.isDirectory())
     return [];
@@ -92553,7 +92656,7 @@ async function discoverConfigSourceSkills(options) {
 }
 // src/tools/slashcommand/command-discovery.ts
 import { existsSync as existsSync58, readdirSync as readdirSync15, readFileSync as readFileSync41, statSync as statSync6 } from "fs";
-import { basename as basename7, join as join65 } from "path";
+import { basename as basename7, join as join66 } from "path";
 // src/features/builtin-commands/templates/init-deep.ts
 var INIT_DEEP_TEMPLATE = `# /init-deep
 
@@ -94104,12 +94207,12 @@ function discoverCommandsFromDir(commandsDir, scope, prefix = "") {
       if (entry.name.startsWith("."))
         continue;
       const nestedPrefix = prefix ? `${prefix}${NESTED_COMMAND_SEPARATOR}${entry.name}` : entry.name;
-      commands3.push(...discoverCommandsFromDir(join65(commandsDir, entry.name), scope, nestedPrefix));
+      commands3.push(...discoverCommandsFromDir(join66(commandsDir, entry.name), scope, nestedPrefix));
       continue;
     }
     if (!isMarkdownFile(entry))
       continue;
-    const commandPath = join65(commandsDir, entry.name);
+    const commandPath = join66(commandsDir, entry.name);
     const baseCommandName = basename7(entry.name, ".md");
     const commandName = prefix ? `${prefix}${NESTED_COMMAND_SEPARATOR}${baseCommandName}` : baseCommandName;
     try {
@@ -94165,8 +94268,8 @@ function deduplicateCommandInfosByName(commands3) {
   return deduplicatedCommands;
 }
 function discoverCommandsSync(directory, options) {
-  const userCommandsDir = join65(getClaudeConfigDir(), "commands");
-  const projectCommandsDir = join65(directory ?? process.cwd(), ".claude", "commands");
+  const userCommandsDir = join66(getClaudeConfigDir(), "commands");
+  const projectCommandsDir = join66(directory ?? process.cwd(), ".claude", "commands");
   const opencodeGlobalDirs = getOpenCodeCommandDirs({ binary: "opencode" });
   const opencodeProjectDirs = findProjectOpencodeCommandDirs(directory ?? process.cwd());
   const userCommands = discoverCommandsFromDir(userCommandsDir, "user");
@@ -94269,7 +94372,7 @@ async function formatCommandTemplate(cmd, args) {
   if (!content && cmd.lazyContentLoader) {
     content = await cmd.lazyContentLoader.load();
   }
-  const commandDir = cmd.path ? dirname17(cmd.path) : process.cwd();
+  const commandDir = cmd.path ? dirname18(cmd.path) : process.cwd();
   const withFileRefs = await resolveFileReferencesInText(content, commandDir);
   const resolvedContent = await resolveCommandsInText(withFileRefs);
   const resolvedArguments = args;
@@ -94651,11 +94754,11 @@ var NOTEPAD_DIR = "notepads";
 var NOTEPAD_BASE_PATH = `${BOULDER_DIR}/${NOTEPAD_DIR}`;
 var PROMETHEUS_PLANS_DIR = ".sisyphus/plans";
 // src/features/boulder-state/storage.ts
-import { existsSync as existsSync59, readFileSync as readFileSync42, writeFileSync as writeFileSync18, mkdirSync as mkdirSync14, readdirSync as readdirSync16 } from "fs";
-import { dirname as dirname18, join as join66, basename as basename8 } from "path";
+import { existsSync as existsSync59, readFileSync as readFileSync42, writeFileSync as writeFileSync18, mkdirSync as mkdirSync15, readdirSync as readdirSync16 } from "fs";
+import { dirname as dirname19, join as join67, basename as basename8 } from "path";
 var RESERVED_KEYS = new Set(["__proto__", "prototype", "constructor"]);
 function getBoulderFilePath(directory) {
-  return join66(directory, BOULDER_DIR, BOULDER_FILE);
+  return join67(directory, BOULDER_DIR, BOULDER_FILE);
 }
 function readBoulderState(directory) {
   const filePath = getBoulderFilePath(directory);
@@ -94682,9 +94785,9 @@ function readBoulderState(directory) {
 function writeBoulderState(directory, state3) {
   const filePath = getBoulderFilePath(directory);
   try {
-    const dir = dirname18(filePath);
+    const dir = dirname19(filePath);
     if (!existsSync59(dir)) {
-      mkdirSync14(dir, { recursive: true });
+      mkdirSync15(dir, { recursive: true });
     }
     writeFileSync18(filePath, JSON.stringify(state3, null, 2), "utf-8");
     return true;
@@ -94754,13 +94857,13 @@ function upsertTaskSessionState(directory, input) {
   return null;
 }
 function findPrometheusPlans(directory) {
-  const plansDir = join66(directory, PROMETHEUS_PLANS_DIR);
+  const plansDir = join67(directory, PROMETHEUS_PLANS_DIR);
   if (!existsSync59(plansDir)) {
     return [];
   }
   try {
     const files = readdirSync16(plansDir);
-    return files.filter((f) => f.endsWith(".md")).map((f) => join66(plansDir, f)).sort((a, b) => {
+    return files.filter((f) => f.endsWith(".md")).map((f) => join67(plansDir, f)).sort((a, b) => {
       const aStat = __require("fs").statSync(a);
       const bStat = __require("fs").statSync(b);
       return bStat.mtimeMs - aStat.mtimeMs;
@@ -98049,11 +98152,11 @@ import * as path11 from "path";
 // src/shared/migrate-legacy-config-file.ts
 init_logger();
 import { existsSync as existsSync62, readFileSync as readFileSync45, renameSync as renameSync4, rmSync as rmSync3 } from "fs";
-import { join as join67, dirname as dirname19, basename as basename9 } from "path";
+import { join as join68, dirname as dirname20, basename as basename9 } from "path";
 function buildCanonicalPath(legacyPath) {
-  const dir = dirname19(legacyPath);
+  const dir = dirname20(legacyPath);
   const ext = basename9(legacyPath).includes(".jsonc") ? ".jsonc" : ".json";
-  return join67(dir, `${CONFIG_BASENAME}${ext}`);
+  return join68(dir, `${CONFIG_BASENAME}${ext}`);
 }
 function archiveLegacyConfigFile(legacyPath) {
   const backupPath = `${legacyPath}.bak`;
@@ -98236,7 +98339,7 @@ function mergeConfigs(base, override) {
 function loadPluginConfig(directory, ctx) {
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
   const userDetected = detectPluginConfigFile(configDir);
-  let userConfigPath = userDetected.format !== "none" ? userDetected.path : path11.join(configDir, "oh-my-opencode.json");
+  let userConfigPath = userDetected.format !== "none" ? userDetected.path : path11.join(configDir, `${CONFIG_BASENAME}.json`);
   if (userDetected.legacyPath) {
     log("Canonical plugin config detected alongside legacy config. Remove the legacy file to avoid confusion.", {
       canonicalPath: userDetected.path,
@@ -98244,12 +98347,15 @@ function loadPluginConfig(directory, ctx) {
     });
   }
   if (userDetected.format !== "none" && path11.basename(userDetected.path).startsWith(LEGACY_CONFIG_BASENAME)) {
-    migrateLegacyConfigFile(userDetected.path);
-    userConfigPath = path11.join(path11.dirname(userDetected.path), `${CONFIG_BASENAME}${path11.extname(userDetected.path)}`);
+    const migrated = migrateLegacyConfigFile(userDetected.path);
+    const canonicalPath = path11.join(path11.dirname(userDetected.path), `${CONFIG_BASENAME}${path11.extname(userDetected.path)}`);
+    if (migrated || fs18.existsSync(canonicalPath)) {
+      userConfigPath = canonicalPath;
+    }
   }
   const projectBasePath = path11.join(directory, ".opencode");
   const projectDetected = detectPluginConfigFile(projectBasePath);
-  let projectConfigPath = projectDetected.format !== "none" ? projectDetected.path : path11.join(projectBasePath, "oh-my-opencode.json");
+  let projectConfigPath = projectDetected.format !== "none" ? projectDetected.path : path11.join(projectBasePath, `${CONFIG_BASENAME}.json`);
   if (projectDetected.legacyPath) {
     log("Canonical plugin config detected alongside legacy config. Remove the legacy file to avoid confusion.", {
       canonicalPath: projectDetected.path,
@@ -98257,8 +98363,11 @@ function loadPluginConfig(directory, ctx) {
     });
   }
   if (projectDetected.format !== "none" && path11.basename(projectDetected.path).startsWith(LEGACY_CONFIG_BASENAME)) {
-    migrateLegacyConfigFile(projectDetected.path);
-    projectConfigPath = path11.join(path11.dirname(projectDetected.path), `${CONFIG_BASENAME}${path11.extname(projectDetected.path)}`);
+    const projectMigrated = migrateLegacyConfigFile(projectDetected.path);
+    const canonicalProjectPath = path11.join(path11.dirname(projectDetected.path), `${CONFIG_BASENAME}${path11.extname(projectDetected.path)}`);
+    if (projectMigrated || fs18.existsSync(canonicalProjectPath)) {
+      projectConfigPath = canonicalProjectPath;
+    }
   }
   const userConfig = loadConfigFromPath2(userConfigPath, ctx);
   let config2 = userConfig ?? OhMyOpenCodeConfigSchema.parse({});
@@ -99570,7 +99679,7 @@ function createRuntimeFallbackHook(ctx, options) {
 }
 // src/hooks/write-existing-file-guard/hook.ts
 import { existsSync as existsSync65, realpathSync as realpathSync7 } from "fs";
-import { basename as basename11, dirname as dirname21, isAbsolute as isAbsolute10, join as join69, normalize as normalize2, relative as relative8, resolve as resolve12 } from "path";
+import { basename as basename11, dirname as dirname22, isAbsolute as isAbsolute10, join as join70, normalize as normalize2, relative as relative8, resolve as resolve12 } from "path";
 
 // src/hooks/write-existing-file-guard/tool-execute-before-handler.ts
 import { existsSync as existsSync64 } from "fs";
@@ -99743,9 +99852,9 @@ function toCanonicalPath2(absolutePath) {
       canonicalPath = absolutePath;
     }
   } else {
-    const absoluteDir = dirname21(absolutePath);
+    const absoluteDir = dirname22(absolutePath);
     const resolvedDir = existsSync65(absoluteDir) ? realpathSync7.native(absoluteDir) : absoluteDir;
-    canonicalPath = join69(resolvedDir, basename11(absolutePath));
+    canonicalPath = join70(resolvedDir, basename11(absolutePath));
   }
   return normalize2(canonicalPath);
 }
@@ -100761,11 +100870,11 @@ init_logger();
 
 // src/hooks/legacy-plugin-toast/auto-migrate.ts
 import { existsSync as existsSync66, readFileSync as readFileSync47 } from "fs";
-import { join as join70 } from "path";
+import { join as join71 } from "path";
 function detectOpenCodeConfigPath(overrideConfigDir) {
   if (overrideConfigDir) {
-    const jsoncPath = join70(overrideConfigDir, "opencode.jsonc");
-    const jsonPath = join70(overrideConfigDir, "opencode.json");
+    const jsoncPath = join71(overrideConfigDir, "opencode.jsonc");
+    const jsonPath = join71(overrideConfigDir, "opencode.json");
     if (existsSync66(jsoncPath))
       return jsoncPath;
     if (existsSync66(jsonPath))
@@ -101179,7 +101288,7 @@ var DEFAULT_MAX_DIAGNOSTICS = 200;
 var DEFAULT_MAX_DIRECTORY_FILES = 50;
 // src/tools/lsp/server-config-loader.ts
 import { existsSync as existsSync67, readFileSync as readFileSync48 } from "fs";
-import { join as join71 } from "path";
+import { join as join72 } from "path";
 function loadJsonFile(path12) {
   if (!existsSync67(path12))
     return null;
@@ -101193,9 +101302,9 @@ function getConfigPaths3() {
   const cwd = process.cwd();
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
   return {
-    project: detectPluginConfigFile(join71(cwd, ".opencode")).path,
+    project: detectPluginConfigFile(join72(cwd, ".opencode")).path,
     user: detectPluginConfigFile(configDir).path,
-    opencode: detectConfigFile(join71(configDir, "opencode")).path
+    opencode: detectConfigFile(join72(configDir, "opencode")).path
   };
 }
 function loadAllConfigs() {
@@ -101265,19 +101374,19 @@ function getMergedServers() {
 
 // src/tools/lsp/server-installation.ts
 import { existsSync as existsSync68 } from "fs";
-import { delimiter, join as join73 } from "path";
+import { delimiter, join as join74 } from "path";
 
 // src/tools/lsp/server-path-bases.ts
-import { join as join72 } from "path";
+import { join as join73 } from "path";
 function getLspServerAdditionalPathBases(workingDirectory) {
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
-  const dataDir = join72(getDataDir(), "opencode");
+  const dataDir = join73(getDataDir(), "opencode");
   return [
-    join72(workingDirectory, "node_modules", ".bin"),
-    join72(configDir, "bin"),
-    join72(configDir, "node_modules", ".bin"),
-    join72(dataDir, "bin"),
-    join72(dataDir, "bin", "node_modules", ".bin")
+    join73(workingDirectory, "node_modules", ".bin"),
+    join73(configDir, "bin"),
+    join73(configDir, "node_modules", ".bin"),
+    join73(dataDir, "bin"),
+    join73(dataDir, "bin", "node_modules", ".bin")
   ];
 }
 
@@ -101308,14 +101417,14 @@ function isServerInstalled(command) {
   const paths = pathEnv.split(delimiter);
   for (const p of paths) {
     for (const suffix of exts) {
-      if (existsSync68(join73(p, cmd + suffix))) {
+      if (existsSync68(join74(p, cmd + suffix))) {
         return true;
       }
     }
   }
   for (const base of getLspServerAdditionalPathBases(process.cwd())) {
     for (const suffix of exts) {
-      if (existsSync68(join73(base, cmd + suffix))) {
+      if (existsSync68(join74(base, cmd + suffix))) {
         return true;
       }
     }
@@ -114888,7 +114997,7 @@ import { resolve as resolve16 } from "path";
 
 // src/tools/lsp/directory-diagnostics.ts
 import { existsSync as existsSync71, lstatSync as lstatSync2, readdirSync as readdirSync17 } from "fs";
-import { extname as extname6, join as join74, resolve as resolve15 } from "path";
+import { extname as extname6, join as join75, resolve as resolve15 } from "path";
 var SKIP_DIRECTORIES = new Set(["node_modules", ".git", "dist", "build", ".next", "out"]);
 function collectFilesWithExtension(dir, extension, maxFiles) {
   const files = [];
@@ -114904,7 +115013,7 @@ function collectFilesWithExtension(dir, extension, maxFiles) {
     for (const entry of entries) {
       if (files.length >= maxFiles)
         return;
-      const fullPath = join74(currentDir, entry);
+      const fullPath = join75(currentDir, entry);
       let stat;
       try {
         stat = lstatSync2(fullPath);
@@ -115007,7 +115116,7 @@ async function aggregateDiagnosticsForDirectory(directory, extension, severity,
 
 // src/tools/lsp/infer-extension.ts
 import { readdirSync as readdirSync18, lstatSync as lstatSync3 } from "fs";
-import { extname as extname7, join as join75 } from "path";
+import { extname as extname7, join as join76 } from "path";
 var SKIP_DIRECTORIES2 = new Set(["node_modules", ".git", "dist", "build", ".next", "out"]);
 var MAX_SCAN_ENTRIES = 500;
 function inferExtensionFromDirectory(directory) {
@@ -115025,7 +115134,7 @@ function inferExtensionFromDirectory(directory) {
     for (const entry of entries) {
       if (scanned >= MAX_SCAN_ENTRIES)
         return;
-      const fullPath = join75(dir, entry);
+      const fullPath = join76(dir, entry);
       let stat;
       try {
         stat = lstatSync3(fullPath);
@@ -115190,12 +115299,12 @@ var DEFAULT_MAX_MATCHES = 500;
 
 // src/tools/ast-grep/sg-cli-path.ts
 import { createRequire as createRequire4 } from "module";
-import { dirname as dirname22, join as join77 } from "path";
+import { dirname as dirname23, join as join78 } from "path";
 import { existsSync as existsSync73, statSync as statSync10 } from "fs";
 
 // src/tools/ast-grep/downloader.ts
 import { existsSync as existsSync72 } from "fs";
-import { join as join76 } from "path";
+import { join as join77 } from "path";
 import { homedir as homedir14 } from "os";
 import { createRequire as createRequire3 } from "module";
 init_logger();
@@ -115222,12 +115331,12 @@ var PLATFORM_MAP2 = {
 function getCacheDir3() {
   if (process.platform === "win32") {
     const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
-    const base2 = localAppData || join76(homedir14(), "AppData", "Local");
-    return join76(base2, "oh-my-opencode", "bin");
+    const base2 = localAppData || join77(homedir14(), "AppData", "Local");
+    return join77(base2, "oh-my-opencode", "bin");
   }
   const xdgCache = process.env.XDG_CACHE_HOME;
-  const base = xdgCache || join76(homedir14(), ".cache");
-  return join76(base, "oh-my-opencode", "bin");
+  const base = xdgCache || join77(homedir14(), ".cache");
+  return join77(base, "oh-my-opencode", "bin");
 }
 function getBinaryName3() {
   return process.platform === "win32" ? "sg.exe" : "sg";
@@ -115244,7 +115353,7 @@ async function downloadAstGrep(version3 = DEFAULT_VERSION) {
   }
   const cacheDir = getCacheDir3();
   const binaryName = getBinaryName3();
-  const binaryPath = join76(cacheDir, binaryName);
+  const binaryPath = join77(cacheDir, binaryName);
   if (existsSync72(binaryPath)) {
     return binaryPath;
   }
@@ -115253,7 +115362,7 @@ async function downloadAstGrep(version3 = DEFAULT_VERSION) {
   const downloadUrl = `https://github.com/${REPO2}/releases/download/${version3}/${assetName}`;
   log(`[oh-my-opencode] Downloading ast-grep binary...`);
   try {
-    const archivePath = join76(cacheDir, assetName);
+    const archivePath = join77(cacheDir, assetName);
     ensureCacheDir(cacheDir);
     await downloadArchive(downloadUrl, archivePath);
     await extractZipArchive(archivePath, cacheDir);
@@ -115306,8 +115415,8 @@ function findSgCliPathSync() {
   try {
     const require2 = createRequire4(import.meta.url);
     const cliPackageJsonPath = require2.resolve("@ast-grep/cli/package.json");
-    const cliDirectory = dirname22(cliPackageJsonPath);
-    const sgPath = join77(cliDirectory, binaryName);
+    const cliDirectory = dirname23(cliPackageJsonPath);
+    const sgPath = join78(cliDirectory, binaryName);
     if (existsSync73(sgPath) && isValidBinary(sgPath)) {
       return sgPath;
     }
@@ -115317,9 +115426,9 @@ function findSgCliPathSync() {
     try {
       const require2 = createRequire4(import.meta.url);
       const packageJsonPath = require2.resolve(`${platformPackage}/package.json`);
-      const packageDirectory = dirname22(packageJsonPath);
+      const packageDirectory = dirname23(packageJsonPath);
       const astGrepBinaryName = process.platform === "win32" ? "ast-grep.exe" : "ast-grep";
-      const binaryPath = join77(packageDirectory, astGrepBinaryName);
+      const binaryPath = join78(packageDirectory, astGrepBinaryName);
       if (existsSync73(binaryPath) && isValidBinary(binaryPath)) {
         return binaryPath;
       }
@@ -115721,18 +115830,18 @@ var {spawn: spawn18 } = globalThis.Bun;
 
 // src/tools/grep/constants.ts
 import { existsSync as existsSync77 } from "fs";
-import { join as join79, dirname as dirname23 } from "path";
+import { join as join80, dirname as dirname24 } from "path";
 import { spawnSync as spawnSync4 } from "child_process";
 
 // src/tools/grep/downloader.ts
 import { existsSync as existsSync76, readdirSync as readdirSync19 } from "fs";
-import { join as join78 } from "path";
+import { join as join79 } from "path";
 function findFileRecursive(dir, filename) {
   try {
     const entries = readdirSync19(dir, { withFileTypes: true, recursive: true });
     for (const entry of entries) {
       if (entry.isFile() && entry.name === filename) {
-        return join78(entry.parentPath ?? dir, entry.name);
+        return join79(entry.parentPath ?? dir, entry.name);
       }
     }
   } catch {
@@ -115753,11 +115862,11 @@ function getPlatformKey() {
 }
 function getInstallDir() {
   const homeDir = process.env.HOME || process.env.USERPROFILE || ".";
-  return join78(homeDir, ".cache", "oh-my-opencode", "bin");
+  return join79(homeDir, ".cache", "oh-my-opencode", "bin");
 }
 function getRgPath() {
   const isWindows2 = process.platform === "win32";
-  return join78(getInstallDir(), isWindows2 ? "rg.exe" : "rg");
+  return join79(getInstallDir(), isWindows2 ? "rg.exe" : "rg");
 }
 async function extractTarGz2(archivePath, destDir) {
   const platformKey = getPlatformKey();
@@ -115774,7 +115883,7 @@ async function extractZip2(archivePath, destDir) {
   const binaryName = process.platform === "win32" ? "rg.exe" : "rg";
   const foundPath = findFileRecursive(destDir, binaryName);
   if (foundPath) {
-    const destPath = join78(destDir, binaryName);
+    const destPath = join79(destDir, binaryName);
     if (foundPath !== destPath) {
       const { renameSync: renameSync5 } = await import("fs");
       renameSync5(foundPath, destPath);
@@ -115795,7 +115904,7 @@ async function downloadAndInstallRipgrep() {
   ensureCacheDir(installDir);
   const filename = `ripgrep-${RG_VERSION}-${config4.platform}.${config4.extension}`;
   const url3 = `https://github.com/BurntSushi/ripgrep/releases/download/${RG_VERSION}/${filename}`;
-  const archivePath = join78(installDir, filename);
+  const archivePath = join79(installDir, filename);
   try {
     await downloadArchive(url3, archivePath);
     if (config4.extension === "tar.gz") {
@@ -115837,15 +115946,15 @@ function findExecutable(name) {
 }
 function getOpenCodeBundledRg() {
   const execPath = process.execPath;
-  const execDir = dirname23(execPath);
+  const execDir = dirname24(execPath);
   const isWindows2 = process.platform === "win32";
   const rgName = isWindows2 ? "rg.exe" : "rg";
   const candidates = [
-    join79(getDataDir(), "opencode", "bin", rgName),
-    join79(execDir, rgName),
-    join79(execDir, "bin", rgName),
-    join79(execDir, "..", "bin", rgName),
-    join79(execDir, "..", "libexec", rgName)
+    join80(getDataDir(), "opencode", "bin", rgName),
+    join80(execDir, rgName),
+    join80(execDir, "bin", rgName),
+    join80(execDir, "..", "bin", rgName),
+    join80(execDir, "..", "libexec", rgName)
   ];
   for (const candidate of candidates) {
     if (existsSync77(candidate)) {
@@ -116496,9 +116605,9 @@ Use this when a task matches an available skill's or command's description.
 - The tool will return detailed instructions with your context applied.
 `;
 // src/tools/skill/tools.ts
-import { dirname as dirname25 } from "path";
+import { dirname as dirname26 } from "path";
 // src/tools/slashcommand/command-output-formatter.ts
-import { dirname as dirname24 } from "path";
+import { dirname as dirname25 } from "path";
 async function formatLoadedCommand(command, userMessage) {
   const sections = [];
   sections.push(`# /${command.name} Command
@@ -116537,7 +116646,7 @@ async function formatLoadedCommand(command, userMessage) {
   if (!content && command.lazyContentLoader) {
     content = await command.lazyContentLoader.load();
   }
-  const commandDir = command.path ? dirname24(command.path) : process.cwd();
+  const commandDir = command.path ? dirname25(command.path) : process.cwd();
   const withFileReferences = await resolveFileReferencesInText(content, commandDir);
   const resolvedContent = await resolveCommandsInText(withFileReferences);
   let finalContent = resolvedContent.trim();
@@ -116917,7 +117026,7 @@ function createSkillTool(options = {}) {
         if (matchedSkill.name === "git-master") {
           body = injectGitMasterConfig(body, options.gitMasterConfig);
         }
-        const dir = matchedSkill.path ? dirname25(matchedSkill.path) : matchedSkill.resolvedPath || process.cwd();
+        const dir = matchedSkill.path ? dirname26(matchedSkill.path) : matchedSkill.resolvedPath || process.cwd();
         const output = [
           `## Skill: ${matchedSkill.name}`,
           "",
@@ -116957,9 +117066,9 @@ function createSkillTool(options = {}) {
 }
 var skill = createSkillTool();
 // src/tools/session-manager/constants.ts
-import { join as join80 } from "path";
-var TODO_DIR2 = join80(getClaudeConfigDir(), "todos");
-var TRANSCRIPT_DIR2 = join80(getClaudeConfigDir(), "transcripts");
+import { join as join81 } from "path";
+var TODO_DIR2 = join81(getClaudeConfigDir(), "todos");
+var TRANSCRIPT_DIR2 = join81(getClaudeConfigDir(), "transcripts");
 var SESSION_LIST_DESCRIPTION = `List all OpenCode sessions with optional filtering.
 
 Returns a list of available session IDs with metadata including message count, date range, and agents used.
@@ -117034,7 +117143,7 @@ Has Transcript: Yes (234 entries)`;
 // src/tools/session-manager/file-storage.ts
 import { existsSync as existsSync78 } from "fs";
 import { readdir, readFile } from "fs/promises";
-import { join as join81 } from "path";
+import { join as join82 } from "path";
 async function getFileMainSessions(directory) {
   if (!existsSync78(SESSION_STORAGE))
     return [];
@@ -117044,13 +117153,13 @@ async function getFileMainSessions(directory) {
     for (const projectDir of projectDirs) {
       if (!projectDir.isDirectory())
         continue;
-      const projectPath = join81(SESSION_STORAGE, projectDir.name);
+      const projectPath = join82(SESSION_STORAGE, projectDir.name);
       const sessionFiles = await readdir(projectPath);
       for (const file3 of sessionFiles) {
         if (!file3.endsWith(".json"))
           continue;
         try {
-          const content = await readFile(join81(projectPath, file3), "utf-8");
+          const content = await readFile(join82(projectPath, file3), "utf-8");
           const meta3 = JSON.parse(content);
           if (meta3.parentID)
             continue;
@@ -117077,7 +117186,7 @@ async function getFileAllSessions() {
       for (const entry of entries) {
         if (!entry.isDirectory())
           continue;
-        const sessionPath = join81(dir, entry.name);
+        const sessionPath = join82(dir, entry.name);
         const files = await readdir(sessionPath);
         if (files.some((file3) => file3.endsWith(".json"))) {
           sessions.push(entry.name);
@@ -117106,7 +117215,7 @@ async function getFileSessionMessages(sessionID) {
       if (!file3.endsWith(".json"))
         continue;
       try {
-        const content = await readFile(join81(messageDir, file3), "utf-8");
+        const content = await readFile(join82(messageDir, file3), "utf-8");
         const meta3 = JSON.parse(content);
         const parts = await readParts2(meta3.id);
         messages.push({
@@ -117132,7 +117241,7 @@ async function getFileSessionMessages(sessionID) {
   });
 }
 async function readParts2(messageID) {
-  const partDir = join81(PART_STORAGE, messageID);
+  const partDir = join82(PART_STORAGE, messageID);
   if (!existsSync78(partDir))
     return [];
   const parts = [];
@@ -117142,7 +117251,7 @@ async function readParts2(messageID) {
       if (!file3.endsWith(".json"))
         continue;
       try {
-        const content = await readFile(join81(partDir, file3), "utf-8");
+        const content = await readFile(join82(partDir, file3), "utf-8");
         parts.push(JSON.parse(content));
       } catch {
         continue;
@@ -117161,7 +117270,7 @@ async function getFileSessionTodos(sessionID) {
     const todoFiles = allFiles.filter((file3) => file3 === `${sessionID}.json`);
     for (const file3 of todoFiles) {
       try {
-        const content = await readFile(join81(TODO_DIR2, file3), "utf-8");
+        const content = await readFile(join82(TODO_DIR2, file3), "utf-8");
         const data = JSON.parse(content);
         if (!Array.isArray(data))
           continue;
@@ -117183,7 +117292,7 @@ async function getFileSessionTodos(sessionID) {
 async function getFileSessionTranscript(sessionID) {
   if (!existsSync78(TRANSCRIPT_DIR2))
     return 0;
-  const transcriptFile = join81(TRANSCRIPT_DIR2, `${sessionID}.jsonl`);
+  const transcriptFile = join82(TRANSCRIPT_DIR2, `${sessionID}.jsonl`);
   if (!existsSync78(transcriptFile))
     return 0;
   try {
@@ -117349,6 +117458,19 @@ function shouldFallbackFromSdkError(error92) {
 }
 
 // src/tools/session-manager/storage.ts
+function mergeSessionMetadataLists(sdkSessions, fileSessions) {
+  const merged = new Map;
+  for (const session of fileSessions) {
+    merged.set(session.id, session);
+  }
+  for (const session of sdkSessions) {
+    merged.set(session.id, session);
+  }
+  return [...merged.values()].sort((a, b) => b.time.updated - a.time.updated);
+}
+function mergeSessionIds(sdkSessionIds, fileSessionIds) {
+  return [...new Set([...sdkSessionIds, ...fileSessionIds])];
+}
 var sdkClient = null;
 function setStorageClient(client2) {
   sdkClient = client2;
@@ -117356,7 +117478,9 @@ function setStorageClient(client2) {
 async function getMainSessions(options) {
   if (isSqliteBackend() && sdkClient) {
     try {
-      return await getSdkMainSessions(sdkClient, options.directory);
+      const sdkSessions = await getSdkMainSessions(sdkClient, options.directory);
+      const fileSessions = await getFileMainSessions(options.directory);
+      return mergeSessionMetadataLists(sdkSessions, fileSessions);
     } catch (error92) {
       if (!shouldFallbackFromSdkError(error92))
         throw error92;
@@ -117368,7 +117492,9 @@ async function getMainSessions(options) {
 async function getAllSessions() {
   if (isSqliteBackend() && sdkClient) {
     try {
-      return await getSdkAllSessions(sdkClient);
+      const sdkSessionIds = await getSdkAllSessions(sdkClient);
+      const fileSessionIds = await getFileAllSessions();
+      return mergeSessionIds(sdkSessionIds, fileSessionIds);
     } catch (error92) {
       if (!shouldFallbackFromSdkError(error92))
         throw error92;
@@ -117380,7 +117506,9 @@ async function getAllSessions() {
 async function sessionExists2(sessionID) {
   if (isSqliteBackend() && sdkClient) {
     try {
-      return await sdkSessionExists(sdkClient, sessionID);
+      const existsInSdk = await sdkSessionExists(sdkClient, sessionID);
+      if (existsInSdk)
+        return true;
     } catch (error92) {
       if (!shouldFallbackFromSdkError(error92))
         throw error92;
@@ -117392,7 +117520,9 @@ async function sessionExists2(sessionID) {
 async function readSessionMessages2(sessionID) {
   if (isSqliteBackend() && sdkClient) {
     try {
-      return await getSdkSessionMessages(sdkClient, sessionID);
+      const sdkMessages = await getSdkSessionMessages(sdkClient, sessionID);
+      if (sdkMessages.length > 0)
+        return sdkMessages;
     } catch (error92) {
       if (!shouldFallbackFromSdkError(error92))
         throw error92;
@@ -117404,7 +117534,9 @@ async function readSessionMessages2(sessionID) {
 async function readSessionTodos(sessionID) {
   if (isSqliteBackend() && sdkClient) {
     try {
-      return await getSdkSessionTodos(sdkClient, sessionID);
+      const sdkTodos = await getSdkSessionTodos(sdkClient, sessionID);
+      if (sdkTodos.length > 0)
+        return sdkTodos;
     } catch (error92) {
       if (!shouldFallbackFromSdkError(error92))
         throw error92;
@@ -117413,7 +117545,48 @@ async function readSessionTodos(sessionID) {
   }
   return getFileSessionTodos(sessionID);
 }
+async function readSessionTranscript(sessionID) {
+  return getFileSessionTranscript(sessionID);
+}
 async function getSessionInfo(sessionID) {
+  if (isSqliteBackend() && sdkClient) {
+    try {
+      const sdkMessages = await getSdkSessionMessages(sdkClient, sessionID);
+      if (sdkMessages.length > 0) {
+        const agentsUsed = new Set;
+        let firstMessage;
+        let lastMessage;
+        for (const msg of sdkMessages) {
+          if (msg.agent)
+            agentsUsed.add(msg.agent);
+          if (msg.time?.created) {
+            const date9 = new Date(msg.time.created);
+            if (!firstMessage || date9 < firstMessage)
+              firstMessage = date9;
+            if (!lastMessage || date9 > lastMessage)
+              lastMessage = date9;
+          }
+        }
+        const todos = await readSessionTodos(sessionID);
+        const transcriptEntries = await readSessionTranscript(sessionID);
+        return {
+          id: sessionID,
+          message_count: sdkMessages.length,
+          first_message: firstMessage,
+          last_message: lastMessage,
+          agents_used: Array.from(agentsUsed),
+          has_todos: todos.length > 0,
+          has_transcript: transcriptEntries > 0,
+          todos,
+          transcript_entries: transcriptEntries
+        };
+      }
+    } catch (error92) {
+      if (!shouldFallbackFromSdkError(error92))
+        throw error92;
+      log("[session-manager] falling back to file session info after SDK unavailable error", { error: String(error92), sessionID });
+    }
+  }
   return getFileSessionInfo(sessionID);
 }
 
@@ -119396,7 +119569,7 @@ async function resolveMultimodalLookerAgentMetadata(ctx) {
 import * as childProcess from "child_process";
 import { existsSync as existsSync79, mkdtempSync, readFileSync as readFileSync51, rmSync as rmSync4, unlinkSync as unlinkSync11, writeFileSync as writeFileSync20 } from "fs";
 import { tmpdir as tmpdir7 } from "os";
-import { dirname as dirname26, join as join82 } from "path";
+import { dirname as dirname27, join as join83 } from "path";
 var SUPPORTED_FORMATS = new Set([
   "image/jpeg",
   "image/png",
@@ -119437,8 +119610,8 @@ function convertImageToJpeg(inputPath, mimeType) {
   if (!existsSync79(inputPath)) {
     throw new Error(`File not found: ${inputPath}`);
   }
-  const tempDir = mkdtempSync(join82(tmpdir7(), "opencode-img-"));
-  const outputPath = join82(tempDir, "converted.jpg");
+  const tempDir = mkdtempSync(join83(tmpdir7(), "opencode-img-"));
+  const outputPath = join83(tempDir, "converted.jpg");
   log(`[image-converter] Converting ${mimeType} to JPEG: ${inputPath}`);
   try {
     if (process.platform === "darwin") {
@@ -119489,7 +119662,7 @@ function convertImageToJpeg(inputPath, mimeType) {
 }
 function cleanupConvertedImage(filePath) {
   try {
-    const tempDirectory = dirname26(filePath);
+    const tempDirectory = dirname27(filePath);
     if (existsSync79(filePath)) {
       unlinkSync11(filePath);
       log(`[image-converter] Cleaned up temporary file: ${filePath}`);
@@ -119503,9 +119676,9 @@ function cleanupConvertedImage(filePath) {
   }
 }
 function convertBase64ImageToJpeg(base64Data, mimeType) {
-  const tempDir = mkdtempSync(join82(tmpdir7(), "opencode-b64-"));
+  const tempDir = mkdtempSync(join83(tmpdir7(), "opencode-b64-"));
   const inputExt = mimeType.split("/")[1] || "bin";
-  const inputPath = join82(tempDir, `input.${inputExt}`);
+  const inputPath = join83(tempDir, `input.${inputExt}`);
   const tempFiles = [inputPath];
   try {
     const cleanBase64 = base64Data.replace(/^data:[^;]+;base64,/, "");
@@ -120062,6 +120235,7 @@ function getTimingConfig() {
 // src/tools/delegate-task/sync-session-poller.ts
 init_logger();
 var NON_TERMINAL_FINISH_REASONS = new Set(["tool-calls", "unknown"]);
+var PENDING_TOOL_PART_TYPES = new Set(["tool", "tool_use", "tool-call"]);
 function wait(milliseconds) {
   const sharedBuffer = new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT);
   const typedArray = new Int32Array(sharedBuffer);
@@ -120094,6 +120268,8 @@ function isSessionComplete(messages) {
     return false;
   if (NON_TERMINAL_FINISH_REASONS.has(lastAssistant.info.finish))
     return false;
+  if (lastAssistant.parts?.some((part) => part.type && PENDING_TOOL_PART_TYPES.has(part.type)))
+    return false;
   if (!lastUser?.info?.id || !lastAssistant?.info?.id)
     return false;
   return lastUser.info.id < lastAssistant.info.id;
@@ -121789,7 +121965,7 @@ function createDelegateTask(options) {
 // src/tools/delegate-task/index.ts
 init_constants();
 // src/tools/task/task-create.ts
-import { join as join84 } from "path";
+import { join as join85 } from "path";
 
 // src/tools/task/types.ts
 var TaskStatusSchema = exports_external.enum(["pending", "in_progress", "completed", "deleted"]);
@@ -121843,18 +122019,18 @@ var TaskDeleteInputSchema = exports_external.object({
 });
 
 // src/features/claude-tasks/storage.ts
-import { join as join83, dirname as dirname27, basename as basename13, isAbsolute as isAbsolute11 } from "path";
-import { existsSync as existsSync80, mkdirSync as mkdirSync15, readFileSync as readFileSync52, writeFileSync as writeFileSync21, renameSync as renameSync5, unlinkSync as unlinkSync12, readdirSync as readdirSync20 } from "fs";
+import { join as join84, dirname as dirname28, basename as basename13, isAbsolute as isAbsolute11 } from "path";
+import { existsSync as existsSync80, mkdirSync as mkdirSync16, readFileSync as readFileSync52, writeFileSync as writeFileSync21, renameSync as renameSync5, unlinkSync as unlinkSync12, readdirSync as readdirSync20 } from "fs";
 import { randomUUID as randomUUID3 } from "crypto";
 function getTaskDir(config4 = {}) {
   const tasksConfig = config4.sisyphus?.tasks;
   const storagePath = tasksConfig?.storage_path;
   if (storagePath) {
-    return isAbsolute11(storagePath) ? storagePath : join83(process.cwd(), storagePath);
+    return isAbsolute11(storagePath) ? storagePath : join84(process.cwd(), storagePath);
   }
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
   const listId = resolveTaskListId(config4);
-  return join83(configDir, "tasks", listId);
+  return join84(configDir, "tasks", listId);
 }
 function sanitizePathSegment(value) {
   return value.replace(/[^a-zA-Z0-9_-]/g, "-") || "default";
@@ -121873,7 +122049,7 @@ function resolveTaskListId(config4 = {}) {
 }
 function ensureDir(dirPath) {
   if (!existsSync80(dirPath)) {
-    mkdirSync15(dirPath, { recursive: true });
+    mkdirSync16(dirPath, { recursive: true });
   }
 }
 function readJsonSafe(filePath, schema2) {
@@ -121893,7 +122069,7 @@ function readJsonSafe(filePath, schema2) {
   }
 }
 function writeJsonAtomic(filePath, data) {
-  const dir = dirname27(filePath);
+  const dir = dirname28(filePath);
   ensureDir(dir);
   const tempPath = `${filePath}.tmp.${Date.now()}`;
   try {
@@ -121913,7 +122089,7 @@ function generateTaskId() {
   return `T-${randomUUID3()}`;
 }
 function acquireLock(dirPath) {
-  const lockPath = join83(dirPath, ".lock");
+  const lockPath = join84(dirPath, ".lock");
   const lockId = randomUUID3();
   const createLock = (timestamp2) => {
     writeFileSync21(lockPath, JSON.stringify({ id: lockId, timestamp: timestamp2 }), {
@@ -122126,7 +122302,7 @@ async function handleCreate(args, config4, ctx, context) {
         threadID: context.sessionID
       };
       const validatedTask = TaskObjectSchema.parse(task);
-      writeJsonAtomic(join84(taskDir, `${taskId}.json`), validatedTask);
+      writeJsonAtomic(join85(taskDir, `${taskId}.json`), validatedTask);
       await syncTaskTodoUpdate(ctx, validatedTask, context.sessionID);
       return JSON.stringify({
         task: {
@@ -122148,7 +122324,7 @@ async function handleCreate(args, config4, ctx, context) {
   }
 }
 // src/tools/task/task-get.ts
-import { join as join85 } from "path";
+import { join as join86 } from "path";
 var TASK_ID_PATTERN = /^T-[A-Za-z0-9-]+$/;
 function parseTaskId(id) {
   if (!TASK_ID_PATTERN.test(id))
@@ -122173,7 +122349,7 @@ Returns null if the task does not exist or the file is invalid.`,
           return JSON.stringify({ error: "invalid_task_id" });
         }
         const taskDir = getTaskDir(config4);
-        const taskPath = join85(taskDir, `${taskId}.json`);
+        const taskPath = join86(taskDir, `${taskId}.json`);
         const task = readJsonSafe(taskPath, TaskObjectSchema);
         return JSON.stringify({ task: task ?? null });
       } catch (error92) {
@@ -122186,7 +122362,7 @@ Returns null if the task does not exist or the file is invalid.`,
   });
 }
 // src/tools/task/task-list.ts
-import { join as join86 } from "path";
+import { join as join87 } from "path";
 import { existsSync as existsSync81, readdirSync as readdirSync21 } from "fs";
 function createTaskList(config4) {
   return tool({
@@ -122207,7 +122383,7 @@ Returns summary format: id, subject, status, owner, blockedBy (not full descript
       }
       const allTasks = [];
       for (const fileId of files) {
-        const task = readJsonSafe(join86(taskDir, `${fileId}.json`), TaskObjectSchema);
+        const task = readJsonSafe(join87(taskDir, `${fileId}.json`), TaskObjectSchema);
         if (task) {
           allTasks.push(task);
         }
@@ -122235,7 +122411,7 @@ Returns summary format: id, subject, status, owner, blockedBy (not full descript
   });
 }
 // src/tools/task/task-update.ts
-import { join as join87 } from "path";
+import { join as join88 } from "path";
 var TASK_ID_PATTERN2 = /^T-[A-Za-z0-9-]+$/;
 function parseTaskId2(id) {
   if (!TASK_ID_PATTERN2.test(id))
@@ -122283,7 +122459,7 @@ async function handleUpdate(args, config4, ctx, context) {
       return JSON.stringify({ error: "task_lock_unavailable" });
     }
     try {
-      const taskPath = join87(taskDir, `${taskId}.json`);
+      const taskPath = join88(taskDir, `${taskId}.json`);
       const task = readJsonSafe(taskPath, TaskObjectSchema);
       if (!task) {
         return JSON.stringify({ error: "task_not_found" });
@@ -123947,6 +124123,9 @@ var builtinTools = {
 function isTmuxIntegrationEnabled(pluginConfig) {
   return pluginConfig.tmux?.enabled ?? false;
 }
+function isInteractiveBashEnabled(which = Bun.which) {
+  return which("tmux") !== null;
+}
 function createRuntimeTmuxConfig(pluginConfig) {
   return TmuxConfigSchema.parse(pluginConfig.tmux ?? {});
 }
@@ -124495,6 +124674,40 @@ function createHooks(args) {
     }
   };
 }
+// src/features/background-agent/constants.ts
+var TASK_TTL_MS = 30 * 60 * 1000;
+var TERMINAL_TASK_TTL_MS = 30 * 60 * 1000;
+var MIN_STABILITY_TIME_MS2 = 10 * 1000;
+var DEFAULT_STALE_TIMEOUT_MS = 2700000;
+var DEFAULT_MESSAGE_STALENESS_TIMEOUT_MS = 3600000;
+var DEFAULT_MAX_TOOL_CALLS = 4000;
+var DEFAULT_CIRCUIT_BREAKER_CONSECUTIVE_THRESHOLD = 20;
+var DEFAULT_CIRCUIT_BREAKER_ENABLED = true;
+var MIN_RUNTIME_BEFORE_STALE_MS = 30000;
+var DEFAULT_SESSION_GONE_TIMEOUT_MS = 60000;
+var MIN_IDLE_TIME_MS = 5000;
+var POLLING_INTERVAL_MS = 3000;
+var TASK_CLEANUP_DELAY_MS = 10 * 60 * 1000;
+
+// src/features/background-agent/spawner.ts
+var FALLBACK_AGENT = "general";
+function isAgentNotFoundError(error92) {
+  const message = typeof error92 === "string" ? error92 : error92 instanceof Error ? error92.message : typeof error92 === "object" && error92 !== null && typeof error92.message === "string" ? error92.message : String(error92);
+  return message.includes("Agent not found") || message.includes("agent.name");
+}
+function buildFallbackBody(originalBody, fallbackAgent) {
+  return {
+    ...originalBody,
+    agent: fallbackAgent,
+    tools: {
+      task: false,
+      call_omo_agent: true,
+      question: false,
+      ...getAgentToolRestrictions(fallbackAgent)
+    }
+  };
+}
+
 // src/features/background-agent/task-history.ts
 var MAX_ENTRIES_PER_PARENT = 100;
 
@@ -124652,21 +124865,6 @@ class ConcurrencyManager {
   }
 }
 
-// src/features/background-agent/constants.ts
-var TASK_TTL_MS = 30 * 60 * 1000;
-var TERMINAL_TASK_TTL_MS = 30 * 60 * 1000;
-var MIN_STABILITY_TIME_MS2 = 10 * 1000;
-var DEFAULT_STALE_TIMEOUT_MS = 2700000;
-var DEFAULT_MESSAGE_STALENESS_TIMEOUT_MS = 3600000;
-var DEFAULT_MAX_TOOL_CALLS = 4000;
-var DEFAULT_CIRCUIT_BREAKER_CONSECUTIVE_THRESHOLD = 20;
-var DEFAULT_CIRCUIT_BREAKER_ENABLED = true;
-var MIN_RUNTIME_BEFORE_STALE_MS = 30000;
-var DEFAULT_SESSION_GONE_TIMEOUT_MS = 60000;
-var MIN_IDLE_TIME_MS = 5000;
-var POLLING_INTERVAL_MS = 3000;
-var TASK_CLEANUP_DELAY_MS = 10 * 60 * 1000;
-
 // src/features/background-agent/duration-formatter.ts
 function formatDuration3(start, end) {
   const duration5 = (end ?? new Date).getTime() - start.getTime();
@@ -125005,7 +125203,7 @@ function unregisterManagerForCleanup(manager) {
 
 // src/features/background-agent/compaction-aware-message-resolver.ts
 import { readdirSync as readdirSync22, readFileSync as readFileSync53 } from "fs";
-import { join as join88 } from "path";
+import { join as join89 } from "path";
 function isCompactionAgent4(agent) {
   return agent?.trim().toLowerCase() === "compaction";
 }
@@ -125084,7 +125282,7 @@ function findNearestMessageExcludingCompaction(messageDir, sessionID) {
     const messages = [];
     for (const file3 of files) {
       try {
-        const content = readFileSync53(join88(messageDir, file3), "utf-8");
+        const content = readFileSync53(join89(messageDir, file3), "utf-8");
         messages.push(JSON.parse(content));
       } catch {
         continue;
@@ -125170,7 +125368,7 @@ function handleSessionIdleBackgroundEvent(args) {
 }
 
 // src/features/background-agent/manager.ts
-import { join as join89 } from "path";
+import { join as join90 } from "path";
 
 // src/features/background-agent/remove-task-toast-tracking.ts
 function removeTaskToastTracking(taskId) {
@@ -125858,32 +126056,52 @@ class BackgroundManager {
     if (input.model) {
       applySessionPromptParams(sessionID, input.model);
     }
+    const promptBody = {
+      agent: input.agent,
+      ...launchModel ? { model: launchModel } : {},
+      ...launchVariant ? { variant: launchVariant } : {},
+      system: input.skillContent,
+      tools: (() => {
+        const tools = {
+          task: false,
+          call_omo_agent: true,
+          question: false,
+          ...getAgentToolRestrictions(input.agent)
+        };
+        setSessionTools(sessionID, tools);
+        return tools;
+      })(),
+      parts: [createInternalAgentTextPart(input.prompt)]
+    };
     promptWithModelSuggestionRetry(this.client, {
       path: { id: sessionID },
-      body: {
-        agent: input.agent,
-        ...launchModel ? { model: launchModel } : {},
-        ...launchVariant ? { variant: launchVariant } : {},
-        system: input.skillContent,
-        tools: (() => {
-          const tools = {
-            task: false,
-            call_omo_agent: true,
-            question: false,
-            ...getAgentToolRestrictions(input.agent)
-          };
-          setSessionTools(sessionID, tools);
-          return tools;
-        })(),
-        parts: [createInternalAgentTextPart(input.prompt)]
-      }
+      body: promptBody
     }).catch(async (error92) => {
+      if (isAgentNotFoundError(error92) && input.agent !== FALLBACK_AGENT) {
+        log("[background-agent] Agent not found, retrying with fallback agent", {
+          original: input.agent,
+          fallback: FALLBACK_AGENT,
+          taskId: task.id
+        });
+        try {
+          const fallbackBody = buildFallbackBody(promptBody, FALLBACK_AGENT);
+          setSessionTools(sessionID, fallbackBody.tools);
+          await promptWithModelSuggestionRetry(this.client, {
+            path: { id: sessionID },
+            body: fallbackBody
+          });
+          task.agent = FALLBACK_AGENT;
+          return;
+        } catch (retryError) {
+          log("[background-agent] Fallback agent also failed:", retryError);
+        }
+      }
       log("[background-agent] promptAsync error:", error92);
       const existingTask = this.findBySession(sessionID);
       if (existingTask) {
         existingTask.status = "interrupt";
         const errorMessage = error92 instanceof Error ? error92.message : String(error92);
-        if (errorMessage.includes("agent.name") || errorMessage.includes("undefined")) {
+        if (errorMessage.includes("agent.name") || errorMessage.includes("undefined") || isAgentNotFoundError(error92)) {
           existingTask.error = `Agent "${input.agent}" not found. Make sure the agent is registered in your opencode.json or provided by a plugin.`;
         } else {
           existingTask.error = errorMessage;
@@ -126394,6 +126612,13 @@ class BackgroundManager {
   }
   async handleSessionErrorEvent(args) {
     const { task, errorInfo, errorMessage, errorName } = args;
+    if (isAgentNotFoundError({ message: errorInfo.message })) {
+      log("[background-agent] Skipping session.error fallback for agent-not-found (handled by prompt catch)", {
+        taskId: task.id,
+        errorMessage: errorInfo.message?.slice(0, 100)
+      });
+      return;
+    }
     if (await this.tryFallbackRetry(task, errorInfo, "session.error")) {
       return;
     }
@@ -126797,7 +127022,7 @@ ${originalText}`;
             parentSessionID: task.parentSessionID
           });
         }
-        const messageDir = join89(MESSAGE_STORAGE, task.parentSessionID);
+        const messageDir = join90(MESSAGE_STORAGE, task.parentSessionID);
         const currentMessage = messageDir ? findNearestMessageExcludingCompaction(messageDir, task.parentSessionID) : null;
         agent = currentMessage?.agent ?? task.parentAgent;
         model = currentMessage?.model?.providerID && currentMessage?.model?.modelID ? { providerID: currentMessage.model.providerID, modelID: currentMessage.model.modelID } : undefined;
@@ -127125,11 +127350,11 @@ ${originalText}`;
   }
 }
 // src/features/mcp-oauth/storage.ts
-import { chmodSync as chmodSync2, existsSync as existsSync82, mkdirSync as mkdirSync16, readFileSync as readFileSync54, unlinkSync as unlinkSync13, writeFileSync as writeFileSync22 } from "fs";
-import { dirname as dirname28, join as join90 } from "path";
+import { chmodSync as chmodSync2, existsSync as existsSync82, mkdirSync as mkdirSync17, readFileSync as readFileSync54, unlinkSync as unlinkSync13, writeFileSync as writeFileSync22 } from "fs";
+import { dirname as dirname29, join as join91 } from "path";
 var STORAGE_FILE_NAME = "mcp-oauth.json";
 function getMcpOauthStoragePath() {
-  return join90(getOpenCodeConfigDir({ binary: "opencode" }), STORAGE_FILE_NAME);
+  return join91(getOpenCodeConfigDir({ binary: "opencode" }), STORAGE_FILE_NAME);
 }
 function normalizeHost(serverHost) {
   let host = serverHost.trim();
@@ -127179,9 +127404,9 @@ function readStore() {
 function writeStore(store2) {
   const filePath = getMcpOauthStoragePath();
   try {
-    const dir = dirname28(filePath);
+    const dir = dirname29(filePath);
     if (!existsSync82(dir)) {
-      mkdirSync16(dir, { recursive: true });
+      mkdirSync17(dir, { recursive: true });
     }
     writeFileSync22(filePath, JSON.stringify(store2, null, 2), { encoding: "utf-8", mode: 384 });
     chmodSync2(filePath, 384);
@@ -133676,17 +133901,17 @@ var SESSION_TIMEOUT_MS3 = 10 * 60 * 1000;
 var MIN_STABILITY_TIME_MS4 = 10 * 1000;
 // src/features/claude-code-mcp-loader/loader.ts
 import { existsSync as existsSync83, readFileSync as readFileSync55 } from "fs";
-import { join as join91 } from "path";
+import { join as join92 } from "path";
 import { homedir as homedir15 } from "os";
 init_logger();
 function getMcpConfigPaths() {
   const claudeConfigDir = getClaudeConfigDir();
   const cwd = process.cwd();
   return [
-    { path: join91(homedir15(), ".claude.json"), scope: "user" },
-    { path: join91(claudeConfigDir, ".mcp.json"), scope: "user" },
-    { path: join91(cwd, ".mcp.json"), scope: "project" },
-    { path: join91(cwd, ".claude", ".mcp.json"), scope: "local" }
+    { path: join92(homedir15(), ".claude.json"), scope: "user" },
+    { path: join92(claudeConfigDir, ".mcp.json"), scope: "user" },
+    { path: join92(cwd, ".mcp.json"), scope: "project" },
+    { path: join92(cwd, ".claude", ".mcp.json"), scope: "local" }
   ];
 }
 async function loadMcpConfigFile(filePath) {
@@ -138716,43 +138941,39 @@ function buildTodoDisciplineSection3(useTaskSystem) {
   if (useTaskSystem) {
     return `## Task Discipline (NON-NEGOTIABLE)
 
-Track ALL multi-step work with tasks. This is your execution backbone.
+**Track ALL multi-step work with tasks. This is your execution backbone.**
 
 ### When to Create Tasks (MANDATORY)
 
-- 2+ step task - \`task_create\` FIRST, atomic breakdown
-- Uncertain scope - \`task_create\` to clarify thinking
-- Complex single task - break down into trackable steps
+- **2+ step task** - \`task_create\` FIRST, atomic breakdown
+- **Uncertain scope** - \`task_create\` to clarify thinking
+- **Complex single task** - Break down into trackable steps
 
 ### Workflow (STRICT)
 
-1. On task start: \`task_create\` with atomic steps - no announcements, just create
-2. Before each step: \`task_update(status="in_progress")\` (ONE at a time)
-3. After each step: \`task_update(status="completed")\` IMMEDIATELY (NEVER batch)
-4. Scope changes: update tasks BEFORE proceeding
-
-Tasks prevent drift, enable recovery if interrupted, and make each commitment explicit. Skipping tasks on multi-step work, batch-completing, or proceeding without \`in_progress\` are blocking violations.
+1. **On task start**: \`task_create\` with atomic steps-no announcements, just create
+2. **Before each step**: \`task_update(status="in_progress")\` (ONE at a time)
+3. **After each step**: \`task_update(status="completed")\` IMMEDIATELY (NEVER batch)
+4. **Scope changes**: Update tasks BEFORE proceeding
 
 **NO TASKS ON MULTI-STEP WORK = INCOMPLETE WORK.**`;
   }
   return `## Todo Discipline (NON-NEGOTIABLE)
 
-Track ALL multi-step work with todos. This is your execution backbone.
+**Track ALL multi-step work with todos. This is your execution backbone.**
 
 ### When to Create Todos (MANDATORY)
 
-- 2+ step task - \`todowrite\` FIRST, atomic breakdown
-- Uncertain scope - \`todowrite\` to clarify thinking
-- Complex single task - break down into trackable steps
+- **2+ step task** - \`todowrite\` FIRST, atomic breakdown
+- **Uncertain scope** - \`todowrite\` to clarify thinking
+- **Complex single task** - Break down into trackable steps
 
 ### Workflow (STRICT)
 
-1. On task start: \`todowrite\` with atomic steps - no announcements, just create
-2. Before each step: mark \`in_progress\` (ONE at a time)
-3. After each step: mark \`completed\` IMMEDIATELY (NEVER batch)
-4. Scope changes: update todos BEFORE proceeding
-
-Todos prevent drift, enable recovery if interrupted, and make each commitment explicit. Skipping todos on multi-step work, batch-completing, or proceeding without \`in_progress\` are blocking violations.
+1. **On task start**: \`todowrite\` with atomic steps-no announcements, just create
+2. **Before each step**: Mark \`in_progress\` (ONE at a time)
+3. **After each step**: Mark \`completed\` IMMEDIATELY (NEVER batch)
+4. **Scope changes**: Update todos BEFORE proceeding
 
 **NO TODOS ON MULTI-STEP WORK = INCOMPLETE WORK.**`;
 }
@@ -138766,313 +138987,243 @@ function buildHephaestusPrompt3(availableAgents = [], availableTools = [], avail
   const oracleSection = buildOracleSection(availableAgents);
   const hardBlocks = buildHardBlocksSection();
   const antiPatterns = buildAntiPatternsSection();
+  const antiDuplication = buildAntiDuplicationSection();
   const todoDiscipline = buildTodoDisciplineSection3(useTaskSystem);
-  return `You are Hephaestus, an autonomous deep worker for software engineering.
-
-## Identity
-
-You build context by examining the codebase first without making assumptions. You think through the nuances of the code you encounter. You do not stop early. You complete.
-
-Persist until the task is fully handled end-to-end within the current turn. Persevere even when tool calls fail. Only terminate your turn when you are sure the problem is solved and verified.
-
-When blocked: try a different approach \u2192 decompose the problem \u2192 challenge assumptions \u2192 explore how others solved it. Asking the user is the LAST resort after exhausting creative alternatives.
-
-### Do NOT Ask - Just Do
-
-**FORBIDDEN:**
-- Asking permission in any form ("Should I proceed?", "Would you like me to...?", "I can do X if you want") \u2192 JUST DO IT.
-- "Do you want me to run tests?" \u2192 RUN THEM.
-- "I noticed Y, should I fix it?" \u2192 FIX IT OR NOTE IN FINAL MESSAGE.
-- Stopping after partial implementation \u2192 100% OR NOTHING.
-- Answering a question then stopping \u2192 The question implies action. DO THE ACTION.
-- "I'll do X" / "I recommend X" then ending turn \u2192 You COMMITTED to X. DO X NOW before ending.
-- Explaining findings without acting on them \u2192 ACT on your findings immediately.
-
-**CORRECT:**
-- Keep going until COMPLETELY done
-- Run verification (lint, tests, build) WITHOUT asking
-- Make decisions. Course-correct only on CONCRETE failure
-- Note assumptions in final message, not as questions mid-work
-- Need context? Fire explore/librarian in background IMMEDIATELY - continue only with non-overlapping work while they search
-- User asks "did you do X?" and you didn't \u2192 Acknowledge briefly, DO X immediately
-- User asks a question implying work \u2192 Answer briefly, DO the implied work in the same turn
-- You wrote a plan in your response \u2192 EXECUTE the plan before ending turn - plans are starting lines, not finish lines
-
-### Task Scope Clarification
+  const identityBlock = `<identity>
+You are Hephaestus, an autonomous deep worker for software engineering.
 
-You handle multi-step sub-tasks of a SINGLE GOAL. What you receive is ONE goal that may require multiple steps to complete - this is your primary use case. Only reject when given MULTIPLE INDEPENDENT goals in one request.
+You communicate warmly and directly, like a senior colleague walking through a problem together. You explain the why behind decisions, not just the what. You stay concise in volume but generous in clarity - every sentence carries meaning.
 
-## Hard Constraints
+You build context by examining the codebase first without assumptions. You think through the nuances of the code you encounter. You persist until the task is fully handled end-to-end, even when tool calls fail. You only end your turn when the problem is solved and verified.
 
-${hardBlocks}
+You are autonomous. When you see work to do, do it - run tests, fix issues, make decisions. Course-correct only on concrete failure. State assumptions in your final message, not as questions along the way. If you commit to doing something ("I'll fix X"), execute it before ending your turn. When a user's question implies action, answer briefly and do the implied work in the same turn. If you find something, act on it - do not explain findings without acting on them. Plans are starting lines, not finish lines - if you wrote a plan, execute it before ending your turn.
 
-${antiPatterns}
-
-## Phase 0 - Intent Gate (EVERY task)
+When blocked: try a different approach, decompose the problem, challenge your assumptions, explore how others solved it. Asking the user is a last resort after exhausting creative alternatives. If you need context, fire explore/librarian agents in background immediately and continue only with non-overlapping work while they search. Continue only with non-overlapping work after launching background agents. If you notice a potential issue along the way, fix it or note it in your final message - do not ask for permission.
 
+You handle multi-step sub-tasks of a single goal. What you receive is one goal that may require multiple steps - this is your primary use case. Only flag when given genuinely independent goals in one request.
+</identity>`;
+  const intentBlock = `<intent>
 ${keyTriggers}
 
-<intent_extraction>
-### Step 0: Extract True Intent (BEFORE Classification)
+You are an autonomous deep worker. Users chose you for ACTION, not analysis. Your conservative grounding bias may cause you to interpret messages too literally - counter this by extracting true intent first.
 
-You are an autonomous deep worker. Users chose you for ACTION, not analysis.
+Every message has a surface form and a true intent. Default: the message implies action unless it explicitly says otherwise ("just explain", "don't change anything").
 
-Every user message has a surface form and a true intent. Your conservative grounding bias may cause you to interpret messages too literally - counter this by extracting true intent FIRST.
-
-**Intent Mapping (act on TRUE intent, not surface form):**
-
-| Surface Form | True Intent | Your Response |
+<intent_mapping>
+| Surface Form | True Intent | Your Move |
 |---|---|---|
-| "Did you do X?" (and you didn't) | You forgot X. Do it now. | Acknowledge \u2192 DO X immediately |
-| "How does X work?" | Understand X to work with/fix it | Explore \u2192 Implement/Fix |
-| "Can you look into Y?" | Investigate AND resolve Y | Investigate \u2192 Resolve |
-| "What's the best way to do Z?" | Actually do Z the best way | Decide \u2192 Implement |
-| "Why is A broken?" / "I'm seeing error B" | Fix A / Fix B | Diagnose \u2192 Fix |
-| "What do you think about C?" | Evaluate, decide, implement C | Evaluate \u2192 Implement best option |
-
-Pure question (NO action) ONLY when ALL of these are true: user explicitly says "just explain" / "don't change anything" / "I'm just curious", no actionable codebase context, and no problem or improvement is mentioned or implied.
-
-DEFAULT: Message implies action unless explicitly stated otherwise.
-
-Verbalize your classification before acting:
-
-> "I detect [implementation/fix/investigation/pure question] intent - [reason]. [Action I'm taking now]."
-
-This verbalization commits you to action. Once you state implementation, fix, or investigation intent, you MUST follow through in the same turn. Only "pure question" permits ending without action.
-</intent_extraction>
-
-### Step 1: Classify Task Type
-
-- **Trivial**: Single file, known location, <10 lines - Direct tools only (UNLESS Key Trigger applies)
-- **Explicit**: Specific file/line, clear command - Execute directly
-- **Exploratory**: "How does X work?", "Find Y" - Fire explore (1-3) + tools in parallel \u2192 then ACT on findings (see Step 0 true intent)
-- **Open-ended**: "Improve", "Refactor", "Add feature" - Full Execution Loop required
-- **Ambiguous**: Unclear scope, multiple interpretations - Ask ONE clarifying question
+| "Did you do X?" (and you didn't) | Do X now | Acknowledge briefly, do X |
+| "How does X work?" | Understand to fix/improve | Explore, then implement/fix |
+| "Can you look into Y?" | Investigate and resolve | Investigate, then resolve |
+| "What's the best way to do Z?" | Do Z the best way | Decide, then implement |
+| "Why is A broken?" / "I'm seeing error B" | Fix A / Fix B | Diagnose, then fix |
+| "What do you think about C?" | Evaluate and implement | Evaluate, then implement best option |
+</intent_mapping>
 
-### Step 2: Ambiguity Protocol (EXPLORE FIRST - NEVER ask before exploring)
+Pure question (no action) only when ALL of these are true: user explicitly says "just explain" / "don't change anything", no actionable codebase context, and no problem or improvement is mentioned.
 
-- Single valid interpretation - proceed immediately
-- Missing info that MIGHT exist - EXPLORE FIRST with tools (\`gh\`, \`git\`, \`grep\`, explore agents)
-- Multiple plausible interpretations - cover ALL likely intents comprehensively, don't ask
-- Truly impossible to proceed - ask ONE precise question (LAST RESORT)
+State your read before acting: "I detect [intent type] - [reason]. [What I'm doing now]." This commits you to follow through in the same turn.
 
-Exploration hierarchy (MANDATORY before any question):
-1. Direct tools: \`gh pr list\`, \`git log\`, \`grep\`, \`rg\`, file reads
+Complexity:
+- Trivial (single file, <10 lines) - direct tools, unless a key trigger fires
+- Explicit (specific file/line) - execute directly
+- Exploratory ("how does X work?") - fire explore agents + tools in parallel, then act on findings
+- Open-ended ("improve", "refactor") - full execution loop
+- Ambiguous - explore first, cover all likely intents comprehensively rather than asking
+- Uncertain scope - create todos to clarify thinking, then proceed
+
+Before asking the user anything, exhaust this hierarchy:
+1. Direct tools: \`grep\`, \`rg\`, file reads, \`gh\`, \`git log\`
 2. Explore agents: fire 2-3 parallel background searches
 3. Librarian agents: check docs, GitHub, external sources
 4. Context inference: educated guess from surrounding context
-5. LAST RESORT: ask ONE precise question (only if 1-4 all failed)
-
-If you notice a potential issue - fix it or note it in final message. Don't ask for permission.
-
-### Step 3: Validate Before Acting
+5. Only when 1-4 all fail: ask one precise question
 
-**Assumptions Check:** Do I have implicit assumptions? Is the search scope clear?
+Before acting, check:
+- Do I have implicit assumptions? Is the search scope clear?
+- Is there a skill whose domain overlaps? Load it immediately.
+- Is there a specialized agent that matches this? What category + skills to equip?
+- Can I do it myself for the best result? Default to delegation for complex tasks.
 
-**Delegation Check (MANDATORY):**
-0. Find relevant skills to load - load them IMMEDIATELY.
-1. Is there a specialized agent that perfectly matches this request?
-2. If not, what \`task\` category + skills to equip? \u2192 \`task(load_skills=[{skill1}, ...])\`
-3. Can I do it myself for the best result, FOR SURE?
+If the user's approach seems problematic, explain your concern and the alternative, then proceed with the better approach. Flag major risks before implementing.
+</intent>`;
+  const exploreBlock = `<explore>
+${toolSelection}
 
-Default bias: DELEGATE for complex tasks. Work yourself ONLY when trivial.
+${exploreSection}
 
-### When to Challenge the User
+${librarianSection}
 
-If you observe a design decision that will cause obvious problems, an approach contradicting established patterns, or a request that misunderstands the existing code - note the concern and your alternative clearly, then proceed with the best approach. If the risk is major, flag it before implementing.
+<tool_usage_rules>
+- Parallelize independent tool calls: multiple file reads, grep searches, agent fires - all at once
+- Explore/Librarian = background grep. ALWAYS \`run_in_background=true\`, ALWAYS parallel
+- After any file edit: restate what changed, where, and what validation follows
+- Prefer tools over guessing whenever you need specific data (files, configs, patterns)
+</tool_usage_rules>
 
----
+<tool_call_philosophy>
+More tool calls = more accuracy. Ten tool calls that build a complete picture are better than three that leave gaps. Your internal reasoning about file contents, project structure, and code behavior is unreliable - always verify with tools instead of guessing.
 
-## Exploration & Research
+Treat every tool call as an investment in correctness, not a cost to minimize. When you are unsure whether to make a tool call, make it. When you think you have enough context, make one more call to verify. The user would rather wait an extra few seconds for a correct answer than get a fast wrong one.
+</tool_call_philosophy>
 
-${toolSelection}
+<tool_persistence>
+Do not stop calling tools just to save calls. If a tool returns empty or partial results, retry with a different strategy before concluding. Prefer reading more files over fewer: when investigating, read the full cluster of related files, not just the one you think matters. When multiple files might be relevant, read all of them simultaneously rather than guessing which one matters.
+</tool_persistence>
 
-${exploreSection}
+<dig_deeper>
+Do not stop at the first plausible answer. Look for second-order issues, edge cases, and missing constraints. When you think you understand the problem, verify by checking one more layer of dependencies or callers. If a finding seems too simple for the complexity of the question, it probably is.
+</dig_deeper>
 
-${librarianSection}
+<dependency_checks>
+Before taking an action, check whether prerequisite discovery or lookup is required. Do not skip prerequisite steps just because the intended final action seems obvious. If a later step depends on an earlier one's output, resolve that dependency first.
+</dependency_checks>
 
-### Parallel Execution & Tool Usage (DEFAULT - NON-NEGOTIABLE)
+Prefer tools over guessing whenever you need specific data (files, configs, patterns). Always use tools over internal knowledge for file contents, project state, and verification.
 
-Parallelize EVERYTHING. Independent reads, searches, and agents run SIMULTANEOUSLY.
+<parallel_execution>
+Parallelize aggressively - this is where you gain the most speed and accuracy. Every independent operation should run simultaneously, not sequentially:
+- Multiple file reads: read 5 files at once, not one by one
+- Grep + file reads: search and read in the same turn
+- Multiple explore/librarian agents: fire 3-5 agents in parallel for different angles on the same question
+- Agent fires + direct tool calls: launch background agents AND do direct reads simultaneously
 
-<tool_usage_rules>
-- Parallelize independent tool calls: multiple file reads, grep searches, agent fires - all at once.
-- Explore/Librarian = background grep. ALWAYS \`run_in_background=true\`, ALWAYS parallel.
-- Never chain together bash commands with separators like \`&&\`, \`;\`, or \`|\` in a single call. Run each command as a separate tool invocation.
-- After any file edit: restate what changed, where, and what validation follows.
-- Prefer tools over guessing whenever you need specific data (files, configs, patterns).
-</tool_usage_rules>
+Fire 2-5 explore agents in parallel for any non-trivial codebase question. Explore and librarian agents always run in background (\`run_in_background=true\`). Never use \`run_in_background=false\` for explore/librarian. After launching, continue only with non-overlapping work. Continue only with non-overlapping work after launching background agents. If nothing independent remains, end your response and wait for the completion notification.
+</parallel_execution>
 
-**How to call explore/librarian:**
+How to call explore/librarian:
 \`\`\`
-// Codebase search - use subagent_type="explore"
+// Codebase search
 task(subagent_type="explore", run_in_background=true, load_skills=[], description="Find [what]", prompt="[CONTEXT]: ... [GOAL]: ... [REQUEST]: ...")
 
-// External docs/OSS search - use subagent_type="librarian"
+// External docs/OSS search
 task(subagent_type="librarian", run_in_background=true, load_skills=[], description="Find [what]", prompt="[CONTEXT]: ... [GOAL]: ... [REQUEST]: ...")
-
 \`\`\`
 
-Prompt structure for each agent:
-- [CONTEXT]: Task, files/modules involved, approach
-- [GOAL]: Specific outcome needed - what decision this unblocks
-- [DOWNSTREAM]: How results will be used
-- [REQUEST]: What to find, format to return, what to SKIP
+Never chain together bash commands with separators like \`&&\`, \`;\`, or \`|\` in a single call. Run each command as a separate tool invocation.
 
-**Rules:**
-- Fire 2-5 explore agents in parallel for any non-trivial codebase question
-- Parallelize independent file reads - don't read files one at a time
-- NEVER use \`run_in_background=false\` for explore/librarian
-- Continue only with non-overlapping work after launching background agents
-- Collect results with \`background_output(task_id="...")\` when needed
-- BEFORE final answer, cancel DISPOSABLE tasks individually: \`background_cancel(taskId="bg_explore_xxx")\`, \`background_cancel(taskId="bg_librarian_xxx")\`
-- **NEVER use \`background_cancel(all=true)\`** - it kills tasks whose results you haven't collected yet
+After any file edit, briefly restate what changed, where, and what validation follows.
 
-${buildAntiDuplicationSection()}
+Once you delegate exploration to background agents, do not repeat the same search yourself. Continue only with non-overlapping work only. Continue only with non-overlapping work after launching background agents. When you need the delegated results but they are not ready, end your response - the notification will trigger your next turn.
 
-### Search Stop Conditions
+Agent prompt structure:
+- [CONTEXT]: Task, files/modules involved, approach
+- [GOAL]: Specific outcome needed - what decision this unblocks
+- [DOWNSTREAM]: How results will be used
+- [REQUEST]: What to find, format to return, what to skip
 
-STOP searching when you have enough context, the same information keeps appearing, 2 search iterations yielded nothing new, or a direct answer was found. Do not over-explore.
+Background task management:
+- Collect results with \`background_output(task_id="...")\` when completed
+- Before final answer, cancel disposable tasks individually: \`background_cancel(taskId="...")\`
+- Never use \`background_cancel(all=true)\` - it kills tasks whose results you have not collected yet
 
----
+${antiDuplication}
 
-## Execution Loop (EXPLORE \u2192 PLAN \u2192 DECIDE \u2192 EXECUTE \u2192 VERIFY)
+Stop searching when you have enough context, the same info repeats, or two iterations found nothing new.
+</explore>`;
+  const constraintsBlock = `<constraints>
+${hardBlocks}
 
-1. **EXPLORE**: Fire 2-5 explore/librarian agents IN PARALLEL + direct tool reads simultaneously.
-2. **PLAN**: List files to modify, specific changes, dependencies, complexity estimate.
-3. **DECIDE**: Trivial (<10 lines, single file) \u2192 self. Complex (multi-file, >100 lines) \u2192 MUST delegate.
-4. **EXECUTE**: Surgical changes yourself, or exhaustive context in delegation prompts.
-5. **VERIFY**: \`lsp_diagnostics\` on ALL modified files \u2192 build \u2192 tests.
+${antiPatterns}
+</constraints>`;
+  const executionBlock = `<execution>
+1. **Explore**: Fire 2-5 explore/librarian agents in parallel + direct tool reads. Goal: complete understanding, not just enough context.
+2. **Plan**: List files to modify, specific changes, dependencies, complexity estimate.
+3. **Decide**: Trivial (<10 lines, single file) -> self. Complex (multi-file, >100 lines) -> delegate.
+4. **Execute**: Surgical changes yourself, or provide exhaustive context in delegation prompts. Match existing patterns. Minimal diff. Search the codebase for similar patterns before writing code. Default to ASCII. Add comments only for non-obvious blocks.
+5. **Verify**: \`lsp_diagnostics\` on all modified files (zero errors) -> run related tests (\`foo.ts\` -> \`foo.test.ts\`) -> typecheck -> build if applicable (exit 0). Fix only issues your changes caused.
 
-If verification fails: return to Step 1 (max 3 iterations, then consult Oracle).
+If verification fails, return to step 1 with a materially different approach. After three attempts: stop, revert to last working state, document what you tried, consult Oracle. If Oracle cannot resolve, ask the user.
 
-### Scope Discipline
+While working, you may notice unexpected changes you did not make - likely from the user or autogeneration. If they directly conflict with your task, ask. Otherwise, focus on your task.
 
-While you are working, you might notice unexpected changes that you didn't make. It's likely the user made them, or they were autogenerated. If they directly conflict with your current task, stop and ask the user how they would like to proceed. Otherwise, focus on the task at hand.
+<completion_check>
+When you think you are done: re-read the original request. Check your intent classification from earlier - did the user's message imply action you have not taken? Verify every item is fully implemented - not partially, not "extend later." Run verification once more. Then report what you did, what you verified, and the results.
+</completion_check>
 
----
+<failure_recovery>
+Fix root causes, not symptoms. Re-verify after every attempt. If the first approach fails, try a materially different alternative (different algorithm, pattern, or library). After three different approaches fail: stop all edits, revert to last working state, document what you tried, consult Oracle. If Oracle cannot resolve, ask the user with a clear explanation.
 
+Never leave code broken, delete failing tests, or make random changes hoping something works.
+</failure_recovery>
+</execution>`;
+  const trackingBlock = `<tracking>
 ${todoDiscipline}
+</tracking>`;
+  const progressBlock = `<progress>
+Report progress at meaningful phase transitions. The user should know what you are doing and why, but do not narrate every \`grep\` or \`cat\`.
 
----
-
-## Progress Updates
-
-Report progress proactively every ~30 seconds. The user should always know what you're doing and why.
-
-When to update (MANDATORY):
+When to update:
 - Before exploration: "Checking the repo structure for auth patterns..."
 - After discovery: "Found the config in \`src/config/\`. The pattern uses factory functions."
 - Before large edits: "About to refactor the handler - touching 3 files."
 - On phase transitions: "Exploration done. Moving to implementation."
 - On blockers: "Hit a snag with the types - trying generics instead."
 
-Style: 1-2 sentences, concrete, with at least one specific detail (file path, pattern found, decision made). When explaining technical decisions, explain the WHY. Don't narrate every \`grep\` or \`cat\`, but DO signal meaningful progress. Keep updates varied in structure - don't start each the same way.
-
----
-
-## Implementation
-
+Style: one sentence, concrete, with at least one specific detail (file path, pattern found, decision made). Explain the why behind technical decisions. Keep updates varied in structure.
+</progress>`;
+  const delegationBlock = `<delegation>
 ${categorySkillsGuide}
 
-### Skill Loading Examples
-
-When delegating, ALWAYS check if relevant skills should be loaded:
-
-- **Frontend/UI work**: \`frontend-ui-ux\` - Anti-slop design: bold typography, intentional color, meaningful motion
-- **Browser testing**: \`playwright\` - Browser automation, screenshots, verification
-- **Git operations**: \`git-master\` - Atomic commits, rebase/squash, blame/bisect
-- **Tauri desktop app**: \`tauri-macos-craft\` - macOS-native UI, vibrancy, traffic lights
-
-User-installed skills get PRIORITY. Always evaluate ALL available skills before delegating.
+When delegating, check all available skills. User-installed skills get priority. Always evaluate all available skills before delegating. Example domain-skill mappings:
+- Frontend/UI work: \`frontend-ui-ux\` - Anti-slop design: bold typography, intentional color, meaningful motion
+- Browser testing: \`playwright\` - Browser automation, screenshots, verification
+- Git operations: \`git-master\` - Atomic commits, rebase/squash, blame/bisect
+- Tauri desktop app: \`tauri-macos-craft\` - macOS-native UI, vibrancy, traffic lights
 
 ${delegationTable}
 
-### Delegation Prompt (MANDATORY 6 sections)
-
-\`\`\`
-1. TASK: Atomic, specific goal (one action per delegation)
-2. EXPECTED OUTCOME: Concrete deliverables with success criteria
-3. REQUIRED TOOLS: Explicit tool whitelist
-4. MUST DO: Exhaustive requirements - leave NOTHING implicit
-5. MUST NOT DO: Forbidden actions - anticipate and block rogue behavior
-6. CONTEXT: File paths, existing patterns, constraints
-\`\`\`
-
-Vague prompts = rejected. Be exhaustive.
-
-After delegation, ALWAYS verify: works as expected? follows codebase pattern? MUST DO / MUST NOT DO respected? NEVER trust subagent self-reports. ALWAYS verify with your own tools.
+<delegation_prompt>
+Every delegation prompt needs these 6 sections:
+1. TASK: atomic goal
+2. EXPECTED OUTCOME: deliverables + success criteria
+3. REQUIRED TOOLS: explicit whitelist
+4. MUST DO: exhaustive requirements - leave nothing implicit
+5. MUST NOT DO: forbidden actions - anticipate rogue behavior
+6. CONTEXT: file paths, existing patterns, constraints
+</delegation_prompt>
 
-### Session Continuity
-
-Every \`task()\` output includes a session_id. USE IT for follow-ups.
+After delegation, verify by reading every file the subagent touched. Check: works as expected? follows codebase pattern? Do not trust self-reports.
 
-- Task failed/incomplete - \`session_id="{id}", prompt="Fix: {error}"\`
-- Follow-up on result - \`session_id="{id}", prompt="Also: {question}"\`
-- Verification failed - \`session_id="{id}", prompt="Failed: {error}. Fix."\`
+<session_continuity>
+Every \`task()\` returns a session_id. Use it for all follow-ups:
+- Task failed/incomplete: \`session_id="{id}", prompt="Fix: {error}"\`
+- Follow-up on result: \`session_id="{id}", prompt="Also: {question}"\`
+- Verification failed: \`session_id="{id}", prompt="Failed: {error}. Fix."\`
 
+This preserves full context, avoids repeated exploration, saves 70%+ tokens.
+</session_continuity>
 ${oracleSection ? `
-${oracleSection}
-` : ""}
-
-## Output Contract
-
-<output_contract>
-Always favor conciseness. Do not default to bullets - use prose when a few sentences suffice, structured sections only when complexity warrants it. Group findings by outcome rather than enumerating every detail.
-
-For simple or single-file tasks, prefer 1-2 short paragraphs. For larger tasks, use at most 2-4 high-level sections. Prefer grouping by major change area or user-facing outcome, not by file or edit inventory.
-
-Do not begin responses with conversational interjections or meta commentary. NEVER open with: "Done -", "Got it", "Great question!", "That's a great idea!", "You're right to call that out".
-
-DO send clear context before significant actions - explain what you're doing and why in plain language so anyone can follow. When explaining technical decisions, explain the WHY, not just the WHAT.
-
-Updates at meaningful milestones must include a concrete outcome ("Found X", "Updated Y"). Do not expand task beyond what user asked - but implied action IS part of the request (see Step 0 true intent).
-</output_contract>
-
-## Code Quality & Verification
-
-### Before Writing Code (MANDATORY)
-
-1. SEARCH existing codebase for similar patterns/styles
-2. Match naming, indentation, import styles, error handling conventions
-3. Default to ASCII. Add comments only for non-obvious blocks
-
-### After Implementation (MANDATORY - DO NOT SKIP)
-
-1. \`lsp_diagnostics\` on ALL modified files - zero errors required
-2. Run related tests - pattern: modified \`foo.ts\` \u2192 look for \`foo.test.ts\`
-3. Run typecheck if TypeScript project
-4. Run build if applicable - exit code 0 required
-5. Tell user what you verified and the results
+${oracleSection}` : ""}
+</delegation>`;
+  const communicationBlock = `<communication>
+Your output is the one part the user actually sees. Everything before this - all the tool calls, exploration, analysis - is invisible to them. So when you finally speak, make it count: be warm, clear, and genuinely helpful.
 
-**NO EVIDENCE = NOT COMPLETE.**
+Write in complete, natural sentences that anyone can follow. Explain technical decisions in plain language - if a non-engineer colleague were reading over the user's shoulder, they should be able to follow the gist. Favor prose over bullets; use structured sections only when complexity genuinely warrants it.
 
-## Completion Guarantee (NON-NEGOTIABLE - READ THIS LAST, REMEMBER IT ALWAYS)
+For simple tasks, 1-2 short paragraphs. For larger tasks, at most 2-4 sections grouped by outcome, not by file. Group findings by outcome rather than enumerating every detail.
 
-You do NOT end your turn until the user's request is 100% done, verified, and proven. Implement everything asked for - no partial delivery, no "basic version". Verify with real tools, not "it should work". Confirm every verification passed. Re-read the original request - did you miss anything? Re-check true intent (Step 0) - did the user's message imply action you haven't taken?
+When explaining what you did: lead with the result ("Fixed the auth bug - the token was expiring before the refresh check"), then add supporting detail only if it helps understanding. Include concrete details: file paths, patterns found, decisions made. Updates at meaningful milestones should include a concrete outcome ("Found X", "Updated Y").
 
-<turn_end_self_check>
-Before ending your turn, verify ALL of the following:
+Do not pad responses with conversational openers ("Done -", "Got it", "Great question!"), meta commentary, or acknowledgements. Do not repeat the user's request back. Do not expand the task beyond what was asked - but implied action is part of the request (see intent mapping).
+</communication>`;
+  return `${identityBlock}
 
-1. Did the user's message imply action? (Step 0) \u2192 Did you take that action?
-2. Did you write "I'll do X" or "I recommend X"? \u2192 Did you then DO X?
-3. Did you offer to do something ("Would you like me to...?") \u2192 VIOLATION. Go back and do it.
-4. Did you answer a question and stop? \u2192 Was there implied work? If yes, do it now.
+${intentBlock}
 
-If ANY check fails: DO NOT end your turn. Continue working.
-</turn_end_self_check>
+${exploreBlock}
 
-If ANY of these are false, you are NOT done: all requested functionality fully implemented, \`lsp_diagnostics\` returns zero errors on ALL modified files, build passes (if applicable), tests pass (or pre-existing failures documented), you have EVIDENCE for each verification step.
+${constraintsBlock}
 
-Keep going until the task is fully resolved. Persist even when tool calls fail. Only terminate your turn when you are sure the problem is solved and verified.
+${executionBlock}
 
-When you think you're done: re-read the request. Run verification ONE MORE TIME. Then report.
+${trackingBlock}
 
-## Failure Recovery
+${progressBlock}
 
-Fix root causes, not symptoms. Re-verify after EVERY attempt. If first approach fails, try an alternative (different algorithm, pattern, library). After 3 DIFFERENT approaches fail: STOP all edits \u2192 REVERT to last working state \u2192 DOCUMENT what you tried \u2192 CONSULT Oracle \u2192 if Oracle fails \u2192 ASK USER with clear explanation.
+${delegationBlock}
 
-Never leave code broken, delete failing tests, or shotgun debug.`;
+${communicationBlock}`;
 }
 
 // src/agents/hephaestus/agent.ts
@@ -140388,7 +140539,7 @@ async function createBuiltinAgents(disabledAgents = [], agentOverrides = {}, dir
 }
 // src/features/claude-code-agent-loader/loader.ts
 import { existsSync as existsSync85, readdirSync as readdirSync23, readFileSync as readFileSync57 } from "fs";
-import { join as join92, basename as basename14 } from "path";
+import { join as join93, basename as basename14 } from "path";
 function parseToolsConfig2(toolsStr) {
   if (!toolsStr)
     return;
@@ -140410,7 +140561,7 @@ function loadAgentsFromDir(agentsDir, scope) {
   for (const entry of entries) {
     if (!isMarkdownFile(entry))
       continue;
-    const agentPath = join92(agentsDir, entry.name);
+    const agentPath = join93(agentsDir, entry.name);
     const agentName = basename14(entry.name, ".md");
     try {
       const content = readFileSync57(agentPath, "utf-8");
@@ -140443,7 +140594,7 @@ function loadAgentsFromDir(agentsDir, scope) {
   return agents;
 }
 function loadUserAgents() {
-  const userAgentsDir = join92(getClaudeConfigDir(), "agents");
+  const userAgentsDir = join93(getClaudeConfigDir(), "agents");
   const agents = loadAgentsFromDir(userAgentsDir, "user");
   const result = {};
   for (const agent of agents) {
@@ -140452,7 +140603,7 @@ function loadUserAgents() {
   return result;
 }
 function loadProjectAgents(directory) {
-  const projectAgentsDir = join92(directory ?? process.cwd(), ".claude", "agents");
+  const projectAgentsDir = join93(directory ?? process.cwd(), ".claude", "agents");
   const agents = loadAgentsFromDir(projectAgentsDir, "project");
   const result = {};
   for (const agent of agents) {
@@ -142942,7 +143093,7 @@ async function applyAgentConfig(params) {
 }
 // src/features/claude-code-command-loader/loader.ts
 import { promises as fs19 } from "fs";
-import { join as join93, basename as basename15 } from "path";
+import { join as join94, basename as basename15 } from "path";
 init_logger();
 async function loadCommandsFromDir(commandsDir, scope, visited = new Set, prefix = "") {
   try {
@@ -142973,7 +143124,7 @@ async function loadCommandsFromDir(commandsDir, scope, visited = new Set, prefix
     if (entry.isDirectory()) {
       if (entry.name.startsWith("."))
         continue;
-      const subDirPath = join93(commandsDir, entry.name);
+      const subDirPath = join94(commandsDir, entry.name);
       const subPrefix = prefix ? `${prefix}/${entry.name}` : entry.name;
       const subCommands = await loadCommandsFromDir(subDirPath, scope, visited, subPrefix);
       commands3.push(...subCommands);
@@ -142981,7 +143132,7 @@ async function loadCommandsFromDir(commandsDir, scope, visited = new Set, prefix
     }
     if (!isMarkdownFile(entry))
       continue;
-    const commandPath = join93(commandsDir, entry.name);
+    const commandPath = join94(commandsDir, entry.name);
     const baseCommandName = basename15(entry.name, ".md");
     const commandName = prefix ? `${prefix}/${baseCommandName}` : baseCommandName;
     try {
@@ -143040,12 +143191,12 @@ function commandsToRecord(commands3) {
   return result;
 }
 async function loadUserCommands() {
-  const userCommandsDir = join93(getClaudeConfigDir(), "commands");
+  const userCommandsDir = join94(getClaudeConfigDir(), "commands");
   const commands3 = await loadCommandsFromDir(userCommandsDir, "user");
   return commandsToRecord(commands3);
 }
 async function loadProjectCommands(directory) {
-  const projectCommandsDir = join93(directory ?? process.cwd(), ".claude", "commands");
+  const projectCommandsDir = join94(directory ?? process.cwd(), ".claude", "commands");
   const commands3 = await loadCommandsFromDir(projectCommandsDir, "project");
   return commandsToRecord(commands3);
 }
@@ -143452,7 +143603,9 @@ function createConfigHandler(deps) {
 // src/create-managers.ts
 function createManagers(args) {
   const { ctx, pluginConfig, tmuxConfig, modelCacheState, backgroundNotificationHookEnabled } = args;
-  markServerRunningInProcess();
+  if (tmuxConfig.enabled) {
+    markServerRunningInProcess();
+  }
   const tmuxSessionManager = new TmuxSessionManager(ctx, tmuxConfig);
   registerManagerForCleanup({
     shutdown: async () => {
@@ -143652,8 +143805,14 @@ function trimToolsToCap(filteredTools, maxTools) {
   log(`[tool-registry] Trimmed ${removed} tools to satisfy max_tools=${maxTools}. Final plugin tool count=${currentCount}.`);
 }
 function createToolRegistry(args) {
-  const { ctx, pluginConfig, managers, skillContext, availableCategories } = args;
-  const tmuxIntegrationEnabled = isTmuxIntegrationEnabled(pluginConfig);
+  const {
+    ctx,
+    pluginConfig,
+    managers,
+    skillContext,
+    availableCategories,
+    interactiveBashEnabled = isInteractiveBashEnabled()
+  } = args;
   const backgroundTools = createBackgroundTools(managers.backgroundManager, ctx.client);
   const callOmoAgent = createCallOmoAgent(ctx, managers.backgroundManager, pluginConfig.disabled_agents ?? [], pluginConfig.agents, pluginConfig.categories);
   const isMultimodalLookerEnabled = !(pluginConfig.disabled_agents ?? []).some((agent) => agent.toLowerCase() === "multimodal-looker");
@@ -143730,7 +143889,7 @@ function createToolRegistry(args) {
     task: delegateTask,
     skill_mcp: skillMcpTool,
     skill: skillTool,
-    ...tmuxIntegrationEnabled ? { interactive_bash } : {},
+    ...interactiveBashEnabled ? { interactive_bash } : {},
     ...taskToolsRecord,
     ...hashlineToolsRecord
   };
@@ -144023,10 +144182,10 @@ function createChatHeadersHandler(args) {
 
 // src/plugin/ultrawork-db-model-override.ts
 import { Database } from "bun:sqlite";
-import { join as join94 } from "path";
+import { join as join95 } from "path";
 import { existsSync as existsSync86 } from "fs";
 function getDbPath() {
-  return join94(getDataDir(), "opencode", "opencode.db");
+  return join95(getDataDir(), "opencode", "opencode.db");
 }
 var MAX_MICROTASK_RETRIES = 10;
 function tryUpdateMessageModel(db, messageId, targetModel, variant) {
@@ -144581,7 +144740,8 @@ function isCompactionAgent5(agent) {
   return agent.toLowerCase() === "compaction";
 }
 function createEventHandler2(args) {
-  const { ctx, firstMessageVariantGate, managers, hooks: hooks2 } = args;
+  const { ctx, pluginConfig, firstMessageVariantGate, managers, hooks: hooks2 } = args;
+  const tmuxIntegrationEnabled = isTmuxIntegrationEnabled(pluginConfig);
   const pluginContext = ctx;
   const isRuntimeFallbackEnabled = hooks2.runtimeFallback !== null && hooks2.runtimeFallback !== undefined && (typeof args.pluginConfig.runtime_fallback === "boolean" ? args.pluginConfig.runtime_fallback : args.pluginConfig.runtime_fallback?.enabled ?? false);
   const isModelFallbackEnabled = hooks2.modelFallback !== null && hooks2.modelFallback !== undefined;
@@ -144724,7 +144884,7 @@ function createEventHandler2(args) {
     }
     const { event } = input;
     const props = event.properties;
-    if (TMUX_ACTIVITY_EVENT_TYPES.has(event.type)) {
+    if (tmuxIntegrationEnabled && TMUX_ACTIVITY_EVENT_TYPES.has(event.type)) {
       managers.tmuxSessionManager.onEvent?.(event);
     }
     if (event.type === "session.created") {
@@ -144733,7 +144893,9 @@ function createEventHandler2(args) {
         setMainSession(sessionInfo?.id);
       }
       firstMessageVariantGate.markSessionCreated(sessionInfo);
-      await managers.tmuxSessionManager.onSessionCreated(event);
+      if (tmuxIntegrationEnabled) {
+        await managers.tmuxSessionManager.onSessionCreated(event);
+      }
     }
     if (event.type === "session.deleted") {
       const sessionInfo = props?.info;
@@ -144761,9 +144923,11 @@ function createEventHandler2(args) {
         deleteSessionTools(sessionInfo.id);
         await managers.skillMcpManager.disconnectSession(sessionInfo.id);
         await lspManager.cleanupTempDirectoryClients();
-        await managers.tmuxSessionManager.onSessionDeleted({
-          sessionID: sessionInfo.id
-        });
+        if (tmuxIntegrationEnabled) {
+          await managers.tmuxSessionManager.onSessionDeleted({
+            sessionID: sessionInfo.id
+          });
+        }
       }
     }
     if (event.type === "message.removed") {