From 4b1e21c6532c74a83aae962d69dcec6090ee5b05 Mon Sep 17 00:00:00 2001
From: pewdiepie-archdaemon <pewdiepie-archdaemon@users.noreply.github.com>
Date: Fri, 18 Sep 2026 15:39:10 +0000
Subject: [PATCH] enforce binary write guard before execution bridges

---
 src/tool_execution.py          | 44 +++++++++++++++++++++++++++-------
 tests/test_execution_bridge.py | 27 +++++++++++++++++++++
 2 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/src/tool_execution.py b/src/tool_execution.py
index 5dcfad715..2cdc8fd80 100644
--- a/src/tool_execution.py
+++ b/src/tool_execution.py
@@ -315,6 +315,30 @@ _TEXT_WRITE_BINARY_SUFFIXES = frozenset({
 })
 
 
+def _text_write_to_binary_artifact_result(content: str) -> tuple[str, Dict] | None:
+    """Reject UTF-8 text writes that target a binary artifact path."""
+    raw = str(content or "")
+    path, _, _body = raw.partition("\n")
+    path = path.strip()
+    if raw.lstrip().startswith("{"):
+        try:
+            args = json.loads(raw)
+            if isinstance(args, dict) and isinstance(args.get("path"), str):
+                path = args["path"].strip()
+        except (TypeError, ValueError):
+            pass
+    if os.path.splitext(path)[1].casefold() not in _TEXT_WRITE_BINARY_SUFFIXES:
+        return None
+    return f"write_file: {path[:80]}", {
+        "error": (
+            f"write_file: refusing UTF-8 text for binary artifact path {path}. "
+            "Use Python or a format-specific creation tool, then inspect the result."
+        ),
+        "exit_code": 1,
+        "binary_artifact_preserved": True,
+    }
+
+
 async def _route_tool_via_bridge(tool: str, content: str, session_id: Optional[str], client_runtime_context: Optional[Dict]):
     import base64
     bridge = _client_bridge(client_runtime_context)
@@ -668,15 +692,9 @@ async def _route_tool_via_bridge(tool: str, content: str, session_id: Optional[s
             "error": "write_file: path is required",
             "exit_code": 1,
         }
-    if os.path.splitext(path)[1].casefold() in _TEXT_WRITE_BINARY_SUFFIXES:
-        return f"write_file: {path[:80]}", {
-            "error": (
-                f"write_file: refusing UTF-8 text for binary artifact path {path}. "
-                "Use Python or a format-specific creation tool, then inspect the result."
-            ),
-            "exit_code": 1,
-            "binary_artifact_preserved": True,
-        }
+    rejected = _text_write_to_binary_artifact_result(content)
+    if rejected is not None:
+        return rejected
     return f"write_file: {path[:80]}", await _bridge_post(
         bridge,
         "/write",
@@ -1589,6 +1607,14 @@ async def _execute_tool_block_impl(
         logger.warning("Public tool policy blocked owner=%r tool=%s", owner, tool)
         return desc, result
 
+    # A request-scoped bridge owns where a task workspace lives, not the
+    # semantic contract of write_file.  Keep text writes from corrupting a
+    # rendered image/PDF even when the bridge handles the physical write.
+    if tool == "write_file":
+        rejected = _text_write_to_binary_artifact_result(content)
+        if rejected is not None:
+            return rejected
+
     if bridge_owns_tool:
         try:
             return await execution_bridge.route_tool(
diff --git a/tests/test_execution_bridge.py b/tests/test_execution_bridge.py
index 6e2614859..9c72e0569 100644
--- a/tests/test_execution_bridge.py
+++ b/tests/test_execution_bridge.py
@@ -182,3 +182,30 @@ def test_tui_bridge_write_file_rejects_text_for_binary_artifact(monkeypatch) ->
     assert result["binary_artifact_preserved"] is True
     assert "binary artifact path" in result["error"]
     assert called is False
+
+
+def test_scoped_bridge_cannot_bypass_binary_text_write_guard() -> None:
+    called = False
+
+    async def route(tool, content, session_id, runtime):
+        nonlocal called
+        called = True
+        return tool, {"output": "should not run", "exit_code": 0}
+
+    bridge = AgentExecutionBridge(route, frozenset({"write_file"}), name="task-workspace")
+
+    async def invoke():
+        block = Block("/tmp_workspace/results/screenshot.png\ncompletion prose")
+        block.tool_type = "write_file"
+        with bind_execution_bridge(bridge):
+            return await execute_tool_block(
+                block,
+                security_context=NO_TOOL_SECURITY_CONTEXT,
+            )
+
+    description, result = asyncio.run(invoke())
+
+    assert description == "write_file: /tmp_workspace/results/screenshot.png"
+    assert result["exit_code"] == 1
+    assert result["binary_artifact_preserved"] is True
+    assert called is False