oh-my-opencode 0.1.14 → 0.1.15

package/dist/index.js

@@ -893,14 +893,71 @@ async function recoverThinkingDisabledViolation(client, sessionID, failedAssista
   } catch {}
   return false;
 }
-async function recoverEmptyContentMessage(client, sessionID, failedAssistantMsg, directory) {
-  const messageID = failedAssistantMsg.info?.id;
-  const parentMsgID = failedAssistantMsg.info?.parentID;
-  if (!messageID) {
+var THINKING_TYPES = new Set(["thinking", "redacted_thinking", "reasoning"]);
+function hasNonEmptyOutput(msg) {
+  const parts = msg.parts;
+  if (!parts || parts.length === 0)
+    return false;
+  return parts.some((p) => {
+    if (THINKING_TYPES.has(p.type))
+      return false;
+    if (p.type === "step-start" || p.type === "step-finish")
+      return false;
+    if (p.type === "text" && p.text && p.text.trim())
+      return true;
+    if (p.type === "tool_use" && p.id)
+      return true;
+    if (p.type === "tool_result")
+      return true;
     return false;
+  });
+}
+function findEmptyContentMessage(msgs) {
+  for (let i = 0;i < msgs.length; i++) {
+    const msg = msgs[i];
+    const isLastMessage = i === msgs.length - 1;
+    const isAssistant = msg.info?.role === "assistant";
+    if (isLastMessage && isAssistant)
+      continue;
+    if (!hasNonEmptyOutput(msg)) {
+      return msg;
+    }
   }
-  const revertTargetID = parentMsgID || messageID;
+  return null;
+}
+async function recoverEmptyContentMessage(client, sessionID, failedAssistantMsg, directory) {
   try {
+    const messagesResp = await client.session.messages({
+      path: { id: sessionID },
+      query: { directory }
+    });
+    const msgs = messagesResp.data;
+    if (!msgs || msgs.length === 0)
+      return false;
+    const emptyMsg = findEmptyContentMessage(msgs) || failedAssistantMsg;
+    const messageID = emptyMsg.info?.id;
+    if (!messageID)
+      return false;
+    const existingParts = emptyMsg.parts || [];
+    const hasOnlyThinkingOrMeta = existingParts.length > 0 && existingParts.every((p) => THINKING_TYPES.has(p.type) || p.type === "step-start" || p.type === "step-finish");
+    if (hasOnlyThinkingOrMeta) {
+      const strippedParts = [{ type: "text", text: "(interrupted)" }];
+      try {
+        await client.message?.update?.({
+          path: { id: messageID },
+          body: { parts: strippedParts }
+        });
+        return true;
+      } catch {}
+      try {
+        await client.session.patch?.({
+          path: { id: sessionID },
+          body: { messageID, parts: strippedParts }
+        });
+        return true;
+      } catch {}
+    }
+    const revertTargetID = emptyMsg.info?.parentID || messageID;
     await client.session.revert({
       path: { id: sessionID },
       body: { messageID: revertTargetID },
@@ -15494,10 +15551,30 @@ function showOutputToUser(context, output) {
   const ctx = context;
   ctx.metadata?.({ metadata: { output } });
 }
+var JS_TS_LANGUAGES = ["javascript", "typescript", "tsx"];
+function validatePatternForCli(pattern, lang) {
+  if (!JS_TS_LANGUAGES.includes(lang)) {
+    return;
+  }
+  const src = pattern.trim();
+  const incompleteFunctionDecl = /^(export\s+)?(default\s+)?(async\s+)?function\s+\$[A-Z_][A-Z0-9_]*\s*$/i.test(src);
+  if (incompleteFunctionDecl) {
+    throw new Error(`Incomplete AST pattern for ${lang}: "${pattern}"
+
+` + `ast-grep requires complete AST nodes. Function declarations must include parameters and body.
+
+` + `Examples of correct patterns:
+` + `  - "export async function $NAME($$$) { $$$ }" (matches export async functions)
+` + `  - "function $NAME($$$) { $$$ }" (matches all function declarations)
+` + `  - "async function $NAME($$$) { $$$ }" (matches async functions)
+
+` + `Your pattern "${pattern}" is missing the parameter list and body.`);
+  }
+}
 var ast_grep_search = tool({
-  description: "Search code patterns across filesystem using AST-aware matching. Supports 25 languages. " + "Use meta-variables: $VAR (single node), $$$ (multiple nodes). " + "Examples: 'console.log($MSG)', 'def $FUNC($$$):', 'async function $NAME($$$)'",
+  description: "Search code patterns across filesystem using AST-aware matching. Supports 25 languages. " + "Use meta-variables: $VAR (single node), $$$ (multiple nodes). " + "IMPORTANT: Patterns must be complete AST nodes (valid code). " + "For functions, include params and body: 'export async function $NAME($$$) { $$$ }' not 'export async function $NAME'. " + "Examples: 'console.log($MSG)', 'def $FUNC($$$):', 'async function $NAME($$$)'",
   args: {
-    pattern: tool.schema.string().describe("AST pattern with meta-variables ($VAR, $$$)"),
+    pattern: tool.schema.string().describe("AST pattern with meta-variables ($VAR, $$$). Must be complete AST node."),
     lang: tool.schema.enum(CLI_LANGUAGES).describe("Target language"),
     paths: tool.schema.array(tool.schema.string()).optional().describe("Paths to search (default: ['.'])"),
     globs: tool.schema.array(tool.schema.string()).optional().describe("Include/exclude globs (prefix ! to exclude)"),
@@ -15505,6 +15582,7 @@ var ast_grep_search = tool({
   },
   execute: async (args, context) => {
     try {
+      validatePatternForCli(args.pattern, args.lang);
       const matches = await runSg({
         pattern: args.pattern,
         lang: args.lang,

package/package.json

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