coding-proxy 0.2.4a2__py3-none-any.whl → 0.2.4a4__py3-none-any.whl

coding/proxy/config/config.default.yaml

@@ -52,7 +52,7 @@ vendors:
       success_threshold: 2
     quota_guard:
       enabled: false
-      token_budget: 60000000 # 5 小时 token 预算（根据订阅计划调整）
+      token_budget: 65000000 # 5 小时 token 预算（根据订阅计划调整）
       window_hours: 5.0
       threshold_percent: 99.0
       probe_interval_seconds: 300

coding/proxy/routing/executor.py

@@ -233,7 +233,7 @@ class _RouteExecutor:
         """为指定 tier 准备请求体，必要时应用 Anthropic 专属修复（Phase 2）.
 
         仅当 tier 为 Anthropic 时才执行以下处理：
-        1. tool_result 重定位 + 孤儿修复（需 normalization.has_anthropic_fixes）
+        1. 跨供应商 tool_use/tool_result 配对强制修复（单遍自包含扫描）
         2. 条件化 thinking block 剥离（仅跨供应商场景）
 
         确保 Zhipu 等其他 vendor 不受影响。
@@ -241,30 +241,28 @@ class _RouteExecutor:
         if tier.name != "anthropic":
             return body
 
-        needs_tool_fixes = (
-            normalization is not None and normalization.has_anthropic_fixes
+        needs_tool_pairing = self._needs_tool_pairing_enforcement(
+            normalization, session_record
         )
         needs_thinking_strip = self._needs_thinking_strip(normalization, session_record)
 
-        if not needs_tool_fixes and not needs_thinking_strip:
+        if not needs_tool_pairing and not needs_thinking_strip:
             return body
 
         from ..server.request_normalizer import (
-            apply_anthropic_specific_fixes,
+            enforce_anthropic_tool_pairing,
             strip_thinking_blocks,
         )
 
         body_for_vendor = copy.deepcopy(body)
 
-        if needs_tool_fixes:
-            fixes = apply_anthropic_specific_fixes(
+        if needs_tool_pairing:
+            fixes = enforce_anthropic_tool_pairing(
                 body_for_vendor.get("messages", []),
-                normalization.misplaced_tool_results,
-                normalization.misplaced_log_info,
             )
             if fixes:
                 logger.debug(
-                    "Applied Anthropic-specific fixes for tier %s: %s",
+                    "Applied tool pairing enforcement for tier %s: %s",
                     tier.name,
                     ", ".join(fixes),
                 )
@@ -279,6 +277,40 @@ class _RouteExecutor:
 
         return body_for_vendor
 
+    @staticmethod
+    def _needs_tool_pairing_enforcement(
+        normalization: Any, session_record: Any
+    ) -> bool:
+        """判断是否需要强制执行 Anthropic tool_use/tool_result 配对修复.
+
+        此方法扩展了原有 ``has_anthropic_fixes`` 的触发条件，覆盖以下场景：
+
+        1. 请求体中检测到跨供应商产物（如非标准 ID、misplaced tool_result）
+        2. Phase 1 检测到需要 Anthropic 修复（misplaced 或 ID 重写）
+        3. 会话历史中存在非 Anthropic 供应商记录（如 zhipu）
+        4. 无会话追踪能力时安全回退
+
+        条件 3 和 4 确保即使请求体本身无跨供应商产物（如 zhipu 使用标准
+        ``toolu_*`` ID 时），只要会话曾经过非 Anthropic 供应商，仍会执行配对修复。
+        """
+        # Signal 1: 当前请求体有跨供应商产物
+        if normalization is not None and normalization.has_cross_vendor_signals:
+            return True
+        # Signal 2: Phase 1 检测到需要 Anthropic 修复
+        if normalization is not None and normalization.has_anthropic_fixes:
+            return True
+        # Signal 3: 无会话追踪 → 安全回退
+        if session_record is None:
+            return True
+        # Signal 4: 会话历史中有非 Anthropic 供应商
+        if session_record.provider_state:
+            non_anthropic = {
+                v for v in session_record.provider_state if v != "anthropic"
+            }
+            if non_anthropic:
+                return True
+        return False
+
     @staticmethod
     def _needs_thinking_strip(normalization: Any, session_record: Any) -> bool:
         """判断是否需要剥离 thinking blocks（仅跨供应商场景）.

