Skip to content

chore: merge Roo Code upstream sunset into Zoo Code#123

Merged
edelauna merged 17 commits into
mainfrom
chore/merge-roo-upstream-v2
May 21, 2026
Merged

chore: merge Roo Code upstream sunset into Zoo Code#123
edelauna merged 17 commits into
mainfrom
chore/merge-roo-upstream-v2

Conversation

@edelauna
Copy link
Copy Markdown
Contributor

@edelauna edelauna commented May 15, 2026

Summary

Merges Roo Code upstream (upstream/main @ e921f9d21) into Zoo Code, incorporating their final sunset changes while preserving all Zoo-specific features.

What was merged from upstream

  • Remove MDM and organization membership enforcement
  • Remove Roo Code Cloud and evals infrastructure
  • Remove corporate extension support links
  • Remove contributor and community references
  • Welcome flow defaults new users to OpenRouter (improved onboarding UX)

What Zoo kept (intentionally diverged from upstream)

  • Telemetry — Zoo's PostHog setup across extension, webview components (ErrorBoundary, UISettings, DismissibleUpsell, ModeSelector), and TelemetryBanner
  • Cloud/Auth — Zoo Code auth flow and cloud package
  • Marketplace — Zoo's local-files-based marketplace, including buttons in MCP view, Modes view, Mode selector, and Skills settings
  • Branding — Zoo Code naming, links, community docs, and announcement content
  • Community — Contact & Community section in About, Discord/Reddit links, contributor attributions in CHANGELOG

What was removed

  • Roo providersrc/api/providers/roo.ts and all references (dead code)
  • Evalsapps/web-evals/, packages/evals/
  • MDM servicesrc/services/mdm/
  • Docs appapps/docs/ (Zoo has a separate docs repo)
  • Website appapps/web-roo-code/ (Zoo has a separate website repo)
  • Website workflowswebsite-deploy.yml, website-preview.yml, evals.yml

Dependency fixes

  • Pinned @copilotkit/aimock to 1.15.1 — v1.24.1 introduced a breaking change to toolCallId fixture matching
  • Fixed @google/genai ThinkingLevel enum change (uppercase values)
  • Fixed ink Key type requiring new super field

Follow-up items

  • CLI binary name still says "roo" → rename to "zoo"
  • src/core/config/routerRemoval.ts still has legacy roo constant (imported by 4 files)
  • Clean up dead cloud package files if Zoo isn't actively using them
  • Upgrade @copilotkit/aimock to latest with proper fixture migration

Test plan

  • pnpm run build — all packages pass
  • pnpm run test — all packages pass (8,000+ tests)
  • check-types — all packages pass
  • Lint — all packages pass
  • CI: compile, knip, check-translations, platform-unit-test (ubuntu + windows), e2e-mock — all pass

🤖 Generated with Claude Code

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 15, 2026

Important

Review skipped

Too many files!

This PR contains 234 files, which is 84 over the limit of 150.

To get a review, narrow the scope:
• coderabbit review --type committed # exclude uncommitted changes
• coderabbit review --dir # limit to a subdirectory
• coderabbit review --base # compare against a closer base

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro Plus

Run ID: a63fb099-3211-4481-8547-ced7ec846266

📥 Commits

Reviewing files that changed from the base of the PR and between 3bd1a80 and 20df6a2.

