Merge branch 'acorn/creator-rebase' into feat/creator-mode

Author: Acorn221

src/activate/index.ts

@@ -2,3 +2,4 @@ export { handleUri } from "./handleUri"
 export { registerCommands } from "./registerCommands"
 export { registerCodeActions } from "./registerCodeActions"
 export { registerTerminalActions } from "./registerTerminalActions"
+export { registerPearListener } from "./registerPearListener"

src/activate/registerPearListener.ts

@@ -0,0 +1,110 @@
+import * as vscode from "vscode"
+import { ClineProvider } from "../core/webview/ClineProvider"
+import { assert } from "../utils/util"
+
+export const getPearaiExtension = async () => {
+	const pearAiExtension = vscode.extensions.getExtension("pearai.pearai")
+
+	assert(!!pearAiExtension, "PearAI extension not found")
+
+	if (!pearAiExtension.isActive) {
+		await pearAiExtension.activate()
+	}
+
+	return pearAiExtension
+}
+
+// TODO: TYPES
+export const getpearAIExports = async () => {
+	const pearAiExtension = await getPearaiExtension()
+
+	assert(!!pearAiExtension.exports, "⚠️⚠️ Error, no PearAI Exports could be found :( ⚠️⚠️");
+
+	return pearAiExtension.exports;
+}
+ 
+// TODO: SHOULD HAVE TYPE SYNCED WITH THE PEARAI SUBMODULE!
+type CreatorModeState = "OVERLAY_CLOSED" | "OVERLAY_OPEN" | "OVERLAY_CLOSED_CREATOR_ACTIVE"
+
+export const registerPearListener = async (provider: ClineProvider) => {
+	// Getting the pear ai extension instance
+	const exports = await getpearAIExports()
+
+	exports.pearAPI.creatorMode.onDidRequestExecutePlan(async (msg: any) => {
+		console.dir(`onDidRequestNewTask triggered with: ${JSON.stringify(msg)}`)
+
+		let canContinue = false;
+
+		while(!canContinue) {
+			await new Promise((resolve) => setTimeout(resolve, 10));
+			canContinue = provider.viewLaunched && provider.isViewLaunched;
+		}
+
+
+		// Get the sidebar provider
+		// Focus the sidebar first
+		await vscode.commands.executeCommand("pearai-roo-cline.SidebarProvider.focus")
+
+		// Wait for the view to be ready using a helper function
+		await ensureViewIsReady(provider)
+		// Wait a brief moment for UI to update
+		await new Promise((resolve) => setTimeout(resolve, 3000))
+
+		// * This does actually work but the UI update does not happen. This method calls this.postStateToWebview() so not sure what is going on - James
+		await provider.handleModeSwitch("Creator")
+
+		// Clicl the chat btn
+		await provider.postMessageToWebview({ type: "action", action: "chatButtonClicked" })
+
+		const creatorModeConfig = {
+			creatorMode: true,
+			newProjectType: msg.newProjectType,
+			newProjectPath: msg.newProjectPath,
+		}
+
+
+		// Initialize with task
+		await provider.initClineWithTask(msg.plan, undefined, undefined, undefined, creatorModeConfig);
+	});
+	// If there's a creator event in the cache after the extensions were refreshed, we need to get it!
+	exports.pearAPI.creatorMode.triggerCachedCreatorEvent(true);
+
+	exports.pearAPI.creatorMode.onDidChangeCreatorModeState(async (state: CreatorModeState) => {
+		// Get the sidebar provider
+		const sidebarProvider = ClineProvider.getVisibleInstance();
+		
+		if (sidebarProvider) {
+			// Send a message to the webview that will trigger a window event
+			sidebarProvider.postMessageToWebview({
+				type: "creatorModeUpdate",
+				text: state,
+			});
+		}
+	});
+
+}
+
+// TODO: decide if this is needed
+// Helper function to ensure the webview is ready
+async function ensureViewIsReady(provider: ClineProvider): Promise<void> {
+	// If the view is already launched, we're good to go
+	if (provider.viewLaunched) {
+		return
+	}
+
+	// Otherwise, we need to wait for it to initialize
+	return new Promise<void>((resolve) => {
+		// Set up a one-time listener for when the view is ready
+		const disposable = provider.on("clineCreated", () => {
+			// Clean up the listener
+			disposable.dispose()
+			resolve()
+		})
+
+		// Set a timeout just in case
+		setTimeout(() => {
+			disposable.dispose()
+			resolve()
+		}, 5000)
+	})
+}

