Reapply Batch 1: 22 clean non-AI-SDK cherry-picks#11473
Merged
hannesrudolph merged 23 commits intomainfrom Feb 14, 2026
Merged
Conversation
Co-authored-by: Roo Code <roomote@roocode.com>
Co-authored-by: Roo Code <roomote@roocode.com> Co-authored-by: Matt Rubens <mrubens@users.noreply.github.com>
…gemini-embedding-001 (#11038) Co-authored-by: Roo Code <roomote@roocode.com> Co-authored-by: Hannes Rudolph <hrudolph@gmail.com>
…11131) Tool IDs from providers like Gemini/OpenRouter contain special characters (e.g., 'functions.read_file:0') that are sanitized when saving tool_use blocks to API history. However, tool_result blocks were using the original unsanitized IDs, causing ToolResultIdMismatchError. This fix ensures tool_result blocks use sanitizeToolUseId() to match the sanitized tool_use IDs in conversation history. Fixes EXT-711
Co-authored-by: Roo Code <roomote@roocode.com> Co-authored-by: roomote[bot] <219738659+roomote[bot]@users.noreply.github.com>
…changes (#11205) When using slash commands with `mode:` frontmatter (e.g., `/cli-release` with `mode: code`), the CLI would fail with "Could not resolve authentication method" from the Anthropic SDK, even when using a non-Anthropic provider like `--provider roo`. Root cause: In `markWebviewReady()`, the `webviewDidLaunch` message was sent before `updateSettings`, creating a race condition. The `webviewDidLaunch` handler's "first-time init" sync would read `getState()` before CLI-provided settings were applied to the context proxy. Since `getState()` defaults `apiProvider` to "anthropic" when unset, this default was saved to the provider profile. When a slash command triggered `handleModeSwitch()`, it found this corrupted profile with `apiProvider: "anthropic"` (but no API key) and activated it, overwriting the CLI's working roo provider configuration. Fix: 1. Reorder `markWebviewReady()` to send `updateSettings` before `webviewDidLaunch`, ensuring the context proxy has CLI-provided values when the initialization handler runs. 2. Guard the first-time init sync with `checkExistKey(apiConfiguration)` to prevent saving a profile with only the default "anthropic" fallback and no actual API keys configured. Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
Remove the toolFormat constant and <tool_format> line from environment details output. Native tool calling is now the only supported protocol, making this code unnecessary. Fixes #11206 Co-authored-by: Roo Code <roomote@roocode.com>
…ls (#11215) * feat: extract translation and merge resolver modes into reusable skills - Add roo-translation skill with comprehensive i18n guidelines - Add roo-conflict-resolution skill for intelligent merge conflict resolution - Add /roo-translate slash command as shortcut for translation skill - Add /roo-resolve-conflicts slash command as shortcut for conflict resolution skill The existing translate and merge-resolver modes are preserved. These new skills and commands provide reusable access to the same functionality. Closes CLO-722 * feat: add guidances directory with translator guidance file - Add .roo/guidances/roo-translator.md for brand voice, tone, and word choice guidance - Update roo-translation skill to reference the guidance file The guidance file serves as a placeholder for translation style guidelines that will be interpolated at runtime. * fix: rename guidances directory to guidance (singular) * fix: remove language-specific section from translator guidance The guidance file should focus on brand voice, tone, and word choice only. * fix: remove language-specific guidelines section from skill file * Update .roo/skills/roo-translation/SKILL.md Co-authored-by: roomote[bot] <219738659+roomote[bot]@users.noreply.github.com> --------- Co-authored-by: Roo Code <roomote@roocode.com> Co-authored-by: Bruno Bergher <bruno@roocode.com> Co-authored-by: roomote[bot] <219738659+roomote[bot]@users.noreply.github.com>
* feat: add Claude Opus 4.6 support across all providers Add Claude Opus 4.6 (claude-opus-4-6) model definitions and 1M context support across Anthropic, Bedrock, Vertex AI, OpenRouter, and Vercel AI Gateway providers. - Anthropic: 128K max output, /5 pricing, 1M context tiers - Bedrock: anthropic.claude-opus-4-6-v1:0 with 1M context + global inference - Vertex: claude-opus-4-6 with 1M context tiers - OpenRouter: prompt caching + reasoning budget sets - Vercel AI Gateway: Opus 4.5 and 4.6 added to capability sets - UI: 1M context checkbox for Opus 4.6 on all providers - i18n: Updated 1M context descriptions across 18 locales Also adds Opus 4.5 to Vercel AI Gateway (previously missing) and OpenRouter maxTokens overrides for Opus 4.5/4.6. Closes #11223 * fix: apply tier pricing when 1M context is enabled on Bedrock When awsBedrock1MContext is enabled for tiered models like Opus 4.6, also apply the 1M tier pricing (inputPrice, outputPrice, cache prices) instead of only updating contextWindow. This ensures cost calculations and UI display use the correct >200K rates.
feat: add gpt-5.3-codex model and make it default for OpenAI Codex provider Co-authored-by: Roo Code <roomote@roocode.com>
… parent tasks (#11302) * fix: make removeClineFromStack() delegation-aware to prevent orphaned parent tasks When a delegated child task is removed via removeClineFromStack() (e.g., Clear Task, navigate to history, start new task), the parent task was left orphaned in "delegated" status with a stale awaitingChildId. This made the parent unresumable without manual history repair. This fix captures parentTaskId and childTaskId before abort/dispose, then repairs the parent metadata (status -> active, clear awaitingChildId) when the popped task is a delegated child and awaitingChildId matches. Parent lookup + updateTaskHistory are wrapped in try/catch so failures are non-fatal (logged but do not block the pop). Closes #11301 * fix: add skipDelegationRepair opt-out to removeClineFromStack() for nested delegation --------- Co-authored-by: Roo Code <roomote@roocode.com>
…e idempotent (#11313) * fix(reliability): prevent webview postMessage crashes and make dispose idempotent Closes: #11311 1. postMessageToWebview() now catches rejections from webview.postMessage() so that messages sent after the webview is disposed do not surface as unhandled promise rejections. 2. dispose() is guarded by a _disposed flag so that repeated calls (e.g. during rapid extension deactivation) are no-ops. 3. CloudService mock in ClineProvider.spec.ts updated to include off() — a pre-existing gap exposed by the new dispose test. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: add early _disposed check in postMessageToWebview Skip the postMessage call entirely when the provider is already disposed, avoiding unnecessary try/catch execution. Added test coverage for this path. * chore: trigger CI --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: daniel-lxs <ricciodaniel98@gmail.com>
…task history (#11331) * fix: resolve race condition in new_task delegation that loses parent task history When delegateParentAndOpenChild creates a child task via createTask(), the Task constructor fires startTask() as a fire-and-forget async call. The child immediately begins its task loop and eventually calls saveClineMessages() → updateTaskHistory(), which reads globalState, modifies it, and writes back. Meanwhile, delegateParentAndOpenChild persists the parent's delegation metadata (status: 'delegated', delegatedToId, awaitingChildId, childIds) via a separate updateTaskHistory() call AFTER createTask() returns. These two concurrent read-modify-write operations on globalState race: the last writer wins, overwriting the other's changes. When the child's write lands last, the parent's delegation fields are lost, making the parent task unresumable when the child finishes. Fix: create the child task with startTask: false, persist the parent's delegation metadata first, then manually call child.start(). This ensures the parent metadata is safely in globalState before the child begins writing. * docs: clarify Task.start() only handles new tasks, not history resume
… race (#11335) Add a promise-chain mutex (withTaskHistoryLock) to serialize all read-modify-write operations on taskHistory, preventing concurrent interleaving from silently dropping entries. Reorder reopenParentFromDelegation to close the child instance before marking it completed, so the abort path's stale 'active' status write no longer overwrites the 'completed' state. Covered by new tests: RPD-04/05/06, UTH-02/04, and a full mutex concurrency suite.
hannesrudolph
requested review from
cte,
daniel-lxs,
jr and
mrubens
as code owners
dosubot
bot
added
the
size:XL
Contributor
Reviewed all 22 cherry-picked commits + 1 fix. No issues found. The changes are well-structured, type-consistent, and thoroughly tested (5,359 backend + 1,229 webview-ui tests passing).
Mention @roomote in a comment to request specific changes to this pull request or fix all unresolved issues. |
![roomote[bot]](https://avatars.githubusercontent.com/in/1546624?s=60&v=4){kind=small}
daniel-lxs
approved these changes
Feb 14, 2026
This was referenced Feb 14, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reapply Batch 1 — Clean Cherry-Picks
Step 1 of the reapplication plan from
docs/reapplication-plan.mdContext
PR #11462 reverted the codebase to pre-AI-SDK state (Jan 29, 2026). PR #11463 reapplied 21 non-AI-SDK commits. This PR reapplies 22 additional non-AI-SDK PRs that were verified to cherry-pick cleanly with zero conflicts.
What This Adds (22 commits + 1 fix)
Bug Fixes (10 commits)
e597921478fix: add image content support to MCP tool responses #10874 — fix: add image content support to MCP tool responsesa357c00e35fix: transform tool blocks to text before condensing (EXT-624) #10975 — fix: transform tool blocks to text before condensing (EXT-624)db11712d17fix(code-index): remove deprecated text-embedding-004 and migrate to gemini-embedding-001 #11038 — fix(code-index): migrate to gemini-embedding-001fc71291e71fix: sanitize tool_use_id in tool_result blocks to match API history #11131 — fix: sanitize tool_use_id in tool_result blocks196d0d6720fix: queue messages during command execution instead of losing them #11140 — fix: queue messages during command execution6fbb60cb9cfix(cli): resolve race condition causing provider switch during mode changes #11205 — fix(cli): resolve race condition causing provider switch21f6c31258fix(reliability): prevent webview postMessage crashes and make dispose idempotent #11313 — fix: prevent webview postMessage crashesb2340d7ce0Fix task resumption in the API module #11369 — fix: task resumption in API module87cee09491fix: resolve race condition in new_task delegation that loses parent task history #11331 — fix: resolve delegation race condition761bef443dfix: serialize taskHistory writes and fix delegation status overwrite race #11335 — fix: serialize taskHistory writesFeatures (6 commits)
10d9577a61feat: allow import settings in initial welcome screen #10994 — feat: allow import settings in welcome screen6a562c09c1feat: add support for AGENTS.local.md personal override files #11183 — feat: add AGENTS.local.md supporta45e9cc4d6feat: add Claude Opus 4.6 support across all providers #11224 — feat: add Claude Opus 4.6 support across all providersc24b9b48abfeat: add gpt-5.3-codex model to OpenAI Codex provider #11225 — feat: add gpt-5.3-codex modela50adc786afix: prevent parent task state loss during orchestrator delegation #11281 — fix: prevent parent task state loss during delegation94e1f07be2fix: make removeClineFromStack() delegation-aware to prevent orphaned parent tasks #11302 — fix: delegation-aware removeClineFromStackRefactors & Chores (6 commits)
08f2fe23a5refactor(read_file): Codex-inspired read_file refactor EXT-617 #10981 — refactor: Codex-inspired read_file refactor9d2907fa4cchore: treat extension .env as optional #11116 — chore: treat extension .env as optionalbd3fbe7608chore: remove dead toolFormat code from getEnvironmentDetails #11207 — chore: remove dead toolFormat codeeae9c966b5feat: extract translation and merge resolver modes into reusable skills #11215 — feat: extract translation/merge resolver into skills (empty)61edbb34c6IPC fixes for task cancellation and queued messages #11162 — IPC fixes for task cancellationeb23efd7cfchore: clean up repo-facing mode rules #11410 — chore: clean up repo-facing mode rules (empty)Fix (1 commit)
93806b7048fix: add maxReadFileLine to ExtensionState type for webview compatibilityVerification
✅ 5,359 backend tests passed
✅ 1,229 webview-ui tests passed
✅ TypeScript check passed (all packages)
✅ Lint passed
Related
docs/reapplication-plan.mdfor full plan