Progress

Author: nang-dev

src/api/providers/pearai.ts

@@ -1,18 +1,16 @@
 import { OpenAiHandler } from "./openai"
-import { ApiHandlerOptions } from "../../shared/api"
+import { ApiHandlerOptions, PEARAI_URL } from "../../shared/api"
 
 export class PearAiHandler extends OpenAiHandler {
 	constructor(options: ApiHandlerOptions) {
 		if (!options.pearaiApiKey) {
-			throw new Error("PearAI API key is required. Please provide it in the settings.")
+			throw new Error("PearAI API key not found. Please login to PearAI.")
 		}
 		super({
 			...options,
 			// Map PearAI specific options to OpenAI options for compatibility
 			openAiApiKey: options.pearaiApiKey,
-			openAiBaseUrl:
-				options.pearaiBaseUrl ??
-				"https://stingray-app-gb2an.ondigitalocean.app/pearai-server-api2/integrations/cline",
+			openAiBaseUrl: PEARAI_URL,
 			openAiStreamingEnabled: true,
 		})
 	}

src/core/webview/ClineProvider.ts

@@ -14,7 +14,7 @@ import { getTheme } from "../../integrations/theme/getTheme"
 import { getDiffStrategy } from "../diff/DiffStrategy"
 import WorkspaceTracker from "../../integrations/workspace/WorkspaceTracker"
 import { McpHub } from "../../services/mcp/McpHub"
-import { ApiConfiguration, ApiProvider, ModelInfo } from "../../shared/api"
+import { ApiConfiguration, ApiProvider, ModelInfo, PEARAI_URL } from "../../shared/api"
 import { findLast } from "../../shared/array"
 import { ApiConfigMeta, ExtensionMessage } from "../../shared/ExtensionMessage"
 import { HistoryItem } from "../../shared/HistoryItem"
@@ -45,6 +45,9 @@ import { CustomSupportPrompts, supportPrompt } from "../../shared/support-prompt
 
 import { ACTION_NAMES } from "../CodeActionProvider"
 
+// Todo: Remove
+const PEARAI_TOKEN = "temp"
+
 /*
 https://github.com/microsoft/vscode-webview-ui-toolkit-samples/blob/main/default/weather-webview/src/providers/WeatherViewProvider.ts
 
@@ -126,7 +129,9 @@ type GlobalStateKey =
 	| "enhancementApiConfigId"
 	| "experiments" // Map of experiment IDs to their enabled state
 	| "autoApprovalEnabled"
-	| "customModes" // Array of custom modes
+	| "customModes"
+	| "pearai-token"
+	| "pearai-refresh" // Array of custom modes
 
 export const GlobalFileNames = {
 	apiConversationHistory: "api_conversation_history.json",
@@ -1410,10 +1415,10 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 		await this.updateGlobalState("openRouterUseMiddleOutTransform", openRouterUseMiddleOutTransform)
 		await this.updateGlobalState("vsCodeLmModelSelector", vsCodeLmModelSelector)
 		await this.storeSecret("mistralApiKey", mistralApiKey)
+		await this.updateGlobalState("pearai-token", PEARAI_TOKEN)
+		await this.updateGlobalState("pearaiBaseUrl", PEARAI_URL)
 		await this.updateGlobalState("pearaiModelId", pearaiModelId)
 		await this.updateGlobalState("pearaiModelInfo", pearaiModelInfo)
-		await this.storeSecret("pearaiApiKey", pearaiApiKey)
-		await this.updateGlobalState("pearaiBaseUrl", pearaiBaseUrl)
 		if (this.cline) {
 			this.cline.api = buildApiHandler(apiConfiguration)
 		}
@@ -2033,6 +2038,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 			deepSeekApiKey,
 			mistralApiKey,
 			pearaiApiKey,
+			pearaiRefreshKey,
 			pearaiBaseUrl,
 			pearaiModelId,
 			pearaiModelInfo,
@@ -2106,7 +2112,8 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 			this.getSecret("openAiNativeApiKey") as Promise<string | undefined>,
 			this.getSecret("deepSeekApiKey") as Promise<string | undefined>,
 			this.getSecret("mistralApiKey") as Promise<string | undefined>,
-			this.getSecret("pearaiApiKey") as Promise<string | undefined>,
+			this.getGlobalState("pearai-token") as Promise<string | undefined>,
+			this.getGlobalState("pearai-refresh") as Promise<string | undefined>,
 			this.getGlobalState("pearaiBaseUrl") as Promise<string | undefined>,
 			this.getGlobalState("pearaiModelId") as Promise<string | undefined>,
 			this.getGlobalState("pearaiModelInfo") as Promise<ModelInfo | undefined>,

src/shared/api.ts

@@ -598,3 +598,9 @@ export const mistralModels = {
 		outputPrice: 0.9,
 	},
 } as const satisfies Record<string, ModelInfo>
+
+// CHANGE AS NEEDED FOR TESTING
+// PROD:
+// export const PEARAI_URL = "https://stingray-app-gb2an.ondigitalocean.app/pearai-server-api2/integrations/cline"
+// DEV:
+export const PEARAI_URL = "http://localhost:8000/integrations/cline"

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

@@ -32,6 +32,7 @@ import {
 	openRouterDefaultModelInfo,
 	vertexDefaultModelId,
 	vertexModels,
+	PEARAI_URL,
 } from "../../../../src/shared/api"
 import { ExtensionMessage } from "../../../../src/shared/ExtensionMessage"
 import { useExtensionState } from "../../context/ExtensionStateContext"
@@ -45,8 +46,6 @@ import OpenRouterModelPicker, {
 import OpenAiModelPicker from "./OpenAiModelPicker"
 import GlamaModelPicker from "./GlamaModelPicker"
 
-const PEARAI_DEFAULT_URL = "https://stingray-app-gb2an.ondigitalocean.app/pearai-server-api2/integrations/cline"
-
 interface ApiOptionsProps {
 	apiErrorMessage?: string
 	modelIdErrorMessage?: string
@@ -60,7 +59,6 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
 	const [anthropicBaseUrlSelected, setAnthropicBaseUrlSelected] = useState(!!apiConfiguration?.anthropicBaseUrl)
 	const [azureApiVersionSelected, setAzureApiVersionSelected] = useState(!!apiConfiguration?.azureApiVersion)
 	const [openRouterBaseUrlSelected, setOpenRouterBaseUrlSelected] = useState(!!apiConfiguration?.openRouterBaseUrl)
-	const [pearaiBaseUrlSelected, setPearaiBaseUrlSelected] = useState(!!apiConfiguration?.pearaiBaseUrl)
 	const [isDescriptionExpanded, setIsDescriptionExpanded] = useState(false)
 
 	const { selectedProvider, selectedModelId, selectedModelInfo } = useMemo(() => {
@@ -171,34 +169,12 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
 						placeholder="Enter API Key...">
 						<span style={{ fontWeight: 500 }}>PearAI API Key</span>
 					</VSCodeTextField>
-					<VSCodeTextField
-						value={apiConfiguration?.pearaiBaseUrl || PEARAI_DEFAULT_URL}
-						style={{ width: "100%" }}
-						type="url"
-						onInput={handleInputChange("pearaiBaseUrl")}
-						placeholder={PEARAI_DEFAULT_URL}>
-						<span style={{ fontWeight: 500 }}>Base URL</span>
-					</VSCodeTextField>
-					{apiConfiguration?.pearaiBaseUrl && apiConfiguration.pearaiBaseUrl !== PEARAI_DEFAULT_URL && (
-						<VSCodeButton
-							onClick={() => {
-								handleInputChange("pearaiBaseUrl")({
-									target: {
-										value: PEARAI_DEFAULT_URL,
-									},
-								})
-							}}>
-							Reset to default URL
-						</VSCodeButton>
-					)}
 					<p
 						style={{
 							fontSize: "12px",
 							marginTop: "5px",
 							color: "var(--vscode-descriptionForeground)",
-						}}>
-						This key is stored locally and only used to make API requests from this extension.
-					</p>
+						}}></p>
 				</div>
 			)}
 
@@ -1607,7 +1583,7 @@ export function normalizeApiConfiguration(apiConfiguration?: ApiConfiguration) {
 		case "pearai":
 			return {
 				selectedProvider: provider,
-				selectedModelId: apiConfiguration?.pearaiModelId || "",
+				selectedModelId: apiConfiguration?.pearaiModelId || "pearai_model",
 				selectedModelInfo: apiConfiguration?.pearaiModelInfo || openAiModelInfoSaneDefaults,
 			}
 		default: