Progress

Author: nang-dev

src/api/providers/pearai.ts

@@ -3,6 +3,8 @@ import { ApiHandlerOptions, PEARAI_URL, ModelInfo } from "../../shared/api"
 import { AnthropicHandler } from "./anthropic"
 import { DeepSeekHandler } from "./deepseek"
 import Anthropic from "@anthropic-ai/sdk"
+import { BaseProvider } from "./base-provider"
+import { SingleCompletionHandler } from "../"
 
 interface PearAiModelsResponse {
 	models: {
@@ -14,10 +16,11 @@ interface PearAiModelsResponse {
 	defaultModelId: string
 }
 
-export class PearAiHandler {
+export class PearAiHandler extends BaseProvider implements SingleCompletionHandler {
 	private handler!: AnthropicHandler | DeepSeekHandler
 
 	constructor(options: ApiHandlerOptions) {
+		super()
 		if (!options.pearaiApiKey) {
 			vscode.window.showErrorMessage("PearAI API key not found.", "Login to PearAI").then(async (selection) => {
 				if (selection === "Login to PearAI") {
@@ -151,8 +154,4 @@ export class PearAiHandler {
 	async completePrompt(prompt: string): Promise<string> {
 		return this.handler.completePrompt(prompt)
 	}
-
-	async countTokens(content: Array<Anthropic.Messages.ContentBlockParam>): Promise<number> {
-		return this.handler.countTokens(content)
-	}
 }

src/exports/roo-code.d.ts

@@ -162,8 +162,8 @@ export type SecretKey =
 	| "mistralApiKey"
 	| "unboundApiKey"
 	| "requestyApiKey"
-	| "pearaiToken"
-	| "pearaiRefresh"
+	| "pearaiApiKey"
+
 export type GlobalStateKey =
 	| "apiProvider"
 	| "apiModelId"
@@ -256,7 +256,6 @@ export type GlobalStateKey =
 	| "language"
 	| "maxReadFileLine"
 	| "fakeAi"
-	| "pearaiApiKey"
 	| "pearaiModelId"
 	| "pearaiModelInfo"
 	| "pearaiBaseUrl"

src/extension.ts

@@ -93,8 +93,8 @@ export function activate(context: vscode.ExtensionContext) {
 		vscode.commands.registerCommand("pearai-roo-cline.pearaiLogin", async (data) => {
 			console.dir("Logged in to PearAI:")
 			console.dir(data)
-			context.secrets.store("pearai-token", data.accessToken)
-			context.secrets.store("pearai-refresh", data.refreshToken)
+			context.secrets.store("pearaiApiKey", data.accessToken)
+			context.secrets.store("pearaiRefreshKey", data.refreshToken)
 			// Update MCP server with new token
 			// const provider = await ClineProvider.getInstance()
 			// if (provider) {
@@ -110,8 +110,8 @@ export function activate(context: vscode.ExtensionContext) {
 	context.subscriptions.push(
 		vscode.commands.registerCommand("pearai-roo-cline.pearaiLogout", async () => {
 			console.dir("Logged out of PearAI:")
-			context.secrets.delete("pearai-token")
-			context.secrets.delete("pearai-refresh")
+			context.secrets.delete("pearaiApiKey")
+			context.secrets.delete("pearaiRefreshKey")
 			// Clear MCP server token
 			const provider = await ClineProvider.getInstance()
 			// if (provider) {

src/shared/checkExistApiConfig.ts

@@ -4,8 +4,8 @@ import { SECRET_KEYS } from "./globalState"
 export function checkExistKey(config: ApiConfiguration | undefined) {
 	if (!config) return false
 
-	// Special case for human-relay and fake-ai providers which don't need any configuration
-	if (config.apiProvider === "human-relay" || config.apiProvider === "fake-ai") {
+	// Special case for providers that don't need configuration in the apiConfiguration object
+	if (config.apiProvider === "human-relay" || config.apiProvider === "fake-ai" || config.apiProvider === "pearai") {
 		return true
 	}
 

src/shared/globalState.ts

@@ -26,8 +26,7 @@ export const SECRET_KEYS = [
 	"mistralApiKey",
 	"unboundApiKey",
 	"requestyApiKey",
-	"pearaiToken",
-	"pearaiRefresh",
+	"pearaiApiKey",
 ] as const
 
 // type CheckSecretKeysExhaustiveness = Exclude<SecretKey, (typeof SECRET_KEYS)[number]> extends never ? true : false
@@ -129,7 +128,6 @@ export const GLOBAL_STATE_KEYS = [
 	"pearaiModelId",
 	"pearaiModelInfo",
 	"pearaiBaseUrl",
-	"pearaiApiKey",
 ] as const
 
 export const PASS_THROUGH_STATE_KEYS = ["taskHistory"] as const

webview-ui/src/context/ExtensionStateContext.tsx

@@ -202,7 +202,7 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode
 					}))
 					const config = newState.apiConfiguration
 					const hasKey = checkExistKey(config)
-					if (!hasKey) {
+					if (!hasKey && (!config || config.apiProvider !== "pearai")) {
 						vscode.postMessage({
 							type: "apiConfiguration",
 							apiConfiguration: {