coding-proxy 0.2.4a2__tar.gz → 0.2.4a4__tar.gz

{coding_proxy-0.2.4a2 → coding_proxy-0.2.4a4}/.github/workflows/release.yml

@@ -1,15 +1,14 @@
 # =============================================================================
-# coding-proxy: PyPI Publishing Pipeline (4-Stage Unified Pipeline)
+# coding-proxy: PyPI Publishing Pipeline (3-Stage Unified Pipeline)
 # =============================================================================
 # Trigger: GitHub Release publication event (release.types: [published])
 #
-# Architecture: 4-Stage Serial Pipeline (prerelease only — 所有生产发布均走预发布)
+# Architecture: 3-Stage Serial Pipeline (prerelease only — 所有生产发布均走预发布)
 #
 #   Stage 1 (build):            矩阵构建 3.12/3.13/3.14，上传 artifacts
 #   Stage 2 (publish-testpypi): 发布到 TestPyPI 供验证
 #   Stage 3 (publish-to-pypi):  ⏸ Production Approval Gate (environment: pypi)
 #                               审批通过后自动：Promote Release + Publish to PyPI
-#   Stage 4 (update-changelog): 从 Release notes 生成 Changelog PR → master
 #
 # 设计决策 — Stage 3 合并审批与发布的理由：
 #   pypa/gh-action-pypi-publish@release/v1 始终优先尝试 OIDC Trusted Publishing。
@@ -21,9 +20,6 @@
 # Pre-requisites — 需要在 GitHub Settings 一次性手动配置：
 #   1. repo → Settings → Environments → "pypi"
 #      → Required reviewers: 添加审批人员（Production Approval Gate 所需）
-#   2. repo → Settings → Actions → General → Workflow permissions
-#      → "Read and write permissions"（Stage 4 推分支所需）
-#      → 勾选 "Allow GitHub Actions to create and approve pull requests"
 #
 # Authentication:
 #   - TEST_PYPI_API_TOKEN: TestPyPI API Token（repository secret）
@@ -197,130 +193,3 @@ jobs:
         with:
           skip-existing: true
           verbose: true
-
-  # ===========================================================================
-  # Stage 5: UPDATE CHANGELOG -- 自动生成 Changelog PR → master
-  # ===========================================================================
-  update-changelog:
-    name: Update Changelog
-    runs-on: ubuntu-latest
-    needs: publish-to-pypi
-    if: github.event.release.prerelease == true
-    timeout-minutes: 10
-    permissions:
-      contents: write        # git push 新分支
-      pull-requests: write   # 创建 PR
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          persist-credentials: true
-
-      - name: Extract stable version from prerelease tag
-        id: version
-        run: |
-          PRERELEASE_TAG="${{ github.ref_name }}"
-          # v0.2.0a1 → v0.2.0（移除预发布后缀 a*/b*/rc*）
-          STABLE_VERSION=$(echo "$PRERELEASE_TAG" | sed 's/\(v[0-9]*\.[0-9]*\.[0-9]*\).*/\1/')
-          echo "prerelease_tag=$PRERELEASE_TAG" >> "$GITHUB_OUTPUT"
-          echo "stable_version=$STABLE_VERSION" >> "$GITHUB_OUTPUT"
-          echo "branch_name=chore/changelog-$STABLE_VERSION" >> "$GITHUB_OUTPUT"
-          echo "Extracted: $PRERELEASE_TAG → $STABLE_VERSION"
-
-      - name: Check if Changelog entry already exists
-        id: check
-        run: |
-          STABLE="${{ steps.version.outputs.stable_version }}"
-          if grep -qF "[$STABLE]" CHANGELOG.md; then
-            echo "exists=true" >> "$GITHUB_OUTPUT"
-            echo "ℹ️ Changelog entry for $STABLE already exists, skipping PR creation"
-          else
-            echo "exists=false" >> "$GITHUB_OUTPUT"
-            echo "✅ No existing entry for $STABLE, will create PR"
-          fi
-
-      - name: Fetch release body and update CHANGELOG.md
-        if: steps.check.outputs.exists == 'false'
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const fs = require('fs');
-            const { owner, repo } = context.repo;
-
-            // 通过 API 获取 Release body，避免 shell 特殊字符注入问题
-            const release = await github.rest.repos.getReleaseByTag({
-              owner,
-              repo,
-              tag: '${{ steps.version.outputs.prerelease_tag }}',
-            });
-
-            const stable = '${{ steps.version.outputs.stable_version }}';
-            const date = new Date().toISOString().slice(0, 10);
-            const releaseUrl = `https://github.com/${owner}/${repo}/releases/tag/${{ steps.version.outputs.prerelease_tag }}`;
-            const body = release.data.body || '';
-
-            // 构建新条目
-            const newEntry = `\n## [${stable}](${releaseUrl}) — ${date}\n\n${body}\n`;
-
-            // 读取 CHANGELOG.md，在 ## [Unreleased] 行后插入新条目
-            let content = fs.readFileSync('CHANGELOG.md', 'utf8');
-            const marker = '## [Unreleased]';
-            const idx = content.indexOf(marker);
-            if (idx === -1) {
-              core.setFailed('CHANGELOG.md 中未找到 ## [Unreleased] 标记，无法插入条目');
-              return;
-            }
-            const insertPos = idx + marker.length;
-            content = content.slice(0, insertPos) + newEntry + content.slice(insertPos);
-            fs.writeFileSync('CHANGELOG.md', content, 'utf8');
-            core.info(`✅ CHANGELOG.md updated with entry for ${stable}`);
-
-      - name: Create branch and commit
-        if: steps.check.outputs.exists == 'false'
-        run: |
-          BRANCH="${{ steps.version.outputs.branch_name }}"
-          STABLE="${{ steps.version.outputs.stable_version }}"
-
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-
-          git checkout -b "$BRANCH"
-          git add CHANGELOG.md
-          git commit -m "docs(changelog): add entry for $STABLE"
-          git push origin "$BRANCH"
-
-      - name: Create Pull Request
-        if: steps.check.outputs.exists == 'false'
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const { owner, repo } = context.repo;
-            const stable = '${{ steps.version.outputs.stable_version }}';
-            const branch = '${{ steps.version.outputs.branch_name }}';
-            const prereleaseTag = '${{ steps.version.outputs.prerelease_tag }}';
-            const runUrl = `https://github.com/${owner}/${repo}/actions/runs/${{ github.run_id }}`;
-
-            const pr = await github.rest.pulls.create({
-              owner,
-              repo,
-              title: `docs(changelog): 补充 ${stable} 发版说明`,
-              body: [
-                `## 摘要`,
-                ``,
-                `自动生成的 PR，为 **${stable}** 正式版补充 CHANGELOG 条目。`,
-                ``,
-                `- 来源：[\`${prereleaseTag}\`](https://github.com/${owner}/${repo}/releases/tag/${prereleaseTag}) Release notes`,
-                `- 目标分支：\`master\``,
-                ``,
-                `请审阅 CHANGELOG 条目后合并。`,
-                ``,
-                `> 🤖 由 [发布流水线](${runUrl}) 自动生成`,
-              ].join('\n'),
-              head: branch,
-              base: 'master',
-            });
-
-            core.notice(`✅ PR created: ${pr.data.html_url}`);
-

