diff --git a/README.en.md b/README.en.md
index 898ba42..d231f16 100644
--- a/README.en.md
+++ b/README.en.md
@@ -78,6 +78,7 @@ I believe in the right tool for the job. For your wallet's sake, use CLIProxyAPI
 - **Todo Continuation Enforcer**: Forces the agent to complete all tasks before exiting. Eliminates the common LLM issue of "giving up halfway".
 - **Context Window Monitor**: Implements [Context Window Anxiety Management](https://agentic-patterns.com/patterns/context-window-anxiety-management/). When context usage exceeds 70%, it reminds the agent that resources are sufficient, preventing rushed or low-quality output.
 - **Session Notification**: Sends a native OS notification when the job is done (macOS, Linux, Windows).
+- **Session Recovery**: Automatically recovers from API errors by injecting missing tool results and correcting thinking block violations, ensuring session stability.
 
 ### Agents
 - **oracle** (`openai/gpt-5.1`): The architect. Expert in code reviews and strategy. Uses GPT-5.1 for its unmatched logic and reasoning capabilities. Inspired by AmpCode.
diff --git a/package.json b/package.json
index 95627d7..d909910 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oh-my-opencode",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "OpenCode plugin - custom agents (oracle, librarian) and enhanced features",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/src/hooks/index.ts b/src/hooks/index.ts
index 8f6d3e4..d3f9d82 100644
--- a/src/hooks/index.ts
+++ b/src/hooks/index.ts
@@ -1,3 +1,4 @@
 export * from "./todo-continuation-enforcer"
 export * from "./context-window-monitor"
 export * from "./session-notification"
+export * from "./session-recovery"
diff --git a/src/hooks/session-recovery.ts b/src/hooks/session-recovery.ts
new file mode 100644
index 0000000..8137c10
--- /dev/null
+++ b/src/hooks/session-recovery.ts
@@ -0,0 +1,354 @@
+/**
+ * Session Recovery - Message State Error Recovery
+ *
+ * Handles THREE specific scenarios:
+ * 1. tool_use block exists without tool_result
+ *    - Recovery: inject tool_result with "cancelled" content
+ *
+ * 2. Thinking block order violation (first block must be thinking)
+ *    - Recovery: prepend empty thinking block
+ *
+ * 3. Thinking disabled but message contains thinking blocks
+ *    - Recovery: strip thinking/redacted_thinking blocks
+ */
+
+import type { PluginInput } from "@opencode-ai/plugin"
+import type { createOpencodeClient } from "@opencode-ai/sdk"
+
+type Client = ReturnType<typeof createOpencodeClient>
+
+type RecoveryErrorType = "tool_result_missing" | "thinking_block_order" | "thinking_disabled_violation" | null
+
+interface MessageInfo {
+  id?: string
+  role?: string
+  sessionID?: string
+  parentID?: string
+  error?: unknown
+}
+
+interface ToolUsePart {
+  type: "tool_use"
+  id: string
+  name: string
+  input: Record<string, unknown>
+}
+
+interface ThinkingPart {
+  type: "thinking"
+  thinking: string
+}
+
+interface MessagePart {
+  type: string
+  id?: string
+  text?: string
+  thinking?: string
+  name?: string
+  input?: Record<string, unknown>
+}
+
+interface MessageData {
+  info?: MessageInfo
+  parts?: MessagePart[]
+}
+
+function getErrorMessage(error: unknown): string {
+  if (!error) return ""
+  if (typeof error === "string") return error.toLowerCase()
+  const errorObj = error as { data?: { message?: string }; message?: string }
+  return (errorObj.data?.message || errorObj.message || "").toLowerCase()
+}
+
+function detectErrorType(error: unknown): RecoveryErrorType {
+  const message = getErrorMessage(error)
+
+  if (message.includes("tool_use") && message.includes("tool_result")) {
+    return "tool_result_missing"
+  }
+
+  if (message.includes("thinking") && message.includes("first block")) {
+    return "thinking_block_order"
+  }
+
+  if (message.includes("thinking is disabled") && message.includes("cannot contain")) {
+    return "thinking_disabled_violation"
+  }
+
+  return null
+}
+
+function extractToolUseIds(parts: MessagePart[]): string[] {
+  return parts.filter((p): p is ToolUsePart => p.type === "tool_use" && !!p.id).map((p) => p.id)
+}
+
+async function recoverToolResultMissing(
+  client: Client,
+  sessionID: string,
+  failedAssistantMsg: MessageData
+): Promise<boolean> {
+  const parts = failedAssistantMsg.parts || []
+  const toolUseIds = extractToolUseIds(parts)
+
+  if (toolUseIds.length === 0) {
+    return false
+  }
+
+  const toolResultParts = toolUseIds.map((id) => ({
+    type: "tool_result" as const,
+    tool_use_id: id,
+    content: "Operation cancelled by user (ESC pressed)",
+  }))
+
+  try {
+    await client.session.prompt({
+      path: { id: sessionID },
+      // @ts-expect-error - SDK types may not include tool_result parts, but runtime accepts it
+      body: { parts: toolResultParts },
+    })
+
+    return true
+  } catch {
+    return false
+  }
+}
+
+async function recoverThinkingBlockOrder(
+  client: Client,
+  sessionID: string,
+  failedAssistantMsg: MessageData,
+  directory: string
+): Promise<boolean> {
+  const messageID = failedAssistantMsg.info?.id
+  if (!messageID) {
+    return false
+  }
+
+  const existingParts = failedAssistantMsg.parts || []
+  const patchedParts: MessagePart[] = [{ type: "thinking", thinking: "" } as ThinkingPart, ...existingParts]
+
+  try {
+    // @ts-expect-error - Experimental API
+    await client.message?.update?.({
+      path: { id: messageID },
+      body: { parts: patchedParts },
+    })
+
+    return true
+  } catch {
+    // message.update not available
+  }
+
+  try {
+    // @ts-expect-error - Experimental API
+    await client.session.patch?.({
+      path: { id: sessionID },
+      body: {
+        messageID,
+        parts: patchedParts,
+      },
+    })
+
+    return true
+  } catch {
+    // session.patch not available
+  }
+
+  return await fallbackRevertStrategy(client, sessionID, failedAssistantMsg, directory)
+}
+
+async function recoverThinkingDisabledViolation(
+  client: Client,
+  sessionID: string,
+  failedAssistantMsg: MessageData
+): Promise<boolean> {
+  const messageID = failedAssistantMsg.info?.id
+  if (!messageID) {
+    return false
+  }
+
+  const existingParts = failedAssistantMsg.parts || []
+  const strippedParts = existingParts.filter((p) => p.type !== "thinking" && p.type !== "redacted_thinking")
+
+  if (strippedParts.length === 0) {
+    return false
+  }
+
+  try {
+    // @ts-expect-error - Experimental API
+    await client.message?.update?.({
+      path: { id: messageID },
+      body: { parts: strippedParts },
+    })
+
+    return true
+  } catch {
+    // message.update not available
+  }
+
+  try {
+    // @ts-expect-error - Experimental API
+    await client.session.patch?.({
+      path: { id: sessionID },
+      body: {
+        messageID,
+        parts: strippedParts,
+      },
+    })
+
+    return true
+  } catch {
+    // session.patch not available
+  }
+
+  return false
+}
+
+async function fallbackRevertStrategy(
+  client: Client,
+  sessionID: string,
+  failedAssistantMsg: MessageData,
+  directory: string
+): Promise<boolean> {
+  const parentMsgID = failedAssistantMsg.info?.parentID
+
+  const messagesResp = await client.session.messages({
+    path: { id: sessionID },
+    query: { directory },
+  })
+  const msgs = (messagesResp as { data?: MessageData[] }).data
+  if (!msgs || msgs.length === 0) {
+    return false
+  }
+
+  let targetUserMsg: MessageData | null = null
+  if (parentMsgID) {
+    targetUserMsg = msgs.find((m) => m.info?.id === parentMsgID) ?? null
+  }
+  if (!targetUserMsg) {
+    for (let i = msgs.length - 1; i >= 0; i--) {
+      if (msgs[i].info?.role === "user") {
+        targetUserMsg = msgs[i]
+        break
+      }
+    }
+  }
+
+  if (!targetUserMsg?.parts?.length) {
+    return false
+  }
+
+  await client.session.revert({
+    path: { id: sessionID },
+    body: { messageID: targetUserMsg.info?.id ?? "" },
+    query: { directory },
+  })
+
+  const textParts = targetUserMsg.parts
+    .filter((p) => p.type === "text" && p.text)
+    .map((p) => ({ type: "text" as const, text: p.text ?? "" }))
+
+  if (textParts.length === 0) {
+    return false
+  }
+
+  await client.session.prompt({
+    path: { id: sessionID },
+    body: { parts: textParts },
+    query: { directory },
+  })
+
+  return true
+}
+
+export function createSessionRecoveryHook(ctx: PluginInput) {
+  const processingErrors = new Set<string>()
+  let onAbortCallback: ((sessionID: string) => void) | null = null
+
+  const setOnAbortCallback = (callback: (sessionID: string) => void): void => {
+    onAbortCallback = callback
+  }
+
+  const isRecoverableError = (error: unknown): boolean => {
+    return detectErrorType(error) !== null
+  }
+
+  const handleSessionRecovery = async (info: MessageInfo): Promise<boolean> => {
+    if (!info || info.role !== "assistant" || !info.error) return false
+
+    const errorType = detectErrorType(info.error)
+    if (!errorType) return false
+
+    const sessionID = info.sessionID
+    const assistantMsgID = info.id
+
+    if (!sessionID || !assistantMsgID) return false
+    if (processingErrors.has(assistantMsgID)) return false
+    processingErrors.add(assistantMsgID)
+
+    try {
+      await ctx.client.session.abort({ path: { id: sessionID } }).catch(() => {})
+
+      if (onAbortCallback) {
+        onAbortCallback(sessionID)
+      }
+
+      const messagesResp = await ctx.client.session.messages({
+        path: { id: sessionID },
+        query: { directory: ctx.directory },
+      })
+      const msgs = (messagesResp as { data?: MessageData[] }).data
+
+      const failedMsg = msgs?.find((m) => m.info?.id === assistantMsgID)
+      if (!failedMsg) {
+        return false
+      }
+
+      const toastTitles: Record<RecoveryErrorType & string, string> = {
+        tool_result_missing: "Tool Crash Recovery",
+        thinking_block_order: "Thinking Block Recovery",
+        thinking_disabled_violation: "Thinking Strip Recovery",
+      }
+      const toastMessages: Record<RecoveryErrorType & string, string> = {
+        tool_result_missing: "Injecting cancelled tool results...",
+        thinking_block_order: "Fixing message structure...",
+        thinking_disabled_violation: "Stripping thinking blocks...",
+      }
+      const toastTitle = toastTitles[errorType]
+      const toastMessage = toastMessages[errorType]
+
+      await ctx.client.tui
+        .showToast({
+          body: {
+            title: toastTitle,
+            message: toastMessage,
+            variant: "warning",
+            duration: 3000,
+          },
+        })
+        .catch(() => {})
+
+      let success = false
+
+      if (errorType === "tool_result_missing") {
+        success = await recoverToolResultMissing(ctx.client, sessionID, failedMsg)
+      } else if (errorType === "thinking_block_order") {
+        success = await recoverThinkingBlockOrder(ctx.client, sessionID, failedMsg, ctx.directory)
+      } else if (errorType === "thinking_disabled_violation") {
+        success = await recoverThinkingDisabledViolation(ctx.client, sessionID, failedMsg)
+      }
+
+      return success
+    } catch {
+      return false
+    } finally {
+      processingErrors.delete(assistantMsgID)
+    }
+  }
+
+  return {
+    handleSessionRecovery,
+    isRecoverableError,
+    setOnAbortCallback,
+  }
+}
diff --git a/src/index.ts b/src/index.ts
index 053a267..efa5d34 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,12 +1,13 @@
 import type { Plugin } from "@opencode-ai/plugin"
 import { builtinAgents } from "./agents"
-import { createTodoContinuationEnforcer, createContextWindowMonitorHook } from "./hooks"
+import { createTodoContinuationEnforcer, createContextWindowMonitorHook, createSessionRecoveryHook } from "./hooks"
 import { updateTerminalTitle } from "./features/terminal"
 import { builtinTools } from "./tools"
 
 const OhMyOpenCodePlugin: Plugin = async (ctx) => {
   const todoContinuationEnforcer = createTodoContinuationEnforcer(ctx)
   const contextWindowMonitor = createContextWindowMonitorHook(ctx)
+  const sessionRecovery = createSessionRecoveryHook(ctx)
 
   updateTerminalTitle({ sessionId: "main" })
 
@@ -79,6 +80,18 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
 
       if (event.type === "session.error") {
         const sessionID = props?.sessionID as string | undefined
+        const error = props?.error
+
+        if (sessionRecovery.isRecoverableError(error)) {
+          const messageInfo = {
+            id: props?.messageID as string | undefined,
+            role: "assistant" as const,
+            sessionID,
+            error,
+          }
+          await sessionRecovery.handleSessionRecovery(messageInfo)
+        }
+
         if (sessionID && sessionID === mainSessionID) {
           updateTerminalTitle({
             sessionId: sessionID,