src/api/providers/anthropic.ts

@@ -105,9 +105,18 @@ export class AnthropicHandler extends BaseProvider implements SingleCompletionHa
 							case "claude-3-opus-20240229":
 							case "claude-3-haiku-20240307":
 								betas.push("prompt-caching-2024-07-31")
+								// Include prompt_key if newProjectType is set
 								return {
-									headers: { "anthropic-beta": betas.join(",") },
-									authorization: `Bearer ${this.options.apiKey}`,
+									headers: {
+										"anthropic-beta": betas.join(","),
+										prompt_key: this.options.creatorModeConfig?.newProjectType
+											? String(this.options.creatorModeConfig.newProjectType)
+											: undefined,
+										project_path: this.options.creatorModeConfig?.newProjectPath
+											? String(this.options.creatorModeConfig.newProjectPath)
+											: undefined,
+										authorization: `Bearer ${this.options.apiKey}`,
+									},
 								}
 							default:
 								return undefined

src/core/Cline.ts

@@ -11,7 +11,7 @@ import { serializeError } from "serialize-error"
 import * as vscode from "vscode"
 
 // schemas
-import { TokenUsage, ToolUsage, ToolName, ModelInfo } from "../schemas"
+import { TokenUsage, ToolUsage, ToolName, ModelInfo, CreatorModeConfig } from "../schemas"
 
 // api
 import { ApiHandler, buildApiHandler } from "../api"
@@ -127,6 +127,7 @@ export type ClineOptions = {
 	taskNumber?: number
 	onCreated?: (cline: Cline) => void
 	pearaiModels?: Record<string, ModelInfo>
+	creatorModeConfig?: CreatorModeConfig
 }
 
 export class Cline extends EventEmitter<ClineEvents> {
@@ -142,6 +143,7 @@ export class Cline extends EventEmitter<ClineEvents> {
 	pausedModeSlug: string = defaultModeSlug
 	private pauseInterval: NodeJS.Timeout | undefined
 
+	public creatorModeConfig: CreatorModeConfig
 	readonly apiConfiguration: ApiConfiguration
 	api: ApiHandler
 	private promptCacheKey: string
@@ -220,6 +222,7 @@ export class Cline extends EventEmitter<ClineEvents> {
 		parentTask,
 		taskNumber = -1,
 		onCreated,
+		creatorModeConfig,
 	}: ClineOptions) {
 		super()
 
@@ -257,6 +260,8 @@ export class Cline extends EventEmitter<ClineEvents> {
 		this.diffViewProvider = new DiffViewProvider(this.cwd)
 		this.enableCheckpoints = enableCheckpoints
 
+		this.creatorModeConfig = creatorModeConfig ?? historyItem?.creatorModeConfig ?? { creatorMode: false }
+
 		this.rootTask = rootTask
 		this.parentTask = parentTask
 		this.taskNumber = taskNumber
@@ -371,6 +376,7 @@ export class Cline extends EventEmitter<ClineEvents> {
 				taskNumber: this.taskNumber,
 				globalStoragePath: this.globalStoragePath,
 				workspace: this.cwd,
+				creatorModeConfig: this.creatorModeConfig,
 			})
 
 			this.emit("taskTokenUsageUpdated", this.taskId, tokenUsage)

src/core/task-persistence/taskMetadata.ts

@@ -17,6 +17,11 @@ export type TaskMetadataOptions = {
 	taskNumber: number
 	globalStoragePath: string
 	workspace: string
+	creatorModeConfig?: {
+		creatorMode?: boolean
+		newProjectType?: string
+		newProjectPath?: string
+	}
 }
 
 export async function taskMetadata({
@@ -25,6 +30,7 @@ export async function taskMetadata({
 	taskNumber,
 	globalStoragePath,
 	workspace,
+	creatorModeConfig,
 }: TaskMetadataOptions) {
 	const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
 	const taskMessage = messages[0] // First message is always the task say.
@@ -57,6 +63,7 @@ export async function taskMetadata({
 		totalCost: tokenUsage.totalCost,
 		size: taskDirSize,
 		workspace,
+		creatorModeConfig,
 	}
 
 	return { historyItem, tokenUsage }