Added login logout p2p call working

Author: nang-dev

package-lock.json

@@ -1,8 +1,8 @@
 {
-	"name": "roo-cline",
-	"displayName": "Roo Code (prev. Roo Cline)",
-	"description": "A VS Code plugin that enhances coding with AI-powered automation, multi-model support, and experimental features.",
-	"publisher": "RooVeterinaryInc",
+	"name": "pearai-roo-cline",
+	"displayName": "PearAI Roo Code / Cline",
+	"description": "PearAI's integration of Roo Code / Cline, a coding agent.",
+	"publisher": "PearAI",
 	"version": "3.3.4",
 	"icon": "assets/icons/rocket.png",
 	"galleryBanner": {
@@ -13,7 +13,7 @@
 		"vscode": "^1.84.0"
 	},
 	"author": {
-		"name": "Roo Vet"
+		"name": "PearAI"
 	},
 	"repository": {
 		"type": "git",

package.json

@@ -45,9 +45,6 @@ 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
 
@@ -66,7 +63,8 @@ type SecretKey =
 	| "openAiNativeApiKey"
 	| "deepSeekApiKey"
 	| "mistralApiKey"
-	| "pearaiApiKey"
+	| "pearai-token"
+	| "pearai-refresh" // Array of custom modes
 type GlobalStateKey =
 	| "apiProvider"
 	| "apiModelId"
@@ -130,8 +128,6 @@ type GlobalStateKey =
 	| "experiments" // Map of experiment IDs to their enabled state
 	| "autoApprovalEnabled"
 	| "customModes"
-	| "pearai-token"
-	| "pearai-refresh" // Array of custom modes
 
 export const GlobalFileNames = {
 	apiConversationHistory: "api_conversation_history.json",
@@ -1278,6 +1274,19 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 							await this.updateGlobalState("mode", defaultModeSlug)
 							await this.postStateToWebview()
 						}
+						break
+					case "openPearAiAuth":
+						const extensionUrl = `${vscode.env.uriScheme}://pearai.pearai/auth`
+						const callbackUri = await vscode.env.asExternalUri(vscode.Uri.parse(extensionUrl))
+
+						await vscode.env.openExternal(
+							await vscode.env.asExternalUri(
+								vscode.Uri.parse(
+									`https://trypear.ai/signin?callback=${callbackUri.toString()}`, // Change to localhost if running locally
+								),
+							),
+						)
+						break
 				}
 			},
 			null,
@@ -1373,7 +1382,6 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 			openRouterUseMiddleOutTransform,
 			vsCodeLmModelSelector,
 			mistralApiKey,
-			pearaiApiKey,
 			pearaiBaseUrl,
 			pearaiModelId,
 			pearaiModelInfo,
@@ -1415,7 +1423,6 @@ 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)
@@ -2112,8 +2119,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.getGlobalState("pearai-token") as Promise<string | undefined>,
-			this.getGlobalState("pearai-refresh") as Promise<string | undefined>,
+			this.getSecret("pearai-token") as Promise<string | undefined>,
+			this.getSecret("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/core/webview/ClineProvider.ts

@@ -52,6 +52,23 @@ export function activate(context: vscode.ExtensionContext) {
 		}),
 	)
 
