合并 origin/main（旧版 v5）到 feature/v6-benchmark-v2：以 v6 为准解决冲突

Browse Source

- origin/main 为旧版 v5 快照；本分支 v6 为当前权威实现（v5 超集）。
- 7 个冲突文件（CLAUDE.md、README.md、agent/main.py、agent/task_executor.py、orchestrator/main.py、orchestrator/swarm_runtime.py、scripts/test-merge-smoke.py）全部以 v6（ours）解决，无冲突标记残留。
- 解决后 7 套测试全绿（contract / merge-smoke / workflow-e2e / contract-events / benchmark-metrics / benchmark-collector / baseline-comparison）。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

...

This commit is contained in:

Songhaoz666

2026-06-09 16:54:06 +08:00

co-authored by Claude Opus 4.8

parent 54cb327348 d0fa193f79

commit 84e1e3b2b3

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available