coding_proxy-0.2.4a4/.pre-commit-config.yaml

@@ -0,0 +1,57 @@
+# =============================================================================
+# coding-proxy: Pre-commit Hooks Configuration
+# =============================================================================
+# 目的: 在代码提交前自动执行 Ruff lint/format 及通用卫生检查，作为 CI 的前置守护
+#
+# 设计决策：使用 local hook（language: system + uv run）而非 astral-sh/ruff-pre-commit
+#   - 遵循 Single Source of Truth 原则：Ruff 版本由 uv.lock 唯一管控，消除版本漂移
+#   - 与 CI 命令形态完全镜像（uv run ruff check/format）
+#   - 符合 AGENTS.md 包管理规范（统一使用 uv）
+#
+# 安装：uv run pre-commit install
+# 手动全量检查：uv run pre-commit run --all-files
+# =============================================================================
+
+minimum_pre_commit_version: "4.0.0"
+
+repos:
+  # ---------------------------------------------------------------------------
+  # 通用代码卫生检查（pre-commit-hooks 官方钩子集）
+  # 轻量级、无额外依赖、执行极快
+  # ---------------------------------------------------------------------------
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: trailing-whitespace      # 去除行尾空白
+      - id: end-of-file-fixer        # 确保文件以换行符结尾
+      - id: check-yaml
+        args: ["--unsafe"]           # 兼容 GitHub Actions ${{ }} 表达式语法
+      - id: check-toml               # 校验 TOML 语法（pyproject.toml）
+      - id: check-merge-conflict     # 阻止提交含未解决 merge conflict 标记的文件
+      - id: check-added-large-files
+        args: ["--maxkb=1024"]       # 阈值 1MB（assets/dashboard-v0.2.3.png 为 944KB）
+
+  # ---------------------------------------------------------------------------
+  # Ruff: local hook，直接调用 uv 安装的 Ruff（与 CI 版本完全一致）
+  # 前置条件：uv sync --dev 已执行
+  # ---------------------------------------------------------------------------
+  - repo: local
+    hooks:
+      # 对应 CI: uv run ruff check .
+      # --fix: 自动修复安全可修复问题（isort、UP 现代化等），降低开发摩擦
+      # --exit-non-zero-on-fix: 修复后返回非零码，触发 git 重新暂存已修复文件
+      - id: ruff-lint
+        name: Ruff (lint + auto-fix)
+        language: system
+        entry: uv run ruff check --fix --exit-non-zero-on-fix
+        types_or: [python, pyi]
+        require_serial: false
+
+      # 对应 CI: uv run ruff format --check .
+      # 本地直接 format（自动修复格式），CI 保留 --check 模式作为最终防线
+      - id: ruff-format
+        name: Ruff (format)
+        language: system
+        entry: uv run ruff format
+        types_or: [python, pyi]
+        require_serial: false

