Skip to content

Commit 0e03b3a

Browse files
PierrunoYTampagent
andcommitted
Cancel stale Bedrock catalogue discovery and complete regression coverage
Recover the missing regional catalogue baseline from pinned visual CI run 37342364879 (artifact 11359827471). No host-generated baseline. Amp-Thread-ID: https://ampcode.com/threads/T-01a10cc3-9ccd-740a-917e-e09003b7f29a Co-authored-by: Amp <[email protected]>
1 parent 047e5d9 commit 0e03b3a

11 files changed

Lines changed: 185 additions & 10 deletions

File tree

‎packages/types/src/providers/bedrock.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export type BedrockModelId = keyof typeof bedrockModels
66

77
export const BedrockModelsMessageType = {
88
requestBedrockModels: "requestBedrockModels",
9+
cancelBedrockModels: "cancelBedrockModels",
910
bedrockModels: "bedrockModels",
1011
} as const
1112

‎packages/types/src/vscode-extension-host.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,7 @@ export interface WebviewMessage {
494494
| typeof RouterModelsMessageType.requestRouterModels
495495
| typeof OpenAiModelsMessageType.requestOpenAiModels
496496
| typeof BedrockModelsMessageType.requestBedrockModels
497+
| typeof BedrockModelsMessageType.cancelBedrockModels
497498
| typeof OllamaModelsMessageType.requestOllamaModels
498499
| typeof LmStudioModelsMessageType.requestLmStudioModels
499500
| "requestRooModels"

‎src/api/providers/fetchers/__tests__/bedrock.spec.ts‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,3 +172,47 @@ it("releases the client if a later profile page fails instead of returning parti
172172
await expect(getBedrockCatalog({ awsRegion: "eu-west-3" })).rejects.toThrow("Pagination denied")
173173
expect(destroy).toHaveBeenCalledOnce()
174174
})
175+
176+
it.each([
177+
["foundations", "external"],
178+
["profiles", "external"],
179+
["foundations", "timeout"],
180+
["profiles", "timeout"],
181+
])("aborts pending %s discovery on %s cancellation and releases the client", async (operation, cancellation) => {
182+
const external = new AbortController()
183+
const timeout = new AbortController()
184+
const timeoutSpy = vi.spyOn(AbortSignal, "timeout").mockReturnValue(timeout.signal)
185+
const pending = vi.fn(
186+
(signal: AbortSignal) =>
187+
new Promise<never>((_resolve, reject) => {
188+
signal.addEventListener("abort", () => reject(signal.reason), { once: true })
189+
}),
190+
)
191+
send.mockImplementation((_command: unknown, { abortSignal }: { abortSignal: AbortSignal }) =>
192+
operation === "foundations" ? pending(abortSignal) : Promise.resolve({}),
193+
)
194+
pages.mockImplementation(async function* (_config, _input, { abortSignal }: { abortSignal: AbortSignal }) {
195+
yield {}
196+
await pending(abortSignal)
197+
})
198+
try {
199+
const request = getBedrockCatalog({ awsRegion: "eu-west-3" }, external.signal)
200+
const rejected = expect(request).rejects.toThrow("cancelled discovery")
201+
await vi.waitFor(() => expect(pending).toHaveBeenCalledOnce())
202+
const signal = pending.mock.calls[0][0]
203+
expect(signal.aborted).toBe(false)
204+
expect(destroy).not.toHaveBeenCalled()
205+
;(cancellation === "external" ? external : timeout).abort(new Error("cancelled discovery"))
206+
expect(signal.aborted).toBe(true)
207+
await rejected
208+
expect(timeoutSpy).toHaveBeenCalledWith(30_000)
209+
expect(destroy).toHaveBeenCalledOnce()
210+
if (operation === "profiles") {
211+
expect(send.mock.calls[0][1].abortSignal).toBe(signal)
212+
} else {
213+
expect(pages).not.toHaveBeenCalled()
214+
}
215+
} finally {
216+
timeoutSpy.mockRestore()
217+
}
218+
})

