Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(models): preserve OAuth ownership across speech discovery
JiangJiahaoddb620ddfa9d
diff --git a/apps/desktop/src/main/maker-host/__tests__/genericOAuth.test.ts b/apps/desktop/src/main/maker-host/__tests__/genericOAuth.test.tsindex 0354b59735..9357681e91 100644--- a/apps/desktop/src/main/maker-host/__tests__/genericOAuth.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/genericOAuth.test.ts@@ -136,22 +136,35 @@ describe('manual model refresh for saved OAuth providers', () => {};}+ // Unit: refresh must reuse the saved login for both OpenRouter catalogs. The+ // former single-response fixture rejected the speech URL and hid its models.for (const presetId of ['openrouter', 'nous']) {it.each(['claude-code', 'codex', 'pi'] as const)(`${presetId} refresh uses the saved login and upstream protocol for %s`, async agent => {const provider = savedProvider(presetId);// Display IDs and owner-scoped storage IDs deliberately differ.seedBlob('scoped-account', { access_token: 'fake-oauth-access' });- let requests = 0;+ const requests: string[] = [];const result = await fetchSavedOAuthProviderModels(provider, agent, 'scoped-account', () => true,async (url, init) => {- requests++;- expect(url).toBe(provider.auth.oauth!.modelsDiscoveryUrl);+ requests.push(String(url));expect(init?.headers).toEqual({ authorization: 'Bearer fake-oauth-access' });expect(init?.redirect).toBe('error');+ if (new URL(String(url)).searchParams.get('output_modalities') === 'speech') {+ return new Response(JSON.stringify({ data: [{+ id: 'minimax/speech-2.8-turbo', architecture: { output_modalities: ['speech'] },+ }] }));+ }return new Response(JSON.stringify({ data: [{ id: 'new-model', context_length: 123456 }] }));});- expect(requests).toBe(1);- expect(result).toMatchObject({ ok: true, models: [{ id: 'new-model', contextWindow: 123456 }] });+ const modelsUrl = provider.auth.oauth!.modelsDiscoveryUrl!;+ expect(requests).toEqual(presetId === 'openrouter'+ ? [modelsUrl, `${modelsUrl}?output_modalities=speech`] : [modelsUrl]);+ expect(result).toMatchObject({ ok: true, models: [+ { id: 'new-model', contextWindow: 123456 },+ ...(presetId === 'openrouter' ? [{+ id: 'minimax/speech-2.8-turbo', discoveredMetadata: { mode: 'audio_speech' },+ }] : []),+ ] });expect(JSON.stringify(result)).not.toContain('fake-oauth-access');});}@@ -195,14 +208,20 @@ describe('manual model refresh for saved OAuth providers', () => {expect(requests).toBe(0);});- it.each(['before-request', 'during-request'])('discards a refresh after account/config changes %s', async phase => {+ // A new catalog must not reuse a revoked owner snapshot or publish a late result.+ // Keep the original one-request maximum when ownership changes on the first reply.+ it.each(['before-request', 'during-request', 'during-speech-request'])('discards a refresh after account/config changes %s', async phase => {seedBlob('scoped-account', { access_token: 'fake-access' });let current = phase !== 'before-request';let requests = 0;const result = await fetchSavedOAuthProviderModels(savedProvider(), 'pi', 'scoped-account', () => current,- async () => { requests++; current = false; return new Response('{"data":["model"]}'); });+ async () => {+ requests++;+ if (phase === 'during-request' || requests === 2) current = false;+ return new Response('{"data":["model"]}');+ });expect(result).toEqual({ ok: false, code: 'AUTH_INVALID' });- expect(requests).toBe(phase === 'before-request' ? 0 : 1);+ expect(requests).toBe(phase === 'before-request' ? 0 : phase === 'during-request' ? 1 : 2);});});diff --git a/apps/desktop/src/main/maker-host/provider-model-fetch.ts b/apps/desktop/src/main/maker-host/provider-model-fetch.tsindex a123f47a2b..13630df2e3 100644--- a/apps/desktop/src/main/maker-host/provider-model-fetch.ts+++ b/apps/desktop/src/main/maker-host/provider-model-fetch.ts@@ -106,7 +106,12 @@ export async function fetchSavedOAuthProviderModels(apiKey: token,headers,redirect: 'error',- }, fetchImpl);+ }, async (url, init) => {+ // Pagination and the separate speech catalog may run after the first reply.+ // Revoke the captured credentials before another request if ownership changed.+ if (!isCurrent()) throw new Error('Provider model refresh is no longer current');+ return fetchImpl(url, init);+ });return isCurrent() ? result : { ok: false, code: 'AUTH_INVALID' };}