oh-my-opencode 2.5.2 → 2.5.3

package/dist/index.js

@@ -222,8 +222,8 @@ var require_utils = __commonJS((exports) => {
     }
     return output;
   };
-  exports.basename = (path4, { windows } = {}) => {
-    const segs = path4.split(windows ? /[\\/]/ : "/");
+  exports.basename = (path5, { windows } = {}) => {
+    const segs = path5.split(windows ? /[\\/]/ : "/");
     const last = segs[segs.length - 1];
     if (last === "") {
       return segs[segs.length - 2];
@@ -3269,6 +3269,18 @@ function getUserConfigDir() {
   }
   return process.env.XDG_CONFIG_HOME || path2.join(os2.homedir(), ".config");
 }
+// src/shared/data-path.ts
+import * as path3 from "path";
+import * as os3 from "os";
+function getDataDir() {
+  if (process.platform === "win32") {
+    return process.env.LOCALAPPDATA ?? path3.join(os3.homedir(), "AppData", "Local");
+  }
+  return process.env.XDG_DATA_HOME ?? path3.join(os3.homedir(), ".local", "share");
+}
+function getOpenCodeStorageDir() {
+  return path3.join(getDataDir(), "opencode", "storage");
+}
 // src/shared/config-errors.ts
 var configLoadErrors = [];
 function getConfigLoadErrors() {
@@ -3356,7 +3368,7 @@ function createBuiltinAgents(disabledAgents = [], agentOverrides = {}, directory
 }
 // src/hooks/todo-continuation-enforcer.ts
 import { existsSync as existsSync5, readdirSync as readdirSync2 } from "fs";
-import { join as join6 } from "path";
+import { join as join7 } from "path";
 
 // src/features/claude-code-session-state/state.ts
 var subagentSessions = new Set;
@@ -3369,15 +3381,13 @@ function getMainSessionID() {
 }
 // src/features/hook-message-injector/injector.ts
 import { existsSync as existsSync4, mkdirSync, readFileSync as readFileSync2, readdirSync, writeFileSync } from "fs";
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 
 // src/features/hook-message-injector/constants.ts
-import { join as join4 } from "path";
-import { homedir as homedir3 } from "os";
-var xdgData = process.env.XDG_DATA_HOME || join4(homedir3(), ".local", "share");
-var OPENCODE_STORAGE = join4(xdgData, "opencode", "storage");
-var MESSAGE_STORAGE = join4(OPENCODE_STORAGE, "message");
-var PART_STORAGE = join4(OPENCODE_STORAGE, "part");
+import { join as join5 } from "path";
+var OPENCODE_STORAGE = getOpenCodeStorageDir();
+var MESSAGE_STORAGE = join5(OPENCODE_STORAGE, "message");
+var PART_STORAGE = join5(OPENCODE_STORAGE, "part");
 
 // src/features/hook-message-injector/injector.ts
 function findNearestMessageWithFields(messageDir) {
@@ -3385,7 +3395,7 @@ function findNearestMessageWithFields(messageDir) {
     const files = readdirSync(messageDir).filter((f) => f.endsWith(".json")).sort().reverse();
     for (const file of files) {
       try {
-        const content = readFileSync2(join5(messageDir, file), "utf-8");
+        const content = readFileSync2(join6(messageDir, file), "utf-8");
         const msg = JSON.parse(content);
         if (msg.agent && msg.model?.providerID && msg.model?.modelID) {
           return msg;
@@ -3413,12 +3423,12 @@ function getOrCreateMessageDir(sessionID) {
   if (!existsSync4(MESSAGE_STORAGE)) {
     mkdirSync(MESSAGE_STORAGE, { recursive: true });
   }
-  const directPath = join5(MESSAGE_STORAGE, sessionID);
+  const directPath = join6(MESSAGE_STORAGE, sessionID);
   if (existsSync4(directPath)) {
     return directPath;
   }
   for (const dir of readdirSync(MESSAGE_STORAGE)) {
-    const sessionPath = join5(MESSAGE_STORAGE, dir, sessionID);
+    const sessionPath = join6(MESSAGE_STORAGE, dir, sessionID);
     if (existsSync4(sessionPath)) {
       return sessionPath;
     }
@@ -3472,12 +3482,12 @@ function injectHookMessage(sessionID, hookContent, originalMessage) {
     sessionID
   };
   try {
-    writeFileSync(join5(messageDir, `${messageID}.json`), JSON.stringify(messageMeta, null, 2));
-    const partDir = join5(PART_STORAGE, messageID);
+    writeFileSync(join6(messageDir, `${messageID}.json`), JSON.stringify(messageMeta, null, 2));
+    const partDir = join6(PART_STORAGE, messageID);
     if (!existsSync4(partDir)) {
       mkdirSync(partDir, { recursive: true });
     }
-    writeFileSync(join5(partDir, `${partID}.json`), JSON.stringify(textPart, null, 2));
+    writeFileSync(join6(partDir, `${partID}.json`), JSON.stringify(textPart, null, 2));
     return true;
   } catch {
     return false;
@@ -3512,11 +3522,11 @@ Incomplete tasks remain in your todo list. Continue working on the next pending
 function getMessageDir(sessionID) {
   if (!existsSync5(MESSAGE_STORAGE))
     return null;
-  const directPath = join6(MESSAGE_STORAGE, sessionID);
+  const directPath = join7(MESSAGE_STORAGE, sessionID);
   if (existsSync5(directPath))
     return directPath;
   for (const dir of readdirSync2(MESSAGE_STORAGE)) {
-    const sessionPath = join6(MESSAGE_STORAGE, dir, sessionID);
+    const sessionPath = join7(MESSAGE_STORAGE, dir, sessionID);
     if (existsSync5(sessionPath))
       return sessionPath;
   }
@@ -3723,7 +3733,8 @@ function createTodoContinuationEnforcer(ctx, options = {}) {
       }
       if (sessionID && role === "assistant" && finish) {
         remindedSessions.delete(sessionID);
-        log(`[${HOOK_NAME}] Cleared reminded state on assistant finish`, { sessionID });
+        preemptivelyInjectedSessions.delete(sessionID);
+        log(`[${HOOK_NAME}] Cleared reminded/preemptive state on assistant finish`, { sessionID });
         const isTerminalFinish = finish && !["tool-calls", "unknown"].includes(finish);
         if (isTerminalFinish && isNonInteractive()) {
           log(`[${HOOK_NAME}] Terminal finish in non-interactive mode`, { sessionID, finish });
@@ -4090,24 +4101,24 @@ function createSessionNotification(ctx, config = {}) {
 }
 // src/hooks/session-recovery/storage.ts
 import { existsSync as existsSync6, mkdirSync as mkdirSync2, readdirSync as readdirSync3, readFileSync as readFileSync3, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 
 // src/hooks/session-recovery/constants.ts
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 
 // node_modules/xdg-basedir/index.js
-import os3 from "os";
-import path3 from "path";
-var homeDirectory = os3.homedir();
+import os4 from "os";
+import path4 from "path";
+var homeDirectory = os4.homedir();
 var { env } = process;
-var xdgData2 = env.XDG_DATA_HOME || (homeDirectory ? path3.join(homeDirectory, ".local", "share") : undefined);
-var xdgConfig = env.XDG_CONFIG_HOME || (homeDirectory ? path3.join(homeDirectory, ".config") : undefined);
-var xdgState = env.XDG_STATE_HOME || (homeDirectory ? path3.join(homeDirectory, ".local", "state") : undefined);
-var xdgCache = env.XDG_CACHE_HOME || (homeDirectory ? path3.join(homeDirectory, ".cache") : undefined);
+var xdgData = env.XDG_DATA_HOME || (homeDirectory ? path4.join(homeDirectory, ".local", "share") : undefined);
+var xdgConfig = env.XDG_CONFIG_HOME || (homeDirectory ? path4.join(homeDirectory, ".config") : undefined);
+var xdgState = env.XDG_STATE_HOME || (homeDirectory ? path4.join(homeDirectory, ".local", "state") : undefined);
+var xdgCache = env.XDG_CACHE_HOME || (homeDirectory ? path4.join(homeDirectory, ".cache") : undefined);
 var xdgRuntime = env.XDG_RUNTIME_DIR || undefined;
 var xdgDataDirectories = (env.XDG_DATA_DIRS || "/usr/local/share/:/usr/share/").split(":");
-if (xdgData2) {
-  xdgDataDirectories.unshift(xdgData2);
+if (xdgData) {
+  xdgDataDirectories.unshift(xdgData);
 }
 var xdgConfigDirectories = (env.XDG_CONFIG_DIRS || "/etc/xdg").split(":");
 if (xdgConfig) {
@@ -4115,9 +4126,9 @@ if (xdgConfig) {
 }
 
 // src/hooks/session-recovery/constants.ts
-var OPENCODE_STORAGE2 = join7(xdgData2 ?? "", "opencode", "storage");
-var MESSAGE_STORAGE2 = join7(OPENCODE_STORAGE2, "message");
-var PART_STORAGE2 = join7(OPENCODE_STORAGE2, "part");
+var OPENCODE_STORAGE2 = join8(xdgData ?? "", "opencode", "storage");
+var MESSAGE_STORAGE2 = join8(OPENCODE_STORAGE2, "message");
+var PART_STORAGE2 = join8(OPENCODE_STORAGE2, "part");
 var THINKING_TYPES = new Set(["thinking", "redacted_thinking", "reasoning"]);
 var META_TYPES = new Set(["step-start", "step-finish"]);
 var CONTENT_TYPES = new Set(["text", "tool", "tool_use", "tool_result"]);
@@ -4131,12 +4142,12 @@ function generatePartId2() {
 function getMessageDir2(sessionID) {
   if (!existsSync6(MESSAGE_STORAGE2))
     return "";
-  const directPath = join8(MESSAGE_STORAGE2, sessionID);
+  const directPath = join9(MESSAGE_STORAGE2, sessionID);
   if (existsSync6(directPath)) {
     return directPath;
   }
   for (const dir of readdirSync3(MESSAGE_STORAGE2)) {
-    const sessionPath = join8(MESSAGE_STORAGE2, dir, sessionID);
+    const sessionPath = join9(MESSAGE_STORAGE2, dir, sessionID);
     if (existsSync6(sessionPath)) {
       return sessionPath;
     }
@@ -4152,7 +4163,7 @@ function readMessages(sessionID) {
     if (!file.endsWith(".json"))
       continue;
     try {
-      const content = readFileSync3(join8(messageDir, file), "utf-8");
+      const content = readFileSync3(join9(messageDir, file), "utf-8");
       messages.push(JSON.parse(content));
     } catch {
       continue;
@@ -4167,7 +4178,7 @@ function readMessages(sessionID) {
   });
 }
 function readParts(messageID) {
-  const partDir = join8(PART_STORAGE2, messageID);
+  const partDir = join9(PART_STORAGE2, messageID);
   if (!existsSync6(partDir))
     return [];
   const parts = [];
@@ -4175,7 +4186,7 @@ function readParts(messageID) {
     if (!file.endsWith(".json"))
       continue;
     try {
-      const content = readFileSync3(join8(partDir, file), "utf-8");
+      const content = readFileSync3(join9(partDir, file), "utf-8");
       parts.push(JSON.parse(content));
     } catch {
       continue;
@@ -4205,7 +4216,7 @@ function messageHasContent(messageID) {
   return parts.some(hasContent);
 }
 function injectTextPart(sessionID, messageID, text) {
-  const partDir = join8(PART_STORAGE2, messageID);
+  const partDir = join9(PART_STORAGE2, messageID);
   if (!existsSync6(partDir)) {
     mkdirSync2(partDir, { recursive: true });
   }
@@ -4219,7 +4230,7 @@ function injectTextPart(sessionID, messageID, text) {
     synthetic: true
   };
   try {
-    writeFileSync2(join8(partDir, `${partId}.json`), JSON.stringify(part, null, 2));
+    writeFileSync2(join9(partDir, `${partId}.json`), JSON.stringify(part, null, 2));
     return true;
   } catch {
     return false;
@@ -4282,7 +4293,7 @@ function findMessagesWithOrphanThinking(sessionID) {
   return result;
 }
 function prependThinkingPart(sessionID, messageID) {
-  const partDir = join8(PART_STORAGE2, messageID);
+  const partDir = join9(PART_STORAGE2, messageID);
   if (!existsSync6(partDir)) {
     mkdirSync2(partDir, { recursive: true });
   }
@@ -4296,14 +4307,14 @@ function prependThinkingPart(sessionID, messageID) {
     synthetic: true
   };
   try {
-    writeFileSync2(join8(partDir, `${partId}.json`), JSON.stringify(part, null, 2));
+    writeFileSync2(join9(partDir, `${partId}.json`), JSON.stringify(part, null, 2));
     return true;
   } catch {
     return false;
   }
 }
 function stripThinkingParts(messageID) {
-  const partDir = join8(PART_STORAGE2, messageID);
+  const partDir = join9(PART_STORAGE2, messageID);
   if (!existsSync6(partDir))
     return false;
   let anyRemoved = false;
@@ -4311,7 +4322,7 @@ function stripThinkingParts(messageID) {
     if (!file.endsWith(".json"))
       continue;
     try {
-      const filePath = join8(partDir, file);
+      const filePath = join9(partDir, file);
       const content = readFileSync3(filePath, "utf-8");
       const part = JSON.parse(content);
       if (THINKING_TYPES.has(part.type)) {
@@ -4325,7 +4336,7 @@ function stripThinkingParts(messageID) {
   return anyRemoved;
 }
 function replaceEmptyTextParts(messageID, replacementText) {
-  const partDir = join8(PART_STORAGE2, messageID);
+  const partDir = join9(PART_STORAGE2, messageID);
   if (!existsSync6(partDir))
     return false;
   let anyReplaced = false;
@@ -4333,7 +4344,7 @@ function replaceEmptyTextParts(messageID, replacementText) {
     if (!file.endsWith(".json"))
       continue;
     try {
-      const filePath = join8(partDir, file);
+      const filePath = join9(partDir, file);
       const content = readFileSync3(filePath, "utf-8");
       const part = JSON.parse(content);
       if (part.type === "text") {
@@ -4610,7 +4621,7 @@ function createSessionRecoveryHook(ctx, options) {
 // src/hooks/comment-checker/cli.ts
 var {spawn: spawn3 } = globalThis.Bun;
 import { createRequire as createRequire2 } from "module";
-import { dirname, join as join10 } from "path";
+import { dirname, join as join11 } from "path";
 import { existsSync as existsSync8 } from "fs";
 import * as fs3 from "fs";
 import { tmpdir as tmpdir3 } from "os";
@@ -4618,11 +4629,11 @@ import { tmpdir as tmpdir3 } from "os";
 // src/hooks/comment-checker/downloader.ts
 var {spawn: spawn2 } = globalThis.Bun;
 import { existsSync as existsSync7, mkdirSync as mkdirSync3, chmodSync, unlinkSync as unlinkSync2, appendFileSync as appendFileSync2 } from "fs";
-import { join as join9 } from "path";
+import { join as join10 } from "path";
 import { homedir as homedir4, tmpdir as tmpdir2 } from "os";
 import { createRequire } from "module";
 var DEBUG = process.env.COMMENT_CHECKER_DEBUG === "1";
-var DEBUG_FILE = join9(tmpdir2(), "comment-checker-debug.log");
+var DEBUG_FILE = join10(tmpdir2(), "comment-checker-debug.log");
 function debugLog(...args) {
   if (DEBUG) {
     const msg = `[${new Date().toISOString()}] [comment-checker:downloader] ${args.map((a) => typeof a === "object" ? JSON.stringify(a, null, 2) : String(a)).join(" ")}
@@ -4640,14 +4651,14 @@ var PLATFORM_MAP = {
 };
 function getCacheDir() {
   const xdgCache2 = process.env.XDG_CACHE_HOME;
-  const base = xdgCache2 || join9(homedir4(), ".cache");
-  return join9(base, "oh-my-opencode", "bin");
+  const base = xdgCache2 || join10(homedir4(), ".cache");
+  return join10(base, "oh-my-opencode", "bin");
 }
 function getBinaryName() {
   return process.platform === "win32" ? "comment-checker.exe" : "comment-checker";
 }
 function getCachedBinaryPath() {
-  const binaryPath = join9(getCacheDir(), getBinaryName());
+  const binaryPath = join10(getCacheDir(), getBinaryName());
   return existsSync7(binaryPath) ? binaryPath : null;
 }
 function getPackageVersion() {
@@ -4695,14 +4706,14 @@ async function downloadCommentChecker() {
   }
   const cacheDir = getCacheDir();
   const binaryName = getBinaryName();
-  const binaryPath = join9(cacheDir, binaryName);
+  const binaryPath = join10(cacheDir, binaryName);
   if (existsSync7(binaryPath)) {
     debugLog("Binary already cached at:", binaryPath);
     return binaryPath;
   }
   const version = getPackageVersion();
-  const { os: os4, arch, ext } = platformInfo;
-  const assetName = `comment-checker_v${version}_${os4}_${arch}.${ext}`;
+  const { os: os5, arch, ext } = platformInfo;
+  const assetName = `comment-checker_v${version}_${os5}_${arch}.${ext}`;
   const downloadUrl = `https://github.com/${REPO}/releases/download/v${version}/${assetName}`;
   debugLog(`Downloading from: ${downloadUrl}`);
   console.log(`[oh-my-opencode] Downloading comment-checker binary...`);
@@ -4714,7 +4725,7 @@ async function downloadCommentChecker() {
     if (!response.ok) {
       throw new Error(`HTTP ${response.status}: ${response.statusText}`);
     }
-    const archivePath = join9(cacheDir, assetName);
+    const archivePath = join10(cacheDir, assetName);
     const arrayBuffer = await response.arrayBuffer();
     await Bun.write(archivePath, arrayBuffer);
     debugLog(`Downloaded archive to: ${archivePath}`);
@@ -4750,7 +4761,7 @@ async function ensureCommentCheckerBinary() {
 
 // src/hooks/comment-checker/cli.ts
 var DEBUG2 = process.env.COMMENT_CHECKER_DEBUG === "1";
-var DEBUG_FILE2 = join10(tmpdir3(), "comment-checker-debug.log");
+var DEBUG_FILE2 = join11(tmpdir3(), "comment-checker-debug.log");
 function debugLog2(...args) {
   if (DEBUG2) {
     const msg = `[${new Date().toISOString()}] [comment-checker:cli] ${args.map((a) => typeof a === "object" ? JSON.stringify(a, null, 2) : String(a)).join(" ")}
@@ -4767,7 +4778,7 @@ function findCommentCheckerPathSync() {
     const require2 = createRequire2(import.meta.url);
     const cliPkgPath = require2.resolve("@code-yeongyu/comment-checker/package.json");
     const cliDir = dirname(cliPkgPath);
-    const binaryPath = join10(cliDir, "bin", binaryName);
+    const binaryPath = join11(cliDir, "bin", binaryName);
     if (existsSync8(binaryPath)) {
       debugLog2("found binary in main package:", binaryPath);
       return binaryPath;
@@ -4814,8 +4825,8 @@ async function getCommentCheckerPath() {
 function startBackgroundInit() {
   if (!initPromise) {
     initPromise = getCommentCheckerPath();
-    initPromise.then((path4) => {
-      debugLog2("background init complete:", path4 || "no binary");
+    initPromise.then((path5) => {
+      debugLog2("background init complete:", path5 || "no binary");
     }).catch((err) => {
       debugLog2("background init error:", err);
     });
@@ -4864,9 +4875,9 @@ async function runCommentChecker(input, cliPath) {
 import * as fs4 from "fs";
 import { existsSync as existsSync9 } from "fs";
 import { tmpdir as tmpdir4 } from "os";
-import { join as join11 } from "path";
+import { join as join12 } from "path";
 var DEBUG3 = process.env.COMMENT_CHECKER_DEBUG === "1";
-var DEBUG_FILE3 = join11(tmpdir4(), "comment-checker-debug.log");
+var DEBUG_FILE3 = join12(tmpdir4(), "comment-checker-debug.log");
 function debugLog3(...args) {
   if (DEBUG3) {
     const msg = `[${new Date().toISOString()}] [comment-checker:hook] ${args.map((a) => typeof a === "object" ? JSON.stringify(a, null, 2) : String(a)).join(" ")}
@@ -4890,8 +4901,8 @@ function createCommentCheckerHooks() {
   debugLog3("createCommentCheckerHooks called");
   startBackgroundInit();
   cliPathPromise = getCommentCheckerPath();
-  cliPathPromise.then((path4) => {
-    debugLog3("CLI path resolved:", path4 || "disabled (no binary)");
+  cliPathPromise.then((path5) => {
+    debugLog3("CLI path resolved:", path5 || "disabled (no binary)");
   }).catch((err) => {
     debugLog3("CLI path resolution error:", err);
   });
@@ -4998,7 +5009,7 @@ var TRUNCATABLE_TOOLS = [
 ];
 function createToolOutputTruncatorHook(ctx, options) {
   const truncator = createDynamicTruncator(ctx);
-  const truncateAll = options?.experimental?.truncate_all_tool_outputs ?? false;
+  const truncateAll = options?.experimental?.truncate_all_tool_outputs ?? true;
   const toolExecuteAfter = async (input, output) => {
     if (!truncateAll && !TRUNCATABLE_TOOLS.includes(input.tool))
       return;
@@ -5015,7 +5026,7 @@ function createToolOutputTruncatorHook(ctx, options) {
 }
 // src/hooks/directory-agents-injector/index.ts
 import { existsSync as existsSync11, readFileSync as readFileSync5 } from "fs";
-import { dirname as dirname2, join as join14, resolve as resolve2 } from "path";
+import { dirname as dirname2, join as join15, resolve as resolve2 } from "path";
 
 // src/hooks/directory-agents-injector/storage.ts
 import {
@@ -5025,17 +5036,17 @@ import {
   writeFileSync as writeFileSync3,
   unlinkSync as unlinkSync3
 } from "fs";
-import { join as join13 } from "path";
+import { join as join14 } from "path";
 
 // src/hooks/directory-agents-injector/constants.ts
-import { join as join12 } from "path";
-var OPENCODE_STORAGE3 = join12(xdgData2 ?? "", "opencode", "storage");
-var AGENTS_INJECTOR_STORAGE = join12(OPENCODE_STORAGE3, "directory-agents");
+import { join as join13 } from "path";
+var OPENCODE_STORAGE3 = join13(xdgData ?? "", "opencode", "storage");
+var AGENTS_INJECTOR_STORAGE = join13(OPENCODE_STORAGE3, "directory-agents");
 var AGENTS_FILENAME = "AGENTS.md";
 
 // src/hooks/directory-agents-injector/storage.ts
 function getStoragePath(sessionID) {
-  return join13(AGENTS_INJECTOR_STORAGE, `${sessionID}.json`);
+  return join14(AGENTS_INJECTOR_STORAGE, `${sessionID}.json`);
 }
 function loadInjectedPaths(sessionID) {
   const filePath = getStoragePath(sessionID);
@@ -5077,18 +5088,18 @@ function createDirectoryAgentsInjectorHook(ctx) {
     }
     return sessionCaches.get(sessionID);
   }
-  function resolveFilePath2(path4) {
-    if (!path4)
+  function resolveFilePath2(path5) {
+    if (!path5)
       return null;
-    if (path4.startsWith("/"))
-      return path4;
-    return resolve2(ctx.directory, path4);
+    if (path5.startsWith("/"))
+      return path5;
+    return resolve2(ctx.directory, path5);
   }
   function findAgentsMdUp(startDir) {
     const found = [];
     let current = startDir;
     while (true) {
-      const agentsPath = join14(current, AGENTS_FILENAME);
+      const agentsPath = join15(current, AGENTS_FILENAME);
       if (existsSync11(agentsPath)) {
         found.push(agentsPath);
       }
@@ -5182,7 +5193,7 @@ ${content}`;
 }
 // src/hooks/directory-readme-injector/index.ts
 import { existsSync as existsSync13, readFileSync as readFileSync7 } from "fs";
-import { dirname as dirname3, join as join17, resolve as resolve3 } from "path";
+import { dirname as dirname3, join as join18, resolve as resolve3 } from "path";
 
 // src/hooks/directory-readme-injector/storage.ts
 import {
@@ -5192,17 +5203,17 @@ import {
   writeFileSync as writeFileSync4,
   unlinkSync as unlinkSync4
 } from "fs";
-import { join as join16 } from "path";
+import { join as join17 } from "path";
 
 // src/hooks/directory-readme-injector/constants.ts
-import { join as join15 } from "path";
-var OPENCODE_STORAGE4 = join15(xdgData2 ?? "", "opencode", "storage");
-var README_INJECTOR_STORAGE = join15(OPENCODE_STORAGE4, "directory-readme");
+import { join as join16 } from "path";
+var OPENCODE_STORAGE4 = join16(xdgData ?? "", "opencode", "storage");
+var README_INJECTOR_STORAGE = join16(OPENCODE_STORAGE4, "directory-readme");
 var README_FILENAME = "README.md";
 
 // src/hooks/directory-readme-injector/storage.ts
 function getStoragePath2(sessionID) {
-  return join16(README_INJECTOR_STORAGE, `${sessionID}.json`);
+  return join17(README_INJECTOR_STORAGE, `${sessionID}.json`);
 }
 function loadInjectedPaths2(sessionID) {
   const filePath = getStoragePath2(sessionID);
@@ -5244,18 +5255,18 @@ function createDirectoryReadmeInjectorHook(ctx) {
     }
     return sessionCaches.get(sessionID);
   }
-  function resolveFilePath2(path4) {
-    if (!path4)
+  function resolveFilePath2(path5) {
+    if (!path5)
       return null;
-    if (path4.startsWith("/"))
-      return path4;
-    return resolve3(ctx.directory, path4);
+    if (path5.startsWith("/"))
+      return path5;
+    return resolve3(ctx.directory, path5);
   }
   function findReadmeMdUp(startDir) {
     const found = [];
     let current = startDir;
     while (true) {
-      const readmePath = join17(current, README_FILENAME);
+      const readmePath = join18(current, README_FILENAME);
       if (existsSync13(readmePath)) {
         found.push(readmePath);
       }
@@ -5553,26 +5564,26 @@ var TRUNCATE_CONFIG = {
 // src/hooks/anthropic-auto-compact/storage.ts
 import { existsSync as existsSync14, readdirSync as readdirSync4, readFileSync as readFileSync8, writeFileSync as writeFileSync5 } from "fs";
 import { homedir as homedir5 } from "os";
-import { join as join18 } from "path";
-var OPENCODE_STORAGE5 = join18(xdgData2 ?? "", "opencode", "storage");
+import { join as join19 } from "path";
+var OPENCODE_STORAGE5 = join19(xdgData ?? "", "opencode", "storage");
 if (process.platform === "darwin" && !existsSync14(OPENCODE_STORAGE5)) {
-  const localShare = join18(homedir5(), ".local", "share", "opencode", "storage");
+  const localShare = join19(homedir5(), ".local", "share", "opencode", "storage");
   if (existsSync14(localShare)) {
     OPENCODE_STORAGE5 = localShare;
   }
 }
-var MESSAGE_STORAGE3 = join18(OPENCODE_STORAGE5, "message");
-var PART_STORAGE3 = join18(OPENCODE_STORAGE5, "part");
+var MESSAGE_STORAGE3 = join19(OPENCODE_STORAGE5, "message");
+var PART_STORAGE3 = join19(OPENCODE_STORAGE5, "part");
 var TRUNCATION_MESSAGE = "[TOOL RESULT TRUNCATED - Context limit exceeded. Original output was too large and has been truncated to recover the session. Please re-run this tool if you need the full output.]";
 function getMessageDir3(sessionID) {
   if (!existsSync14(MESSAGE_STORAGE3))
     return "";
-  const directPath = join18(MESSAGE_STORAGE3, sessionID);
+  const directPath = join19(MESSAGE_STORAGE3, sessionID);
   if (existsSync14(directPath)) {
     return directPath;
   }
   for (const dir of readdirSync4(MESSAGE_STORAGE3)) {
-    const sessionPath = join18(MESSAGE_STORAGE3, dir, sessionID);
+    const sessionPath = join19(MESSAGE_STORAGE3, dir, sessionID);
     if (existsSync14(sessionPath)) {
       return sessionPath;
     }
@@ -5596,14 +5607,14 @@ function findToolResultsBySize(sessionID) {
   const messageIds = getMessageIds(sessionID);
   const results = [];
   for (const messageID of messageIds) {
-    const partDir = join18(PART_STORAGE3, messageID);
+    const partDir = join19(PART_STORAGE3, messageID);
     if (!existsSync14(partDir))
       continue;
     for (const file of readdirSync4(partDir)) {
       if (!file.endsWith(".json"))
         continue;
       try {
-        const partPath = join18(partDir, file);
+        const partPath = join19(partDir, file);
         const content = readFileSync8(partPath, "utf-8");
         const part = JSON.parse(content);
         if (part.type === "tool" && part.state?.output && !part.truncated) {
@@ -6211,7 +6222,7 @@ function createAnthropicAutoCompactHook(ctx, options) {
 }
 // src/hooks/preemptive-compaction/index.ts
 import { existsSync as existsSync15, readdirSync as readdirSync5 } from "fs";
-import { join as join19 } from "path";
+import { join as join20 } from "path";
 
 // src/hooks/preemptive-compaction/constants.ts
 var DEFAULT_THRESHOLD = 0.85;
@@ -6227,11 +6238,11 @@ function isSupportedModel(modelID) {
 function getMessageDir4(sessionID) {
   if (!existsSync15(MESSAGE_STORAGE))
     return null;
-  const directPath = join19(MESSAGE_STORAGE, sessionID);
+  const directPath = join20(MESSAGE_STORAGE, sessionID);
   if (existsSync15(directPath))
     return directPath;
   for (const dir of readdirSync5(MESSAGE_STORAGE)) {
-    const sessionPath = join19(MESSAGE_STORAGE, dir, sessionID);
+    const sessionPath = join20(MESSAGE_STORAGE, dir, sessionID);
     if (existsSync15(sessionPath))
       return sessionPath;
   }
@@ -6717,7 +6728,7 @@ function createThinkModeHook() {
 }
 // src/hooks/claude-code-hooks/config.ts
 import { homedir as homedir6 } from "os";
-import { join as join20 } from "path";
+import { join as join21 } from "path";
 import { existsSync as existsSync16 } from "fs";
 function normalizeHookMatcher(raw) {
   return {
@@ -6744,9 +6755,9 @@ function normalizeHooksConfig(raw) {
 function getClaudeSettingsPaths(customPath) {
   const home = homedir6();
   const paths = [
-    join20(home, ".claude", "settings.json"),
-    join20(process.cwd(), ".claude", "settings.json"),
-    join20(process.cwd(), ".claude", "settings.local.json")
+    join21(home, ".claude", "settings.json"),
+    join21(process.cwd(), ".claude", "settings.json"),
+    join21(process.cwd(), ".claude", "settings.local.json")
   ];
   if (customPath && existsSync16(customPath)) {
     paths.unshift(customPath);
@@ -6792,20 +6803,20 @@ async function loadClaudeHooksConfig(customSettingsPath) {
 // src/hooks/claude-code-hooks/config-loader.ts
 import { existsSync as existsSync17 } from "fs";
 import { homedir as homedir7 } from "os";
-import { join as join21 } from "path";
-var USER_CONFIG_PATH = join21(homedir7(), ".config", "opencode", "opencode-cc-plugin.json");
+import { join as join22 } from "path";
+var USER_CONFIG_PATH = join22(homedir7(), ".config", "opencode", "opencode-cc-plugin.json");
 function getProjectConfigPath() {
-  return join21(process.cwd(), ".opencode", "opencode-cc-plugin.json");
+  return join22(process.cwd(), ".opencode", "opencode-cc-plugin.json");
 }
-async function loadConfigFromPath(path4) {
-  if (!existsSync17(path4)) {
+async function loadConfigFromPath(path5) {
+  if (!existsSync17(path5)) {
     return null;
   }
   try {
-    const content = await Bun.file(path4).text();
+    const content = await Bun.file(path5).text();
     return JSON.parse(content);
   } catch (error) {
-    log("Failed to load config", { path: path4, error });
+    log("Failed to load config", { path: path5, error });
     return null;
   }
 }
@@ -6978,13 +6989,13 @@ async function executePreToolUseHooks(ctx, config, extendedConfig) {
 }
 
 // src/hooks/claude-code-hooks/transcript.ts
-import { join as join22 } from "path";
+import { join as join23 } from "path";
 import { mkdirSync as mkdirSync6, appendFileSync as appendFileSync5, existsSync as existsSync18, writeFileSync as writeFileSync6, unlinkSync as unlinkSync5 } from "fs";
 import { homedir as homedir8, tmpdir as tmpdir5 } from "os";
 import { randomUUID } from "crypto";
-var TRANSCRIPT_DIR = join22(homedir8(), ".claude", "transcripts");
+var TRANSCRIPT_DIR = join23(homedir8(), ".claude", "transcripts");
 function getTranscriptPath(sessionId) {
-  return join22(TRANSCRIPT_DIR, `${sessionId}.jsonl`);
+  return join23(TRANSCRIPT_DIR, `${sessionId}.jsonl`);
 }
 function ensureTranscriptDir() {
   if (!existsSync18(TRANSCRIPT_DIR)) {
@@ -6993,10 +7004,10 @@ function ensureTranscriptDir() {
 }
 function appendTranscriptEntry(sessionId, entry) {
   ensureTranscriptDir();
-  const path4 = getTranscriptPath(sessionId);
+  const path5 = getTranscriptPath(sessionId);
   const line = JSON.stringify(entry) + `
 `;
-  appendFileSync5(path4, line);
+  appendFileSync5(path5, line);
 }
 function recordToolUse(sessionId, toolName, toolInput) {
   appendTranscriptEntry(sessionId, {
@@ -7074,7 +7085,7 @@ async function buildTranscriptFromSession(client, sessionId, directory, currentT
       }
     };
     entries.push(JSON.stringify(currentEntry));
-    const tempPath = join22(tmpdir5(), `opencode-transcript-${sessionId}-${randomUUID()}.jsonl`);
+    const tempPath = join23(tmpdir5(), `opencode-transcript-${sessionId}-${randomUUID()}.jsonl`);
     writeFileSync6(tempPath, entries.join(`
 `) + `
 `);
@@ -7094,7 +7105,7 @@ async function buildTranscriptFromSession(client, sessionId, directory, currentT
           ]
         }
       };
-      const tempPath = join22(tmpdir5(), `opencode-transcript-${sessionId}-${randomUUID()}.jsonl`);
+      const tempPath = join23(tmpdir5(), `opencode-transcript-${sessionId}-${randomUUID()}.jsonl`);
       writeFileSync6(tempPath, JSON.stringify(currentEntry) + `
 `);
       return tempPath;
@@ -7103,11 +7114,11 @@ async function buildTranscriptFromSession(client, sessionId, directory, currentT
     }
   }
 }
-function deleteTempTranscript(path4) {
-  if (!path4)
+function deleteTempTranscript(path5) {
+  if (!path5)
     return;
   try {
-    unlinkSync5(path4);
+    unlinkSync5(path5);
   } catch {}
 }
 
@@ -7306,11 +7317,11 @@ ${USER_PROMPT_SUBMIT_TAG_CLOSE}`);
 }
 
 // src/hooks/claude-code-hooks/todo.ts
-import { join as join23 } from "path";
+import { join as join24 } from "path";
 import { homedir as homedir9 } from "os";
-var TODO_DIR = join23(homedir9(), ".claude", "todos");
+var TODO_DIR = join24(homedir9(), ".claude", "todos");
 function getTodoPath(sessionId) {
-  return join23(TODO_DIR, `${sessionId}-agent-${sessionId}.json`);
+  return join24(TODO_DIR, `${sessionId}-agent-${sessionId}.json`);
 }
 
 // src/hooks/claude-code-hooks/stop.ts
@@ -7745,12 +7756,12 @@ import {
   realpathSync,
   statSync as statSync2
 } from "fs";
-import { dirname as dirname4, join as join25, relative } from "path";
+import { dirname as dirname4, join as join26, relative } from "path";
 
 // src/hooks/rules-injector/constants.ts
-import { join as join24 } from "path";
-var OPENCODE_STORAGE6 = join24(xdgData2 ?? "", "opencode", "storage");
-var RULES_INJECTOR_STORAGE = join24(OPENCODE_STORAGE6, "rules-injector");
+import { join as join25 } from "path";
+var OPENCODE_STORAGE6 = join25(xdgData ?? "", "opencode", "storage");
+var RULES_INJECTOR_STORAGE = join25(OPENCODE_STORAGE6, "rules-injector");
 var PROJECT_MARKERS = [
   ".git",
   "pyproject.toml",
@@ -7777,7 +7788,7 @@ function findProjectRoot(startPath) {
   }
   while (true) {
     for (const marker of PROJECT_MARKERS) {
-      const markerPath = join25(current, marker);
+      const markerPath = join26(current, marker);
       if (existsSync19(markerPath)) {
         return current;
       }
@@ -7795,7 +7806,7 @@ function findRuleFilesRecursive(dir, results) {
   try {
     const entries = readdirSync6(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join25(dir, entry.name);
+      const fullPath = join26(dir, entry.name);
       if (entry.isDirectory()) {
         findRuleFilesRecursive(fullPath, results);
       } else if (entry.isFile()) {
@@ -7821,7 +7832,7 @@ function findRuleFiles(projectRoot, homeDir, currentFile) {
   let distance = 0;
   while (true) {
     for (const [parent, subdir] of PROJECT_RULE_SUBDIRS) {
-      const ruleDir = join25(currentDir, parent, subdir);
+      const ruleDir = join26(currentDir, parent, subdir);
       const files = [];
       findRuleFilesRecursive(ruleDir, files);
       for (const filePath of files) {
@@ -7845,7 +7856,7 @@ function findRuleFiles(projectRoot, homeDir, currentFile) {
     currentDir = parentDir;
     distance++;
   }
-  const userRuleDir = join25(homeDir, USER_RULE_DIR);
+  const userRuleDir = join26(homeDir, USER_RULE_DIR);
   const userFiles = [];
   findRuleFilesRecursive(userRuleDir, userFiles);
   for (const filePath of userFiles) {
@@ -8040,9 +8051,9 @@ import {
   writeFileSync as writeFileSync7,
   unlinkSync as unlinkSync6
 } from "fs";
-import { join as join26 } from "path";
+import { join as join27 } from "path";
 function getStoragePath3(sessionID) {
-  return join26(RULES_INJECTOR_STORAGE, `${sessionID}.json`);
+  return join27(RULES_INJECTOR_STORAGE, `${sessionID}.json`);
 }
 function loadInjectedRules(sessionID) {
   const filePath = getStoragePath3(sessionID);
@@ -8089,12 +8100,12 @@ function createRulesInjectorHook(ctx) {
     }
     return sessionCaches.get(sessionID);
   }
-  function resolveFilePath2(path4) {
-    if (!path4)
+  function resolveFilePath2(path5) {
+    if (!path5)
       return null;
-    if (path4.startsWith("/"))
-      return path4;
-    return resolve4(ctx.directory, path4);
+    if (path5.startsWith("/"))
+      return path5;
+    return resolve4(ctx.directory, path5);
   }
   function processFilePathForInjection(filePath, sessionID, output) {
     const resolved = resolveFilePath2(filePath);
@@ -8213,33 +8224,33 @@ function createBackgroundNotificationHook(manager) {
 }
 // src/hooks/auto-update-checker/checker.ts
 import * as fs5 from "fs";
-import * as path5 from "path";
+import * as path6 from "path";
 import { fileURLToPath } from "url";
 
 // src/hooks/auto-update-checker/constants.ts
-import * as path4 from "path";
-import * as os4 from "os";
+import * as path5 from "path";
+import * as os5 from "os";
 var PACKAGE_NAME = "oh-my-opencode";
 var NPM_REGISTRY_URL = `https://registry.npmjs.org/-/package/${PACKAGE_NAME}/dist-tags`;
 var NPM_FETCH_TIMEOUT = 5000;
 function getCacheDir2() {
   if (process.platform === "win32") {
-    return path4.join(process.env.LOCALAPPDATA ?? os4.homedir(), "opencode");
+    return path5.join(process.env.LOCALAPPDATA ?? os5.homedir(), "opencode");
   }
-  return path4.join(os4.homedir(), ".cache", "opencode");
+  return path5.join(os5.homedir(), ".cache", "opencode");
 }
 var CACHE_DIR = getCacheDir2();
-var VERSION_FILE = path4.join(CACHE_DIR, "version");
-var INSTALLED_PACKAGE_JSON = path4.join(CACHE_DIR, "node_modules", PACKAGE_NAME, "package.json");
+var VERSION_FILE = path5.join(CACHE_DIR, "version");
+var INSTALLED_PACKAGE_JSON = path5.join(CACHE_DIR, "node_modules", PACKAGE_NAME, "package.json");
 function getUserConfigDir2() {
   if (process.platform === "win32") {
-    return process.env.APPDATA ?? path4.join(os4.homedir(), "AppData", "Roaming");
+    return process.env.APPDATA ?? path5.join(os5.homedir(), "AppData", "Roaming");
   }
-  return process.env.XDG_CONFIG_HOME ?? path4.join(os4.homedir(), ".config");
+  return process.env.XDG_CONFIG_HOME ?? path5.join(os5.homedir(), ".config");
 }
 var USER_CONFIG_DIR = getUserConfigDir2();
-var USER_OPENCODE_CONFIG = path4.join(USER_CONFIG_DIR, "opencode", "opencode.json");
-var USER_OPENCODE_CONFIG_JSONC = path4.join(USER_CONFIG_DIR, "opencode", "opencode.jsonc");
+var USER_OPENCODE_CONFIG = path5.join(USER_CONFIG_DIR, "opencode", "opencode.json");
+var USER_OPENCODE_CONFIG_JSONC = path5.join(USER_CONFIG_DIR, "opencode", "opencode.jsonc");
 
 // src/hooks/auto-update-checker/checker.ts
 function stripJsonComments(json) {
@@ -8247,8 +8258,8 @@ function stripJsonComments(json) {
 }
 function getConfigPaths(directory) {
   return [
-    path5.join(directory, ".opencode", "opencode.json"),
-    path5.join(directory, ".opencode", "opencode.jsonc"),
+    path6.join(directory, ".opencode", "opencode.json"),
+    path6.join(directory, ".opencode", "opencode.jsonc"),
     USER_OPENCODE_CONFIG,
     USER_OPENCODE_CONFIG_JSONC
   ];
@@ -8279,9 +8290,9 @@ function getLocalDevPath(directory) {
 function findPackageJsonUp(startPath) {
   try {
     const stat = fs5.statSync(startPath);
-    let dir = stat.isDirectory() ? startPath : path5.dirname(startPath);
+    let dir = stat.isDirectory() ? startPath : path6.dirname(startPath);
     for (let i = 0;i < 10; i++) {
-      const pkgPath = path5.join(dir, "package.json");
+      const pkgPath = path6.join(dir, "package.json");
       if (fs5.existsSync(pkgPath)) {
         try {
           const content = fs5.readFileSync(pkgPath, "utf-8");
@@ -8290,7 +8301,7 @@ function findPackageJsonUp(startPath) {
             return pkgPath;
         } catch {}
       }
-      const parent = path5.dirname(dir);
+      const parent = path6.dirname(dir);
       if (parent === dir)
         break;
       dir = parent;
@@ -8347,7 +8358,7 @@ function getCachedVersion() {
     }
   } catch {}
   try {
-    const currentDir = path5.dirname(fileURLToPath(import.meta.url));
+    const currentDir = path6.dirname(fileURLToPath(import.meta.url));
     const pkgPath = findPackageJsonUp(currentDir);
     if (pkgPath) {
       const content = fs5.readFileSync(pkgPath, "utf-8");
@@ -8423,12 +8434,12 @@ async function getLatestVersion() {
 
 // src/hooks/auto-update-checker/cache.ts
 import * as fs6 from "fs";
-import * as path6 from "path";
+import * as path7 from "path";
 function stripTrailingCommas(json) {
   return json.replace(/,(\s*[}\]])/g, "$1");
 }
 function removeFromBunLock(packageName) {
-  const lockPath = path6.join(CACHE_DIR, "bun.lock");
+  const lockPath = path7.join(CACHE_DIR, "bun.lock");
   if (!fs6.existsSync(lockPath))
     return false;
   try {
@@ -8454,8 +8465,8 @@ function removeFromBunLock(packageName) {
 }
 function invalidatePackage(packageName = PACKAGE_NAME) {
   try {
-    const pkgDir = path6.join(CACHE_DIR, "node_modules", packageName);
-    const pkgJsonPath = path6.join(CACHE_DIR, "package.json");
+    const pkgDir = path7.join(CACHE_DIR, "node_modules", packageName);
+    const pkgJsonPath = path7.join(CACHE_DIR, "package.json");
     let packageRemoved = false;
     let dependencyRemoved = false;
     let lockRemoved = false;
@@ -8649,12 +8660,12 @@ import {
   writeFileSync as writeFileSync10,
   unlinkSync as unlinkSync7
 } from "fs";
-import { join as join31 } from "path";
+import { join as join32 } from "path";
 
 // src/hooks/agent-usage-reminder/constants.ts
-import { join as join30 } from "path";
-var OPENCODE_STORAGE7 = join30(xdgData2 ?? "", "opencode", "storage");
-var AGENT_USAGE_REMINDER_STORAGE = join30(OPENCODE_STORAGE7, "agent-usage-reminder");
+import { join as join31 } from "path";
+var OPENCODE_STORAGE7 = join31(xdgData ?? "", "opencode", "storage");
+var AGENT_USAGE_REMINDER_STORAGE = join31(OPENCODE_STORAGE7, "agent-usage-reminder");
 var TARGET_TOOLS = new Set([
   "grep",
   "safe_grep",
@@ -8699,7 +8710,7 @@ ALWAYS prefer: Multiple parallel background_task calls > Direct tool calls
 
 // src/hooks/agent-usage-reminder/storage.ts
 function getStoragePath4(sessionID) {
-  return join31(AGENT_USAGE_REMINDER_STORAGE, `${sessionID}.json`);
+  return join32(AGENT_USAGE_REMINDER_STORAGE, `${sessionID}.json`);
 }
 function loadAgentUsageState(sessionID) {
   const filePath = getStoragePath4(sessionID);
@@ -9021,12 +9032,12 @@ import {
   writeFileSync as writeFileSync11,
   unlinkSync as unlinkSync8
 } from "fs";
-import { join as join33 } from "path";
+import { join as join34 } from "path";
 
 // src/hooks/interactive-bash-session/constants.ts
-import { join as join32 } from "path";
-var OPENCODE_STORAGE8 = join32(xdgData2 ?? "", "opencode", "storage");
-var INTERACTIVE_BASH_SESSION_STORAGE = join32(OPENCODE_STORAGE8, "interactive-bash-session");
+import { join as join33 } from "path";
+var OPENCODE_STORAGE8 = join33(xdgData ?? "", "opencode", "storage");
+var INTERACTIVE_BASH_SESSION_STORAGE = join33(OPENCODE_STORAGE8, "interactive-bash-session");
 var OMO_SESSION_PREFIX = "omo-";
 function buildSessionReminderMessage(sessions) {
   if (sessions.length === 0)
@@ -9038,7 +9049,7 @@ function buildSessionReminderMessage(sessions) {
 
 // src/hooks/interactive-bash-session/storage.ts
 function getStoragePath5(sessionID) {
-  return join33(INTERACTIVE_BASH_SESSION_STORAGE, `${sessionID}.json`);
+  return join34(INTERACTIVE_BASH_SESSION_STORAGE, `${sessionID}.json`);
 }
 function loadInteractiveBashSessionState(sessionID) {
   const filePath = getStoragePath5(sessionID);
@@ -11016,7 +11027,7 @@ async function createGoogleAntigravityAuthPlugin({
 // src/features/claude-code-command-loader/loader.ts
 import { existsSync as existsSync25, readdirSync as readdirSync7, readFileSync as readFileSync15 } from "fs";
 import { homedir as homedir12 } from "os";
-import { join as join34, basename } from "path";
+import { join as join35, basename } from "path";
 function loadCommandsFromDir(commandsDir, scope) {
   if (!existsSync25(commandsDir)) {
     return [];
@@ -11026,7 +11037,7 @@ function loadCommandsFromDir(commandsDir, scope) {
   for (const entry of entries) {
     if (!isMarkdownFile(entry))
       continue;
-    const commandPath = join34(commandsDir, entry.name);
+    const commandPath = join35(commandsDir, entry.name);
     const commandName = basename(entry.name, ".md");
     try {
       const content = readFileSync15(commandPath, "utf-8");
@@ -11069,29 +11080,29 @@ function commandsToRecord(commands) {
   return result;
 }
 function loadUserCommands() {
-  const userCommandsDir = join34(homedir12(), ".claude", "commands");
+  const userCommandsDir = join35(homedir12(), ".claude", "commands");
   const commands = loadCommandsFromDir(userCommandsDir, "user");
   return commandsToRecord(commands);
 }
 function loadProjectCommands() {
-  const projectCommandsDir = join34(process.cwd(), ".claude", "commands");
+  const projectCommandsDir = join35(process.cwd(), ".claude", "commands");
   const commands = loadCommandsFromDir(projectCommandsDir, "project");
   return commandsToRecord(commands);
 }
 function loadOpencodeGlobalCommands() {
-  const opencodeCommandsDir = join34(homedir12(), ".config", "opencode", "command");
+  const opencodeCommandsDir = join35(homedir12(), ".config", "opencode", "command");
   const commands = loadCommandsFromDir(opencodeCommandsDir, "opencode");
   return commandsToRecord(commands);
 }
 function loadOpencodeProjectCommands() {
-  const opencodeProjectDir = join34(process.cwd(), ".opencode", "command");
+  const opencodeProjectDir = join35(process.cwd(), ".opencode", "command");
   const commands = loadCommandsFromDir(opencodeProjectDir, "opencode-project");
   return commandsToRecord(commands);
 }
 // src/features/claude-code-skill-loader/loader.ts
 import { existsSync as existsSync26, readdirSync as readdirSync8, readFileSync as readFileSync16 } from "fs";
 import { homedir as homedir13 } from "os";
-import { join as join35 } from "path";
+import { join as join36 } from "path";
 function loadSkillsFromDir(skillsDir, scope) {
   if (!existsSync26(skillsDir)) {
     return [];
@@ -11101,11 +11112,11 @@ function loadSkillsFromDir(skillsDir, scope) {
   for (const entry of entries) {
     if (entry.name.startsWith("."))
       continue;
-    const skillPath = join35(skillsDir, entry.name);
+    const skillPath = join36(skillsDir, entry.name);
     if (!entry.isDirectory() && !entry.isSymbolicLink())
       continue;
     const resolvedPath = resolveSymlink(skillPath);
-    const skillMdPath = join35(resolvedPath, "SKILL.md");
+    const skillMdPath = join36(resolvedPath, "SKILL.md");
     if (!existsSync26(skillMdPath))
       continue;
     try {
@@ -11143,7 +11154,7 @@ $ARGUMENTS
   return skills;
 }
 function loadUserSkillsAsCommands() {
-  const userSkillsDir = join35(homedir13(), ".claude", "skills");
+  const userSkillsDir = join36(homedir13(), ".claude", "skills");
   const skills = loadSkillsFromDir(userSkillsDir, "user");
   return skills.reduce((acc, skill) => {
     acc[skill.name] = skill.definition;
@@ -11151,7 +11162,7 @@ function loadUserSkillsAsCommands() {
   }, {});
 }
 function loadProjectSkillsAsCommands() {
-  const projectSkillsDir = join35(process.cwd(), ".claude", "skills");
+  const projectSkillsDir = join36(process.cwd(), ".claude", "skills");
   const skills = loadSkillsFromDir(projectSkillsDir, "project");
   return skills.reduce((acc, skill) => {
     acc[skill.name] = skill.definition;
@@ -11161,7 +11172,7 @@ function loadProjectSkillsAsCommands() {
 // src/features/claude-code-agent-loader/loader.ts
 import { existsSync as existsSync27, readdirSync as readdirSync9, readFileSync as readFileSync17 } from "fs";
 import { homedir as homedir14 } from "os";
-import { join as join36, basename as basename2 } from "path";
+import { join as join37, basename as basename2 } from "path";
 function parseToolsConfig(toolsStr) {
   if (!toolsStr)
     return;
@@ -11183,7 +11194,7 @@ function loadAgentsFromDir(agentsDir, scope) {
   for (const entry of entries) {
     if (!isMarkdownFile(entry))
       continue;
-    const agentPath = join36(agentsDir, entry.name);
+    const agentPath = join37(agentsDir, entry.name);
     const agentName = basename2(entry.name, ".md");
     try {
       const content = readFileSync17(agentPath, "utf-8");
@@ -11213,7 +11224,7 @@ function loadAgentsFromDir(agentsDir, scope) {
   return agents;
 }
 function loadUserAgents() {
-  const userAgentsDir = join36(homedir14(), ".claude", "agents");
+  const userAgentsDir = join37(homedir14(), ".claude", "agents");
   const agents = loadAgentsFromDir(userAgentsDir, "user");
   const result = {};
   for (const agent of agents) {
@@ -11222,7 +11233,7 @@ function loadUserAgents() {
   return result;
 }
 function loadProjectAgents() {
-  const projectAgentsDir = join36(process.cwd(), ".claude", "agents");
+  const projectAgentsDir = join37(process.cwd(), ".claude", "agents");
   const agents = loadAgentsFromDir(projectAgentsDir, "project");
   const result = {};
   for (const agent of agents) {
@@ -11233,7 +11244,7 @@ function loadProjectAgents() {
 // src/features/claude-code-mcp-loader/loader.ts
 import { existsSync as existsSync28 } from "fs";
 import { homedir as homedir15 } from "os";
-import { join as join37 } from "path";
+import { join as join38 } from "path";
 
 // src/features/claude-code-mcp-loader/env-expander.ts
 function expandEnvVars(value) {
@@ -11302,9 +11313,9 @@ function getMcpConfigPaths() {
   const home = homedir15();
   const cwd = process.cwd();
   return [
-    { path: join37(home, ".claude", ".mcp.json"), scope: "user" },
-    { path: join37(cwd, ".mcp.json"), scope: "project" },
-    { path: join37(cwd, ".claude", ".mcp.json"), scope: "local" }
+    { path: join38(home, ".claude", ".mcp.json"), scope: "user" },
+    { path: join38(cwd, ".mcp.json"), scope: "project" },
+    { path: join38(cwd, ".claude", ".mcp.json"), scope: "local" }
   ];
 }
 async function loadMcpConfigFile(filePath) {
@@ -11323,13 +11334,13 @@ async function loadMcpConfigs() {
   const servers = {};
   const loadedServers = [];
   const paths = getMcpConfigPaths();
-  for (const { path: path7, scope } of paths) {
-    const config = await loadMcpConfigFile(path7);
+  for (const { path: path8, scope } of paths) {
+    const config = await loadMcpConfigFile(path8);
     if (!config?.mcpServers)
       continue;
     for (const [name, serverConfig] of Object.entries(config.mcpServers)) {
       if (serverConfig.disabled) {
-        log(`Skipping disabled MCP server "${name}"`, { path: path7 });
+        log(`Skipping disabled MCP server "${name}"`, { path: path8 });
         continue;
       }
       try {
@@ -11340,7 +11351,7 @@ async function loadMcpConfigs() {
           loadedServers.splice(existingIndex, 1);
         }
         loadedServers.push({ name, scope, config: transformed });
-        log(`Loaded MCP server "${name}" from ${scope}`, { path: path7 });
+        log(`Loaded MCP server "${name}" from ${scope}`, { path: path8 });
       } catch (error) {
         log(`Failed to transform MCP server "${name}"`, error);
       }
@@ -11644,13 +11655,13 @@ var EXT_TO_LANG = {
 };
 // src/tools/lsp/config.ts
 import { existsSync as existsSync29, readFileSync as readFileSync18 } from "fs";
-import { join as join38 } from "path";
+import { join as join39 } from "path";
 import { homedir as homedir16 } from "os";
-function loadJsonFile(path7) {
-  if (!existsSync29(path7))
+function loadJsonFile(path8) {
+  if (!existsSync29(path8))
     return null;
   try {
-    return JSON.parse(readFileSync18(path7, "utf-8"));
+    return JSON.parse(readFileSync18(path8, "utf-8"));
   } catch {
     return null;
   }
@@ -11658,9 +11669,9 @@ function loadJsonFile(path7) {
 function getConfigPaths2() {
   const cwd = process.cwd();
   return {
-    project: join38(cwd, ".opencode", "oh-my-opencode.json"),
-    user: join38(homedir16(), ".config", "opencode", "oh-my-opencode.json"),
-    opencode: join38(homedir16(), ".config", "opencode", "opencode.json")
+    project: join39(cwd, ".opencode", "oh-my-opencode.json"),
+    user: join39(homedir16(), ".config", "opencode", "oh-my-opencode.json"),
+    opencode: join39(homedir16(), ".config", "opencode", "opencode.json")
   };
 }
 function loadAllConfigs() {
@@ -11756,18 +11767,18 @@ function isServerInstalled(command) {
   const pathSeparator = isWindows2 ? ";" : ":";
   const paths = pathEnv.split(pathSeparator);
   for (const p of paths) {
-    if (existsSync29(join38(p, cmd)) || existsSync29(join38(p, cmd + ext))) {
+    if (existsSync29(join39(p, cmd)) || existsSync29(join39(p, cmd + ext))) {
       return true;
     }
   }
   const cwd = process.cwd();
   const additionalPaths = [
-    join38(cwd, "node_modules", ".bin", cmd),
-    join38(cwd, "node_modules", ".bin", cmd + ext),
-    join38(homedir16(), ".config", "opencode", "bin", cmd),
-    join38(homedir16(), ".config", "opencode", "bin", cmd + ext),
-    join38(homedir16(), ".config", "opencode", "node_modules", ".bin", cmd),
-    join38(homedir16(), ".config", "opencode", "node_modules", ".bin", cmd + ext)
+    join39(cwd, "node_modules", ".bin", cmd),
+    join39(cwd, "node_modules", ".bin", cmd + ext),
+    join39(homedir16(), ".config", "opencode", "bin", cmd),
+    join39(homedir16(), ".config", "opencode", "bin", cmd + ext),
+    join39(homedir16(), ".config", "opencode", "node_modules", ".bin", cmd),
+    join39(homedir16(), ".config", "opencode", "node_modules", ".bin", cmd + ext)
   ];
   for (const p of additionalPaths) {
     if (existsSync29(p)) {
@@ -13379,10 +13390,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path7) {
-  if (!path7)
+function getElementAtPath(obj, path8) {
+  if (!path8)
     return obj;
-  return path7.reduce((acc, key) => acc?.[key], obj);
+  return path8.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -13741,11 +13752,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path7, issues) {
+function prefixIssues(path8, issues) {
   return issues.map((iss) => {
     var _a;
     (_a = iss).path ?? (_a.path = []);
-    iss.path.unshift(path7);
+    iss.path.unshift(path8);
     return iss;
   });
 }
@@ -13913,7 +13924,7 @@ function treeifyError(error, _mapper) {
     return issue2.message;
   };
   const result = { errors: [] };
-  const processError = (error2, path7 = []) => {
+  const processError = (error2, path8 = []) => {
     var _a, _b;
     for (const issue2 of error2.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
@@ -13923,7 +13934,7 @@ function treeifyError(error, _mapper) {
       } else if (issue2.code === "invalid_element") {
         processError({ issues: issue2.issues }, issue2.path);
       } else {
-        const fullpath = [...path7, ...issue2.path];
+        const fullpath = [...path8, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -13955,8 +13966,8 @@ function treeifyError(error, _mapper) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path7 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path7) {
+  const path8 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path8) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -25299,13 +25310,13 @@ var lsp_code_action_resolve = tool({
 });
 // src/tools/ast-grep/constants.ts
 import { createRequire as createRequire4 } from "module";
-import { dirname as dirname6, join as join40 } from "path";
+import { dirname as dirname6, join as join41 } from "path";
 import { existsSync as existsSync32, statSync as statSync4 } from "fs";
 
 // src/tools/ast-grep/downloader.ts
 var {spawn: spawn5 } = globalThis.Bun;
 import { existsSync as existsSync31, mkdirSync as mkdirSync10, chmodSync as chmodSync2, unlinkSync as unlinkSync9 } from "fs";
-import { join as join39 } from "path";
+import { join as join40 } from "path";
 import { homedir as homedir17 } from "os";
 import { createRequire as createRequire3 } from "module";
 var REPO2 = "ast-grep/ast-grep";
@@ -25331,18 +25342,18 @@ var PLATFORM_MAP2 = {
 function getCacheDir3() {
   if (process.platform === "win32") {
     const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
-    const base2 = localAppData || join39(homedir17(), "AppData", "Local");
-    return join39(base2, "oh-my-opencode", "bin");
+    const base2 = localAppData || join40(homedir17(), "AppData", "Local");
+    return join40(base2, "oh-my-opencode", "bin");
   }
   const xdgCache2 = process.env.XDG_CACHE_HOME;
-  const base = xdgCache2 || join39(homedir17(), ".cache");
-  return join39(base, "oh-my-opencode", "bin");
+  const base = xdgCache2 || join40(homedir17(), ".cache");
+  return join40(base, "oh-my-opencode", "bin");
 }
 function getBinaryName3() {
   return process.platform === "win32" ? "sg.exe" : "sg";
 }
 function getCachedBinaryPath2() {
-  const binaryPath = join39(getCacheDir3(), getBinaryName3());
+  const binaryPath = join40(getCacheDir3(), getBinaryName3());
   return existsSync31(binaryPath) ? binaryPath : null;
 }
 async function extractZip2(archivePath, destDir) {
@@ -25369,12 +25380,12 @@ async function downloadAstGrep(version2 = DEFAULT_VERSION) {
   }
   const cacheDir = getCacheDir3();
   const binaryName = getBinaryName3();
-  const binaryPath = join39(cacheDir, binaryName);
+  const binaryPath = join40(cacheDir, binaryName);
   if (existsSync31(binaryPath)) {
     return binaryPath;
   }
-  const { arch, os: os5 } = platformInfo;
-  const assetName = `app-${arch}-${os5}.zip`;
+  const { arch, os: os6 } = platformInfo;
+  const assetName = `app-${arch}-${os6}.zip`;
   const downloadUrl = `https://github.com/${REPO2}/releases/download/${version2}/${assetName}`;
   console.log(`[oh-my-opencode] Downloading ast-grep binary...`);
   try {
@@ -25385,7 +25396,7 @@ async function downloadAstGrep(version2 = DEFAULT_VERSION) {
     if (!response2.ok) {
       throw new Error(`HTTP ${response2.status}: ${response2.statusText}`);
     }
-    const archivePath = join39(cacheDir, assetName);
+    const archivePath = join40(cacheDir, assetName);
     const arrayBuffer = await response2.arrayBuffer();
     await Bun.write(archivePath, arrayBuffer);
     await extractZip2(archivePath, cacheDir);
@@ -25443,7 +25454,7 @@ function findSgCliPathSync() {
     const require2 = createRequire4(import.meta.url);
     const cliPkgPath = require2.resolve("@ast-grep/cli/package.json");
     const cliDir = dirname6(cliPkgPath);
-    const sgPath = join40(cliDir, binaryName);
+    const sgPath = join41(cliDir, binaryName);
     if (existsSync32(sgPath) && isValidBinary(sgPath)) {
       return sgPath;
     }
@@ -25455,7 +25466,7 @@ function findSgCliPathSync() {
       const pkgPath = require2.resolve(`${platformPkg}/package.json`);
       const pkgDir = dirname6(pkgPath);
       const astGrepName = process.platform === "win32" ? "ast-grep.exe" : "ast-grep";
-      const binaryPath = join40(pkgDir, astGrepName);
+      const binaryPath = join41(pkgDir, astGrepName);
       if (existsSync32(binaryPath) && isValidBinary(binaryPath)) {
         return binaryPath;
       }
@@ -25463,9 +25474,9 @@ function findSgCliPathSync() {
   }
   if (process.platform === "darwin") {
     const homebrewPaths = ["/opt/homebrew/bin/sg", "/usr/local/bin/sg"];
-    for (const path7 of homebrewPaths) {
-      if (existsSync32(path7) && isValidBinary(path7)) {
-        return path7;
+    for (const path8 of homebrewPaths) {
+      if (existsSync32(path8) && isValidBinary(path8)) {
+        return path8;
       }
     }
   }
@@ -25483,8 +25494,8 @@ function getSgCliPath() {
   }
   return "sg";
 }
-function setSgCliPath(path7) {
-  resolvedCliPath2 = path7;
+function setSgCliPath(path8) {
+  resolvedCliPath2 = path8;
 }
 var SG_CLI_PATH = getSgCliPath();
 var CLI_LANGUAGES = [
@@ -25831,19 +25842,19 @@ var {spawn: spawn7 } = globalThis.Bun;
 
 // src/tools/grep/constants.ts
 import { existsSync as existsSync35 } from "fs";
-import { join as join42, dirname as dirname7 } from "path";
+import { join as join43, dirname as dirname7 } from "path";
 import { spawnSync } from "child_process";
 
 // src/tools/grep/downloader.ts
 import { existsSync as existsSync34, mkdirSync as mkdirSync11, chmodSync as chmodSync3, unlinkSync as unlinkSync10, readdirSync as readdirSync10 } from "fs";
-import { join as join41 } from "path";
+import { join as join42 } from "path";
 function getInstallDir() {
   const homeDir = process.env.HOME || process.env.USERPROFILE || ".";
-  return join41(homeDir, ".cache", "oh-my-opencode", "bin");
+  return join42(homeDir, ".cache", "oh-my-opencode", "bin");
 }
 function getRgPath() {
   const isWindows2 = process.platform === "win32";
-  return join41(getInstallDir(), isWindows2 ? "rg.exe" : "rg");
+  return join42(getInstallDir(), isWindows2 ? "rg.exe" : "rg");
 }
 function getInstalledRipgrepPath() {
   const rgPath = getRgPath();
@@ -25870,10 +25881,10 @@ function getOpenCodeBundledRg() {
   const isWindows2 = process.platform === "win32";
   const rgName = isWindows2 ? "rg.exe" : "rg";
   const candidates = [
-    join42(execDir, rgName),
-    join42(execDir, "bin", rgName),
-    join42(execDir, "..", "bin", rgName),
-    join42(execDir, "..", "libexec", rgName)
+    join43(execDir, rgName),
+    join43(execDir, "bin", rgName),
+    join43(execDir, "..", "bin", rgName),
+    join43(execDir, "..", "libexec", rgName)
   ];
   for (const candidate of candidates) {
     if (existsSync35(candidate)) {
@@ -26281,7 +26292,7 @@ var glob = tool({
 // src/tools/slashcommand/tools.ts
 import { existsSync as existsSync36, readdirSync as readdirSync11, readFileSync as readFileSync21 } from "fs";
 import { homedir as homedir18 } from "os";
-import { join as join43, basename as basename3, dirname as dirname8 } from "path";
+import { join as join44, basename as basename3, dirname as dirname8 } from "path";
 function discoverCommandsFromDir(commandsDir, scope) {
   if (!existsSync36(commandsDir)) {
     return [];
@@ -26291,7 +26302,7 @@ function discoverCommandsFromDir(commandsDir, scope) {
   for (const entry of entries) {
     if (!isMarkdownFile(entry))
       continue;
-    const commandPath = join43(commandsDir, entry.name);
+    const commandPath = join44(commandsDir, entry.name);
     const commandName = basename3(entry.name, ".md");
     try {
       const content = readFileSync21(commandPath, "utf-8");
@@ -26319,10 +26330,10 @@ function discoverCommandsFromDir(commandsDir, scope) {
   return commands;
 }
 function discoverCommandsSync() {
-  const userCommandsDir = join43(homedir18(), ".claude", "commands");
-  const projectCommandsDir = join43(process.cwd(), ".claude", "commands");
-  const opencodeGlobalDir = join43(homedir18(), ".config", "opencode", "command");
-  const opencodeProjectDir = join43(process.cwd(), ".opencode", "command");
+  const userCommandsDir = join44(homedir18(), ".claude", "commands");
+  const projectCommandsDir = join44(process.cwd(), ".claude", "commands");
+  const opencodeGlobalDir = join44(homedir18(), ".config", "opencode", "command");
+  const opencodeProjectDir = join44(process.cwd(), ".opencode", "command");
   const userCommands = discoverCommandsFromDir(userCommandsDir, "user");
   const opencodeGlobalCommands = discoverCommandsFromDir(opencodeGlobalDir, "opencode");
   const projectCommands = discoverCommandsFromDir(projectCommandsDir, "project");
@@ -26445,6 +26456,484 @@ Provide a command name to execute.`;
 Try a different command name.`;
   }
 });
+// src/tools/session-manager/constants.ts
+import { join as join45 } from "path";
+import { homedir as homedir19 } from "os";
+var OPENCODE_STORAGE9 = getOpenCodeStorageDir();
+var MESSAGE_STORAGE4 = join45(OPENCODE_STORAGE9, "message");
+var PART_STORAGE4 = join45(OPENCODE_STORAGE9, "part");
+var TODO_DIR2 = join45(homedir19(), ".claude", "todos");
+var TRANSCRIPT_DIR2 = join45(homedir19(), ".claude", "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.
+
+Arguments:
+- limit (optional): Maximum number of sessions to return
+- from_date (optional): Filter sessions from this date (ISO 8601 format)
+- to_date (optional): Filter sessions until this date (ISO 8601 format)
+
+Example output:
+| Session ID | Messages | First | Last | Agents |
+|------------|----------|-------|------|--------|
+| ses_abc123 | 45 | 2025-12-20 | 2025-12-24 | build, oracle |
+| ses_def456 | 12 | 2025-12-19 | 2025-12-19 | build |`;
+var SESSION_READ_DESCRIPTION = `Read messages and history from an OpenCode session.
+
+Returns a formatted view of session messages with role, timestamp, and content. Optionally includes todos and transcript data.
+
+Arguments:
+- session_id (required): Session ID to read
+- include_todos (optional): Include todo list if available (default: false)
+- include_transcript (optional): Include transcript log if available (default: false)
+- limit (optional): Maximum number of messages to return (default: all)
+
+Example output:
+Session: ses_abc123
+Messages: 45
+Date Range: 2025-12-20 to 2025-12-24
+
+[Message 1] user (2025-12-20 10:30:00)
+Hello, can you help me with...
+
+[Message 2] assistant (2025-12-20 10:30:15)
+Of course! Let me help you with...`;
+var SESSION_SEARCH_DESCRIPTION = `Search for content within OpenCode session messages.
+
+Performs full-text search across session messages and returns matching excerpts with context.
+
+Arguments:
+- query (required): Search query string
+- session_id (optional): Search within specific session only (default: all sessions)
+- case_sensitive (optional): Case-sensitive search (default: false)
+- limit (optional): Maximum number of results to return (default: 20)
+
+Example output:
+Found 3 matches across 2 sessions:
+
+[ses_abc123] Message msg_001 (user)
+...implement the **session manager** tool...
+
+[ses_abc123] Message msg_005 (assistant)
+...I'll create a **session manager** with full search...
+
+[ses_def456] Message msg_012 (user)
+...use the **session manager** to find...`;
+var SESSION_INFO_DESCRIPTION = `Get metadata and statistics about an OpenCode session.
+
+Returns detailed information about a session including message count, date range, agents used, and available data sources.
+
+Arguments:
+- session_id (required): Session ID to inspect
+
+Example output:
+Session ID: ses_abc123
+Messages: 45
+Date Range: 2025-12-20 10:30:00 to 2025-12-24 15:45:30
+Duration: 4 days, 5 hours
+Agents Used: build, oracle, librarian
+Has Todos: Yes (12 items, 8 completed)
+Has Transcript: Yes (234 entries)`;
+
+// src/tools/session-manager/storage.ts
+import { existsSync as existsSync37, readdirSync as readdirSync12, readFileSync as readFileSync22 } from "fs";
+import { join as join46 } from "path";
+function getAllSessions() {
+  if (!existsSync37(MESSAGE_STORAGE4))
+    return [];
+  const sessions = [];
+  function scanDirectory(dir) {
+    try {
+      for (const entry of readdirSync12(dir, { withFileTypes: true })) {
+        if (entry.isDirectory()) {
+          const sessionPath = join46(dir, entry.name);
+          const files = readdirSync12(sessionPath);
+          if (files.some((f) => f.endsWith(".json"))) {
+            sessions.push(entry.name);
+          } else {
+            scanDirectory(sessionPath);
+          }
+        }
+      }
+    } catch {
+      return;
+    }
+  }
+  scanDirectory(MESSAGE_STORAGE4);
+  return [...new Set(sessions)];
+}
+function getMessageDir5(sessionID) {
+  if (!existsSync37(MESSAGE_STORAGE4))
+    return "";
+  const directPath = join46(MESSAGE_STORAGE4, sessionID);
+  if (existsSync37(directPath)) {
+    return directPath;
+  }
+  for (const dir of readdirSync12(MESSAGE_STORAGE4)) {
+    const sessionPath = join46(MESSAGE_STORAGE4, dir, sessionID);
+    if (existsSync37(sessionPath)) {
+      return sessionPath;
+    }
+  }
+  return "";
+}
+function sessionExists(sessionID) {
+  return getMessageDir5(sessionID) !== "";
+}
+function readSessionMessages(sessionID) {
+  const messageDir = getMessageDir5(sessionID);
+  if (!messageDir || !existsSync37(messageDir))
+    return [];
+  const messages = [];
+  for (const file2 of readdirSync12(messageDir)) {
+    if (!file2.endsWith(".json"))
+      continue;
+    try {
+      const content = readFileSync22(join46(messageDir, file2), "utf-8");
+      const meta = JSON.parse(content);
+      const parts = readParts2(meta.id);
+      messages.push({
+        id: meta.id,
+        role: meta.role,
+        agent: meta.agent,
+        time: meta.time,
+        parts
+      });
+    } catch {
+      continue;
+    }
+  }
+  return messages.sort((a, b) => {
+    const aTime = a.time?.created ?? 0;
+    const bTime = b.time?.created ?? 0;
+    if (aTime !== bTime)
+      return aTime - bTime;
+    return a.id.localeCompare(b.id);
+  });
+}
+function readParts2(messageID) {
+  const partDir = join46(PART_STORAGE4, messageID);
+  if (!existsSync37(partDir))
+    return [];
+  const parts = [];
+  for (const file2 of readdirSync12(partDir)) {
+    if (!file2.endsWith(".json"))
+      continue;
+    try {
+      const content = readFileSync22(join46(partDir, file2), "utf-8");
+      parts.push(JSON.parse(content));
+    } catch {
+      continue;
+    }
+  }
+  return parts.sort((a, b) => a.id.localeCompare(b.id));
+}
+function readSessionTodos(sessionID) {
+  if (!existsSync37(TODO_DIR2))
+    return [];
+  const todoFiles = readdirSync12(TODO_DIR2).filter((f) => f.includes(sessionID) && f.endsWith(".json"));
+  for (const file2 of todoFiles) {
+    try {
+      const content = readFileSync22(join46(TODO_DIR2, file2), "utf-8");
+      const data = JSON.parse(content);
+      if (Array.isArray(data)) {
+        return data.map((item) => ({
+          id: item.id || "",
+          content: item.content || "",
+          status: item.status || "pending",
+          priority: item.priority
+        }));
+      }
+    } catch {
+      continue;
+    }
+  }
+  return [];
+}
+function readSessionTranscript(sessionID) {
+  if (!existsSync37(TRANSCRIPT_DIR2))
+    return 0;
+  const transcriptFile = join46(TRANSCRIPT_DIR2, `${sessionID}.jsonl`);
+  if (!existsSync37(transcriptFile))
+    return 0;
+  try {
+    const content = readFileSync22(transcriptFile, "utf-8");
+    return content.trim().split(`
+`).filter(Boolean).length;
+  } catch {
+    return 0;
+  }
+}
+function getSessionInfo(sessionID) {
+  const messages = readSessionMessages(sessionID);
+  if (messages.length === 0)
+    return null;
+  const agentsUsed = new Set;
+  let firstMessage;
+  let lastMessage;
+  for (const msg of messages) {
+    if (msg.agent)
+      agentsUsed.add(msg.agent);
+    if (msg.time?.created) {
+      const date5 = new Date(msg.time.created);
+      if (!firstMessage || date5 < firstMessage)
+        firstMessage = date5;
+      if (!lastMessage || date5 > lastMessage)
+        lastMessage = date5;
+    }
+  }
+  const todos = readSessionTodos(sessionID);
+  const transcriptEntries = readSessionTranscript(sessionID);
+  return {
+    id: sessionID,
+    message_count: messages.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
+  };
+}
+
+// src/tools/session-manager/utils.ts
+function formatSessionList(sessionIDs) {
+  if (sessionIDs.length === 0) {
+    return "No sessions found.";
+  }
+  const infos = sessionIDs.map((id) => getSessionInfo(id)).filter((info) => info !== null);
+  if (infos.length === 0) {
+    return "No valid sessions found.";
+  }
+  const headers = ["Session ID", "Messages", "First", "Last", "Agents"];
+  const rows = infos.map((info) => [
+    info.id,
+    info.message_count.toString(),
+    info.first_message?.toISOString().split("T")[0] ?? "N/A",
+    info.last_message?.toISOString().split("T")[0] ?? "N/A",
+    info.agents_used.join(", ") || "none"
+  ]);
+  const colWidths = headers.map((h, i) => Math.max(h.length, ...rows.map((r) => r[i].length)));
+  const formatRow = (cells) => {
+    return "| " + cells.map((cell, i) => cell.padEnd(colWidths[i])).join(" | ").trim() + " |";
+  };
+  const separator = "|" + colWidths.map((w) => "-".repeat(w + 2)).join("|") + "|";
+  return [formatRow(headers), separator, ...rows.map(formatRow)].join(`
+`);
+}
+function formatSessionMessages(messages, includeTodos, todos) {
+  if (messages.length === 0) {
+    return "No messages found in this session.";
+  }
+  const lines = [];
+  for (const msg of messages) {
+    const timestamp = msg.time?.created ? new Date(msg.time.created).toISOString() : "Unknown time";
+    const agent = msg.agent ? ` (${msg.agent})` : "";
+    lines.push(`
+[${msg.role}${agent}] ${timestamp}`);
+    for (const part of msg.parts) {
+      if (part.type === "text" && part.text) {
+        lines.push(part.text.trim());
+      } else if (part.type === "thinking" && part.thinking) {
+        lines.push(`[thinking] ${part.thinking.substring(0, 200)}...`);
+      } else if ((part.type === "tool_use" || part.type === "tool") && part.tool) {
+        const input = part.input ? JSON.stringify(part.input).substring(0, 100) : "";
+        lines.push(`[tool: ${part.tool}] ${input}`);
+      } else if (part.type === "tool_result") {
+        const output = part.output ? part.output.substring(0, 200) : "";
+        lines.push(`[tool result] ${output}...`);
+      }
+    }
+  }
+  if (includeTodos && todos && todos.length > 0) {
+    lines.push(`
+
+=== Todos ===`);
+    for (const todo of todos) {
+      const status = todo.status === "completed" ? "\u2713" : todo.status === "in_progress" ? "\u2192" : "\u25CB";
+      lines.push(`${status} [${todo.status}] ${todo.content}`);
+    }
+  }
+  return lines.join(`
+`);
+}
+function formatSessionInfo(info) {
+  const lines = [
+    `Session ID: ${info.id}`,
+    `Messages: ${info.message_count}`,
+    `Date Range: ${info.first_message?.toISOString() ?? "N/A"} to ${info.last_message?.toISOString() ?? "N/A"}`,
+    `Agents Used: ${info.agents_used.join(", ") || "none"}`,
+    `Has Todos: ${info.has_todos ? `Yes (${info.todos?.length ?? 0} items)` : "No"}`,
+    `Has Transcript: ${info.has_transcript ? `Yes (${info.transcript_entries} entries)` : "No"}`
+  ];
+  if (info.first_message && info.last_message) {
+    const duration3 = info.last_message.getTime() - info.first_message.getTime();
+    const days = Math.floor(duration3 / (1000 * 60 * 60 * 24));
+    const hours = Math.floor(duration3 % (1000 * 60 * 60 * 24) / (1000 * 60 * 60));
+    if (days > 0 || hours > 0) {
+      lines.push(`Duration: ${days} days, ${hours} hours`);
+    }
+  }
+  return lines.join(`
+`);
+}
+function formatSearchResults(results) {
+  if (results.length === 0) {
+    return "No matches found.";
+  }
+  const lines = [`Found ${results.length} matches:
+`];
+  for (const result of results) {
+    const timestamp = result.timestamp ? new Date(result.timestamp).toISOString() : "";
+    lines.push(`[${result.session_id}] ${result.message_id} (${result.role}) ${timestamp}`);
+    lines.push(`  ${result.excerpt}`);
+    lines.push(`  Matches: ${result.match_count}
+`);
+  }
+  return lines.join(`
+`);
+}
+function filterSessionsByDate(sessionIDs, fromDate, toDate) {
+  if (!fromDate && !toDate)
+    return sessionIDs;
+  const from = fromDate ? new Date(fromDate) : null;
+  const to = toDate ? new Date(toDate) : null;
+  return sessionIDs.filter((id) => {
+    const info = getSessionInfo(id);
+    if (!info || !info.last_message)
+      return false;
+    if (from && info.last_message < from)
+      return false;
+    if (to && info.last_message > to)
+      return false;
+    return true;
+  });
+}
+function searchInSession(sessionID, query, caseSensitive = false) {
+  const messages = readSessionMessages(sessionID);
+  const results = [];
+  const searchQuery = caseSensitive ? query : query.toLowerCase();
+  for (const msg of messages) {
+    let matchCount = 0;
+    let excerpts = [];
+    for (const part of msg.parts) {
+      if (part.type === "text" && part.text) {
+        const text = caseSensitive ? part.text : part.text.toLowerCase();
+        const matches = text.split(searchQuery).length - 1;
+        if (matches > 0) {
+          matchCount += matches;
+          const index = text.indexOf(searchQuery);
+          if (index !== -1) {
+            const start = Math.max(0, index - 50);
+            const end = Math.min(text.length, index + searchQuery.length + 50);
+            let excerpt = part.text.substring(start, end);
+            if (start > 0)
+              excerpt = "..." + excerpt;
+            if (end < text.length)
+              excerpt = excerpt + "...";
+            excerpts.push(excerpt);
+          }
+        }
+      }
+    }
+    if (matchCount > 0) {
+      results.push({
+        session_id: sessionID,
+        message_id: msg.id,
+        role: msg.role,
+        excerpt: excerpts[0] || "",
+        match_count: matchCount,
+        timestamp: msg.time?.created
+      });
+    }
+  }
+  return results;
+}
+
+// src/tools/session-manager/tools.ts
+var session_list = tool({
+  description: SESSION_LIST_DESCRIPTION,
+  args: {
+    limit: tool.schema.number().optional().describe("Maximum number of sessions to return"),
+    from_date: tool.schema.string().optional().describe("Filter sessions from this date (ISO 8601 format)"),
+    to_date: tool.schema.string().optional().describe("Filter sessions until this date (ISO 8601 format)")
+  },
+  execute: async (args, _context) => {
+    try {
+      let sessions = getAllSessions();
+      if (args.from_date || args.to_date) {
+        sessions = filterSessionsByDate(sessions, args.from_date, args.to_date);
+      }
+      if (args.limit && args.limit > 0) {
+        sessions = sessions.slice(0, args.limit);
+      }
+      return formatSessionList(sessions);
+    } catch (e) {
+      return `Error: ${e instanceof Error ? e.message : String(e)}`;
+    }
+  }
+});
+var session_read = tool({
+  description: SESSION_READ_DESCRIPTION,
+  args: {
+    session_id: tool.schema.string().describe("Session ID to read"),
+    include_todos: tool.schema.boolean().optional().describe("Include todo list if available (default: false)"),
+    include_transcript: tool.schema.boolean().optional().describe("Include transcript log if available (default: false)"),
+    limit: tool.schema.number().optional().describe("Maximum number of messages to return (default: all)")
+  },
+  execute: async (args, _context) => {
+    try {
+      if (!sessionExists(args.session_id)) {
+        return `Session not found: ${args.session_id}`;
+      }
+      let messages = readSessionMessages(args.session_id);
+      if (args.limit && args.limit > 0) {
+        messages = messages.slice(0, args.limit);
+      }
+      const todos = args.include_todos ? readSessionTodos(args.session_id) : undefined;
+      return formatSessionMessages(messages, args.include_todos, todos);
+    } catch (e) {
+      return `Error: ${e instanceof Error ? e.message : String(e)}`;
+    }
+  }
+});
+var session_search = tool({
+  description: SESSION_SEARCH_DESCRIPTION,
+  args: {
+    query: tool.schema.string().describe("Search query string"),
+    session_id: tool.schema.string().optional().describe("Search within specific session only (default: all sessions)"),
+    case_sensitive: tool.schema.boolean().optional().describe("Case-sensitive search (default: false)"),
+    limit: tool.schema.number().optional().describe("Maximum number of results to return (default: 20)")
+  },
+  execute: async (args, _context) => {
+    try {
+      const sessions = args.session_id ? [args.session_id] : getAllSessions();
+      const allResults = sessions.flatMap((sid) => searchInSession(sid, args.query, args.case_sensitive));
+      const limited = args.limit && args.limit > 0 ? allResults.slice(0, args.limit) : allResults.slice(0, 20);
+      return formatSearchResults(limited);
+    } catch (e) {
+      return `Error: ${e instanceof Error ? e.message : String(e)}`;
+    }
+  }
+});
+var session_info = tool({
+  description: SESSION_INFO_DESCRIPTION,
+  args: {
+    session_id: tool.schema.string().describe("Session ID to inspect")
+  },
+  execute: async (args, _context) => {
+    try {
+      const info = getSessionInfo(args.session_id);
+      if (!info) {
+        return `Session not found: ${args.session_id}`;
+      }
+      return formatSessionInfo(info);
+    } catch (e) {
+      return `Error: ${e instanceof Error ? e.message : String(e)}`;
+    }
+  }
+});
 // src/tools/interactive-bash/constants.ts
 var DEFAULT_TIMEOUT_MS4 = 60000;
 var BLOCKED_TMUX_SUBCOMMANDS = [
@@ -26478,12 +26967,12 @@ async function findTmuxPath() {
       return null;
     }
     const stdout = await new Response(proc.stdout).text();
-    const path7 = stdout.trim().split(`
+    const path8 = stdout.trim().split(`
 `)[0];
-    if (!path7) {
+    if (!path8) {
       return null;
     }
-    const verifyProc = spawn9([path7, "-V"], {
+    const verifyProc = spawn9([path8, "-V"], {
       stdout: "pipe",
       stderr: "pipe"
     });
@@ -26491,7 +26980,7 @@ async function findTmuxPath() {
     if (verifyExitCode !== 0) {
       return null;
     }
-    return path7;
+    return path8;
   } catch {
     return null;
   }
@@ -26504,9 +26993,9 @@ async function getTmuxPath() {
     return initPromise3;
   }
   initPromise3 = (async () => {
-    const path7 = await findTmuxPath();
-    tmuxPath = path7;
-    return path7;
+    const path8 = await findTmuxPath();
+    tmuxPath = path8;
+    return path8;
   })();
   return initPromise3;
 }
@@ -27145,20 +27634,24 @@ var builtinTools = {
   ast_grep_replace,
   grep,
   glob,
-  slashcommand
+  slashcommand,
+  session_list,
+  session_read,
+  session_search,
+  session_info
 };
 // src/features/background-agent/manager.ts
-import { existsSync as existsSync37, readdirSync as readdirSync12 } from "fs";
-import { join as join44 } from "path";
-function getMessageDir5(sessionID) {
-  if (!existsSync37(MESSAGE_STORAGE))
+import { existsSync as existsSync38, readdirSync as readdirSync13 } from "fs";
+import { join as join47 } from "path";
+function getMessageDir6(sessionID) {
+  if (!existsSync38(MESSAGE_STORAGE))
     return null;
-  const directPath = join44(MESSAGE_STORAGE, sessionID);
-  if (existsSync37(directPath))
+  const directPath = join47(MESSAGE_STORAGE, sessionID);
+  if (existsSync38(directPath))
     return directPath;
-  for (const dir of readdirSync12(MESSAGE_STORAGE)) {
-    const sessionPath = join44(MESSAGE_STORAGE, dir, sessionID);
-    if (existsSync37(sessionPath))
+  for (const dir of readdirSync13(MESSAGE_STORAGE)) {
+    const sessionPath = join47(MESSAGE_STORAGE, dir, sessionID);
+    if (existsSync38(sessionPath))
       return sessionPath;
   }
   return null;
@@ -27394,7 +27887,7 @@ class BackgroundManager {
     log("[background-agent] Sending notification to parent session:", { parentSessionID: task.parentSessionID });
     setTimeout(async () => {
       try {
-        const messageDir = getMessageDir5(task.parentSessionID);
+        const messageDir = getMessageDir6(task.parentSessionID);
         const prevMessage = messageDir ? findNearestMessageWithFields(messageDir) : null;
         await this.client.session.prompt({
           path: { id: task.parentSessionID },
@@ -27562,6 +28055,7 @@ var OverridableAgentNameSchema = exports_external.enum([
   "build",
   "plan",
   "Sisyphus",
+  "Builder-Sisyphus",
   "Planner-Sisyphus",
   "oracle",
   "librarian",
@@ -27610,6 +28104,7 @@ var AgentOverridesSchema = exports_external.object({
   build: AgentOverrideConfigSchema.optional(),
   plan: AgentOverrideConfigSchema.optional(),
   Sisyphus: AgentOverrideConfigSchema.optional(),
+  "Builder-Sisyphus": AgentOverrideConfigSchema.optional(),
   "Planner-Sisyphus": AgentOverrideConfigSchema.optional(),
   oracle: AgentOverrideConfigSchema.optional(),
   librarian: AgentOverrideConfigSchema.optional(),
@@ -27626,14 +28121,18 @@ var ClaudeCodeConfigSchema = exports_external.object({
   hooks: exports_external.boolean().optional()
 });
 var SisyphusAgentConfigSchema = exports_external.object({
-  disabled: exports_external.boolean().optional()
+  disabled: exports_external.boolean().optional(),
+  builder_enabled: exports_external.boolean().optional(),
+  planner_enabled: exports_external.boolean().optional(),
+  replace_build: exports_external.boolean().optional(),
+  replace_plan: exports_external.boolean().optional()
 });
 var ExperimentalConfigSchema = exports_external.object({
   aggressive_truncation: exports_external.boolean().optional(),
   auto_resume: exports_external.boolean().optional(),
   preemptive_compaction: exports_external.boolean().optional(),
   preemptive_compaction_threshold: exports_external.number().min(0.5).max(0.95).optional(),
-  truncate_all_tool_outputs: exports_external.boolean().optional()
+  truncate_all_tool_outputs: exports_external.boolean().default(true)
 });
 var OhMyOpenCodeConfigSchema = exports_external.object({
   $schema: exports_external.string().optional(),
@@ -27718,9 +28217,53 @@ var PLAN_PERMISSION = {
   webfetch: "allow"
 };
 
+// src/agents/build-prompt.ts
+var BUILD_SYSTEM_PROMPT = `<system-reminder>
+# Build Mode - System Reminder
+
+BUILD MODE ACTIVE - you are in EXECUTION phase. Your responsibility is to:
+- Implement features and make code changes
+- Execute commands and run tests
+- Fix bugs and refactor code
+- Deploy and build systems
+- Make all necessary file modifications
+
+You have FULL permissions to edit files, run commands, and make system changes.
+This is the implementation phase - execute decisively and thoroughly.
+
+---
+
+## Responsibility
+
+Your current responsibility is to implement, build, and execute. You should:
+- Write and modify code to accomplish the user's goals
+- Run tests and builds to verify your changes
+- Fix errors and issues that arise
+- Use all available tools to complete the task efficiently
+- Delegate to specialized agents when appropriate for better results
+
+**NOTE:** You should ask the user for clarification when requirements are ambiguous,
+but once the path is clear, execute confidently. The goal is to deliver working,
+tested, production-ready solutions.
+
+---
+
+## Important
+
+The user wants you to execute and implement. You SHOULD make edits, run necessary
+tools, and make changes to accomplish the task. Use your full capabilities to
+deliver excellent results.
+</system-reminder>
+`;
+var BUILD_PERMISSION = {
+  edit: "ask",
+  bash: "ask",
+  webfetch: "allow"
+};
+
 // src/index.ts
 import * as fs7 from "fs";
-import * as path7 from "path";
+import * as path8 from "path";
 var AGENT_NAME_MAP = {
   omo: "Sisyphus",
   OmO: "Sisyphus",
@@ -27823,8 +28366,8 @@ function mergeConfigs(base, override) {
   };
 }
 function loadPluginConfig(directory) {
-  const userConfigPath = path7.join(getUserConfigDir(), "opencode", "oh-my-opencode.json");
-  const projectConfigPath = path7.join(directory, ".opencode", "oh-my-opencode.json");
+  const userConfigPath = path8.join(getUserConfigDir(), "opencode", "oh-my-opencode.json");
+  const projectConfigPath = path8.join(directory, ".opencode", "oh-my-opencode.json");
   let config3 = loadConfigFromPath2(userConfigPath) ?? {};
   const projectConfig = loadConfigFromPath2(projectConfigPath);
   if (projectConfig) {
@@ -27934,26 +28477,46 @@ var OhMyOpenCodePlugin = async (ctx) => {
       const userAgents = pluginConfig.claude_code?.agents ?? true ? loadUserAgents() : {};
       const projectAgents = pluginConfig.claude_code?.agents ?? true ? loadProjectAgents() : {};
       const isSisyphusEnabled = pluginConfig.sisyphus_agent?.disabled !== true;
+      const builderEnabled = pluginConfig.sisyphus_agent?.builder_enabled ?? false;
+      const plannerEnabled = pluginConfig.sisyphus_agent?.planner_enabled ?? true;
+      const replaceBuild = pluginConfig.sisyphus_agent?.replace_build ?? true;
+      const replacePlan = pluginConfig.sisyphus_agent?.replace_plan ?? true;
       if (isSisyphusEnabled && builtinAgents.Sisyphus) {
-        const { name: _planName, ...planConfigWithoutName } = config3.agent?.plan ?? {};
-        const plannerSisyphusOverride = pluginConfig.agents?.["Planner-Sisyphus"];
-        const plannerSisyphusBase = {
-          ...planConfigWithoutName,
-          prompt: PLAN_SYSTEM_PROMPT,
-          permission: PLAN_PERMISSION,
-          description: `${config3.agent?.plan?.description ?? "Plan agent"} (OhMyOpenCode version)`,
-          color: config3.agent?.plan?.color ?? "#6495ED"
+        const agentConfig = {
+          Sisyphus: builtinAgents.Sisyphus
         };
-        const plannerSisyphusConfig = plannerSisyphusOverride ? { ...plannerSisyphusBase, ...plannerSisyphusOverride } : plannerSisyphusBase;
+        if (builderEnabled) {
+          const { name: _buildName, ...buildConfigWithoutName } = config3.agent?.build ?? {};
+          const builderSisyphusOverride = pluginConfig.agents?.["Builder-Sisyphus"];
+          const builderSisyphusBase = {
+            ...buildConfigWithoutName,
+            prompt: BUILD_SYSTEM_PROMPT,
+            permission: BUILD_PERMISSION,
+            description: `${config3.agent?.build?.description ?? "Build agent"} (OhMyOpenCode version)`,
+            color: config3.agent?.build?.color ?? "#32CD32"
+          };
+          agentConfig["Builder-Sisyphus"] = builderSisyphusOverride ? { ...builderSisyphusBase, ...builderSisyphusOverride } : builderSisyphusBase;
+        }
+        if (plannerEnabled) {
+          const { name: _planName, ...planConfigWithoutName } = config3.agent?.plan ?? {};
+          const plannerSisyphusOverride = pluginConfig.agents?.["Planner-Sisyphus"];
+          const plannerSisyphusBase = {
+            ...planConfigWithoutName,
+            prompt: PLAN_SYSTEM_PROMPT,
+            permission: PLAN_PERMISSION,
+            description: `${config3.agent?.plan?.description ?? "Plan agent"} (OhMyOpenCode version)`,
+            color: config3.agent?.plan?.color ?? "#6495ED"
+          };
+          agentConfig["Planner-Sisyphus"] = plannerSisyphusOverride ? { ...plannerSisyphusBase, ...plannerSisyphusOverride } : plannerSisyphusBase;
+        }
         config3.agent = {
-          Sisyphus: builtinAgents.Sisyphus,
-          "Planner-Sisyphus": plannerSisyphusConfig,
+          ...agentConfig,
           ...Object.fromEntries(Object.entries(builtinAgents).filter(([k]) => k !== "Sisyphus")),
           ...userAgents,
           ...projectAgents,
           ...config3.agent,
-          build: { ...config3.agent?.build, mode: "subagent" },
-          plan: { ...config3.agent?.plan, mode: "subagent" }
+          ...replaceBuild ? { build: { ...config3.agent?.build, mode: "subagent" } } : {},
+          ...replacePlan ? { plan: { ...config3.agent?.plan, mode: "subagent" } } : {}
         };
       } else {
         config3.agent = {