creator 5

package.json

@@ -393,6 +393,7 @@
 		"pretty-bytes": "^6.1.1",
 		"puppeteer-chromium-resolver": "^23.0.0",
 		"puppeteer-core": "^23.4.0",
+		"react-dev-inspector": "^2.0.1",
 		"react-tooltip": "^5.28.0",
 		"reconnecting-eventsource": "^1.6.4",
 		"say": "^0.16.0",

src/activate/registerCommands.ts

@@ -85,6 +85,48 @@ const getCommandsMap = ({ context, outputChannel, provider }: RegisterCommandOpt
 		"roo-cline.registerHumanRelayCallback": registerHumanRelayCallback,
 		"roo-cline.unregisterHumanRelayCallback": unregisterHumanRelayCallback,
 		"roo-cline.handleHumanRelayResponse": handleHumanRelayResponse,
+		"roo-cline.createInAgent": async (args: any) => {
+			const sidebarProvider = ClineProvider.getSidebarInstance()
+			if (sidebarProvider) {
+				// Start a new chat in the sidebar
+				vscode.commands.executeCommand("pearai-roo-cline.SidebarProvider.focus")
+				await sidebarProvider.handleModeSwitch("code", args.creatorMode)
+				await sidebarProvider.postStateToWebview()
+				await sidebarProvider.postMessageToWebview({ type: "action", action: "chatButtonClicked" })
+
+				await sidebarProvider.initClineWithTask(args.text, undefined, undefined, args.creatorMode)
+			}
+		},
+		"roo-cline.executeCreatorPlan": async (args: any) => {
+			const sidebarProvider = ClineProvider.getSidebarInstance()
+			if (sidebarProvider) {
+				// Start a new chat in the sidebar
+				vscode.commands.executeCommand("pearai-roo-cline.SidebarProvider.focus")
+				await sidebarProvider.handleModeSwitch("code")
+				await sidebarProvider.postStateToWebview()
+				await sidebarProvider.postMessageToWebview({ type: "action", action: "chatButtonClicked" })
+
+				// Create the template message using the args
+				// Todo: add structure to it i.e. You should have these sections: Architecutre, Features, etc.
+				let executePlanTemplate = `This file contains detailed plan to my task. please read it and Execute the plan accordingly.
+					File: ${args.filePath || "No file specified"}`
+
+				if (args.code) {
+					executePlanTemplate += `Code: \`\`\`
+						${args.code}
+						\`\`\`
+					`
+				}
+
+				if (args.context) {
+					executePlanTemplate += `Additional context: ${args.context}`
+				}
+
+				args.text = executePlanTemplate
+
+				await sidebarProvider.initClineWithTask(args.text, undefined, undefined, true)
+			}
+		},
 	}
 }
 
