feat: creator mode state management in roo

Acorn221 · Acorn221 · commit 2e4e456d3740 · 2025-05-10T15:21:49.000+01:00
diff --git a/src/core/Cline.ts b/src/core/Cline.ts
@@ -260,7 +260,7 @@ export class Cline extends EventEmitter<ClineEvents> {
 		this.diffViewProvider = new DiffViewProvider(this.cwd)
 		this.enableCheckpoints = enableCheckpoints
 
-		this.creatorModeConfig = creatorModeConfig ?? { creatorMode: false }
+		this.creatorModeConfig = creatorModeConfig ?? historyItem?.creatorModeConfig ?? { creatorMode: false }
 
 		this.rootTask = rootTask
 		this.parentTask = parentTask
@@ -376,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)
diff --git a/src/core/task-persistence/taskMetadata.ts b/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 }
diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts
@@ -540,7 +540,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 },
+		options?: { creatorModeConfig?: CreatorModeConfig }
+	) {
 		await this.removeClineFromStack()
 
 		const {
@@ -571,6 +574,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 			parentTask: historyItem.parentTask,
 			taskNumber: historyItem.number,
 			onCreated: (cline) => this.emit("clineCreated", cline),
+			creatorModeConfig: options?.creatorModeConfig,
 		})
 
 		await this.addClineToStack(cline)
@@ -886,6 +890,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 		// Preserve parent and root task information for history item.
 		const rootTask = cline.rootTask
 		const parentTask = cline.parentTask
+		const creatorModeConfig = cline.creatorModeConfig
 
 		cline.abortTask()
 
@@ -913,7 +918,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 		}
 
 		// Clears task again, so we need to abortTask manually above.
-		await this.initClineWithHistoryItem({ ...historyItem, rootTask, parentTask })
+		await this.initClineWithHistoryItem({ ...historyItem, rootTask, parentTask }, { creatorModeConfig })
 	}
 
 	async updateCustomInstructions(instructions?: string) {
@@ -1101,7 +1106,8 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 		if (id !== this.getCurrentCline()?.taskId) {
 			// Non-current task.
 			const { historyItem } = await this.getTaskWithId(id)
-			await this.initClineWithHistoryItem(historyItem) // Clears existing task.
+			const creatorModeConfig = this.getCurrentCline()?.creatorModeConfig
+			await this.initClineWithHistoryItem(historyItem, { creatorModeConfig }) // Clears existing task.
 		}
 
 		await this.postMessageToWebview({ type: "action", action: "chatButtonClicked" })
@@ -1243,10 +1249,9 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 			historyPreviewCollapsed,
 		} = await this.getState()
 
-		// Construct API configuration with creator mode
+		const creatorModeConfig = currentCline?.creatorModeConfig;
 		const apiConfiguration = {
-			...baseApiConfiguration,
-			creatorModeConfig: currentCline?.creatorModeConfig,
+			...baseApiConfiguration
 		}
 
 		const telemetryKey = process.env.POSTHOG_API_KEY
@@ -1334,6 +1339,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 			terminalCompressProgressBar: terminalCompressProgressBar ?? true,
 			hasSystemPromptOverride,
 			historyPreviewCollapsed: historyPreviewCollapsed ?? false,
+			creatorModeConfig,
 		}
 	}
 
diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts
@@ -137,7 +137,10 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
 			// Could also do this in extension .ts
 			//provider.postMessageToWebview({ type: "text", text: `Extension: ${Date.now()}` })
 			// initializing new instance of Cline will make sure that any agentically running promises in old instance don't affect our new task. this essentially creates a fresh slate for the new task
