|
| 1 | +# Reapply Progress — Batch 2 (reapply/batch-2-minor-conflicts) |
| 2 | + |
| 3 | +## Status: ✅ READY FOR FORCE PUSH |
| 4 | + |
| 5 | +## Summary |
| 6 | +Batch 2 branch has been rebuilt from scratch on top of origin/main. |
| 7 | + |
| 8 | +## Changes from Previous Attempt |
| 9 | +- **3 delegation PRs removed**: #11379, #11418, #11422 (contained AI SDK contamination) |
| 10 | +- Branch rebuilt with clean cherry-picks only |
| 11 | + |
| 12 | +## Cherry-Picked PRs (9 total) |
| 13 | +1. fix: correct Bedrock model ID for Claude Opus 4.6 (#11232) |
| 14 | +2. fix: guard against empty-string baseURL (#11233) |
| 15 | +3. fix: make defaultTemperature required (#11218) |
| 16 | +4. feat: batch consecutive tool calls (#11245) |
| 17 | +5. feat: add IPC query handlers (#11279) |
| 18 | +6. feat: add lock toggle to pin API config (#11295) |
| 19 | +7. fix: validate Gemini thinkingLevel (#11303) |
| 20 | +8. chore(cli): prepare release v0.0.53 (#11425) |
| 21 | +9. feat: add GLM-5 model support to Z.ai provider (#11440) |
| 22 | + |
| 23 | +## Post-Cherry-Pick Fixes |
| 24 | +- **AI SDK contamination cleaned**: Removed 3 AI SDK tests + import from gemini.spec.ts |
| 25 | +- **Type errors fixed**: Added missing `defaultTemperature` to vertex.ts and xai.ts |
| 26 | +- **pnpm-lock.yaml regenerated**: Clean lockfile matching current dependencies |
| 27 | + |
| 28 | +## Verification Results (2026-02-14) |
| 29 | +- **Backend tests**: 375 files passed, 5372 tests (4 files skipped, 48 tests skipped) |
| 30 | +- **Webview-ui tests**: 120 files passed, 1250 tests (8 tests skipped) |
| 31 | +- **TypeScript check**: 14/14 packages clean (all cached) |
| 32 | +- **AI SDK contamination check**: CLEAN — no traces of `from "ai"`, `rooMessage`, `@ai-sdk` |
| 33 | +- **rooMessage.ts file check**: CLEAN — no such file exists |
| 34 | + |
| 35 | +## Branch ready for force push to origin/reapply/batch-2-minor-conflicts |
0 commit comments