⛔ Files ignored due to path filters (66)
  • apps/web-evals/src/app/favicon.ico is excluded by !**/*.ico
  • apps/web-roo-code/public/Roo-Code-Logo-Horiz-blk.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/Roo-Code-Logo-Horiz-white.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/RooCode-Badge-blk.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/RooCode-Badge-white.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/android-chrome-192x192.png is excluded by !**/*.png
  • apps/web-roo-code/public/android-chrome-512x512.png is excluded by !**/*.png
  • apps/web-roo-code/public/apple-touch-icon.png is excluded by !**/*.png
  • apps/web-roo-code/public/favicon-16x16.png is excluded by !**/*.png
  • apps/web-roo-code/public/favicon-32x32.png is excluded by !**/*.png
  • apps/web-roo-code/public/favicon.ico is excluded by !**/*.ico
  • apps/web-roo-code/public/heroes/agent-pr-fixer.png is excluded by !**/*.png
  • apps/web-roo-code/public/heroes/agent-reviewer.png is excluded by !**/*.png
  • apps/web-roo-code/public/heroes/cloud-screen.png is excluded by !**/*.png
  • apps/web-roo-code/public/illustrations/form-factor-cloud.png is excluded by !**/*.png
  • apps/web-roo-code/public/illustrations/form-factor-extension.png is excluded by !**/*.png
  • apps/web-roo-code/public/illustrations/user-faces/1.jpg is excluded by !**/*.jpg
  • apps/web-roo-code/public/illustrations/user-faces/10.jpg is excluded by !**/*.jpg
  • apps/web-roo-code/public/illustrations/user-faces/11.jpg is excluded by !**/*.jpg
  • apps/web-roo-code/public/illustrations/user-faces/12.jpg is excluded by !**/*.jpg
  • apps/web-roo-code/public/illustrations/user-faces/13.jpg is excluded by !**/*.jpg
  • apps/web-roo-code/public/illustrations/user-faces/14.jpg is excluded by !**/*.jpg
  • apps/web-roo-code/public/illustrations/user-faces/15.jpg is excluded by !**/*.jpg
  • apps/web-roo-code/public/illustrations/user-faces/16.jpg is excluded by !**/*.jpg
  • apps/web-roo-code/public/illustrations/user-faces/17.jpg is excluded by !**/*.jpg
  • apps/web-roo-code/public/illustrations/user-faces/18.jpg is excluded by !**/*.jpg
  • apps/web-roo-code/public/illustrations/user-faces/19.jpg is excluded by !**/*.jpg
  • apps/web-roo-code/public/illustrations/user-faces/2.jpg is excluded by !**/*.jpg
  • apps/web-roo-code/public/illustrations/user-faces/20.jpg is excluded by !**/*.jpg
  • apps/web-roo-code/public/illustrations/user-faces/21.jpg is excluded by !**/*.jpg
  • apps/web-roo-code/public/illustrations/user-faces/22.jpg is excluded by !**/*.jpg
  • apps/web-roo-code/public/illustrations/user-faces/23.jpg is excluded by !**/*.jpg
  • apps/web-roo-code/public/illustrations/user-faces/24.jpg is excluded by !**/*.jpg
  • apps/web-roo-code/public/illustrations/user-faces/3.jpg is excluded by !**/*.jpg
  • apps/web-roo-code/public/illustrations/user-faces/4.jpg is excluded by !**/*.jpg
  • apps/web-roo-code/public/illustrations/user-faces/5.jpg is excluded by !**/*.jpg
  • apps/web-roo-code/public/illustrations/user-faces/6.jpg is excluded by !**/*.jpg
  • apps/web-roo-code/public/illustrations/user-faces/7.jpg is excluded by !**/*.jpg
  • apps/web-roo-code/public/illustrations/user-faces/8.jpg is excluded by !**/*.jpg
  • apps/web-roo-code/public/illustrations/user-faces/9.jpg is excluded by !**/*.jpg
  • apps/web-roo-code/public/logos/amazon.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/logos/anthropic.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/logos/apple.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/logos/bedrock.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/logos/bytedance.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/logos/carvana.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/logos/deepseek.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/logos/gemini.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/logos/grok.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/logos/kimi.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/logos/microsoft.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/logos/mistral.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/logos/moonshot.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/logos/netflix.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/logos/ollama.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/logos/openai.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/logos/openrouter.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/logos/qwen.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/logos/rakuten.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/logos/red-hat.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/logos/roomote-logo.png is excluded by !**/*.png
  • apps/web-roo-code/public/og/base_a.png is excluded by !**/*.png
  • apps/web-roo-code/public/og/base_b.png is excluded by !**/*.png
  • apps/web-roo-code/public/opengraph.png is excluded by !**/*.png
  • apps/web-roo-code/public/placeholder.svg is excluded by !**/*.svg
  • apps/web-roo-code/public/placeholder_pfp.png is excluded by !**/*.png
