fix: rename imageGenerationSelectedModel to openRouterImageGenerationSelectedModel for consistency

daniel-lxs · daniel-lxs · commit bcc0c254bedb · 2025-08-29T17:13:43.000-05:00
diff --git a/packages/types/src/global-settings.ts b/packages/types/src/global-settings.ts
@@ -44,7 +44,7 @@ export const globalSettingsSchema = z.object({
 
 	// Image generation settings (experimental) - flattened for simplicity
 	openRouterImageApiKey: z.string().optional(),
-	imageGenerationSelectedModel: z.string().optional(),
+	openRouterImageGenerationSelectedModel: z.string().optional(),
 
 	condensingApiConfigId: z.string().optional(),
 	customCondensingPrompt: z.string().optional(),
diff --git a/src/core/config/ContextProxy.ts b/src/core/config/ContextProxy.ts
@@ -113,13 +113,13 @@ export class ContextProxy {
 				}
 
 				// Migrate the selected model if it exists and we don't already have one
-				if (oldNestedSettings.selectedModel && !this.stateCache.imageGenerationSelectedModel) {
+				if (oldNestedSettings.selectedModel && !this.stateCache.openRouterImageGenerationSelectedModel) {
 					await this.originalContext.globalState.update(
-						"imageGenerationSelectedModel",
+						"openRouterImageGenerationSelectedModel",
 						oldNestedSettings.selectedModel,
 					)
-					this.stateCache.imageGenerationSelectedModel = oldNestedSettings.selectedModel
-					logger.info("Migrated imageGenerationSelectedModel to global state")
+					this.stateCache.openRouterImageGenerationSelectedModel = oldNestedSettings.selectedModel
+					logger.info("Migrated openRouterImageGenerationSelectedModel to global state")
 				}
 
 				// Clean up the old nested structure
diff --git a/src/core/tools/__tests__/generateImageTool.test.ts b/src/core/tools/__tests__/generateImageTool.test.ts
@@ -47,7 +47,7 @@ describe("generateImageTool", () => {
 							[EXPERIMENT_IDS.IMAGE_GENERATION]: true,
 						},
 						openRouterImageApiKey: "test-api-key",
-						imageGenerationSelectedModel: "google/gemini-2.5-flash-image-preview",
+						openRouterImageGenerationSelectedModel: "google/gemini-2.5-flash-image-preview",
 					}),
 				}),
 			},
diff --git a/src/core/tools/generateImageTool.ts b/src/core/tools/generateImageTool.ts
@@ -146,7 +146,7 @@ export async function generateImageTool(
 	}
 
 	// Get selected model from settings or use default
-	const selectedModel = state?.imageGenerationSelectedModel || IMAGE_GENERATION_MODELS[0]
+	const selectedModel = state?.openRouterImageGenerationSelectedModel || IMAGE_GENERATION_MODELS[0]
 
 	// Determine if the path is outside the workspace
 	const fullPath = path.resolve(cline.cwd, removeClosingTag("path", relPath))
diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts
@@ -1763,7 +1763,7 @@ export class ClineProvider
 			includeTaskHistoryInEnhance,
 			remoteControlEnabled,
 			openRouterImageApiKey,
-			imageGenerationSelectedModel,
+			openRouterImageGenerationSelectedModel,
 		} = await this.getState()
 
 		const telemetryKey = process.env.POSTHOG_API_KEY
@@ -1896,7 +1896,7 @@ export class ClineProvider
 			includeTaskHistoryInEnhance: includeTaskHistoryInEnhance ?? true,
 			remoteControlEnabled,
 			openRouterImageApiKey,
-			imageGenerationSelectedModel,
+			openRouterImageGenerationSelectedModel,
 		}
 	}
 
@@ -2098,7 +2098,7 @@ export class ClineProvider
 			})(),
 			// Add image generation settings
 			openRouterImageApiKey: stateValues.openRouterImageApiKey,
-			imageGenerationSelectedModel: stateValues.imageGenerationSelectedModel,
+			openRouterImageGenerationSelectedModel: stateValues.openRouterImageGenerationSelectedModel,
 		}
 	}
 
