coding-proxy 0.3.1a4__tar.gz → 0.3.1a5__tar.gz

{coding_proxy-0.3.1a4 → coding_proxy-0.3.1a5}/CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ## [Unreleased]
 
+- fix(vendor-channels): 为所有 targeting zhipu 的转换通道（zhipu→zhipu、copilot→zhipu、anthropic→zhipu）新增 `tool_result.id` 字段注入，修复 zhipu GLM-5 后端错误访问 `.id` 属性（`'ClaudeContentBlockToolResult' object has no attribute 'id'`）导致的 500 错误，使 zhipu 可完全承接含 tool_result 的会话；
 - fix(vendor-channels): 新增 zhipu 同 vendor 自清理通道，修复 GLM-5 自循环 400 + tool_results 偶发降级；
 - fix(vendor-channels): 修复 `_rewrite_srvtoolu_ids` 块顺序敏感性导致 inline tool_result 漏改名，进而 enforce 阶段 dict key 与 tool_use_ids 错位、anthropic 报 `tool_use ids without tool_result blocks immediately after` 的 cascade failover 问题（改为两遍扫描：先收集 id_map，再统一改写所有 tool_result.tool_use_id 引用）；
 - fix(vendor-channels): `enforce_anthropic_tool_pairing` 增加全局 sanity check pass，主循环边角错位让 dangling tool_use 漏过校验时兜底合成 is_error 占位并打 `pairing_sanity_repaired` 标签，避免 anthropic 二次报错；

{coding_proxy-0.3.1a4 → coding_proxy-0.3.1a5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coding-proxy
-Version: 0.3.1a4
+Version: 0.3.1a5
 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.1a4 → coding_proxy-0.3.1a5}/docs/issue.md

