diff --git a/providers/utils/heuristic_tool_parser.py b/providers/utils/heuristic_tool_parser.py
index 9e0c03ac..01c91b0b 100644
--- a/providers/utils/heuristic_tool_parser.py
+++ b/providers/utils/heuristic_tool_parser.py
@@ -99,6 +99,16 @@ class HeuristicToolParser:
                 while True:
                     param_match = self.param_pattern.search(self.buffer)
                     if param_match and "</parameter>" in param_match.group(0):
+                        # Detect any content before the parameter match and preserve it
+                        pre_match_text = self.buffer[: param_match.start()]
+                        if pre_match_text.strip():
+                            # If there's non-whitespace text, we should probably treat it as content
+                            # However, purely whitespace might be formatting
+                            filtered_output += pre_match_text
+                        elif pre_match_text:
+                            # Preserve whitespace too just in case
+                            filtered_output += pre_match_text
+
                         key = param_match.group(1).strip()
                         val = param_match.group(2).strip()
                         self.current_parameters[key] = val
@@ -113,6 +123,11 @@ class HeuristicToolParser:
 
                 if "●" in self.buffer:
                     # Next tool call starting or something else, close current
+                    # But first, capture any text before the ●
+                    idx = self.buffer.find("●")
+                    if idx > 0:
+                        filtered_output += self.buffer[:idx]
+                        self.buffer = self.buffer[idx:]
                     finished_tool_call = True
                 elif (
                     len(self.buffer) > 0
@@ -122,6 +137,11 @@ class HeuristicToolParser:
                     # We have text that doesn't look like a tag, and we already parsed some or are in param state
                     # Let's see if we have trailing param starts
                     if "<parameter=" not in self.buffer:
+                        # Treat the buffer as text (it's not a parameter)
+                        # But wait, we are in PARSING_PARAMETERS.
+                        # If we have " some text", we should emit it and finish tool call.
+                        filtered_output += self.buffer
+                        self.buffer = ""
                         finished_tool_call = True
 
                 if finished_tool_call:
@@ -138,7 +158,7 @@ class HeuristicToolParser:
                         f"Heuristic bypass: Emitting tool call '{self.current_function_name}' with {len(self.current_parameters)} params"
                     )
                     self.state = ParserState.TEXT
-                    # Continue loop to process remaining buffer
+                    # Continue loop to process remaining buffer (which is empty or starts with ●)
                 else:
                     break
 
diff --git a/tests/test_parsers.py b/tests/test_parsers.py
index 8ecd1762..c8bdb230 100644
--- a/tests/test_parsers.py
+++ b/tests/test_parsers.py
@@ -125,3 +125,102 @@ def test_partial_interleaved_streaming():
     assert len(tools3) == 1
     assert tools3[0]["name"] == "Read"
     assert tools3[0]["input"] == {"path": "test.py"}
+
+
+# --- New Robustness Tests ---
+
+
+def test_split_across_markers():
+    # Split across the trigger chaaracter
+    # "● <function=Test>"
+    # Split at various points
+    full_text = "● <function=Test><parameter=arg>val</parameter>"
+
+    for i in range(len(full_text)):
+        p = HeuristicToolParser()
+        chunk1 = full_text[:i]
+        chunk2 = full_text[i:]
+
+        tools = []
+        filtered, t = p.feed(chunk1)
+        tools.extend(t)
+        filtered2, t = p.feed(chunk2)
+        tools.extend(t)
+        tools.extend(p.flush())
+
+        if len(tools) != 1:
+            print(f"Failed split at index {i}: '{chunk1}' | '{chunk2}'")
+
+        assert len(tools) == 1, f"Failed split at index {i}"
+        assert tools[0]["name"] == "Test"
+        assert tools[0]["input"] == {"arg": "val"}
+
+
+def test_value_with_special_chars():
+    parser = HeuristicToolParser()
+    # Value with > inside
+    text = "● <function=Test><parameter=arg>a > b</parameter>"
+    _, tools = parser.feed(text)
+    tools.extend(parser.flush())
+
+    assert len(tools) == 1
+    assert tools[0]["input"]["arg"] == "a > b"
+
+
+def test_multiple_params_split():
+    full_text = (
+        "● <function=Test><parameter=p1>v1</parameter><parameter=p2>v2</parameter>"
+    )
+
+    for i in range(len(full_text)):
+        p = HeuristicToolParser()
+        tools = []
+        _, t = p.feed(full_text[:i])
+        tools.extend(t)
+        _, t = p.feed(full_text[i:])
+        tools.extend(t)
+        tools.extend(p.flush())
+
+        assert len(tools) == 1, f"Failed split at {i}"
+        assert tools[0]["input"] == {"p1": "v1", "p2": "v2"}
+
+
+def test_incomplete_tag_flush():
+    p = HeuristicToolParser()
+    p.feed("● <function=Recover><parameter=msg>hello")
+    tools = p.flush()
+
+    assert len(tools) == 1
+    assert tools[0]["input"]["msg"] == "hello"
+
+
+def test_garbage_interleaved():
+    p = HeuristicToolParser()
+    tools = []
+    _, t = p.feed("Some text ")
+    tools.extend(t)
+    _, t = p.feed("● <function=T1><parameter=x>1</parameter>")
+    tools.extend(t)
+    _, t = p.feed(" more text ")
+    tools.extend(t)
+    _, t = p.feed("● <function=T2><parameter=y>2</parameter>")
+    tools.extend(t)
+    tools.extend(p.flush())
+
+    assert len(tools) == 2
+    assert tools[0]["name"] == "T1"
+    assert tools[1]["name"] == "T2"
+
+
+def test_text_between_params_lost():
+    p = HeuristicToolParser()
+    # " text1 " is between function end and first param
+    # " text2 " is between params
+    text = "● <function=F> text1 <parameter=a>1</parameter> text2 <parameter=b>2</parameter>"
+    filtered, tools = p.feed(text)
+    tools.extend(p.flush())
+
+    # Check if "text1" and "text2" are preserved in filtered output
+    assert "text1" in filtered
+    assert "text2" in filtered
+    assert tools[0]["input"] == {"a": "1", "b": "2"}