Merge pull request #193 from EvanProgramming/codex/issue-192-deepseek-xml-actions

fix: parse DeepSeek XML action blocks

Author: EvanProgramming

main.py

@@ -3679,6 +3679,21 @@ def _add(data: dict) -> None:
             if args:
                 _add({"action": TOOL_ALIASES.get(raw_action, raw_action), "args": args})
 
+    xml_action_pattern = re.compile(
+        r"<\s*action\s*>\s*(?P<name>[A-Za-z_]\w*)[ \t]*\r?\n"
+        r"(?P<args>[\s\S]*?)</\s*action\s*>",
+        re.IGNORECASE,
+    )
+    xml_actions = list(xml_action_pattern.finditer(text))
+    # Provider XML is accepted only as one complete, unambiguous action block.
+    if len(xml_actions) == 1 and not re.search(
+            r"<\s*action\s*>[\s\S]*<\s*action\s*>", text, re.IGNORECASE):
+        xml_action = xml_actions[0]
+        raw_action = xml_action.group("name").strip().lower()
+        args = html.unescape(xml_action.group("args").strip())
+        if args and _is_valid_action(raw_action):
+            _add({"action": TOOL_ALIASES.get(raw_action, raw_action), "args": args})
+
     for data in _collect_unwrapped_tool_calls(text)[0]:
         if _is_valid_action(data.get("action")):
             _add(data)
@@ -4378,15 +4393,15 @@ class DeepSeekDSMLFilter:
         r"(?i)(?<![\w])(?P<kind>Action|Thought|Plan|TaskList|TaskDone|DefineTool)\s*:"
     )
     _GENERIC_OPEN_RE = re.compile(
-        r"<\s*(?P<kind>invoke|parameter|calls|tool_calls|function_calls|tool_use|notes|thought|reasoning)\b[^>]*>",
+        r"<\s*(?P<kind>action|invoke|parameter|calls|tool_calls|function_calls|tool_use|notes|thought|reasoning)\b[^>]*>",
         re.IGNORECASE,
     )
     _GENERIC_CLOSE_RE = re.compile(
-        r"</\s*(?P<kind>invoke|parameter|calls|tool_calls|function_calls|tool_use|notes|thought|reasoning)\s*>",
+        r"</\s*(?P<kind>action|invoke|parameter|calls|tool_calls|function_calls|tool_use|notes|thought|reasoning)\s*>",
         re.IGNORECASE,
     )
     _GENERIC_KINDS = (
-        "invoke", "parameter", "calls", "tool_calls", "function_calls",
+        "action", "invoke", "parameter", "calls", "tool_calls", "function_calls",
         "tool_use", "notes", "thought", "reasoning",
     )
     _ACTION_MARKER_RE = _ACTION_MARKER_RE
@@ -4520,7 +4535,7 @@ def _generic_block_end(cls, value: str, match: re.Match[str]) -> int | None:
         kind = match.group("kind").lower()
         close_kinds = (
             "parameter" if kind == "parameter" else
-            "invoke|calls|tool_calls|function_calls|tool_use|notes|thought|reasoning"
+            "action|invoke|calls|tool_calls|function_calls|tool_use|notes|thought|reasoning"
         )
         close = re.compile(rf"</\s*(?:{close_kinds})\s*>", re.IGNORECASE).search(value, match.end())
         return close.end() if close else None

tests/test_streaming.py

@@ -392,11 +392,12 @@ def text(item):
     def test_generic_invoke_tags_split_at_every_boundary_stay_out_of_sse(self):
         marker = _SplitGenericInvokeProvider.marker
         expected = "Visible progress.  after marker."
-        for split in range(1, len(marker)):
-            stream_filter = main.DeepSeekDSMLFilter()
-            content = stream_filter.feed("Visible progress. " + marker[:split])
-            content += stream_filter.feed(marker[split:] + " after marker.", final=True)
-            self.assertEqual(content, expected, split)
+        for control in (marker, '<action>\nrun_cmd\ncurl -w "HTTP_%{http_code}" /\n</action>'):
+            for split in range(1, len(control)):
+                stream_filter = main.DeepSeekDSMLFilter()
+                content = stream_filter.feed("Visible progress. " + control[:split])
+                content += stream_filter.feed(control[split:] + " after marker.", final=True)
+                self.assertEqual(content, expected, (control, split))
 
         session_id = "stream-generic-invoke-regression"
         provider = _SplitGenericInvokeProvider()

tests/test_task_consistency.py

@@ -753,6 +753,23 @@ def test_unwrapped_provider_aliases_are_bounded_and_canonicalized(self):
             '</｜｜DSML｜｜ parameter><｜｜DSML｜｜ parameter name="path">x</｜｜DSML｜｜ parameter>',
         )), [])
 
+        xml_action = (
+            '<action>\nexecute_terminal_command\n'
+            'curl -s -w "HTTP_%{http_code}" "http://127.0.0.1:8765/?a=1&amp;b=2"\n'
+            '</action>'
+        )
+        self.assertEqual(main._collect_tool_calls(xml_action), [{
+            "action": "execute_terminal_command",
+            "args": 'curl -s -w "HTTP_%{http_code}" "http://127.0.0.1:8765/?a=1&b=2"',
+        }])
+        self.assertEqual(main._clean_final_response(xml_action), "")
+        self.assertEqual(main._collect_tool_calls('<action>\nunknown_tool\ntrue\n</action>'), [])
+        self.assertEqual(main._collect_tool_calls('<action>\nrun_cmd\n\n</action>'), [])
+        self.assertEqual(main._collect_tool_calls(xml_action + xml_action), [])
+        self.assertEqual(main._collect_tool_calls(
+            '<action>\nrun_cmd\n<action>\nrun_cmd\ntrue\n</action>\n</action>'
+        ), [])
+
         malformed = main._parse_model_response("run_cmd: ```bash\nprintf alias-ok")
         self.assertEqual(malformed["tool_calls"], [])
         self.assertIn("No tool was executed", malformed["protocol_error"])