Allow Roo-Cline to coexist with Cline (#23)

Co-authored-by: ColemanRoo <[email protected]>

Author: mrubens

.github/workflows/marketplace-publish.yml

@@ -28,5 +28,5 @@ jobs:
         run: |
           current_package_version=$(node -p "require('./package.json').version")
           npm run vsix
-          npm run publish:marketplace
+          npm run publish:marketplace -- --pat VSCE_PAT
           echo "Successfully published version $current_package_version to VS Code Marketplace"

CHANGELOG.md

@@ -1,9 +1,10 @@
 # Change Log
 
-## Roo Cline 2.1.3
+## Roo Cline 2.1.4
 
 - Roo Cline now publishes to the VS Code Marketplace!
 - Roo Cline now allows browser actions without approval when `alwaysAllowBrowser` is true
+- Roo Cline now can run side-by-side with Cline
 
 ## [2.1.6]
 

package-lock.json

@@ -3,9 +3,9 @@
   "displayName": "Roo Cline",
   "description": "Autonomous coding agent right in your IDE, capable of creating/editing files, running commands, using the browser, and more with your permission every step of the way.",
   "publisher": "RooVeterinaryInc",
-  "version": "2.1.3", 
+  "version": "2.1.4",
   "files": [
-    "bin/roo-cline-2.1.3.vsix", 
+    "bin/roo-cline-2.1.4.vsix",
     "assets/icons/icon_Roo.png"
   ],
   "icon": "assets/icons/icon_Roo.png",
@@ -51,69 +51,69 @@
     "viewsContainers": {
       "activitybar": [
         {
-          "id": "claude-dev-ActivityBar",
-          "title": "Cline",
+          "id": "roo-cline-ActivityBar",
+          "title": "Roo Cline",
           "icon": "$(robot)"
         }
       ]
     },
     "views": {
-      "claude-dev-ActivityBar": [
+      "roo-cline-ActivityBar": [
         {
           "type": "webview",
-          "id": "claude-dev.SidebarProvider",
+          "id": "roo-cline.SidebarProvider",
           "name": ""
         }
       ]
     },
     "commands": [
       {
-        "command": "cline.plusButtonClicked",
+        "command": "roo-cline.plusButtonClicked",
         "title": "New Task",
         "icon": "$(add)"
       },
       {
-        "command": "cline.historyButtonClicked",
+        "command": "roo-cline.historyButtonClicked",
         "title": "History",
         "icon": "$(history)"
       },
       {
-        "command": "cline.popoutButtonClicked",
+        "command": "roo-cline.popoutButtonClicked",
         "title": "Open in Editor",
         "icon": "$(link-external)"
       },
       {
-        "command": "cline.settingsButtonClicked",
+        "command": "roo-cline.settingsButtonClicked",
         "title": "Settings",
         "icon": "$(settings-gear)"
       },
       {
-        "command": "cline.openInNewTab",
+        "command": "roo-cline.openInNewTab",
         "title": "Open In New Tab",
-        "category": "Cline"
+        "category": "Roo Cline"
       }
     ],
     "menus": {
       "view/title": [
         {
-          "command": "cline.plusButtonClicked",
+          "command": "roo-cline.plusButtonClicked",
           "group": "navigation@1",
-          "when": "view == claude-dev.SidebarProvider"
+          "when": "view == roo-cline.SidebarProvider"
         },
         {
-          "command": "cline.historyButtonClicked",
+          "command": "roo-cline.historyButtonClicked",
           "group": "navigation@2",
-          "when": "view == claude-dev.SidebarProvider"
+          "when": "view == roo-cline.SidebarProvider"
         },
         {
-          "command": "cline.popoutButtonClicked",
+          "command": "roo-cline.popoutButtonClicked",
           "group": "navigation@3",
-          "when": "view == claude-dev.SidebarProvider"
+          "when": "view == roo-cline.SidebarProvider"
         },
         {
-          "command": "cline.settingsButtonClicked",
+          "command": "roo-cline.settingsButtonClicked",
           "group": "navigation@4",
-          "when": "view == claude-dev.SidebarProvider"
+          "when": "view == roo-cline.SidebarProvider"
         }
       ]
     }
@@ -136,7 +136,7 @@
     "start:webview": "cd webview-ui && npm run start",
     "build:webview": "cd webview-ui && npm run build",
     "test:webview": "cd webview-ui && npm run test",
-    "publish:marketplace": "vsce publish && ovsx publish"
+    "publish:marketplace": "vsce publish"
   },
   "devDependencies": {
     "@types/diff": "^5.2.1",

package.json

@@ -68,8 +68,8 @@ export const GlobalFileNames = {
 }
 
 export class ClineProvider implements vscode.WebviewViewProvider {
-	public static readonly sideBarId = "claude-dev.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 = "claude-dev.TabPanelProvider"
+	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 tabPanelId = "roo-cline.TabPanelProvider"
 	private static activeInstances: Set<ClineProvider> = new Set()
 	private disposables: vscode.Disposable[] = []
 	private view?: vscode.WebviewView | vscode.WebviewPanel

src/core/webview/ClineProvider.ts

@@ -35,7 +35,7 @@ export function activate(context: vscode.ExtensionContext) {
 	)
 
 	context.subscriptions.push(
-		vscode.commands.registerCommand("cline.plusButtonClicked", async () => {
+		vscode.commands.registerCommand("roo-cline.plusButtonClicked", async () => {
 			outputChannel.appendLine("Plus button Clicked")
 			await sidebarProvider.clearTask()
 			await sidebarProvider.postStateToWebview()
@@ -76,18 +76,18 @@ export function activate(context: vscode.ExtensionContext) {
 		await vscode.commands.executeCommand("workbench.action.lockEditorGroup")
 	}
 
-	context.subscriptions.push(vscode.commands.registerCommand("cline.popoutButtonClicked", openClineInNewTab))
-	context.subscriptions.push(vscode.commands.registerCommand("cline.openInNewTab", openClineInNewTab))
+	context.subscriptions.push(vscode.commands.registerCommand("roo-cline.popoutButtonClicked", openClineInNewTab))
+	context.subscriptions.push(vscode.commands.registerCommand("roo-cline.openInNewTab", openClineInNewTab))
 
 	context.subscriptions.push(
-		vscode.commands.registerCommand("cline.settingsButtonClicked", () => {
+		vscode.commands.registerCommand("roo-cline.settingsButtonClicked", () => {
 			//vscode.window.showInformationMessage(message)
 			sidebarProvider.postMessageToWebview({ type: "action", action: "settingsButtonClicked" })
 		}),
 	)
 
 	context.subscriptions.push(
-		vscode.commands.registerCommand("cline.historyButtonClicked", () => {
+		vscode.commands.registerCommand("roo-cline.historyButtonClicked", () => {
 			sidebarProvider.postMessageToWebview({ type: "action", action: "historyButtonClicked" })
 		}),
 	)