oh-my-opencode 2.11.0 → 2.12.0

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.10.0",
+    version: "2.11.0",
     description: "OpenCode plugin - custom agents (oracle, librarian) and enhanced features",
     main: "dist/index.js",
     types: "dist/index.d.ts",

package/dist/index.js

@@ -8683,12 +8683,14 @@ function createTodoContinuationEnforcer(ctx, options = {}) {
     const prompt = `${CONTINUATION_PROMPT}
 
 [Status: ${todos.length - freshIncompleteCount}/${todos.length} completed, ${freshIncompleteCount} remaining]`;
+    const modelField = prevMessage?.model?.providerID && prevMessage?.model?.modelID ? { providerID: prevMessage.model.providerID, modelID: prevMessage.model.modelID } : undefined;
     try {
-      log(`[${HOOK_NAME}] Injecting continuation`, { sessionID, agent: prevMessage?.agent, incompleteCount: freshIncompleteCount });
+      log(`[${HOOK_NAME}] Injecting continuation`, { sessionID, agent: prevMessage?.agent, model: modelField, incompleteCount: freshIncompleteCount });
       await ctx.client.session.prompt({
         path: { id: sessionID },
         body: {
           agent: prevMessage?.agent,
+          model: modelField,
           parts: [{ type: "text", text: prompt }]
         },
         query: { directory: ctx.directory }
@@ -10726,9 +10728,19 @@ var TOKEN_LIMIT_KEYWORDS = [
   "token limit",
   "context length",
   "too many tokens",
-  "non-empty content",
-  "invalid_request_error"
+  "non-empty content"
 ];
+var THINKING_BLOCK_ERROR_PATTERNS = [
+  /thinking.*first block/i,
+  /first block.*thinking/i,
+  /must.*start.*thinking/i,
+  /thinking.*redacted_thinking/i,
+  /expected.*thinking.*found/i,
+  /thinking.*disabled.*cannot.*contain/i
+];
+function isThinkingBlockError(text) {
+  return THINKING_BLOCK_ERROR_PATTERNS.some((pattern) => pattern.test(text));
+}
 var MESSAGE_INDEX_PATTERN = /messages\.(\d+)/;
 function extractTokensFromMessage(message) {
   for (const pattern of TOKEN_LIMIT_PATTERNS) {
@@ -10749,6 +10761,9 @@ function extractMessageIndex2(text) {
   return;
 }
 function isTokenLimitError(text) {
+  if (isThinkingBlockError(text)) {
+    return false;
+  }
   const lower = text.toLowerCase();
   return TOKEN_LIMIT_KEYWORDS.some((kw) => lower.includes(kw.toLowerCase()));
 }
@@ -17381,10 +17396,6 @@ function createClaudeCodeHooksHook(ctx, config = {}) {
       } catch {}
       const isFirstMessage = !sessionFirstMessageProcessed.has(input.sessionID);
       sessionFirstMessageProcessed.add(input.sessionID);
-      if (isFirstMessage) {
-        log("Skipping UserPromptSubmit hooks on first message for title generation", { sessionID: input.sessionID });
-        return;
-      }
       if (!isHookDisabled(config, "UserPromptSubmit")) {
         const userPromptCtx = {
           sessionId: input.sessionID,
@@ -17406,17 +17417,27 @@ function createClaudeCodeHooksHook(ctx, config = {}) {
           const hookContent = result.messages.join(`
 
 `);
-          log(`[claude-code-hooks] Injecting ${result.messages.length} hook messages`, { sessionID: input.sessionID, contentLength: hookContent.length });
-          const message = output.message;
-          const success = injectHookMessage(input.sessionID, hookContent, {
-            agent: message.agent,
-            model: message.model,
-            path: message.path ?? { cwd: ctx.directory, root: "/" },
-            tools: message.tools
-          });
-          log(success ? "Hook message injected via file system" : "File injection failed", {
-            sessionID: input.sessionID
-          });
+          log(`[claude-code-hooks] Injecting ${result.messages.length} hook messages`, { sessionID: input.sessionID, contentLength: hookContent.length, isFirstMessage });
+          if (isFirstMessage) {
+            const idx = output.parts.findIndex((p) => p.type === "text" && p.text);
+            if (idx >= 0) {
+              output.parts[idx].text = `${hookContent}
+
+${output.parts[idx].text ?? ""}`;
+              log("UserPromptSubmit hooks prepended to first message parts directly", { sessionID: input.sessionID });
+            }
+          } else {
+            const message = output.message;
+            const success = injectHookMessage(input.sessionID, hookContent, {
+              agent: message.agent,
+              model: message.model,
+              path: message.path ?? { cwd: ctx.directory, root: "/" },
+              tools: message.tools
+            });
+            log(success ? "Hook message injected via file system" : "File injection failed", {
+              sessionID: input.sessionID
+            });
+          }
         }
       }
     },

package/package.json

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