release: v1.0.2

- Replace direct parts[idx].text modification with injectHookMessage
- Context now injected via filesystem (like UserPromptSubmitHook)
- Preserves original user message without modification

🤖 GENERATED WITH ASSISTANCE OF [OhMyOpenCode](https://github.com/code-yeongyu/oh-my-opencode)

README.ko.md

@@ -43,7 +43,7 @@ OpenCode 가 낭만이 사라진것같은 오늘날의 시대에, 당신에게
   - 이 플러그인은 [OpenCode Zen](https://opencode.ai/docs/zen/), Google, OpenAI, Anthropic 의 모델을 사용합니다.
     - Anthropic 모델들을 사용하기 위해 [OpenCode 의 내장 Claude Code Max Plan 로그인 기능](https://opencode.ai/docs/providers/#anthropic)을 사용하세요.
     - OpenAI 모델 (ChatGPT Plus/Pro)을 사용하기 위해 [OpenCode-OpenAI-Codex-Auth 플러그인](https://github.com/numman-ali/opencode-openai-codex-auth)을 설치하세요.
-    - Google Gemini 모델을 위해 `oh-my-opencode/google-auth` 플러그인을 추가하세요 (**내장 Antigravity OAuth**).
+    - Google Gemini 모델을 위해 `oh-my-opencode.json`에서 `google_auth: true`를 활성화하세요 (**내장 Antigravity OAuth**).
     - 다른 프로바이더를 위해 [VibeProxy (macOS Only)](https://github.com/automazeio/vibeproxy) 또는 [CLIProxyAPI](https://github.com/router-for-me/CLIProxyAPI)를 대안으로 사용할 수 있습니다.
 - **사실 밑의 내용은 읽지 않아도 됩니다. 그냥 설치하시면 됩니다. 모델 설정하고나면 추가로 공부하거나 알 필요가 없고, 설치하고 나면 그냥 더 좋아집니다.**
 - **이 문서도 그냥 Claude Code, OpenCode, Cursor에 붙여넣고, 설치하고, 사용자의 개입이 필요할 때 알려달라고 프롬프팅하세요. 그럼 그냥 깔립니다.**
@@ -110,7 +110,7 @@ cat ~/.config/opencode/opencode.json  # plugin 배열에 "oh-my-opencode"가 있
 
 ### 4단계: 인증정보 설정
 
-plugin 에 oh my opencode 를 추가했다면, tmux 를 사용하여 사용자의 인증 설정을 도와주세요.
+plugin 에 oh my opencode 를 추가했다면, tmux 를 사용하여 사용자의 인증 설정을 도와주세요. **기본적으로 Google Auth (4.2단계) 설정을 권장합니다.**
 
 #### 4.1 Anthropic (Claude)
 
@@ -123,14 +123,13 @@ opencode auth login
 
 #### 4.2 Google Gemini (내장 Antigravity OAuth)
 
-먼저 google-auth 플러그인을 추가:
+**권장되는 기본 설정입니다.**
+
+먼저 주도적으로 `~/.config/opencode/oh-my-opencode.json` (또는 프로젝트 레벨의 `.opencode/oh-my-opencode.json`)에서 Google auth를 활성화하세요:
 
 ```json
 {
-  "plugin": [
-    "oh-my-opencode",
-    "oh-my-opencode/google-auth"
-  ]
+  "google_auth": true
 }
 ```
 
@@ -173,9 +172,9 @@ opencode auth login
 
 ### ⚠️ 주의
 
-**사용자가 명시적으로 요청하지 않는 한, `oh-my-opencode.json` 설정 파일을 생성하거나 수정하지 마세요.**
+**사용자가 명시적으로 요청하지 않는 한, 모델 설정을 변경하거나 기능(에이전트, 훅, MCP)을 비활성화하지 마세요.**
 
-플러그인은 설정 파일 없이도 기본값으로 완벽하게 동작합니다. 설정 파일은 사용자가 커스터마이징을 원할 때만 필요합니다.
+플러그인은 기본값으로 완벽하게 동작합니다. 권장 사항인 `google_auth: true` 설정을 제외하고는, 명시적인 요청 없이 다른 설정을 변경하거나 기능을 끄지 마세요.
 
 </details>
 
@@ -333,10 +332,23 @@ OpenCode 는 아주 확장가능하고 아주 커스터마이저블합니다.
     - Use camelCase for function names
     ```
 - **Think Mode**: 확장된 사고(Extended Thinking)가 필요한 상황을 자동으로 감지하고 모드를 전환합니다. 사용자가 깊은 사고를 요청하는 표현(예: "think deeply", "ultrathink")을 감지하면, 추론 능력을 극대화하도록 모델 설정을 동적으로 조정합니다.
+- **Ultrawork Mode**: 사용자가 "ultrawork" 또는 "ulw" 키워드를 입력하면 자동으로 에이전트 오케스트레이션 가이드를 주입합니다. 메인 에이전트가 모든 가용한 전문 에이전트(탐색, 사서, 계획, UI)를 백그라운드 작업을 통해 병렬로 최대한 활용하도록 강제하며, 엄격한 TODO 추적 및 검증 프로토콜을 따르게 합니다.
 - **Anthropic Auto Compact**: Anthropic 모델 사용 시 컨텍스트 한계에 도달하면 대화 기록을 자동으로 압축하여 효율적으로 관리합니다.
 - **Empty Task Response Detector**: 서브 에이전트가 수행한 작업이 비어있거나 무의미한 응답을 반환하는 경우를 감지하여, 오류 없이 우아하게 처리합니다.
 - **Grep Output Truncator**: Grep 검색 결과가 너무 길어 컨텍스트를 장악해버리는 것을 방지하기 위해, 과도한 출력을 자동으로 자릅니다.
 
+필요 없는 훅이 있다면, `~/.config/opencode/oh-my-opencode.json` 혹은 `.opencode/oh-my-opencode.json`의 `disabled_hooks`를 사용하여 비활성화할 수 있습니다:
+
+```json
+{
+  "disabled_hooks": ["session-notification", "comment-checker"]
+}
+```
+
+사용 가능한 훅: `todo-continuation-enforcer`, `context-window-monitor`, `session-recovery`, `session-notification`, `comment-checker`, `grep-output-truncator`, `directory-agents-injector`, `directory-readme-injector`, `empty-task-response-detector`, `think-mode`, `ultrawork-mode`, `anthropic-auto-compact`, `rules-injector`, `background-notification`, `auto-update-checker`
+
+> **참고**: `disabled_hooks`는 Oh My OpenCode의 내장 훅을 제어합니다. Claude Code의 `settings.json` 훅을 비활성화하려면 `claude_code.hooks: false`를 대신 사용하세요 ([호환성 토글](#호환성-토글) 참고).
+
 ### Claude Code 호환성
 
 Oh My OpenCode는 Claude Code 설정과 완벽하게 호환됩니다. Claude Code를 사용하셨다면, 기존 설정을 그대로 사용할 수 있습니다.
@@ -444,6 +456,18 @@ Schema 자동 완성이 지원됩니다:
 }
 ```
 
+### Google Auth
+
+Google Gemini 모델을 위한 내장 Antigravity OAuth를 활성화합니다:
+
+```json
+{
+  "google_auth": true
+}
+```
+
+활성화하면 `opencode auth login` 실행 시 Google 프로바이더에서 "OAuth with Google (Antigravity)" 로그인 옵션이 표시됩니다.
+
 ### Agents
 
 내장 에이전트 설정을 오버라이드할 수 있습니다:

README.md

@@ -42,7 +42,7 @@ Even if you don't, invest a little time. Boost your skills and productivity by m
   - This plugin utilizes models from [OpenCode Zen](https://opencode.ai/docs/zen/), Google, OpenAI, and Anthropic.
     - For Anthropic models, use [OpenCode's built-in Claude Code Max Plan login](https://opencode.ai/docs/providers/#anthropic).
     - For OpenAI models (ChatGPT Plus/Pro), install the [OpenCode-OpenAI-Codex-Auth plugin](https://github.com/numman-ali/opencode-openai-codex-auth).
-    - For Google Gemini models, add `oh-my-opencode/google-auth` plugin for **built-in Antigravity OAuth**.
+    - For Google Gemini models, enable `google_auth: true` in `oh-my-opencode.json` for **built-in Antigravity OAuth**.
     - For other providers, [VibeProxy (macOS Only)](https://github.com/automazeio/vibeproxy) or [CLIProxyAPI](https://github.com/router-for-me/CLIProxyAPI) remain available as alternatives.
 - **Truth be told, the rest is optional. Just install it. Once set up, no further learning is required. It simply evolves.**
 - **Paste this document into Claude Code, OpenCode, or Cursor, instruct it to install, and ask for assistance if needed. It just installs.**
@@ -109,7 +109,7 @@ cat ~/.config/opencode/opencode.json  # Should contain "oh-my-opencode" in plugi
 
 ### Step 4: Configure Authentication
 
-Once `oh-my-opencode` is added to the plugin list, use `tmux` to assist the user with authentication setup.
+Once `oh-my-opencode` is added to the plugin list, use `tmux` to assist the user with authentication setup. **It is RECOMMENDED to set up Google Auth (Step 4.2) by default.**
 
 #### 4.1 Anthropic (Claude)
 
@@ -122,14 +122,13 @@ opencode auth login
 
 #### 4.2 Google Gemini (Built-in Antigravity OAuth)
 
-First, add the google-auth plugin:
+**This is the RECOMMENDED default configuration.**
+
+First, proactively enable Google auth in `~/.config/opencode/oh-my-opencode.json` (or `.opencode/oh-my-opencode.json` for project-level):
 
 ```json
 {
-  "plugin": [
-    "oh-my-opencode",
-    "oh-my-opencode/google-auth"
-  ]
+  "google_auth": true
 }
 ```
 
@@ -172,9 +171,9 @@ For users who prefer proxy-based authentication, [VibeProxy](https://github.com/
 
 ### ⚠️ Warning
 
-**Do NOT create or modify the `oh-my-opencode.json` configuration file unless the user explicitly requests it.**
+**Do NOT modify model settings or disable features (agents, hooks, MCPs) unless the user explicitly requests it.**
 
-The plugin works perfectly with default settings without any configuration file. The configuration file is only needed when the user wants customization.
+The plugin works perfectly with default settings. While you SHOULD enable `google_auth: true` as recommended, do not alter other configurations or disable features without a specific request.
 
 </details>
 
@@ -331,10 +330,23 @@ Example workflow:
     - Use camelCase for function names
     ```
 - **Think Mode**: Automatic extended thinking detection and mode switching. Detects when user requests deep thinking (e.g., "think deeply", "ultrathink") and dynamically adjusts model settings for enhanced reasoning.
+- **Ultrawork Mode**: When user triggers "ultrawork" or "ulw" keywords, automatically injects agent orchestration guidance. Forces the main agent to leverage all available specialized agents (exploration, librarian, planning, UI) via background tasks in parallel, with strict TODO tracking and verification protocols.
 - **Anthropic Auto Compact**: Automatically compacts conversation history when approaching context limits for Anthropic models.
 - **Empty Task Response Detector**: Detects when subagent tasks return empty or meaningless responses and handles gracefully.
 - **Grep Output Truncator**: Prevents grep output from overwhelming the context by truncating excessively long results.
 
+You can disable specific built-in hooks using `disabled_hooks` in `~/.config/opencode/oh-my-opencode.json` or `.opencode/oh-my-opencode.json`:
+
+```json
+{
+  "disabled_hooks": ["session-notification", "comment-checker"]
+}
+```
+
+Available hooks: `todo-continuation-enforcer`, `context-window-monitor`, `session-recovery`, `session-notification`, `comment-checker`, `grep-output-truncator`, `directory-agents-injector`, `directory-readme-injector`, `empty-task-response-detector`, `think-mode`, `ultrawork-mode`, `anthropic-auto-compact`, `rules-injector`, `background-notification`, `auto-update-checker`
+
+> **Note**: `disabled_hooks` controls Oh My OpenCode's built-in hooks. To disable Claude Code's `settings.json` hooks, use `claude_code.hooks: false` instead (see [Compatibility Toggles](#compatibility-toggles)).
+
 ### Claude Code Compatibility
 
 Oh My OpenCode provides seamless Claude Code configuration compatibility. If you've been using Claude Code, your existing setup works out of the box.
@@ -442,6 +454,18 @@ Schema autocomplete is supported:
 }
 ```
 
+### Google Auth
+
+Enable built-in Antigravity OAuth for Google Gemini models:
+
+```json
+{
+  "google_auth": true
+}
+```
+
+When enabled, `opencode auth login` will show "OAuth with Google (Antigravity)" as a login option for the Google provider.
+
 ### Agents
 
 Override built-in agent settings:

assets/oh-my-opencode.schema.json

@@ -31,6 +31,29 @@
         ]
       }
     },
+    "disabled_hooks": {
+      "type": "array",
+      "description": "List of built-in hooks to disable. Useful for selectively disabling hooks that may conflict with your workflow.",
+      "items": {
+        "type": "string",
+        "enum": [
+          "todo-continuation-enforcer",
+          "context-window-monitor",
+          "session-recovery",
+          "session-notification",
+          "comment-checker",
+          "grep-output-truncator",
+          "directory-agents-injector",
+          "directory-readme-injector",
+          "empty-task-response-detector",
+          "think-mode",
+          "anthropic-auto-compact",
+          "rules-injector",
+          "background-notification",
+          "auto-update-checker"
+        ]
+      }
+    },
     "agents": {
       "type": "object",
       "propertyNames": {
@@ -155,6 +178,47 @@
         }
       }
     },
+    "google_auth": {
+      "type": "boolean",
+      "description": "Enable built-in Antigravity OAuth for Google Gemini models. When true, adds 'OAuth with Google (Antigravity)' login option.",
+      "default": false
+    },
+    "lsp": {
+      "type": "object",
+      "description": "Additional LSP server configurations specific to Oh My OpenCode.",
+      "additionalProperties": {
+        "type": "object",
+        "properties": {
+          "command": {
+            "type": "array",
+            "items": { "type": "string" },
+            "description": "Command and arguments to start the LSP server"
+          },
+          "extensions": {
+            "type": "array",
+            "items": { "type": "string" },
+            "description": "File extensions this server handles (e.g., [\".ts\", \".tsx\"])"
+          },
+          "priority": {
+            "type": "number",
+            "description": "Server priority (higher = preferred)"
+          },
+          "env": {
+            "type": "object",
+            "additionalProperties": { "type": "string" },
+            "description": "Environment variables for the LSP server"
+          },
+          "initialization": {
+            "type": "object",
+            "description": "Custom initialization options"
+          },
+          "disabled": {
+            "type": "boolean",
+            "description": "Disable this LSP server"
+          }
+        }
+      }
+    },
     "claude_code": {
       "type": "object",
       "description": "Toggle Claude Code compatibility features on/off. All default to true (enabled).",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-opencode",
-  "version": "0.4.0",
+  "version": "1.0.2",
   "description": "OpenCode plugin - custom agents (oracle, librarian) and enhanced features",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

src/agents/utils.ts

@@ -5,6 +5,7 @@ import { librarianAgent } from "./librarian"
 import { exploreAgent } from "./explore"
 import { frontendUiUxEngineerAgent } from "./frontend-ui-ux-engineer"
 import { documentWriterAgent } from "./document-writer"
+import { deepMerge } from "../shared"
 
 const allBuiltinAgents: Record<AgentName, AgentConfig> = {
   oracle: oracleAgent,
@@ -18,16 +19,7 @@ function mergeAgentConfig(
   base: AgentConfig,
   override: AgentOverrideConfig
 ): AgentConfig {
-  return {
-    ...base,
-    ...override,
-    tools: override.tools !== undefined
-      ? { ...(base.tools ?? {}), ...override.tools }
-      : base.tools,
-    permission: override.permission !== undefined
-      ? { ...(base.permission ?? {}), ...override.permission }
-      : base.permission,
-  }
+  return deepMerge(base, override as Partial<AgentConfig>)
 }
 
 export function createBuiltinAgents(

src/auth/antigravity/fetch.ts

@@ -70,6 +70,21 @@ function isRetryableError(status: number): boolean {
   return false
 }
 
+const GCP_PERMISSION_ERROR_PATTERNS = [
+  "PERMISSION_DENIED",
+  "does not have permission",
+  "Cloud AI Companion API has not been used",
+  "has not been enabled",
+] as const
+
+function isGcpPermissionError(text: string): boolean {
+  return GCP_PERMISSION_ERROR_PATTERNS.some((pattern) => text.includes(pattern))
+}
+
+function calculateRetryDelay(attempt: number): number {
+  return Math.min(200 * Math.pow(2, attempt), 2000)
+}
+
 async function isRetryableResponse(response: Response): Promise<boolean> {
   if (isRetryableError(response.status)) return true
   if (response.status === 403) {
@@ -155,23 +170,43 @@ async function attemptFetch(
 
     debugLog(`[REQ] streaming=${transformed.streaming}, url=${transformed.url}`)
 
-    const response = await fetch(transformed.url, {
-      method: init.method || "POST",
-      headers: transformed.headers,
-      body: JSON.stringify(transformed.body),
-      signal: init.signal,
-    })
+    const maxPermissionRetries = 10
+    for (let attempt = 0; attempt <= maxPermissionRetries; attempt++) {
+      const response = await fetch(transformed.url, {
+        method: init.method || "POST",
+        headers: transformed.headers,
+        body: JSON.stringify(transformed.body),
+        signal: init.signal,
+      })
 
-    debugLog(
-      `[RESP] status=${response.status} content-type=${response.headers.get("content-type") ?? ""} url=${response.url}`
-    )
+      debugLog(
+        `[RESP] status=${response.status} content-type=${response.headers.get("content-type") ?? ""} url=${response.url}`
+      )
 
-    if (!response.ok && (await isRetryableResponse(response))) {
-      debugLog(`Endpoint failed: ${endpoint} (status: ${response.status}), trying next`)
-      return null
+      if (response.status === 403) {
+        try {
+          const text = await response.clone().text()
+          if (isGcpPermissionError(text)) {
+            if (attempt < maxPermissionRetries) {
+              const delay = calculateRetryDelay(attempt)
+              debugLog(`[RETRY] GCP permission error, retry ${attempt + 1}/${maxPermissionRetries} after ${delay}ms`)
+              await new Promise((resolve) => setTimeout(resolve, delay))
+              continue
+            }
+            debugLog(`[RETRY] GCP permission error, max retries exceeded`)
+          }
+        } catch {}
+      }
+
+      if (!response.ok && (await isRetryableResponse(response))) {
+        debugLog(`Endpoint failed: ${endpoint} (status: ${response.status}), trying next`)
+        return null
+      }
+
+      return response
     }
 
-    return response
+    return null
   } catch (error) {
     debugLog(
       `Endpoint failed: ${endpoint} (${error instanceof Error ? error.message : "Unknown error"}), trying next`

src/config/index.ts

@@ -4,6 +4,7 @@ export {
   AgentOverridesSchema,
   McpNameSchema,
   AgentNameSchema,
+  HookNameSchema,
 } from "./schema"
 
 export type {
@@ -12,4 +13,5 @@ export type {
   AgentOverrides,
   McpName,
   AgentName,
+  HookName,
 } from "./schema"

src/config/schema.ts

@@ -24,6 +24,24 @@ export const AgentNameSchema = z.enum([
   "document-writer",
 ])
 
+export const HookNameSchema = z.enum([
+  "todo-continuation-enforcer",
+  "context-window-monitor",
+  "session-recovery",
+  "session-notification",
+  "comment-checker",
+  "grep-output-truncator",
+  "directory-agents-injector",
+  "directory-readme-injector",
+  "empty-task-response-detector",
+  "think-mode",
+  "anthropic-auto-compact",
+  "rules-injector",
+  "background-notification",
+  "auto-update-checker",
+  "ultrawork-mode",
+])
+
 export const AgentOverrideConfigSchema = z.object({
   model: z.string().optional(),
   temperature: z.number().min(0).max(2).optional(),
@@ -62,13 +80,16 @@ export const OhMyOpenCodeConfigSchema = z.object({
   $schema: z.string().optional(),
   disabled_mcps: z.array(McpNameSchema).optional(),
   disabled_agents: z.array(AgentNameSchema).optional(),
+  disabled_hooks: z.array(HookNameSchema).optional(),
   agents: AgentOverridesSchema.optional(),
   claude_code: ClaudeCodeConfigSchema.optional(),
+  google_auth: z.boolean().optional(),
 })
 
 export type OhMyOpenCodeConfig = z.infer<typeof OhMyOpenCodeConfigSchema>
 export type AgentOverrideConfig = z.infer<typeof AgentOverrideConfigSchema>
 export type AgentOverrides = z.infer<typeof AgentOverridesSchema>
 export type AgentName = z.infer<typeof AgentNameSchema>
+export type HookName = z.infer<typeof HookNameSchema>
 
 export { McpNameSchema, type McpName } from "../mcp/types"

src/features/background-agent/manager.ts

@@ -4,7 +4,6 @@ import type {
   LaunchInput,
 } from "./types"
 import { log } from "../../shared/logger"
-import { getMainSessionID } from "../claude-code-session-state"
 
 type OpencodeClient = PluginInput["client"]
 
@@ -59,6 +58,7 @@ export class BackgroundManager {
       parentSessionID: input.parentSessionID,
       parentMessageID: input.parentMessageID,
       description: input.description,
+      prompt: input.prompt,
       agent: input.agent,
       status: "running",
       startedAt: new Date(),
@@ -239,25 +239,19 @@ export class BackgroundManager {
 
     const message = `[BACKGROUND TASK COMPLETED] Task "${task.description}" finished in ${duration}. Use background_output with task_id="${task.id}" to get results.`
 
-    const mainSessionID = getMainSessionID()
-    if (!mainSessionID) {
-      log("[background-agent] No main session ID available, relying on pending queue")
-      return
-    }
-
-    log("[background-agent] Sending notification to main session:", mainSessionID)
+    log("[background-agent] Sending notification to parent session:", { parentSessionID: task.parentSessionID })
 
     setTimeout(async () => {
       try {
         await this.client.session.prompt({
-          path: { id: mainSessionID },
+          path: { id: task.parentSessionID },
           body: {
             parts: [{ type: "text", text: message }],
           },
           query: { directory: this.directory },
         })
         this.clearNotificationsForTask(task.id)
-        log("[background-agent] Successfully sent prompt to main session")
+        log("[background-agent] Successfully sent prompt to parent session:", { parentSessionID: task.parentSessionID })
       } catch (error) {
         log("[background-agent] prompt failed:", String(error))
       }
@@ -316,7 +310,7 @@ export class BackgroundManager {
         if (!messagesResult.error && messagesResult.data) {
           const messages = messagesResult.data as Array<{
             info?: { role?: string }
-            parts?: Array<{ type?: string; tool?: string; name?: string }>
+            parts?: Array<{ type?: string; tool?: string; name?: string; text?: string }>
           }>
           const assistantMsgs = messages.filter(
             (m) => m.info?.role === "assistant"
@@ -324,6 +318,7 @@ export class BackgroundManager {
 
           let toolCalls = 0
           let lastTool: string | undefined
+          let lastMessage: string | undefined
 
           for (const msg of assistantMsgs) {
             const parts = msg.parts ?? []
@@ -332,6 +327,9 @@ export class BackgroundManager {
                 toolCalls++
                 lastTool = part.tool || part.name || "unknown"
               }
+              if (part.type === "text" && part.text) {
+                lastMessage = part.text
+              }
             }
           }
 
@@ -341,6 +339,10 @@ export class BackgroundManager {
           task.progress.toolCalls = toolCalls
           task.progress.lastTool = lastTool
           task.progress.lastUpdate = new Date()
+          if (lastMessage) {
+            task.progress.lastMessage = lastMessage
+            task.progress.lastMessageAt = new Date()
+          }
         }
       } catch (error) {
         log("[background-agent] Poll error for task:", { taskId: task.id, error })

src/features/background-agent/types.ts

@@ -8,6 +8,8 @@ export interface TaskProgress {
   toolCalls: number
   lastTool?: string
   lastUpdate: Date
+  lastMessage?: string
+  lastMessageAt?: Date
 }
 
 export interface BackgroundTask {
@@ -16,6 +18,7 @@ export interface BackgroundTask {
   parentSessionID: string
   parentMessageID: string
   description: string
+  prompt: string
   agent: string
   status: BackgroundTaskStatus
   startedAt: Date

src/features/claude-code-agent-loader/loader.ts

@@ -3,6 +3,7 @@ import { homedir } from "os"
 import { join, basename } from "path"
 import type { AgentConfig } from "@opencode-ai/sdk"
 import { parseFrontmatter } from "../../shared/frontmatter"
+import { isMarkdownFile } from "../../shared/file-utils"
 import type { AgentScope, AgentFrontmatter, LoadedAgent } from "./types"
 
 function parseToolsConfig(toolsStr?: string): Record<string, boolean> | undefined {
@@ -18,10 +19,6 @@ function parseToolsConfig(toolsStr?: string): Record<string, boolean> | undefine
   return result
 }
 
-function isMarkdownFile(entry: { name: string; isFile: () => boolean }): boolean {
-  return !entry.name.startsWith(".") && entry.name.endsWith(".md") && entry.isFile()
-}
-
 function loadAgentsFromDir(agentsDir: string, scope: AgentScope): LoadedAgent[] {
   if (!existsSync(agentsDir)) {
     return []

src/features/claude-code-command-loader/loader.ts

@@ -3,12 +3,9 @@ import { homedir } from "os"
 import { join, basename } from "path"
 import { parseFrontmatter } from "../../shared/frontmatter"
 import { sanitizeModelField } from "../../shared/model-sanitizer"
+import { isMarkdownFile } from "../../shared/file-utils"
 import type { CommandScope, CommandDefinition, CommandFrontmatter, LoadedCommand } from "./types"
 
-function isMarkdownFile(entry: { name: string; isFile: () => boolean }): boolean {
-  return !entry.name.startsWith(".") && entry.name.endsWith(".md") && entry.isFile()
-}
-
 function loadCommandsFromDir(commandsDir: string, scope: CommandScope): LoadedCommand[] {
   if (!existsSync(commandsDir)) {
     return []

src/features/claude-code-skill-loader/loader.ts

@@ -1,8 +1,9 @@
-import { existsSync, readdirSync, readFileSync, statSync, readlinkSync } from "fs"
+import { existsSync, readdirSync, readFileSync } from "fs"
 import { homedir } from "os"
-import { join, resolve } from "path"
+import { join } from "path"
 import { parseFrontmatter } from "../../shared/frontmatter"
 import { sanitizeModelField } from "../../shared/model-sanitizer"
+import { resolveSymlink } from "../../shared/file-utils"
 import type { CommandDefinition } from "../claude-code-command-loader/types"
 import type { SkillScope, SkillMetadata, LoadedSkillAsCommand } from "./types"
 
@@ -21,10 +22,7 @@ function loadSkillsFromDir(skillsDir: string, scope: SkillScope): LoadedSkillAsC
 
     if (!entry.isDirectory() && !entry.isSymbolicLink()) continue
 
-    let resolvedPath = skillPath
-    if (statSync(skillPath, { throwIfNoEntry: false })?.isSymbolicLink()) {
-      resolvedPath = resolve(skillPath, "..", readlinkSync(skillPath))
-    }
+    const resolvedPath = resolveSymlink(skillPath)
 
     const skillMdPath = join(resolvedPath, "SKILL.md")
     if (!existsSync(skillMdPath)) continue

src/hooks/index.ts

@@ -1,7 +1,7 @@
-export { createTodoContinuationEnforcer } from "./todo-continuation-enforcer";
+export { createTodoContinuationEnforcer, type TodoContinuationEnforcer } from "./todo-continuation-enforcer";
 export { createContextWindowMonitorHook } from "./context-window-monitor";
 export { createSessionNotification } from "./session-notification";
-export { createSessionRecoveryHook } from "./session-recovery";
+export { createSessionRecoveryHook, type SessionRecoveryHook } from "./session-recovery";
 export { createCommentCheckerHooks } from "./comment-checker";
 export { createGrepOutputTruncatorHook } from "./grep-output-truncator";
 export { createDirectoryAgentsInjectorHook } from "./directory-agents-injector";
@@ -13,3 +13,4 @@ export { createClaudeCodeHooksHook } from "./claude-code-hooks";
 export { createRulesInjectorHook } from "./rules-injector";
 export { createBackgroundNotificationHook } from "./background-notification"
 export { createAutoUpdateCheckerHook } from "./auto-update-checker";
+export { createUltraworkModeHook } from "./ultrawork-mode";

src/hooks/session-notification.ts

@@ -17,6 +17,8 @@ interface SessionNotificationConfig {
   idleConfirmationDelay?: number
   /** Skip notification if there are incomplete todos (default: true) */
   skipIfIncompleteTodos?: boolean
+  /** Maximum number of sessions to track before cleanup (default: 100) */
+  maxTrackedSessions?: number
 }
 
 type Platform = "darwin" | "linux" | "win32" | "unsupported"
@@ -103,12 +105,31 @@ export function createSessionNotification(
     soundPath: defaultSoundPath,
     idleConfirmationDelay: 1500,
     skipIfIncompleteTodos: true,
+    maxTrackedSessions: 100,
     ...config,
   }
 
   const notifiedSessions = new Set<string>()
   const pendingTimers = new Map<string, ReturnType<typeof setTimeout>>()
   const sessionActivitySinceIdle = new Set<string>()
+  // Track notification execution version to handle race conditions
+  const notificationVersions = new Map<string, number>()
+
+  function cleanupOldSessions() {
+    const maxSessions = mergedConfig.maxTrackedSessions
+    if (notifiedSessions.size > maxSessions) {
+      const sessionsToRemove = Array.from(notifiedSessions).slice(0, notifiedSessions.size - maxSessions)
+      sessionsToRemove.forEach(id => notifiedSessions.delete(id))
+    }
+    if (sessionActivitySinceIdle.size > maxSessions) {
+      const sessionsToRemove = Array.from(sessionActivitySinceIdle).slice(0, sessionActivitySinceIdle.size - maxSessions)
+      sessionsToRemove.forEach(id => sessionActivitySinceIdle.delete(id))
+    }
+    if (notificationVersions.size > maxSessions) {
+      const sessionsToRemove = Array.from(notificationVersions.keys()).slice(0, notificationVersions.size - maxSessions)
+      sessionsToRemove.forEach(id => notificationVersions.delete(id))
+    }
+  }
 
   function cancelPendingNotification(sessionID: string) {
     const timer = pendingTimers.get(sessionID)
@@ -117,6 +138,8 @@ export function createSessionNotification(
       pendingTimers.delete(sessionID)
     }
     sessionActivitySinceIdle.add(sessionID)
+    // Increment version to invalidate any in-flight notifications
+    notificationVersions.set(sessionID, (notificationVersions.get(sessionID) ?? 0) + 1)
   }
 
   function markSessionActivity(sessionID: string) {
@@ -124,9 +147,14 @@ export function createSessionNotification(
     notifiedSessions.delete(sessionID)
   }
 
-  async function executeNotification(sessionID: string) {
+  async function executeNotification(sessionID: string, version: number) {
     pendingTimers.delete(sessionID)
 
+    // Race condition fix: check if version matches (activity happened during async wait)
+    if (notificationVersions.get(sessionID) !== version) {
+      return
+    }
+
     if (sessionActivitySinceIdle.has(sessionID)) {
       sessionActivitySinceIdle.delete(sessionID)
       return
@@ -136,9 +164,17 @@ export function createSessionNotification(
 
     if (mergedConfig.skipIfIncompleteTodos) {
       const hasPendingWork = await hasIncompleteTodos(ctx, sessionID)
+      // Re-check version after async call (race condition fix)
+      if (notificationVersions.get(sessionID) !== version) {
+        return
+      }
       if (hasPendingWork) return
     }
 
+    if (notificationVersions.get(sessionID) !== version) {
+      return
+    }
+
     notifiedSessions.add(sessionID)
 
     try {
@@ -172,20 +208,34 @@ export function createSessionNotification(
       if (pendingTimers.has(sessionID)) return
 
       sessionActivitySinceIdle.delete(sessionID)
+      
+      const currentVersion = (notificationVersions.get(sessionID) ?? 0) + 1
+      notificationVersions.set(sessionID, currentVersion)
 
       const timer = setTimeout(() => {
-        executeNotification(sessionID)
+        executeNotification(sessionID, currentVersion)
       }, mergedConfig.idleConfirmationDelay)
 
       pendingTimers.set(sessionID, timer)
+      cleanupOldSessions()
+      return
     }
 
-    if (event.type === "message.updated") {
+    if (event.type === "message.updated" || event.type === "message.created") {
       const info = props?.info as Record<string, unknown> | undefined
       const sessionID = info?.sessionID as string | undefined
       if (sessionID) {
         markSessionActivity(sessionID)
       }
+      return
+    }
+
+    if (event.type === "tool.execute.before" || event.type === "tool.execute.after") {
+      const sessionID = props?.sessionID as string | undefined
+      if (sessionID) {
+        markSessionActivity(sessionID)
+      }
+      return
     }
 
     if (event.type === "session.deleted") {
@@ -194,6 +244,7 @@ export function createSessionNotification(
         cancelPendingNotification(sessionInfo.id)
         notifiedSessions.delete(sessionInfo.id)
         sessionActivitySinceIdle.delete(sessionInfo.id)
+        notificationVersions.delete(sessionInfo.id)
       }
     }
   }

src/hooks/session-recovery/index.ts

@@ -216,14 +216,26 @@ async function recoverEmptyContentMessage(
 // All error types have dedicated recovery functions (recoverToolResultMissing,
 // recoverThinkingBlockOrder, recoverThinkingDisabledViolation, recoverEmptyContentMessage).
 
-export function createSessionRecoveryHook(ctx: PluginInput) {
+export interface SessionRecoveryHook {
+  handleSessionRecovery: (info: MessageInfo) => Promise<boolean>
+  isRecoverableError: (error: unknown) => boolean
+  setOnAbortCallback: (callback: (sessionID: string) => void) => void
+  setOnRecoveryCompleteCallback: (callback: (sessionID: string) => void) => void
+}
+
+export function createSessionRecoveryHook(ctx: PluginInput): SessionRecoveryHook {
   const processingErrors = new Set<string>()
   let onAbortCallback: ((sessionID: string) => void) | null = null
+  let onRecoveryCompleteCallback: ((sessionID: string) => void) | null = null
 
   const setOnAbortCallback = (callback: (sessionID: string) => void): void => {
     onAbortCallback = callback
   }
 
+  const setOnRecoveryCompleteCallback = (callback: (sessionID: string) => void): void => {
+    onRecoveryCompleteCallback = callback
+  }
+
   const isRecoverableError = (error: unknown): boolean => {
     return detectErrorType(error) !== null
   }
@@ -242,12 +254,12 @@ export function createSessionRecoveryHook(ctx: PluginInput) {
     processingErrors.add(assistantMsgID)
 
     try {
-      await ctx.client.session.abort({ path: { id: sessionID } }).catch(() => {})
-
       if (onAbortCallback) {
-        onAbortCallback(sessionID)
+        onAbortCallback(sessionID)  // Mark recovering BEFORE abort
       }
 
+      await ctx.client.session.abort({ path: { id: sessionID } }).catch(() => {})
+
       const messagesResp = await ctx.client.session.messages({
         path: { id: sessionID },
         query: { directory: ctx.directory },
@@ -301,6 +313,11 @@ export function createSessionRecoveryHook(ctx: PluginInput) {
     return false
   } finally {
     processingErrors.delete(assistantMsgID)
+
+    // Always notify recovery complete, regardless of success or failure
+    if (sessionID && onRecoveryCompleteCallback) {
+      onRecoveryCompleteCallback(sessionID)
+    }
   }
   }
 
@@ -308,5 +325,6 @@ export function createSessionRecoveryHook(ctx: PluginInput) {
     handleSessionRecovery,
     isRecoverableError,
     setOnAbortCallback,
+    setOnRecoveryCompleteCallback,
   }
 }

src/hooks/think-mode/index.ts

@@ -1,6 +1,7 @@
 import { detectThinkKeyword, extractPromptText } from "./detector"
-import { getHighVariant, isAlreadyHighVariant } from "./switcher"
+import { getHighVariant, isAlreadyHighVariant, getThinkingConfig } from "./switcher"
 import type { ThinkModeState, ThinkModeInput } from "./types"
+import { log } from "../../shared"
 
 export * from "./detector"
 export * from "./switcher"
@@ -23,6 +24,7 @@ export function createThinkModeHook() {
       const state: ThinkModeState = {
         requested: false,
         modelSwitched: false,
+        thinkingConfigInjected: false,
       }
 
       if (!detectThinkKeyword(promptText)) {
@@ -47,17 +49,31 @@ export function createThinkModeHook() {
       }
 
       const highVariant = getHighVariant(currentModel.modelID)
+      const thinkingConfig = getThinkingConfig(currentModel.providerID, currentModel.modelID)
 
-      if (!highVariant) {
-        thinkModeState.set(sessionID, state)
-        return
+      if (highVariant) {
+        output.message.model = {
+          providerID: currentModel.providerID,
+          modelID: highVariant,
+        }
+        state.modelSwitched = true
+        log("Think mode: model switched to high variant", {
+          sessionID,
+          from: currentModel.modelID,
+          to: highVariant,
+        })
       }
 
-      output.message.model = {
-        providerID: currentModel.providerID,
-        modelID: highVariant,
+      if (thinkingConfig) {
+        Object.assign(output.message, thinkingConfig)
+        state.thinkingConfigInjected = true
+        log("Think mode: thinking config injected", {
+          sessionID,
+          provider: currentModel.providerID,
+          config: thinkingConfig,
+        })
       }
-      state.modelSwitched = true
+
       thinkModeState.set(sessionID, state)
     },
 

src/hooks/think-mode/switcher.ts

@@ -55,12 +55,14 @@ export const THINKING_CONFIGS: Record<string, Record<string, unknown>> = {
       type: "enabled",
       budgetTokens: 64000,
     },
+    maxTokens: 128000,
   },
   "amazon-bedrock": {
     reasoningConfig: {
       type: "enabled",
       budgetTokens: 32000,
     },
+    maxTokens: 64000,
   },
   google: {
     providerOptions: {

src/hooks/think-mode/types.ts

@@ -1,6 +1,7 @@
 export interface ThinkModeState {
   requested: boolean
   modelSwitched: boolean
+  thinkingConfigInjected: boolean
   providerID?: string
   modelID?: string
 }

src/hooks/todo-continuation-enforcer.ts

@@ -1,5 +1,11 @@
 import type { PluginInput } from "@opencode-ai/plugin"
 
+export interface TodoContinuationEnforcer {
+  handler: (input: { event: { type: string; properties?: unknown } }) => Promise<void>
+  markRecovering: (sessionID: string) => void
+  markRecoveryComplete: (sessionID: string) => void
+}
+
 interface Todo {
   content: string
   status: string
@@ -32,13 +38,22 @@ function detectInterrupt(error: unknown): boolean {
   return false
 }
 
-export function createTodoContinuationEnforcer(ctx: PluginInput) {
+export function createTodoContinuationEnforcer(ctx: PluginInput): TodoContinuationEnforcer {
   const remindedSessions = new Set<string>()
   const interruptedSessions = new Set<string>()
   const errorSessions = new Set<string>()
+  const recoveringSessions = new Set<string>()
   const pendingTimers = new Map<string, ReturnType<typeof setTimeout>>()
 
-  return async ({ event }: { event: { type: string; properties?: unknown } }) => {
+  const markRecovering = (sessionID: string): void => {
+    recoveringSessions.add(sessionID)
+  }
+
+  const markRecoveryComplete = (sessionID: string): void => {
+    recoveringSessions.delete(sessionID)
+  }
+
+  const handler = async ({ event }: { event: { type: string; properties?: unknown } }): Promise<void> => {
     const props = event.properties as Record<string, unknown> | undefined
 
     if (event.type === "session.error") {
@@ -73,6 +88,11 @@ export function createTodoContinuationEnforcer(ctx: PluginInput) {
       const timer = setTimeout(async () => {
         pendingTimers.delete(sessionID)
 
+        // Check if session is in recovery mode - if so, skip entirely without clearing state
+        if (recoveringSessions.has(sessionID)) {
+          return
+        }
+
         const shouldBypass = interruptedSessions.has(sessionID) || errorSessions.has(sessionID)
         
         interruptedSessions.delete(sessionID)
@@ -111,7 +131,7 @@ export function createTodoContinuationEnforcer(ctx: PluginInput) {
         remindedSessions.add(sessionID)
 
         // Re-check if abort occurred during the delay/fetch
-        if (interruptedSessions.has(sessionID) || errorSessions.has(sessionID)) {
+        if (interruptedSessions.has(sessionID) || errorSessions.has(sessionID) || recoveringSessions.has(sessionID)) {
           remindedSessions.delete(sessionID)
           return
         }
@@ -158,6 +178,7 @@ export function createTodoContinuationEnforcer(ctx: PluginInput) {
         remindedSessions.delete(sessionInfo.id)
         interruptedSessions.delete(sessionInfo.id)
         errorSessions.delete(sessionInfo.id)
+        recoveringSessions.delete(sessionInfo.id)
         
         // Cancel pending continuation
         const timer = pendingTimers.get(sessionInfo.id)
@@ -168,4 +189,10 @@ export function createTodoContinuationEnforcer(ctx: PluginInput) {
       }
     }
   }
+
+  return {
+    handler,
+    markRecovering,
+    markRecoveryComplete,
+  }
 }

src/hooks/ultrawork-mode/constants.ts

@@ -0,0 +1,48 @@
+/** Keyword patterns - "ultrawork", "ulw" (case-insensitive, word boundary) */
+export const ULTRAWORK_PATTERNS = [/\bultrawork\b/i, /\bulw\b/i]
+
+/** Code block pattern to exclude from keyword detection */
+export const CODE_BLOCK_PATTERN = /```[\s\S]*?```/g
+
+/** Inline code pattern to exclude */
+export const INLINE_CODE_PATTERN = /`[^`]+`/g
+
+/**
+ * ULTRAWORK_CONTEXT - Agent-Agnostic Guidance
+ *
+ * Key principles:
+ * - NO specific agent names (oracle, librarian, etc.)
+ * - Only provide guidance based on agent role/capability
+ * - Emphasize parallel execution, TODO tracking, delegation
+ */
+export const ULTRAWORK_CONTEXT = `<ultrawork-mode>
+[CODE RED] Maximum precision required. Ultrathink before acting.
+
+YOU MUST LEVERAGE ALL AVAILABLE AGENTS TO THEIR FULLEST POTENTIAL.
+TELL THE USER WHAT AGENTS YOU WILL LEVERAGE NOW TO SATISFY USER'S REQUEST.
+
+## AGENT UTILIZATION PRINCIPLES (by capability, not by name)
+- **Codebase Exploration**: Spawn exploration agents using BACKGROUND TASKS for file patterns, internal implementations, project structure
+- **Documentation & References**: Use librarian-type agents via BACKGROUND TASKS for API references, examples, external library docs
+- **Planning & Strategy**: NEVER plan yourself - ALWAYS spawn a dedicated planning agent for work breakdown
+- **High-IQ Reasoning**: Leverage specialized agents for architecture decisions, code review, strategic planning
+- **Frontend/UI Tasks**: Delegate to UI-specialized agents for design and implementation
+
+## EXECUTION RULES
+- **TODO**: Track EVERY step. Mark complete IMMEDIATELY after each.
+- **PARALLEL**: Fire independent agent calls simultaneously via background_task - NEVER wait sequentially.
+- **BACKGROUND FIRST**: Use background_task for exploration/research agents (10+ concurrent if needed).
+- **VERIFY**: Re-read request after completion. Check ALL requirements met before reporting done.
+- **DELEGATE**: Don't do everything yourself - orchestrate specialized agents for their strengths.
+
+## WORKFLOW
+1. Analyze the request and identify required capabilities
+2. Spawn exploration/librarian agents via background_task in PARALLEL (10+ if needed)
+3. Use planning agents to create detailed work breakdown
+4. Execute with continuous verification against original requirements
+
+</ultrawork-mode>
+
+---
+
+`

src/hooks/ultrawork-mode/detector.ts

@@ -0,0 +1,33 @@
+import {
+  ULTRAWORK_PATTERNS,
+  CODE_BLOCK_PATTERN,
+  INLINE_CODE_PATTERN,
+} from "./constants"
+
+/**
+ * Remove code blocks and inline code from text.
+ * Prevents false positives when keywords appear in code.
+ */
+export function removeCodeBlocks(text: string): string {
+  return text.replace(CODE_BLOCK_PATTERN, "").replace(INLINE_CODE_PATTERN, "")
+}
+
+/**
+ * Detect ultrawork keywords in text (excluding code blocks).
+ */
+export function detectUltraworkKeyword(text: string): boolean {
+  const textWithoutCode = removeCodeBlocks(text)
+  return ULTRAWORK_PATTERNS.some((pattern) => pattern.test(textWithoutCode))
+}
+
+/**
+ * Extract text content from message parts.
+ */
+export function extractPromptText(
+  parts: Array<{ type: string; text?: string }>
+): string {
+  return parts
+    .filter((p) => p.type === "text")
+    .map((p) => p.text || "")
+    .join("")
+}

src/hooks/ultrawork-mode/index.ts

@@ -0,0 +1,97 @@
+import { detectUltraworkKeyword, extractPromptText } from "./detector"
+import { ULTRAWORK_CONTEXT } from "./constants"
+import type { UltraworkModeState } from "./types"
+import { log } from "../../shared"
+import { injectHookMessage } from "../../features/hook-message-injector"
+
+export * from "./detector"
+export * from "./constants"
+export * from "./types"
+
+const ultraworkModeState = new Map<string, UltraworkModeState>()
+
+export function clearUltraworkModeState(sessionID: string): void {
+  ultraworkModeState.delete(sessionID)
+}
+
+export function createUltraworkModeHook() {
+  return {
+    /**
+     * chat.message hook - detect ultrawork/ulw keywords, inject context via history
+     *
+     * Execution timing: AFTER claudeCodeHooks["chat.message"]
+     * Behavior:
+     *   1. Extract text from user prompt
+     *   2. Detect ultrawork/ulw keywords (excluding code blocks)
+     *   3. If detected, inject ULTRAWORK_CONTEXT via injectHookMessage (history injection)
+     */
+    "chat.message": async (
+      input: {
+        sessionID: string
+        agent?: string
+        model?: { providerID: string; modelID: string }
+        messageID?: string
+      },
+      output: {
+        message: Record<string, unknown>
+        parts: Array<{ type: string; text?: string; [key: string]: unknown }>
+      }
+    ): Promise<void> => {
+      const state: UltraworkModeState = {
+        detected: false,
+        injected: false,
+      }
+
+      const promptText = extractPromptText(output.parts)
+
+      if (!detectUltraworkKeyword(promptText)) {
+        ultraworkModeState.set(input.sessionID, state)
+        return
+      }
+
+      state.detected = true
+      log("Ultrawork keyword detected", { sessionID: input.sessionID })
+
+      const message = output.message as {
+        agent?: string
+        model?: { modelID?: string; providerID?: string }
+        path?: { cwd?: string; root?: string }
+        tools?: Record<string, boolean>
+      }
+
+      const success = injectHookMessage(input.sessionID, ULTRAWORK_CONTEXT, {
+        agent: message.agent,
+        model: message.model,
+        path: message.path,
+        tools: message.tools,
+      })
+
+      if (success) {
+        state.injected = true
+        log("Ultrawork context injected via history", { sessionID: input.sessionID })
+      } else {
+        log("Ultrawork context injection failed", { sessionID: input.sessionID })
+      }
+
+      ultraworkModeState.set(input.sessionID, state)
+    },
+
+    /**
+     * event hook - cleanup session state on deletion
+     */
+    event: async ({
+      event,
+    }: {
+      event: { type: string; properties?: unknown }
+    }) => {
+      if (event.type === "session.deleted") {
+        const props = event.properties as
+          | { info?: { id?: string } }
+          | undefined
+        if (props?.info?.id) {
+          ultraworkModeState.delete(props.info.id)
+        }
+      }
+    },
+  }
+}

src/hooks/ultrawork-mode/types.ts

@@ -0,0 +1,20 @@
+export interface UltraworkModeState {
+  /** Whether ultrawork keyword was detected */
+  detected: boolean
+  /** Whether context was injected */
+  injected: boolean
+}
+
+export interface ModelRef {
+  providerID: string
+  modelID: string
+}
+
+export interface MessageWithModel {
+  model?: ModelRef
+}
+
+export interface UltraworkModeInput {
+  parts: Array<{ type: string; text?: string }>
+  message: MessageWithModel
+}

src/index.ts

@@ -4,6 +4,7 @@ import {
   createTodoContinuationEnforcer,
   createContextWindowMonitorHook,
   createSessionRecoveryHook,
+  createSessionNotification,
   createCommentCheckerHooks,
   createGrepOutputTruncatorHook,
   createDirectoryAgentsInjectorHook,
@@ -15,7 +16,9 @@ import {
   createRulesInjectorHook,
   createBackgroundNotificationHook,
   createAutoUpdateCheckerHook,
+  createUltraworkModeHook,
 } from "./hooks";
+import { createGoogleAntigravityAuthPlugin } from "./auth/antigravity";
 import {
   loadUserCommands,
   loadProjectCommands,
@@ -41,8 +44,8 @@ import { updateTerminalTitle } from "./features/terminal";
 import { builtinTools, createCallOmoAgent, createBackgroundTools } from "./tools";
 import { BackgroundManager } from "./features/background-agent";
 import { createBuiltinMcps } from "./mcp";
-import { OhMyOpenCodeConfigSchema, type OhMyOpenCodeConfig } from "./config";
-import { log } from "./shared/logger";
+import { OhMyOpenCodeConfigSchema, type OhMyOpenCodeConfig, type HookName } from "./config";
+import { log, deepMerge } from "./shared";
 import * as fs from "fs";
 import * as path from "path";
 import * as os from "os";
@@ -89,10 +92,7 @@ function mergeConfigs(
   return {
     ...base,
     ...override,
-    agents:
-      override.agents !== undefined
-        ? { ...(base.agents ?? {}), ...override.agents }
-        : base.agents,
+    agents: deepMerge(base.agents, override.agents),
     disabled_agents: [
       ...new Set([
         ...(base.disabled_agents ?? []),
@@ -105,10 +105,13 @@ function mergeConfigs(
         ...(override.disabled_mcps ?? []),
       ]),
     ],
-    claude_code:
-      override.claude_code !== undefined || base.claude_code !== undefined
-        ? { ...(base.claude_code ?? {}), ...(override.claude_code ?? {}) }
-        : undefined,
+    disabled_hooks: [
+      ...new Set([
+        ...(base.disabled_hooks ?? []),
+        ...(override.disabled_hooks ?? []),
+      ]),
+    ],
+    claude_code: deepMerge(base.claude_code, override.claude_code),
   };
 }
 
@@ -140,6 +143,7 @@ function loadPluginConfig(directory: string): OhMyOpenCodeConfig {
     agents: config.agents,
     disabled_agents: config.disabled_agents,
     disabled_mcps: config.disabled_mcps,
+    disabled_hooks: config.disabled_hooks,
     claude_code: config.claude_code,
   });
   return config;
@@ -147,33 +151,81 @@ function loadPluginConfig(directory: string): OhMyOpenCodeConfig {
 
 const OhMyOpenCodePlugin: Plugin = async (ctx) => {
   const pluginConfig = loadPluginConfig(ctx.directory);
+  const disabledHooks = new Set(pluginConfig.disabled_hooks ?? []);
+  const isHookEnabled = (hookName: HookName) => !disabledHooks.has(hookName);
 
-  const todoContinuationEnforcer = createTodoContinuationEnforcer(ctx);
-  const contextWindowMonitor = createContextWindowMonitorHook(ctx);
-  const sessionRecovery = createSessionRecoveryHook(ctx);
-  const commentChecker = createCommentCheckerHooks();
-  const grepOutputTruncator = createGrepOutputTruncatorHook(ctx);
-  const directoryAgentsInjector = createDirectoryAgentsInjectorHook(ctx);
-  const directoryReadmeInjector = createDirectoryReadmeInjectorHook(ctx);
-  const emptyTaskResponseDetector = createEmptyTaskResponseDetectorHook(ctx);
-  const thinkMode = createThinkModeHook();
+  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 sessionNotification = isHookEnabled("session-notification")
+    ? createSessionNotification(ctx)
+    : null;
+
+  // Wire up recovery state tracking between session-recovery and todo-continuation-enforcer
+  // This prevents the continuation enforcer from injecting prompts during active recovery
+  if (sessionRecovery && todoContinuationEnforcer) {
+    sessionRecovery.setOnAbortCallback(todoContinuationEnforcer.markRecovering);
+    sessionRecovery.setOnRecoveryCompleteCallback(todoContinuationEnforcer.markRecoveryComplete);
+  }
+
+  const commentChecker = isHookEnabled("comment-checker")
+    ? createCommentCheckerHooks()
+    : null;
+  const grepOutputTruncator = isHookEnabled("grep-output-truncator")
+    ? createGrepOutputTruncatorHook(ctx)
+    : null;
+  const directoryAgentsInjector = isHookEnabled("directory-agents-injector")
+    ? createDirectoryAgentsInjectorHook(ctx)
+    : null;
+  const directoryReadmeInjector = isHookEnabled("directory-readme-injector")
+    ? createDirectoryReadmeInjectorHook(ctx)
+    : null;
+  const emptyTaskResponseDetector = isHookEnabled("empty-task-response-detector")
+    ? createEmptyTaskResponseDetectorHook(ctx)
+    : null;
+  const thinkMode = isHookEnabled("think-mode")
+    ? createThinkModeHook()
+    : null;
   const claudeCodeHooks = createClaudeCodeHooksHook(ctx, {
     disabledHooks: (pluginConfig.claude_code?.hooks ?? true) ? undefined : true,
   });
-  const anthropicAutoCompact = createAnthropicAutoCompactHook(ctx);
-  const rulesInjector = createRulesInjectorHook(ctx);
-  const autoUpdateChecker = createAutoUpdateCheckerHook(ctx);
+  const anthropicAutoCompact = isHookEnabled("anthropic-auto-compact")
+    ? createAnthropicAutoCompactHook(ctx)
+    : null;
+  const rulesInjector = isHookEnabled("rules-injector")
+    ? createRulesInjectorHook(ctx)
+    : null;
+  const autoUpdateChecker = isHookEnabled("auto-update-checker")
+    ? createAutoUpdateCheckerHook(ctx)
+    : null;
+  const ultraworkMode = isHookEnabled("ultrawork-mode")
+    ? createUltraworkModeHook()
+    : null;
 
   updateTerminalTitle({ sessionId: "main" });
 
   const backgroundManager = new BackgroundManager(ctx);
 
-  const backgroundNotificationHook = createBackgroundNotificationHook(backgroundManager);
+  const backgroundNotificationHook = isHookEnabled("background-notification")
+    ? createBackgroundNotificationHook(backgroundManager)
+    : null;
   const backgroundTools = createBackgroundTools(backgroundManager, ctx.client);
 
   const callOmoAgent = createCallOmoAgent(ctx, backgroundManager);
 
+  const googleAuthHooks = pluginConfig.google_auth
+    ? await createGoogleAntigravityAuthPlugin(ctx)
+    : null;
+
   return {
+    ...(googleAuthHooks ? { auth: googleAuthHooks.auth } : {}),
+
     tool: {
       ...builtinTools,
       ...backgroundTools,
@@ -182,6 +234,7 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
 
     "chat.message": async (input, output) => {
       await claudeCodeHooks["chat.message"]?.(input, output);
+      await ultraworkMode?.["chat.message"]?.(input, output);
     },
 
     config: async (config) => {
@@ -245,16 +298,18 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
     },
 
     event: async (input) => {
-      await autoUpdateChecker.event(input);
+      await autoUpdateChecker?.event(input);
       await claudeCodeHooks.event(input);
-      await backgroundNotificationHook.event(input);
-      await todoContinuationEnforcer(input);
-      await contextWindowMonitor.event(input);
-      await directoryAgentsInjector.event(input);
-      await directoryReadmeInjector.event(input);
-      await rulesInjector.event(input);
-      await thinkMode.event(input);
-      await anthropicAutoCompact.event(input);
+      await backgroundNotificationHook?.event(input);
+      await sessionNotification?.(input);
+      await todoContinuationEnforcer?.handler(input);
+      await contextWindowMonitor?.event(input);
+      await directoryAgentsInjector?.event(input);
+      await directoryReadmeInjector?.event(input);
+      await rulesInjector?.event(input);
+      await thinkMode?.event(input);
+      await anthropicAutoCompact?.event(input);
+      await ultraworkMode?.event(input);
 
       const { event } = input;
       const props = event.properties as Record<string, unknown> | undefined;
@@ -306,7 +361,7 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
         const sessionID = props?.sessionID as string | undefined;
         const error = props?.error;
 
-        if (sessionRecovery.isRecoverableError(error)) {
+        if (sessionRecovery?.isRecoverableError(error)) {
           const messageInfo = {
             id: props?.messageID as string | undefined,
             role: "assistant" as const,
@@ -352,7 +407,7 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
 
     "tool.execute.before": async (input, output) => {
       await claudeCodeHooks["tool.execute.before"](input, output);
-      await commentChecker["tool.execute.before"](input, output);
+      await commentChecker?.["tool.execute.before"](input, output);
 
       if (input.sessionID === getMainSessionID()) {
         updateTerminalTitle({
@@ -367,13 +422,13 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
 
     "tool.execute.after": async (input, output) => {
       await claudeCodeHooks["tool.execute.after"](input, output);
-      await grepOutputTruncator["tool.execute.after"](input, output);
-      await contextWindowMonitor["tool.execute.after"](input, output);
-      await commentChecker["tool.execute.after"](input, output);
-      await directoryAgentsInjector["tool.execute.after"](input, output);
-      await directoryReadmeInjector["tool.execute.after"](input, output);
-      await rulesInjector["tool.execute.after"](input, output);
-      await emptyTaskResponseDetector["tool.execute.after"](input, output);
+      await grepOutputTruncator?.["tool.execute.after"](input, output);
+      await contextWindowMonitor?.["tool.execute.after"](input, output);
+      await commentChecker?.["tool.execute.after"](input, output);
+      await directoryAgentsInjector?.["tool.execute.after"](input, output);
+      await directoryReadmeInjector?.["tool.execute.after"](input, output);
+      await rulesInjector?.["tool.execute.after"](input, output);
+      await emptyTaskResponseDetector?.["tool.execute.after"](input, output);
 
       if (input.sessionID === getMainSessionID()) {
         updateTerminalTitle({
@@ -395,4 +450,5 @@ export type {
   AgentOverrideConfig,
   AgentOverrides,
   McpName,
+  HookName,
 } from "./config";

src/shared/deep-merge.ts

@@ -0,0 +1,53 @@
+const DANGEROUS_KEYS = new Set(["__proto__", "constructor", "prototype"]);
+const MAX_DEPTH = 50;
+
+export function isPlainObject(value: unknown): value is Record<string, unknown> {
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    !Array.isArray(value) &&
+    Object.prototype.toString.call(value) === "[object Object]"
+  );
+}
+
+/**
+ * Deep merges two objects, with override values taking precedence.
+ * - Objects are recursively merged
+ * - Arrays are replaced (not concatenated)
+ * - undefined values in override do not overwrite base values
+ *
+ * @example
+ * deepMerge({ a: 1, b: { c: 2, d: 3 } }, { b: { c: 10 }, e: 5 })
+ * // => { a: 1, b: { c: 10, d: 3 }, e: 5 }
+ */
+export function deepMerge<T extends Record<string, unknown>>(base: T, override: Partial<T>, depth?: number): T;
+export function deepMerge<T extends Record<string, unknown>>(base: T | undefined, override: T | undefined, depth?: number): T | undefined;
+export function deepMerge<T extends Record<string, unknown>>(
+  base: T | undefined,
+  override: T | undefined,
+  depth = 0
+): T | undefined {
+  if (!base && !override) return undefined;
+  if (!base) return override;
+  if (!override) return base;
+  if (depth > MAX_DEPTH) return override ?? base;
+
+  const result = { ...base } as Record<string, unknown>;
+
+  for (const key of Object.keys(override)) {
+    if (DANGEROUS_KEYS.has(key)) continue;
+
+    const baseValue = base[key];
+    const overrideValue = override[key];
+
+    if (overrideValue === undefined) continue;
+
+    if (isPlainObject(baseValue) && isPlainObject(overrideValue)) {
+      result[key] = deepMerge(baseValue, overrideValue, depth + 1);
+    } else {
+      result[key] = overrideValue;
+    }
+  }
+
+  return result as T;
+}

src/shared/file-utils.ts

@@ -0,0 +1,26 @@
+import { lstatSync, readlinkSync } from "fs"
+import { resolve } from "path"
+
+export function isMarkdownFile(entry: { name: string; isFile: () => boolean }): boolean {
+  return !entry.name.startsWith(".") && entry.name.endsWith(".md") && entry.isFile()
+}
+
+export function isSymbolicLink(filePath: string): boolean {
+  try {
+    return lstatSync(filePath, { throwIfNoEntry: false })?.isSymbolicLink() ?? false
+  } catch {
+    return false
+  }
+}
+
+export function resolveSymlink(filePath: string): string {
+  try {
+    const stats = lstatSync(filePath, { throwIfNoEntry: false })
+    if (stats?.isSymbolicLink()) {
+      return resolve(filePath, "..", readlinkSync(filePath))
+    }
+    return filePath
+  } catch {
+    return filePath
+  }
+}

src/shared/index.ts

@@ -7,3 +7,5 @@ export * from "./snake-case"
 export * from "./tool-name"
 export * from "./pattern-matcher"
 export * from "./hook-disabled"
+export * from "./deep-merge"
+export * from "./file-utils"

src/shared/snake-case.ts

@@ -1,3 +1,5 @@
+import { isPlainObject } from "./deep-merge"
+
 export function camelToSnake(str: string): string {
   return str.replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`)
 }
@@ -6,10 +8,6 @@ export function snakeToCamel(str: string): string {
   return str.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())
 }
 
-function isPlainObject(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value)
-}
-
 export function objectToSnakeCase(
   obj: Record<string, unknown>,
   deep: boolean = true

src/tools/background-task/tools.ts

@@ -62,21 +62,51 @@ function delay(ms: number): Promise<void> {
   return new Promise(resolve => setTimeout(resolve, ms))
 }
 
+function truncateText(text: string, maxLength: number): string {
+  if (text.length <= maxLength) return text
+  return text.slice(0, maxLength) + "..."
+}
+
 function formatTaskStatus(task: BackgroundTask): string {
   const duration = formatDuration(task.startedAt, task.completedAt)
-  const progress = task.progress
-    ? `\nTool calls: ${task.progress.toolCalls}\nLast tool: ${task.progress.lastTool ?? "N/A"}`
-    : ""
+  const promptPreview = truncateText(task.prompt, 500)
+  
+  let progressSection = ""
+  if (task.progress) {
+    progressSection = `\nTool calls: ${task.progress.toolCalls}\nLast tool: ${task.progress.lastTool ?? "N/A"}`
+  }
 
-  return `Task Status
+  let lastMessageSection = ""
+  if (task.progress?.lastMessage) {
+    const truncated = truncateText(task.progress.lastMessage, 500)
+    const messageTime = task.progress.lastMessageAt 
+      ? task.progress.lastMessageAt.toISOString()
+      : "N/A"
+    lastMessageSection = `
 
-Task ID: ${task.id}
-Description: ${task.description}
-Agent: ${task.agent}
-Status: ${task.status}
-Duration: ${duration}${progress}
+## Last Message (${messageTime})
 
-Session ID: ${task.sessionID}`
+\`\`\`
+${truncated}
+\`\`\``
+  }
+
+  return `# Task Status
+
+| Field | Value |
+|-------|-------|
+| Task ID | \`${task.id}\` |
+| Description | ${task.description} |
+| Agent | ${task.agent} |
+| Status | **${task.status}** |
+| Duration | ${duration} |
+| Session ID | \`${task.sessionID}\` |${progressSection}
+
+## Original Prompt
+
+\`\`\`
+${promptPreview}
+\`\`\`${lastMessageSection}`
 }
 
 async function formatTaskResult(task: BackgroundTask, client: OpencodeClient): Promise<string> {

src/tools/skill/tools.ts

@@ -1,9 +1,10 @@
 import { tool } from "@opencode-ai/plugin"
-import { existsSync, readdirSync, statSync, readlinkSync, readFileSync } from "fs"
+import { existsSync, readdirSync, readFileSync } from "fs"
 import { homedir } from "os"
-import { join, resolve, basename } from "path"
+import { join, basename } from "path"
 import { z } from "zod/v4"
 import { parseFrontmatter, resolveCommandsInText } from "../../shared"
+import { resolveSymlink } from "../../shared/file-utils"
 import { SkillFrontmatterSchema } from "./types"
 import type { SkillScope, SkillMetadata, SkillInfo, LoadedSkill, SkillFrontmatter } from "./types"
 
@@ -37,15 +38,7 @@ function discoverSkillsFromDir(
     const skillPath = join(skillsDir, entry.name)
 
     if (entry.isDirectory() || entry.isSymbolicLink()) {
-      let resolvedPath = skillPath
-      try {
-        const stats = statSync(skillPath, { throwIfNoEntry: false })
-        if (stats?.isSymbolicLink()) {
-          resolvedPath = resolve(skillPath, "..", readlinkSync(skillPath))
-        }
-      } catch {
-        continue
-      }
+      const resolvedPath = resolveSymlink(skillPath)
 
       const skillMdPath = join(resolvedPath, "SKILL.md")
       if (!existsSync(skillMdPath)) continue
@@ -83,18 +76,6 @@ const skillListForDescription = availableSkills
   .map((s) => `- ${s.name}: ${s.description} (${s.scope})`)
   .join("\n")
 
-function resolveSymlink(skillPath: string): string {
-  try {
-    const stats = statSync(skillPath, { throwIfNoEntry: false })
-    if (stats?.isSymbolicLink()) {
-      return resolve(skillPath, "..", readlinkSync(skillPath))
-    }
-    return skillPath
-  } catch {
-    return skillPath
-  }
-}
-
 async function parseSkillMd(skillPath: string): Promise<SkillInfo | null> {
   const resolvedPath = resolveSymlink(skillPath)
   const skillMdPath = join(resolvedPath, "SKILL.md")

src/tools/slashcommand/tools.ts

@@ -3,6 +3,7 @@ import { existsSync, readdirSync, readFileSync } from "fs"
 import { homedir } from "os"
 import { join, basename, dirname } from "path"
 import { parseFrontmatter, resolveCommandsInText, resolveFileReferencesInText, sanitizeModelField } from "../../shared"
+import { isMarkdownFile } from "../../shared/file-utils"
 import type { CommandScope, CommandMetadata, CommandInfo } from "./types"
 
 function discoverCommandsFromDir(commandsDir: string, scope: CommandScope): CommandInfo[] {
@@ -14,9 +15,7 @@ function discoverCommandsFromDir(commandsDir: string, scope: CommandScope): Comm
   const commands: CommandInfo[] = []
 
   for (const entry of entries) {
-    if (entry.name.startsWith(".")) continue
-    if (!entry.name.endsWith(".md")) continue
-    if (!entry.isFile()) continue
+    if (!isMarkdownFile(entry)) continue
 
     const commandPath = join(commandsDir, entry.name)
     const commandName = basename(entry.name, ".md")