📒 Files selected for processing (234)
  • .github/ISSUE_TEMPLATE/feature_request.yml
  • .github/workflows/evals.yml
  • .github/workflows/update-contributors.yml
  • .github/workflows/website-deploy.yml
  • .github/workflows/website-preview.yml
  • apps/cli/scripts/integration/cases/create-with-session-id-resume-loads-correct-session.ts
  • apps/cli/scripts/integration/lib/stream-harness.ts
  • apps/cli/src/commands/cli/__tests__/list.test.ts
  • apps/cli/src/commands/cli/__tests__/run-provider-resolution.test.ts
  • apps/cli/src/commands/cli/list.ts
  • apps/cli/src/commands/cli/run.ts
  • apps/cli/src/commands/index.ts
  • apps/cli/src/index.ts
  • apps/cli/src/lib/storage/__tests__/settings.test.ts
  • apps/cli/src/lib/storage/index.ts
  • apps/cli/src/lib/storage/settings.ts
  • apps/cli/src/lib/utils/__tests__/input.test.ts
  • apps/cli/src/types/__tests__/types.test.ts
  • apps/cli/src/types/constants.ts
  • apps/cli/src/types/types.ts
  • apps/vscode-e2e/package.json
  • apps/vscode-e2e/src/runTest.ts
  • apps/vscode-e2e/src/suite/anthropic-opus-4-7.test.ts
  • apps/vscode-e2e/src/types/global.d.ts
  • apps/web-evals/.env
  • apps/web-evals/.gitignore
  • apps/web-evals/CHANGELOG.md
  • apps/web-evals/components.json
  • apps/web-evals/eslint.config.mjs
  • apps/web-evals/next-env.d.ts
  • apps/web-evals/next.config.ts
  • apps/web-evals/package.json
  • apps/web-evals/postcss.config.mjs
  • apps/web-evals/public/.gitkeep
  • apps/web-evals/scripts/check-services.sh
  • apps/web-evals/src/actions/__tests__/killRun.spec.ts
  • apps/web-evals/src/actions/exercises.ts
  • apps/web-evals/src/actions/heartbeat.ts
  • apps/web-evals/src/actions/runners.ts
  • apps/web-evals/src/actions/runs.ts
  • apps/web-evals/src/actions/tasks.ts
  • apps/web-evals/src/app/api/runs/[id]/logs/[taskId]/route.ts
  • apps/web-evals/src/app/api/runs/[id]/logs/failed/route.ts
  • apps/web-evals/src/app/api/runs/[id]/stream/route.ts
  • apps/web-evals/src/app/globals.css
  • apps/web-evals/src/app/layout.tsx
  • apps/web-evals/src/app/page.tsx
  • apps/web-evals/src/app/runs/[id]/page.tsx
  • apps/web-evals/src/app/runs/[id]/run-status.tsx
  • apps/web-evals/src/app/runs/[id]/run.tsx
  • apps/web-evals/src/app/runs/[id]/task-status.tsx
  • apps/web-evals/src/app/runs/new/new-run.tsx
  • apps/web-evals/src/app/runs/new/page.tsx
  • apps/web-evals/src/app/runs/new/settings-diff.tsx
  • apps/web-evals/src/components/home/run.tsx
  • apps/web-evals/src/components/home/runs.tsx
  • apps/web-evals/src/components/layout/header.tsx
  • apps/web-evals/src/components/layout/logo.tsx
  • apps/web-evals/src/components/providers/index.ts
  • apps/web-evals/src/components/providers/react-query-provider.tsx
  • apps/web-evals/src/components/providers/theme-provider.tsx
  • apps/web-evals/src/components/ui/alert-dialog.tsx
  • apps/web-evals/src/components/ui/badge.tsx
  • apps/web-evals/src/components/ui/button.tsx
  • apps/web-evals/src/components/ui/checkbox.tsx
  • apps/web-evals/src/components/ui/command.tsx
  • apps/web-evals/src/components/ui/dialog.tsx
  • apps/web-evals/src/components/ui/drawer.tsx
  • apps/web-evals/src/components/ui/dropdown-menu.tsx
  • apps/web-evals/src/components/ui/form.tsx
  • apps/web-evals/src/components/ui/index.ts
  • apps/web-evals/src/components/ui/input.tsx
  • apps/web-evals/src/components/ui/label.tsx
  • apps/web-evals/src/components/ui/multi-select.tsx
  • apps/web-evals/src/components/ui/popover.tsx
  • apps/web-evals/src/components/ui/scroll-area.tsx
  • apps/web-evals/src/components/ui/select.tsx
  • apps/web-evals/src/components/ui/separator.tsx
  • apps/web-evals/src/components/ui/slider.tsx
  • apps/web-evals/src/components/ui/sonner.tsx
  • apps/web-evals/src/components/ui/table.tsx
  • apps/web-evals/src/components/ui/tabs.tsx
  • apps/web-evals/src/components/ui/textarea.tsx
  • apps/web-evals/src/components/ui/tooltip.tsx
  • apps/web-evals/src/hooks/use-copy-run.ts
  • apps/web-evals/src/hooks/use-event-source.ts
  • apps/web-evals/src/hooks/use-fuzzy-model-search.ts
  • apps/web-evals/src/hooks/use-open-router-models.ts
  • apps/web-evals/src/hooks/use-run-status.ts
  • apps/web-evals/src/lib/__tests__/formatters.spec.ts
  • apps/web-evals/src/lib/__tests__/normalize-create-run.spec.ts
  • apps/web-evals/src/lib/actions.ts
  • apps/web-evals/src/lib/formatters.ts
  • apps/web-evals/src/lib/normalize-create-run.ts
  • apps/web-evals/src/lib/schemas.ts
  • apps/web-evals/src/lib/server/__tests__/sse-stream.spec.ts
  • apps/web-evals/src/lib/server/redis.ts
  • apps/web-evals/src/lib/server/sse-stream.ts
  • apps/web-evals/src/lib/utils.ts
  • apps/web-evals/tsconfig.json
  • apps/web-evals/turbo.json
  • apps/web-evals/vitest.config.ts
  • apps/web-roo-code/.env.example
  • apps/web-roo-code/.gitignore
  • apps/web-roo-code/.npmrc
  • apps/web-roo-code/CHANGELOG.md
  • apps/web-roo-code/components.json
  • apps/web-roo-code/eslint.config.mjs
  • apps/web-roo-code/next-sitemap.config.cjs
  • apps/web-roo-code/next.config.ts
  • apps/web-roo-code/package.json
  • apps/web-roo-code/postcss.config.cjs
  • apps/web-roo-code/src/actions/evals.ts
  • apps/web-roo-code/src/app/api/og/route.tsx
  • apps/web-roo-code/src/app/blog/[slug]/page.tsx
  • apps/web-roo-code/src/app/blog/page.tsx
  • apps/web-roo-code/src/app/blog/page/[page]/page.tsx
  • apps/web-roo-code/src/app/cloud/page.tsx
  • apps/web-roo-code/src/app/cloud/team/page.tsx
  • apps/web-roo-code/src/app/enterprise/page.tsx
  • apps/web-roo-code/src/app/evals/evals.tsx
  • apps/web-roo-code/src/app/evals/page.tsx
  • apps/web-roo-code/src/app/evals/plot.tsx
  • apps/web-roo-code/src/app/evals/types.ts
  • apps/web-roo-code/src/app/extension/page.tsx
  • apps/web-roo-code/src/app/globals.css
  • apps/web-roo-code/src/app/layout.tsx
  • apps/web-roo-code/src/app/legal/cookies/page.tsx
  • apps/web-roo-code/src/app/legal/subprocessors/page.tsx
  • apps/web-roo-code/src/app/linear/page.tsx
  • apps/web-roo-code/src/app/page.tsx
  • apps/web-roo-code/src/app/pr-fixer/content-a.tsx
  • apps/web-roo-code/src/app/pr-fixer/page.tsx
  • apps/web-roo-code/src/app/pricing/page.tsx
  • apps/web-roo-code/src/app/privacy/page.tsx
  • apps/web-roo-code/src/app/provider/page.tsx
  • apps/web-roo-code/src/app/provider/pricing/components/model-card.tsx
  • apps/web-roo-code/src/app/reviewer/content-b.ts
  • apps/web-roo-code/src/app/reviewer/content.ts
  • apps/web-roo-code/src/app/reviewer/page.tsx
  • apps/web-roo-code/src/app/robots.ts
  • apps/web-roo-code/src/app/shared/AgentLandingContent.tsx
  • apps/web-roo-code/src/app/shared/agent-page-content.ts
  • apps/web-roo-code/src/app/shared/getContentVariant.ts
  • apps/web-roo-code/src/app/shell.tsx
  • apps/web-roo-code/src/app/slack/page.tsx
  • apps/web-roo-code/src/app/terms/page.tsx
  • apps/web-roo-code/src/app/terms/terms.md
  • apps/web-roo-code/src/components/CookieConsentWrapper.tsx
  • apps/web-roo-code/src/components/RoomoteAnnouncementBanner.tsx
  • apps/web-roo-code/src/components/animated-text.tsx
  • apps/web-roo-code/src/components/blog/BlogAnalytics.tsx
  • apps/web-roo-code/src/components/blog/BlogContent.tsx
  • apps/web-roo-code/src/components/blog/BlogFAQ.tsx
  • apps/web-roo-code/src/components/blog/BlogPagination.tsx
  • apps/web-roo-code/src/components/blog/BlogPostList.tsx
  • apps/web-roo-code/src/components/blog/BlogViewToggle.tsx
  • apps/web-roo-code/src/components/blog/YouTubeModal.test.ts
  • apps/web-roo-code/src/components/blog/YouTubeModal.tsx
  • apps/web-roo-code/src/components/chromes/footer.tsx
  • apps/web-roo-code/src/components/chromes/index.ts
  • apps/web-roo-code/src/components/chromes/nav-bar.tsx
  • apps/web-roo-code/src/components/chromes/stats-display.tsx
  • apps/web-roo-code/src/components/chromes/theme-toggle.tsx
  • apps/web-roo-code/src/components/enterprise/contact-form.tsx
  • apps/web-roo-code/src/components/homepage/animated-background.tsx
  • apps/web-roo-code/src/components/homepage/cloud-section.tsx
  • apps/web-roo-code/src/components/homepage/code-example.tsx
  • apps/web-roo-code/src/components/homepage/company-logos.tsx
  • apps/web-roo-code/src/components/homepage/cta-section.tsx
  • apps/web-roo-code/src/components/homepage/ecosystem-section.tsx
  • apps/web-roo-code/src/components/homepage/faq-section.tsx
  • apps/web-roo-code/src/components/homepage/features.tsx
  • apps/web-roo-code/src/components/homepage/index.ts
  • apps/web-roo-code/src/components/homepage/install-section.tsx
  • apps/web-roo-code/src/components/homepage/option-overview-section.tsx
  • apps/web-roo-code/src/components/homepage/pillars-section.tsx
  • apps/web-roo-code/src/components/homepage/testimonials.tsx
  • apps/web-roo-code/src/components/homepage/use-examples-section.tsx
  • apps/web-roo-code/src/components/homepage/whats-new-button.tsx
  • apps/web-roo-code/src/components/linear/linear-issue-demo.tsx
  • apps/web-roo-code/src/components/providers/google-tag-manager-provider.tsx
  • apps/web-roo-code/src/components/providers/hubspot-provider.tsx
  • apps/web-roo-code/src/components/providers/index.ts
  • apps/web-roo-code/src/components/providers/posthog-provider.tsx
  • apps/web-roo-code/src/components/providers/providers.tsx
  • apps/web-roo-code/src/components/slack/slack-thread-demo.tsx
  • apps/web-roo-code/src/components/structured-data.tsx
  • apps/web-roo-code/src/components/ui/button.tsx
  • apps/web-roo-code/src/components/ui/chart.tsx
  • apps/web-roo-code/src/components/ui/index.ts
  • apps/web-roo-code/src/components/ui/link.tsx
  • apps/web-roo-code/src/components/ui/modal.tsx
  • apps/web-roo-code/src/components/ui/navigation-menu.tsx
  • apps/web-roo-code/src/components/ui/scroll-button.tsx
  • apps/web-roo-code/src/components/ui/table.tsx
  • apps/web-roo-code/src/content/blog/ai-best-practices-spread-through-internal-influencers-not-topdown-mandates.md
  • apps/web-roo-code/src/content/blog/manage-ai-spend-by-measuring-return-not-cost.md
  • apps/web-roo-code/src/content/blog/non-engineers-stopped-waiting-for-engineers-to-unblock-them.md
  • apps/web-roo-code/src/content/blog/over-half-of-googles-production-code-is-now-aigenerated.md
  • apps/web-roo-code/src/content/blog/prds-are-becoming-artifacts-of-the-past.md
  • apps/web-roo-code/src/content/blog/score-agents-like-employees-not-like-models.md
  • apps/web-roo-code/src/content/blog/sunsetting-roo-code-extension-cloud-and-router.md
  • apps/web-roo-code/src/images.d.ts
  • apps/web-roo-code/src/lib/analytics/consent-manager.ts
  • apps/web-roo-code/src/lib/blog/analytics.ts
  • apps/web-roo-code/src/lib/blog/content.ts
  • apps/web-roo-code/src/lib/blog/curated.ts
  • apps/web-roo-code/src/lib/blog/index.ts
  • apps/web-roo-code/src/lib/blog/time.ts
  • apps/web-roo-code/src/lib/blog/types.ts
  • apps/web-roo-code/src/lib/blog/validation.ts
  • apps/web-roo-code/src/lib/constants.ts
  • apps/web-roo-code/src/lib/format-currency.ts
  • apps/web-roo-code/src/lib/format-duration.ts
  • apps/web-roo-code/src/lib/format-score.ts
  • apps/web-roo-code/src/lib/format-tokens.ts
  • apps/web-roo-code/src/lib/formatters.ts
  • apps/web-roo-code/src/lib/hooks/index.ts
  • apps/web-roo-code/src/lib/hooks/use-logo-src.ts
  • apps/web-roo-code/src/lib/hooks/use-open-router-models.ts
  • apps/web-roo-code/src/lib/index.ts
  • apps/web-roo-code/src/lib/og.ts
  • apps/web-roo-code/src/lib/seo.ts
  • apps/web-roo-code/src/lib/stats.ts
  • apps/web-roo-code/src/lib/structured-data.ts
  • apps/web-roo-code/src/lib/types/models.ts
  • apps/web-roo-code/src/lib/utils.ts
  • apps/web-roo-code/tailwind.config.ts
  • apps/web-roo-code/tsconfig.json
  • apps/web-roo-code/turbo.json
  • apps/web-roo-code/vitest.config.ts
  • knip.json
  • package.json

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-v2

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

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

