Ignore OpenClaude metadata when detecting user intent

openai_compat.py

@@ -119,6 +119,10 @@ NO_TOOLS_RE = re.compile(
     r"without"
     r")\s+(?:as?\s+)?(?:ferramentas?|tools?)\b"
 )
+OPENCLAUDE_METADATA_BLOCK_RE = re.compile(
+    r"<(?P<tag>available-deferred-tools|system-reminder)\b[^>]*>.*?</(?P=tag)>",
+    re.DOTALL | re.IGNORECASE,
+)
 
 
 @dataclass(frozen=True)
@@ -158,6 +162,22 @@ def _content_text(content: Any) -> str:
     return "" if content is None else str(content)
 
 
+def _user_request_text(content: Any) -> str:
+    """Remove OpenClaude's injected metadata before classifying user intent.
+
+    OpenClaude places deferred-tool lists, skill descriptions, and snip markers
+    inside a user-role message.  Those blocks can contain words such as
+    ``create``, ``code``, or ``test``; treating them as the user's request can
+    incorrectly force ``tool_choice=required`` for a plain greeting.
+    """
+    text = _content_text(content)
+    previous = None
+    while text != previous:
+        previous = text
+        text = OPENCLAUDE_METADATA_BLOCK_RE.sub("", text)
+    return text.strip()
+
+
 def _call_arguments(value: Any) -> dict[str, Any]:
     if isinstance(value, Mapping):
         return dict(value)
@@ -307,7 +327,7 @@ def _latest_user_request(messages: object) -> str:
             and str(message.get("role", "")).casefold() == "user"
             and not _is_synthetic_continuation(message)
         ):
-            text = _content_text(message.get("content")).strip()
+            text = _user_request_text(message.get("content"))
             if text:
                 requests.append(text)
     if not requests:

test_openai_compat.py

@@ -146,6 +146,27 @@ class OpenAICompatibilityTests(unittest.TestCase):
         self.assertFalse(state.active)
         self.assertEqual(resolve_tool_choice("required", state), "none")
 
+    def test_openclaude_metadata_does_not_become_user_intent(self) -> None:
+        state = analyze_tool_flow(
+            [
+                {
+                    "role": "user",
+                    "content": (
+                        "<available-deferred-tools>\nWebSearch\n"
+                        "</available-deferred-tools>\n"
+                        "<system-reminder>Use this skill to create code "
+                        "and run tests.</system-reminder>\n"
+                        "oi\n"
+                        "<system-reminder>snip_id=abc</system-reminder>"
+                    ),
+                }
+            ],
+            TOOLS,
+        )
+        self.assertFalse(state.active)
+        self.assertFalse(state.requires_tool)
+        self.assertEqual(resolve_tool_choice("required", state), "none")
+
     def test_forced_tool_choice_is_case_insensitive_and_restrictive(self) -> None:
         tools, mode = select_tools(
             TOOLS,