@@ -93,20 +135,20 @@ const openClineInNewTab = async ({ context, outputChannel }: Omit<RegisterComman
 	// deserialize cached webview, but since we use retainContextWhenHidden, we
 	// don't need to use that event).
 	// https://github.com/microsoft/vscode-extension-samples/blob/main/webview-sample/src/extension.ts
-	const tabProvider = new ClineProvider(context, outputChannel, "editor")
+	const tabProvider = new ClineProvider(context, outputChannel, "editor", true)
 	const lastCol = Math.max(...vscode.window.visibleTextEditors.map((editor) => editor.viewColumn || 0))
 
 	// Check if there are any visible text editors, otherwise open a new group
 	// to the right.
-	const hasVisibleEditors = vscode.window.visibleTextEditors.length > 0
+	// const hasVisibleEditors = vscode.window.visibleTextEditors.length > 0
 
-	if (!hasVisibleEditors) {
-		await vscode.commands.executeCommand("workbench.action.newGroupRight")
-	}
+	// if (!hasVisibleEditors) {
+	// 	await vscode.commands.executeCommand("workbench.action.newGroupRight")
+	// }
 
-	const targetCol = hasVisibleEditors ? Math.max(lastCol + 1, 1) : vscode.ViewColumn.Two
+	// const targetCol = hasVisibleEditors ? Math.max(lastCol + 1, 1) : vscode.ViewColumn.Two
 
-	const newPanel = vscode.window.createWebviewPanel(ClineProvider.tabPanelId, "Roo Code", targetCol, {
+	const newPanel = vscode.window.createWebviewPanel(ClineProvider.tabPanelId, "Roo Code", vscode.ViewColumn.One, {
 		enableScripts: true,
 		retainContextWhenHidden: true,
 		localResourceRoots: [context.extensionUri],
@@ -131,5 +173,5 @@ const openClineInNewTab = async ({ context, outputChannel }: Omit<RegisterComman
 
 	// Lock the editor group so clicking on files doesn't open them over the panel.
 	await delay(100)
-	await vscode.commands.executeCommand("workbench.action.lockEditorGroup")
+	// await vscode.commands.executeCommand("workbench.action.lockEditorGroup")
 }

src/api/providers/anthropic.ts

@@ -99,7 +99,10 @@ export class AnthropicHandler extends BaseProvider implements SingleCompletionHa
 							case "claude-3-haiku-20240307":
 								betas.push("prompt-caching-2024-07-31")
 								return {
-									headers: { "anthropic-beta": betas.join(",") },
+									headers: {
+										"anthropic-beta": betas.join(","),
+										"creator-mode": String(this.options.creatorMode),
+									},
 									authorization: `Bearer ${this.options.apiKey}`,
 								}
 							default:

src/api/providers/pearai.ts

@@ -42,6 +42,7 @@ export class PearAiHandler extends BaseProvider implements SingleCompletionHandl
 			apiKey: options.pearaiApiKey,
 			anthropicBaseUrl: PEARAI_URL,
 			apiModelId: "claude-3-5-sonnet-20241022",
+			creatorMode: options.creatorMode,
 		})
 
 		// Then try to initialize the correct handler asynchronously
@@ -68,6 +69,7 @@ export class PearAiHandler extends BaseProvider implements SingleCompletionHandl
 						deepSeekApiKey: options.pearaiApiKey,
 						deepSeekBaseUrl: PEARAI_URL,
 						apiModelId: underlyingModel,
+						creatorMode: options.creatorMode,
 					})
 				} else {
 					// Default to Claude
@@ -76,6 +78,7 @@ export class PearAiHandler extends BaseProvider implements SingleCompletionHandl
 						apiKey: options.pearaiApiKey,
 						anthropicBaseUrl: PEARAI_URL,
 						apiModelId: underlyingModel,
+						creatorMode: options.creatorMode,
 					})
 				}
 			} catch (error) {
@@ -86,6 +89,7 @@ export class PearAiHandler extends BaseProvider implements SingleCompletionHandl
 					apiKey: options.pearaiApiKey,
 					anthropicBaseUrl: PEARAI_URL,
 					apiModelId: "claude-3-5-sonnet-20241022",
+					creatorMode: options.creatorMode,
 				})
 			}
 		} else if (modelId.startsWith("claude")) {

src/core/Cline.ts

@@ -1312,7 +1312,7 @@ export class Cline extends EventEmitter<ClineEvents> {
 					// (have to do this for partial and complete since sending content in thinking tags to markdown renderer will automatically be removed)
 					// Remove end substrings of <thinking or </thinking (below xml parsing is only for opening tags)
 					// (this is done with the xml parsing below now, but keeping here for reference)
-					// content = content.replace(/<\/?t(?:h(?:i(?:n(?:k(?:i(?:n(?:g)?)?)?$/, "")
+					// content = content.replace(/<\/?t(?:h(?:i(?:n(?:k(?:i(?:n(?:g)?)?)?)?$/, "")
 					// Remove all instances of <thinking> (with optional line break after) and </thinking> (with optional line break before)
 					// - Needs to be separate since we dont want to remove the line break before the first tag
 					// - Needs to happen before the xml parsing below
@@ -1390,6 +1390,7 @@ export class Cline extends EventEmitter<ClineEvents> {
 							return `[${block.name} in ${modeName} mode: '${message}']`
 						}
 					}
+					return `[${block.name}]`
 				}
 
 				if (this.didRejectTool) {

src/core/webview/ClineProvider.ts

@@ -67,6 +67,13 @@ import { getUri } from "./getUri"
 import { telemetryService } from "../../services/telemetry/TelemetryService"
 import { TelemetrySetting } from "../../shared/TelemetrySetting"
 import { getWorkspacePath } from "../../utils/path"
+import { readWorkspaceFile, writeWorkspaceFile } from "../../integrations/misc/workspace-files"
+
+/*
+https://github.com/microsoft/vscode-webview-ui-toolkit-samples/blob/main/default/weather-webview/src/providers/WeatherViewProvider.ts
+
+https://github.com/KumarVariable/vscode-extension-sidebar-html/blob/master/src/customSidebarViewProvider.ts
+*/
 
 /**
  * https://github.com/microsoft/vscode-webview-ui-toolkit-samples/blob/main/default/weather-webview/src/providers/WeatherViewProvider.ts
@@ -91,16 +98,21 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 	private contextProxy: ContextProxy
 	configManager: ConfigManager
 	customModesManager: CustomModesManager
+	private isCreatorView: boolean = false
 	get cwd() {
 		return getWorkspacePath()
 	}
 	constructor(
 		readonly context: vscode.ExtensionContext,
 		private readonly outputChannel: vscode.OutputChannel,
 		private readonly renderContext: "sidebar" | "editor" = "sidebar",
+		isCreatorView: boolean = false,
 	) {
 		super()
-
+		this.outputChannel.appendLine(`creator = ${isCreatorView}`)
+		this.isCreatorView = isCreatorView
+		console.dir("CREATOR")
+		console.dir(this.isCreatorView)
 		this.outputChannel.appendLine("ClineProvider instantiated")
 		this.contextProxy = new ContextProxy(context)
 		ClineProvider.activeInstances.add(this)
@@ -236,6 +248,16 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 		McpServerManager.unregisterProvider(this)
 	}
 
+	public static getSidebarInstance(): ClineProvider | undefined {
+		const sidebar = Array.from(this.activeInstances).find((instance) => !instance.isCreatorView)
+
+		if (!sidebar?.view?.visible) {
+			vscode.commands.executeCommand("pearai-roo-cline.SidebarProvider.focus")
+		}
+
+		return sidebar
+	}
+
 	public static getVisibleInstance(): ClineProvider | undefined {
 		return findLast(Array.from(this.activeInstances), (instance) => instance.view?.visible === true)
 	}
@@ -455,7 +477,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 	// when initializing a new task, (not from history but from a tool command new_task) there is no need to remove the previouse task
 	// since the new task is a sub task of the previous one, and when it finishes it is removed from the stack and the caller is resumed
 	// in this way we can have a chain of tasks, each one being a sub task of the previous one until the main task is finished
-	public async initClineWithTask(task?: string, images?: string[], parentTask?: Cline) {
+	public async initClineWithTask(task?: string, images?: string[], parentTask?: Cline, creatorMode?: boolean) {
 		const {
 			apiConfiguration,
 			customModePrompts,
@@ -473,7 +495,10 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 
 		const cline = new Cline({
 			provider: this,
-			apiConfiguration,
+			apiConfiguration: {
+				...apiConfiguration,
+				creatorMode: creatorMode,
+			},
 			customInstructions: effectiveInstructions,
 			enableDiff,
 			enableCheckpoints,
@@ -494,7 +519,10 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 		return cline
 	}
 
-	public async initClineWithHistoryItem(historyItem: HistoryItem & { rootTask?: Cline; parentTask?: Cline }) {
+	public async initClineWithHistoryItem(
+		historyItem: HistoryItem & { rootTask?: Cline; parentTask?: Cline },
+		creatorMode?: boolean,
+	) {
 		await this.removeClineFromStack()
 
 		const {
@@ -540,7 +568,10 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 
 		const cline = new Cline({
 			provider: this,
-			apiConfiguration,
+			apiConfiguration: {
+				...apiConfiguration,
+				creatorMode: creatorMode,
+			},
 			customInstructions: effectiveInstructions,
 			enableDiff,
 			...checkpoints,
@@ -603,6 +634,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 				window.$RefreshReg$ = () => {}
 				window.$RefreshSig$ = () => (type) => type
 				window.__vite_plugin_react_preamble_installed__ = true
+				window.isCreator="${this.isCreatorView}";
 			</script>
 		`
 
@@ -615,6 +647,8 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 			`connect-src https://* https://*.posthog.com ws://${localServerUrl} ws://0.0.0.0:${localPort} http://${localServerUrl} http://0.0.0.0:${localPort} http://localhost:8000 http://0.0.0.0:8000 https://stingray-app-gb2an.ondigitalocean.app`,
 		]
 
+		console.dir("CREATORRRRRR")
+		console.dir(this.isCreatorView)
 		return /*html*/ `
 			<!DOCTYPE html>
 			<html lang="en">
@@ -2033,6 +2067,47 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 							),
 						)
 						break
+					case "readWorkspaceFile":
+						if (message.values?.relativePath) {
+							const result = await readWorkspaceFile(message.values.relativePath, {
+								create: message.values.create,
+								ensureDirectory: message.values.ensureDirectory,
+								content: message.values.content,
+							})
+							await this.postMessageToWebview(result)
+						}
+						break
+					case "writeWorkspaceFile":
+						if (message.values?.relativePath && message.values?.content !== undefined) {
+							const result = await writeWorkspaceFile(message.values.relativePath, {
+								create: message.values.create,
+								ensureDirectory: message.values.ensureDirectory,
+								content: message.values.content,
+							})
+							await this.postMessageToWebview(result)
+						}
+						break
+					case "invoke":
+						switch (message.invoke) {
+							case "sendMessage":
+								if (message.text) {
+									await this.getCurrentCline()?.ask("followup", message.text, false)
+								}
+								break
+							case "setChatBoxMessage":
+								if (message.text) {
+									await this.getCurrentCline()?.ask("followup", message.text, false)
+								}
+								break
+							case "executeCommand":
+								if (message.command) {
+									await vscode.commands.executeCommand(message.command, message.args)
+								}
+								break
+							default:
+								console.warn("Unknown invoke:", message.invoke)
+						}
+						break
 				}
 			},
 			null,
@@ -2096,7 +2171,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 	 * Handle switching to a new mode, including updating the associated API configuration
 	 * @param newMode The mode to switch to
 	 */
-	public async handleModeSwitch(newMode: Mode) {
+	public async handleModeSwitch(newMode: Mode, creatorMode?: boolean) {
 		// Capture mode switch telemetry event
 		const currentTaskId = this.getCurrentCline()?.taskId
 		if (currentTaskId) {

src/extension.ts

@@ -62,7 +62,7 @@ export function activate(context: vscode.ExtensionContext) {
 		context.globalState.update("allowedCommands", defaultCommands)
 	}
 
-	const provider = new ClineProvider(context, outputChannel, "sidebar")
+	const provider = new ClineProvider(context, outputChannel, "sidebar", false)
 	telemetryService.setProvider(provider)
 
 	context.subscriptions.push(
@@ -177,7 +177,7 @@ export function activate(context: vscode.ExtensionContext) {
 
 		// Lock the editor group so clicking on files doesn't open them over the panel
 		await delay(100)
-		await vscode.commands.executeCommand("workbench.action.lockEditorGroup")
+		// await vscode.commands.executeCommand("workbench.action.lockEditorGroup")
 	}
 
 	// context.subscriptions.push(vscode.commands.registerCommand("roo-cline.popoutButtonClicked", openClineInNewTab))

src/integrations/editor/DiffViewProvider.ts

@@ -163,7 +163,7 @@ export class DiffViewProvider {
 		Getting diagnostics before and after the file edit is a better approach than
 		automatically tracking problems in real-time. This method ensures we only
 		report new problems that are a direct result of this specific edit.
-		Since these are new problems resulting from Roo's edit, we know they're
+		Since these are new problems resulting from Agent's edit, we know they're
 		directly related to the work he's doing. This eliminates the risk of Roo
 		going off-task or getting distracted by unrelated issues, which was a problem
 		with the previous auto-debug approach. Some users' machines may be slow to
@@ -299,7 +299,7 @@ export class DiffViewProvider {
 					query: Buffer.from(this.originalContent ?? "").toString("base64"),
 				}),
 				uri,
-				`${fileName}: ${fileExists ? "Original ↔ Roo's Changes" : "New File"} (Editable)`,
+				`${fileName}: ${fileExists ? "Original ↔ Agent's Changes" : "New File"} (Editable)`,
 			)
 			// This may happen on very slow machines ie project idx
 			setTimeout(() => {