Codex cherry-pick:
- b1c4f40f: fix ACP extended thinking + tool_use 连续 user 消息导致 400
→ src/utils/messages.ts: ensureToolResultPairing 检查连续 user 消息
→ src/utils/tests/messages.test.ts: 新增测试(冲突手动解决)
James 兜底:
- tools.ts: WorkflowTool lazy getter → top-level require (MonitorTool 模式)
移除 initBundledWorkflows() 调用(经确认是 no-op)
原因: lazy getter 在 splitting:true 下运行时触发 chunk load 死锁
审核结论:
- 上游 a91653a0/6dd378bf/efc218d8 已存在(之前已合入)
- 上游
|
||
|---|---|---|
| .. | ||
| defines.ts | ||
| dev-debug.ts | ||
| dev.ts | ||
| download-ripgrep.ts | ||
| health-check.ts | ||
| post-build.ts | ||
| postinstall.cjs | ||
| rcs.ts | ||
| verify-gates.ts | ||
| vite-plugin-feature-flags.ts | ||
| vite-plugin-import-meta-require.ts | ||