Skip to content

Commit 43b52aa

Browse files
committed
fix(core/webview): merge view-local state into getState for per-view overrides
Fold ClineProvider viewLocalState on top of ContextProxy values in getState() (mode, apiConfiguration, and all per-view fields) so each webview reports its own selections while falling back to shared global state for everything else. Ports the getState-merging and local-state-isolation spec coverage from the superseded vps2 source. Also pins the full default surface of the merged read path, including the apiConfiguration provider fill-in when provider settings sanitize the raw value away (mutation-diff gate).
1 parent 0a8ffc9 commit 43b52aa

2 files changed

Lines changed: 622 additions & 95 deletions

File tree

‎src/core/webview/ClineProvider.ts‎

Lines changed: 104 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -3151,12 +3151,18 @@ export class ClineProvider
31513151
>
31523152
> {
31533153
const stateValues = this.contextProxy.getValues()
3154+
3155+
// Merge viewLocalState on top of global state so a provider can serve
3156+
// state values scoped to its own view while preserving ContextProxy defaults.
3157+
const mergedStateValues = { ...stateValues, ...this.viewLocalState }
3158+
31543159
const customModes = await this.customModesManager.getCustomModes()
31553160

31563161
// Determine apiProvider with the same logic as before, while filtering retired providers.
3162+
// Use mergedStateValues to prioritize viewLocalState for parallel mode support
31573163
const apiProvider: ProviderName =
3158-
stateValues.apiProvider && !isRetiredProvider(stateValues.apiProvider)
3159-
? stateValues.apiProvider
3164+
mergedStateValues.apiProvider && !isRetiredProvider(mergedStateValues.apiProvider)
3165+
? mergedStateValues.apiProvider
31603166
: providerIdentifiers.anthropic
31613167

31623168
// Build the apiConfiguration object combining state values and secrets.
@@ -3218,119 +3224,122 @@ export class ClineProvider
32183224

32193225
// Return the same structure as before.
32203226
return {
3221-
apiConfiguration: providerSettings,
3222-
lastShownAnnouncementId: stateValues.lastShownAnnouncementId,
3223-
customInstructions: stateValues.customInstructions,
3224-
apiModelId: stateValues.apiModelId,
3225-
alwaysAllowReadOnly: stateValues.alwaysAllowReadOnly ?? false,
3226-
alwaysAllowReadOnlyOutsideWorkspace: stateValues.alwaysAllowReadOnlyOutsideWorkspace ?? false,
3227-
allowedReadFiles: stateValues.allowedReadFiles ?? [],
3228-
alwaysAllowWrite: stateValues.alwaysAllowWrite ?? false,
3229-
alwaysAllowWriteOutsideWorkspace: stateValues.alwaysAllowWriteOutsideWorkspace ?? false,
3230-
alwaysAllowWriteProtected: stateValues.alwaysAllowWriteProtected ?? false,
3231-
allowedWriteFiles: stateValues.allowedWriteFiles ?? [],
3232-
alwaysAllowExecute: stateValues.alwaysAllowExecute ?? false,
3227+
apiConfiguration: {
3228+
...providerSettings,
3229+
...mergedStateValues.apiConfiguration,
3230+
},
3231+
lastShownAnnouncementId: mergedStateValues.lastShownAnnouncementId,
3232+
customInstructions: mergedStateValues.customInstructions,
3233+
apiModelId: mergedStateValues.apiModelId,
3234+
alwaysAllowReadOnly: mergedStateValues.alwaysAllowReadOnly ?? false,
3235+
alwaysAllowReadOnlyOutsideWorkspace: mergedStateValues.alwaysAllowReadOnlyOutsideWorkspace ?? false,
3236+
allowedReadFiles: mergedStateValues.allowedReadFiles ?? [],
3237+
alwaysAllowWrite: mergedStateValues.alwaysAllowWrite ?? false,
3238+
alwaysAllowWriteOutsideWorkspace: mergedStateValues.alwaysAllowWriteOutsideWorkspace ?? false,
3239+
alwaysAllowWriteProtected: mergedStateValues.alwaysAllowWriteProtected ?? false,
3240+
allowedWriteFiles: mergedStateValues.allowedWriteFiles ?? [],
3241+
alwaysAllowExecute: mergedStateValues.alwaysAllowExecute ?? false,
32333242
destructiveCommandGuardEnabled:
3234-
stateValues.destructiveCommandGuardEnabled ?? DEFAULT_DESTRUCTIVE_COMMAND_GUARD_ENABLED,
3235-
alwaysAllowMcp: stateValues.alwaysAllowMcp ?? false,
3236-
alwaysAllowModeSwitch: stateValues.alwaysAllowModeSwitch ?? false,
3237-
alwaysAllowSubtasks: stateValues.alwaysAllowSubtasks ?? false,
3238-
alwaysAllowFollowupQuestions: stateValues.alwaysAllowFollowupQuestions ?? false,
3239-
followupAutoApproveTimeoutMs: stateValues.followupAutoApproveTimeoutMs ?? 60000,
3240-
diagnosticsEnabled: stateValues.diagnosticsEnabled ?? true,
3241-
allowedMaxRequests: stateValues.allowedMaxRequests,
3242-
allowedMaxCost: stateValues.allowedMaxCost,
3243-
autoCondenseContext: stateValues.autoCondenseContext ?? true,
3244-
autoCondenseContextPercent: stateValues.autoCondenseContextPercent ?? 100,
3243+
mergedStateValues.destructiveCommandGuardEnabled ?? DEFAULT_DESTRUCTIVE_COMMAND_GUARD_ENABLED,
3244+
alwaysAllowMcp: mergedStateValues.alwaysAllowMcp ?? false,
3245+
alwaysAllowModeSwitch: mergedStateValues.alwaysAllowModeSwitch ?? false,
3246+
alwaysAllowSubtasks: mergedStateValues.alwaysAllowSubtasks ?? false,
3247+
alwaysAllowFollowupQuestions: mergedStateValues.alwaysAllowFollowupQuestions ?? false,
3248+
followupAutoApproveTimeoutMs: mergedStateValues.followupAutoApproveTimeoutMs ?? 60000,
3249+
diagnosticsEnabled: mergedStateValues.diagnosticsEnabled ?? true,
3250+
allowedMaxRequests: mergedStateValues.allowedMaxRequests,
3251+
allowedMaxCost: mergedStateValues.allowedMaxCost,
3252+
autoCondenseContext: mergedStateValues.autoCondenseContext ?? true,
3253+
autoCondenseContextPercent: mergedStateValues.autoCondenseContextPercent ?? 100,
32453254
taskHistory: includeTaskHistory ? this.taskHistoryStore.getAll() : [],
3246-
allowedCommands: stateValues.allowedCommands,
3247-
deniedCommands: stateValues.deniedCommands,
3248-
soundEnabled: stateValues.soundEnabled ?? false,
3249-
ttsEnabled: stateValues.ttsEnabled ?? false,
3250-
ttsSpeed: stateValues.ttsSpeed ?? 1.0,
3251-
enableCheckpoints: stateValues.enableCheckpoints ?? true,
3252-
checkpointTimeout: stateValues.checkpointTimeout ?? DEFAULT_CHECKPOINT_TIMEOUT_SECONDS,
3253-
soundVolume: stateValues.soundVolume,
3254-
writeDelayMs: stateValues.writeDelayMs ?? DEFAULT_WRITE_DELAY_MS,
3255-
diffFuzzyThreshold: stateValues.diffFuzzyThreshold ?? DEFAULT_DIFF_FUZZY_THRESHOLD,
3255+
allowedCommands: mergedStateValues.allowedCommands,
3256+
deniedCommands: mergedStateValues.deniedCommands,
3257+
soundEnabled: mergedStateValues.soundEnabled ?? false,
3258+
ttsEnabled: mergedStateValues.ttsEnabled ?? false,
3259+
ttsSpeed: mergedStateValues.ttsSpeed ?? 1.0,
3260+
enableCheckpoints: mergedStateValues.enableCheckpoints ?? true,
3261+
checkpointTimeout: mergedStateValues.checkpointTimeout ?? DEFAULT_CHECKPOINT_TIMEOUT_SECONDS,
3262+
soundVolume: mergedStateValues.soundVolume,
3263+
writeDelayMs: mergedStateValues.writeDelayMs ?? DEFAULT_WRITE_DELAY_MS,
3264+
diffFuzzyThreshold: mergedStateValues.diffFuzzyThreshold ?? DEFAULT_DIFF_FUZZY_THRESHOLD,
32563265
terminalShellIntegrationTimeout:
3257-
stateValues.terminalShellIntegrationTimeout ?? Terminal.defaultShellIntegrationTimeout,
3258-
terminalShellIntegrationDisabled: stateValues.terminalShellIntegrationDisabled ?? true,
3259-
terminalCommandDelay: stateValues.terminalCommandDelay ?? 0,
3260-
terminalPowershellCounter: stateValues.terminalPowershellCounter ?? false,
3261-
terminalZshClearEolMark: stateValues.terminalZshClearEolMark ?? true,
3262-
terminalZshOhMy: stateValues.terminalZshOhMy ?? false,
3263-
terminalZshP10k: stateValues.terminalZshP10k ?? false,
3264-
terminalZdotdir: stateValues.terminalZdotdir ?? false,
3265-
terminalProfile: stateValues.terminalProfile,
3266-
mode: stateValues.mode ?? defaultModeSlug,
3267-
language: stateValues.language ?? formatLanguage(vscode.env.language),
3268-
mcpEnabled: stateValues.mcpEnabled ?? true,
3266+
mergedStateValues.terminalShellIntegrationTimeout ?? Terminal.defaultShellIntegrationTimeout,
3267+
terminalShellIntegrationDisabled: mergedStateValues.terminalShellIntegrationDisabled ?? true,
3268+
terminalCommandDelay: mergedStateValues.terminalCommandDelay ?? 0,
3269+
terminalPowershellCounter: mergedStateValues.terminalPowershellCounter ?? false,
3270+
terminalZshClearEolMark: mergedStateValues.terminalZshClearEolMark ?? true,
3271+
terminalZshOhMy: mergedStateValues.terminalZshOhMy ?? false,
3272+
terminalZshP10k: mergedStateValues.terminalZshP10k ?? false,
3273+
terminalZdotdir: mergedStateValues.terminalZdotdir ?? false,
3274+
terminalProfile: mergedStateValues.terminalProfile,
3275+
mode: (mergedStateValues.mode as Mode) ?? defaultModeSlug,
3276+
language: mergedStateValues.language ?? formatLanguage(vscode.env.language),
3277+
mcpEnabled: mergedStateValues.mcpEnabled ?? true,
32693278
mcpServers: this.mcpHub?.getAllServers() ?? [],
3270-
currentApiConfigName: stateValues.currentApiConfigName ?? "default",
3271-
listApiConfigMeta: stateValues.listApiConfigMeta ?? [],
3272-
pinnedApiConfigs: stateValues.pinnedApiConfigs ?? {},
3273-
modeApiConfigs: stateValues.modeApiConfigs ?? ({} as Record<Mode, string>),
3274-
customModePrompts: stateValues.customModePrompts ?? {},
3275-
customSupportPrompts: stateValues.customSupportPrompts ?? {},
3276-
enhancementApiConfigId: stateValues.enhancementApiConfigId,
3277-
experiments: stateValues.experiments ?? experimentDefault,
3278-
autoApprovalEnabled: stateValues.autoApprovalEnabled ?? false,
3279+
currentApiConfigName: mergedStateValues.currentApiConfigName ?? "default",
3280+
listApiConfigMeta: mergedStateValues.listApiConfigMeta ?? [],
3281+
pinnedApiConfigs: mergedStateValues.pinnedApiConfigs ?? {},
3282+
modeApiConfigs: (mergedStateValues.modeApiConfigs as Record<Mode, string>) ?? ({} as Record<Mode, string>),
3283+
customModePrompts: mergedStateValues.customModePrompts ?? {},
3284+
customSupportPrompts: mergedStateValues.customSupportPrompts ?? {},
3285+
enhancementApiConfigId: mergedStateValues.enhancementApiConfigId,
3286+
experiments: mergedStateValues.experiments ?? experimentDefault,
3287+
autoApprovalEnabled: mergedStateValues.autoApprovalEnabled ?? false,
32793288
customModes,
3280-
maxOpenTabsContext: stateValues.maxOpenTabsContext ?? 20,
3281-
maxWorkspaceFiles: stateValues.maxWorkspaceFiles ?? 200,
3282-
disabledTools: stateValues.disabledTools,
3283-
telemetrySetting: stateValues.telemetrySetting || "unset",
3284-
showRooIgnoredFiles: stateValues.showRooIgnoredFiles ?? false,
3285-
enableSubfolderRules: stateValues.enableSubfolderRules ?? false,
3286-
maxImageFileSize: stateValues.maxImageFileSize ?? 5,
3287-
maxTotalImageSize: stateValues.maxTotalImageSize ?? 20,
3288-
historyPreviewCollapsed: stateValues.historyPreviewCollapsed ?? false,
3289-
reasoningBlockCollapsed: stateValues.reasoningBlockCollapsed ?? true,
3290-
chatFontSize: stateValues.chatFontSize,
3291-
enterBehavior: stateValues.enterBehavior ?? "send",
3289+
maxOpenTabsContext: mergedStateValues.maxOpenTabsContext ?? 20,
3290+
maxWorkspaceFiles: mergedStateValues.maxWorkspaceFiles ?? 200,
3291+
disabledTools: mergedStateValues.disabledTools,
3292+
telemetrySetting: mergedStateValues.telemetrySetting || "unset",
3293+
showRooIgnoredFiles: mergedStateValues.showRooIgnoredFiles ?? false,
3294+
enableSubfolderRules: mergedStateValues.enableSubfolderRules ?? false,
3295+
maxImageFileSize: mergedStateValues.maxImageFileSize ?? 5,
3296+
maxTotalImageSize: mergedStateValues.maxTotalImageSize ?? 20,
3297+
historyPreviewCollapsed: mergedStateValues.historyPreviewCollapsed ?? false,
3298+
reasoningBlockCollapsed: mergedStateValues.reasoningBlockCollapsed ?? true,
3299+
chatFontSize: mergedStateValues.chatFontSize,
3300+
enterBehavior: mergedStateValues.enterBehavior ?? "send",
32923301
cloudUserInfo,
32933302
cloudIsAuthenticated,
32943303
sharingEnabled,
32953304
publicSharingEnabled,
32963305
organizationAllowList,
32973306
organizationSettingsVersion,
3298-
customCondensingPrompt: stateValues.customCondensingPrompt,
3299-
codebaseIndexModels: stateValues.codebaseIndexModels ?? EMBEDDING_MODEL_PROFILES,
3307+
customCondensingPrompt: mergedStateValues.customCondensingPrompt,
3308+
codebaseIndexModels: mergedStateValues.codebaseIndexModels ?? EMBEDDING_MODEL_PROFILES,
33003309
codebaseIndexConfig: {
3301-
codebaseIndexEnabled: stateValues.codebaseIndexConfig?.codebaseIndexEnabled ?? false,
3310+
codebaseIndexEnabled: mergedStateValues.codebaseIndexConfig?.codebaseIndexEnabled ?? false,
33023311
codebaseIndexQdrantUrl:
3303-
stateValues.codebaseIndexConfig?.codebaseIndexQdrantUrl ?? "http://localhost:6333",
3312+
mergedStateValues.codebaseIndexConfig?.codebaseIndexQdrantUrl ?? "http://localhost:6333",
33043313
codebaseIndexEmbedderProvider:
3305-
stateValues.codebaseIndexConfig?.codebaseIndexEmbedderProvider ?? providerIdentifiers.openai,
3306-
codebaseIndexEmbedderBaseUrl: stateValues.codebaseIndexConfig?.codebaseIndexEmbedderBaseUrl ?? "",
3307-
codebaseIndexEmbedderModelId: stateValues.codebaseIndexConfig?.codebaseIndexEmbedderModelId ?? "",
3314+
mergedStateValues.codebaseIndexConfig?.codebaseIndexEmbedderProvider ?? providerIdentifiers.openai,
3315+
codebaseIndexEmbedderBaseUrl: mergedStateValues.codebaseIndexConfig?.codebaseIndexEmbedderBaseUrl ?? "",
3316+
codebaseIndexEmbedderModelId: mergedStateValues.codebaseIndexConfig?.codebaseIndexEmbedderModelId ?? "",
33083317
codebaseIndexEmbedderModelDimension:
3309-
stateValues.codebaseIndexConfig?.codebaseIndexEmbedderModelDimension,
3318+
mergedStateValues.codebaseIndexConfig?.codebaseIndexEmbedderModelDimension,
33103319
codebaseIndexOpenAiCompatibleBaseUrl:
3311-
stateValues.codebaseIndexConfig?.codebaseIndexOpenAiCompatibleBaseUrl,
3312-
codebaseIndexSearchMaxResults: stateValues.codebaseIndexConfig?.codebaseIndexSearchMaxResults,
3313-
codebaseIndexSearchMinScore: stateValues.codebaseIndexConfig?.codebaseIndexSearchMinScore,
3314-
codebaseIndexBedrockRegion: stateValues.codebaseIndexConfig?.codebaseIndexBedrockRegion,
3315-
codebaseIndexBedrockProfile: stateValues.codebaseIndexConfig?.codebaseIndexBedrockProfile,
3320+
mergedStateValues.codebaseIndexConfig?.codebaseIndexOpenAiCompatibleBaseUrl,
3321+
codebaseIndexSearchMaxResults: mergedStateValues.codebaseIndexConfig?.codebaseIndexSearchMaxResults,
3322+
codebaseIndexSearchMinScore: mergedStateValues.codebaseIndexConfig?.codebaseIndexSearchMinScore,
3323+
codebaseIndexBedrockRegion: mergedStateValues.codebaseIndexConfig?.codebaseIndexBedrockRegion,
3324+
codebaseIndexBedrockProfile: mergedStateValues.codebaseIndexConfig?.codebaseIndexBedrockProfile,
33163325
codebaseIndexOpenRouterSpecificProvider:
3317-
stateValues.codebaseIndexConfig?.codebaseIndexOpenRouterSpecificProvider,
3326+
mergedStateValues.codebaseIndexConfig?.codebaseIndexOpenRouterSpecificProvider,
33183327
},
3319-
profileThresholds: stateValues.profileThresholds ?? {},
3328+
profileThresholds: mergedStateValues.profileThresholds ?? {},
33203329
lockApiConfigAcrossModes: this.context.workspaceState.get("lockApiConfigAcrossModes", false),
3321-
includeDiagnosticMessages: stateValues.includeDiagnosticMessages ?? true,
3322-
maxDiagnosticMessages: stateValues.maxDiagnosticMessages ?? 50,
3323-
includeTaskHistoryInEnhance: stateValues.includeTaskHistoryInEnhance ?? true,
3324-
includeCurrentTime: stateValues.includeCurrentTime ?? true,
3325-
includeCurrentCost: stateValues.includeCurrentCost ?? true,
3326-
maxGitStatusFiles: stateValues.maxGitStatusFiles ?? 0,
3330+
includeDiagnosticMessages: mergedStateValues.includeDiagnosticMessages ?? true,
3331+
maxDiagnosticMessages: mergedStateValues.maxDiagnosticMessages ?? 50,
3332+
includeTaskHistoryInEnhance: mergedStateValues.includeTaskHistoryInEnhance ?? true,
3333+
includeCurrentTime: mergedStateValues.includeCurrentTime ?? true,
3334+
includeCurrentCost: mergedStateValues.includeCurrentCost ?? true,
3335+
maxGitStatusFiles: mergedStateValues.maxGitStatusFiles ?? 0,
33273336
taskSyncEnabled,
3328-
imageGenerationProvider: stateValues.imageGenerationProvider,
3329-
openRouterImageApiKey: stateValues.openRouterImageApiKey,
3330-
openRouterImageGenerationSelectedModel: stateValues.openRouterImageGenerationSelectedModel,
3331-
autoCloseZooOpenedFiles: stateValues.autoCloseZooOpenedFiles,
3332-
autoCloseZooOpenedFilesAfterUserEdited: stateValues.autoCloseZooOpenedFilesAfterUserEdited,
3333-
autoCloseZooOpenedNewFiles: stateValues.autoCloseZooOpenedNewFiles,
3337+
imageGenerationProvider: mergedStateValues.imageGenerationProvider,
3338+
openRouterImageApiKey: mergedStateValues.openRouterImageApiKey,
3339+
openRouterImageGenerationSelectedModel: mergedStateValues.openRouterImageGenerationSelectedModel,
3340+
autoCloseZooOpenedFiles: mergedStateValues.autoCloseZooOpenedFiles,
3341+
autoCloseZooOpenedFilesAfterUserEdited: mergedStateValues.autoCloseZooOpenedFilesAfterUserEdited,
3342+
autoCloseZooOpenedNewFiles: mergedStateValues.autoCloseZooOpenedNewFiles,
33343343
}
33353344
}
33363345

0 commit comments

Comments
 (0)