-			await provider.initClineWithTask(message.text, message.images)
+			const existingCline = provider.getCurrentCline()
+			const creatorModeConfig = existingCline?.creatorModeConfig
+			
+			await provider.initClineWithTask(message.text, message.images, undefined, {}, creatorModeConfig)
 			break
 		case "apiConfiguration":
 			if (message.apiConfiguration) {
diff --git a/src/exports/roo-code.d.ts b/src/exports/roo-code.d.ts
@@ -262,6 +262,13 @@ type GlobalSettings = {
 				totalCost: number
 				size?: number | undefined
 				workspace?: string | undefined
+				creatorModeConfig?:
+					| {
+							creatorMode?: boolean | undefined
+							newProjectType?: string | undefined
+							newProjectPath?: string | undefined
+					  }
+					| undefined
 		  }[]
 		| undefined
 	autoApprovalEnabled?: boolean | undefined
diff --git a/src/exports/types.ts b/src/exports/types.ts
@@ -265,6 +265,13 @@ type GlobalSettings = {
 				totalCost: number
 				size?: number | undefined
 				workspace?: string | undefined
+				creatorModeConfig?:
+					| {
+							creatorMode?: boolean | undefined
+							newProjectType?: string | undefined
+							newProjectPath?: string | undefined
+					  }
+					| undefined
 		  }[]
 		| undefined
 	autoApprovalEnabled?: boolean | undefined
diff --git a/src/schemas/index.ts b/src/schemas/index.ts
@@ -149,22 +149,6 @@ export type ApiConfigMeta = z.infer<typeof apiConfigMetaSchema>
  * HistoryItem
  */
 
-export const historyItemSchema = z.object({
-	id: z.string(),
-	number: z.number(),
-	ts: z.number(),
-	task: z.string(),
-	tokensIn: z.number(),
-	tokensOut: z.number(),
-	cacheWrites: z.number().optional(),
-	cacheReads: z.number().optional(),
-	totalCost: z.number(),
-	size: z.number().optional(),
-	workspace: z.string().optional(),
-})
-
-export type HistoryItem = z.infer<typeof historyItemSchema>
-
 /**
  * GroupOptions
  */
@@ -347,6 +331,27 @@ export const creatorModeConfigSchema = z.object({
 
 export type CreatorModeConfig = z.infer<typeof creatorModeConfigSchema>
 
+/**
+ * HistoryItem
+ */
+
+export const historyItemSchema = z.object({
+	id: z.string(),
+	number: z.number(),
+	ts: z.number(),
+	task: z.string(),
+	tokensIn: z.number(),
+	tokensOut: z.number(),
+	cacheWrites: z.number().optional(),
+	cacheReads: z.number().optional(),
+	totalCost: z.number(),
+	size: z.number().optional(),
+	workspace: z.string().optional(),
+	creatorModeConfig: creatorModeConfigSchema.optional(),
+})
+
+export type HistoryItem = z.infer<typeof historyItemSchema>
+
 /**
  * ProviderSettings
  */
diff --git a/src/shared/ExtensionMessage.ts b/src/shared/ExtensionMessage.ts
@@ -203,6 +203,11 @@ export type ExtensionState = Pick<
 	renderContext: "sidebar" | "editor"
 	settingsImportedAt?: number
 	historyPreviewCollapsed?: boolean
+	creatorModeConfig?: {
+		creatorMode?: boolean
+		newProjectType?: string
+		newProjectPath?: string
+	}
 }
 
 export type { ClineMessage, ClineAsk, ClineSay }
diff --git a/src/shared/modes.ts b/src/shared/modes.ts
@@ -56,9 +56,10 @@ export const modes: readonly ModeConfig[] = [
 	{
 		slug: "creator",
 		name: "Creator",
+		// TODO: CHANGE ME TO ACTUALLY BE LIKE THE CREATOR MODE WE WANT
 		roleDefinition:
 			"You are PearAI Agent (Powered by Roo Code / Cline), a creative and systematic software architect focused on turning high-level ideas into actionable plans. Your primary goal is to help users transform their ideas into structured action plans.",
-		groups: ["read", ["edit", { fileRegex: "\\.md$", description: "Markdown files only" }], "browser", "mcp"],
+		groups: ["read", "edit", "browser", "command", "mcp"],
 	},
 	{
 		slug: "code",
diff --git a/webview-ui/src/components/chat/ChatView.tsx b/webview-ui/src/components/chat/ChatView.tsx
@@ -97,7 +97,8 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 		customModes,
 		telemetrySetting,
 		hasSystemPromptOverride,
-		historyPreviewCollapsed, // Added historyPreviewCollapsed
+		historyPreviewCollapsed,
+		creatorModeConfig,
 	} = useExtensionState()
 
 	const { tasks } = useTaskSearch()
@@ -1238,7 +1239,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 				flexDirection: "column",
 				overflow: "hidden",
 			}}>
-			{apiConfiguration?.creatorModeConfig?.creatorMode === true && (
+			{creatorModeConfig?.creatorMode === true && (
 				<PlanningBar
 					requestedPlan={task?.text || ""}
 					isGenerating={isStreaming}
diff --git a/webview-ui/src/context/ExtensionStateContext.tsx b/webview-ui/src/context/ExtensionStateContext.tsx
@@ -94,6 +94,16 @@ export interface ExtensionStateContextType extends ExtensionState {
 	terminalCompressProgressBar?: boolean
 	setTerminalCompressProgressBar: (value: boolean) => void
 	setHistoryPreviewCollapsed: (value: boolean) => void
+	creatorModeConfig?: {
+		creatorMode?: boolean
+		newProjectType?: string
+		newProjectPath?: string
+	}
+	setCreatorModeConfig: (value: {
+		creatorMode?: boolean
+		newProjectType?: string
+		newProjectPath?: string
+	}) => void
 }
 
 export const ExtensionStateContext = createContext<ExtensionStateContextType | undefined>(undefined)
@@ -103,6 +113,7 @@ export const mergeExtensionState = (prevState: ExtensionState, newState: Extensi
 		customModePrompts: prevCustomModePrompts,
 		customSupportPrompts: prevCustomSupportPrompts,
 		experiments: prevExperiments,
+		creatorModeConfig: prevCreatorModeConfig,
 		...prevRest
 	} = prevState
 
@@ -111,6 +122,7 @@ export const mergeExtensionState = (prevState: ExtensionState, newState: Extensi
 		customModePrompts: newCustomModePrompts,
 		customSupportPrompts: newCustomSupportPrompts,
 		experiments: newExperiments,
+		creatorModeConfig,
 		...newRest
 	} = newState
 
@@ -122,7 +134,7 @@ export const mergeExtensionState = (prevState: ExtensionState, newState: Extensi
 	// Note that we completely replace the previous apiConfiguration object with
 	// a new one since the state that is broadcast is the entire apiConfiguration
 	// and therefore merging is not necessary.
-	return { ...rest, apiConfiguration, customModePrompts, customSupportPrompts, experiments }
+	return { ...rest, apiConfiguration, creatorModeConfig, customModePrompts, customSupportPrompts, experiments }
 }
 
 export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
@@ -178,6 +190,7 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode
 		terminalZdotdir: false, // Default ZDOTDIR handling setting
 		terminalCompressProgressBar: true, // Default to compress progress bar output
 		historyPreviewCollapsed: false, // Initialize the new state (default to expanded)
+		creatorModeConfig: { creatorMode: false, newProjectType: "", newProjectPath: "" }, // Default creator mode config
 	})
 
 	const [didHydrateState, setDidHydrateState] = useState(false)
@@ -370,6 +383,8 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode
 			}),
 		setHistoryPreviewCollapsed: (value) =>
 			setState((prevState) => ({ ...prevState, historyPreviewCollapsed: value })), // Implement the setter
+		setCreatorModeConfig: (value) =>
+			setState((prevState) => ({ ...prevState, creatorModeConfig: value })),
 	}
 
 	return <ExtensionStateContext.Provider value={contextValue}>{children}</ExtensionStateContext.Provider>

Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,10 @@ export const modes: readonly ModeConfig[] = [`
`56`	`56`	`{`
`57`	`57`	`slug: "creator",`
`58`	`58`	`name: "Creator",`
	`59`	`+ // TODO: CHANGE ME TO ACTUALLY BE LIKE THE CREATOR MODE WE WANT`
`59`	`60`	`roleDefinition:`
`60`	`61`	`"You are PearAI Agent (Powered by Roo Code / Cline), a creative and systematic software architect focused on turning high-level ideas into actionable plans. Your primary goal is to help users transform their ideas into structured action plans.",`
`61`		`- groups: ["read", ["edit", { fileRegex: "\\.md$", description: "Markdown files only" }], "browser", "mcp"],`
	`62`	`+ groups: ["read", "edit", "browser", "command", "mcp"],`
`62`	`63`	`},`
`63`	`64`	`{`
`64`	`65`	`slug: "code",`