Skip to content

Commit ccf1597

Browse files
committed
fix(kimi-code): address review feedback and resolve main merge conflicts
- Wrap kimiCodeOAuthState aggregation in try/catch in ClineProvider - Add non-401 OAuth no-retry test for createMessage - Add vi.resetModules() to kimiCode sign-in/out spec setup - Localize kimiCode settings strings in 9 locales - Merge origin/main: adopt canonical providerIdentifiers registry, keep both kimi-code and zoo-gateway setup-gate checks
1 parent 891c04f commit ccf1597

12 files changed

Lines changed: 101 additions & 83 deletions

File tree

src/api/providers/__tests__/kimi-code.spec.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,18 @@ describe("KimiCodeHandler", () => {
137137
expect(mockForceRefreshAccessToken).not.toHaveBeenCalled()
138138
})
139139

140+
it("does not force-refresh on non-401 OAuth failures", async () => {
141+
const handler = new KimiCodeHandler({ kimiCodeAuthMethod: "oauth" })
142+
vi.spyOn(globalThis, "fetch").mockResolvedValueOnce(new Response(null, { status: 500 }))
143+
const gen = handler.createMessage("system", [{ role: "user", content: "test" }])
144+
await expect(async () => {
145+
for await (const chunk of gen) {
146+
// consume
147+
}
148+
}).rejects.toThrow()
149+
expect(mockForceRefreshAccessToken).not.toHaveBeenCalled()
150+
})
151+
140152
it("fetches models during prepareRequest", async () => {
141153
mockGetModels.mockResolvedValueOnce({ "test-model": { maxTokens: 1000 } })
142154
const handler = new KimiCodeHandler({ kimiCodeAuthMethod: "api-key", kimiCodeApiKey: "key" })

src/core/webview/ClineProvider.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2568,8 +2568,12 @@ export class ClineProvider
25682568
}
25692569
})(),
25702570
kimiCodeOAuthState: await (async () => {
2571-
const { kimiCodeOAuthManager } = await import("../../integrations/kimi-code/oauth")
2572-
return kimiCodeOAuthManager.getState()
2571+
try {
2572+
const { kimiCodeOAuthManager } = await import("../../integrations/kimi-code/oauth")
2573+
return kimiCodeOAuthManager.getState()
2574+
} catch {
2575+
return undefined
2576+
}
25732577
})(),
25742578
...zooCodeState,
25752579
platform: process.platform,

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1477,6 +1477,7 @@ describe("zooCodeSignOut", () => {
14771477
describe("webviewMessageHandler - kimiCodeSignIn", () => {
14781478
beforeEach(() => {
14791479
vi.clearAllMocks()
1480+
vi.resetModules()
14801481
})
14811482

14821483
it("starts OAuth authorization and opens browser", async () => {
@@ -1584,6 +1585,7 @@ describe("webviewMessageHandler - kimiCodeSignIn", () => {
15841585
describe("webviewMessageHandler - kimiCodeSignOut", () => {
15851586
beforeEach(() => {
15861587
vi.clearAllMocks()
1588+
vi.resetModules()
15871589
})
15881590

15891591
it("clears credentials and shows success message", async () => {

webview-ui/src/i18n/locales/de/settings.json

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webview-ui/src/i18n/locales/es/settings.json

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webview-ui/src/i18n/locales/fr/settings.json

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webview-ui/src/i18n/locales/hi/settings.json

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webview-ui/src/i18n/locales/id/settings.json

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webview-ui/src/i18n/locales/it/settings.json

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webview-ui/src/i18n/locales/ja/settings.json

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)