Skip to content

Commit 91a2709

Browse files
author
Zoo (VP)
committed
fix(core): keep legacy routerModels response shape when no request ID
What: only include values.requestId in the routerModels response when the request carried one; requests without an ID keep the previous response shape (values undefined for aggregate, { provider } for filtered). Why: the unconditional requestId echo broke six existing requestRouterModels specs in ClineProvider.spec.ts and webviewMessageHandler.spec.ts that assert the exact legacy response payload (values: undefined for aggregate requests), failing the platform-unit-test ubuntu CI job on bc077c2. Impact: CI restoration; the request-ID correlation added for fetchRouterModels is unchanged for new-protocol requests. Added a host-side test asserting the ID echo for filtered requests.
1 parent bc077c2 commit 91a2709

2 files changed

Lines changed: 36 additions & 7 deletions

File tree

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -678,6 +678,31 @@ describe("webviewMessageHandler - requestRouterModels provider filter", () => {
678678
})
679679
})
680680

681+
it("echoes the request ID in the routerModels response when one was provided", async () => {
682+
mockProvider.getState.mockResolvedValue({
683+
apiConfiguration: {
684+
mimoApiKey: "stored-mimo-key",
685+
},
686+
})
687+
688+
getModelsMock.mockResolvedValue({})
689+
690+
await webviewMessageHandler(mockProvider, {
691+
type: RouterModelsMessageType.requestRouterModels,
692+
values: { provider: providerIdentifiers.mimo, requestId: "req-123" },
693+
})
694+
695+
const response = mockProvider.postMessageToWebview.mock.calls.find(
696+
(call) => call[0]?.type === RouterModelsMessageType.routerModels,
697+
)
698+
expect(response).toBeDefined()
699+
if (!response) throw new Error("Expected routerModels response")
700+
expect(response[0].values).toEqual({
701+
requestId: "req-123",
702+
provider: providerIdentifiers.mimo,
703+
})
704+
})
705+
681706
it("flushes MiMo cache when explicit credentials are provided via message values", async () => {
682707
getModelsMock.mockResolvedValue({
683708
"mimo-v2.6-pro": { contextWindow: 1_048_576, supportsPromptCache: false },

‎src/core/webview/webviewMessageHandler.ts‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1440,16 +1440,20 @@ export const webviewMessageHandler = async (
14401440
}
14411441
})
14421442

1443+
// Echo the webview's request ID when one was provided so
1444+
// fetchRouterModels can correlate the response to the exact pending
1445+
// request (a remount may re-issue the same provider request while a
1446+
// stale response is in flight). Requests without an ID keep the
1447+
// previous response shape.
1448+
const requestId = message?.values?.requestId
14431449
await provider.postMessageToWebview({
14441450
type: RouterModelsMessageType.routerModels,
14451451
routerModels,
1446-
// Echo the webview's request ID so fetchRouterModels can correlate
1447-
// the response to the exact pending request (a remount may re-issue
1448-
// the same provider request while a stale response is in flight).
1449-
values: {
1450-
requestId: message?.values?.requestId,
1451-
...(providerFilter ? { provider: requestedProvider } : {}),
1452-
},
1452+
values: requestId
1453+
? { requestId, ...(providerFilter ? { provider: requestedProvider } : {}) }
1454+
: providerFilter
1455+
? { provider: requestedProvider }
1456+
: undefined,
14531457
})
14541458
break
14551459
}

0 commit comments

Comments
 (0)