@edelauna edelauna changed the title Merge upstream/main (Roo Code sunset) into Zoo Code chore: merge Roo Code upstream sunset into Zoo Code May 15, 2026
@edelauna edelauna force-pushed the chore/merge-roo-upstream-v2 branch 2 times, most recently from 5203f8b to e33c272 Compare May 15, 2026 17:02
@codecov
Copy link
Copy Markdown

codecov Bot commented May 15, 2026

@edelauna edelauna force-pushed the chore/merge-roo-upstream-v2 branch 10 times, most recently from 5179fa3 to 0c433af Compare May 17, 2026 12:58
@edelauna edelauna marked this pull request as ready for review May 17, 2026 12:58
@@ -151,6 +149,7 @@ export const retiredProviderNames = [
"groq",
"huggingface",
"io-intelligence",
"roo",
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is needed so that we can display a message about the provider is no longer supported

@@ -4,7 +4,6 @@ import { RooCodeEventName } from "./events.js"
import type { RooCodeSettings } from "./global-settings.js"
import type { ClineMessage, QueuedMessage, TokenUsage } from "./message.js"
import type { ToolUsage, ToolName } from "./tool.js"
import type { StaticAppProperties, GitProperties, TelemetryProperties } from "./telemetry.js"
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

doesn't affect Zoo, telemetry goes through TelemtryPropertiesProvider

@edelauna edelauna force-pushed the chore/merge-roo-upstream-v2 branch from 0c433af to 25e637f Compare May 17, 2026 23:17
Comment thread webview-ui/src/components/welcome/WelcomeViewProvider.tsx Outdated
Comment thread webview-ui/src/components/settings/__tests__/About.spec.tsx Outdated
Comment thread webview-ui/src/components/chat/__tests__/Announcement.spec.tsx Outdated
@edelauna edelauna force-pushed the chore/merge-roo-upstream-v2 branch from 25e637f to 6bc5388 Compare May 20, 2026 01:49
Copy link
Copy Markdown
Contributor Author

@edelauna edelauna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re-reviewed

navedmerchant
navedmerchant previously approved these changes May 20, 2026
Copy link
Copy Markdown
Contributor

@navedmerchant navedmerchant left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

@edelauna edelauna added this pull request to the merge queue May 21, 2026
Merged via the queue into main with commit 166bc3f May 21, 2026
9 of 10 checks passed
@edelauna edelauna deleted the chore/merge-roo-upstream-v2 branch May 21, 2026 14:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants