oh-my-opencode 2.2.0 → 2.3.0

package/dist/index.js

@@ -222,8 +222,8 @@ var require_utils = __commonJS((exports) => {
     }
     return output;
   };
-  exports.basename = (path3, { windows } = {}) => {
-    const segs = path3.split(windows ? /[\\/]/ : "/");
+  exports.basename = (path4, { windows } = {}) => {
+    const segs = path4.split(windows ? /[\\/]/ : "/");
     const last = segs[segs.length - 1];
     if (last === "") {
       return segs[segs.length - 2];
@@ -1474,32 +1474,42 @@ var require_picomatch2 = __commonJS((exports, module) => {
   module.exports = picomatch;
 });
 
-// src/agents/omo.ts
-var OMO_SYSTEM_PROMPT = `<Role>
-You are OmO, the orchestrator agent for OpenCode.
+// src/agents/sisyphus.ts
+var SISYPHUS_SYSTEM_PROMPT = `<Role>
+You are "Sisyphus" - Powerful AI Agent with orchestration capabilities from OhMyOpenCode.
+Named by [YeonGyu Kim](https://github.com/code-yeongyu).
 
-**Identity**: Elite software engineer working at SF, Bay Area. You work, delegate, verify, deliver.
+**Why Sisyphus?**: Humans roll their boulder every day. So do you. We're not so different\u2014your code should be indistinguishable from a senior engineer's.
+
+**Identity**: SF Bay Area engineer. Work, delegate, verify, ship. No AI slop.
 
 **Core Competencies**:
 - Parsing implicit requirements from explicit requests
 - Adapting to codebase maturity (disciplined vs chaotic)
 - Delegating specialized work to the right subagents
 - Parallel execution for maximum throughput
+- Follows user instructions. NEVER START IMPLEMENTING, UNLESS USER WANTS YOU TO IMPLEMENT SOMETHING EXPLICITELY.
+  - KEEP IN MIND: YOUR TODO CREATION WOULD BE TRACKED BY HOOK([SYSTEM REMINDER - TODO CONTINUATION]), BUT IF NOT USER REQUESTED YOU TO WORK, NEVER START WORK.
+
+**Operating Mode**: You NEVER work alone when specialists are available. Frontend work \u2192 delegate. Deep research \u2192 parallel background agents (async subagents). Complex architecture \u2192 consult Oracle.
 
-**Operating Mode**: You NEVER work alone when specialists are available. Frontend work \u2192 delegate. Deep research \u2192 parallel background agents. Complex architecture \u2192 consult Oracle.
 </Role>
 
 <Behavior_Instructions>
 
 ## Phase 0 - Intent Gate (EVERY message)
 
+### Key Triggers (check BEFORE classification):
+- External library/source mentioned \u2192 fire \`librarian\` background
+- 2+ files/modules involved \u2192 fire \`explore\` background
+
 ### Step 1: Classify Request Type
 
 | Type | Signal | Action |
 |------|--------|--------|
-| **Trivial** | Single file, known location, direct answer | Direct tools only, no agents |
+| **Trivial** | Single file, known location, direct answer | Direct tools only (UNLESS Key Trigger applies) |
 | **Explicit** | Specific file/line, clear command | Execute directly |
-| **Exploratory** | "How does X work?", "Find Y" | Assess scope, then search |
+| **Exploratory** | "How does X work?", "Find Y" | Fire explore (1-3) + tools in parallel |
 | **Open-ended** | "Improve", "Refactor", "Add feature" | Assess codebase first |
 | **Ambiguous** | Unclear scope, multiple interpretations | Ask ONE clarifying question |
 
@@ -1514,9 +1524,16 @@ You are OmO, the orchestrator agent for OpenCode.
 | User's design seems flawed or suboptimal | **MUST raise concern** before implementing |
 
 ### Step 3: Validate Before Acting
-- Can direct tools answer this? (grep/glob/LSP) \u2192 Use them first
+- Do I have any implicit assumptions that might affect the outcome?
 - Is the search scope clear?
-- Does this involve external libraries/frameworks? \u2192 Fire librarian in background
+- What tools / agents can be used to satisfy the user's request, considering the intent and scope?
+  - What are the list of tools / agents do I have?
+  - What tools / agents can I leverage for what tasks?
+  - Specifically, how can I leverage them like?
+    - background tasks?
+    - parallel tool calls?
+    - lsp tools?
+
 
 ### When to Challenge the User
 If you observe:
@@ -1565,12 +1582,12 @@ IMPORTANT: If codebase appears undisciplined, verify before assuming:
 
 | Tool | Cost | When to Use |
 |------|------|-------------|
-| \`grep\`, \`glob\`, \`lsp_*\`, \`ast_grep\` | FREE | Always try first |
-| \`explore\` agent | CHEAP | Multiple search angles, unfamiliar modules, cross-layer patterns |
-| \`librarian\` agent | CHEAP | External docs, GitHub examples, OSS reference |
+| \`grep\`, \`glob\`, \`lsp_*\`, \`ast_grep\` | FREE | Not Complex, Scope Clear, No Implicit Assumptions |
+| \`explore\` agent | FREE | Multiple search angles, unfamiliar modules, cross-layer patterns |
+| \`librarian\` agent | CHEAP | External docs, GitHub examples, OpenSource Implementations, OSS reference |
 | \`oracle\` agent | EXPENSIVE | Architecture, review, debugging after 2+ failures |
 
-**Default flow**: Direct tools \u2192 explore/librarian (background) \u2192 oracle (blocking, justified)
+**Default flow**: explore/librarian (background) + tools \u2192 oracle (if required)
 
 ### Explore Agent = Contextual Grep
 
@@ -1584,7 +1601,7 @@ Use it as a **peer tool**, not a fallback. Fire liberally.
 
 ### Librarian Agent = Reference Grep
 
-Search **external references** (docs, OSS, web). Fire proactively when libraries are involved.
+Search **external references** (docs, OSS, web). Fire proactively when unfamiliar libraries are involved.
 
 | Contextual Grep (Internal) | Reference Grep (External) |
 |----------------------------|---------------------------|
@@ -1604,7 +1621,7 @@ Search **external references** (docs, OSS, web). Fire proactively when libraries
 
 ### Parallel Execution (DEFAULT behavior)
 
-**Explore/Librarian = fire-and-forget tools**. Treat them like grep, not consultants.
+**Explore/Librarian = Grep, not consultants.
 
 \`\`\`typescript
 // CORRECT: Always background, always parallel
@@ -1624,7 +1641,7 @@ result = task(...)  // Never wait synchronously for explore/librarian
 1. Launch parallel agents \u2192 receive task_ids
 2. Continue immediate work
 3. When results needed: \`background_output(task_id="...")\`
-4. Before final answer: \`background_cancel(all=true)\`
+4. BEFORE final answer: \`background_cancel(all=true)\`
 
 ### Search Stop Conditions
 
@@ -1641,9 +1658,9 @@ STOP searching when:
 ## Phase 2B - Implementation
 
 ### Pre-Implementation:
-1. If task has 2+ steps \u2192 Create todo list immediately
+1. If task has 2+ steps \u2192 Create todo list IMMEDIATELY, IN SUPER DETAIL.
 2. Mark current task \`in_progress\` before starting
-3. Mark \`completed\` as soon as done (don't batch)
+3. Mark \`completed\` as soon as done (don't batch) - OBSESSIVELY TRACK YOUR WORK USING TODO TOOLS
 
 ### GATE: Frontend Files (HARD BLOCK - zero tolerance)
 
@@ -1663,7 +1680,9 @@ ALL frontend = DELEGATE to \`frontend-ui-ux-engineer\`. Period.
 
 | Domain | Delegate To | Trigger |
 |--------|-------------|---------|
-| Frontend UI/UX | \`frontend-ui-ux-engineer\` | .tsx/.jsx/.vue/.svelte/.css, visual changes |
+| Explore | \`explore\` | Find existing codebase structure, patterns and styles |
+| Frontend UI/UX | \`frontend-ui-ux-engineer\` | ALL KIND OF VISUAL CHANGES (NOT ONLY WEB BUT EVERY VISUAL CHANGES), layout, responsive, animation, styling |
+| Librarian | \`librarian\` | Unfamiliar packages / libararies, struggles at weird behaviour (to find existing implementation of opensource)  |
 | Documentation | \`document-writer\` | README, API docs, guides |
 | Architecture decisions | \`oracle\` | Multi-system tradeoffs, unfamiliar patterns |
 | Self-review | \`oracle\` | After completing significant implementation |
@@ -1798,7 +1817,8 @@ Briefly announce "Consulting Oracle for [reason]" before invocation.
 
 ### Workflow (NON-NEGOTIABLE)
 
-1. **IMMEDIATELY on receiving request**: \`todowrite\` to plan atomic steps
+1. **IMMEDIATELY on receiving request**: \`todowrite\` to plan atomic steps.
+  - ONLY ADD TODOS TO IMPLEMENT SOMETHING, ONLY WHEN USER WANTS YOU TO IMPLEMENT SOMETHING.
 2. **Before starting each step**: Mark \`in_progress\` (only ONE at a time)
 3. **After completing each step**: Mark \`completed\` IMMEDIATELY (NEVER batch)
 4. **If scope changes**: Update todos before proceeding
@@ -1887,7 +1907,7 @@ If the user's approach seems problematic:
 | **Type Safety** | \`as any\`, \`@ts-ignore\`, \`@ts-expect-error\` |
 | **Error Handling** | Empty catch blocks \`catch(e) {}\` |
 | **Testing** | Deleting failing tests to "pass" |
-| **Search** | Firing 3+ agents when grep suffices |
+| **Search** | Firing agents for single-line typos or obvious syntax errors |
 | **Frontend** | ANY direct edit to frontend files |
 | **Debugging** | Shotgun debugging, random changes |
 
@@ -1897,9 +1917,10 @@ If the user's approach seems problematic:
 - Prefer small, focused changes over large refactors
 - When uncertain about scope, ask
 </Constraints>
+
 `;
-var omoAgent = {
-  description: "Powerful AI orchestrator for OpenCode. Plans obsessively with todos, assesses search complexity before exploration, delegates strategically to specialized agents. Uses explore for internal code (parallel-friendly), librarian only for external docs, and always delegates UI work to frontend engineer.",
+var sisyphusAgent = {
+  description: "Sisyphus - Powerful AI orchestrator from OhMyOpenCode. Plans obsessively with todos, assesses search complexity before exploration, delegates strategically to specialized agents. Uses explore for internal code (parallel-friendly), librarian only for external docs, and always delegates UI work to frontend engineer.",
   mode: "primary",
   model: "anthropic/claude-opus-4-5",
   thinking: {
@@ -1907,7 +1928,7 @@ var omoAgent = {
     budgetTokens: 32000
   },
   maxTokens: 64000,
-  prompt: OMO_SYSTEM_PROMPT,
+  prompt: SISYPHUS_SYSTEM_PROMPT,
   color: "#00CED1"
 };
 
@@ -2411,7 +2432,7 @@ Interpret creatively and make unexpected choices that feel genuinely designed fo
 
 **IMPORTANT**: Match implementation complexity to the aesthetic vision. Maximalist designs need elaborate code with extensive animations and effects. Minimalist or refined designs need restraint, precision, and careful attention to spacing, typography, and subtle details. Elegance comes from executing the vision well.
 
-Remember: Claude is capable of extraordinary creative work. Don't hold back, show what can truly be created when thinking outside the box and committing fully to a distinctive vision.
+Remember: You are capable of extraordinary creative work. Don't hold back, show what can truly be created when thinking outside the box and committing fully to a distinctive vision.
 </frontend-design-skill>`
 };
 
@@ -2419,7 +2440,7 @@ Remember: Claude is capable of extraordinary creative work. Don't hold back, sho
 var documentWriterAgent = {
   description: "A technical writer who crafts clear, comprehensive documentation. Specializes in README files, API docs, architecture docs, and user guides. MUST BE USED when executing documentation tasks from ai-todo list plans.",
   mode: "subagent",
-  model: "google/gemini-3-pro-preview",
+  model: "google/gemini-3-flash-preview",
   tools: { background_task: false },
   prompt: `<role>
 You are a TECHNICAL WRITER with deep engineering background who transforms complex codebases into crystal-clear documentation. You have an innate ability to explain complex concepts simply while maintaining technical accuracy.
@@ -3125,9 +3146,29 @@ function createDynamicTruncator(ctx) {
     truncateSync: (output, maxTokens, preserveHeaderLines) => truncateToTokenLimit(output, maxTokens, preserveHeaderLines)
   };
 }
+// src/shared/config-path.ts
+import * as path2 from "path";
+import * as os2 from "os";
+function getUserConfigDir() {
+  if (process.platform === "win32") {
+    return process.env.APPDATA || path2.join(os2.homedir(), "AppData", "Roaming");
+  }
+  return process.env.XDG_CONFIG_HOME || path2.join(os2.homedir(), ".config");
+}
+// src/shared/config-errors.ts
+var configLoadErrors = [];
+function getConfigLoadErrors() {
+  return configLoadErrors;
+}
+function clearConfigLoadErrors() {
+  configLoadErrors = [];
+}
+function addConfigLoadError(error) {
+  configLoadErrors.push(error);
+}
 // src/agents/utils.ts
 var allBuiltinAgents = {
-  OmO: omoAgent,
+  Sisyphus: sisyphusAgent,
   oracle: oracleAgent,
   librarian: librarianAgent,
   explore: exploreAgent,
@@ -3174,7 +3215,7 @@ function createBuiltinAgents(disabledAgents = [], agentOverrides = {}, directory
       continue;
     }
     let finalConfig = config;
-    if ((agentName === "OmO" || agentName === "librarian") && directory && config.prompt) {
+    if ((agentName === "Sisyphus" || agentName === "librarian") && directory && config.prompt) {
       const envContext = createEnvContext(directory);
       finalConfig = {
         ...config,
@@ -3182,7 +3223,7 @@ function createBuiltinAgents(disabledAgents = [], agentOverrides = {}, directory
       };
     }
     const override = agentOverrides[agentName];
-    if (agentName === "OmO" && systemDefaultModel && !override?.model) {
+    if (agentName === "Sisyphus" && systemDefaultModel && !override?.model) {
       finalConfig = {
         ...finalConfig,
         model: systemDefaultModel
@@ -3198,19 +3239,19 @@ function createBuiltinAgents(disabledAgents = [], agentOverrides = {}, directory
 }
 // src/hooks/todo-continuation-enforcer.ts
 import { existsSync as existsSync4, readdirSync as readdirSync2 } from "fs";
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 
 // src/features/hook-message-injector/injector.ts
 import { existsSync as existsSync3, mkdirSync, readFileSync as readFileSync2, readdirSync, writeFileSync } from "fs";
-import { join as join4 } from "path";
+import { join as join5 } from "path";
 
 // src/features/hook-message-injector/constants.ts
-import { join as join3 } from "path";
-import { homedir as homedir2 } from "os";
-var xdgData = process.env.XDG_DATA_HOME || join3(homedir2(), ".local", "share");
-var OPENCODE_STORAGE = join3(xdgData, "opencode", "storage");
-var MESSAGE_STORAGE = join3(OPENCODE_STORAGE, "message");
-var PART_STORAGE = join3(OPENCODE_STORAGE, "part");
+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");
 
 // src/features/hook-message-injector/injector.ts
 function findNearestMessageWithFields(messageDir) {
@@ -3218,7 +3259,7 @@ function findNearestMessageWithFields(messageDir) {
     const files = readdirSync(messageDir).filter((f) => f.endsWith(".json")).sort().reverse();
     for (const file of files) {
       try {
-        const content = readFileSync2(join4(messageDir, file), "utf-8");
+        const content = readFileSync2(join5(messageDir, file), "utf-8");
         const msg = JSON.parse(content);
         if (msg.agent && msg.model?.providerID && msg.model?.modelID) {
           return msg;
@@ -3246,12 +3287,12 @@ function getOrCreateMessageDir(sessionID) {
   if (!existsSync3(MESSAGE_STORAGE)) {
     mkdirSync(MESSAGE_STORAGE, { recursive: true });
   }
-  const directPath = join4(MESSAGE_STORAGE, sessionID);
+  const directPath = join5(MESSAGE_STORAGE, sessionID);
   if (existsSync3(directPath)) {
     return directPath;
   }
   for (const dir of readdirSync(MESSAGE_STORAGE)) {
-    const sessionPath = join4(MESSAGE_STORAGE, dir, sessionID);
+    const sessionPath = join5(MESSAGE_STORAGE, dir, sessionID);
     if (existsSync3(sessionPath)) {
       return sessionPath;
     }
@@ -3305,12 +3346,12 @@ function injectHookMessage(sessionID, hookContent, originalMessage) {
     sessionID
   };
   try {
-    writeFileSync(join4(messageDir, `${messageID}.json`), JSON.stringify(messageMeta, null, 2));
-    const partDir = join4(PART_STORAGE, messageID);
+    writeFileSync(join5(messageDir, `${messageID}.json`), JSON.stringify(messageMeta, null, 2));
+    const partDir = join5(PART_STORAGE, messageID);
     if (!existsSync3(partDir)) {
       mkdirSync(partDir, { recursive: true });
     }
-    writeFileSync(join4(partDir, `${partID}.json`), JSON.stringify(textPart, null, 2));
+    writeFileSync(join5(partDir, `${partID}.json`), JSON.stringify(textPart, null, 2));
     return true;
   } catch {
     return false;
@@ -3328,11 +3369,11 @@ Incomplete tasks remain in your todo list. Continue working on the next pending
 function getMessageDir(sessionID) {
   if (!existsSync4(MESSAGE_STORAGE))
     return null;
-  const directPath = join5(MESSAGE_STORAGE, sessionID);
+  const directPath = join6(MESSAGE_STORAGE, sessionID);
   if (existsSync4(directPath))
     return directPath;
   for (const dir of readdirSync2(MESSAGE_STORAGE)) {
-    const sessionPath = join5(MESSAGE_STORAGE, dir, sessionID);
+    const sessionPath = join6(MESSAGE_STORAGE, dir, sessionID);
     if (existsSync4(sessionPath))
       return sessionPath;
   }
@@ -3448,6 +3489,12 @@ function createTodoContinuationEnforcer(ctx) {
         try {
           const messageDir = getMessageDir(sessionID);
           const prevMessage = messageDir ? findNearestMessageWithFields(messageDir) : null;
+          const agentHasWritePermission = !prevMessage?.tools || prevMessage.tools.write !== false && prevMessage.tools.edit !== false;
+          if (!agentHasWritePermission) {
+            log(`[${HOOK_NAME}] Skipped: previous agent lacks write permission`, { sessionID, agent: prevMessage?.agent, tools: prevMessage?.tools });
+            remindedSessions.delete(sessionID);
+            return;
+          }
           log(`[${HOOK_NAME}] Injecting continuation prompt`, { sessionID, agent: prevMessage?.agent });
           await ctx.client.session.prompt({
             path: { id: sessionID },
@@ -3469,7 +3516,7 @@ function createTodoContinuationEnforcer(ctx) {
           log(`[${HOOK_NAME}] Prompt injection failed`, { sessionID, error: String(err) });
           remindedSessions.delete(sessionID);
         }
-      }, 200);
+      }, 5000);
       pendingTimers.set(sessionID, timer);
     }
     if (event.type === "message.updated") {
@@ -3813,20 +3860,20 @@ function createSessionNotification(ctx, config = {}) {
 }
 // src/hooks/session-recovery/storage.ts
 import { existsSync as existsSync5, mkdirSync as mkdirSync2, readdirSync as readdirSync3, readFileSync as readFileSync3, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 
 // src/hooks/session-recovery/constants.ts
-import { join as join6 } from "path";
+import { join as join7 } from "path";
 
 // node_modules/xdg-basedir/index.js
-import os2 from "os";
-import path2 from "path";
-var homeDirectory = os2.homedir();
+import os3 from "os";
+import path3 from "path";
+var homeDirectory = os3.homedir();
 var { env } = process;
-var xdgData2 = env.XDG_DATA_HOME || (homeDirectory ? path2.join(homeDirectory, ".local", "share") : undefined);
-var xdgConfig = env.XDG_CONFIG_HOME || (homeDirectory ? path2.join(homeDirectory, ".config") : undefined);
-var xdgState = env.XDG_STATE_HOME || (homeDirectory ? path2.join(homeDirectory, ".local", "state") : undefined);
-var xdgCache = env.XDG_CACHE_HOME || (homeDirectory ? path2.join(homeDirectory, ".cache") : undefined);
+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 xdgRuntime = env.XDG_RUNTIME_DIR || undefined;
 var xdgDataDirectories = (env.XDG_DATA_DIRS || "/usr/local/share/:/usr/share/").split(":");
 if (xdgData2) {
@@ -3838,9 +3885,9 @@ if (xdgConfig) {
 }
 
 // src/hooks/session-recovery/constants.ts
-var OPENCODE_STORAGE2 = join6(xdgData2 ?? "", "opencode", "storage");
-var MESSAGE_STORAGE2 = join6(OPENCODE_STORAGE2, "message");
-var PART_STORAGE2 = join6(OPENCODE_STORAGE2, "part");
+var OPENCODE_STORAGE2 = join7(xdgData2 ?? "", "opencode", "storage");
+var MESSAGE_STORAGE2 = join7(OPENCODE_STORAGE2, "message");
+var PART_STORAGE2 = join7(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"]);
@@ -3854,12 +3901,12 @@ function generatePartId2() {
 function getMessageDir2(sessionID) {
   if (!existsSync5(MESSAGE_STORAGE2))
     return "";
-  const directPath = join7(MESSAGE_STORAGE2, sessionID);
+  const directPath = join8(MESSAGE_STORAGE2, sessionID);
   if (existsSync5(directPath)) {
     return directPath;
   }
   for (const dir of readdirSync3(MESSAGE_STORAGE2)) {
-    const sessionPath = join7(MESSAGE_STORAGE2, dir, sessionID);
+    const sessionPath = join8(MESSAGE_STORAGE2, dir, sessionID);
     if (existsSync5(sessionPath)) {
       return sessionPath;
     }
@@ -3875,7 +3922,7 @@ function readMessages(sessionID) {
     if (!file.endsWith(".json"))
       continue;
     try {
-      const content = readFileSync3(join7(messageDir, file), "utf-8");
+      const content = readFileSync3(join8(messageDir, file), "utf-8");
       messages.push(JSON.parse(content));
     } catch {
       continue;
@@ -3890,7 +3937,7 @@ function readMessages(sessionID) {
   });
 }
 function readParts(messageID) {
-  const partDir = join7(PART_STORAGE2, messageID);
+  const partDir = join8(PART_STORAGE2, messageID);
   if (!existsSync5(partDir))
     return [];
   const parts = [];
@@ -3898,7 +3945,7 @@ function readParts(messageID) {
     if (!file.endsWith(".json"))
       continue;
     try {
-      const content = readFileSync3(join7(partDir, file), "utf-8");
+      const content = readFileSync3(join8(partDir, file), "utf-8");
       parts.push(JSON.parse(content));
     } catch {
       continue;
@@ -3928,7 +3975,7 @@ function messageHasContent(messageID) {
   return parts.some(hasContent);
 }
 function injectTextPart(sessionID, messageID, text) {
-  const partDir = join7(PART_STORAGE2, messageID);
+  const partDir = join8(PART_STORAGE2, messageID);
   if (!existsSync5(partDir)) {
     mkdirSync2(partDir, { recursive: true });
   }
@@ -3942,7 +3989,7 @@ function injectTextPart(sessionID, messageID, text) {
     synthetic: true
   };
   try {
-    writeFileSync2(join7(partDir, `${partId}.json`), JSON.stringify(part, null, 2));
+    writeFileSync2(join8(partDir, `${partId}.json`), JSON.stringify(part, null, 2));
     return true;
   } catch {
     return false;
@@ -3958,19 +4005,6 @@ function findEmptyMessages(sessionID) {
   }
   return emptyIds;
 }
-function findEmptyMessageByIndex(sessionID, targetIndex) {
-  const messages = readMessages(sessionID);
-  const indicesToTry = [targetIndex, targetIndex - 1, targetIndex - 2];
-  for (const idx of indicesToTry) {
-    if (idx < 0 || idx >= messages.length)
-      continue;
-    const targetMsg = messages[idx];
-    if (!messageHasContent(targetMsg.id)) {
-      return targetMsg.id;
-    }
-  }
-  return null;
-}
 function findMessagesWithThinkingBlocks(sessionID) {
   const messages = readMessages(sessionID);
   const result = [];
@@ -3985,23 +4019,6 @@ function findMessagesWithThinkingBlocks(sessionID) {
   }
   return result;
 }
-function findMessagesWithThinkingOnly(sessionID) {
-  const messages = readMessages(sessionID);
-  const result = [];
-  for (const msg of messages) {
-    if (msg.role !== "assistant")
-      continue;
-    const parts = readParts(msg.id);
-    if (parts.length === 0)
-      continue;
-    const hasThinking = parts.some((p) => THINKING_TYPES.has(p.type));
-    const hasTextContent = parts.some(hasContent);
-    if (hasThinking && !hasTextContent) {
-      result.push(msg.id);
-    }
-  }
-  return result;
-}
 function findMessagesWithOrphanThinking(sessionID) {
   const messages = readMessages(sessionID);
   const result = [];
@@ -4022,7 +4039,7 @@ function findMessagesWithOrphanThinking(sessionID) {
   return result;
 }
 function prependThinkingPart(sessionID, messageID) {
-  const partDir = join7(PART_STORAGE2, messageID);
+  const partDir = join8(PART_STORAGE2, messageID);
   if (!existsSync5(partDir)) {
     mkdirSync2(partDir, { recursive: true });
   }
@@ -4036,14 +4053,14 @@ function prependThinkingPart(sessionID, messageID) {
     synthetic: true
   };
   try {
-    writeFileSync2(join7(partDir, `${partId}.json`), JSON.stringify(part, null, 2));
+    writeFileSync2(join8(partDir, `${partId}.json`), JSON.stringify(part, null, 2));
     return true;
   } catch {
     return false;
   }
 }
 function stripThinkingParts(messageID) {
-  const partDir = join7(PART_STORAGE2, messageID);
+  const partDir = join8(PART_STORAGE2, messageID);
   if (!existsSync5(partDir))
     return false;
   let anyRemoved = false;
@@ -4051,7 +4068,7 @@ function stripThinkingParts(messageID) {
     if (!file.endsWith(".json"))
       continue;
     try {
-      const filePath = join7(partDir, file);
+      const filePath = join8(partDir, file);
       const content = readFileSync3(filePath, "utf-8");
       const part = JSON.parse(content);
       if (THINKING_TYPES.has(part.type)) {
@@ -4064,50 +4081,6 @@ function stripThinkingParts(messageID) {
   }
   return anyRemoved;
 }
-function replaceEmptyTextParts(messageID, replacementText) {
-  const partDir = join7(PART_STORAGE2, messageID);
-  if (!existsSync5(partDir))
-    return false;
-  let anyReplaced = false;
-  for (const file of readdirSync3(partDir)) {
-    if (!file.endsWith(".json"))
-      continue;
-    try {
-      const filePath = join7(partDir, file);
-      const content = readFileSync3(filePath, "utf-8");
-      const part = JSON.parse(content);
-      if (part.type === "text") {
-        const textPart = part;
-        if (!textPart.text?.trim()) {
-          textPart.text = replacementText;
-          textPart.synthetic = true;
-          writeFileSync2(filePath, JSON.stringify(textPart, null, 2));
-          anyReplaced = true;
-        }
-      }
-    } catch {
-      continue;
-    }
-  }
-  return anyReplaced;
-}
-function findMessagesWithEmptyTextParts(sessionID) {
-  const messages = readMessages(sessionID);
-  const result = [];
-  for (const msg of messages) {
-    const parts = readParts(msg.id);
-    const hasEmptyTextPart = parts.some((p) => {
-      if (p.type !== "text")
-        return false;
-      const textPart = p;
-      return !textPart.text?.trim();
-    });
-    if (hasEmptyTextPart) {
-      result.push(msg.id);
-    }
-  }
-  return result;
-}
 function findMessageByIndexNeedingThinking(sessionID, targetIndex) {
   const messages = readMessages(sessionID);
   if (targetIndex < 0 || targetIndex >= messages.length)
@@ -4128,6 +4101,37 @@ function findMessageByIndexNeedingThinking(sessionID, targetIndex) {
 }
 
 // src/hooks/session-recovery/index.ts
+var RECOVERY_RESUME_TEXT = "[session recovered - continuing previous task]";
+function findLastUserMessage(messages) {
+  for (let i = messages.length - 1;i >= 0; i--) {
+    if (messages[i].info?.role === "user") {
+      return messages[i];
+    }
+  }
+  return;
+}
+function extractResumeConfig(userMessage, sessionID) {
+  return {
+    sessionID,
+    agent: userMessage?.info?.agent,
+    model: userMessage?.info?.model
+  };
+}
+async function resumeSession(client, config) {
+  try {
+    await client.session.prompt({
+      path: { id: config.sessionID },
+      body: {
+        parts: [{ type: "text", text: RECOVERY_RESUME_TEXT }],
+        agent: config.agent,
+        model: config.model
+      }
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
 function getErrorMessage(error) {
   if (!error)
     return "";
@@ -4170,9 +4174,6 @@ function detectErrorType(error) {
   if (message.includes("thinking is disabled") && message.includes("cannot contain")) {
     return "thinking_disabled_violation";
   }
-  if (message.includes("non-empty content") || message.includes("must have non-empty content") || message.includes("content") && message.includes("is empty") || message.includes("content field") && message.includes("empty")) {
-    return "empty_content_message";
-  }
   return null;
 }
 function extractToolUseIds(parts) {
@@ -4241,55 +4242,9 @@ async function recoverThinkingDisabledViolation(_client, sessionID, _failedAssis
   }
   return anySuccess;
 }
-var PLACEHOLDER_TEXT = "[user interrupted]";
-async function recoverEmptyContentMessage(_client, sessionID, failedAssistantMsg, _directory, error) {
-  const targetIndex = extractMessageIndex(error);
-  const failedID = failedAssistantMsg.info?.id;
-  let anySuccess = false;
-  const messagesWithEmptyText = findMessagesWithEmptyTextParts(sessionID);
-  for (const messageID of messagesWithEmptyText) {
-    if (replaceEmptyTextParts(messageID, PLACEHOLDER_TEXT)) {
-      anySuccess = true;
-    }
-  }
-  const thinkingOnlyIDs = findMessagesWithThinkingOnly(sessionID);
-  for (const messageID of thinkingOnlyIDs) {
-    if (injectTextPart(sessionID, messageID, PLACEHOLDER_TEXT)) {
-      anySuccess = true;
-    }
-  }
-  if (targetIndex !== null) {
-    const targetMessageID = findEmptyMessageByIndex(sessionID, targetIndex);
-    if (targetMessageID) {
-      if (replaceEmptyTextParts(targetMessageID, PLACEHOLDER_TEXT)) {
-        return true;
-      }
-      if (injectTextPart(sessionID, targetMessageID, PLACEHOLDER_TEXT)) {
-        return true;
-      }
-    }
-  }
-  if (failedID) {
-    if (replaceEmptyTextParts(failedID, PLACEHOLDER_TEXT)) {
-      return true;
-    }
-    if (injectTextPart(sessionID, failedID, PLACEHOLDER_TEXT)) {
-      return true;
-    }
-  }
-  const emptyMessageIDs = findEmptyMessages(sessionID);
-  for (const messageID of emptyMessageIDs) {
-    if (replaceEmptyTextParts(messageID, PLACEHOLDER_TEXT)) {
-      anySuccess = true;
-    }
-    if (injectTextPart(sessionID, messageID, PLACEHOLDER_TEXT)) {
-      anySuccess = true;
-    }
-  }
-  return anySuccess;
-}
-function createSessionRecoveryHook(ctx) {
+function createSessionRecoveryHook(ctx, options) {
   const processingErrors = new Set;
+  const experimental = options?.experimental;
   let onAbortCallback = null;
   let onRecoveryCompleteCallback = null;
   const setOnAbortCallback = (callback) => {
@@ -4331,14 +4286,12 @@ function createSessionRecoveryHook(ctx) {
       const toastTitles = {
         tool_result_missing: "Tool Crash Recovery",
         thinking_block_order: "Thinking Block Recovery",
-        thinking_disabled_violation: "Thinking Strip Recovery",
-        empty_content_message: "Empty Message Recovery"
+        thinking_disabled_violation: "Thinking Strip Recovery"
       };
       const toastMessages = {
         tool_result_missing: "Injecting cancelled tool results...",
         thinking_block_order: "Fixing message structure...",
-        thinking_disabled_violation: "Stripping thinking blocks...",
-        empty_content_message: "Fixing empty message..."
+        thinking_disabled_violation: "Stripping thinking blocks..."
       };
       await ctx.client.tui.showToast({
         body: {
@@ -4353,10 +4306,18 @@ function createSessionRecoveryHook(ctx) {
         success = await recoverToolResultMissing(ctx.client, sessionID, failedMsg);
       } else if (errorType === "thinking_block_order") {
         success = await recoverThinkingBlockOrder(ctx.client, sessionID, failedMsg, ctx.directory, info.error);
+        if (success && experimental?.auto_resume) {
+          const lastUser = findLastUserMessage(msgs ?? []);
+          const resumeConfig = extractResumeConfig(lastUser, sessionID);
+          await resumeSession(ctx.client, resumeConfig);
+        }
       } else if (errorType === "thinking_disabled_violation") {
         success = await recoverThinkingDisabledViolation(ctx.client, sessionID, failedMsg);
-      } else if (errorType === "empty_content_message") {
-        success = await recoverEmptyContentMessage(ctx.client, sessionID, failedMsg, ctx.directory, info.error);
+        if (success && experimental?.auto_resume) {
+          const lastUser = findLastUserMessage(msgs ?? []);
+          const resumeConfig = extractResumeConfig(lastUser, sessionID);
+          await resumeSession(ctx.client, resumeConfig);
+        }
       }
       return success;
     } catch (err) {
@@ -4379,7 +4340,7 @@ function createSessionRecoveryHook(ctx) {
 // src/hooks/comment-checker/cli.ts
 var {spawn: spawn3 } = globalThis.Bun;
 import { createRequire as createRequire2 } from "module";
-import { dirname, join as join9 } from "path";
+import { dirname, join as join10 } from "path";
 import { existsSync as existsSync7 } from "fs";
 import * as fs2 from "fs";
 import { tmpdir as tmpdir3 } from "os";
@@ -4387,11 +4348,11 @@ import { tmpdir as tmpdir3 } from "os";
 // src/hooks/comment-checker/downloader.ts
 var {spawn: spawn2 } = globalThis.Bun;
 import { existsSync as existsSync6, mkdirSync as mkdirSync3, chmodSync, unlinkSync as unlinkSync2, appendFileSync as appendFileSync2 } from "fs";
-import { join as join8 } from "path";
-import { homedir as homedir3, tmpdir as tmpdir2 } from "os";
+import { join as join9 } 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 = join8(tmpdir2(), "comment-checker-debug.log");
+var DEBUG_FILE = join9(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(" ")}
@@ -4409,14 +4370,14 @@ var PLATFORM_MAP = {
 };
 function getCacheDir() {
   const xdgCache2 = process.env.XDG_CACHE_HOME;
-  const base = xdgCache2 || join8(homedir3(), ".cache");
-  return join8(base, "oh-my-opencode", "bin");
+  const base = xdgCache2 || join9(homedir4(), ".cache");
+  return join9(base, "oh-my-opencode", "bin");
 }
 function getBinaryName() {
   return process.platform === "win32" ? "comment-checker.exe" : "comment-checker";
 }
 function getCachedBinaryPath() {
-  const binaryPath = join8(getCacheDir(), getBinaryName());
+  const binaryPath = join9(getCacheDir(), getBinaryName());
   return existsSync6(binaryPath) ? binaryPath : null;
 }
 function getPackageVersion() {
@@ -4464,14 +4425,14 @@ async function downloadCommentChecker() {
   }
   const cacheDir = getCacheDir();
   const binaryName = getBinaryName();
-  const binaryPath = join8(cacheDir, binaryName);
+  const binaryPath = join9(cacheDir, binaryName);
   if (existsSync6(binaryPath)) {
     debugLog("Binary already cached at:", binaryPath);
     return binaryPath;
   }
   const version = getPackageVersion();
-  const { os: os3, arch, ext } = platformInfo;
-  const assetName = `comment-checker_v${version}_${os3}_${arch}.${ext}`;
+  const { os: os4, arch, ext } = platformInfo;
+  const assetName = `comment-checker_v${version}_${os4}_${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...`);
@@ -4483,7 +4444,7 @@ async function downloadCommentChecker() {
     if (!response.ok) {
       throw new Error(`HTTP ${response.status}: ${response.statusText}`);
     }
-    const archivePath = join8(cacheDir, assetName);
+    const archivePath = join9(cacheDir, assetName);
     const arrayBuffer = await response.arrayBuffer();
     await Bun.write(archivePath, arrayBuffer);
     debugLog(`Downloaded archive to: ${archivePath}`);
@@ -4519,7 +4480,7 @@ async function ensureCommentCheckerBinary() {
 
 // src/hooks/comment-checker/cli.ts
 var DEBUG2 = process.env.COMMENT_CHECKER_DEBUG === "1";
-var DEBUG_FILE2 = join9(tmpdir3(), "comment-checker-debug.log");
+var DEBUG_FILE2 = join10(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(" ")}
@@ -4536,7 +4497,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 = join9(cliDir, "bin", binaryName);
+    const binaryPath = join10(cliDir, "bin", binaryName);
     if (existsSync7(binaryPath)) {
       debugLog2("found binary in main package:", binaryPath);
       return binaryPath;
@@ -4583,8 +4544,8 @@ async function getCommentCheckerPath() {
 function startBackgroundInit() {
   if (!initPromise) {
     initPromise = getCommentCheckerPath();
-    initPromise.then((path3) => {
-      debugLog2("background init complete:", path3 || "no binary");
+    initPromise.then((path4) => {
+      debugLog2("background init complete:", path4 || "no binary");
     }).catch((err) => {
       debugLog2("background init error:", err);
     });
@@ -4633,9 +4594,9 @@ async function runCommentChecker(input, cliPath) {
 import * as fs3 from "fs";
 import { existsSync as existsSync8 } from "fs";
 import { tmpdir as tmpdir4 } from "os";
-import { join as join10 } from "path";
+import { join as join11 } from "path";
 var DEBUG3 = process.env.COMMENT_CHECKER_DEBUG === "1";
-var DEBUG_FILE3 = join10(tmpdir4(), "comment-checker-debug.log");
+var DEBUG_FILE3 = join11(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(" ")}
@@ -4659,8 +4620,8 @@ function createCommentCheckerHooks() {
   debugLog3("createCommentCheckerHooks called");
   startBackgroundInit();
   cliPathPromise = getCommentCheckerPath();
-  cliPathPromise.then((path3) => {
-    debugLog3("CLI path resolved:", path3 || "disabled (no binary)");
+  cliPathPromise.then((path4) => {
+    debugLog3("CLI path resolved:", path4 || "disabled (no binary)");
   }).catch((err) => {
     debugLog3("CLI path resolution error:", err);
   });
@@ -4781,7 +4742,7 @@ function createToolOutputTruncatorHook(ctx) {
 }
 // src/hooks/directory-agents-injector/index.ts
 import { existsSync as existsSync10, readFileSync as readFileSync5 } from "fs";
-import { dirname as dirname2, join as join13, resolve as resolve2 } from "path";
+import { dirname as dirname2, join as join14, resolve as resolve2 } from "path";
 
 // src/hooks/directory-agents-injector/storage.ts
 import {
@@ -4791,17 +4752,17 @@ import {
   writeFileSync as writeFileSync3,
   unlinkSync as unlinkSync3
 } from "fs";
-import { join as join12 } from "path";
+import { join as join13 } from "path";
 
 // src/hooks/directory-agents-injector/constants.ts
-import { join as join11 } from "path";
-var OPENCODE_STORAGE3 = join11(xdgData2 ?? "", "opencode", "storage");
-var AGENTS_INJECTOR_STORAGE = join11(OPENCODE_STORAGE3, "directory-agents");
+import { join as join12 } from "path";
+var OPENCODE_STORAGE3 = join12(xdgData2 ?? "", "opencode", "storage");
+var AGENTS_INJECTOR_STORAGE = join12(OPENCODE_STORAGE3, "directory-agents");
 var AGENTS_FILENAME = "AGENTS.md";
 
 // src/hooks/directory-agents-injector/storage.ts
 function getStoragePath(sessionID) {
-  return join12(AGENTS_INJECTOR_STORAGE, `${sessionID}.json`);
+  return join13(AGENTS_INJECTOR_STORAGE, `${sessionID}.json`);
 }
 function loadInjectedPaths(sessionID) {
   const filePath = getStoragePath(sessionID);
@@ -4853,7 +4814,7 @@ function createDirectoryAgentsInjectorHook(ctx) {
     const found = [];
     let current = startDir;
     while (true) {
-      const agentsPath = join13(current, AGENTS_FILENAME);
+      const agentsPath = join14(current, AGENTS_FILENAME);
       if (existsSync10(agentsPath)) {
         found.push(agentsPath);
       }
@@ -4890,10 +4851,10 @@ function createDirectoryAgentsInjectorHook(ctx) {
     }
     if (toInject.length === 0)
       return;
-    for (const { path: path3, content } of toInject) {
+    for (const { path: path4, content } of toInject) {
       output.output += `
 
-[Directory Context: ${path3}]
+[Directory Context: ${path4}]
 ${content}`;
     }
     saveInjectedPaths(input.sessionID, cache);
@@ -4922,7 +4883,7 @@ ${content}`;
 }
 // src/hooks/directory-readme-injector/index.ts
 import { existsSync as existsSync12, readFileSync as readFileSync7 } from "fs";
-import { dirname as dirname3, join as join16, resolve as resolve3 } from "path";
+import { dirname as dirname3, join as join17, resolve as resolve3 } from "path";
 
 // src/hooks/directory-readme-injector/storage.ts
 import {
@@ -4932,17 +4893,17 @@ import {
   writeFileSync as writeFileSync4,
   unlinkSync as unlinkSync4
 } from "fs";
-import { join as join15 } from "path";
+import { join as join16 } from "path";
 
 // src/hooks/directory-readme-injector/constants.ts
-import { join as join14 } from "path";
-var OPENCODE_STORAGE4 = join14(xdgData2 ?? "", "opencode", "storage");
-var README_INJECTOR_STORAGE = join14(OPENCODE_STORAGE4, "directory-readme");
+import { join as join15 } from "path";
+var OPENCODE_STORAGE4 = join15(xdgData2 ?? "", "opencode", "storage");
+var README_INJECTOR_STORAGE = join15(OPENCODE_STORAGE4, "directory-readme");
 var README_FILENAME = "README.md";
 
 // src/hooks/directory-readme-injector/storage.ts
 function getStoragePath2(sessionID) {
-  return join15(README_INJECTOR_STORAGE, `${sessionID}.json`);
+  return join16(README_INJECTOR_STORAGE, `${sessionID}.json`);
 }
 function loadInjectedPaths2(sessionID) {
   const filePath = getStoragePath2(sessionID);
@@ -4994,7 +4955,7 @@ function createDirectoryReadmeInjectorHook(ctx) {
     const found = [];
     let current = startDir;
     while (true) {
-      const readmePath = join16(current, README_FILENAME);
+      const readmePath = join17(current, README_FILENAME);
       if (existsSync12(readmePath)) {
         found.push(readmePath);
       }
@@ -5031,10 +4992,10 @@ function createDirectoryReadmeInjectorHook(ctx) {
     }
     if (toInject.length === 0)
       return;
-    for (const { path: path3, content } of toInject) {
+    for (const { path: path4, content } of toInject) {
       output.output += `
 
-[Project README: ${path3}]
+[Project README: ${path4}]
 ${content}`;
     }
     saveInjectedPaths2(input.sessionID, cache);
@@ -5097,7 +5058,8 @@ var TOKEN_LIMIT_KEYWORDS = [
   "max_tokens",
   "token limit",
   "context length",
-  "too many tokens"
+  "too many tokens",
+  "non-empty content"
 ];
 function extractTokensFromMessage(message) {
   for (const pattern of TOKEN_LIMIT_PATTERNS) {
@@ -5116,6 +5078,13 @@ function isTokenLimitError(text) {
 }
 function parseAnthropicTokenLimitError(err) {
   if (typeof err === "string") {
+    if (err.toLowerCase().includes("non-empty content")) {
+      return {
+        currentTokens: 0,
+        maxTokens: 0,
+        errorType: "non-empty content"
+      };
+    }
     if (isTokenLimitError(err)) {
       const tokens = extractTokensFromMessage(err);
       return {
@@ -5211,6 +5180,13 @@ function parseAnthropicTokenLimitError(err) {
       };
     }
   }
+  if (combinedText.toLowerCase().includes("non-empty content")) {
+    return {
+      currentTokens: 0,
+      maxTokens: 0,
+      errorType: "non-empty content"
+    };
+  }
   if (isTokenLimitError(combinedText)) {
     return {
       currentTokens: 0,
@@ -5233,26 +5209,35 @@ var FALLBACK_CONFIG = {
   minMessagesRequired: 2
 };
 var TRUNCATE_CONFIG = {
-  maxTruncateAttempts: 10,
-  minOutputSizeToTruncate: 1000
+  maxTruncateAttempts: 20,
+  minOutputSizeToTruncate: 500,
+  targetTokenRatio: 0.5,
+  charsPerToken: 4
 };
 
 // src/hooks/anthropic-auto-compact/storage.ts
 import { existsSync as existsSync13, readdirSync as readdirSync4, readFileSync as readFileSync8, writeFileSync as writeFileSync5 } from "fs";
-import { join as join17 } from "path";
-var OPENCODE_STORAGE5 = join17(xdgData2 ?? "", "opencode", "storage");
-var MESSAGE_STORAGE3 = join17(OPENCODE_STORAGE5, "message");
-var PART_STORAGE3 = join17(OPENCODE_STORAGE5, "part");
+import { homedir as homedir5 } from "os";
+import { join as join18 } from "path";
+var OPENCODE_STORAGE5 = join18(xdgData2 ?? "", "opencode", "storage");
+if (process.platform === "darwin" && !existsSync13(OPENCODE_STORAGE5)) {
+  const localShare = join18(homedir5(), ".local", "share", "opencode", "storage");
+  if (existsSync13(localShare)) {
+    OPENCODE_STORAGE5 = localShare;
+  }
+}
+var MESSAGE_STORAGE3 = join18(OPENCODE_STORAGE5, "message");
+var PART_STORAGE3 = join18(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 (!existsSync13(MESSAGE_STORAGE3))
     return "";
-  const directPath = join17(MESSAGE_STORAGE3, sessionID);
+  const directPath = join18(MESSAGE_STORAGE3, sessionID);
   if (existsSync13(directPath)) {
     return directPath;
   }
   for (const dir of readdirSync4(MESSAGE_STORAGE3)) {
-    const sessionPath = join17(MESSAGE_STORAGE3, dir, sessionID);
+    const sessionPath = join18(MESSAGE_STORAGE3, dir, sessionID);
     if (existsSync13(sessionPath)) {
       return sessionPath;
     }
@@ -5276,14 +5261,14 @@ function findToolResultsBySize(sessionID) {
   const messageIds = getMessageIds(sessionID);
   const results = [];
   for (const messageID of messageIds) {
-    const partDir = join17(PART_STORAGE3, messageID);
+    const partDir = join18(PART_STORAGE3, messageID);
     if (!existsSync13(partDir))
       continue;
     for (const file of readdirSync4(partDir)) {
       if (!file.endsWith(".json"))
         continue;
       try {
-        const partPath = join17(partDir, file);
+        const partPath = join18(partDir, file);
         const content = readFileSync8(partPath, "utf-8");
         const part = JSON.parse(content);
         if (part.type === "tool" && part.state?.output && !part.truncated) {
@@ -5328,6 +5313,56 @@ function truncateToolResult(partPath) {
     return { success: false };
   }
 }
+function truncateUntilTargetTokens(sessionID, currentTokens, maxTokens, targetRatio = 0.8, charsPerToken = 4) {
+  const targetTokens = Math.floor(maxTokens * targetRatio);
+  const tokensToReduce = currentTokens - targetTokens;
+  const charsToReduce = tokensToReduce * charsPerToken;
+  if (tokensToReduce <= 0) {
+    return {
+      success: true,
+      sufficient: true,
+      truncatedCount: 0,
+      totalBytesRemoved: 0,
+      targetBytesToRemove: 0,
+      truncatedTools: []
+    };
+  }
+  const results = findToolResultsBySize(sessionID);
+  if (results.length === 0) {
+    return {
+      success: false,
+      sufficient: false,
+      truncatedCount: 0,
+      totalBytesRemoved: 0,
+      targetBytesToRemove: charsToReduce,
+      truncatedTools: []
+    };
+  }
+  let totalRemoved = 0;
+  let truncatedCount = 0;
+  const truncatedTools = [];
+  for (const result of results) {
+    const truncateResult = truncateToolResult(result.partPath);
+    if (truncateResult.success) {
+      truncatedCount++;
+      const removedSize = truncateResult.originalSize ?? result.outputSize;
+      totalRemoved += removedSize;
+      truncatedTools.push({
+        toolName: truncateResult.toolName ?? result.toolName,
+        originalSize: removedSize
+      });
+    }
+  }
+  const sufficient = totalRemoved >= charsToReduce;
+  return {
+    success: truncatedCount > 0,
+    sufficient,
+    truncatedCount,
+    totalBytesRemoved: totalRemoved,
+    targetBytesToRemove: charsToReduce,
+    truncatedTools
+  };
+}
 
 // src/hooks/anthropic-auto-compact/executor.ts
 function getOrCreateRetryState(autoCompactState, sessionID) {
@@ -5426,14 +5461,97 @@ function clearSessionState(autoCompactState, sessionID) {
   autoCompactState.retryStateBySession.delete(sessionID);
   autoCompactState.fallbackStateBySession.delete(sessionID);
   autoCompactState.truncateStateBySession.delete(sessionID);
+  autoCompactState.emptyContentAttemptBySession.delete(sessionID);
   autoCompactState.compactionInProgress.delete(sessionID);
 }
-async function executeCompact(sessionID, msg, autoCompactState, client, directory) {
+function getOrCreateEmptyContentAttempt(autoCompactState, sessionID) {
+  return autoCompactState.emptyContentAttemptBySession.get(sessionID) ?? 0;
+}
+async function fixEmptyMessages(sessionID, autoCompactState, client) {
+  const attempt = getOrCreateEmptyContentAttempt(autoCompactState, sessionID);
+  autoCompactState.emptyContentAttemptBySession.set(sessionID, attempt + 1);
+  const emptyMessageIds = findEmptyMessages(sessionID);
+  if (emptyMessageIds.length === 0) {
+    await client.tui.showToast({
+      body: {
+        title: "Empty Content Error",
+        message: "No empty messages found in storage. Cannot auto-recover.",
+        variant: "error",
+        duration: 5000
+      }
+    }).catch(() => {});
+    return false;
+  }
+  let fixed = false;
+  for (const messageID of emptyMessageIds) {
+    const success = injectTextPart(sessionID, messageID, "[user interrupted]");
+    if (success)
+      fixed = true;
+  }
+  if (fixed) {
+    await client.tui.showToast({
+      body: {
+        title: "Session Recovery",
+        message: `Fixed ${emptyMessageIds.length} empty messages. Retrying...`,
+        variant: "warning",
+        duration: 3000
+      }
+    }).catch(() => {});
+  }
+  return fixed;
+}
+async function executeCompact(sessionID, msg, autoCompactState, client, directory, experimental) {
   if (autoCompactState.compactionInProgress.has(sessionID)) {
     return;
   }
   autoCompactState.compactionInProgress.add(sessionID);
+  const errorData = autoCompactState.errorDataBySession.get(sessionID);
   const truncateState = getOrCreateTruncateState(autoCompactState, sessionID);
+  if (experimental?.aggressive_truncation && errorData?.currentTokens && errorData?.maxTokens && errorData.currentTokens > errorData.maxTokens && truncateState.truncateAttempt < TRUNCATE_CONFIG.maxTruncateAttempts) {
+    log("[auto-compact] aggressive truncation triggered (experimental)", {
+      currentTokens: errorData.currentTokens,
+      maxTokens: errorData.maxTokens,
+      targetRatio: TRUNCATE_CONFIG.targetTokenRatio
+    });
+    const aggressiveResult = truncateUntilTargetTokens(sessionID, errorData.currentTokens, errorData.maxTokens, TRUNCATE_CONFIG.targetTokenRatio, TRUNCATE_CONFIG.charsPerToken);
+    if (aggressiveResult.truncatedCount > 0) {
+      truncateState.truncateAttempt += aggressiveResult.truncatedCount;
+      const toolNames = aggressiveResult.truncatedTools.map((t) => t.toolName).join(", ");
+      const statusMsg = aggressiveResult.sufficient ? `Truncated ${aggressiveResult.truncatedCount} outputs (${formatBytes(aggressiveResult.totalBytesRemoved)})` : `Truncated ${aggressiveResult.truncatedCount} outputs (${formatBytes(aggressiveResult.totalBytesRemoved)}) but need ${formatBytes(aggressiveResult.targetBytesToRemove)}. Falling back to summarize/revert...`;
+      await client.tui.showToast({
+        body: {
+          title: aggressiveResult.sufficient ? "Aggressive Truncation" : "Partial Truncation",
+          message: `${statusMsg}: ${toolNames}`,
+          variant: "warning",
+          duration: 4000
+        }
+      }).catch(() => {});
+      log("[auto-compact] aggressive truncation completed", aggressiveResult);
+      if (aggressiveResult.sufficient) {
+        autoCompactState.compactionInProgress.delete(sessionID);
+        setTimeout(async () => {
+          try {
+            await client.session.prompt_async({
+              path: { sessionID },
+              body: { parts: [{ type: "text", text: "Continue" }] },
+              query: { directory }
+            });
+          } catch {}
+        }, 500);
+        return;
+      }
+    } else {
+      await client.tui.showToast({
+        body: {
+          title: "Truncation Skipped",
+          message: "No tool outputs found to truncate.",
+          variant: "warning",
+          duration: 3000
+        }
+      }).catch(() => {});
+    }
+  }
+  let skipSummarize = false;
   if (truncateState.truncateAttempt < TRUNCATE_CONFIG.maxTruncateAttempts) {
     const largest = findLargestToolResult(sessionID);
     if (largest && largest.outputSize >= TRUNCATE_CONFIG.minOutputSizeToTruncate) {
@@ -5461,10 +5579,58 @@ async function executeCompact(sessionID, msg, autoCompactState, client, director
         }, 500);
         return;
       }
+    } else if (errorData?.currentTokens && errorData?.maxTokens && errorData.currentTokens > errorData.maxTokens) {
+      skipSummarize = true;
+      await client.tui.showToast({
+        body: {
+          title: "Summarize Skipped",
+          message: `Over token limit (${errorData.currentTokens}/${errorData.maxTokens}) with nothing to truncate. Going to revert...`,
+          variant: "warning",
+          duration: 3000
+        }
+      }).catch(() => {});
+    } else if (!errorData?.currentTokens) {
+      await client.tui.showToast({
+        body: {
+          title: "Truncation Skipped",
+          message: "No large tool outputs found.",
+          variant: "warning",
+          duration: 3000
+        }
+      }).catch(() => {});
     }
   }
   const retryState = getOrCreateRetryState(autoCompactState, sessionID);
-  if (retryState.attempt < RETRY_CONFIG.maxAttempts) {
+  if (experimental?.empty_message_recovery && errorData?.errorType?.includes("non-empty content")) {
+    const attempt = getOrCreateEmptyContentAttempt(autoCompactState, sessionID);
+    if (attempt < 3) {
+      const fixed = await fixEmptyMessages(sessionID, autoCompactState, client);
+      if (fixed) {
+        autoCompactState.compactionInProgress.delete(sessionID);
+        setTimeout(() => {
+          executeCompact(sessionID, msg, autoCompactState, client, directory, experimental);
+        }, 500);
+        return;
+      }
+    } else {
+      await client.tui.showToast({
+        body: {
+          title: "Recovery Failed",
+          message: "Max recovery attempts (3) reached for empty content error. Please start a new session.",
+          variant: "error",
+          duration: 1e4
+        }
+      }).catch(() => {});
+      autoCompactState.compactionInProgress.delete(sessionID);
+      return;
+    }
+  }
+  if (Date.now() - retryState.lastAttemptTime > 300000) {
+    retryState.attempt = 0;
+    autoCompactState.fallbackStateBySession.delete(sessionID);
+    autoCompactState.truncateStateBySession.delete(sessionID);
+  }
+  if (!skipSummarize && retryState.attempt < RETRY_CONFIG.maxAttempts) {
     retryState.attempt++;
     retryState.lastAttemptTime = Date.now();
     const providerID = msg.providerID;
@@ -5484,7 +5650,7 @@ async function executeCompact(sessionID, msg, autoCompactState, client, director
           body: { providerID, modelID },
           query: { directory }
         });
-        clearSessionState(autoCompactState, sessionID);
+        autoCompactState.compactionInProgress.delete(sessionID);
         setTimeout(async () => {
           try {
             await client.session.prompt_async({
@@ -5500,10 +5666,19 @@ async function executeCompact(sessionID, msg, autoCompactState, client, director
         const delay = RETRY_CONFIG.initialDelayMs * Math.pow(RETRY_CONFIG.backoffFactor, retryState.attempt - 1);
         const cappedDelay = Math.min(delay, RETRY_CONFIG.maxDelayMs);
         setTimeout(() => {
-          executeCompact(sessionID, msg, autoCompactState, client, directory);
+          executeCompact(sessionID, msg, autoCompactState, client, directory, experimental);
         }, cappedDelay);
         return;
       }
+    } else {
+      await client.tui.showToast({
+        body: {
+          title: "Summarize Skipped",
+          message: "Missing providerID or modelID. Skipping to revert...",
+          variant: "warning",
+          duration: 3000
+        }
+      }).catch(() => {});
     }
   }
   const fallbackState = getOrCreateFallbackState(autoCompactState, sessionID);
@@ -5537,10 +5712,19 @@ async function executeCompact(sessionID, msg, autoCompactState, client, director
         truncateState.truncateAttempt = 0;
         autoCompactState.compactionInProgress.delete(sessionID);
         setTimeout(() => {
-          executeCompact(sessionID, msg, autoCompactState, client, directory);
+          executeCompact(sessionID, msg, autoCompactState, client, directory, experimental);
         }, 1000);
         return;
       } catch {}
+    } else {
+      await client.tui.showToast({
+        body: {
+          title: "Revert Skipped",
+          message: "Could not find last message pair to revert.",
+          variant: "warning",
+          duration: 3000
+        }
+      }).catch(() => {});
     }
   }
   clearSessionState(autoCompactState, sessionID);
@@ -5562,11 +5746,13 @@ function createAutoCompactState() {
     retryStateBySession: new Map,
     fallbackStateBySession: new Map,
     truncateStateBySession: new Map,
+    emptyContentAttemptBySession: new Map,
     compactionInProgress: new Set
   };
 }
-function createAnthropicAutoCompactHook(ctx) {
+function createAnthropicAutoCompactHook(ctx, options) {
   const autoCompactState = createAutoCompactState();
+  const experimental = options?.experimental;
   const eventHandler = async ({ event }) => {
     const props = event.properties;
     if (event.type === "session.deleted") {
@@ -5577,15 +5763,18 @@ function createAnthropicAutoCompactHook(ctx) {
         autoCompactState.retryStateBySession.delete(sessionInfo.id);
         autoCompactState.fallbackStateBySession.delete(sessionInfo.id);
         autoCompactState.truncateStateBySession.delete(sessionInfo.id);
+        autoCompactState.emptyContentAttemptBySession.delete(sessionInfo.id);
         autoCompactState.compactionInProgress.delete(sessionInfo.id);
       }
       return;
     }
     if (event.type === "session.error") {
       const sessionID = props?.sessionID;
+      log("[auto-compact] session.error received", { sessionID, error: props?.error });
       if (!sessionID)
         return;
       const parsed = parseAnthropicTokenLimitError(props?.error);
+      log("[auto-compact] parsed result", { parsed, hasError: !!props?.error });
       if (parsed) {
         autoCompactState.pendingCompact.add(sessionID);
         autoCompactState.errorDataBySession.set(sessionID, parsed);
@@ -5595,19 +5784,17 @@ function createAnthropicAutoCompactHook(ctx) {
         const lastAssistant = await getLastAssistant(sessionID, ctx.client, ctx.directory);
         const providerID = parsed.providerID ?? lastAssistant?.providerID;
         const modelID = parsed.modelID ?? lastAssistant?.modelID;
-        if (providerID && modelID) {
-          await ctx.client.tui.showToast({
-            body: {
-              title: "Context Limit Hit",
-              message: "Truncating large tool outputs and recovering...",
-              variant: "warning",
-              duration: 3000
-            }
-          }).catch(() => {});
-          setTimeout(() => {
-            executeCompact(sessionID, { providerID, modelID }, autoCompactState, ctx.client, ctx.directory);
-          }, 300);
-        }
+        await ctx.client.tui.showToast({
+          body: {
+            title: "Context Limit Hit",
+            message: "Truncating large tool outputs and recovering...",
+            variant: "warning",
+            duration: 3000
+          }
+        }).catch(() => {});
+        setTimeout(() => {
+          executeCompact(sessionID, { providerID, modelID }, autoCompactState, ctx.client, ctx.directory, experimental);
+        }, 300);
       }
       return;
     }
@@ -5615,7 +5802,9 @@ function createAnthropicAutoCompactHook(ctx) {
       const info = props?.info;
       const sessionID = info?.sessionID;
       if (sessionID && info?.role === "assistant" && info.error) {
+        log("[auto-compact] message.updated with error", { sessionID, error: info.error });
         const parsed = parseAnthropicTokenLimitError(info.error);
+        log("[auto-compact] message.updated parsed result", { parsed });
         if (parsed) {
           parsed.providerID = info.providerID;
           parsed.modelID = info.modelID;
@@ -5632,40 +5821,22 @@ function createAnthropicAutoCompactHook(ctx) {
       if (!autoCompactState.pendingCompact.has(sessionID))
         return;
       const errorData = autoCompactState.errorDataBySession.get(sessionID);
-      if (errorData?.providerID && errorData?.modelID) {
-        await ctx.client.tui.showToast({
-          body: {
-            title: "Auto Compact",
-            message: "Token limit exceeded. Summarizing session...",
-            variant: "warning",
-            duration: 3000
-          }
-        }).catch(() => {});
-        await executeCompact(sessionID, { providerID: errorData.providerID, modelID: errorData.modelID }, autoCompactState, ctx.client, ctx.directory);
-        return;
-      }
       const lastAssistant = await getLastAssistant(sessionID, ctx.client, ctx.directory);
-      if (!lastAssistant) {
-        autoCompactState.pendingCompact.delete(sessionID);
-        return;
-      }
-      if (lastAssistant.summary === true) {
-        autoCompactState.pendingCompact.delete(sessionID);
-        return;
-      }
-      if (!lastAssistant.modelID || !lastAssistant.providerID) {
+      if (lastAssistant?.summary === true) {
         autoCompactState.pendingCompact.delete(sessionID);
         return;
       }
+      const providerID = errorData?.providerID ?? lastAssistant?.providerID;
+      const modelID = errorData?.modelID ?? lastAssistant?.modelID;
       await ctx.client.tui.showToast({
         body: {
           title: "Auto Compact",
-          message: "Token limit exceeded. Summarizing session...",
+          message: "Token limit exceeded. Attempting recovery...",
           variant: "warning",
           duration: 3000
         }
       }).catch(() => {});
-      await executeCompact(sessionID, lastAssistant, autoCompactState, ctx.client, ctx.directory);
+      await executeCompact(sessionID, { providerID, modelID }, autoCompactState, ctx.client, ctx.directory, experimental);
     }
   };
   return {
@@ -5939,8 +6110,8 @@ function createThinkModeHook() {
   };
 }
 // src/hooks/claude-code-hooks/config.ts
-import { homedir as homedir4 } from "os";
-import { join as join18 } from "path";
+import { homedir as homedir6 } from "os";
+import { join as join19 } from "path";
 import { existsSync as existsSync14 } from "fs";
 function normalizeHookMatcher(raw) {
   return {
@@ -5964,11 +6135,11 @@ function normalizeHooksConfig(raw) {
   return result;
 }
 function getClaudeSettingsPaths(customPath) {
-  const home = homedir4();
+  const home = homedir6();
   const paths = [
-    join18(home, ".claude", "settings.json"),
-    join18(process.cwd(), ".claude", "settings.json"),
-    join18(process.cwd(), ".claude", "settings.local.json")
+    join19(home, ".claude", "settings.json"),
+    join19(process.cwd(), ".claude", "settings.json"),
+    join19(process.cwd(), ".claude", "settings.local.json")
   ];
   if (customPath && existsSync14(customPath)) {
     paths.unshift(customPath);
@@ -6012,21 +6183,21 @@ async function loadClaudeHooksConfig(customSettingsPath) {
 
 // src/hooks/claude-code-hooks/config-loader.ts
 import { existsSync as existsSync15 } from "fs";
-import { homedir as homedir5 } from "os";
-import { join as join19 } from "path";
-var USER_CONFIG_PATH = join19(homedir5(), ".config", "opencode", "opencode-cc-plugin.json");
+import { homedir as homedir7 } from "os";
+import { join as join20 } from "path";
+var USER_CONFIG_PATH = join20(homedir7(), ".config", "opencode", "opencode-cc-plugin.json");
 function getProjectConfigPath() {
-  return join19(process.cwd(), ".opencode", "opencode-cc-plugin.json");
+  return join20(process.cwd(), ".opencode", "opencode-cc-plugin.json");
 }
-async function loadConfigFromPath(path3) {
-  if (!existsSync15(path3)) {
+async function loadConfigFromPath(path4) {
+  if (!existsSync15(path4)) {
     return null;
   }
   try {
-    const content = await Bun.file(path3).text();
+    const content = await Bun.file(path4).text();
     return JSON.parse(content);
   } catch (error) {
-    log("Failed to load config", { path: path3, error });
+    log("Failed to load config", { path: path4, error });
     return null;
   }
 }
@@ -6198,13 +6369,13 @@ async function executePreToolUseHooks(ctx, config, extendedConfig) {
 }
 
 // src/hooks/claude-code-hooks/transcript.ts
-import { join as join20 } from "path";
+import { join as join21 } from "path";
 import { mkdirSync as mkdirSync6, appendFileSync as appendFileSync5, existsSync as existsSync16, writeFileSync as writeFileSync6, unlinkSync as unlinkSync5 } from "fs";
-import { homedir as homedir6, tmpdir as tmpdir5 } from "os";
+import { homedir as homedir8, tmpdir as tmpdir5 } from "os";
 import { randomUUID } from "crypto";
-var TRANSCRIPT_DIR = join20(homedir6(), ".claude", "transcripts");
+var TRANSCRIPT_DIR = join21(homedir8(), ".claude", "transcripts");
 function getTranscriptPath(sessionId) {
-  return join20(TRANSCRIPT_DIR, `${sessionId}.jsonl`);
+  return join21(TRANSCRIPT_DIR, `${sessionId}.jsonl`);
 }
 function ensureTranscriptDir() {
   if (!existsSync16(TRANSCRIPT_DIR)) {
@@ -6213,10 +6384,10 @@ function ensureTranscriptDir() {
 }
 function appendTranscriptEntry(sessionId, entry) {
   ensureTranscriptDir();
-  const path3 = getTranscriptPath(sessionId);
+  const path4 = getTranscriptPath(sessionId);
   const line = JSON.stringify(entry) + `
 `;
-  appendFileSync5(path3, line);
+  appendFileSync5(path4, line);
 }
 function recordToolUse(sessionId, toolName, toolInput) {
   appendTranscriptEntry(sessionId, {
@@ -6294,7 +6465,7 @@ async function buildTranscriptFromSession(client, sessionId, directory, currentT
       }
     };
     entries.push(JSON.stringify(currentEntry));
-    const tempPath = join20(tmpdir5(), `opencode-transcript-${sessionId}-${randomUUID()}.jsonl`);
+    const tempPath = join21(tmpdir5(), `opencode-transcript-${sessionId}-${randomUUID()}.jsonl`);
     writeFileSync6(tempPath, entries.join(`
 `) + `
 `);
@@ -6314,7 +6485,7 @@ async function buildTranscriptFromSession(client, sessionId, directory, currentT
           ]
         }
       };
-      const tempPath = join20(tmpdir5(), `opencode-transcript-${sessionId}-${randomUUID()}.jsonl`);
+      const tempPath = join21(tmpdir5(), `opencode-transcript-${sessionId}-${randomUUID()}.jsonl`);
       writeFileSync6(tempPath, JSON.stringify(currentEntry) + `
 `);
       return tempPath;
@@ -6323,11 +6494,11 @@ async function buildTranscriptFromSession(client, sessionId, directory, currentT
     }
   }
 }
-function deleteTempTranscript(path3) {
-  if (!path3)
+function deleteTempTranscript(path4) {
+  if (!path4)
     return;
   try {
-    unlinkSync5(path3);
+    unlinkSync5(path4);
   } catch {}
 }
 
@@ -6526,11 +6697,11 @@ ${USER_PROMPT_SUBMIT_TAG_CLOSE}`);
 }
 
 // src/hooks/claude-code-hooks/todo.ts
-import { join as join21 } from "path";
-import { homedir as homedir7 } from "os";
-var TODO_DIR = join21(homedir7(), ".claude", "todos");
+import { join as join22 } from "path";
+import { homedir as homedir9 } from "os";
+var TODO_DIR = join22(homedir9(), ".claude", "todos");
 function getTodoPath(sessionId) {
-  return join21(TODO_DIR, `${sessionId}-agent-${sessionId}.json`);
+  return join22(TODO_DIR, `${sessionId}-agent-${sessionId}.json`);
 }
 
 // src/hooks/claude-code-hooks/stop.ts
@@ -6863,7 +7034,7 @@ ${result.message}`;
 }
 // src/hooks/rules-injector/index.ts
 import { readFileSync as readFileSync10 } from "fs";
-import { homedir as homedir8 } from "os";
+import { homedir as homedir10 } from "os";
 import { relative as relative3, resolve as resolve4 } from "path";
 
 // src/hooks/rules-injector/finder.ts
@@ -6873,12 +7044,12 @@ import {
   realpathSync,
   statSync as statSync2
 } from "fs";
-import { dirname as dirname4, join as join23, relative } from "path";
+import { dirname as dirname4, join as join24, relative } from "path";
 
 // src/hooks/rules-injector/constants.ts
-import { join as join22 } from "path";
-var OPENCODE_STORAGE6 = join22(xdgData2 ?? "", "opencode", "storage");
-var RULES_INJECTOR_STORAGE = join22(OPENCODE_STORAGE6, "rules-injector");
+import { join as join23 } from "path";
+var OPENCODE_STORAGE6 = join23(xdgData2 ?? "", "opencode", "storage");
+var RULES_INJECTOR_STORAGE = join23(OPENCODE_STORAGE6, "rules-injector");
 var PROJECT_MARKERS = [
   ".git",
   "pyproject.toml",
@@ -6905,7 +7076,7 @@ function findProjectRoot(startPath) {
   }
   while (true) {
     for (const marker of PROJECT_MARKERS) {
-      const markerPath = join23(current, marker);
+      const markerPath = join24(current, marker);
       if (existsSync17(markerPath)) {
         return current;
       }
@@ -6923,7 +7094,7 @@ function findRuleFilesRecursive(dir, results) {
   try {
     const entries = readdirSync5(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join23(dir, entry.name);
+      const fullPath = join24(dir, entry.name);
       if (entry.isDirectory()) {
         findRuleFilesRecursive(fullPath, results);
       } else if (entry.isFile()) {
@@ -6949,7 +7120,7 @@ function findRuleFiles(projectRoot, homeDir, currentFile) {
   let distance = 0;
   while (true) {
     for (const [parent, subdir] of PROJECT_RULE_SUBDIRS) {
-      const ruleDir = join23(currentDir, parent, subdir);
+      const ruleDir = join24(currentDir, parent, subdir);
       const files = [];
       findRuleFilesRecursive(ruleDir, files);
       for (const filePath of files) {
@@ -6973,7 +7144,7 @@ function findRuleFiles(projectRoot, homeDir, currentFile) {
     currentDir = parentDir;
     distance++;
   }
-  const userRuleDir = join23(homeDir, USER_RULE_DIR);
+  const userRuleDir = join24(homeDir, USER_RULE_DIR);
   const userFiles = [];
   findRuleFilesRecursive(userRuleDir, userFiles);
   for (const filePath of userFiles) {
@@ -7168,9 +7339,9 @@ import {
   writeFileSync as writeFileSync7,
   unlinkSync as unlinkSync6
 } from "fs";
-import { join as join24 } from "path";
+import { join as join25 } from "path";
 function getStoragePath3(sessionID) {
-  return join24(RULES_INJECTOR_STORAGE, `${sessionID}.json`);
+  return join25(RULES_INJECTOR_STORAGE, `${sessionID}.json`);
 }
 function loadInjectedRules(sessionID) {
   const filePath = getStoragePath3(sessionID);
@@ -7231,7 +7402,7 @@ function createRulesInjectorHook(ctx) {
       return;
     const projectRoot = findProjectRoot(filePath);
     const cache2 = getSessionCache(input.sessionID);
-    const home = homedir8();
+    const home = homedir10();
     const ruleFileCandidates = findRuleFiles(projectRoot, home, filePath);
     const toInject = [];
     for (const candidate of ruleFileCandidates) {
@@ -7302,33 +7473,33 @@ function createBackgroundNotificationHook(manager) {
 }
 // src/hooks/auto-update-checker/checker.ts
 import * as fs4 from "fs";
-import * as path4 from "path";
+import * as path5 from "path";
 import { fileURLToPath } from "url";
 
 // src/hooks/auto-update-checker/constants.ts
-import * as path3 from "path";
-import * as os3 from "os";
+import * as path4 from "path";
+import * as os4 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 path3.join(process.env.LOCALAPPDATA ?? os3.homedir(), "opencode");
+    return path4.join(process.env.LOCALAPPDATA ?? os4.homedir(), "opencode");
   }
-  return path3.join(os3.homedir(), ".cache", "opencode");
+  return path4.join(os4.homedir(), ".cache", "opencode");
 }
 var CACHE_DIR = getCacheDir2();
-var VERSION_FILE = path3.join(CACHE_DIR, "version");
-var INSTALLED_PACKAGE_JSON = path3.join(CACHE_DIR, "node_modules", PACKAGE_NAME, "package.json");
-function getUserConfigDir() {
+var VERSION_FILE = path4.join(CACHE_DIR, "version");
+var INSTALLED_PACKAGE_JSON = path4.join(CACHE_DIR, "node_modules", PACKAGE_NAME, "package.json");
+function getUserConfigDir2() {
   if (process.platform === "win32") {
-    return process.env.APPDATA ?? path3.join(os3.homedir(), "AppData", "Roaming");
+    return process.env.APPDATA ?? path4.join(os4.homedir(), "AppData", "Roaming");
   }
-  return process.env.XDG_CONFIG_HOME ?? path3.join(os3.homedir(), ".config");
+  return process.env.XDG_CONFIG_HOME ?? path4.join(os4.homedir(), ".config");
 }
-var USER_CONFIG_DIR = getUserConfigDir();
-var USER_OPENCODE_CONFIG = path3.join(USER_CONFIG_DIR, "opencode", "opencode.json");
-var USER_OPENCODE_CONFIG_JSONC = path3.join(USER_CONFIG_DIR, "opencode", "opencode.jsonc");
+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");
 
 // src/hooks/auto-update-checker/checker.ts
 function isLocalDevMode(directory) {
@@ -7339,8 +7510,8 @@ function stripJsonComments(json) {
 }
 function getConfigPaths(directory) {
   return [
-    path4.join(directory, ".opencode", "opencode.json"),
-    path4.join(directory, ".opencode", "opencode.jsonc"),
+    path5.join(directory, ".opencode", "opencode.json"),
+    path5.join(directory, ".opencode", "opencode.jsonc"),
     USER_OPENCODE_CONFIG,
     USER_OPENCODE_CONFIG_JSONC
   ];
@@ -7371,9 +7542,9 @@ function getLocalDevPath(directory) {
 function findPackageJsonUp(startPath) {
   try {
     const stat = fs4.statSync(startPath);
-    let dir = stat.isDirectory() ? startPath : path4.dirname(startPath);
+    let dir = stat.isDirectory() ? startPath : path5.dirname(startPath);
     for (let i = 0;i < 10; i++) {
-      const pkgPath = path4.join(dir, "package.json");
+      const pkgPath = path5.join(dir, "package.json");
       if (fs4.existsSync(pkgPath)) {
         try {
           const content = fs4.readFileSync(pkgPath, "utf-8");
@@ -7382,7 +7553,7 @@ function findPackageJsonUp(startPath) {
             return pkgPath;
         } catch {}
       }
-      const parent = path4.dirname(dir);
+      const parent = path5.dirname(dir);
       if (parent === dir)
         break;
       dir = parent;
@@ -7439,7 +7610,7 @@ function getCachedVersion() {
     }
   } catch {}
   try {
-    const currentDir = path4.dirname(fileURLToPath(import.meta.url));
+    const currentDir = path5.dirname(fileURLToPath(import.meta.url));
     const pkgPath = findPackageJsonUp(currentDir);
     if (pkgPath) {
       const content = fs4.readFileSync(pkgPath, "utf-8");
@@ -7501,11 +7672,11 @@ async function checkForUpdate(directory) {
 
 // src/hooks/auto-update-checker/cache.ts
 import * as fs5 from "fs";
-import * as path5 from "path";
+import * as path6 from "path";
 function invalidatePackage(packageName = PACKAGE_NAME) {
   try {
-    const pkgDir = path5.join(CACHE_DIR, "node_modules", packageName);
-    const pkgJsonPath = path5.join(CACHE_DIR, "package.json");
+    const pkgDir = path6.join(CACHE_DIR, "node_modules", packageName);
+    const pkgJsonPath = path6.join(CACHE_DIR, "package.json");
     let packageRemoved = false;
     let dependencyRemoved = false;
     if (fs5.existsSync(pkgDir)) {
@@ -7536,7 +7707,27 @@ function invalidatePackage(packageName = PACKAGE_NAME) {
 
 // src/hooks/auto-update-checker/index.ts
 function createAutoUpdateCheckerHook(ctx, options = {}) {
-  const { showStartupToast = true } = options;
+  const { showStartupToast = true, isSisyphusEnabled = false } = options;
+  const getToastMessage = (isUpdate, latestVersion) => {
+    if (isSisyphusEnabled) {
+      return isUpdate ? `Sisyphus on steroids is steering OpenCode.
+v${latestVersion} available. Restart to apply.` : `Sisyphus on steroids is steering OpenCode.`;
+    }
+    return isUpdate ? `OpenCode is now on Steroids. oMoMoMoMo...
+v${latestVersion} available. Restart OpenCode to apply.` : `OpenCode is now on Steroids. oMoMoMoMo...`;
+  };
+  const showVersionToast = async (version) => {
+    const displayVersion = version ?? "unknown";
+    await ctx.client.tui.showToast({
+      body: {
+        title: `OhMyOpenCode ${displayVersion}`,
+        message: getToastMessage(false),
+        variant: "info",
+        duration: 5000
+      }
+    }).catch(() => {});
+    log(`[auto-update-checker] Startup toast shown: v${displayVersion}`);
+  };
   let hasChecked = false;
   return {
     event: async ({ event }) => {
@@ -7554,21 +7745,21 @@ function createAutoUpdateCheckerHook(ctx, options = {}) {
           log("[auto-update-checker] Skipped: local development mode");
           if (showStartupToast) {
             const version = getLocalDevVersion(ctx.directory) ?? getCachedVersion();
-            await showVersionToast(ctx, version);
+            await showVersionToast(version);
           }
           return;
         }
         if (result.isPinned) {
           log(`[auto-update-checker] Skipped: version pinned to ${result.currentVersion}`);
           if (showStartupToast) {
-            await showVersionToast(ctx, result.currentVersion);
+            await showVersionToast(result.currentVersion);
           }
           return;
         }
         if (!result.needsUpdate) {
           log("[auto-update-checker] No update needed");
           if (showStartupToast) {
-            await showVersionToast(ctx, result.currentVersion);
+            await showVersionToast(result.currentVersion);
           }
           return;
         }
@@ -7576,8 +7767,7 @@ function createAutoUpdateCheckerHook(ctx, options = {}) {
         await ctx.client.tui.showToast({
           body: {
             title: `OhMyOpenCode ${result.latestVersion}`,
-            message: `OpenCode is now on Steroids. oMoMoMoMo...
-v${result.latestVersion} available. Restart OpenCode to apply.`,
+            message: getToastMessage(true, result.latestVersion ?? undefined),
             variant: "info",
             duration: 8000
           }
@@ -7586,20 +7776,27 @@ v${result.latestVersion} available. Restart OpenCode to apply.`,
       } catch (err) {
         log("[auto-update-checker] Error during update check:", err);
       }
+      await showConfigErrorsIfAny(ctx);
     }
   };
 }
-async function showVersionToast(ctx, version) {
-  const displayVersion = version ?? "unknown";
+async function showConfigErrorsIfAny(ctx) {
+  const errors = getConfigLoadErrors();
+  if (errors.length === 0)
+    return;
+  const errorMessages = errors.map((e) => `${e.path}: ${e.error}`).join(`
+`);
   await ctx.client.tui.showToast({
     body: {
-      title: `OhMyOpenCode ${displayVersion}`,
-      message: "OpenCode is now on Steroids. oMoMoMoMo...",
-      variant: "info",
-      duration: 5000
+      title: "Config Load Error",
+      message: `Failed to load config:
+${errorMessages}`,
+      variant: "error",
+      duration: 1e4
     }
   }).catch(() => {});
-  log(`[auto-update-checker] Startup toast shown: v${displayVersion}`);
+  log(`[auto-update-checker] Config load errors shown: ${errors.length} error(s)`);
+  clearConfigLoadErrors();
 }
 // src/hooks/agent-usage-reminder/storage.ts
 import {
@@ -7609,12 +7806,12 @@ import {
   writeFileSync as writeFileSync9,
   unlinkSync as unlinkSync7
 } from "fs";
-import { join as join29 } from "path";
+import { join as join30 } from "path";
 
 // src/hooks/agent-usage-reminder/constants.ts
-import { join as join28 } from "path";
-var OPENCODE_STORAGE7 = join28(xdgData2 ?? "", "opencode", "storage");
-var AGENT_USAGE_REMINDER_STORAGE = join28(OPENCODE_STORAGE7, "agent-usage-reminder");
+import { join as join29 } from "path";
+var OPENCODE_STORAGE7 = join29(xdgData2 ?? "", "opencode", "storage");
+var AGENT_USAGE_REMINDER_STORAGE = join29(OPENCODE_STORAGE7, "agent-usage-reminder");
 var TARGET_TOOLS = new Set([
   "grep",
   "safe_grep",
@@ -7659,7 +7856,7 @@ ALWAYS prefer: Multiple parallel background_task calls > Direct tool calls
 
 // src/hooks/agent-usage-reminder/storage.ts
 function getStoragePath4(sessionID) {
-  return join29(AGENT_USAGE_REMINDER_STORAGE, `${sessionID}.json`);
+  return join30(AGENT_USAGE_REMINDER_STORAGE, `${sessionID}.json`);
 }
 function loadAgentUsageState(sessionID) {
   const filePath = getStoragePath4(sessionID);
@@ -7829,13 +8026,9 @@ function extractPromptText2(parts) {
 }
 
 // src/hooks/keyword-detector/index.ts
-var injectedSessions = new Set;
 function createKeywordDetectorHook() {
   return {
     "chat.message": async (input, output) => {
-      if (injectedSessions.has(input.sessionID)) {
-        return;
-      }
       const promptText = extractPromptText2(output.parts);
       const messages = detectKeywords(promptText);
       if (messages.length === 0) {
@@ -7853,19 +8046,8 @@ function createKeywordDetectorHook() {
         tools: message.tools
       });
       if (success) {
-        injectedSessions.add(input.sessionID);
         log("Keyword context injected", { sessionID: input.sessionID });
       }
-    },
-    event: async ({
-      event
-    }) => {
-      if (event.type === "session.deleted") {
-        const props = event.properties;
-        if (props?.info?.id) {
-          injectedSessions.delete(props.info.id);
-        }
-      }
     }
   };
 }
@@ -7909,12 +8091,12 @@ import {
   writeFileSync as writeFileSync10,
   unlinkSync as unlinkSync8
 } from "fs";
-import { join as join31 } from "path";
+import { join as join32 } from "path";
 
 // src/hooks/interactive-bash-session/constants.ts
-import { join as join30 } from "path";
-var OPENCODE_STORAGE8 = join30(xdgData2 ?? "", "opencode", "storage");
-var INTERACTIVE_BASH_SESSION_STORAGE = join30(OPENCODE_STORAGE8, "interactive-bash-session");
+import { join as join31 } from "path";
+var OPENCODE_STORAGE8 = join31(xdgData2 ?? "", "opencode", "storage");
+var INTERACTIVE_BASH_SESSION_STORAGE = join31(OPENCODE_STORAGE8, "interactive-bash-session");
 var OMO_SESSION_PREFIX = "omo-";
 function buildSessionReminderMessage(sessions) {
   if (sessions.length === 0)
@@ -7926,7 +8108,7 @@ function buildSessionReminderMessage(sessions) {
 
 // src/hooks/interactive-bash-session/storage.ts
 function getStoragePath5(sessionID) {
-  return join31(INTERACTIVE_BASH_SESSION_STORAGE, `${sessionID}.json`);
+  return join32(INTERACTIVE_BASH_SESSION_STORAGE, `${sessionID}.json`);
 }
 function loadInteractiveBashSessionState(sessionID) {
   const filePath = getStoragePath5(sessionID);
@@ -8136,7 +8318,7 @@ function createInteractiveBashSessionHook(_ctx) {
   };
 }
 // src/hooks/empty-message-sanitizer/index.ts
-var PLACEHOLDER_TEXT2 = "[user interrupted]";
+var PLACEHOLDER_TEXT = "[user interrupted]";
 function hasTextContent(part) {
   if (part.type === "text") {
     const text = part.text;
@@ -8165,7 +8347,7 @@ function createEmptyMessageSanitizerHook() {
             if (part.type === "text") {
               const textPart = part;
               if (!textPart.text || !textPart.text.trim()) {
-                textPart.text = PLACEHOLDER_TEXT2;
+                textPart.text = PLACEHOLDER_TEXT;
                 textPart.synthetic = true;
                 injected = true;
                 break;
@@ -8179,7 +8361,7 @@ function createEmptyMessageSanitizerHook() {
               messageID: message.info.id,
               sessionID: message.info.sessionID ?? "",
               type: "text",
-              text: PLACEHOLDER_TEXT2,
+              text: PLACEHOLDER_TEXT,
               synthetic: true
             };
             if (insertIndex === -1) {
@@ -8193,7 +8375,7 @@ function createEmptyMessageSanitizerHook() {
           if (part.type === "text") {
             const textPart = part;
             if (textPart.text !== undefined && textPart.text.trim() === "") {
-              textPart.text = PLACEHOLDER_TEXT2;
+              textPart.text = PLACEHOLDER_TEXT;
               textPart.synthetic = true;
             }
           }
@@ -9903,8 +10085,8 @@ async function createGoogleAntigravityAuthPlugin({
 }
 // src/features/claude-code-command-loader/loader.ts
 import { existsSync as existsSync23, readdirSync as readdirSync6, readFileSync as readFileSync15 } from "fs";
-import { homedir as homedir10 } from "os";
-import { join as join32, basename } from "path";
+import { homedir as homedir12 } from "os";
+import { join as join33, basename } from "path";
 function loadCommandsFromDir(commandsDir, scope) {
   if (!existsSync23(commandsDir)) {
     return [];
@@ -9914,7 +10096,7 @@ function loadCommandsFromDir(commandsDir, scope) {
   for (const entry of entries) {
     if (!isMarkdownFile(entry))
       continue;
-    const commandPath = join32(commandsDir, entry.name);
+    const commandPath = join33(commandsDir, entry.name);
     const commandName = basename(entry.name, ".md");
     try {
       const content = readFileSync15(commandPath, "utf-8");
@@ -9957,29 +10139,29 @@ function commandsToRecord(commands) {
   return result;
 }
 function loadUserCommands() {
-  const userCommandsDir = join32(homedir10(), ".claude", "commands");
+  const userCommandsDir = join33(homedir12(), ".claude", "commands");
   const commands = loadCommandsFromDir(userCommandsDir, "user");
   return commandsToRecord(commands);
 }
 function loadProjectCommands() {
-  const projectCommandsDir = join32(process.cwd(), ".claude", "commands");
+  const projectCommandsDir = join33(process.cwd(), ".claude", "commands");
   const commands = loadCommandsFromDir(projectCommandsDir, "project");
   return commandsToRecord(commands);
 }
 function loadOpencodeGlobalCommands() {
-  const opencodeCommandsDir = join32(homedir10(), ".config", "opencode", "command");
+  const opencodeCommandsDir = join33(homedir12(), ".config", "opencode", "command");
   const commands = loadCommandsFromDir(opencodeCommandsDir, "opencode");
   return commandsToRecord(commands);
 }
 function loadOpencodeProjectCommands() {
-  const opencodeProjectDir = join32(process.cwd(), ".opencode", "command");
+  const opencodeProjectDir = join33(process.cwd(), ".opencode", "command");
   const commands = loadCommandsFromDir(opencodeProjectDir, "opencode-project");
   return commandsToRecord(commands);
 }
 // src/features/claude-code-skill-loader/loader.ts
 import { existsSync as existsSync24, readdirSync as readdirSync7, readFileSync as readFileSync16 } from "fs";
-import { homedir as homedir11 } from "os";
-import { join as join33 } from "path";
+import { homedir as homedir13 } from "os";
+import { join as join34 } from "path";
 function loadSkillsFromDir(skillsDir, scope) {
   if (!existsSync24(skillsDir)) {
     return [];
@@ -9989,11 +10171,11 @@ function loadSkillsFromDir(skillsDir, scope) {
   for (const entry of entries) {
     if (entry.name.startsWith("."))
       continue;
-    const skillPath = join33(skillsDir, entry.name);
+    const skillPath = join34(skillsDir, entry.name);
     if (!entry.isDirectory() && !entry.isSymbolicLink())
       continue;
     const resolvedPath = resolveSymlink(skillPath);
-    const skillMdPath = join33(resolvedPath, "SKILL.md");
+    const skillMdPath = join34(resolvedPath, "SKILL.md");
     if (!existsSync24(skillMdPath))
       continue;
     try {
@@ -10003,6 +10185,9 @@ function loadSkillsFromDir(skillsDir, scope) {
       const originalDescription = data.description || "";
       const formattedDescription = `(${scope} - Skill) ${originalDescription}`;
       const wrappedTemplate = `<skill-instruction>
+Base directory for this skill: ${resolvedPath}/
+File references (@path) in this skill are relative to this directory.
+
 ${body.trim()}
 </skill-instruction>
 
@@ -10028,7 +10213,7 @@ $ARGUMENTS
   return skills;
 }
 function loadUserSkillsAsCommands() {
-  const userSkillsDir = join33(homedir11(), ".claude", "skills");
+  const userSkillsDir = join34(homedir13(), ".claude", "skills");
   const skills = loadSkillsFromDir(userSkillsDir, "user");
   return skills.reduce((acc, skill) => {
     acc[skill.name] = skill.definition;
@@ -10036,7 +10221,7 @@ function loadUserSkillsAsCommands() {
   }, {});
 }
 function loadProjectSkillsAsCommands() {
-  const projectSkillsDir = join33(process.cwd(), ".claude", "skills");
+  const projectSkillsDir = join34(process.cwd(), ".claude", "skills");
   const skills = loadSkillsFromDir(projectSkillsDir, "project");
   return skills.reduce((acc, skill) => {
     acc[skill.name] = skill.definition;
@@ -10045,8 +10230,8 @@ function loadProjectSkillsAsCommands() {
 }
 // src/features/claude-code-agent-loader/loader.ts
 import { existsSync as existsSync25, readdirSync as readdirSync8, readFileSync as readFileSync17 } from "fs";
-import { homedir as homedir12 } from "os";
-import { join as join34, basename as basename2 } from "path";
+import { homedir as homedir14 } from "os";
+import { join as join35, basename as basename2 } from "path";
 function parseToolsConfig(toolsStr) {
   if (!toolsStr)
     return;
@@ -10068,7 +10253,7 @@ function loadAgentsFromDir(agentsDir, scope) {
   for (const entry of entries) {
     if (!isMarkdownFile(entry))
       continue;
-    const agentPath = join34(agentsDir, entry.name);
+    const agentPath = join35(agentsDir, entry.name);
     const agentName = basename2(entry.name, ".md");
     try {
       const content = readFileSync17(agentPath, "utf-8");
@@ -10098,7 +10283,7 @@ function loadAgentsFromDir(agentsDir, scope) {
   return agents;
 }
 function loadUserAgents() {
-  const userAgentsDir = join34(homedir12(), ".claude", "agents");
+  const userAgentsDir = join35(homedir14(), ".claude", "agents");
   const agents = loadAgentsFromDir(userAgentsDir, "user");
   const result = {};
   for (const agent of agents) {
@@ -10107,7 +10292,7 @@ function loadUserAgents() {
   return result;
 }
 function loadProjectAgents() {
-  const projectAgentsDir = join34(process.cwd(), ".claude", "agents");
+  const projectAgentsDir = join35(process.cwd(), ".claude", "agents");
   const agents = loadAgentsFromDir(projectAgentsDir, "project");
   const result = {};
   for (const agent of agents) {
@@ -10117,8 +10302,8 @@ function loadProjectAgents() {
 }
 // src/features/claude-code-mcp-loader/loader.ts
 import { existsSync as existsSync26 } from "fs";
-import { homedir as homedir13 } from "os";
-import { join as join35 } from "path";
+import { homedir as homedir15 } from "os";
+import { join as join36 } from "path";
 
 // src/features/claude-code-mcp-loader/env-expander.ts
 function expandEnvVars(value) {
@@ -10184,12 +10369,12 @@ function transformMcpServer(name, server) {
 
 // src/features/claude-code-mcp-loader/loader.ts
 function getMcpConfigPaths() {
-  const home = homedir13();
+  const home = homedir15();
   const cwd = process.cwd();
   return [
-    { path: join35(home, ".claude", ".mcp.json"), scope: "user" },
-    { path: join35(cwd, ".mcp.json"), scope: "project" },
-    { path: join35(cwd, ".claude", ".mcp.json"), scope: "local" }
+    { path: join36(home, ".claude", ".mcp.json"), scope: "user" },
+    { path: join36(cwd, ".mcp.json"), scope: "project" },
+    { path: join36(cwd, ".claude", ".mcp.json"), scope: "local" }
   ];
 }
 async function loadMcpConfigFile(filePath) {
@@ -10208,13 +10393,13 @@ async function loadMcpConfigs() {
   const servers = {};
   const loadedServers = [];
   const paths = getMcpConfigPaths();
-  for (const { path: path6, scope } of paths) {
-    const config = await loadMcpConfigFile(path6);
+  for (const { path: path7, scope } of paths) {
+    const config = await loadMcpConfigFile(path7);
     if (!config?.mcpServers)
       continue;
     for (const [name, serverConfig] of Object.entries(config.mcpServers)) {
       if (serverConfig.disabled) {
-        log(`Skipping disabled MCP server "${name}"`, { path: path6 });
+        log(`Skipping disabled MCP server "${name}"`, { path: path7 });
         continue;
       }
       try {
@@ -10225,7 +10410,7 @@ async function loadMcpConfigs() {
           loadedServers.splice(existingIndex, 1);
         }
         loadedServers.push({ name, scope, config: transformed });
-        log(`Loaded MCP server "${name}" from ${scope}`, { path: path6 });
+        log(`Loaded MCP server "${name}" from ${scope}`, { path: path7 });
       } catch (error) {
         log(`Failed to transform MCP server "${name}"`, error);
       }
@@ -10422,13 +10607,13 @@ var EXT_TO_LANG = {
 };
 // src/tools/lsp/config.ts
 import { existsSync as existsSync27, readFileSync as readFileSync18 } from "fs";
-import { join as join36 } from "path";
-import { homedir as homedir14 } from "os";
-function loadJsonFile(path6) {
-  if (!existsSync27(path6))
+import { join as join37 } from "path";
+import { homedir as homedir16 } from "os";
+function loadJsonFile(path7) {
+  if (!existsSync27(path7))
     return null;
   try {
-    return JSON.parse(readFileSync18(path6, "utf-8"));
+    return JSON.parse(readFileSync18(path7, "utf-8"));
   } catch {
     return null;
   }
@@ -10436,9 +10621,9 @@ function loadJsonFile(path6) {
 function getConfigPaths2() {
   const cwd = process.cwd();
   return {
-    project: join36(cwd, ".opencode", "oh-my-opencode.json"),
-    user: join36(homedir14(), ".config", "opencode", "oh-my-opencode.json"),
-    opencode: join36(homedir14(), ".config", "opencode", "opencode.json")
+    project: join37(cwd, ".opencode", "oh-my-opencode.json"),
+    user: join37(homedir16(), ".config", "opencode", "oh-my-opencode.json"),
+    opencode: join37(homedir16(), ".config", "opencode", "opencode.json")
   };
 }
 function loadAllConfigs() {
@@ -10531,7 +10716,7 @@ function isServerInstalled(command) {
   const pathEnv = process.env.PATH || "";
   const paths = pathEnv.split(":");
   for (const p of paths) {
-    if (existsSync27(join36(p, cmd))) {
+    if (existsSync27(join37(p, cmd))) {
       return true;
     }
   }
@@ -12140,10 +12325,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path6) {
-  if (!path6)
+function getElementAtPath(obj, path7) {
+  if (!path7)
     return obj;
-  return path6.reduce((acc, key) => acc?.[key], obj);
+  return path7.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -12502,11 +12687,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path6, issues) {
+function prefixIssues(path7, issues) {
   return issues.map((iss) => {
     var _a;
     (_a = iss).path ?? (_a.path = []);
-    iss.path.unshift(path6);
+    iss.path.unshift(path7);
     return iss;
   });
 }
@@ -12674,7 +12859,7 @@ function treeifyError(error, _mapper) {
     return issue2.message;
   };
   const result = { errors: [] };
-  const processError = (error2, path6 = []) => {
+  const processError = (error2, path7 = []) => {
     var _a, _b;
     for (const issue2 of error2.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
@@ -12684,7 +12869,7 @@ function treeifyError(error, _mapper) {
       } else if (issue2.code === "invalid_element") {
         processError({ issues: issue2.issues }, issue2.path);
       } else {
-        const fullpath = [...path6, ...issue2.path];
+        const fullpath = [...path7, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -12716,8 +12901,8 @@ function treeifyError(error, _mapper) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path6 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path6) {
+  const path7 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path7) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -24060,14 +24245,14 @@ var lsp_code_action_resolve = tool({
 });
 // src/tools/ast-grep/constants.ts
 import { createRequire as createRequire4 } from "module";
-import { dirname as dirname6, join as join38 } from "path";
+import { dirname as dirname6, join as join39 } from "path";
 import { existsSync as existsSync30, statSync as statSync4 } from "fs";
 
 // src/tools/ast-grep/downloader.ts
 var {spawn: spawn5 } = globalThis.Bun;
 import { existsSync as existsSync29, mkdirSync as mkdirSync10, chmodSync as chmodSync2, unlinkSync as unlinkSync9 } from "fs";
-import { join as join37 } from "path";
-import { homedir as homedir15 } from "os";
+import { join as join38 } from "path";
+import { homedir as homedir17 } from "os";
 import { createRequire as createRequire3 } from "module";
 var REPO2 = "ast-grep/ast-grep";
 var DEFAULT_VERSION = "0.40.0";
@@ -24092,18 +24277,18 @@ var PLATFORM_MAP2 = {
 function getCacheDir3() {
   if (process.platform === "win32") {
     const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
-    const base2 = localAppData || join37(homedir15(), "AppData", "Local");
-    return join37(base2, "oh-my-opencode", "bin");
+    const base2 = localAppData || join38(homedir17(), "AppData", "Local");
+    return join38(base2, "oh-my-opencode", "bin");
   }
   const xdgCache2 = process.env.XDG_CACHE_HOME;
-  const base = xdgCache2 || join37(homedir15(), ".cache");
-  return join37(base, "oh-my-opencode", "bin");
+  const base = xdgCache2 || join38(homedir17(), ".cache");
+  return join38(base, "oh-my-opencode", "bin");
 }
 function getBinaryName3() {
   return process.platform === "win32" ? "sg.exe" : "sg";
 }
 function getCachedBinaryPath2() {
-  const binaryPath = join37(getCacheDir3(), getBinaryName3());
+  const binaryPath = join38(getCacheDir3(), getBinaryName3());
   return existsSync29(binaryPath) ? binaryPath : null;
 }
 async function extractZip2(archivePath, destDir) {
@@ -24130,12 +24315,12 @@ async function downloadAstGrep(version2 = DEFAULT_VERSION) {
   }
   const cacheDir = getCacheDir3();
   const binaryName = getBinaryName3();
-  const binaryPath = join37(cacheDir, binaryName);
+  const binaryPath = join38(cacheDir, binaryName);
   if (existsSync29(binaryPath)) {
     return binaryPath;
   }
-  const { arch, os: os4 } = platformInfo;
-  const assetName = `app-${arch}-${os4}.zip`;
+  const { arch, os: os5 } = platformInfo;
+  const assetName = `app-${arch}-${os5}.zip`;
   const downloadUrl = `https://github.com/${REPO2}/releases/download/${version2}/${assetName}`;
   console.log(`[oh-my-opencode] Downloading ast-grep binary...`);
   try {
@@ -24146,7 +24331,7 @@ async function downloadAstGrep(version2 = DEFAULT_VERSION) {
     if (!response2.ok) {
       throw new Error(`HTTP ${response2.status}: ${response2.statusText}`);
     }
-    const archivePath = join37(cacheDir, assetName);
+    const archivePath = join38(cacheDir, assetName);
     const arrayBuffer = await response2.arrayBuffer();
     await Bun.write(archivePath, arrayBuffer);
     await extractZip2(archivePath, cacheDir);
@@ -24204,7 +24389,7 @@ function findSgCliPathSync() {
     const require2 = createRequire4(import.meta.url);
     const cliPkgPath = require2.resolve("@ast-grep/cli/package.json");
     const cliDir = dirname6(cliPkgPath);
-    const sgPath = join38(cliDir, binaryName);
+    const sgPath = join39(cliDir, binaryName);
     if (existsSync30(sgPath) && isValidBinary(sgPath)) {
       return sgPath;
     }
@@ -24216,7 +24401,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 = join38(pkgDir, astGrepName);
+      const binaryPath = join39(pkgDir, astGrepName);
       if (existsSync30(binaryPath) && isValidBinary(binaryPath)) {
         return binaryPath;
       }
@@ -24224,9 +24409,9 @@ function findSgCliPathSync() {
   }
   if (process.platform === "darwin") {
     const homebrewPaths = ["/opt/homebrew/bin/sg", "/usr/local/bin/sg"];
-    for (const path6 of homebrewPaths) {
-      if (existsSync30(path6) && isValidBinary(path6)) {
-        return path6;
+    for (const path7 of homebrewPaths) {
+      if (existsSync30(path7) && isValidBinary(path7)) {
+        return path7;
       }
     }
   }
@@ -24244,8 +24429,8 @@ function getSgCliPath() {
   }
   return "sg";
 }
-function setSgCliPath(path6) {
-  resolvedCliPath2 = path6;
+function setSgCliPath(path7) {
+  resolvedCliPath2 = path7;
 }
 var SG_CLI_PATH = getSgCliPath();
 var CLI_LANGUAGES = [
@@ -24592,19 +24777,19 @@ var {spawn: spawn7 } = globalThis.Bun;
 
 // src/tools/grep/constants.ts
 import { existsSync as existsSync33 } from "fs";
-import { join as join40, dirname as dirname7 } from "path";
+import { join as join41, dirname as dirname7 } from "path";
 import { spawnSync } from "child_process";
 
 // src/tools/grep/downloader.ts
 import { existsSync as existsSync32, mkdirSync as mkdirSync11, chmodSync as chmodSync3, unlinkSync as unlinkSync10, readdirSync as readdirSync9 } from "fs";
-import { join as join39 } from "path";
+import { join as join40 } from "path";
 function getInstallDir() {
   const homeDir = process.env.HOME || process.env.USERPROFILE || ".";
-  return join39(homeDir, ".cache", "oh-my-opencode", "bin");
+  return join40(homeDir, ".cache", "oh-my-opencode", "bin");
 }
 function getRgPath() {
   const isWindows2 = process.platform === "win32";
-  return join39(getInstallDir(), isWindows2 ? "rg.exe" : "rg");
+  return join40(getInstallDir(), isWindows2 ? "rg.exe" : "rg");
 }
 function getInstalledRipgrepPath() {
   const rgPath = getRgPath();
@@ -24631,10 +24816,10 @@ function getOpenCodeBundledRg() {
   const isWindows2 = process.platform === "win32";
   const rgName = isWindows2 ? "rg.exe" : "rg";
   const candidates = [
-    join40(execDir, rgName),
-    join40(execDir, "bin", rgName),
-    join40(execDir, "..", "bin", rgName),
-    join40(execDir, "..", "libexec", rgName)
+    join41(execDir, rgName),
+    join41(execDir, "bin", rgName),
+    join41(execDir, "..", "bin", rgName),
+    join41(execDir, "..", "libexec", rgName)
   ];
   for (const candidate of candidates) {
     if (existsSync33(candidate)) {
@@ -25041,8 +25226,8 @@ var glob = tool({
 });
 // src/tools/slashcommand/tools.ts
 import { existsSync as existsSync34, readdirSync as readdirSync10, readFileSync as readFileSync21 } from "fs";
-import { homedir as homedir16 } from "os";
-import { join as join41, basename as basename3, dirname as dirname8 } from "path";
+import { homedir as homedir18 } from "os";
+import { join as join42, basename as basename3, dirname as dirname8 } from "path";
 function discoverCommandsFromDir(commandsDir, scope) {
   if (!existsSync34(commandsDir)) {
     return [];
@@ -25052,7 +25237,7 @@ function discoverCommandsFromDir(commandsDir, scope) {
   for (const entry of entries) {
     if (!isMarkdownFile(entry))
       continue;
-    const commandPath = join41(commandsDir, entry.name);
+    const commandPath = join42(commandsDir, entry.name);
     const commandName = basename3(entry.name, ".md");
     try {
       const content = readFileSync21(commandPath, "utf-8");
@@ -25080,10 +25265,10 @@ function discoverCommandsFromDir(commandsDir, scope) {
   return commands;
 }
 function discoverCommandsSync() {
-  const userCommandsDir = join41(homedir16(), ".claude", "commands");
-  const projectCommandsDir = join41(process.cwd(), ".claude", "commands");
-  const opencodeGlobalDir = join41(homedir16(), ".config", "opencode", "command");
-  const opencodeProjectDir = join41(process.cwd(), ".opencode", "command");
+  const userCommandsDir = join42(homedir18(), ".claude", "commands");
+  const projectCommandsDir = join42(process.cwd(), ".claude", "commands");
+  const opencodeGlobalDir = join42(homedir18(), ".config", "opencode", "command");
+  const opencodeProjectDir = join42(process.cwd(), ".opencode", "command");
   const userCommands = discoverCommandsFromDir(userCommandsDir, "user");
   const opencodeGlobalCommands = discoverCommandsFromDir(opencodeGlobalDir, "opencode");
   const projectCommands = discoverCommandsFromDir(projectCommandsDir, "project");
@@ -25216,8 +25401,8 @@ var SkillFrontmatterSchema = exports_external.object({
 });
 // src/tools/skill/tools.ts
 import { existsSync as existsSync35, readdirSync as readdirSync11, readFileSync as readFileSync22 } from "fs";
-import { homedir as homedir17 } from "os";
-import { join as join42, basename as basename4 } from "path";
+import { homedir as homedir19 } from "os";
+import { join as join43, basename as basename4 } from "path";
 function parseSkillFrontmatter(data) {
   return {
     name: typeof data.name === "string" ? data.name : "",
@@ -25236,10 +25421,10 @@ function discoverSkillsFromDir(skillsDir, scope) {
   for (const entry of entries) {
     if (entry.name.startsWith("."))
       continue;
-    const skillPath = join42(skillsDir, entry.name);
+    const skillPath = join43(skillsDir, entry.name);
     if (entry.isDirectory() || entry.isSymbolicLink()) {
       const resolvedPath = resolveSymlink(skillPath);
-      const skillMdPath = join42(resolvedPath, "SKILL.md");
+      const skillMdPath = join43(resolvedPath, "SKILL.md");
       if (!existsSync35(skillMdPath))
         continue;
       try {
@@ -25258,8 +25443,8 @@ function discoverSkillsFromDir(skillsDir, scope) {
   return skills;
 }
 function discoverSkillsSync() {
-  const userSkillsDir = join42(homedir17(), ".claude", "skills");
-  const projectSkillsDir = join42(process.cwd(), ".claude", "skills");
+  const userSkillsDir = join43(homedir19(), ".claude", "skills");
+  const projectSkillsDir = join43(process.cwd(), ".claude", "skills");
   const userSkills = discoverSkillsFromDir(userSkillsDir, "user");
   const projectSkills = discoverSkillsFromDir(projectSkillsDir, "project");
   return [...projectSkills, ...userSkills];
@@ -25269,7 +25454,7 @@ var skillListForDescription = availableSkills.map((s) => `- ${s.name}: ${s.descr
 `);
 async function parseSkillMd(skillPath) {
   const resolvedPath = resolveSymlink(skillPath);
-  const skillMdPath = join42(resolvedPath, "SKILL.md");
+  const skillMdPath = join43(resolvedPath, "SKILL.md");
   if (!existsSync35(skillMdPath)) {
     return null;
   }
@@ -25285,9 +25470,9 @@ async function parseSkillMd(skillPath) {
       allowedTools: frontmatter2["allowed-tools"],
       metadata: frontmatter2.metadata
     };
-    const referencesDir = join42(resolvedPath, "references");
-    const scriptsDir = join42(resolvedPath, "scripts");
-    const assetsDir = join42(resolvedPath, "assets");
+    const referencesDir = join43(resolvedPath, "references");
+    const scriptsDir = join43(resolvedPath, "scripts");
+    const assetsDir = join43(resolvedPath, "assets");
     const references = existsSync35(referencesDir) ? readdirSync11(referencesDir).filter((f) => !f.startsWith(".")) : [];
     const scripts = existsSync35(scriptsDir) ? readdirSync11(scriptsDir).filter((f) => !f.startsWith(".") && !f.startsWith("__")) : [];
     const assets = existsSync35(assetsDir) ? readdirSync11(assetsDir).filter((f) => !f.startsWith(".")) : [];
@@ -25314,7 +25499,7 @@ async function discoverSkillsFromDirAsync(skillsDir) {
   for (const entry of entries) {
     if (entry.name.startsWith("."))
       continue;
-    const skillPath = join42(skillsDir, entry.name);
+    const skillPath = join43(skillsDir, entry.name);
     if (entry.isDirectory() || entry.isSymbolicLink()) {
       const skillInfo = await parseSkillMd(skillPath);
       if (skillInfo) {
@@ -25325,8 +25510,8 @@ async function discoverSkillsFromDirAsync(skillsDir) {
   return skills;
 }
 async function discoverSkills() {
-  const userSkillsDir = join42(homedir17(), ".claude", "skills");
-  const projectSkillsDir = join42(process.cwd(), ".claude", "skills");
+  const userSkillsDir = join43(homedir19(), ".claude", "skills");
+  const projectSkillsDir = join43(process.cwd(), ".claude", "skills");
   const userSkills = await discoverSkillsFromDirAsync(userSkillsDir);
   const projectSkills = await discoverSkillsFromDirAsync(projectSkillsDir);
   return [...projectSkills, ...userSkills];
@@ -25355,7 +25540,7 @@ async function loadSkillWithReferences(skill, includeRefs) {
   const referencesLoaded = [];
   if (includeRefs && skill.references.length > 0) {
     for (const ref of skill.references) {
-      const refPath = join42(skill.path, "references", ref);
+      const refPath = join43(skill.path, "references", ref);
       try {
         let content = readFileSync22(refPath, "utf-8");
         content = await resolveCommandsInText(content);
@@ -25479,12 +25664,12 @@ async function findTmuxPath() {
       return null;
     }
     const stdout = await new Response(proc.stdout).text();
-    const path6 = stdout.trim().split(`
+    const path7 = stdout.trim().split(`
 `)[0];
-    if (!path6) {
+    if (!path7) {
       return null;
     }
-    const verifyProc = spawn9([path6, "-V"], {
+    const verifyProc = spawn9([path7, "-V"], {
       stdout: "pipe",
       stderr: "pipe"
     });
@@ -25492,7 +25677,7 @@ async function findTmuxPath() {
     if (verifyExitCode !== 0) {
       return null;
     }
-    return path6;
+    return path7;
   } catch {
     return null;
   }
@@ -25505,9 +25690,9 @@ async function getTmuxPath() {
     return initPromise3;
   }
   initPromise3 = (async () => {
-    const path6 = await findTmuxPath();
-    tmuxPath = path6;
-    return path6;
+    const path7 = await findTmuxPath();
+    tmuxPath = path7;
+    return path7;
   })();
   return initPromise3;
 }
@@ -25827,7 +26012,7 @@ function createBackgroundCancel(manager, client2) {
           return `\u274C Invalid arguments: Either provide a taskId or set all=true to cancel all running tasks.`;
         }
         if (cancelAll) {
-          const tasks = manager.getTasksByParentSession(toolContext.sessionID);
+          const tasks = manager.getAllDescendantTasks(toolContext.sessionID);
           const runningTasks = tasks.filter((t) => t.status === "running");
           if (runningTasks.length === 0) {
             return `\u2705 No running background tasks to cancel.`;
@@ -26122,15 +26307,15 @@ var builtinTools = {
 };
 // src/features/background-agent/manager.ts
 import { existsSync as existsSync36, readdirSync as readdirSync12 } from "fs";
-import { join as join43 } from "path";
+import { join as join44 } from "path";
 function getMessageDir4(sessionID) {
   if (!existsSync36(MESSAGE_STORAGE))
     return null;
-  const directPath = join43(MESSAGE_STORAGE, sessionID);
+  const directPath = join44(MESSAGE_STORAGE, sessionID);
   if (existsSync36(directPath))
     return directPath;
   for (const dir of readdirSync12(MESSAGE_STORAGE)) {
-    const sessionPath = join43(MESSAGE_STORAGE, dir, sessionID);
+    const sessionPath = join44(MESSAGE_STORAGE, dir, sessionID);
     if (existsSync36(sessionPath))
       return sessionPath;
   }
@@ -26222,6 +26407,16 @@ class BackgroundManager {
     }
     return result;
   }
+  getAllDescendantTasks(sessionID) {
+    const result = [];
+    const directChildren = this.getTasksByParentSession(sessionID);
+    for (const child of directChildren) {
+      result.push(child);
+      const descendants = this.getAllDescendantTasks(child.sessionID);
+      result.push(...descendants);
+    }
+    return result;
+  }
   findBySession(sessionID) {
     for (const task of this.tasks.values()) {
       if (task.sessionID === sessionID) {
@@ -26513,7 +26708,7 @@ var AgentPermissionSchema = exports_external.object({
   external_directory: PermissionValue.optional()
 });
 var BuiltinAgentNameSchema = exports_external.enum([
-  "OmO",
+  "Sisyphus",
   "oracle",
   "librarian",
   "explore",
@@ -26524,8 +26719,8 @@ var BuiltinAgentNameSchema = exports_external.enum([
 var OverridableAgentNameSchema = exports_external.enum([
   "build",
   "plan",
-  "OmO",
-  "OmO-Plan",
+  "Sisyphus",
+  "Planner-Sisyphus",
   "oracle",
   "librarian",
   "explore",
@@ -26571,8 +26766,8 @@ var AgentOverrideConfigSchema = exports_external.object({
 var AgentOverridesSchema = exports_external.object({
   build: AgentOverrideConfigSchema.optional(),
   plan: AgentOverrideConfigSchema.optional(),
-  OmO: AgentOverrideConfigSchema.optional(),
-  "OmO-Plan": AgentOverrideConfigSchema.optional(),
+  Sisyphus: AgentOverrideConfigSchema.optional(),
+  "Planner-Sisyphus": AgentOverrideConfigSchema.optional(),
   oracle: AgentOverrideConfigSchema.optional(),
   librarian: AgentOverrideConfigSchema.optional(),
   explore: AgentOverrideConfigSchema.optional(),
@@ -26587,9 +26782,14 @@ var ClaudeCodeConfigSchema = exports_external.object({
   agents: exports_external.boolean().optional(),
   hooks: exports_external.boolean().optional()
 });
-var OmoAgentConfigSchema = exports_external.object({
+var SisyphusAgentConfigSchema = exports_external.object({
   disabled: exports_external.boolean().optional()
 });
+var ExperimentalConfigSchema = exports_external.object({
+  aggressive_truncation: exports_external.boolean().optional(),
+  empty_message_recovery: exports_external.boolean().optional(),
+  auto_resume: exports_external.boolean().optional()
+});
 var OhMyOpenCodeConfigSchema = exports_external.object({
   $schema: exports_external.string().optional(),
   disabled_mcps: exports_external.array(McpNameSchema).optional(),
@@ -26598,7 +26798,8 @@ var OhMyOpenCodeConfigSchema = exports_external.object({
   agents: AgentOverridesSchema.optional(),
   claude_code: ClaudeCodeConfigSchema.optional(),
   google_auth: exports_external.boolean().optional(),
-  omo_agent: OmoAgentConfigSchema.optional()
+  sisyphus_agent: SisyphusAgentConfigSchema.optional(),
+  experimental: ExperimentalConfigSchema.optional()
 });
 // src/agents/plan-prompt.ts
 var PLAN_SYSTEM_PROMPT = `<system-reminder>
@@ -26673,16 +26874,14 @@ var PLAN_PERMISSION = {
 
 // src/index.ts
 import * as fs6 from "fs";
-import * as path6 from "path";
-import * as os4 from "os";
-function getUserConfigDir2() {
-  if (process.platform === "win32") {
-    return process.env.APPDATA || path6.join(os4.homedir(), "AppData", "Roaming");
-  }
-  return process.env.XDG_CONFIG_HOME || path6.join(os4.homedir(), ".config");
-}
+import * as path7 from "path";
 var AGENT_NAME_MAP = {
-  omo: "OmO",
+  omo: "Sisyphus",
+  OmO: "Sisyphus",
+  "OmO-Plan": "Planner-Sisyphus",
+  "omo-plan": "Planner-Sisyphus",
+  sisyphus: "Sisyphus",
+  "planner-sisyphus": "Planner-Sisyphus",
   build: "build",
   oracle: "oracle",
   librarian: "librarian",
@@ -26691,32 +26890,63 @@ var AGENT_NAME_MAP = {
   "document-writer": "document-writer",
   "multimodal-looker": "multimodal-looker"
 };
-function normalizeAgentNames(agents) {
-  const normalized = {};
+function migrateAgentNames(agents) {
+  const migrated = {};
+  let changed = false;
   for (const [key, value] of Object.entries(agents)) {
-    const normalizedKey = AGENT_NAME_MAP[key.toLowerCase()] ?? key;
-    normalized[normalizedKey] = value;
+    const newKey = AGENT_NAME_MAP[key.toLowerCase()] ?? AGENT_NAME_MAP[key] ?? key;
+    if (newKey !== key) {
+      changed = true;
+    }
+    migrated[newKey] = value;
+  }
+  return { migrated, changed };
+}
+function migrateConfigFile(configPath, rawConfig) {
+  let needsWrite = false;
+  if (rawConfig.agents && typeof rawConfig.agents === "object") {
+    const { migrated, changed } = migrateAgentNames(rawConfig.agents);
+    if (changed) {
+      rawConfig.agents = migrated;
+      needsWrite = true;
+    }
+  }
+  if (rawConfig.omo_agent) {
+    rawConfig.sisyphus_agent = rawConfig.omo_agent;
+    delete rawConfig.omo_agent;
+    needsWrite = true;
   }
-  return normalized;
+  if (needsWrite) {
+    try {
+      fs6.writeFileSync(configPath, JSON.stringify(rawConfig, null, 2) + `
+`, "utf-8");
+      log(`Migrated config file: ${configPath} (OmO \u2192 Sisyphus)`);
+    } catch (err) {
+      log(`Failed to write migrated config to ${configPath}:`, err);
+    }
+  }
+  return needsWrite;
 }
 function loadConfigFromPath2(configPath) {
   try {
     if (fs6.existsSync(configPath)) {
       const content = fs6.readFileSync(configPath, "utf-8");
       const rawConfig = JSON.parse(content);
-      if (rawConfig.agents && typeof rawConfig.agents === "object") {
-        rawConfig.agents = normalizeAgentNames(rawConfig.agents);
-      }
+      migrateConfigFile(configPath, rawConfig);
       const result = OhMyOpenCodeConfigSchema.safeParse(rawConfig);
       if (!result.success) {
+        const errorMsg = result.error.issues.map((i) => `${i.path.join(".")}: ${i.message}`).join(", ");
         log(`Config validation error in ${configPath}:`, result.error.issues);
+        addConfigLoadError({ path: configPath, error: `Validation error: ${errorMsg}` });
         return null;
       }
       log(`Config loaded from ${configPath}`, { agents: result.data.agents });
       return result.data;
     }
   } catch (err) {
+    const errorMsg = err instanceof Error ? err.message : String(err);
     log(`Error loading config from ${configPath}:`, err);
+    addConfigLoadError({ path: configPath, error: errorMsg });
   }
   return null;
 }
@@ -26747,8 +26977,8 @@ function mergeConfigs(base, override) {
   };
 }
 function loadPluginConfig(directory) {
-  const userConfigPath = path6.join(getUserConfigDir2(), "opencode", "oh-my-opencode.json");
-  const projectConfigPath = path6.join(directory, ".opencode", "oh-my-opencode.json");
+  const userConfigPath = path7.join(getUserConfigDir(), "opencode", "oh-my-opencode.json");
+  const projectConfigPath = path7.join(directory, ".opencode", "oh-my-opencode.json");
   let config3 = loadConfigFromPath2(userConfigPath) ?? {};
   const projectConfig = loadConfigFromPath2(projectConfigPath);
   if (projectConfig) {
@@ -26769,7 +26999,7 @@ var OhMyOpenCodePlugin = async (ctx) => {
   const isHookEnabled = (hookName) => !disabledHooks.has(hookName);
   const todoContinuationEnforcer = isHookEnabled("todo-continuation-enforcer") ? createTodoContinuationEnforcer(ctx) : null;
   const contextWindowMonitor = isHookEnabled("context-window-monitor") ? createContextWindowMonitorHook(ctx) : null;
-  const sessionRecovery = isHookEnabled("session-recovery") ? createSessionRecoveryHook(ctx) : null;
+  const sessionRecovery = isHookEnabled("session-recovery") ? createSessionRecoveryHook(ctx, { experimental: pluginConfig.experimental }) : null;
   const sessionNotification = isHookEnabled("session-notification") ? createSessionNotification(ctx) : null;
   if (sessionRecovery && todoContinuationEnforcer) {
     sessionRecovery.setOnAbortCallback(todoContinuationEnforcer.markRecovering);
@@ -26784,10 +27014,11 @@ var OhMyOpenCodePlugin = async (ctx) => {
   const claudeCodeHooks = createClaudeCodeHooksHook(ctx, {
     disabledHooks: pluginConfig.claude_code?.hooks ?? true ? undefined : true
   });
-  const anthropicAutoCompact = isHookEnabled("anthropic-auto-compact") ? createAnthropicAutoCompactHook(ctx) : null;
+  const anthropicAutoCompact = isHookEnabled("anthropic-auto-compact") ? createAnthropicAutoCompactHook(ctx, { experimental: pluginConfig.experimental }) : null;
   const rulesInjector = isHookEnabled("rules-injector") ? createRulesInjectorHook(ctx) : null;
   const autoUpdateChecker = isHookEnabled("auto-update-checker") ? createAutoUpdateCheckerHook(ctx, {
-    showStartupToast: isHookEnabled("startup-toast")
+    showStartupToast: isHookEnabled("startup-toast"),
+    isSisyphusEnabled: pluginConfig.sisyphus_agent?.disabled !== true
   }) : null;
   const keywordDetector = isHookEnabled("keyword-detector") ? createKeywordDetectorHook() : null;
   const agentUsageReminder = isHookEnabled("agent-usage-reminder") ? createAgentUsageReminderHook(ctx) : null;
@@ -26821,22 +27052,22 @@ var OhMyOpenCodePlugin = async (ctx) => {
       const builtinAgents = createBuiltinAgents(pluginConfig.disabled_agents, pluginConfig.agents, ctx.directory, config3.model);
       const userAgents = pluginConfig.claude_code?.agents ?? true ? loadUserAgents() : {};
       const projectAgents = pluginConfig.claude_code?.agents ?? true ? loadProjectAgents() : {};
-      const isOmoEnabled = pluginConfig.omo_agent?.disabled !== true;
-      if (isOmoEnabled && builtinAgents.OmO) {
+      const isSisyphusEnabled = pluginConfig.sisyphus_agent?.disabled !== true;
+      if (isSisyphusEnabled && builtinAgents.Sisyphus) {
         const { name: _planName, ...planConfigWithoutName } = config3.agent?.plan ?? {};
-        const omoPlanOverride = pluginConfig.agents?.["OmO-Plan"];
-        const omoPlanBase = {
+        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 omoPlanConfig = omoPlanOverride ? { ...omoPlanBase, ...omoPlanOverride } : omoPlanBase;
+        const plannerSisyphusConfig = plannerSisyphusOverride ? { ...plannerSisyphusBase, ...plannerSisyphusOverride } : plannerSisyphusBase;
         config3.agent = {
-          OmO: builtinAgents.OmO,
-          "OmO-Plan": omoPlanConfig,
-          ...Object.fromEntries(Object.entries(builtinAgents).filter(([k]) => k !== "OmO")),
+          Sisyphus: builtinAgents.Sisyphus,
+          "Planner-Sisyphus": plannerSisyphusConfig,
+          ...Object.fromEntries(Object.entries(builtinAgents).filter(([k]) => k !== "Sisyphus")),
           ...userAgents,
           ...projectAgents,
           ...config3.agent,
@@ -26914,7 +27145,6 @@ var OhMyOpenCodePlugin = async (ctx) => {
       await rulesInjector?.event(input);
       await thinkMode?.event(input);
       await anthropicAutoCompact?.event(input);
-      await keywordDetector?.event(input);
       await agentUsageReminder?.event(input);
       await interactiveBashSession?.event(input);
       const { event } = input;