coding-proxy 0.3.1a6__tar.gz → 0.3.1a7__tar.gz

{coding_proxy-0.3.1a6 → coding_proxy-0.3.1a7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coding-proxy
-Version: 0.3.1a6
+Version: 0.3.1a7
 Summary: A High-Availability, Transparent, and Smart Multi-Vendor Proxy for Claude Code. Support Claude Plans, GitHub Copilot, Google Antigravity, ZAI/GLM, MiniMax, Qwen, Xiaomi, Kimi, Doubao...
 Project-URL: Source Code, https://github.com/ThreeFish-AI/coding-proxy
 Project-URL: User Guide, https://github.com/ThreeFish-AI/coding-proxy/blob/master/docs/user-guide.md

{coding_proxy-0.3.1a6 → coding_proxy-0.3.1a7}/docs/issue.md

@@ -158,29 +158,35 @@ WARNING zhipu stream error: status=500 body='...message":"\'ClaudeContentBlockTo
 
 zhipu 后端在解析 `tool_result` 内容块时错误地访问 `.id` 属性。但 Anthropic API 规范中 `tool_result` 块只有 `tool_use_id` 字段（用于关联对应的 `tool_use`），没有 `id` 字段。
 
-**根因**（2026-04-29 复盘更新）
+**根因**（2026-04-29 第二次复盘更新）
 
-**初始诊断**（已推翻）：认为 zhipu 后端期望 `tool_result` 有 `id` 字段，通过 `_inject_tool_result_id_for_zhipu` 注入 `id = tool_use_id` 可绕过。
+**第一次诊断**（已推翻）：认为 `_inject_tool_result_id_for_zhipu` 注入 `id` 可绕过。实证：注入 114 个块后 500 依旧。
 
-**实际根因**：转换通道本身引入的问题。具体因果链：
+**第二次诊断**（已推翻）：认为 `enforce_anthropic_tool_pairing` 搬迁 tool_result 到 user 消息是触发条件。实证：移除 tool pairing 后 500 依旧（日志显示 `copilot → zhipu: stripped_19_thinking_blocks, removed_thinking_param`，无 `misplaced_tool_result_relocated`）。
 
-1. **转换前**：zhipu 偶发在 assistant 消息中内联输出 `tool_result`（违反 Anthropic 规范），但 zhipu 后端对 assistant 消息中内联的 `tool_result` **不做 `.id` 属性访问**，因此不触发 500。
-2. **转换后**：所有 zhipu 目标通道执行 `enforce_anthropic_tool_pairing`，将 assistant 内联的 `tool_result` 搬迁到紧随的 user 消息。zhipu 后端对 user 消息中的 `tool_result` **执行 `.id` 属性访问**（代码路径不同），触发 `AttributeError` → 500。
-3. **`_inject_tool_result_id_for_zhipu` 无效**：该函数往 JSON dict 注入 `"id": tool_use_id`，但 zhipu 后端的 `ClaudeContentBlockToolResult` Python 类不从 JSON 读取 `id` 字段（类定义中无此属性），注入的值在反序列化时被丢弃。
+**实际根因**：zhipu 后端的 `ClaudeContentBlockToolResult` Python 类**没有 `id` 属性**，但 zhipu 代码在处理**所有** `tool_result` 块时都访问 `obj.id`，无论块位于 assistant 还是 user 消息。三层因果链：
 
-**实证依据**：用户确认「转换通道之前 zhipu 正常，转换通道之后才出现 500 错误」。
+1. **zhipu 后端 Bug**（不可修复 — 上游代码）：`ClaudeContentBlockToolResult` 类缺少 `id` 属性，zhipu 代码访问时触发 `AttributeError` → 500。
+2. **JSON 注入无效**（已实证）：`_inject_tool_result_id_for_zhipu` 往 JSON dict 注入 `id = tool_use_id`，但 zhipu 反序列化框架不读取此字段，Python 对象仍无 `id` 属性。
+3. **无预防机制**（proxy 层可修复）：tier 门控系统不检查请求是否含 `tool_result` 块 → 每次请求先发 zhipu → 必然 500 → failover → 额外 ~2 秒延迟。
 
-**处理方式**（2026-04-29 更新）
+**实证依据**：
+- 有注入（114 个块）→ 500；无注入 → 500。结论：注入无效。
+- 有 tool pairing → 500；无 tool pairing → 500。结论：tool pairing 不是触发条件。
+- 首次请求（无 tool_result 块）→ zhipu 正常。结论：500 由 tool_result 块本身触发。
 
-从所有 zhipu 目标转换通道中移除以下三个步骤：
+**处理方式**（2026-04-29 第二次更新）
 
-| 移除项 | 原因 |
+从所有 zhipu 目标转换通道中移除有害/无效步骤（`enforce_anthropic_tool_pairing`、`_inject_tool_result_id_for_zhipu`、`_strip_cache_control`），并在 `ZhipuVendor.supports_request` 中增加 `has_tool_results` 门控：当请求包含 `tool_result` 块时主动拒绝 zhipu tier，避免「尝试 → 500 → failover」的无效延迟。
+
+| 变更项 | 说明 |
 |--------|------|
-| `enforce_anthropic_tool_pairing` | 搬迁 `tool_result` 到 user 消息触发 zhipu 500 |
-| `_inject_tool_result_id_for_zhipu` | zhipu 类不读取注入的 `id`，无效且可能干扰 |
-| `_strip_cache_control` | zhipu 原生支持 `cache_control`（cache_read 已实证），剥离反损性能 |
+| `RequestCapabilities.has_tool_results` | 新增字段，检测请求中是否含 `tool_result` 块 |
+| `CapabilityLossReason.TOOL_RESULTS` | 新增枚举值，标记 tool_result 兼容性问题 |
+| `ZhipuVendor.supports_request` | 覆写方法，`has_tool_results=True` 时拒绝请求 |
+| `build_request_capabilities` | 扩展 tool_result 块检测逻辑 |
 
-保留的必要步骤：
+保留的 zhipu 目标转换通道精简步骤：
 
 | 保留项 | 原因 |
 |--------|------|

{coding_proxy-0.3.1a6 → coding_proxy-0.3.1a7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "coding-proxy"
-version = "0.3.1a6"
+version = "0.3.1a7"
 description = "A High-Availability, Transparent, and Smart Multi-Vendor Proxy for Claude Code. Support Claude Plans, GitHub Copilot, Google Antigravity, ZAI/GLM, MiniMax, Qwen, Xiaomi, Kimi, Doubao..."
 readme = "README.md"
 requires-python = ">=3.12"

{coding_proxy-0.3.1a6 → coding_proxy-0.3.1a7}/src/coding/proxy/convert/vendor_channels.py

@@ -352,6 +352,92 @@ def _inject_tool_result_id_for_zhipu(body: dict[str, Any]) -> int:
     return injected
 
 
+def _extract_text_from_content(content: Any) -> str:
+    """从 tool_result 的 content 字段提取可读文本."""
+    if isinstance(content, str):
+        return content
+    if isinstance(content, list):
+        parts: list[str] = []
+        for item in content:
+            if isinstance(item, str):
+                parts.append(item)
+            elif isinstance(item, dict) and item.get("type") == "text":
+                parts.append(item.get("text", ""))
+        return " ".join(parts)
+    return ""
+
+
+def _flatten_tool_blocks(body: dict[str, Any]) -> int:
+    """将 messages 中的 tool_use 和 tool_result 块转为 text 块.
+
+    zhipu GLM-5 后端的 ``ClaudeContentBlockToolResult`` 类缺少 ``id`` 属性，
+    导致处理 tool_result 块时触发 ``AttributeError`` → HTTP 500。
+    此函数将所有 tool_use / tool_result 块转为纯文本表示，
+    让 zhipu 以普通文本对话处理，彻底规避反序列化缺陷。
+
+    Returns:
+        被转换的 tool_use + tool_result 块总数。
+    """
+    import json as _json
+
+    converted = 0
+    for message in body.get("messages", []):
+        if not isinstance(message, dict):
+            continue
+        content = message.get("content")
+        if not isinstance(content, list):
+            continue
+
+        new_blocks: list[dict[str, Any]] = []
+        for block in content:
+            if not isinstance(block, dict):
+                new_blocks.append(block)
+                continue
+
+            block_type = block.get("type")
+
+            if block_type == "tool_use":
+                name = block.get("name", "unknown")
+                input_data = block.get("input", {})
+                try:
+                    args_text = _json.dumps(input_data, ensure_ascii=False)
+                except (TypeError, ValueError):
+                    args_text = str(input_data)
+                # 截断过长参数
+                if len(args_text) > 2000:
+                    args_text = args_text[:1997] + "..."
+                new_blocks.append(
+                    {"type": "text", "text": f"[Tool Call: {name}({args_text})]"}
+                )
+                converted += 1
+
+            elif block_type == "tool_result":
+                tool_use_id = block.get("tool_use_id", "?")
+                is_error = block.get("is_error", False)
+                result_text = _extract_text_from_content(block.get("content"))
+                if len(result_text) > 2000:
+                    result_text = result_text[:1997] + "..."
+                prefix = "[ERROR] " if is_error else ""
+                new_blocks.append(
+                    {
+                        "type": "text",
+                        "text": f"{prefix}[Tool Result for {tool_use_id}: {result_text}]",
+                    }
+                )
+                converted += 1
+
+            else:
+                new_blocks.append(block)
+
+        # 如果 content 为空则插入占位
+        if not new_blocks:
+            new_blocks = [{"type": "text", "text": "..."}]
+
+        message["content"] = new_blocks
+
+    return converted
+
+
 def _strip_cache_control(body: dict[str, Any]) -> int:
     """从 system/messages/tools 中移除 cache_control 字段（就地）.
 
@@ -602,6 +688,11 @@ def prepare_copilot_to_zhipu(
             del prepared[param]
             adaptations.append(f"removed_{param}_param")
 
+    # Step 3: 展平 tool_use/tool_result 为 text 块
+    flattened = _flatten_tool_blocks(prepared)
+    if flattened:
+        adaptations.append(f"flattened_{flattened}_tool_blocks")
+
     return prepared, adaptations
 
 
@@ -649,6 +740,11 @@ def prepare_anthropic_to_zhipu(
             del prepared[param]
             adaptations.append(f"removed_{param}_param")
 
+    # Step 4: 展平 tool_use/tool_result 为 text 块
+    flattened = _flatten_tool_blocks(prepared)
+    if flattened:
+        adaptations.append(f"flattened_{flattened}_tool_blocks")
+
     return prepared, adaptations
 
 
@@ -787,6 +883,11 @@ def prepare_zhipu_self_cleanup(
     if removed_vendor_blocks:
         adaptations.append(f"removed_{removed_vendor_blocks}_zhipu_vendor_blocks")
 
+    # Step 2: 展平 tool_use/tool_result 为 text 块
+    flattened = _flatten_tool_blocks(prepared)
+    if flattened:
+        adaptations.append(f"flattened_{flattened}_tool_blocks")
+
     return prepared, adaptations
 
 

{coding_proxy-0.3.1a6 → coding_proxy-0.3.1a7}/src/coding/proxy/model/vendor.py

@@ -99,6 +99,7 @@ class CapabilityLossReason(Enum):
     IMAGES = "images"
     VENDOR_TOOLS = "vendor_tools"
     METADATA = "metadata"
+    TOOL_RESULTS = "tool_results"
 
 
 @dataclass(frozen=True)
@@ -109,6 +110,7 @@ class RequestCapabilities:
     has_thinking: bool = False
     has_images: bool = False
     has_metadata: bool = False
+    has_tool_results: bool = False
 
 
 @dataclass(frozen=True)

{coding_proxy-0.3.1a6 → coding_proxy-0.3.1a7}/src/coding/proxy/routing/error_classifier.py

@@ -111,15 +111,22 @@ def is_semantic_rejection(
 def build_request_capabilities(body: dict[str, Any]) -> RequestCapabilities:
     """从请求体提取能力画像."""
     has_images = False
+    has_tool_results = False
     for msg in body.get("messages", []):
         content = msg.get("content")
         if not isinstance(content, list):
             continue
-        if any(
-            isinstance(block, dict) and block.get("type") == "image"
-            for block in content
-        ):
-            has_images = True
+        for block in content:
+            if not isinstance(block, dict):
+                continue
+            block_type = block.get("type")
+            if block_type == "image" and not has_images:
+                has_images = True
+            elif block_type == "tool_result" and not has_tool_results:
+                has_tool_results = True
+            if has_images and has_tool_results:
+                break
+        if has_images and has_tool_results:
             break
 
     return RequestCapabilities(
@@ -127,4 +134,5 @@ def build_request_capabilities(body: dict[str, Any]) -> RequestCapabilities:
         has_thinking=bool(body.get("thinking") or body.get("extended_thinking")),
         has_images=has_images,
         has_metadata=bool(body.get("metadata")),
+        has_tool_results=has_tool_results,
     )

{coding_proxy-0.3.1a6 → coding_proxy-0.3.1a7}/tests/test_error_classifier.py

@@ -362,3 +362,75 @@ def test_string_content_not_image():
 def test_empty_messages():
     caps = build_request_capabilities({"model": "m", "messages": []})
     assert caps.has_images is False
+    assert caps.has_tool_results is False
+
+
+def test_tool_results_in_user_message():
+    caps = build_request_capabilities(
+        {
+            "model": "m",
+            "messages": [
+                {
+                    "role": "user",
+                    "content": [
+                        {
+                            "type": "tool_result",
+                            "tool_use_id": "toolu_1",
+                            "content": "ok",
+                        }
+                    ],
+                }
+            ],
+        }
+    )
+    assert caps.has_tool_results is True
+
+
+def test_tool_results_in_assistant_message():
+    caps = build_request_capabilities(
+        {
+            "model": "m",
+            "messages": [
+                {
+                    "role": "assistant",
+                    "content": [
+                        {
+                            "type": "tool_use",
+                            "id": "toolu_1",
+                            "name": "bash",
+                            "input": {},
+                        },
+                        {
+                            "type": "tool_result",
+                            "tool_use_id": "toolu_1",
+                            "content": "ok",
+                        },
+                    ],
+                }
+            ],
+        }
+    )
+    assert caps.has_tool_results is True
+
+
+def test_no_tool_results():
+    caps = build_request_capabilities(
+        {
+            "model": "m",
+            "messages": [
+                {"role": "user", "content": "hello"},
+                {
+                    "role": "assistant",
+                    "content": [
+                        {
+                            "type": "tool_use",
+                            "id": "toolu_1",
+                            "name": "bash",
+                            "input": {},
+                        }
+                    ],
+                },
+            ],
+        }
+    )
+    assert caps.has_tool_results is False

{coding_proxy-0.3.1a6 → coding_proxy-0.3.1a7}/tests/test_model_vendor.py

@@ -115,13 +115,20 @@ class TestCapabilityLossReason:
         assert CapabilityLossReason.METADATA.value == "metadata"
 
     def test_member_count(self):
-        """枚举成员数量固定为 5."""
-        assert len(CapabilityLossReason) == 5
+        """枚举成员数量."""
+        assert len(CapabilityLossReason) == 6
 
     def test_can_iterate(self):
         """可遍历所有成员."""
         names = {m.name for m in CapabilityLossReason}
-        assert names == {"TOOLS", "THINKING", "IMAGES", "VENDOR_TOOLS", "METADATA"}
+        assert names == {
+            "TOOLS",
+            "THINKING",
+            "IMAGES",
+            "VENDOR_TOOLS",
+            "METADATA",
+            "TOOL_RESULTS",
+        }
 
     def test_lookup_by_value(self):
         """可通过 value 反查成员."""
@@ -144,6 +151,7 @@ class TestRequestCapabilities:
         assert caps.has_thinking is False
         assert caps.has_images is False
         assert caps.has_metadata is False
+        assert caps.has_tool_results is False
 
     def test_custom_true_values(self):
         """自定义构造: 指定 True 的字段正确赋值."""
@@ -152,6 +160,7 @@ class TestRequestCapabilities:
         assert caps.has_images is True
         assert caps.has_thinking is False
         assert caps.has_metadata is False
+        assert caps.has_tool_results is False
 
     def test_frozen_immutable(self):
         """frozen dataclass: 赋值操作抛 AttributeError."""

{coding_proxy-0.3.1a6 → coding_proxy-0.3.1a7}/tests/test_router_executor.py

@@ -2034,12 +2034,7 @@ class TestPrepareBodyForTierSelfTransition:
     """验证 zhipu → zhipu 自转换通道在 _prepare_body_for_tier 中的应用行为."""
 
     def test_applies_zhipu_self_cleanup(self):
-        """source=zhipu, target=zhipu → 仅剥离 server_tool_use_delta.
-
-        不再做 tool pairing（搬迁 tool_result 会触发 zhipu 500），
-        也不做 id 注入（zhipu 类不读取 JSON 中的 id）。
-        inline tool_result 保留在 assistant 消息中，zhipu 可自行消化。
-        """
+        """source=zhipu, target=zhipu → 剥离 server_tool_use_delta 并展平 tool 块."""
         tier = MagicMock()
         tier.name = "zhipu"
 
@@ -2075,13 +2070,10 @@ class TestPrepareBodyForTierSelfTransition:
         # delta 块被剥离
         assistant_content = result["messages"][0]["content"]
         assert all(b.get("type") != "server_tool_use_delta" for b in assistant_content)
-        # inline tool_result 保留在 assistant 中（不再搬迁）
-        assert any(
-            b.get("type") == "tool_result" and b.get("tool_use_id") == "srvtoolu_a"
-            for b in assistant_content
+        # tool_use 和 tool_result 被展平为 text
+        assert all(
+            b.get("type") not in ("tool_use", "tool_result") for b in assistant_content
         )
-        # 不应插入额外的 user 消息
-        assert len(result["messages"]) == 1
 
     def test_self_cleanup_preserves_srvtoolu_ids(self):
         """回归保护: 自清理通道不得改写 zhipu 原生 srvtoolu_* ID."""

{coding_proxy-0.3.1a6 → coding_proxy-0.3.1a7}/tests/test_types.py

@@ -67,6 +67,7 @@ def test_request_capabilities_defaults():
     assert caps.has_thinking is False
     assert caps.has_images is False
     assert caps.has_metadata is False
+    assert caps.has_tool_results is False
 
 
 def test_request_capabilities_immutable():

{coding_proxy-0.3.1a6 → coding_proxy-0.3.1a7}/tests/test_vendor_channels.py

@@ -268,8 +268,8 @@ class TestCopilotToZhipuChannel:
         assert "removed_thinking_param" in adaptations
         assert "removed_extended_thinking_param" in adaptations
 
-    def test_does_not_relocate_tool_results(self):
-        """copilot → zhipu 不再执行 tool pairing（避免触发 zhipu 500）."""
+    def test_flattens_tool_use_blocks(self):
+        """copilot → zhipu 将 tool_use 展平为 text 块."""
         body = {
             "messages": [
                 {
@@ -279,7 +279,7 @@ class TestCopilotToZhipuChannel:
                             "type": "tool_use",
                             "id": "toolu_1",
                             "name": "bash",
-                            "input": {},
+                            "input": {"command": "ls"},
                         },
                     ],
                 },
@@ -290,15 +290,15 @@ class TestCopilotToZhipuChannel:
             ],
         }
         prepared, adaptations = prepare_copilot_to_zhipu(body)
-        # user 消息内容不变（无 synthesized tool_result）
-        user_content = prepared["messages"][1]["content"]
-        tool_results = [
-            b
-            for b in user_content
-            if isinstance(b, dict) and b.get("type") == "tool_result"
-        ]
-        assert len(tool_results) == 0
-        assert not any("misplaced" in a for a in adaptations)
+        assert any("flattened" in a for a in adaptations)
+        # tool_use 被转为 text
+        assistant_content = prepared["messages"][0]["content"]
+        assert all(b.get("type") != "tool_use" for b in assistant_content)
+        assert any(
+            "Tool Call: bash" in b.get("text", "")
+            for b in assistant_content
+            if b.get("type") == "text"
+        )
 
     def test_combined_transformations(self):
         body = {
@@ -333,14 +333,9 @@ class TestCopilotToZhipuChannel:
         # cache_control 保留
         assert "cache_control" in prepared["system"][0]
         assert "thinking" not in prepared
-        # tool pairing 不执行（user 消息内容不变）
-        user_content = prepared["messages"][1]["content"]
-        tool_results = [
-            b
-            for b in user_content
-            if isinstance(b, dict) and b.get("type") == "tool_result"
-        ]
-        assert len(tool_results) == 0
+        # tool_use 被展平为 text
+        assistant_content = prepared["messages"][0]["content"]
+        assert all(b.get("type") != "tool_use" for b in assistant_content)
 
     def test_preserves_original_body(self):
         body = {
@@ -397,8 +392,8 @@ class TestCopilotToZhipuChannel:
         assert prepared2 == prepared1
         assert adaptations2 == []
 
-    def test_no_id_injection_on_tool_result(self):
-        """copilot → zhipu 转换不再注入 id 字段（zhipu 类不读取，注入无效）."""
+    def test_flattens_tool_result_in_user_message(self):
+        """copilot → zhipu 将 user 消息中的 tool_result 展平为 text."""
         body = {
             "messages": [
                 {
@@ -425,9 +420,10 @@ class TestCopilotToZhipuChannel:
             ],
         }
         prepared, adaptations = prepare_copilot_to_zhipu(body)
-        tr = prepared["messages"][1]["content"][0]
-        assert "id" not in tr
-        assert not any("injected" in a for a in adaptations)
+        # tool_result 被展平为 text
+        user_content = prepared["messages"][1]["content"]
+        assert all(b.get("type") != "tool_result" for b in user_content)
+        assert any("flattened" in a for a in adaptations)
 
 
 # ── zhipu → anthropic 转换通道测试 ────────────────────────────────
@@ -764,7 +760,7 @@ class TestZhipuSelfCleanupChannel:
         assert any("zhipu_vendor_blocks" in a for a in adaptations)
 
     def test_preserves_inline_tool_result_in_assistant(self):
-        """assistant 内联 tool_result 保留原位（不再搬迁，避免触发 zhipu 500）."""
+        """assistant 内联 tool_result 和 tool_use 被展平为 text 块."""
         body = {
             "messages": [
                 {
@@ -788,19 +784,15 @@ class TestZhipuSelfCleanupChannel:
         }
         prepared, adaptations = prepare_zhipu_self_cleanup(body)
 
-        # assistant 消息中 tool_result 保留原位
+        # tool_use 和 tool_result 均被展平为 text
         assistant_content = prepared["messages"][0]["content"]
-        assert any(
-            b.get("type") == "tool_result" and b.get("tool_use_id") == "srvtoolu_a"
-            for b in assistant_content
+        assert all(
+            b.get("type") not in ("tool_use", "tool_result") for b in assistant_content
         )
-        # 不应有 tool pairing 相关的 adaptations
-        assert not any("misplaced" in a for a in adaptations)
-        assert not any("orphaned" in a for a in adaptations)
-        assert not any("injected" in a for a in adaptations)
+        assert any("flattened" in a for a in adaptations)
 
-    def test_no_id_injection(self):
-        """自清理通道不再注入 id 字段（zhipu 类不读取，注入无效）."""
+    def test_tool_result_flattened_to_text(self):
+        """自清理通道将 tool_result 展平为 text 块."""
         body = {
             "messages": [
                 {
@@ -827,13 +819,13 @@ class TestZhipuSelfCleanupChannel:
             ],
         }
         prepared, adaptations = prepare_zhipu_self_cleanup(body)
+        # tool_result 被展平为 text
+        user_content = prepared["messages"][1]["content"]
+        assert all(b.get("type") != "tool_result" for b in user_content)
+        assert any("flattened" in a for a in adaptations)
 
-        tr = prepared["messages"][1]["content"][0]
-        assert "id" not in tr
-        assert not any("injected" in a for a in adaptations)
-
-    def test_preserves_existing_id(self):
-        """tool_result 已有 id 字段时应原样保留，不被修改."""
+    def test_flattens_tool_result_with_existing_id(self):
+        """自清理通道将含 id 的 tool_result 也展平为 text."""
         body = {
             "messages": [
                 {
@@ -861,9 +853,10 @@ class TestZhipuSelfCleanupChannel:
             ],
         }
         prepared, adaptations = prepare_zhipu_self_cleanup(body)
-        tr = prepared["messages"][1]["content"][0]
-        assert tr["id"] == "original_id"
-        assert not any("injected" in a for a in adaptations)
+        # tool_result 被展平为 text，不再保留原结构
+        user_content = prepared["messages"][1]["content"]
+        assert all(b.get("type") != "tool_result" for b in user_content)
+        assert any("flattened" in a for a in adaptations)
 
     def test_preserves_srvtoolu_ids(self):
         """zhipu 原生 srvtoolu_* ID 与 server_tool_use 类型必须保留."""
@@ -1074,25 +1067,25 @@ class TestZhipuSelfCleanupChannel:
         assistant_content = prepared["messages"][0]["content"]
         # delta 被剥离
         assert all(b.get("type") != "server_tool_use_delta" for b in assistant_content)
-        # inline tool_result 保留在 assistant 中（不再搬迁）
-        assert any(
-            b.get("type") == "tool_result" and b.get("tool_use_id") == "toolu_bash_001"
-            for b in assistant_content
-        )
+        # tool_use / tool_result 被 flatten 为 text 块
+        assert not any(b.get("type") == "tool_use" for b in assistant_content)
+        assert not any(b.get("type") == "tool_result" for b in assistant_content)
         # server_tool_use 与其 srvtoolu_* ID 完整保留
         srv_block = next(
             b for b in assistant_content if b.get("type") == "server_tool_use"
         )
         assert srv_block["id"] == "srvtoolu_native"
-        # tool_use ID 同样保留
-        tool_use_block = next(
-            b for b in assistant_content if b.get("type") == "tool_use"
-        )
-        assert tool_use_block["id"] == "toolu_bash_001"
+        # flatten 后应包含 tool_use 和 tool_result 对应的 text 块
+        text_contents = [
+            b.get("text", "") for b in assistant_content if b.get("type") == "text"
+        ]
+        assert any("Tool Call: bash" in t for t in text_contents)
+        assert any("Tool Result for toolu_bash_001" in t for t in text_contents)
         # 不插入额外 user 消息
         assert len(prepared["messages"]) == 1
         # 关键 adaptation 标签
         assert any("zhipu_vendor_blocks" in a for a in adaptations)
+        assert any("flattened" in a and "tool_blocks" in a for a in adaptations)
         # 不应有 tool pairing / id 注入 相关 adaptation
         assert not any("misplaced" in a for a in adaptations)
         assert not any("injected" in a for a in adaptations)
@@ -2858,8 +2851,8 @@ class TestAnthropicToZhipuChannel:
         assert any("server_tool_use" in a for a in adaptations)
         assert any("thinking_blocks" in a for a in adaptations)
 
-    def test_no_id_injection_on_tool_result(self):
-        """anthropic → zhipu 转换不再注入 id 字段（zhipu 类不读取，注入无效）."""
+    def test_flattens_tool_result_in_user_message(self):
+        """anthropic → zhipu 将 tool_result 展平为 text 块."""
         body = {
             "messages": [
                 {
@@ -2886,6 +2879,7 @@ class TestAnthropicToZhipuChannel:
             ],
         }
         prepared, adaptations = prepare_anthropic_to_zhipu(body)
-        tr = prepared["messages"][1]["content"][0]
-        assert "id" not in tr
-        assert not any("injected" in a for a in adaptations)
+        # tool_result 被展平为 text
+        user_content = prepared["messages"][1]["content"]
+        assert all(b.get("type") != "tool_result" for b in user_content)
+        assert any("flattened" in a for a in adaptations)