Merge branch 'main' into add_api_key_env_vars

Signed-off-by: Geoff Wilson <[email protected]>

Author: suprjinx

packages/types/src/provider-settings.ts

@@ -234,6 +234,7 @@ const unboundSchema = baseProviderSettingsSchema.extend({
 })
 
 const requestySchema = baseProviderSettingsSchema.extend({
+	requestyBaseUrl: z.string().optional(),
 	requestyApiKey: z.string().optional(),
 	requestyConfigUseEnvVars: z.boolean().optional(),
 	requestyModelId: z.string().optional(),

src/api/providers/__tests__/requesty.spec.ts

@@ -65,6 +65,21 @@ describe("RequestyHandler", () => {
 		})
 	})
 
+	it("can use a base URL instead of the default", () => {
+		const handler = new RequestyHandler({ ...mockOptions, requestyBaseUrl: "some-base-url" })
+		expect(handler).toBeInstanceOf(RequestyHandler)
+
+		expect(OpenAI).toHaveBeenCalledWith({
+			baseURL: "some-base-url",
+			apiKey: mockOptions.requestyApiKey,
+			defaultHeaders: {
+				"HTTP-Referer": "https://github.com/RooVetGit/Roo-Cline",
+				"X-Title": "Roo Code",
+				"User-Agent": `RooCode/${Package.version}`,
+			},
+		})
+	})
+
 	describe("fetchModel", () => {
 		it("returns correct model info when options are provided", async () => {
 			const handler = new RequestyHandler(mockOptions)

src/api/providers/requesty.ts

@@ -47,7 +47,7 @@ export class RequestyHandler extends BaseProvider implements SingleCompletionHan
 		this.options = options
 
 		this.client = new OpenAI({
-			baseURL: "https://router.requesty.ai/v1",
+			baseURL: options.requestyBaseUrl || "https://router.requesty.ai/v1",
 			apiKey: this.options.requestyApiKey ?? "not-provided",
 			defaultHeaders: DEFAULT_HEADERS,
 		})

src/core/checkpoints/index.ts

@@ -23,22 +23,8 @@ export async function getCheckpointService(
 	if (!cline.enableCheckpoints) {
 		return undefined
 	}
-
 	if (cline.checkpointService) {
-		if (cline.checkpointServiceInitializing) {
-			console.log("[Task#getCheckpointService] checkpoint service is still initializing")
-			const service = cline.checkpointService
-			await pWaitFor(
-				() => {
-					console.log("[Task#getCheckpointService] waiting for service to initialize")
-					return service.isInitialized
-				},
-				{ interval, timeout },
-			)
-			return service.isInitialized ? cline.checkpointService : undefined
-		} else {
-			return cline.checkpointService
-		}
+		return cline.checkpointService
 	}
 
 	const provider = cline.providerRef.deref()
@@ -78,25 +64,32 @@ export async function getCheckpointService(
 			shadowDir: globalStorageDir,
 			log,
 		}
-
+		if (cline.checkpointServiceInitializing) {
+			await pWaitFor(
+				() => {
+					console.log("[Task#getCheckpointService] waiting for service to initialize")
+					return !!cline.checkpointService && !!cline?.checkpointService?.isInitialized
+				},
+				{ interval, timeout },
+			)
+			if (!cline?.checkpointService) {
+				cline.enableCheckpoints = false
+				return undefined
+			}
+			return cline.checkpointService
+		}
+		if (!cline.enableCheckpoints) {
+			return undefined
+		}
 		const service = RepoPerTaskCheckpointService.create(options)
 		cline.checkpointServiceInitializing = true
-
-		// Check if Git is installed before initializing the service
-		// Only assign the service after successful initialization
-		try {
-			await checkGitInstallation(cline, service, log, provider)
-			cline.checkpointService = service
-			return service
-		} catch (err) {
-			// Clean up on failure
-			cline.checkpointServiceInitializing = false
-			cline.enableCheckpoints = false
-			throw err
-		}
+		await checkGitInstallation(cline, service, log, provider)
+		cline.checkpointService = service
+		return service
 	} catch (err) {
 		log(`[Task#getCheckpointService] ${err.message}`)
 		cline.enableCheckpoints = false
+		cline.checkpointServiceInitializing = false
 		return undefined
 	}
 }
@@ -175,13 +168,6 @@ export async function checkpointSave(cline: Task, force = false) {
 		return
 	}
 
-	if (!service.isInitialized) {
-		const provider = cline.providerRef.deref()
-		provider?.log("[checkpointSave] checkpoints didn't initialize in time, disabling checkpoints for this task")
-		cline.enableCheckpoints = false
-		return
-	}
-
 	TelemetryService.instance.captureCheckpointCreated(cline.taskId)
 
 	// Start the checkpoint process in the background.

webview-ui/src/components/settings/ModelPicker.tsx

@@ -155,7 +155,7 @@ export const ModelPicker = ({
 							aria-expanded={open}
 							className="w-full justify-between"
 							data-testid="model-picker-button">
-							<div>{selectedModelId ?? t("settings:common.select")}</div>
+							<div className="truncate">{selectedModelId ?? t("settings:common.select")}</div>
 							<ChevronsUpDown className="opacity-50" />
 						</Button>
 					</PopoverTrigger>
@@ -194,7 +194,7 @@ export const ModelPicker = ({
 											value={model}
 											onSelect={onSelect}
 											data-testid={`model-option-${model}`}>
-											{model}
+<span className="truncate" title={model}>{model}</span>
 											<Check
 												className={cn(
 													"size-4 p-0.5 ml-auto",

webview-ui/src/components/settings/providers/Requesty.tsx

@@ -1,4 +1,5 @@
-import { useState } from "react"
+import { useCallback, useEffect, useState } from "react"
+import { VSCodeCheckbox, VSCodeTextField } from "@vscode/webview-ui-toolkit/react"
 
 import { type ProviderSettings, type OrganizationAllowList, requestyDefaultModelId, API_KEYS } from "@roo-code/types"
 
@@ -11,6 +12,7 @@ import { Button } from "@src/components/ui"
 import { ModelPicker } from "../ModelPicker"
 import { RequestyBalanceDisplay } from "./RequestyBalanceDisplay"
 import { ApiKey } from "../ApiKey"
+import { inputEventTransform } from "../transforms"
 
 type RequestyProps = {
 	apiConfiguration: ProviderSettings
@@ -32,6 +34,23 @@ export const Requesty = ({
 	const { t } = useAppTranslation()
 
 	const [didRefetch, setDidRefetch] = useState<boolean>()
+	const [requestyEndpointSelected, setRequestyEndpointSelected] = useState(!!apiConfiguration.requestyBaseUrl)
+
+	// This ensures that the "Use custom URL" checkbox is hidden when the user deletes the URL.
+	useEffect(() => {
+		setRequestyEndpointSelected(!!apiConfiguration?.requestyBaseUrl)
+	}, [apiConfiguration?.requestyBaseUrl])
+
+	const handleInputChange = useCallback(
+		<K extends keyof ProviderSettings, E>(
+			field: K,
+			transform: (event: E) => ProviderSettings[K] = inputEventTransform,
+		) =>
+			(event: E | Event) => {
+				setApiConfigurationField(field, transform(event as E))
+			},
+		[setApiConfigurationField],
+	)
 
 	return (
 		<>
@@ -50,6 +69,30 @@ export const Requesty = ({
 					)
 				}
 			/>
+			<VSCodeCheckbox
+				checked={requestyEndpointSelected}
+				onChange={(e: any) => {
+					const isChecked = e.target.checked === true
+					if (!isChecked) {
+						setApiConfigurationField("requestyBaseUrl", undefined)
+					}
+
+					setRequestyEndpointSelected(isChecked)
+				}}>
+				{t("settings:providers.requestyUseCustomBaseUrl")}
+			</VSCodeCheckbox>
+			{requestyEndpointSelected && (
+				<VSCodeTextField
+					value={apiConfiguration?.requestyBaseUrl || ""}
+					type="text"
+					onInput={handleInputChange("requestyBaseUrl")}
+					placeholder={t("settings:providers.getRequestyBaseUrl")}
+					className="w-full">
+					<div className="flex justify-between items-center mb-1">
+						<label className="block font-medium">{t("settings:providers.getRequestyBaseUrl")}</label>
+					</div>
+				</VSCodeTextField>
+			)}
 			<Button
 				variant="outline"
 				onClick={() => {

webview-ui/src/i18n/locales/ca/settings.json

@@ -253,6 +253,8 @@
 			"error": "Failed to refresh models list. Please try again."
 		},
 		"getRequestyApiKey": "Get Requesty API Key",
+		"getRequestyBaseUrl": "Base URL",
+		"requestyUseCustomBaseUrl": "Use custom base URL",
 		"openRouterTransformsText": "Compress prompts and message chains to the context size (<a>OpenRouter Transforms</a>)",
 		"anthropicApiKey": "Anthropic API Key",
 		"getAnthropicApiKey": "Get Anthropic API Key",