oh-my-opencode 2.12.1 → 2.12.2

package/README.ja.md

@@ -4,7 +4,7 @@
 >
 > 一緒に歩みましょう！
 >
-> | [<img alt="Discord link" src="https://img.shields.io/discord/1452487457085063218?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=flat-square" width="156px" />](https://discord.gg/PWpXmbhF) | [Discordコミュニティ](https://discord.gg/PWpXmbhF)に参加して、コントリビューターや`oh-my-opencode`仲間とつながりましょう。 |
+> | [<img alt="Discord link" src="https://img.shields.io/discord/1452487457085063218?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=flat-square" width="156px" />](https://discord.gg/aSfGzWtYxM) | [Discordコミュニティ](https://discord.gg/aSfGzWtYxM)に参加して、コントリビューターや`oh-my-opencode`仲間とつながりましょう。 |
 > | :-----| :----- |
 > | [<img alt="X link" src="https://img.shields.io/badge/Follow-%40justsisyphus-00CED1?style=flat-square&logo=x&labelColor=black" width="156px" />](https://x.com/justsisyphus) | `oh-my-opencode`に関するニュースは私のXアカウントで投稿していましたが、無実の罪で凍結されたため、<br />[@justsisyphus](https://x.com/justsisyphus)が代わりに更新を投稿しています。 |
 > | [<img alt="Sponsor" src="https://img.shields.io/badge/Sponsor-❤-ff69b4?style=flat-square&logo=github-sponsors&labelColor=black" width="156px" />](https://github.com/sponsors/code-yeongyu) | [スポンサーになって](https://github.com/sponsors/code-yeongyu) `oh-my-opencode` の開発を応援してください。皆さまのご支援がこのプロジェクトを成長させます。 |

package/README.ko.md

@@ -4,7 +4,7 @@
 >
 > 함께해주세요!
 >
-> | [<img alt="Discord link" src="https://img.shields.io/discord/1452487457085063218?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=flat-square" width="156px" />](https://discord.gg/PWpXmbhF) | [Discord 커뮤니티](https://discord.gg/PWpXmbhF)에서 기여자들과 `oh-my-opencode` 사용자들을 만나보세요. |
+> | [<img alt="Discord link" src="https://img.shields.io/discord/1452487457085063218?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=flat-square" width="156px" />](https://discord.gg/aSfGzWtYxM) | [Discord 커뮤니티](https://discord.gg/aSfGzWtYxM)에서 기여자들과 `oh-my-opencode` 사용자들을 만나보세요. |
 > | :-----| :----- |
 > | [<img alt="X link" src="https://img.shields.io/badge/Follow-%40justsisyphus-00CED1?style=flat-square&logo=x&labelColor=black" width="156px" />](https://x.com/justsisyphus) | `oh-my-opencode` 관련 소식은 제 X 계정에서 올렸었는데, 억울하게 정지당해서 <br />[@justsisyphus](https://x.com/justsisyphus)가 대신 소식을 전하고 있습니다. |
 > | [<img alt="Sponsor" src="https://img.shields.io/badge/Sponsor-❤-ff69b4?style=flat-square&logo=github-sponsors&labelColor=black" width="156px" />](https://github.com/sponsors/code-yeongyu) | [스폰서가 되어](https://github.com/sponsors/code-yeongyu) `oh-my-opencode` 개발을 응원해주세요. 여러분의 후원이 이 프로젝트를 계속 성장시킵니다. |

package/README.md

@@ -7,7 +7,7 @@
 >
 > Be with us!
 >
-> | [<img alt="Discord link" src="https://img.shields.io/discord/1452487457085063218?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=flat-square" width="156px" />](https://discord.gg/PWpXmbhF) | Join our [Discord community](https://discord.gg/PWpXmbhF) to connect with contributors and fellow `oh-my-opencode` users. |
+> | [<img alt="Discord link" src="https://img.shields.io/discord/1452487457085063218?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=flat-square" width="156px" />](https://discord.gg/aSfGzWtYxM) | Join our [Discord community](https://discord.gg/aSfGzWtYxM) to connect with contributors and fellow `oh-my-opencode` users. |
 > | :-----| :----- |
 > | [<img alt="X link" src="https://img.shields.io/badge/Follow-%40justsisyphus-00CED1?style=flat-square&logo=x&labelColor=black" width="156px" />](https://x.com/justsisyphus) | News and updates for `oh-my-opencode` used to be posted on my X account. <br /> Since it was suspended mistakenly, [@justsisyphus](https://x.com/justsisyphus) now posts updates on my behalf. |
 > | [<img alt="Sponsor" src="https://img.shields.io/badge/Sponsor-❤-ff69b4?style=flat-square&logo=github-sponsors&labelColor=black" width="156px" />](https://github.com/sponsors/code-yeongyu) | Support the development of `oh-my-opencode` by [becoming a sponsor](https://github.com/sponsors/code-yeongyu). Your contribution helps keep this project alive and growing. |

package/README.zh-cn.md

@@ -4,7 +4,7 @@
 >
 > 与我们同行！
 >
-> | [<img alt="Discord link" src="https://img.shields.io/discord/1452487457085063218?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=flat-square" width="156px" />](https://discord.gg/PWpXmbhF) | 加入我们的 [Discord 社区](https://discord.gg/PWpXmbhF)，和贡献者们、`oh-my-opencode` 用户们一起交流。 |
+> | [<img alt="Discord link" src="https://img.shields.io/discord/1452487457085063218?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=flat-square" width="156px" />](https://discord.gg/aSfGzWtYxM) | 加入我们的 [Discord 社区](https://discord.gg/aSfGzWtYxM)，和贡献者们、`oh-my-opencode` 用户们一起交流。 |
 > | :-----| :----- |
 > | [<img alt="X link" src="https://img.shields.io/badge/Follow-%40justsisyphus-00CED1?style=flat-square&logo=x&labelColor=black" width="156px" />](https://x.com/justsisyphus) | `oh-my-opencode` 的消息之前在我的 X 账号发，但账号被无辜封了，<br />现在 [@justsisyphus](https://x.com/justsisyphus) 替我发更新。 |
 > | [<img alt="Sponsor" src="https://img.shields.io/badge/Sponsor-❤-ff69b4?style=flat-square&logo=github-sponsors&labelColor=black" width="156px" />](https://github.com/sponsors/code-yeongyu) | [成为赞助者](https://github.com/sponsors/code-yeongyu)，支持 `oh-my-opencode` 的开发。您的支持让这个项目持续成长。 |

package/dist/cli/index.js

@@ -2657,7 +2657,7 @@ var require_napi = __commonJS((exports, module) => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "oh-my-opencode",
-    version: "2.12.0",
+    version: "2.12.1",
     description: "OpenCode plugin - custom agents (oracle, librarian) and enhanced features",
     main: "dist/index.js",
     types: "dist/index.d.ts",

package/dist/hooks/ralph-loop/types.d.ts

@@ -11,4 +11,5 @@ export interface RalphLoopState {
 export interface RalphLoopOptions {
     config?: RalphLoopConfig;
     getTranscriptPath?: (sessionId: string) => string;
+    apiTimeout?: number;
 }

package/dist/hooks/session-recovery/index.d.ts

@@ -3,6 +3,7 @@ import type { ExperimentalConfig } from "../../config";
 export interface SessionRecoveryOptions {
     experimental?: ExperimentalConfig;
 }
+type RecoveryErrorType = "tool_result_missing" | "thinking_block_order" | "thinking_disabled_violation" | null;
 interface MessageInfo {
     id?: string;
     role?: string;
@@ -10,6 +11,7 @@ interface MessageInfo {
     parentID?: string;
     error?: unknown;
 }
+export declare function detectErrorType(error: unknown): RecoveryErrorType;
 export interface SessionRecoveryHook {
     handleSessionRecovery: (info: MessageInfo) => Promise<boolean>;
     isRecoverableError: (error: unknown) => boolean;

package/dist/hooks/session-recovery/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/index.js

@@ -9650,7 +9650,7 @@ function detectErrorType(error) {
   if (message.includes("tool_use") && message.includes("tool_result")) {
     return "tool_result_missing";
   }
-  if (message.includes("thinking") && (message.includes("first block") || message.includes("must start with") || message.includes("preceeding") || message.includes("expected") && message.includes("found"))) {
+  if (message.includes("thinking") && (message.includes("first block") || message.includes("must start with") || message.includes("preceeding") || message.includes("final block") || message.includes("cannot be thinking") || message.includes("expected") && message.includes("found"))) {
     return "thinking_block_order";
   }
   if (message.includes("thinking is disabled") && message.includes("cannot contain")) {
@@ -19585,11 +19585,13 @@ IMPORTANT:
 
 Original task:
 {{PROMPT}}`;
+var DEFAULT_API_TIMEOUT = 3000;
 function createRalphLoopHook(ctx, options) {
   const sessions = new Map;
   const config = options?.config;
   const stateDir = config?.state_dir;
   const getTranscriptPath2 = options?.getTranscriptPath ?? getTranscriptPath;
+  const apiTimeout = options?.apiTimeout ?? DEFAULT_API_TIMEOUT;
   function getSessionState(sessionID) {
     let state2 = sessions.get(sessionID);
     if (!state2) {
@@ -19616,28 +19618,26 @@ function createRalphLoopHook(ctx, options) {
   }
   async function detectCompletionInSessionMessages(sessionID, promise) {
     try {
-      const response = await ctx.client.session.messages({
-        path: { id: sessionID },
-        query: { directory: ctx.directory }
-      });
+      const response = await Promise.race([
+        ctx.client.session.messages({
+          path: { id: sessionID },
+          query: { directory: ctx.directory }
+        }),
+        new Promise((_, reject) => setTimeout(() => reject(new Error("API timeout")), apiTimeout))
+      ]);
       const messages = response.data ?? [];
       if (!Array.isArray(messages))
         return false;
+      const assistantMessages = messages.filter((msg) => msg.info?.role === "assistant");
+      const lastAssistant = assistantMessages[assistantMessages.length - 1];
+      if (!lastAssistant?.parts)
+        return false;
       const pattern = new RegExp(`<promise>\\s*${escapeRegex(promise)}\\s*</promise>`, "is");
-      for (const msg of messages) {
-        if (msg.info?.role !== "assistant")
-          continue;
-        for (const part of msg.parts || []) {
-          if (part.type === "text" && part.text) {
-            if (pattern.test(part.text)) {
-              return true;
-            }
-          }
-        }
-      }
-      return false;
+      const responseText = lastAssistant.parts.filter((p) => p.type === "text").map((p) => p.text ?? "").join(`
+`);
+      return pattern.test(responseText);
     } catch (err) {
-      log(`[${HOOK_NAME3}] Failed to fetch session messages`, { sessionID, error: String(err) });
+      log(`[${HOOK_NAME3}] Session messages check failed`, { sessionID, error: String(err) });
       return false;
     }
   }
@@ -19695,15 +19695,15 @@ function createRalphLoopHook(ctx, options) {
       if (state2.session_id && state2.session_id !== sessionID) {
         return;
       }
-      const completionDetectedViaApi = await detectCompletionInSessionMessages(sessionID, state2.completion_promise);
       const transcriptPath = getTranscriptPath2(sessionID);
       const completionDetectedViaTranscript = detectCompletionPromise(transcriptPath, state2.completion_promise);
-      if (completionDetectedViaApi || completionDetectedViaTranscript) {
+      const completionDetectedViaApi = completionDetectedViaTranscript ? false : await detectCompletionInSessionMessages(sessionID, state2.completion_promise);
+      if (completionDetectedViaTranscript || completionDetectedViaApi) {
         log(`[${HOOK_NAME3}] Completion detected!`, {
           sessionID,
           iteration: state2.iteration,
           promise: state2.completion_promise,
-          detectedVia: completionDetectedViaApi ? "session_messages_api" : "transcript_file"
+          detectedVia: completionDetectedViaTranscript ? "transcript_file" : "session_messages_api"
         });
         clearState(ctx.directory, stateDir);
         await ctx.client.tui.showToast({
@@ -19780,6 +19780,18 @@ function createRalphLoopHook(ctx, options) {
     }
     if (event2.type === "session.error") {
       const sessionID = props?.sessionID;
+      const error = props?.error;
+      if (error?.name === "MessageAbortedError") {
+        if (sessionID) {
+          const state2 = readState(ctx.directory, stateDir);
+          if (state2?.session_id === sessionID) {
+            clearState(ctx.directory, stateDir);
+            log(`[${HOOK_NAME3}] User aborted, loop cleared`, { sessionID });
+          }
+          sessions.delete(sessionID);
+        }
+        return;
+      }
       if (sessionID) {
         const sessionState = getSessionState(sessionID);
         sessionState.isRecovering = true;

package/package.json

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