‎src/api/providers/fetchers/bedrock.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ import type { BedrockCatalogEntry, ProviderSettings } from "@roo-code/types"
77
import { getSystemProxyUrl } from "../../../utils/networkProxy"
88

99
/** Query the regional control plane, not a custom inference/runtime endpoint. */
10-
export async function getBedrockCatalog(options: ProviderSettings): Promise<BedrockCatalogEntry[]> {
10+
export async function getBedrockCatalog(
11+
options: ProviderSettings,
12+
abortSignal?: AbortSignal,
13+
): Promise<BedrockCatalogEntry[]> {
1114
if (!options.awsRegion) throw new Error("Select an AWS region before refreshing the catalogue.")
1215
if (options.awsUseApiKey)
1316
throw new Error("Catalogue discovery requires AWS IAM credentials or an AWS profile, not a Bedrock API key.")
@@ -32,8 +35,10 @@ export async function getBedrockCatalog(options: ProviderSettings): Promise<Bedr
3235
...(proxy ? { httpAgent: new HttpProxyAgent(proxy), httpsAgent: new HttpsProxyAgent(proxy) } : {}),
3336
}),
3437
})
35-
const signal = AbortSignal.timeout(30_000)
38+
const timeout = AbortSignal.timeout(30_000)
39+
const signal = abortSignal ? AbortSignal.any([abortSignal, timeout]) : timeout
3640
try {
41+
signal.throwIfAborted()
3742
const result: BedrockCatalogEntry[] = []
3843
const foundations = await client.send(
3944
new ListFoundationModelsCommand({ byOutputModality: "TEXT", byInferenceType: "ON_DEMAND" }),

‎src/core/webview/ClineProvider.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ export class ClineProvider
198198
private static activeInstances: Set<ClineProvider> = new Set()
199199
private disposables: vscode.Disposable[] = []
200200
private webviewDisposables: vscode.Disposable[] = []
201+
public readonly bedrockCatalogRequests = new Map<string, AbortController>()
201202
private pendingThemeFixtureProbes = new Map<
202203
string,
203204
{
@@ -779,6 +780,10 @@ export class ClineProvider
779780
- https://github.com/microsoft/vscode-extension-samples/blob/main/webview-sample/src/extension.ts
780781
*/
781782
private clearWebviewResources() {
783+
for (const controller of this.bedrockCatalogRequests.values()) {
784+
controller.abort()
785+
}
786+
this.bedrockCatalogRequests.clear()
782787
this.rejectPendingThemeFixtureProbes(new Error("Webview was disposed before the theme fixture probe completed"))
783788
while (this.webviewDisposables.length) {
784789
const x = this.webviewDisposables.pop()

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -839,6 +839,19 @@ describe("ClineProvider", () => {
839839
})
840840
})
841841

842+
test("aborts and forgets pending Bedrock discovery when webview resources are cleared", () => {
843+
const first = new AbortController()
844+
const second = new AbortController()
845+
provider.bedrockCatalogRequests.set("first", first)
846+
provider.bedrockCatalogRequests.set("second", second)
847+
848+
provider["clearWebviewResources"]()
849+
850+
expect(first.signal.aborted).toBe(true)
851+
expect(second.signal.aborted).toBe(true)
852+
expect(provider.bedrockCatalogRequests.size).toBe(0)
853+
})
854+
842855
test("postStateToWebview does not force action navigation for non-compliant MDM state", async () => {
843856
const mdmService = {
844857
requiresCloudAuth: vi.fn().mockReturnValue(true),

‎src/core/webview/__tests__/webviewMessageHandler.routerModels.spec.ts‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ describe("webviewMessageHandler - requestRouterModels provider filter", () => {
8080

8181
mockProvider = {
8282
// Only methods used by this code path
83+
bedrockCatalogRequests: new Map<string, AbortController>(),
8384
postMessageToWebview: vi.fn(),
8485
getState: vi.fn().mockResolvedValue({ apiConfiguration: {} }),
8586
contextProxy: {
@@ -116,7 +117,8 @@ describe("webviewMessageHandler - requestRouterModels provider filter", () => {
116117
requestId: "draft",
117118
apiConfiguration,
118119
})
119-
expect(getBedrockCatalogMock).toHaveBeenCalledWith(apiConfiguration)
120+
expect(getBedrockCatalogMock).toHaveBeenCalledWith(apiConfiguration, expect.any(AbortSignal))
121+
expect(mockProvider.bedrockCatalogRequests.size).toBe(0)
120122
expect(mockProvider.contextProxy.setValue).not.toHaveBeenCalled()
121123
expect(mockProvider.postMessageToWebview).toHaveBeenCalledWith({
122124
type: BedrockModelsMessageType.bedrockModels,
@@ -154,6 +156,38 @@ describe("webviewMessageHandler - requestRouterModels provider filter", () => {
154156
}),
155157
)
156158
expect(JSON.stringify(mockProvider.postMessageToWebview.mock.calls)).not.toContain("secret credential detail")
159+
expect(mockProvider.bedrockCatalogRequests.size).toBe(0)
160+
})
161+
162+
it.each(["success", "failure"])("cancels only the correlated discovery and suppresses late %s", async (outcome) => {
163+
let finish!: () => void
164+
getBedrockCatalogMock.mockImplementationOnce(
165+
() =>
166+
new Promise((resolve, reject) => {
167+
finish = () => (outcome === "success" ? resolve([]) : reject(new Error("aborted discovery")))
168+
}),
169+
)
170+
const other = new AbortController()
171+
mockProvider.bedrockCatalogRequests.set("other", other)
172+
const pending = webviewMessageHandler(mockProvider, {
173+
type: BedrockModelsMessageType.requestBedrockModels,
174+
requestId: "cancelled",
175+
})
176+
await vi.waitFor(() => expect(getBedrockCatalogMock).toHaveBeenCalledOnce())
177+
const signal: AbortSignal = getBedrockCatalogMock.mock.calls[0][1]
178+
expect(signal.aborted).toBe(false)
179+
await webviewMessageHandler(mockProvider, {
180+
type: BedrockModelsMessageType.cancelBedrockModels,
181+
requestId: "cancelled",
182+
})
183+
expect(signal.aborted).toBe(true)
184+
expect(other.signal.aborted).toBe(false)
185+
expect(mockProvider.bedrockCatalogRequests.has("cancelled")).toBe(false)
186+
finish()
187+
await pending
188+
expect(mockProvider.postMessageToWebview).not.toHaveBeenCalled()
189+
expect(mockProvider.log).not.toHaveBeenCalled()
190+
expect(mockProvider.bedrockCatalogRequests.get("other")).toBe(other)
157191
})
158192

159193
it("returns explicit removal error for requestRooModels", async () => {

‎src/core/webview/webviewMessageHandler.ts‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1108,15 +1108,28 @@ export const webviewMessageHandler = async (
11081108
// For providers that need credentials, use their specific handlers
11091109
await flushModels({ provider: routerNameFlush } as GetModelsOptions, true)
11101110
break
1111+
case BedrockModelsMessageType.cancelBedrockModels:
1112+
if (message.requestId) {
1113+
provider.bedrockCatalogRequests.get(message.requestId)?.abort()
1114+
provider.bedrockCatalogRequests.delete(message.requestId)
1115+
}
1116+
break
11111117
case BedrockModelsMessageType.requestBedrockModels: {
1118+
const { requestId } = message
1119+
if (!requestId) break
1120+
provider.bedrockCatalogRequests.get(requestId)?.abort()
1121+
const controller = new AbortController()
1122+
provider.bedrockCatalogRequests.set(requestId, controller)
11121123
try {
1113-
const bedrockModels = await getBedrockCatalog(message.apiConfiguration ?? {})
1124+
const bedrockModels = await getBedrockCatalog(message.apiConfiguration ?? {}, controller.signal)
1125+
if (controller.signal.aborted) break
11141126
await provider.postMessageToWebview({
11151127
type: BedrockModelsMessageType.bedrockModels,
11161128
requestId: message.requestId,
11171129
bedrockModels,
11181130
})
11191131
} catch (error) {
1132+
if (controller.signal.aborted) break
11201133
// Keep the underlying cause (IAM denial, network, wrong region) diagnosable in the output channel.
11211134
provider.log(
11221135
`Bedrock catalogue discovery failed: ${error instanceof Error ? `${error.name}: ${error.message}` : String(error)}`,
@@ -1126,6 +1139,10 @@ export const webviewMessageHandler = async (
11261139
requestId: message.requestId,
11271140
error: "Could not load the regional catalogue. Check IAM credentials/profile, network access, and listing permissions (bedrock:ListFoundationModels / bedrock:ListInferenceProfiles). This discovery flow requires IAM authentication.",
11281141
})
1142+
} finally {
1143+
if (provider.bedrockCatalogRequests.get(requestId) === controller) {
1144+
provider.bedrockCatalogRequests.delete(requestId)
1145+
}
11291146
}
11301147
break
11311148
}

‎webview-ui/src/components/settings/providers/BedrockCatalog.tsx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@ export function BedrockCatalog({
4343
}
4444
window.addEventListener("message", listener)
4545
return () => {
46+
if (requestId.current) {
47+
vscode.postMessage({
48+
type: BedrockModelsMessageType.cancelBedrockModels,
49+
requestId: requestId.current,
50+
})
51+
}
4652
requestId.current = undefined
4753
window.removeEventListener("message", listener)
4854
}

‎webview-ui/src/components/settings/providers/__tests__/BedrockCatalog.spec.tsx‎

Lines changed: 55 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,71 @@ vi.mock("@src/components/ui", () => ({
1010
children,
1111
value,
1212
onValueChange,
13+
disabled,
1314
}: {
1415
children: React.ReactNode
1516
value: string
1617
onValueChange: (value: string) => void
18+
disabled?: boolean
1719
}) => (
18-
<select value={value} onChange={(event) => onValueChange(event.target.value)}>
19-
<option value="" disabled />
20+
<select value={value} disabled={disabled} onChange={(event) => onValueChange(event.target.value)}>
2021
{children}
2122
</select>
2223
),
2324
SelectContent: ({ children }: { children: React.ReactNode }) => <>{children}</>,
2425
SelectItem: ({ children, value }: { children: React.ReactNode; value: string }) => (
2526
<option value={value}>{children}</option>
2627
),
27-
SelectTrigger: () => null,
28-
SelectValue: () => null,
28+
SelectTrigger: ({ children }: { children: React.ReactNode }) => <option value="">{children}</option>,
29+
SelectValue: ({ placeholder }: { placeholder: string }) => <>{placeholder}</>,
2930
}))
3031

3132
beforeEach(() => vi.clearAllMocks())
3233

34+
it.each([{}, { awsRegion: "eu-west-3", awsUseApiKey: true }])(
35+
"does not request discovery for unavailable authentication or region: %j",
36+
(apiConfiguration) => {
37+
render(<BedrockCatalog apiConfiguration={apiConfiguration} onSelect={vi.fn()} />)
38+
expect(screen.getByRole("button")).toBeDisabled()
39+
fireEvent.click(screen.getByRole("button"))
40+
expect(vscode.postMessage).not.toHaveBeenCalled()
41+
},
42+
)
43+
44+
it("disables refresh while loading and renders an unselectable empty successful result", () => {
45+
const { unmount } = render(<BedrockCatalog apiConfiguration={{ awsRegion: "eu-west-3" }} onSelect={vi.fn()} />)
46+
fireEvent.click(screen.getByRole("button"))
47+
const request = vi.mocked(vscode.postMessage).mock.calls[0][0]
48+
expect(screen.getByRole("button")).toBeDisabled()
49+
expect(screen.getByRole("button")).toHaveTextContent("settings:providers.awsCatalogLoading")
50+
fireEvent.click(screen.getByRole("button"))
51+
expect(vscode.postMessage).toHaveBeenCalledTimes(1)
52+
act(() =>
53+
window.dispatchEvent(
54+
new MessageEvent("message", {
55+
data: { type: BedrockModelsMessageType.bedrockModels, requestId: request.requestId, bedrockModels: [] },
56+
}),
57+
),
58+
)
59+
expect(screen.getByRole("button")).toBeEnabled()
60+
expect(screen.getByRole("combobox")).toBeDisabled()
61+
expect(screen.getByRole("combobox")).toHaveTextContent("settings:providers.awsCatalogEmpty")
62+
expect(screen.queryByRole("alert")).not.toBeInTheDocument()
63+
unmount()
64+
expect(vscode.postMessage).toHaveBeenCalledTimes(1)
65+
})
66+
67+
it("cancels pending discovery on unmount", () => {
68+
const { unmount } = render(<BedrockCatalog apiConfiguration={{ awsRegion: "eu-west-3" }} onSelect={vi.fn()} />)
69+
fireEvent.click(screen.getByRole("button"))
70+
const request = vi.mocked(vscode.postMessage).mock.calls[0][0]
71+
unmount()
72+
expect(vscode.postMessage).toHaveBeenLastCalledWith({
73+
type: BedrockModelsMessageType.cancelBedrockModels,
74+
requestId: request.requestId,
75+
})
76+
})
77+
3378
it.each([undefined, "", " "])("disables incomplete profile discovery (%j)", (awsProfile) => {
3479
render(
3580
<BedrockCatalog
@@ -82,6 +127,10 @@ it.each([{ awsRegion: "us-east-1" }, { awsProfile: "other" }])(
82127
const first = vi.mocked(vscode.postMessage).mock.calls[0][0]
83128
expect(first.apiConfiguration).toEqual(expect.objectContaining(config))
84129
rerender(<BedrockCatalog apiConfiguration={{ ...config, ...change }} onSelect={onSelect} />)
130+
expect(vscode.postMessage).toHaveBeenLastCalledWith({
131+
type: BedrockModelsMessageType.cancelBedrockModels,
132+
requestId: first.requestId,
133+
})
85134
act(() =>
86135
window.dispatchEvent(
87136
new MessageEvent("message", {
@@ -95,7 +144,7 @@ it.each([{ awsRegion: "us-east-1" }, { awsProfile: "other" }])(
95144
)
96145
expect(screen.queryByRole("combobox")).not.toBeInTheDocument()
97146
fireEvent.click(screen.getByRole("button"))
98-
const second = vi.mocked(vscode.postMessage).mock.calls[1][0]
147+
const second = vi.mocked(vscode.postMessage).mock.calls[2][0]
99148
act(() =>
100149
window.dispatchEvent(
101150
new MessageEvent("message", {
@@ -109,7 +158,7 @@ it.each([{ awsRegion: "us-east-1" }, { awsProfile: "other" }])(
109158
)
110159
fireEvent.change(screen.getByRole("combobox"), { target: { value: "new" } })
111160
expect(onSelect).toHaveBeenCalledWith("new")
112-
expect(vscode.postMessage).toHaveBeenCalledTimes(2)
161+
expect(vscode.postMessage).toHaveBeenCalledTimes(3)
113162
},
114163
)
115164

0 commit comments

Comments
 (0)