From 00256ff66c748907d2030b7f88fda3ce32ba0c43 Mon Sep 17 00:00:00 2001 From: nang-dev Date: Thu, 20 Feb 2025 17:41:42 -0500 Subject: [PATCH 1/3] Changed webview name --- package.json | 14 +++++++------- src/core/webview/ClineProvider.ts | 4 ++-- src/extension.ts | 2 +- src/shared/api.ts | 4 ++-- src/test/extension.test.ts | 19 ++++++++++++------- 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 76004563ad6..c6758698cca 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "pearai-roo-cline": [ { "type": "webview", - "id": "roo-cline.SidebarProvider", + "id": "pearai-roo-cline.SidebarProvider", "name": "" } ] @@ -157,32 +157,32 @@ { "command": "roo-cline.plusButtonClicked", "group": "navigation@1", - "when": "view == roo-cline.SidebarProvider" + "when": "view == pearai-roo-cline.SidebarProvider" }, { "command": "roo-cline.promptsButtonClicked", "group": "navigation@2", - "when": "view == roo-cline.SidebarProvider" + "when": "view == pearai-roo-cline.SidebarProvider" }, { "command": "roo-cline.mcpButtonClicked", "group": "navigation@3", - "when": "view == roo-cline.SidebarProvider" + "when": "view == pearai-roo-cline.SidebarProvider" }, { "command": "roo-cline.historyButtonClicked", "group": "navigation@4", - "when": "view == roo-cline.SidebarProvider" + "when": "view == pearai-roo-cline.SidebarProvider" }, { "command": "roo-cline.popoutButtonClicked", "group": "navigation@5", - "when": "view == roo-cline.SidebarProvider" + "when": "view == pearai-roo-cline.SidebarProvider" }, { "command": "roo-cline.settingsButtonClicked", "group": "navigation@6", - "when": "view == roo-cline.SidebarProvider" + "when": "view == pearai-roo-cline.SidebarProvider" } ] }, diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts index b0d70bd0164..304c968622f 100644 --- a/src/core/webview/ClineProvider.ts +++ b/src/core/webview/ClineProvider.ts @@ -141,7 +141,7 @@ export const GlobalFileNames = { } export class ClineProvider implements vscode.WebviewViewProvider { - public static readonly sideBarId = "roo-cline.SidebarProvider" // used in package.json as the view's id. This value cannot be changed due to how vscode caches views based on their id, and updating the id would break existing instances of the extension. + public static readonly sideBarId = "pearai-roo-cline.SidebarProvider" // used in package.json as the view's id. This value cannot be changed due to how vscode caches views based on their id, and updating the id would break existing instances of the extension. public static readonly tabPanelId = "roo-cline.TabPanelProvider" private static activeInstances: Set = new Set() private disposables: vscode.Disposable[] = [] @@ -204,7 +204,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { // If no visible provider, try to show the sidebar view if (!visibleProvider) { - await vscode.commands.executeCommand("roo-cline.SidebarProvider.focus") + await vscode.commands.executeCommand("pearai-roo-cline.SidebarProvider.focus") // Wait briefly for the view to become visible await delay(100) visibleProvider = ClineProvider.getVisibleInstance() diff --git a/src/extension.ts b/src/extension.ts index 7ae38da38f8..0afc6834786 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -274,7 +274,7 @@ export function activate(context: vscode.ExtensionContext) { context.subscriptions.push( vscode.commands.registerCommand("roo-cline.focus", async (...args: any[]) => { - await vscode.commands.executeCommand("roo-cline.SidebarProvider.focus") + await vscode.commands.executeCommand("pearai-roo-cline.SidebarProvider.focus") }), ) diff --git a/src/shared/api.ts b/src/shared/api.ts index 46d974afe21..fc7cc3f792f 100644 --- a/src/shared/api.ts +++ b/src/shared/api.ts @@ -623,6 +623,6 @@ export const unboundModels = { // CHANGE AS NEEDED FOR TESTING // PROD: -export const PEARAI_URL = "https://stingray-app-gb2an.ondigitalocean.app/pearai-server-api2/integrations/cline" +// 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" +export const PEARAI_URL = "http://localhost:8000/integrations/cline" diff --git a/src/test/extension.test.ts b/src/test/extension.test.ts index aa6b7802ace..6f158d7b5a2 100644 --- a/src/test/extension.test.ts +++ b/src/test/extension.test.ts @@ -135,7 +135,7 @@ suite("Roo Code Extension Test Suite", () => { test("Views should be registered", () => { const view = vscode.window.createWebviewPanel( - "roo-cline.SidebarProvider", + "pearai-roo-cline.SidebarProvider", "Roo Code", vscode.ViewColumn.One, {}, @@ -184,12 +184,17 @@ suite("Roo Code Extension Test Suite", () => { // Create webview panel with development options const extensionUri = extension.extensionUri - const panel = vscode.window.createWebviewPanel("roo-cline.SidebarProvider", "Roo Code", vscode.ViewColumn.One, { - enableScripts: true, - enableCommandUris: true, - retainContextWhenHidden: true, - localResourceRoots: [extensionUri], - }) + const panel = vscode.window.createWebviewPanel( + "pearai-roo-cline.SidebarProvider", + "Roo Code", + vscode.ViewColumn.One, + { + enableScripts: true, + enableCommandUris: true, + retainContextWhenHidden: true, + localResourceRoots: [extensionUri], + }, + ) try { // Initialize webview with development context From f3f069713aede7f95adf0d68a054d1220aa555ac Mon Sep 17 00:00:00 2001 From: nang-dev Date: Thu, 20 Feb 2025 18:23:20 -0500 Subject: [PATCH 2/3] Added send to app --- src/extension.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/extension.ts b/src/extension.ts index 0afc6834786..3bc661d0366 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -274,6 +274,13 @@ export function activate(context: vscode.ExtensionContext) { context.subscriptions.push( vscode.commands.registerCommand("roo-cline.focus", async (...args: any[]) => { + try { + await vscode.commands.executeCommand("workbench.action.switchToPearAIIntegrationIconBar", { + view: "agent", + }) + } catch (error) { + // Silently handle any errors that might occur when switching to the integration bar + } await vscode.commands.executeCommand("pearai-roo-cline.SidebarProvider.focus") }), ) From d6477e3b4bb3f924f7348548959f551d49b81f72 Mon Sep 17 00:00:00 2001 From: nang-dev Date: Thu, 20 Feb 2025 18:25:38 -0500 Subject: [PATCH 3/3] Reverted some files --- src/shared/api.ts | 4 ++-- src/test/extension.test.ts | 19 +++++++------------ 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/shared/api.ts b/src/shared/api.ts index fc7cc3f792f..46d974afe21 100644 --- a/src/shared/api.ts +++ b/src/shared/api.ts @@ -623,6 +623,6 @@ export const unboundModels = { // CHANGE AS NEEDED FOR TESTING // PROD: -// export const PEARAI_URL = "https://stingray-app-gb2an.ondigitalocean.app/pearai-server-api2/integrations/cline" +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" +// export const PEARAI_URL = "http://localhost:8000/integrations/cline" diff --git a/src/test/extension.test.ts b/src/test/extension.test.ts index 6f158d7b5a2..aa6b7802ace 100644 --- a/src/test/extension.test.ts +++ b/src/test/extension.test.ts @@ -135,7 +135,7 @@ suite("Roo Code Extension Test Suite", () => { test("Views should be registered", () => { const view = vscode.window.createWebviewPanel( - "pearai-roo-cline.SidebarProvider", + "roo-cline.SidebarProvider", "Roo Code", vscode.ViewColumn.One, {}, @@ -184,17 +184,12 @@ suite("Roo Code Extension Test Suite", () => { // Create webview panel with development options const extensionUri = extension.extensionUri - const panel = vscode.window.createWebviewPanel( - "pearai-roo-cline.SidebarProvider", - "Roo Code", - vscode.ViewColumn.One, - { - enableScripts: true, - enableCommandUris: true, - retainContextWhenHidden: true, - localResourceRoots: [extensionUri], - }, - ) + const panel = vscode.window.createWebviewPanel("roo-cline.SidebarProvider", "Roo Code", vscode.ViewColumn.One, { + enableScripts: true, + enableCommandUris: true, + retainContextWhenHidden: true, + localResourceRoots: [extensionUri], + }) try { // Initialize webview with development context