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

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -64,7 +64,7 @@ body:
     attributes:
       value: |
         ---
-        Optional (for contributors): You can stop here if you're just proposing the improvement.
+        Optional: You can stop here if you're just proposing the improvement.
 
   - type: textarea
     id: acceptance-criteria

CHANGELOG.md

@@ -1292,7 +1292,6 @@ The entries below are preserved from the upstream Roo Code project history befor
 - Reposition Add Image button inside ChatTextArea (thanks @roomote!)
 - Bring back a way to temporarily and globally pause auto-approve without losing your toggle state (thanks @brunobergher!)
 - Makes text area buttons appear only when there's text (thanks @brunobergher!)
-- CONTRIBUTING.md tweaks and issue template rewrite (thanks @hannesrudolph!)
 - Bump axios from 1.9.0 to 1.12.0 (thanks @dependabot!)
 
 ## [3.28.2] - 2025-09-14
@@ -1752,7 +1751,6 @@ The entries below are preserved from the upstream Roo Code project history befor
 - Fix Claude model detection by name for API protocol selection (thanks @daniel-lxs!)
 - Move marketplace icon from overflow menu to top navigation
 - Optional setting to prevent completion with open todos
-- Added YouTube to website footer (thanks @thill2323!)
 
 ## [3.23.14] - 2025-07-17
 
@@ -2146,7 +2144,6 @@ The entries below are preserved from the upstream Roo Code project history befor
 - Fix bug with context condensing in Amazon Bedrock
 - Fix UTF-8 encoding in ExecaTerminalProcess (thanks @mr-ryan-james!)
 - Set sidebar name bugfix (thanks @chrarnoldus!)
-- Fix link to CONTRIBUTING.md in feature request template (thanks @cannuri!)
 - Add task metadata to Unbound and improve caching logic (thanks @pugazhendhi-m!)
 
 ## [3.19.0] - 2025-05-29
@@ -3114,7 +3111,6 @@ The entries below are preserved from the upstream Roo Code project history befor
 - Ask and Architect modes can now edit markdown files
 - Custom modes can now be restricted to specific file patterns (for example, a technical writer who can only edit markdown files 👋)
 - Support for configuring the Bedrock provider with AWS Profiles
-- New Roo Code community Discord at https://roocode.com/discord!
 
 ## [3.2.8]
 
@@ -3154,8 +3150,6 @@ The entries below are preserved from the upstream Roo Code project history befor
     - Create specialized assistants for any workflow
     - Just type "Create a new mode for <X>" or visit the Prompts tab in the top menu to get started
 
-Join us at https://www.reddit.com/r/RooCode to share your custom modes and be part of our next chapter!
-
 ## [3.1.7]
 
 - DeepSeek-R1 support (thanks @philipnext!)
@@ -3203,12 +3197,8 @@ Join us at https://www.reddit.com/r/RooCode to share your custom modes and be pa
 
 ## [3.0.1]
 
-- Fix the reddit link and a small visual glitch in the chat input
-
 ## [3.0.0]
 
-- This release adds chat modes! Now you can ask Roo Code questions about system architecture or the codebase without immediately jumping into writing code. You can even assign different API configuration profiles to each mode if you prefer to use different models for thinking vs coding. Would love feedback in the new Roo Code Reddit! https://www.reddit.com/r/RooCode
-
 ## [2.2.46]
 
 - Only parse @-mentions in user input (not in files)

apps/cli/package.json

@@ -16,9 +16,9 @@
 		"test:coverage": "vitest run --coverage",
 		"test:integration": "tsx scripts/integration/run.ts",
 		"build": "tsup",
-		"build:extension": "pnpm --filter ./src bundle",
-		"dev": "ROO_AUTH_BASE_URL=https://app.roocode.com ROO_SDK_BASE_URL=https://cloud-api.roocode.com ROO_CODE_PROVIDER_URL=https://api.roocode.com/proxy tsx src/index.ts",
-		"dev:local": "ROO_AUTH_BASE_URL=http://localhost:3000 ROO_SDK_BASE_URL=http://localhost:3001 ROO_CODE_PROVIDER_URL=http://localhost:8080/proxy tsx src/index.ts",
+		"build:extension": "pnpm --filter zoo-code bundle",
+		"dev": "tsx src/index.ts",
+		"dev:local": "tsx src/index.ts",
 		"clean": "rimraf dist .turbo"
 	},
 	"dependencies": {

apps/cli/scripts/integration/cases/create-with-session-id-resume-loads-correct-session.ts

@@ -88,7 +88,7 @@ async function createSessionWithCustomId(
 			"dev",
 			"--print",
 			"--provider",
-			"roo",
+			"openrouter",
 			"--output-format",
 			"stream-json",
 			"--workspace",
@@ -148,7 +148,7 @@ async function resumeSessionAndSendMarker(
 			"--print",
 			"--stdin-prompt-stream",
 			"--provider",
-			"roo",
+			"openrouter",
 			"--output-format",
 			"stream-json",
 			"--workspace",

apps/cli/scripts/integration/lib/stream-harness.ts

@@ -69,7 +69,7 @@ export async function runStreamCase(options: RunStreamCaseOptions): Promise<void
 
 	const child = execa(
 		"pnpm",
-		["dev", "--print", "--stdin-prompt-stream", "--provider", "roo", "--output-format", "stream-json"],
+		["dev", "--print", "--stdin-prompt-stream", "--provider", "openrouter", "--output-format", "stream-json"],
 		{
 			cwd: cliRoot,
 			stdin: "pipe",