fix: resolve allquixotic merge type errors

Co-Authored-By: Oz <oz-agent@warp.dev>

Author: allquixotic

packages/cloud/src/TaskSyncClient.ts

@@ -1,11 +1,6 @@
 import { z } from "zod"
 
-import {
-	type AuthService,
-	type ClineMessage,
-	type SettingsService,
-	clineMessageSchema,
-} from "@roo-code/types"
+import { type AuthService, type ClineMessage, type SettingsService, clineMessageSchema } from "@roo-code/types"
 
 import { getRooCodeApiUrl } from "./config.js"
 import type { RetryQueue } from "./retry-queue/index.js"
@@ -52,12 +47,16 @@ export class TaskSyncClient {
 		}
 
 		const url = `${getRooCodeApiUrl()}/api/${path}`
-		const requestHeaders =
-			options.headers instanceof Headers
-				? Object.fromEntries(options.headers.entries())
-				: Array.isArray(options.headers)
-					? Object.fromEntries(options.headers)
-					: ((options.headers as Record<string, string> | undefined) ?? {})
+		const requestHeaders: Record<string, string> = {}
+		if (options.headers instanceof Headers) {
+			options.headers.forEach((value, key) => {
+				requestHeaders[key] = value
+			})
+		} else if (Array.isArray(options.headers)) {
+			Object.assign(requestHeaders, Object.fromEntries(options.headers))
+		} else {
+			Object.assign(requestHeaders, (options.headers as Record<string, string> | undefined) ?? {})
+		}
 
 		const fetchOptions: RequestInit = {
 			...options,
@@ -80,7 +79,9 @@ export class TaskSyncClient {
 			const response = await fetch(url, fetchOptions)
 
 			if (!response.ok) {
-				console.error(`[TaskSyncClient#fetch] ${options.method} ${path} -> ${response.status} ${response.statusText}`)
+				console.error(
+					`[TaskSyncClient#fetch] ${options.method} ${path} -> ${response.status} ${response.statusText}`,
+				)
 
 				if (this.retryQueue && allowQueueing && (response.status >= 500 || response.status === 429)) {
 					await this.retryQueue.enqueue(url, fetchOptions, "task-sync", path)

packages/types/src/index.ts

@@ -18,6 +18,7 @@ export * from "./mcp.js"
 export * from "./message.js"
 export * from "./mode.js"
 export * from "./model.js"
+export * from "./marketplace.js"
 export * from "./provider-settings.js"
 export * from "./task.js"
 export * from "./todo.js"

packages/types/src/providers/index.ts

@@ -16,6 +16,7 @@ export * from "./openrouter.js"
 export * from "./poe.js"
 export * from "./qwen-code.js"
 export * from "./requesty.js"
+export * from "./roo.js"
 export * from "./sambanova.js"
 export * from "./unbound.js"
 export * from "./vertex.js"
@@ -41,6 +42,7 @@ import { openRouterDefaultModelId } from "./openrouter.js"
 import { poeDefaultModelId } from "./poe.js"
 import { qwenCodeDefaultModelId } from "./qwen-code.js"
 import { requestyDefaultModelId } from "./requesty.js"
+import { rooDefaultModelId } from "./roo.js"
 import { sambaNovaDefaultModelId } from "./sambanova.js"
 import { unboundDefaultModelId } from "./unbound.js"
 import { vertexDefaultModelId } from "./vertex.js"
@@ -69,6 +71,8 @@ export function getProviderDefaultModelId(
 			return openRouterDefaultModelId
 		case "requesty":
 			return requestyDefaultModelId
+		case "roo":
+			return rooDefaultModelId
 		case "litellm":
 			return litellmDefaultModelId
 		case "xai":

packages/types/src/vscode-extension-host.ts

@@ -110,6 +110,7 @@ export interface ExtensionMessage {
 	}
 	action?:
 		| "chatButtonClicked"
+		| "cloudButtonClicked"
 		| "settingsButtonClicked"
 		| "historyButtonClicked"
 		| "marketplaceButtonClicked"
@@ -180,7 +181,6 @@ export interface ExtensionMessage {
 	context?: string
 	commands?: Command[]
 	queuedMessages?: QueuedMessage[]
-	organizationId?: string | null // For organizationSwitchResult
 	tools?: SerializedCustomToolDefinition[] // For customToolsResult
 	skills?: SkillMetadata[] // For skills response
 	modes?: { slug: string; name: string }[] // For modes response

packages/types/src/vscode.ts

@@ -30,6 +30,7 @@ export const commandIds = [
 	"activationCompleted",
 
 	"plusButtonClicked",
+	"cloudButtonClicked",
 	"historyButtonClicked",
 	"marketplaceButtonClicked",
 	"popoutButtonClicked",

src/__tests__/extension.spec.ts

@@ -3,6 +3,8 @@
 import type * as vscode from "vscode"
 import type { AuthState } from "@roo-code/types"
 
+const mockRefreshModels = vi.hoisted(() => vi.fn().mockResolvedValue({}))
+
 vi.mock("vscode", () => ({
 	window: {
 		createOutputChannel: vi.fn().mockReturnValue({
@@ -189,7 +191,7 @@ vi.mock("../api/providers/fetchers/modelCache", () => ({
 	flushModels: vi.fn(),
 	getModels: vi.fn().mockResolvedValue([]),
 	initializeModelCacheRefresh: vi.fn(),
-	refreshModels: vi.fn().mockResolvedValue({}),
+	refreshModels: mockRefreshModels,
 }))
 
 describe("extension.ts", () => {

src/activate/CodeActionProvider.ts

@@ -1,7 +1,8 @@
 import * as vscode from "vscode"
 
-import { CodeActionId } from "@roo-code/types"
+import { type CodeActionId, type CodeActionName } from "@roo-code/types"
 import { Package } from "../shared/package"
+import { t } from "../i18n"
 
 import { getCodeActionCommand } from "../utils/commands"
 import { EditorUtils } from "../integrations/editor/EditorUtils"

src/api/providers/anthropic.ts

@@ -15,6 +15,7 @@ import type { ApiHandlerOptions } from "../../shared/api"
 import { ApiStream } from "../transform/stream"
 import { getModelParams } from "../transform/model-params"
 import { filterNonAnthropicBlocks } from "../transform/anthropic-filter"
+import { getAnthropicProviderReasoning } from "../transform/reasoning"
 
 import { BaseProvider } from "./base-provider"
 import type { SingleCompletionHandler, ApiHandlerCreateMessageMetadata } from "../index"
@@ -119,7 +120,7 @@ export class AnthropicHandler extends BaseProvider implements SingleCompletionHa
 						model: modelId,
 						max_tokens: maxTokens ?? ANTHROPIC_DEFAULT_MAX_TOKENS,
 						temperature,
-						thinking,
+						thinking: thinking as unknown as Anthropic.Messages.MessageCreateParams["thinking"],
 						// Setting cache breakpoint for system prompt so new tasks can reuse it.
 						system: [{ text: systemPrompt, type: "text", cache_control: cacheControl }],
 						messages: sanitizedMessages.map((message, index) => {

src/api/providers/bedrock-discovery.ts

@@ -21,6 +21,8 @@ import {
 
 import { Package } from "../../shared/package"
 
+export const BEDROCK_DISCOVERY_TIMEOUT_MS = 30_000
+
 // The two AWS SDK packages we use here (`@aws-sdk/client-bedrock` for control-plane discovery
 // and `@aws-sdk/client-bedrock-runtime` for Converse probes) each ship their own discriminated
 // `Config` interface where `token`/`credentials` are tagged with package-private branded types.
@@ -152,7 +154,7 @@ const buildInferenceProfileTarget = (summary: InferenceProfileSummary): BedrockD
 	}
 }
 
-const listInferenceProfiles = async (client: BedrockClient) => {
+const listInferenceProfiles = async (client: BedrockClient, abortSignal?: AbortSignal) => {
 	const results: InferenceProfileSummary[] = []
 	let nextToken: string | undefined
 
@@ -162,6 +164,7 @@ const listInferenceProfiles = async (client: BedrockClient) => {
 				nextToken,
 				maxResults: 100,
 			}),
+			{ abortSignal },
 		)
 
 		results.push(...(response.inferenceProfileSummaries ?? []))
@@ -177,42 +180,59 @@ export const discoverBedrockTargets = async (options: ProviderSettings): Promise
 	}
 
 	const client = new BedrockClient(toBedrockClientConfig(options))
+	const controller = new AbortController()
+	const timeout = setTimeout(() => controller.abort(), BEDROCK_DISCOVERY_TIMEOUT_MS)
+	const timeoutPromise = new Promise<never>((_, reject) => {
+		controller.signal.addEventListener(
+			"abort",
+			() => reject(new Error(`Bedrock discovery timed out after ${BEDROCK_DISCOVERY_TIMEOUT_MS}ms`)),
+			{ once: true },
+		)
+	})
 
-	const [foundationModelsResponse, inferenceProfiles] = await Promise.all([
-		client.send(new ListFoundationModelsCommand({})),
-		listInferenceProfiles(client),
-	])
-
-	const targets = [
-		...(foundationModelsResponse.modelSummaries ?? [])
-			.map((summary) => buildFoundationTarget(summary))
-			.filter((target): target is BedrockDiscoveredTarget => Boolean(target)),
-		...inferenceProfiles
-			.filter((summary) => summary.status === "ACTIVE")
-			.map((summary) => buildInferenceProfileTarget(summary))
-			.filter((target): target is BedrockDiscoveredTarget => Boolean(target)),
-	]
-
-	const dedupedTargets = Array.from(new Map(targets.map((target) => [target.id, target])).values())
-
-	const sortedTargets = dedupedTargets.sort((a, b) => {
-		const kindOrder = { "foundation-model": 0, "system-profile": 1, "application-profile": 2 }
-		const kindCompare = kindOrder[a.targetKind] - kindOrder[b.targetKind]
-		if (kindCompare !== 0) {
-			return kindCompare
-		}
+	const discoveryPromise = (async () => {
+		const [foundationModelsResponse, inferenceProfiles] = await Promise.all([
+			client.send(new ListFoundationModelsCommand({}), { abortSignal: controller.signal }),
+			listInferenceProfiles(client, controller.signal),
+		])
+
+		const targets = [
+			...(foundationModelsResponse.modelSummaries ?? [])
+				.map((summary) => buildFoundationTarget(summary))
+				.filter((target): target is BedrockDiscoveredTarget => Boolean(target)),
+			...inferenceProfiles
+				.filter((summary) => summary.status === "ACTIVE")
+				.map((summary) => buildInferenceProfileTarget(summary))
+				.filter((target): target is BedrockDiscoveredTarget => Boolean(target)),
+		]
+
+		const dedupedTargets = Array.from(new Map(targets.map((target) => [target.id, target])).values())
+
+		const sortedTargets = dedupedTargets.sort((a, b) => {
+			const kindOrder = { "foundation-model": 0, "system-profile": 1, "application-profile": 2 }
+			const kindCompare = kindOrder[a.targetKind] - kindOrder[b.targetKind]
+			if (kindCompare !== 0) {
+				return kindCompare
+			}
 
-		if (a.baseModelId !== b.baseModelId) {
-			return a.baseModelId.localeCompare(b.baseModelId)
-		}
+			if (a.baseModelId !== b.baseModelId) {
+				return a.baseModelId.localeCompare(b.baseModelId)
+			}
 
-		return a.label.localeCompare(b.label)
-	})
+			return a.label.localeCompare(b.label)
+		})
 
-	// AWS often returns a single inference profile id for models that support both 128K
-	// and 1M context windows. Expand those into two dropdown entries so users can pick
-	// the context tier explicitly; the `:1m` suffix is round-tripped through the runtime.
-	return expandBedrockTargetsWith1MVariants(sortedTargets)
+		// AWS often returns a single inference profile id for models that support both 128K
+		// and 1M context windows. Expand those into two dropdown entries so users can pick
+		// the context tier explicitly; the `:1m` suffix is round-tripped through the runtime.
+		return expandBedrockTargetsWith1MVariants(sortedTargets)
+	})()
+
+	try {
+		return await Promise.race([discoveryPromise, timeoutPromise])
+	} finally {
+		clearTimeout(timeout)
+	}
 }
 
 /**

src/api/providers/fetchers/modelCache.ts

@@ -19,6 +19,7 @@ import { getOpenRouterModels } from "./openrouter"
 import { getVercelAiGatewayModels } from "./vercel-ai-gateway"
 import { getOpencodeGoModels } from "./opencode-go"
 import { getRequestyModels } from "./requesty"
+import { getRooModels } from "./roo"
 import { getUnboundModels } from "./unbound"
 import { getLiteLLMModels } from "./litellm"
 import { GetModelsOptions } from "../../../shared/api"
@@ -70,6 +71,12 @@ async function fetchModelsFromProvider(options: GetModelsOptions): Promise<Model
 			// Requesty models endpoint requires an API key for per-user custom policies.
 			models = await getRequestyModels(options.baseUrl, options.apiKey)
 			break
+		case "roo":
+			models = await getRooModels(
+				options.baseUrl ?? process.env.ROO_CODE_PROVIDER_URL ?? "https://api.roocode.com/proxy",
+				options.apiKey,
+			)
+			break
 		case "unbound":
 			models = await getUnboundModels(options.apiKey)
 			break