coding/proxy/server/dashboard.py

@@ -911,8 +911,21 @@ function updateVendorStatus(status) {
   }).join('');
 }
 
+// ── 按 tiers 顺序排序 vendor 列表 ─────────────────────────
+function sortByTierOrder(vendors, tierOrder) {
+  if (!tierOrder || !tierOrder.length) return vendors.sort();
+  const orderMap = {};
+  tierOrder.forEach((name, i) => { orderMap[name] = i; });
+  const maxIdx = tierOrder.length;
+  return vendors.sort((a, b) => {
+    const ia = orderMap[a] ?? maxIdx;
+    const ib = orderMap[b] ?? maxIdx;
+    return ia !== ib ? ia - ib : a.localeCompare(b);
+  });
+}
+
 // ── 时序折线图（请求量，按 vendor）────────────────────────
-function buildTimeline(rows) {
+function buildTimeline(rows, tierOrder) {
   const vendorDateMap = {};
   const allDates = new Set();
   for (const r of rows) {
@@ -923,7 +936,7 @@ function buildTimeline(rows) {
     allDates.add(d);
   }
   const dates = [...allDates].sort();
-  const vendors = Object.keys(vendorDateMap).sort();
+  const vendors = sortByTierOrder(Object.keys(vendorDateMap), tierOrder);
 
   if (chartTimeline) chartTimeline.destroy();
   const ctx = document.getElementById('chart-timeline').getContext('2d');
@@ -962,14 +975,14 @@ function buildTimeline(rows) {
 }
 
 // ── 供应商分布环形图 ──────────────────────────────────────
-function buildVendorDist(rows) {
+function buildVendorDist(rows, tierOrder) {
   const vendorTotals = {};
   for (const r of rows) {
     const v = r.vendor;
     if (!isValidLabel(v)) continue;
     vendorTotals[v] = (vendorTotals[v] || 0) + (r.total_requests || 0);
   }
-  const labels = Object.keys(vendorTotals).sort((a,b) => vendorTotals[b]-vendorTotals[a]);
+  const labels = sortByTierOrder(Object.keys(vendorTotals), tierOrder);
   const data = labels.map(v => vendorTotals[v]);
 
   if (chartVendorDist) chartVendorDist.destroy();
@@ -1027,7 +1040,7 @@ function buildVendorDist(rows) {
 }
 
 // ── Token 量趋势折线图（按 vendor）───────────────────────
-function buildTokenTimeline(rows) {
+function buildTokenTimeline(rows, tierOrder) {
   const vendorDateMap = {};
   const allDates = new Set();
   for (const r of rows) {
@@ -1040,7 +1053,7 @@ function buildTokenTimeline(rows) {
     allDates.add(d);
   }
   const dates = [...allDates].sort();
-  const vendors = Object.keys(vendorDateMap).sort();
+  const vendors = sortByTierOrder(Object.keys(vendorDateMap), tierOrder);
 
   if (chartTokenTimeline) chartTokenTimeline.destroy();
   const ctx = document.getElementById('chart-token-timeline').getContext('2d');
@@ -1258,9 +1271,10 @@ async function refresh() {
     updateChartTitles(days);
 
     const rows = timeline.rows || [];
-    buildTimeline(rows);
-    buildVendorDist(rows);
-    buildTokenTimeline(rows);
+    const tierOrder = (status.tiers || []).map(t => t.name);
+    buildTimeline(rows, tierOrder);
+    buildVendorDist(rows, tierOrder);
+    buildTokenTimeline(rows, tierOrder);
     buildModelTokenTimeline(rows);
 
     document.getElementById('refresh-time').textContent = '上次刷新: ' + now();

coding/proxy/server/request_normalizer.py

@@ -487,6 +487,150 @@ def _repair_orphaned_tool_use(
     return repaired
 
 
+# ── Phase 2: 跨供应商 tool_use/tool_result 配对强制修复 ─────────
+
+
+def enforce_anthropic_tool_pairing(
+    messages_list: list[dict[str, Any]],
+) -> list[str]:
+    """为跨供应商场景强制保证 Anthropic tool_use/tool_result 配对约束.
+
+    单次正向遍历所有消息，对每个 assistant 消息执行：
+
+    1. 剥离所有 tool_result 块（跨供应商产物，如 GLM-5 内联的 tool_result）
+    2. 收集所有 tool_use ID
+    3. 确保紧邻的下一条消息是 user 消息且包含所有必需的 tool_result
+    4. 将剥离的 tool_result 重定位到正确的 user 消息
+    5. 为仍缺失的 tool_result 合成 ``is_error=True`` 的占位块
+
+    此函数是一个**自包含的单遍处理**，不依赖 Phase 1 收集的 misplaced 信息，
+    通过直接扫描消息列表确保处理的完备性。替代此前多步串联管线
+    （剥离 → 重定位 → 孤儿修复）因步骤间隐式依赖导致的漏修问题。
+
+    仅在请求实际发送给 Anthropic tier 且检测到跨供应商信号时调用，
+    确保 Zhipu 等其他 vendor 不受影响。
+
+    Args:
+        messages_list: 消息列表（就地修改）。
+
+    Returns:
+        新增的 adaptation 标签列表。
+    """
+    adaptations: list[str] = []
+    relocated_count = 0
+    synthesized_ids: list[str] = []
+
+    i = 0
+    while i < len(messages_list):
+        msg = messages_list[i]
+        if not isinstance(msg, dict) or msg.get("role") != "assistant":
+            i += 1
+            continue
+
+        content = msg.get("content")
+        if not isinstance(content, list):
+            i += 1
+            continue
+
+        # ── A. 从 assistant 消息中剥离所有 tool_result 块 ─────────
+        extracted_tool_results: dict[str, dict[str, Any]] = {}  # tool_use_id → block
+        retained_content: list[Any] = []
+        for block in content:
+            if isinstance(block, dict) and block.get("type") == "tool_result":
+                tid = block.get("tool_use_id")
+                if tid:
+                    extracted_tool_results[tid] = block
+                    relocated_count += 1
+                # 无 tool_use_id 的 tool_result 直接丢弃（无效块）
+            else:
+                retained_content.append(block)
+
+        if extracted_tool_results:
+            msg["content"] = retained_content
+
+        # ── B. 收集所有 tool_use ID ───────────────────────────────
+        tool_use_ids: list[str] = [
+            b["id"]
+            for b in (
+                msg.get("content") if isinstance(msg.get("content"), list) else []
+            )
+            if isinstance(b, dict) and b.get("type") == "tool_use" and b.get("id")
+        ]
+        if not tool_use_ids:
+            # 无 tool_use 块：若剥离后 content 为空，插入占位
+            current_content = msg.get("content")
+            if isinstance(current_content, list) and not current_content:
+                msg["content"] = [{"type": "text", "text": ""}]
+            i += 1
+            continue
+
+        # ── C. 确保 messages[i+1] 是 user 消息 ───────────────────
+        next_idx = i + 1
+        if (
+            next_idx < len(messages_list)
+            and isinstance(messages_list[next_idx], dict)
+            and messages_list[next_idx].get("role") == "user"
+        ):
+            user_msg = messages_list[next_idx]
+        else:
+            # 插入合成 user 消息
+            user_msg: dict[str, Any] = {"role": "user", "content": []}
+            messages_list.insert(next_idx, user_msg)
+
+        # ── D. 确保 user_msg.content 是 list ─────────────────────
+        user_content = user_msg.get("content")
+        if isinstance(user_content, str):
+            user_msg["content"] = [{"type": "text", "text": user_content}]
+        elif not isinstance(user_content, list):
+            user_msg["content"] = []
+
+        # ── E. 收集 user 消息中已有的 tool_result IDs ─────────────
+        existing_result_ids: set[str] = {
+            b["tool_use_id"]
+            for b in user_msg["content"]
+            if isinstance(b, dict)
+            and b.get("type") == "tool_result"
+            and b.get("tool_use_id")
+        }
+
+        # ── F. 为每个 tool_use_id 确保 tool_result 存在 ──────────
+        for uid in tool_use_ids:
+            if uid in existing_result_ids:
+                continue  # 已有匹配的 tool_result
+
+            if uid in extracted_tool_results:
+                # 从 assistant 剥离的 tool_result 重定位到 user
+                user_msg["content"].append(extracted_tool_results[uid])
+            else:
+                # 完全缺失：合成 is_error=True 占位块
+                user_msg["content"].append(
+                    {
+                        "type": "tool_result",
+                        "tool_use_id": uid,
+                        "content": "",
+                        "is_error": True,
+                    }
+                )
+                synthesized_ids.append(uid)
+
+        i += 1
+
+    # ── 构建 adaptation 标签与日志 ────────────────────────────
+    if relocated_count:
+        adaptations.append("misplaced_tool_result_relocated")
+    if synthesized_ids:
+        adaptations.append("orphaned_tool_use_repaired")
+        logger.warning(
+            "Vendor degradation adaptation: synthesized %d tool_result block(s) "
+            "for orphaned tool_use to satisfy Anthropic pairing constraint. "
+            "Affected tool_use_ids: %s",
+            len(synthesized_ids),
+            ", ".join(synthesized_ids),
+        )
+
+    return adaptations
+
+
 # ── Phase 2: Thinking block 剥离 ──────────────────────────────
 
 # 需要从 assistant messages 中剥离的 thinking block 类型

{coding_proxy-0.2.4a2.dist-info → coding_proxy-0.2.4a4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coding-proxy
-Version: 0.2.4a2
+Version: 0.2.4a4
 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
@@ -145,7 +145,7 @@ graph RL
 
     subgraph CodingProxy["⚡ coding-proxy"]
         direction RL
-        
+
         Router["RequestRouter<br/><code>routing/router.py</code>"]:::router
 
         Router -->NTier
@@ -178,7 +178,7 @@ graph RL
             Tier2 -. "🆘 Safety Net Downgrade" .-> TierN
         end
 
-    end    
+    end
 
     Client -->|"POST /v1/messages"| CodingProxy
 ```

{coding_proxy-0.2.4a2.dist-info → coding_proxy-0.2.4a4.dist-info}/RECORD

@@ -17,7 +17,7 @@ coding/proxy/compat/canonical.py,sha256=-zcuEwZ402xeH3C545RmuYRkT2HDuvFloyFydDv8
 coding/proxy/compat/session_store.py,sha256=B9IFjjQJnHMg1244m__jG9gnqGWi26-JyEtwopEri6Q,5244
 coding/proxy/config/__init__.py,sha256=hzgU5noJGecjj13UY38cC_p6jpWO3GO7okSW-A2XkJ0,127
 coding/proxy/config/auth_schema.py,sha256=LYrJQU_fgW-6AoQdjXt4-MgPJjXjv9HrghlCcZwotnA,696
-coding/proxy/config/config.default.yaml,sha256=wiY5RZ5NH1HePR-oJ9Q88AcHMaRnBX5eg-s40o79oh4,16579
+coding/proxy/config/config.default.yaml,sha256=Q7pfvyVfm63sBGsw5OWyBHILi4vp_ANcRQAfU_q-T9g,16579
 coding/proxy/config/loader.py,sha256=1J_RBJgjuC8RwB2mwewLMS7vy9WEhUqttZG2igeDm-w,8984
 coding/proxy/config/resiliency.py,sha256=GnzY-LoyfFqXFM1l6xEru418v-cKlv97-HM0noGPdks,1308
 coding/proxy/config/routing.py,sha256=aJMhfCRyoZIvemM3Q2_KV9rpWxUsFnoY0ZdCr4TwSs8,11765
@@ -44,7 +44,7 @@ coding/proxy/model/vendor.py,sha256=Yg4AYN7tgjHaGWRGEccCs3AdO8vBc-KxIelnqRowpyo,
 coding/proxy/routing/__init__.py,sha256=2Tpc6MQ5Oy_w-YlEWQVDSgcSgiHp3OwKOABIjj5kfHA,1595
 coding/proxy/routing/circuit_breaker.py,sha256=hOyoY_RWB5dTVbipyuiWfAelnva3cZRLbXrSmSn8KTs,8096
 coding/proxy/routing/error_classifier.py,sha256=oDxp69sCb-pdfe1hWce29A9tsN3jAbhqfl2fRECBtCo,3747
-coding/proxy/routing/executor.py,sha256=JCK0mh4JfaiS3hQ8CkPxard6xrE7k3hSXck_e2IO2YA,34062
+coding/proxy/routing/executor.py,sha256=PNOv9fK5ZGGNx3wVLWmPBtM48R88Iu3xLZ2oXgDlx6M,35533
 coding/proxy/routing/model_mapper.py,sha256=b72CGRdusLAwoq7p8-8TWAv9-Zv8BozssiZC8XnNTx4,3574
 coding/proxy/routing/quota_guard.py,sha256=uoQSr2siv6aIBVylvXG_PsfdpY_i4QJxc-WHz4MGDa4,7791
 coding/proxy/routing/rate_limit.py,sha256=i2cCqtbmXrP6wjRUTWXLP4DdYwVj0C4o59QdYGkPQj0,5122
@@ -56,9 +56,9 @@ coding/proxy/routing/usage_parser.py,sha256=j4G0ArFduQ2D4Yeuad94DVlwdc-JvSh7SJLV
 coding/proxy/routing/usage_recorder.py,sha256=pObOrX2yIITTiyojl1fJcqO0yWWpbP4KqsJvFdmlt04,6273
 coding/proxy/server/__init__.py,sha256=KeH7mEu36v9v27m3VgeSxSeFz9sLTJrxS_EVATJ7Vks,20
 coding/proxy/server/app.py,sha256=kRGgb772dZu8200LPnn7Nt0IU5oagcbBf_Vc5ynxxzE,5599
-coding/proxy/server/dashboard.py,sha256=z8WfLOi_YDR11uk018luxZNam98p_GW1aMrgguatROU,54539
+coding/proxy/server/dashboard.py,sha256=sCGuqBFqCrwB6zoyYXDdIfadZphHHhKJ9A9GjiHSHQU,55210
 coding/proxy/server/factory.py,sha256=w8VFvxoogw9K9sO8MlT6bIP7xM7mR6sCohrZle9y_Gg,9985
-coding/proxy/server/request_normalizer.py,sha256=1T2aqZFdB8kdLQsLJsXgEmi-z6d5OhaVv0dER8Vk6I4,21884
+coding/proxy/server/request_normalizer.py,sha256=QqevMqHFFwkggo7MEVAX4YmOFNtnwuH4SkpBO11YiZs,27778
 coding/proxy/server/responses.py,sha256=i0ugnLRNOdRYGHEWxkwsxR35ChmdMQsSaD8AjRluTn4,2167
 coding/proxy/server/routes.py,sha256=_N_-GPEgK5YEmlkuuM0dvB-nOyL_OMXI12cOiQWAGPY,13845
 coding/proxy/streaming/__init__.py,sha256=0al5TC-zJt8Bz0CibTmd8WPza-Cs-qcuZWvT2fKPqHI,23
@@ -80,8 +80,8 @@ coding/proxy/vendors/native_anthropic.py,sha256=SxtM71PDci0gqLqiwCrFnT410SnSoD7F
 coding/proxy/vendors/token_manager.py,sha256=s10t4Com0jNnKGkPyJ_HpG5SjHrCEJvfArEOAaPKA_k,4189
 coding/proxy/vendors/xiaomi.py,sha256=E-GcmJBZh7GOtDFonxZmlf0hKRhrlrXzL0IxHFRYcRo,860
 coding/proxy/vendors/zhipu.py,sha256=3j_rqNFu1CX-B5ugtrL6Y1OeWSy9yiqsVa9Bi1ssaAA,1062
-coding_proxy-0.2.4a2.dist-info/METADATA,sha256=eDsFwAnUCCfFE3No3RfgQ-f0QHd-ifJcI8FWstUJ9jY,10892
-coding_proxy-0.2.4a2.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-coding_proxy-0.2.4a2.dist-info/entry_points.txt,sha256=moIVzt5ho0Wk9B47LOo2SEAbhzuDDHWi-EfM30U0XBg,54
-coding_proxy-0.2.4a2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-coding_proxy-0.2.4a2.dist-info/RECORD,,
+coding_proxy-0.2.4a4.dist-info/METADATA,sha256=Fk2VSfWJkycIPJ-qy72DxJWdb2sqy0Wn6udazeKrV7o,10880
+coding_proxy-0.2.4a4.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+coding_proxy-0.2.4a4.dist-info/entry_points.txt,sha256=moIVzt5ho0Wk9B47LOo2SEAbhzuDDHWi-EfM30U0XBg,54
+coding_proxy-0.2.4a4.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+coding_proxy-0.2.4a4.dist-info/RECORD,,