Skip to content

Commit cae6900

Browse files
committed
fix(provider): normalize apiProvider in updateProfileModel and harden mutation lifecycle
1 parent f5770c9 commit cae6900

2 files changed

Lines changed: 128 additions & 14 deletions

File tree

‎src/core/webview/ClineProvider.ts‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1998,7 +1998,7 @@ export class ClineProvider
19981998
const allowedKeys: ReadonlySet<string> = new Set(
19991999
providerModelKey ? [providerModelKey, ...RESET_ONLY_KEYS] : RESET_ONLY_KEYS,
20002000
)
2001-
const merged: Record<string, unknown> = { ...stored, id }
2001+
const merged: Record<string, unknown> = { ...stored, id, apiProvider: storedProvider }
20022002
for (const [key, value] of Object.entries(patch)) {
20032003
// The provider is never patchable.
20042004
if (key === "apiProvider" || !allowedKeys.has(key)) {
@@ -2052,6 +2052,10 @@ export class ClineProvider
20522052
await this.contextProxy.setProviderSettings(merged as ProviderSettings)
20532053
updatedContext = true
20542054
}
2055+
2056+
if (signal.aborted) {
2057+
throw new Error("Provider profile mutation aborted")
2058+
}
20552059
} catch (updateError) {
20562060
if (savedConfig) {
20572061
try {
@@ -2074,6 +2078,10 @@ export class ClineProvider
20742078
throw updateError
20752079
}
20762080

2081+
if (signal.aborted) {
2082+
return
2083+
}
2084+
20772085
this.updateTaskApiHandlerIfNeeded(merged as ProviderSettings, { forceRebuild: true })
20782086
await this.persistStickyProviderProfileToCurrentTask(name)
20792087
await this.postStateToWebview()

‎src/core/webview/__tests__/ClineProvider.updateProfileModel.spec.ts‎

Lines changed: 119 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import * as vscode from "vscode"
44
import { makeCompositeDisposable } from "../../../test-utils/vscode"
55
import { TelemetryService } from "@roo-code/telemetry"
6+
import { CloudService } from "@roo-code/cloud"
67
import { providerIdentifiers, type ProviderSettings } from "@roo-code/types"
78

89
import { ContextProxy } from "../../config/ContextProxy"
@@ -118,20 +119,24 @@ vi.mock("../../../i18n", async (importOriginal) => ({
118119
t: (key: string) => key,
119120
}))
120121

122+
const { mockCloudInstance } = vi.hoisted(() => ({
123+
mockCloudInstance: {
124+
isCloudAgent: false,
125+
isAuthenticated: vi.fn().mockReturnValue(false),
126+
getAllowList: vi.fn().mockReturnValue({ allowAll: true }),
127+
getOrganizationSettings: vi.fn().mockReturnValue(undefined),
128+
getUserInfo: vi.fn().mockReturnValue(null),
129+
on: vi.fn(),
130+
off: vi.fn(),
131+
},
132+
}))
133+
121134
vi.mock("@roo-code/cloud", () => ({
122135
getRooCodeApiUrl: vi.fn().mockReturnValue("https://api.roocode.com"),
123136
CloudService: {
124137
hasInstance: vi.fn().mockReturnValue(true),
125138
get instance() {
126-
return {
127-
isCloudAgent: false,
128-
isAuthenticated: vi.fn().mockReturnValue(false),
129-
getAllowList: vi.fn().mockReturnValue({ allowAll: true }),
130-
getOrganizationSettings: vi.fn().mockReturnValue(undefined),
131-
getUserInfo: vi.fn().mockReturnValue(null),
132-
on: vi.fn(),
133-
off: vi.fn(),
134-
}
139+
return mockCloudInstance
135140
},
136141
},
137142
}))
@@ -158,6 +163,9 @@ describe("ClineProvider - updateProfileModel", () => {
158163

159164
beforeEach(async () => {
160165
vi.clearAllMocks()
166+
mockCloudInstance.isAuthenticated.mockReturnValue(false)
167+
mockCloudInstance.getOrganizationSettings.mockReturnValue(undefined)
168+
mockCloudInstance.getAllowList.mockReturnValue({ allowAll: true })
161169

162170
if (!TelemetryService.hasInstance()) {
163171
TelemetryService.createInstance([])
@@ -295,19 +303,62 @@ describe("ClineProvider - updateProfileModel", () => {
295303
expect(manager().saveConfig).not.toHaveBeenCalled()
296304
})
297305

298-
it("treats a profile without apiProvider as OpenRouter", async () => {
306+
it("treats a profile without apiProvider as OpenRouter and normalizes apiProvider when saving", async () => {
299307
mockStoredProfile({})
300308

301309
await provider.updateProfileModel("test-config", providerIdentifiers.openrouter, {
302310
openRouterModelId: "x/y",
303311
})
304312

305-
expect(manager().saveConfig).toHaveBeenCalledWith(
306-
"test-config",
307-
expect.objectContaining({ openRouterModelId: "x/y" }),
313+
expect(manager().saveConfig).toHaveBeenCalledWith("test-config", {
314+
id: "test-id",
315+
apiProvider: providerIdentifiers.openrouter,
316+
openRouterModelId: "x/y",
317+
})
318+
expect(provider.contextProxy.getValues().apiProvider).toBe(providerIdentifiers.openrouter)
319+
})
320+
321+
it("normalizes apiProvider to OpenRouter when rebuilding task handler for provider-less profile", async () => {
322+
const mockTask = new Task({} as unknown as ConstructorParameters<typeof Task>[0])
323+
Object.defineProperty(mockTask, "taskApiConfigName", { value: "test-config" })
324+
await provider.addClineToStack(mockTask)
325+
mockStoredProfile({})
326+
327+
await provider.updateProfileModel("test-config", providerIdentifiers.openrouter, {
328+
openRouterModelId: "x/y",
329+
})
330+
331+
expect(mockTask.updateApiConfiguration).toHaveBeenCalledWith(
332+
expect.objectContaining({
333+
apiProvider: providerIdentifiers.openrouter,
334+
openRouterModelId: "x/y",
335+
}),
308336
)
309337
})
310338

339+
it("ignores non-null values for reset-only keys while updating model selection", async () => {
340+
mockStoredProfile({
341+
apiProvider: providerIdentifiers.openrouter,
342+
openRouterModelId: "openai/gpt-4",
343+
reasoningEffort: "low",
344+
modelMaxTokens: 4096,
345+
modelMaxThinkingTokens: 2048,
346+
})
347+
348+
await provider.updateProfileModel("test-config", providerIdentifiers.openrouter, {
349+
openRouterModelId: "x/y",
350+
reasoningEffort: "high",
351+
modelMaxTokens: 8192,
352+
modelMaxThinkingTokens: 4096,
353+
})
354+
355+
const saved = manager().saveConfig.mock.calls[0][1]
356+
expect(saved.openRouterModelId).toBe("x/y")
357+
expect(saved.reasoningEffort).toBe("low")
358+
expect(saved.modelMaxTokens).toBe(4096)
359+
expect(saved.modelMaxThinkingTokens).toBe(2048)
360+
})
361+
311362
it("ignores non-setting keys, apiProvider, own __proto__ keys and non-primitive values", async () => {
312363
mockStoredProfile({ apiProvider: providerIdentifiers.openrouter, openRouterApiKey: "stored-key" })
313364
const patch = JSON.parse(
@@ -518,4 +569,59 @@ describe("ClineProvider - updateProfileModel", () => {
518569
)
519570
expect(vscode.window.showErrorMessage).toHaveBeenCalledWith("common:errors.save_api_config")
520571
})
572+
573+
it("enforces organization allow-list when authenticated through CloudService", async () => {
574+
mockStoredProfile({ apiProvider: providerIdentifiers.openrouter, openRouterModelId: "allowed/model" })
575+
mockCloudInstance.isAuthenticated.mockReturnValue(true)
576+
mockCloudInstance.getOrganizationSettings.mockReturnValue({
577+
allowList: {
578+
allowAll: false,
579+
providers: { [providerIdentifiers.openrouter]: { allowAll: false, models: ["allowed/model"] } },
580+
},
581+
} as unknown as ReturnType<typeof mockCloudInstance.getOrganizationSettings>)
582+
583+
await provider.updateProfileModel("test-config", providerIdentifiers.openrouter, {
584+
openRouterModelId: "blocked/model",
585+
})
586+
expect(manager().saveConfig).not.toHaveBeenCalled()
587+
expect(vscode.window.showErrorMessage).toHaveBeenCalledWith("common:errors.violated_organization_allowlist")
588+
589+
await provider.updateProfileModel("test-config", providerIdentifiers.openrouter, {
590+
openRouterModelId: "allowed/model",
591+
})
592+
expect(manager().saveConfig).toHaveBeenCalledTimes(1)
593+
expect(manager().saveConfig).toHaveBeenCalledWith(
594+
"test-config",
595+
expect.objectContaining({ openRouterModelId: "allowed/model" }),
596+
)
597+
})
598+
599+
it("rolls back saved profile and prevents handler rebuild when mutation signal aborts during context update", async () => {
600+
const mockTask = new Task({} as unknown as ConstructorParameters<typeof Task>[0])
601+
Object.defineProperty(mockTask, "taskApiConfigName", { value: "test-config" })
602+
await provider.addClineToStack(mockTask)
603+
604+
mockStoredProfile({
605+
apiProvider: providerIdentifiers.openrouter,
606+
openRouterModelId: "openai/gpt-4",
607+
openRouterApiKey: "my-key",
608+
})
609+
610+
const controller = new AbortController()
611+
provider["enqueueProviderProfileMutation"] = vi.fn().mockImplementation(async (fn) => {
612+
return fn(controller.signal)
613+
})
614+
615+
vi.spyOn(provider.contextProxy, "setProviderSettings").mockImplementationOnce(async () => {
616+
controller.abort()
617+
})
618+
619+
await provider.updateProfileModel("test-config", providerIdentifiers.openrouter, {
620+
openRouterModelId: "openai/gpt-4.5",
621+
})
622+
623+
expect(manager().saveConfig).toHaveBeenCalledTimes(2)
624+
expect(mockTask.updateApiConfiguration).not.toHaveBeenCalled()
625+
expect(vscode.window.showErrorMessage).toHaveBeenCalledWith("common:errors.save_api_config")
626+
})
521627
})

0 commit comments

Comments
 (0)