{coding_proxy-0.2.4a2 → coding_proxy-0.2.4a4}/AGENTS.md

@@ -46,6 +46,7 @@
   2. **Temp Management**: 临时产物（执行计划等）一律收敛至 `.temp/` 并及时清理；
   3. **Link Validity**: 确保所有引用的 URL 可访问且具备明确的上下文价值；
   4. **Git Commit**: 在需要提交变更到 Git 时，一律使用 Shell 调用 Claude Code 的自定义 Slash Command: `/commit` 进行 git commit 操作（若环境中未安装 Claude Code，则直接读取 `~/.claude/commands/commit.md`，按照其中的规则进行 git commit 操作）。不要执行 Rebase。
+  5. **Pre-commit Hooks**: 克隆仓库后执行 `uv run pre-commit install` 激活本地 Git hooks，使 Ruff lint（含 auto-fix）、Ruff format 及通用代码卫生检查在每次 commit 前自动运行。若 hooks 自动修复了问题，提交会被中断，执行 `git add -p` 审阅修复内容后重新提交即可。
 - **Package Management Standardization (包管理规范)**:
   1. **Python**: 严禁使用 pip/poetry，**必须**统一使用 `uv` 进行包管理与脚本执行（如 `uv run`）；
   2. **JavaScript/TypeScript**: 严禁使用 npm/yarn，**必须**统一使用 `pnpm` 进行包管理与脚本执行。

{coding_proxy-0.2.4a2 → coding_proxy-0.2.4a4}/CHANGELOG.md

@@ -4,6 +4,8 @@
 
 ## [Unreleased]
 
+- fix(request-normalizer): 重设计 zhipu→anthropic 跨供应商 tool_use/tool_result 配对修复——以单遍自包含 `enforce_anthropic_tool_pairing` 替代原有多步串联管线（剥离→重定位→孤儿修复），消除步骤间隐式依赖导致的孤儿 tool_use 漏修问题，彻底根治 `tool_use ids were found without tool_result blocks` 400 异常;
+
 ## [v0.2.3](https://github.com/ThreeFish-AI/coding-proxy/releases/tag/v0.2.3) — 2026-04-16
 
 - feat(dashboard): 新增实时 Web Dashboard 页面，聚合展示流量与用量统计;
@@ -71,9 +73,9 @@
 ## [v0.1.1](https://github.com/ThreeFish-AI/coding-proxy/releases/tag/v0.1.1) — 2026-04-05
 
 > [!IMPORTANT]
-> 
-> **🎉 coding-proxy MVP 惊艳登场！** 
-> 
+>
+> **🎉 coding-proxy MVP 惊艳登场！**
+>
 > 仅需配置一行环境变量，立刻为你的 Claude Code 接入“永不宕机”的多源智能引擎。主供应商打盹？毫秒级自动无缝切换备用通道，全天候护航你的编码心流，向打断大声说不！
 
 ### ✨ 核心亮点

{coding_proxy-0.2.4a2 → coding_proxy-0.2.4a4}/PKG-INFO

@@ -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 → coding_proxy-0.2.4a4}/README.md

@@ -118,7 +118,7 @@ graph RL
 
     subgraph CodingProxy["⚡ coding-proxy"]
         direction RL
-        
+
         Router["RequestRouter<br/><code>routing/router.py</code>"]:::router
 
         Router -->NTier
@@ -151,7 +151,7 @@ graph RL
             Tier2 -. "🆘 Safety Net Downgrade" .-> TierN
         end
 
-    end    
+    end
 
     Client -->|"POST /v1/messages"| CodingProxy
 ```

{coding_proxy-0.2.4a2 → coding_proxy-0.2.4a4}/docs/zh-CN/README.md

@@ -118,7 +118,7 @@ graph RL
 
     subgraph CodingProxy["⚡ coding-proxy"]
         direction RL
-        
+
         Router["RequestRouter<br/><code>routing/router.py</code>"]:::router
 
         Router -->NTier
@@ -151,7 +151,7 @@ graph RL
             Tier2 -. "🆘 Safety Net Downgrade" .-> TierN
         end
 
-    end    
+    end
 
     Client -->|"POST /v1/messages"| CodingProxy
 ```

{coding_proxy-0.2.4a2 → coding_proxy-0.2.4a4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "coding-proxy"
-version = "0.2.4a2"
+version = "0.2.4a4"
 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"
@@ -47,6 +47,7 @@ dev = [
     "pytest-asyncio>=1.3",
     "pytest-cov>=6.0",
     "ruff>=0.9.0",
+    "pre-commit>=4.0",
 ]
 
 # ── Ruff: Linter & Formatter（替代 flake8 + isort + Black + pyupgrade 等 6+ 工具） ──

{coding_proxy-0.2.4a2 → coding_proxy-0.2.4a4}/src/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-0.2.4a2 → coding_proxy-0.2.4a4}/src/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-0.2.4a2 → coding_proxy-0.2.4a4}/src/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-0.2.4a2 → coding_proxy-0.2.4a4}/src/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 类型