fix: sending roo code when we're in creator mode

Author: Acorn221

src/core/Cline.ts

@@ -115,6 +115,7 @@ export type ClineOptions = {
 	rootTask?: Cline
 	parentTask?: Cline
 	taskNumber?: number
+	creatorMode?: boolean
 }
 
 export class Cline extends EventEmitter<ClineEvents> {
@@ -131,6 +132,7 @@ export class Cline extends EventEmitter<ClineEvents> {
 	private pausedModeSlug: string = defaultModeSlug
 	private pauseInterval: NodeJS.Timeout | undefined
 
+	public creatorMode: boolean
 	readonly apiConfiguration: ApiConfiguration
 	api: ApiHandler
 	private urlContentFetcher: UrlContentFetcher
@@ -192,6 +194,7 @@ export class Cline extends EventEmitter<ClineEvents> {
 		rootTask,
 		parentTask,
 		taskNumber,
+		creatorMode,
 	}: ClineOptions) {
 		super()
 
@@ -219,6 +222,8 @@ export class Cline extends EventEmitter<ClineEvents> {
 		this.enableCheckpoints = enableCheckpoints
 		this.checkpointStorage = checkpointStorage
 
+		this.creatorMode = creatorMode ?? false
+
 		this.rootTask = rootTask
 		this.parentTask = parentTask
 		this.taskNumber = taskNumber ?? -1

src/core/webview/ClineProvider.ts

@@ -501,6 +501,15 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 			experiments,
 		} = await this.getState()
 
+		// Update API configuration with creator mode
+		await this.updateApiConfiguration({
+			...apiConfiguration,
+			creatorMode,
+		})
+
+		// Post updated state to webview immediately
+		await this.postStateToWebview()
+
 		const modePrompt = customModePrompts?.[mode] as PromptComponent
 		const effectiveInstructions = [globalInstructions, modePrompt?.customInstructions].filter(Boolean).join("\n\n")
 
@@ -524,6 +533,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 			rootTask: this.clineStack.length > 0 ? this.clineStack[0] : undefined,
 			parentTask,
 			taskNumber: this.clineStack.length + 1,
+			creatorMode,
 		})
 
 		await this.addClineToStack(cline)
@@ -2175,6 +2185,13 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 	private async updateApiConfiguration(apiConfiguration: ApiConfiguration) {
 		// Update mode's default config.
 		const { mode } = await this.getState()
+		const currentCline = this.getCurrentCline()
+
+		// Preserve creator mode when updating configuration
+		const updatedConfig = {
+			...apiConfiguration,
+			creatorMode: currentCline?.creatorMode,
+		}
 
 		if (mode) {
 			const currentApiConfigName = await this.getGlobalState("currentApiConfigName")
@@ -2186,7 +2203,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 			}
 		}
 
-		await this.contextProxy.setApiConfiguration(apiConfiguration)
+		await this.contextProxy.setApiConfiguration(updatedConfig)
 
 		if (this.getCurrentCline()) {
 			this.getCurrentCline()!.api = buildApiHandler(apiConfiguration)
@@ -2511,8 +2528,10 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 	}
 
 	async getStateToPostToWebview() {
+		const currentCline = this.getCurrentCline()
+		// Get base state
 		const {
-			apiConfiguration,
+			apiConfiguration: baseApiConfiguration,
 			lastShownAnnouncementId,
 			customInstructions,
 			alwaysAllowReadOnly,
@@ -2560,6 +2579,12 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 			maxReadFileLine,
 		} = await this.getState()
 
+		// Construct API configuration with creator mode
+		const apiConfiguration = {
+			...baseApiConfiguration,
+			creatorMode: currentCline?.creatorMode,
+		}
+
 		const telemetryKey = process.env.POSTHOG_API_KEY
 		const machineId = vscode.env.machineId
 		const allowedCommands = vscode.workspace.getConfiguration("roo-cline").get<string[]>("allowedCommands") || []

src/shared/api.ts

@@ -85,12 +85,12 @@ export interface ApiHandlerOptions {
 	pearaiAgentModels?: PearAIAgentModelsConfig
 	modelMaxThinkingTokens?: number
 	fakeAi?: unknown
+	creatorMode?: boolean
 }
 
 export type ApiConfiguration = ApiHandlerOptions & {
 	apiProvider?: ApiProvider
 	id?: string // stable unique identifier
-	creatorMode?: boolean
 }
 
 // Import GlobalStateKey type from globalState.ts

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

@@ -1607,8 +1607,8 @@ export function normalizeApiConfiguration(
 			if (modelId === "pearai-model" && models[modelId].underlyingModelUpdated) {
 				let modelInfo = models[modelId].underlyingModelUpdated
 				selectedModelInfo = {
-					contextWindow: modelInfo.contextWindow || 4096, // provide default or actual value
-					supportsPromptCache: modelInfo.supportsPromptCaching || false, // provide default or actual value
+					contextWindow: modelInfo.contextWindow || 4096,
+					supportsPromptCache: modelInfo.supportsPromptCaching || false,
 					...modelInfo,
 				}
 			} else {
@@ -1619,7 +1619,13 @@ export function normalizeApiConfiguration(
 			selectedModelInfo = models[defaultId]
 		}
 
-		return { selectedProvider: provider, selectedModelId, selectedModelInfo }
+		// Preserve all original configuration fields while updating model-specific ones
+		return {
+			selectedProvider: provider,
+			selectedModelId,
+			selectedModelInfo,
+			...apiConfiguration,
+		}
 	}
 
 	switch (provider) {
@@ -1705,8 +1711,16 @@ export function normalizeApiConfiguration(
 			}
 		case "pearai": {
 			// Always use the models from the hook which are fetched when provider is selected
-			let query = pearAiModelsQuery
-			return getProviderData(pearAiModelsQuery || {}, pearAiDefaultModelId)
+			const { selectedProvider, selectedModelId, selectedModelInfo } = getProviderData(
+				pearAiModelsQuery || {},
+				pearAiDefaultModelId,
+			)
+			return {
+				selectedProvider,
+				selectedModelId,
+				selectedModelInfo,
+				creatorMode: apiConfiguration?.creatorMode,
+			}
 		}
 		default:
 			return getProviderData(anthropicModels, anthropicDefaultModelId)