diff --git a/src/core/webview/__tests__/ClineProvider.spec.ts b/src/core/webview/__tests__/ClineProvider.spec.ts
@@ -547,7 +547,7 @@ describe("ClineProvider", () => {
 			hasOpenedModeSelector: false,
 			diagnosticsEnabled: true,
 			openRouterImageApiKey: undefined,
-			imageGenerationSelectedModel: undefined,
+			openRouterImageGenerationSelectedModel: undefined,
 		}
 
 		const message: ExtensionMessage = {
diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts
@@ -1317,8 +1317,8 @@ export const webviewMessageHandler = async (
 			await provider.contextProxy.setValue("openRouterImageApiKey", message.text)
 			await provider.postStateToWebview()
 			break
-		case "imageGenerationSelectedModel":
-			await provider.contextProxy.setValue("imageGenerationSelectedModel", message.text)
+		case "openRouterImageGenerationSelectedModel":
+			await provider.contextProxy.setValue("openRouterImageGenerationSelectedModel", message.text)
 			await provider.postStateToWebview()
 			break
 		case "showRooIgnoredFiles":
diff --git a/src/shared/ExtensionMessage.ts b/src/shared/ExtensionMessage.ts
@@ -273,7 +273,7 @@ export type ExtensionState = Pick<
 	| "includeDiagnosticMessages"
 	| "maxDiagnosticMessages"
 	| "remoteControlEnabled"
-	| "imageGenerationSelectedModel"
+	| "openRouterImageGenerationSelectedModel"
 > & {
 	version: string
 	clineMessages: ClineMessage[]
diff --git a/src/shared/WebviewMessage.ts b/src/shared/WebviewMessage.ts
@@ -214,7 +214,7 @@ export interface WebviewMessage {
 		| "showMdmAuthRequiredNotification"
 		| "imageGenerationSettings"
 		| "openRouterImageApiKey"
-		| "imageGenerationSelectedModel"
+		| "openRouterImageGenerationSelectedModel"
 	text?: string
 	editedMessageContent?: string
 	tab?: "settings" | "history" | "mcp" | "modes" | "chat" | "marketplace" | "account"
diff --git a/webview-ui/src/components/settings/ExperimentalSettings.tsx b/webview-ui/src/components/settings/ExperimentalSettings.tsx
@@ -20,7 +20,7 @@ type ExperimentalSettingsProps = HTMLAttributes<HTMLDivElement> & {
 	apiConfiguration?: any
 	setApiConfigurationField?: any
 	openRouterImageApiKey?: string
-	imageGenerationSelectedModel?: string
+	openRouterImageGenerationSelectedModel?: string
 	setOpenRouterImageApiKey?: (apiKey: string) => void
 	setImageGenerationSelectedModel?: (model: string) => void
 }
@@ -31,7 +31,7 @@ export const ExperimentalSettings = ({
 	apiConfiguration,
 	setApiConfigurationField,
 	openRouterImageApiKey,
-	imageGenerationSelectedModel,
+	openRouterImageGenerationSelectedModel,
 	setOpenRouterImageApiKey,
 	setImageGenerationSelectedModel,
 	className,
@@ -77,7 +77,7 @@ export const ExperimentalSettings = ({
 										setExperimentEnabled(EXPERIMENT_IDS.IMAGE_GENERATION, enabled)
 									}
 									openRouterImageApiKey={openRouterImageApiKey}
-									imageGenerationSelectedModel={imageGenerationSelectedModel}
+									openRouterImageGenerationSelectedModel={openRouterImageGenerationSelectedModel}
 									setOpenRouterImageApiKey={setOpenRouterImageApiKey}
 									setImageGenerationSelectedModel={setImageGenerationSelectedModel}
 								/>
diff --git a/webview-ui/src/components/settings/ImageGenerationSettings.tsx b/webview-ui/src/components/settings/ImageGenerationSettings.tsx
@@ -6,7 +6,7 @@ interface ImageGenerationSettingsProps {
 	enabled: boolean
 	onChange: (enabled: boolean) => void
 	openRouterImageApiKey?: string
-	imageGenerationSelectedModel?: string
+	openRouterImageGenerationSelectedModel?: string
 	setOpenRouterImageApiKey: (apiKey: string) => void
 	setImageGenerationSelectedModel: (model: string) => void
 }
@@ -22,20 +22,22 @@ export const ImageGenerationSettings = ({
 	enabled,
 	onChange,
 	openRouterImageApiKey,
-	imageGenerationSelectedModel,
+	openRouterImageGenerationSelectedModel,
 	setOpenRouterImageApiKey,
 	setImageGenerationSelectedModel,
 }: ImageGenerationSettingsProps) => {
 	const { t } = useAppTranslation()
 
 	const [apiKey, setApiKey] = useState(openRouterImageApiKey || "")
-	const [selectedModel, setSelectedModel] = useState(imageGenerationSelectedModel || IMAGE_GENERATION_MODELS[0].value)
+	const [selectedModel, setSelectedModel] = useState(
+		openRouterImageGenerationSelectedModel || IMAGE_GENERATION_MODELS[0].value,
+	)
 
 	// Update local state when props change (e.g., when switching profiles)
 	useEffect(() => {
 		setApiKey(openRouterImageApiKey || "")
-		setSelectedModel(imageGenerationSelectedModel || IMAGE_GENERATION_MODELS[0].value)
-	}, [openRouterImageApiKey, imageGenerationSelectedModel])
+		setSelectedModel(openRouterImageGenerationSelectedModel || IMAGE_GENERATION_MODELS[0].value)
+	}, [openRouterImageApiKey, openRouterImageGenerationSelectedModel])
 
 	// Handle API key changes
 	const handleApiKeyChange = (value: string) => {
diff --git a/webview-ui/src/components/settings/SettingsView.tsx b/webview-ui/src/components/settings/SettingsView.tsx
@@ -182,7 +182,7 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 		maxDiagnosticMessages,
 		includeTaskHistoryInEnhance,
 		openRouterImageApiKey,
-		imageGenerationSelectedModel,
+		openRouterImageGenerationSelectedModel,
 	} = cachedState
 
 	const apiConfiguration = useMemo(() => cachedState.apiConfiguration ?? {}, [cachedState.apiConfiguration])
@@ -272,7 +272,7 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 	const setImageGenerationSelectedModel = useCallback((model: string) => {
 		setCachedState((prevState) => {
 			setChangeDetected(true)
-			return { ...prevState, imageGenerationSelectedModel: model }
+			return { ...prevState, openRouterImageGenerationSelectedModel: model }
 		})
 	}, [])
 
@@ -360,7 +360,10 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 			vscode.postMessage({ type: "telemetrySetting", text: telemetrySetting })
 			vscode.postMessage({ type: "profileThresholds", values: profileThresholds })
 			vscode.postMessage({ type: "openRouterImageApiKey", text: openRouterImageApiKey })
-			vscode.postMessage({ type: "imageGenerationSelectedModel", text: imageGenerationSelectedModel })
+			vscode.postMessage({
+				type: "openRouterImageGenerationSelectedModel",
+				text: openRouterImageGenerationSelectedModel,
+			})
 			setChangeDetected(false)
 		}
 	}
@@ -742,7 +745,9 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 							apiConfiguration={apiConfiguration}
 							setApiConfigurationField={setApiConfigurationField}
 							openRouterImageApiKey={openRouterImageApiKey as string | undefined}
-							imageGenerationSelectedModel={imageGenerationSelectedModel as string | undefined}
+							openRouterImageGenerationSelectedModel={
+								openRouterImageGenerationSelectedModel as string | undefined
+							}
 							setOpenRouterImageApiKey={setOpenRouterImageApiKey}
 							setImageGenerationSelectedModel={setImageGenerationSelectedModel}
 						/>
diff --git a/webview-ui/src/components/settings/__tests__/ImageGenerationSettings.spec.tsx b/webview-ui/src/components/settings/__tests__/ImageGenerationSettings.spec.tsx
@@ -18,7 +18,7 @@ describe("ImageGenerationSettings", () => {
 		enabled: false,
 		onChange: mockOnChange,
 		openRouterImageApiKey: undefined,
-		imageGenerationSelectedModel: undefined,
+		openRouterImageGenerationSelectedModel: undefined,
 		setOpenRouterImageApiKey: mockSetOpenRouterImageApiKey,
 		setImageGenerationSelectedModel: mockSetImageGenerationSelectedModel,
 	}
@@ -41,7 +41,7 @@ describe("ImageGenerationSettings", () => {
 				<ImageGenerationSettings
 					{...defaultProps}
 					openRouterImageApiKey="existing-key"
-					imageGenerationSelectedModel="google/gemini-2.5-flash-image-preview:free"
+					openRouterImageGenerationSelectedModel="google/gemini-2.5-flash-image-preview:free"
 				/>,
 			)
 
diff --git a/webview-ui/src/context/ExtensionStateContext.tsx b/webview-ui/src/context/ExtensionStateContext.tsx
@@ -253,7 +253,7 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode
 		includeDiagnosticMessages: true,
 		maxDiagnosticMessages: 50,
 		openRouterImageApiKey: "",
-		imageGenerationSelectedModel: "",
+		openRouterImageGenerationSelectedModel: "",
 	})
 
 	const [didHydrateState, setDidHydrateState] = useState(false)

Original file line number	Diff line number	Diff line change
`@@ -113,13 +113,13 @@ export class ContextProxy {`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`// Migrate the selected model if it exists and we don't already have one`
`116`		`- if (oldNestedSettings.selectedModel && !this.stateCache.imageGenerationSelectedModel) {`
	`116`	`+ if (oldNestedSettings.selectedModel && !this.stateCache.openRouterImageGenerationSelectedModel) {`
`117`	`117`	`await this.originalContext.globalState.update(`
`118`		`- "imageGenerationSelectedModel",`
	`118`	`+ "openRouterImageGenerationSelectedModel",`
`119`	`119`	`oldNestedSettings.selectedModel,`
`120`	`120`	`)`
`121`		`- this.stateCache.imageGenerationSelectedModel = oldNestedSettings.selectedModel`
`122`		`- logger.info("Migrated imageGenerationSelectedModel to global state")`
	`121`	`+ this.stateCache.openRouterImageGenerationSelectedModel = oldNestedSettings.selectedModel`
	`122`	`+ logger.info("Migrated openRouterImageGenerationSelectedModel to global state")`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`// Clean up the old nested structure`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ export async function generateImageTool(`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`// Get selected model from settings or use default`
`149`		`- const selectedModel = state?.imageGenerationSelectedModel \|\| IMAGE_GENERATION_MODELS[0]`
	`149`	`+ const selectedModel = state?.openRouterImageGenerationSelectedModel \|\| IMAGE_GENERATION_MODELS[0]`
`150`	`150`
`151`	`151`	`// Determine if the path is outside the workspace`
`152`	`152`	`const fullPath = path.resolve(cline.cwd, removeClosingTag("path", relPath))`
Original file line number	Diff line number	Diff line change
`@@ -1763,7 +1763,7 @@ export class ClineProvider`
`1763`	`1763`	`includeTaskHistoryInEnhance,`
`1764`	`1764`	`remoteControlEnabled,`
`1765`	`1765`	`openRouterImageApiKey,`
`1766`		`- imageGenerationSelectedModel,`
	`1766`	`+ openRouterImageGenerationSelectedModel,`
`1767`	`1767`	`} = await this.getState()`
`1768`	`1768`
`1769`	`1769`	`const telemetryKey = process.env.POSTHOG_API_KEY`
`@@ -1896,7 +1896,7 @@ export class ClineProvider`
`1896`	`1896`	`includeTaskHistoryInEnhance: includeTaskHistoryInEnhance ?? true,`
`1897`	`1897`	`remoteControlEnabled,`
`1898`	`1898`	`openRouterImageApiKey,`
`1899`		`- imageGenerationSelectedModel,`
	`1899`	`+ openRouterImageGenerationSelectedModel,`
`1900`	`1900`	`}`
`1901`	`1901`	`}`
`1902`	`1902`
`@@ -2098,7 +2098,7 @@ export class ClineProvider`
`2098`	`2098`	`})(),`
`2099`	`2099`	`// Add image generation settings`
`2100`	`2100`	`openRouterImageApiKey: stateValues.openRouterImageApiKey,`
`2101`		`- imageGenerationSelectedModel: stateValues.imageGenerationSelectedModel,`
	`2101`	`+ openRouterImageGenerationSelectedModel: stateValues.openRouterImageGenerationSelectedModel,`
`2102`	`2102`	`}`
`2103`	`2103`	`}`
`2104`	`2104`
Original file line number	Diff line number	Diff line change
`@@ -547,7 +547,7 @@ describe("ClineProvider", () => {`
`547`	`547`	`hasOpenedModeSelector: false,`
`548`	`548`	`diagnosticsEnabled: true,`
`549`	`549`	`openRouterImageApiKey: undefined,`
`550`		`- imageGenerationSelectedModel: undefined,`
	`550`	`+ openRouterImageGenerationSelectedModel: undefined,`
`551`	`551`	`}`
`552`	`552`
`553`	`553`	`const message: ExtensionMessage = {`