Merge upstream Roo Code @ e921f9d (telemetry, cloud, MCP marketplace removal)

[edelauna]

Summary

Merges upstream Roo Code (upstream/main @ e921f9d) into Zoo Code. This is a large upstream cleanup that removes several features Roo Code Inc. no longer maintains, bringing the fork up to date before those divergences compound.

Upstream changes included (8 commits):

• Remove all telemetry — strips `TelemetryService` instrumentation across the codebase
• Remove Roo Code Cloud and evals — removes cloud auth, `DismissibleUpsell`, `web-evals` app, and the cloud router (`roo` provider)
• Remove the MCP marketplace — upstream removed their hosted marketplace
• Remove MDM and organization membership enforcement
• Remove corporate extension support links
• Remove contributor and community references
• Simplify website — `apps/web-roo-code` slimmed to extension-focused content
• Add docs app and GitHub Pages deploy

Net: 504 files changed, ~35k lines removed.

Zoo Code-specific fixes applied during merge:

• Restored functional implementation of `_executeBatchUpsertOperations` and `_handleBatchDeletions` in `file-watcher.ts` — upstream stripped the entire implementation body when removing telemetry calls
• Updated `deleteCustomMode` call sites (1-arg vs 2-arg API change)
• Removed `roo` router from `routerModels` test expectations (no longer a valid `RouterName`)
• Fixed `ContextProxy` test for Roo provider sanitization (removed `rooApiKey` field)
• Added telemetry mock in `anthropic.spec.ts` for error-path coverage
• Restored `taskHistory.length < 6` guard on `` in `ChatView` (inadvertently dropped upstream)
• Fixed retired Roo provider i18n key (`retiredRooProviderMessage`) in two test files
• Updated Zoo Code support link in `ChatRow` rate-limit test
• Un-skipped 6 settings regression tests from `origin/main` commit `350e172`

Test plan

• `pnpm check-types` — 11/11 packages pass
• Extension unit tests — 5336 pass, 48 skipped (all pre-existing platform/env skips), 34 local-only GPG failures (pass in CI)
• `webview-ui` tests — 1235/1235 pass, 0 skipped
• E2E mocked — 16 passing, 37 pending (unfixured tool suites, unchanged)

🤖 Generated with Claude Code

[coderabbitai]

Important

Review skipped

Draft detected.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro Plus

Run ID: 5d8fb59f-ec92-4769-8eba-56aded25ea22

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch chore/merge-roo-upstream-2026-05-14

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[edelauna]

Closing in favour of #123