fix(qdrant): resolve URL port handling bug for HTTPS URLs (RooCodeInc#4992)

Co-authored-by: Ben Ashby <[email protected]>

Author: 2 people

.roo/rules-code/use-safeWriteJson.md

@@ -0,0 +1,6 @@
+# JSON File Writing Must Be Atomic
+
+- You MUST use `safeWriteJson(filePath: string, data: any): Promise<void>` from `src/utils/safeWriteJson.ts` instead of `JSON.stringify` with file-write operations
+- `safeWriteJson` will create parent directories if necessary, so do not call `mkdir` prior to `safeWriteJson`
+- `safeWriteJson` prevents data corruption via atomic writes with locking and streams the write to minimize memory footprint
+- Test files are exempt from this rule

.roo/rules-pr-reviewer/1_workflow.xml

@@ -100,7 +100,7 @@
       </arguments>
       </use_mcp_tool>
 
-      Examine existing PR comments to understand the current state of discussion. Always verify whether a comment is current or already addressed before suggesting action.
+      Examine existing PR comments to understand the current state of discussion. When reading the comments and reviews, you must verify which are resolved by reading the files they refer to, since they might already be resolved. This prevents you from making redundant suggestions.
     </instructions>
   </step>
 

.roo/rules-pr-reviewer/2_best_practices.xml

@@ -2,7 +2,7 @@
   - Always fetch and review the entire PR diff before commenting
   - Check for and review any associated issue for context
   - Check out the PR locally for better context understanding
-  - Review existing comments to avoid duplicate feedback
+  - Review existing comments and verify against the current code to avoid redundant feedback on already resolved issues
   - Focus on the changes made, not unrelated code
   - Ensure all changes are directly related to the linked issue
   - Use a friendly, curious tone in all comments

.roo/rules-pr-reviewer/3_common_mistakes_to_avoid.xml

@@ -7,7 +7,7 @@
   - Using markdown headings (###, ##, #) in review comments
   - Using excessive markdown formatting when plain text would suffice
   - Submitting comments without user preview/approval
-  - Ignoring existing PR comments and discussions
+  - Ignoring existing PR comments or failing to verify if they have already been resolved by checking the code
   - Forgetting to check for an associated issue for additional context
   - Missing critical security or performance issues
   - Not checking for proper i18n in UI changes

.roo/rules-translate/001-general-rules.md

@@ -64,8 +64,10 @@
     1. Identify where the string appears in the UI/codebase
     2. Understand the context and purpose of the string
     3. Update English translation first
-    4. Create appropriate translations for all other supported languages
-    5. Validate your changes with the missing translations script
+    4. Use the `<search_files>` tool to find JSON keys that are near new keys in English translations but do not yet exist in the other language files for `<apply_diff>` SEARCH context
+    5. Create appropriate translations for all other supported languages utilizing the `search_files` result using `<apply_diff>` without reading every file.
+    6. Do not output the translated text into the chat, just modify the files.
+    7. Validate your changes with the missing translations script
 - Flag or comment if an English source string is incomplete ("please see this...") to avoid truncated or unclear translations
 - For UI elements, distinguish between:
     - Button labels: Use short imperative commands ("Save", "Cancel")

CHANGELOG.md

@@ -1,5 +1,35 @@
 # CHANGELOG
 
+## [3.22.1] - 2025-06-26
+
+- Add Gemini CLI provider (thanks Cline!)
+- Fix undefined mcp command (thanks @qdaxb!)
+- Use upstream_inference_cost for OpenRouter BYOK cost calculation and show cached token count (thanks @chrarnoldus!)
+- Update maxTokens value for qwen/qwen3-32b model on Groq (thanks @KanTakahiro!)
+- Standardize tooltip delays to 300ms
+
+## [3.22.0] - 2025-06-25
+
+- Add 1-click task sharing
+- Add support for loading rules from a global .roo directory (thanks @samhvw8!)
+- Modes selector improvements (thanks @brunobergher!)
+- Use safeWriteJson for all JSON file writes to avoid task history corruption (thanks @KJ7LNW!)
+- Improve YAML error handling when editing modes
+- Register importSettings as VSCode command (thanks @shivamd1810!)
+- Add default task names for empty tasks (thanks @daniel-lxs!)
+- Improve translation workflow to avoid unnecessary file reads (thanks @KJ7LNW!)
+- Allow write_to_file to handle newline-only and empty content (thanks @Githubguy132010!)
+- Address multiple memory leaks in CodeBlock component (thanks @kiwina!)
+- Memory cleanup (thanks @xyOz-dev!)
+- Fix port handling bug in code indexing for HTTPS URLs (thanks @benashby!)
+- Improve Bedrock error handling for throttling and streaming contexts
+- Handle long Claude code messages (thanks @daniel-lxs!)
+- Fixes to Claude Code caching and image upload
+- Disable reasoning budget UI controls for Claude Code provider
+- Remove temperature parameter for Azure OpenAI reasoning models (thanks @ExactDoug!)
+- Allowed commands import/export (thanks @catrielmuller!)
+- Add VS Code setting to disable quick fix context actions (thanks @OlegOAndreev!)
+
 ## [3.21.5] - 2025-06-23
 
 - Fix Qdrant URL prefix handling for QdrantClient initialization (thanks @CW-B-W!)

packages/telemetry/src/BaseTelemetryClient.ts

@@ -25,13 +25,21 @@ export abstract class BaseTelemetryClient implements TelemetryClient {
 			: !this.subscription.events.includes(eventName)
 	}
 
+	/**
+	 * Determines if a specific property should be included in telemetry events
+	 * Override in subclasses to filter specific properties
+	 */
+	protected isPropertyCapturable(_propertyName: string): boolean {
+		return true
+	}
+
 	protected async getEventProperties(event: TelemetryEvent): Promise<TelemetryEvent["properties"]> {
 		let providerProperties: TelemetryEvent["properties"] = {}
 		const provider = this.providerRef?.deref()
 
 		if (provider) {
 			try {
-				// Get the telemetry properties directly from the provider.
+				// Get properties from the provider
 				providerProperties = await provider.getTelemetryProperties()
 			} catch (error) {
 				// Log error but continue with capturing the event.
@@ -43,7 +51,10 @@ export abstract class BaseTelemetryClient implements TelemetryClient {
 
 		// Merge provider properties with event-specific properties.
 		// Event properties take precedence in case of conflicts.
-		return { ...providerProperties, ...(event.properties || {}) }
+		const mergedProperties = { ...providerProperties, ...(event.properties || {}) }
+
+		// Filter out properties that shouldn't be captured by this client
+		return Object.fromEntries(Object.entries(mergedProperties).filter(([key]) => this.isPropertyCapturable(key)))
 	}
 
 	public abstract capture(event: TelemetryEvent): Promise<void>

packages/telemetry/src/PostHogTelemetryClient.ts

@@ -13,6 +13,8 @@ import { BaseTelemetryClient } from "./BaseTelemetryClient"
 export class PostHogTelemetryClient extends BaseTelemetryClient {
 	private client: PostHog
 	private distinctId: string = vscode.env.machineId
+	// Git repository properties that should be filtered out
+	private readonly gitPropertyNames = ["repositoryUrl", "repositoryName", "defaultBranch"]
 
 	constructor(debug = false) {
 		super(
@@ -26,6 +28,19 @@ export class PostHogTelemetryClient extends BaseTelemetryClient {
 		this.client = new PostHog(process.env.POSTHOG_API_KEY || "", { host: "https://us.i.posthog.com" })
 	}
 
+	/**
+	 * Filter out git repository properties for PostHog telemetry
+	 * @param propertyName The property name to check
+	 * @returns Whether the property should be included in telemetry events
+	 */
+	protected override isPropertyCapturable(propertyName: string): boolean {
+		// Filter out git repository properties
+		if (this.gitPropertyNames.includes(propertyName)) {
+			return false
+		}
+		return true
+	}
+
 	public override async capture(event: TelemetryEvent): Promise<void> {
 		if (!this.isTelemetryEnabled() || !this.isEventCapturable(event.event)) {
 			if (this.debug) {

packages/telemetry/src/__tests__/PostHogTelemetryClient.test.ts

@@ -70,6 +70,29 @@ describe("PostHogTelemetryClient", () => {
 		})
 	})
 
+	describe("isPropertyCapturable", () => {
+		it("should filter out git repository properties", () => {
+			const client = new PostHogTelemetryClient()
+
+			const isPropertyCapturable = getPrivateProperty<(propertyName: string) => boolean>(
+				client,
+				"isPropertyCapturable",
+			).bind(client)
+
+			// Git properties should be filtered out
+			expect(isPropertyCapturable("repositoryUrl")).toBe(false)
+			expect(isPropertyCapturable("repositoryName")).toBe(false)
+			expect(isPropertyCapturable("defaultBranch")).toBe(false)
+
+			// Other properties should be included
+			expect(isPropertyCapturable("appVersion")).toBe(true)
+			expect(isPropertyCapturable("vscodeVersion")).toBe(true)
+			expect(isPropertyCapturable("platform")).toBe(true)
+			expect(isPropertyCapturable("mode")).toBe(true)
+			expect(isPropertyCapturable("customProperty")).toBe(true)
+		})
+	})
+
 	describe("getEventProperties", () => {
 		it("should merge provider properties with event properties", async () => {
 			const client = new PostHogTelemetryClient()
@@ -112,6 +135,54 @@ describe("PostHogTelemetryClient", () => {
 			expect(mockProvider.getTelemetryProperties).toHaveBeenCalledTimes(1)
 		})
 
+		it("should filter out git repository properties", async () => {
+			const client = new PostHogTelemetryClient()
+
+			const mockProvider: TelemetryPropertiesProvider = {
+				getTelemetryProperties: vi.fn().mockResolvedValue({
+					appVersion: "1.0.0",
+					vscodeVersion: "1.60.0",
+					platform: "darwin",
+					editorName: "vscode",
+					language: "en",
+					mode: "code",
+					// Git properties that should be filtered out
+					repositoryUrl: "https://github.com/example/repo",
+					repositoryName: "example/repo",
+					defaultBranch: "main",
+				}),
+			}
+
+			client.setProvider(mockProvider)
+
+			const getEventProperties = getPrivateProperty<
+				(event: { event: TelemetryEventName; properties?: Record<string, any> }) => Promise<Record<string, any>>
+			>(client, "getEventProperties").bind(client)
+
+			const result = await getEventProperties({
+				event: TelemetryEventName.TASK_CREATED,
+				properties: {
+					customProp: "value",
+				},
+			})
+
+			// Git properties should be filtered out
+			expect(result).not.toHaveProperty("repositoryUrl")
+			expect(result).not.toHaveProperty("repositoryName")
+			expect(result).not.toHaveProperty("defaultBranch")
+
+			// Other properties should be included
+			expect(result).toEqual({
+				appVersion: "1.0.0",
+				vscodeVersion: "1.60.0",
+				platform: "darwin",
+				editorName: "vscode",
+				language: "en",
+				mode: "code",
+				customProp: "value",
+			})
+		})
+
 		it("should handle errors from provider gracefully", async () => {
 			const client = new PostHogTelemetryClient()
 
@@ -211,6 +282,48 @@ describe("PostHogTelemetryClient", () => {
 				}),
 			})
 		})
+
+		it("should filter out git repository properties when capturing events", async () => {
+			const client = new PostHogTelemetryClient()
+			client.updateTelemetryState(true)
+
+			const mockProvider: TelemetryPropertiesProvider = {
+				getTelemetryProperties: vi.fn().mockResolvedValue({
+					appVersion: "1.0.0",
+					vscodeVersion: "1.60.0",
+					platform: "darwin",
+					editorName: "vscode",
+					language: "en",
+					mode: "code",
+					// Git properties that should be filtered out
+					repositoryUrl: "https://github.com/example/repo",
+					repositoryName: "example/repo",
+					defaultBranch: "main",
+				}),
+			}
+
+			client.setProvider(mockProvider)
+
+			await client.capture({
+				event: TelemetryEventName.TASK_CREATED,
+				properties: { test: "value" },
+			})
+
+			expect(mockPostHogClient.capture).toHaveBeenCalledWith({
+				distinctId: "test-machine-id",
+				event: TelemetryEventName.TASK_CREATED,
+				properties: expect.objectContaining({
+					appVersion: "1.0.0",
+					test: "value",
+				}),
+			})
+
+			// Verify git properties are not included
+			const captureCall = mockPostHogClient.capture.mock.calls[0][0]
+			expect(captureCall.properties).not.toHaveProperty("repositoryUrl")
+			expect(captureCall.properties).not.toHaveProperty("repositoryName")
+			expect(captureCall.properties).not.toHaveProperty("defaultBranch")
+		})
 	})
 
 	describe("updateTelemetryState", () => {

packages/types/src/provider-settings.ts

@@ -19,6 +19,7 @@ export const providerNames = [
 	"vscode-lm",
 	"lmstudio",
 	"gemini",
+	"gemini-cli",
 	"openai-native",
 	"mistral",
 	"deepseek",
@@ -158,6 +159,11 @@ const geminiSchema = apiModelIdProviderModelSchema.extend({
 	googleGeminiBaseUrl: z.string().optional(),
 })
 
+const geminiCliSchema = apiModelIdProviderModelSchema.extend({
+	geminiCliOAuthPath: z.string().optional(),
+	geminiCliProjectId: z.string().optional(),
+})
+
 const openAiNativeSchema = apiModelIdProviderModelSchema.extend({
 	openAiNativeApiKey: z.string().optional(),
 	openAiNativeBaseUrl: z.string().optional(),
@@ -223,6 +229,7 @@ export const providerSettingsSchemaDiscriminated = z.discriminatedUnion("apiProv
 	vsCodeLmSchema.merge(z.object({ apiProvider: z.literal("vscode-lm") })),
 	lmStudioSchema.merge(z.object({ apiProvider: z.literal("lmstudio") })),
 	geminiSchema.merge(z.object({ apiProvider: z.literal("gemini") })),
+	geminiCliSchema.merge(z.object({ apiProvider: z.literal("gemini-cli") })),
 	openAiNativeSchema.merge(z.object({ apiProvider: z.literal("openai-native") })),
 	mistralSchema.merge(z.object({ apiProvider: z.literal("mistral") })),
 	deepSeekSchema.merge(z.object({ apiProvider: z.literal("deepseek") })),
@@ -250,6 +257,7 @@ export const providerSettingsSchema = z.object({
 	...vsCodeLmSchema.shape,
 	...lmStudioSchema.shape,
 	...geminiSchema.shape,
+	...geminiCliSchema.shape,
 	...openAiNativeSchema.shape,
 	...mistralSchema.shape,
 	...deepSeekSchema.shape,