@@ -141,3 +141,41 @@ adaptations 列表显示 `misplaced_tool_result_relocated` 但**没有** `orphan
 
 - 任何对 messages 进行 ID 重写的转换链 (如 `_rewrite_srvtoolu_ids`、`anthropic_to_openai`、`anthropic_to_gemini`) 都应使用两遍扫描或一次性收集后再批量改写, 以保证 block 顺序无关性。
 - enforce 类校验函数若依赖 dict key 与 list 元素的**等同性**, 必须先确保两者在同一参考系下 (改名前 vs 改名后); 否则错位会以 "看起来 OK 实际有漏" 的方式静默泄漏到下游。
+
+---
+
+## zhipu 500 `'ClaudeContentBlockToolResult' object has no attribute 'id'`
+
+**问题描述**
+
+zhipu GLM-5 在处理含 `tool_result` 块的会话时持续返回 500 错误，每次请求都触发故障转移至 copilot，zhipu 完全无法承接含工具调用的多轮对话：
+
+```
+WARNING zhipu stream error: status=500 body='...message":"\'ClaudeContentBlockToolResult\' object has no attribute \'id\'"}'
+WARNING Tier zhipu zhipu tool_result format error (500), treating as format incompatibility without circuit breaker penalty
+INFO  Failover: zhipu → copilot (reason: HTTP 500)
+```
+
+**表因**
+
+zhipu 后端在解析 `tool_result` 内容块时错误地访问 `.id` 属性。但 Anthropic API 规范中 `tool_result` 块只有 `tool_use_id` 字段（用于关联对应的 `tool_use`），没有 `id` 字段（`id` 是 `tool_use` 块的属性）。
+
+**根因**
+
+所有 targeting zhipu 的转换通道（`prepare_zhipu_self_cleanup`、`prepare_copilot_to_zhipu`、`prepare_anthropic_to_zhipu`）在完成 `enforce_anthropic_tool_pairing` 后，没有为 `tool_result` 块补上 zhipu 后端期望的 `id` 字段。搬迁或合成的 `tool_result` 块仅有 `tool_use_id`，缺少 `id`。
+
+**处理方式**
+
+- 在 `vendor_channels.py` 新增 `_inject_tool_result_id_for_zhipu` 辅助函数：扫描所有消息中的 `tool_result` 块，将 `tool_use_id` 值复制为 `id` 字段（仅注入尚无 `id` 的块，保持幂等）
+- 在三个 targeting zhipu 的转换通道末尾统一调用此辅助函数
+- 保留 executor 中已有的 500 错误检测作为纵深防御
+
+**后续防范**
+
+- 其他 `NativeAnthropicVendor` 子类若出现类似的「后端期望非标准字段」问题，可参考此模式在对应的转换通道中注入兼容字段。
+- 当 zhipu 后端修复此 bug（不再访问 `.id`）后，此 workaround 仍安全保留（多一个 `id` 字段不影响 Anthropic API 语义）。
+
+**同类问题影响与处理注意事项**
+
+- `enforce_anthropic_tool_pairing` 合成的 `is_error=True` 占位块只有 `tool_use_id`，同样需要 `id` 注入——辅助函数在配对后统一处理，无需在合成逻辑中单独添加。
+- `tool_result.id` 的值设为与 `tool_use_id` 相同，语义上可视为「内容块标识符」，对 zhipu 后端足够区分不同 tool_result 块。

{coding_proxy-0.3.1a4 → coding_proxy-0.3.1a5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "coding-proxy"
-version = "0.3.1a4"
+version = "0.3.1a5"
 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.1a4 → coding_proxy-0.3.1a5}/src/coding/proxy/convert/vendor_channels.py

@@ -322,6 +322,36 @@ def _enforce_pairing_sanity_pass(messages_list: list[Any]) -> list[str]:
     return sanity_synthesized
 
 
+def _inject_tool_result_id_for_zhipu(body: dict[str, Any]) -> int:
+    """为 tool_result 块注入 ``id`` 字段以兼容 zhipu GLM-5 后端.
+
+    zhipu 的 Anthropic 兼容端点在解析 ``tool_result`` 块时会访问 ``.id`` 属性，
+    但 Anthropic API 规范中 ``tool_result`` 只有 ``tool_use_id`` 字段而没有 ``id``。
+    此函数在所有 ``tool_result`` 块上补设 ``id``（值等于 ``tool_use_id``），
+    避免触发 ``'ClaudeContentBlockToolResult' object has no attribute 'id'`` 500 错误。
+
+    Returns:
+        被注入 ``id`` 字段的 tool_result 块数量。
+    """
+    injected = 0
+    for message in body.get("messages", []):
+        if not isinstance(message, dict):
+            continue
+        content = message.get("content")
+        if not isinstance(content, list):
+            continue
+        for block in content:
+            if (
+                isinstance(block, dict)
+                and block.get("type") == "tool_result"
+                and "id" not in block
+                and block.get("tool_use_id")
+            ):
+                block["id"] = block["tool_use_id"]
+                injected += 1
+    return injected
+
+
 def _strip_cache_control(body: dict[str, Any]) -> int:
     """从 system/messages/tools 中移除 cache_control 字段（就地）.
 
@@ -577,6 +607,11 @@ def prepare_copilot_to_zhipu(
     if pairing_fixes:
         adaptations.extend(pairing_fixes)
 
+    # Step 5: 为 tool_result 块注入 id 字段（zhipu 后端 bug workaround）
+    injected = _inject_tool_result_id_for_zhipu(prepared)
+    if injected:
+        adaptations.append(f"injected_{injected}_tool_result_id_fields")
+
     return prepared, adaptations
 
 
@@ -632,6 +667,11 @@ def prepare_anthropic_to_zhipu(
     if pairing_fixes:
         adaptations.extend(pairing_fixes)
 
+    # Step 6: 为 tool_result 块注入 id 字段（zhipu 后端 bug workaround）
+    injected = _inject_tool_result_id_for_zhipu(prepared)
+    if injected:
+        adaptations.append(f"injected_{injected}_tool_result_id_fields")
+
     return prepared, adaptations
 
 
@@ -760,6 +800,7 @@ def prepare_zhipu_self_cleanup(
     1. 剥离 ``server_tool_use_delta`` 流式残块
     2. 强制 tool_use/tool_result 配对（关键: 把 assistant 内联的 tool_result
        搬迁到紧随的 user 消息）
+    3. 为 ``tool_result`` 块注入 ``id`` 字段（zhipu 后端错误访问 ``.id`` 属性）
 
     Returns:
         (prepared_body, adaptations) — adaptations 为应用的变换描述列表。
@@ -777,6 +818,11 @@ def prepare_zhipu_self_cleanup(
     if pairing_fixes:
         adaptations.extend(pairing_fixes)
 
+    # Step 3: 为 tool_result 块注入 id 字段（zhipu 后端 bug workaround）
+    injected = _inject_tool_result_id_for_zhipu(prepared)
+    if injected:
+        adaptations.append(f"injected_{injected}_tool_result_id_fields")
+
     return prepared, adaptations
 
 

{coding_proxy-0.3.1a4 → coding_proxy-0.3.1a5}/tests/test_vendor_channels.py

@@ -392,6 +392,38 @@ class TestCopilotToZhipuChannel:
         assert prepared2 == prepared1
         assert adaptations2 == []
 
+    def test_injects_id_on_tool_result_for_zhipu(self):
+        """copilot → zhipu 转换后 tool_result 应包含 id 字段."""
+        body = {
+            "messages": [
+                {
+                    "role": "assistant",
+                    "content": [
+                        {
+                            "type": "tool_use",
+                            "id": "toolu_001",
+                            "name": "bash",
+                            "input": {},
+                        },
+                    ],
+                },
+                {
+                    "role": "user",
+                    "content": [
+                        {
+                            "type": "tool_result",
+                            "tool_use_id": "toolu_001",
+                            "content": "ok",
+                        },
+                    ],
+                },
+            ],
+        }
+        prepared, adaptations = prepare_copilot_to_zhipu(body)
+        tr = prepared["messages"][1]["content"][0]
+        assert tr["id"] == "toolu_001"
+        assert any("injected" in a and "tool_result_id" in a for a in adaptations)
+
 
 # ── zhipu → anthropic 转换通道测试 ────────────────────────────────
 
@@ -762,6 +794,101 @@ class TestZhipuSelfCleanupChannel:
         )
         assert "misplaced_tool_result_relocated" in adaptations
 
+    def test_injects_id_on_relocated_tool_result(self):
+        """搬迁后的 tool_result 块应具有 id 字段（zhipu 后端 bug workaround）."""
+        body = {
+            "messages": [
+                {
+                    "role": "assistant",
+                    "content": [
+                        {
+                            "type": "tool_use",
+                            "id": "toolu_001",
+                            "name": "bash",
+                            "input": {},
+                        },
+                        {
+                            "type": "tool_result",
+                            "tool_use_id": "toolu_001",
+                            "content": "ok",
+                        },
+                    ],
+                },
+                {"role": "user", "content": []},
+            ],
+        }
+        prepared, adaptations = prepare_zhipu_self_cleanup(body)
+
+        user_content = prepared["messages"][1]["content"]
+        tr = next(b for b in user_content if b.get("type") == "tool_result")
+        assert tr["id"] == "toolu_001"
+        assert any("injected" in a and "tool_result_id" in a for a in adaptations)
+
+    def test_injects_id_on_existing_user_tool_result(self):
+        """user 消息中已有的 tool_result 也应被注入 id 字段."""
+        body = {
+            "messages": [
+                {
+                    "role": "assistant",
+                    "content": [
+                        {
+                            "type": "tool_use",
+                            "id": "toolu_001",
+                            "name": "bash",
+                            "input": {},
+                        },
+                    ],
+                },
+                {
+                    "role": "user",
+                    "content": [
+                        {
+                            "type": "tool_result",
+                            "tool_use_id": "toolu_001",
+                            "content": "ok",
+                        },
+                    ],
+                },
+            ],
+        }
+        prepared, adaptations = prepare_zhipu_self_cleanup(body)
+
+        tr = prepared["messages"][1]["content"][0]
+        assert tr["id"] == "toolu_001"
+        assert any("injected" in a and "tool_result_id" in a for a in adaptations)
+
+    def test_skips_id_injection_when_already_present(self):
+        """tool_result 已有 id 字段时不应重复注入."""
+        body = {
+            "messages": [
+                {
+                    "role": "assistant",
+                    "content": [
+                        {
+                            "type": "tool_use",
+                            "id": "toolu_001",
+                            "name": "bash",
+                            "input": {},
+                        },
+                    ],
+                },
+                {
+                    "role": "user",
+                    "content": [
+                        {
+                            "type": "tool_result",
+                            "tool_use_id": "toolu_001",
+                            "id": "toolu_001",
+                            "content": "ok",
+                        },
+                    ],
+                },
+            ],
+        }
+        prepared, adaptations = prepare_zhipu_self_cleanup(body)
+        # 不应产生注入 adaptation（id 已存在）
+        assert not any("injected" in a for a in adaptations)
+
     def test_preserves_srvtoolu_ids(self):
         """zhipu 原生 srvtoolu_* ID 与 server_tool_use 类型必须保留."""
         body = {
@@ -2751,3 +2878,35 @@ class TestAnthropicToZhipuChannel:
         assert "thinking" not in prepared
         assert any("server_tool_use" in a for a in adaptations)
         assert any("thinking_blocks" in a for a in adaptations)
+
+    def test_injects_id_on_tool_result_for_zhipu(self):
+        """anthropic → zhipu 转换后 tool_result 应包含 id 字段."""
+        body = {
+            "messages": [
+                {
+                    "role": "assistant",
+                    "content": [
+                        {
+                            "type": "tool_use",
+                            "id": "toolu_001",
+                            "name": "bash",
+                            "input": {},
+                        },
+                    ],
+                },
+                {
+                    "role": "user",
+                    "content": [
+                        {
+                            "type": "tool_result",
+                            "tool_use_id": "toolu_001",
+                            "content": "ok",
+                        },
+                    ],
+                },
+            ],
+        }
+        prepared, adaptations = prepare_anthropic_to_zhipu(body)
+        tr = prepared["messages"][1]["content"][0]
+        assert tr["id"] == "toolu_001"
+        assert any("injected" in a and "tool_result_id" in a for a in adaptations)

{coding_proxy-0.3.1a4 → coding_proxy-0.3.1a5}/uv.lock

@@ -74,7 +74,7 @@ wheels = [
 
 [[package]]
 name = "coding-proxy"
-version = "0.3.1a4"
+version = "0.3.1a5"
 source = { editable = "." }
 dependencies = [
     { name = "aiosqlite" },