+	context.subscriptions.push(
+		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.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.subscriptions.push(
 		vscode.commands.registerCommand("roo-cline.mcpButtonClicked", () => {
 			sidebarProvider.postMessageToWebview({ type: "action", action: "mcpButtonClicked" })

src/extension.ts

@@ -50,6 +50,7 @@ export interface ExtensionMessage {
 		| "historyButtonClicked"
 		| "promptsButtonClicked"
 		| "didBecomeVisible"
+		| "updatePearAIAuth"
 	invoke?: "sendMessage" | "primaryButtonClick" | "secondaryButtonClick"
 	state?: ExtensionState
 	images?: string[]

src/shared/ExtensionMessage.ts

@@ -81,6 +81,7 @@ export interface WebviewMessage {
 		| "deleteCustomMode"
 		| "setopenAiCustomModelInfo"
 		| "openCustomModesSettings"
+		| "openPearAiAuth"
 	text?: string
 	disabled?: boolean
 	askResponse?: ClineAskResponse

src/shared/WebviewMessage.ts

@@ -4,7 +4,6 @@ export function checkExistKey(config: ApiConfiguration | undefined) {
 	return config
 		? [
 				config.apiKey,
-				config.pearaiApiKey,
 				config.glamaApiKey,
 				config.openRouterApiKey,
 				config.awsRegion,
@@ -17,6 +16,7 @@ export function checkExistKey(config: ApiConfiguration | undefined) {
 				config.deepSeekApiKey,
 				config.mistralApiKey,
 				config.vsCodeLmModelSelector,
+				config.pearaiBaseUrl,
 			].some((key) => key !== undefined)
 		: false
 }

src/shared/checkExistApiConfig.ts

@@ -32,7 +32,6 @@ import {
 	openRouterDefaultModelInfo,
 	vertexDefaultModelId,
 	vertexModels,
-	PEARAI_URL,
 } from "../../../../src/shared/api"
 import { ExtensionMessage } from "../../../../src/shared/ExtensionMessage"
 import { useExtensionState } from "../../context/ExtensionStateContext"
@@ -161,20 +160,35 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) =
 
 			{selectedProvider === "pearai" && (
 				<div>
-					<VSCodeTextField
-						value={apiConfiguration?.pearaiApiKey || ""}
-						style={{ width: "100%" }}
-						type="password"
-						onInput={handleInputChange("pearaiApiKey")}
-						placeholder="Enter API Key...">
-						<span style={{ fontWeight: 500 }}>PearAI API Key</span>
-					</VSCodeTextField>
-					<p
-						style={{
-							fontSize: "12px",
-							marginTop: "5px",
-							color: "var(--vscode-descriptionForeground)",
-						}}></p>
+					{!apiConfiguration?.pearaiApiKey ? (
+						<>
+							<VSCodeButton
+								onClick={() => {
+									vscode.postMessage({
+										type: "openPearAiAuth",
+									})
+								}}>
+								Login to PearAI
+							</VSCodeButton>
+							<p
+								style={{
+									fontSize: "12px",
+									marginTop: "5px",
+									color: "var(--vscode-descriptionForeground)",
+								}}>
+								Connect your PearAI account to use servers.
+							</p>
+						</>
+					) : (
+						<p
+							style={{
+								fontSize: "12px",
+								marginTop: "5px",
+								color: "var(--vscode-descriptionForeground)",
+							}}>
+							User already logged in to PearAI. Click 'Done' to proceed!
+						</p>
+					)}
 				</div>
 			)}
 

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

@@ -1,32 +1,26 @@
 import { VSCodeButton } from "@vscode/webview-ui-toolkit/react"
-import { useExtensionState } from "../../context/ExtensionStateContext"
 import { vscode } from "../../utils/vscode"
+import { PEARAI_URL } from "../../../../src/shared/api"
 
 const WelcomeView = () => {
 	const handleSubmit = () => {
 		vscode.postMessage({
 			type: "apiConfiguration",
 			apiConfiguration: {
 				apiProvider: "pearai",
-				pearaiApiKey: "temp", // TODO: Change this to use api-key
-				pearaiBaseUrl: "http://localhost:8000/integrations/cline",
+				pearaiBaseUrl: `${PEARAI_URL}/integrations/cline`,
 			},
 		})
 	}
 
 	return (
 		<div style={{ position: "fixed", top: 0, left: 0, right: 0, bottom: 0, padding: "0 20px" }}>
 			<h2>Welcome to PearAI's Coding Agent (Powered by Roo Code / Cline)!</h2>
-			<p>
-				I can do all kinds of tasks thanks to the latest breakthroughs in agentic coding capabilities and access
-				to tools that let me create & edit files, explore complex projects, use the browser, and execute
-				terminal commands (with your permission, of course). I can even use MCP to create new tools and extend
-				my own capabilities.
-			</p>
+			<p>Ask me to code new features or fix bugs!</p>
 
 			<div style={{ marginTop: "10px" }}>
 				<VSCodeButton onClick={handleSubmit} style={{ marginTop: "3px" }}>
-					Let's go!
+					Proceed
 				</VSCodeButton>
 			</div>
 		</div>