Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(providers): add speech references on manual refresh
JiangJiahao9c31898e8dde
diff --git a/apps/desktop/scripts/fixtures/provider-speech-setup/provider-speech-setup-fixture.tsx b/apps/desktop/scripts/fixtures/provider-speech-setup/provider-speech-setup-fixture.tsxindex 8550a5728d..5735502b22 100644--- a/apps/desktop/scripts/fixtures/provider-speech-setup/provider-speech-setup-fixture.tsx+++ b/apps/desktop/scripts/fixtures/provider-speech-setup/provider-speech-setup-fixture.tsx@@ -29,7 +29,7 @@ let stored: CustomProviderConfig = {},};function view(): ProviderView {- const provider = buildUserProvider(stored);+ const provider = buildUserProvider(stored, { modelRegistry: BUNDLED_CATALOG.modelRegistry });return { ...provider, connected: true, availableMediaModelIds: provider.audioModels?.map(model => model.id) ?? [] };}function VisibilityEvidence() {@@ -74,17 +74,8 @@ function Fixture({ scenario }: { scenario: string }) {{visibilityReady && <UnifiedModelListprovider={provider}focusModelId={scenario === 'speech-visibility' ? 'speech-2.8-hd' : undefined}- onAddSpeechModels={- setup- ? () => {- if (setup.needsApiKey)- setWizard({- entry: { kind: 'preset', presetId: setup.presetId, speechOnly: true },- });- else setSpeech(true);- }- : undefined- }+ onRefresh={forbid('manualRefresh: covered by ProvidersSection regression tests')}+ onAddSpeechModels={setup ? () => setSpeech(true) : undefined}/>}</div>{scenario === 'speech-visibility' && visibilityReady && <VisibilityEvidence />}@@ -129,6 +120,7 @@ function Fixture({ scenario }: { scenario: string }) {}void mountPage({host: (ctx) => {+ if (ctx.case === 'empty') stored.runtimes.codex!.models = [];if (ctx.case === 'speech-visibility')stored.runtimes.codex!.models.push({ id: 'speech-2.8-hd', name: 'MiniMax Speech 2.8 HD', mode: 'audio_speech', defaultEnabled: false });if (ctx.case === 'token-plan-existing')diff --git a/apps/desktop/scripts/fixtures/provider-speech-setup/ui-page.mjs b/apps/desktop/scripts/fixtures/provider-speech-setup/ui-page.mjsindex 0555fc786a..3e54ee2120 100644--- a/apps/desktop/scripts/fixtures/provider-speech-setup/ui-page.mjs+++ b/apps/desktop/scripts/fixtures/provider-speech-setup/ui-page.mjs@@ -5,9 +5,10 @@ export default {viewport: { width: 1120, height: 820 },real: 'AddProviderWizard, UnifiedModelList toolbar, AddSpeechModelsDialog, SpeechModelChoices, model Registry resolution, translations and themes',notCovered:- 'Live credentials, provider network calls, OS safe storage, Settings owner changes, OAuth login and actual synthesis; host catalog/save responses are scenario data',+ 'Live credentials, manual refresh orchestration (covered by ProvidersSection unit tests), provider network calls, OS safe storage, Settings owner changes, OAuth login and actual synthesis; host catalog/save responses are scenario data',cases: {default: { about: 'Existing API-key connection adds speech without replacing its chat model' },+ empty: { about: 'An empty API-key connection keeps manual speech addition in Management' },minimax: {about:'Single add-provider flow: MiniMax API key, grouped chat/speech, recommended speech default',@@ -23,7 +24,7 @@ export default {'token-plan': { about: 'Token Plan recommends Qwen-Audio instead of workspace CosyVoice' },'token-plan-existing': { about: 'Existing Token Plan uses the same Qwen-Audio recommendation' },'speech-visibility': { about: 'Previously hidden speech can be shown and hidden through model management' },- subscription: { about: 'Existing OpenAI subscription creates a separate API-key connection' },+ subscription: { about: 'Existing OpenAI subscription has no speech-add button or menu item' },},async ready(page) {await page.getByTestId('provider-model-toolbar').waitFor();@@ -43,14 +44,24 @@ export default {await page.getByTestId('speech-visible').filter({ hasText: 'false' }).waitFor({ state: 'attached' });return;}- const existing = ['default', 'bailian-existing', 'token-plan-existing'].includes(ui.case);+ const existing = ['default', 'empty', 'bailian-existing', 'token-plan-existing'].includes(ui.case);if (existing || ui.case === 'subscription') {+ assert.equal(await page.getByRole('button', { name: await ui.t('settings.providers.speechSetup.add'), exact: true }).count(), 0);+ await ui.capture('toolbar');await page.getByRole('button', {- name: await ui.t('settings.providers.speechSetup.add'),+ name: await ui.t('settings.providers.models.manage.menu'),exact: true,}).click();+ await page.getByRole('menu').waitFor();+ const manual = page.getByRole('menuitem', { name: await ui.t('settings.providers.speechSetup.add'), exact: true });+ await ui.capture('management');+ if (ui.case === 'subscription') {+ assert.equal(await manual.count(), 0);+ return;+ }+ await manual.click();} else {await page.getByTestId('add-provider').click();await ui.capture('single-add-entry');@@ -64,8 +75,6 @@ export default {.click();}if (!existing) {- if (ui.case === 'subscription')- await page.getByText(await ui.t('settings.providers.speechSetup.separateKey')).waitFor();await page.getByPlaceholder('sk-…').fill('fixture-key');await ui.capture('connection');await page@@ -81,9 +90,7 @@ export default {? 'qwen3-tts-flash': ui.case === 'bailian-existing'? 'cosyvoice-v3-flash'- : ui.case === 'subscription'- ? 'gpt-4o-mini-tts'- : 'speech-2.8-turbo';+ : 'speech-2.8-turbo';const recommended = page.getByRole('checkbox', { name: new RegExp(recommendedId) });await recommended.waitFor();assert.equal(await recommended.getAttribute('aria-checked'), 'true');diff --git a/apps/desktop/src/renderer/__tests__/providersSectionUnavailableModels.test.tsx b/apps/desktop/src/renderer/__tests__/providersSectionUnavailableModels.test.tsxindex 460507a07f..3c7918f711 100644--- a/apps/desktop/src/renderer/__tests__/providersSectionUnavailableModels.test.tsx+++ b/apps/desktop/src/renderer/__tests__/providersSectionUnavailableModels.test.tsx@@ -12,7 +12,7 @@ import React from 'react';import { MemoryRouter } from 'react-router-dom';import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';-import type { ProviderView } from '@cindy/model-providers';+import type { CustomProviderConfig, ProviderView } from '@cindy/model-providers';import { createIpcError } from '../../shared/ipc-errors';import { toast } from '@/lib/toast';@@ -200,7 +200,7 @@ vi.mock('@/components/settings/AddProviderWizard', () => ({import { setModelVisibilities } from '@/state/modelVisibilityPrefs';import { readCustomProviderKey, updateCustomProvider } from '@/lib/customProviders';-import { buildUserProvider, providerPresetOAuth } from '@cindy/model-providers';+import { BUNDLED_CATALOG, buildUserProvider, providerPresetOAuth } from '@cindy/model-providers';import { ProvidersSection } from '@/components/settings/ProvidersSection';@@ -218,6 +218,7 @@ beforeEach(() => {providerSnapshotState.error = null;providerSnapshotState.order = ['anthropic', 'xd', 'custom'];scanResult = { detections: [] };+ vi.mocked(updateCustomProvider).mockResolvedValue({ ok: true });(window as unknown as { electronAPI: unknown }).electronAPI = {maker: {scanLocalCli: vi.fn(async () => scanResult),@@ -235,6 +236,145 @@ afterEach(() => {});describe('ProvidersSection — 双栏管理', () => {+ // Renderer unit: click the real provider refresh/menu, inspect the persisted+ // config and visible dialog. Earlier refresh cases only used chat-only proxies;+ // a MiniMax API connection with no speech is the minimal missing-default case.+ const miniMaxConfig = () => ({+ id: 'minimax-api', name: 'My MiniMax', runtimes: {+ codex: { baseUrl: 'https://api.minimax.io/v1', wireProtocol: 'openai-chat' as const,+ models: [{ id: 'MiniMax-M3', name: 'My chat', defaultEnabled: false }] },+ },+ });+ function selectSpeechProvider(config: CustomProviderConfig = miniMaxConfig()) {+ const provider = buildUserProvider(config, { modelRegistry: BUNDLED_CATALOG.modelRegistry });+ providerSnapshotState.customOverride = { ...provider, connected: true,+ availableMediaModelIds: provider.audioModels?.map(model => model.id) ?? [] };+ providerSnapshotState.order = [provider.id, 'xd'];+ }+ it.each(['missing', 'discovered', 'hidden', 'explicit-other'] as const)(+ 'manual refresh handles %s speech without changing saved switches', async kind => {+ const config = miniMaxConfig();+ if (kind === 'hidden') config.runtimes.codex.models.push({+ id: 'speech-2.8-hd', name: 'My hidden voice', defaultEnabled: false,+ });+ selectSpeechProvider(config);+ const discovered = kind === 'discovered'+ ? [{ id: 'new-voice', name: 'New voice', discoveredMetadata: { mode: 'audio_speech' as const } }]+ : kind === 'explicit-other'+ ? [{ id: 'speech-2.8-turbo', name: 'Not TTS', discoveredMetadata: { mode: 'other' as const } }]+ : [];+ window.electronAPI.maker.fetchProviderModels = vi.fn(async () => ({ ok: true, models: [+ { id: 'MiniMax-M3', name: 'Upstream name' }, ...discovered,+ ] }));+ const view = render(<MemoryRouter><ProvidersSection /></MemoryRouter>);+ // Opening Settings only schedules discovery, never writes reference models.+ expect(updateCustomProvider).not.toHaveBeenCalled();+ await act(async () => { fireEvent.click(await screen.findByRole('button', { name: 'settings.providers.models.refreshAria' })); });+ const saved = vi.mocked(updateCustomProvider).mock.lastCall![0];+ expect(saved.name).toBe(config.name);+ expect(saved.runtimes.codex!.models.find(model => model.id === 'MiniMax-M3')).toMatchObject(config.runtimes.codex.models[0]);+ const speech = buildUserProvider(saved, { modelRegistry: BUNDLED_CATALOG.modelRegistry }).audioModels?.filter(model => model.mode === 'audio_speech') ?? [];+ expect(speech.map(model => model.id)).toEqual(kind === 'missing' ? ['speech-2.8-turbo']+ : kind === 'discovered' ? ['new-voice'] : kind === 'hidden' ? ['speech-2.8-hd'] : []);+ if (kind === 'hidden') expect(speech[0].defaultEnabled).toBe(false);+ expect(setModelVisibilities).not.toHaveBeenCalled();+ if (kind === 'missing') {+ expect(speech[0].defaultEnabled).toBe(true);+ expect(toast.success).toHaveBeenLastCalledWith('settings.providers.models.refreshSpeechAdded');+ // A second click sees the saved reference; it does not add HD/other defaults.+ selectSpeechProvider(saved);+ view.rerender(<MemoryRouter><ProvidersSection /></MemoryRouter>);+ await act(async () => { fireEvent.click(screen.getByRole('button', { name: 'settings.providers.models.refreshAria' })); });+ expect(vi.mocked(updateCustomProvider).mock.lastCall![0].runtimes.codex!.models.map(model => model.id))+ .toEqual(saved.runtimes.codex!.models.map(model => model.id));+ }+ },+ );+ it.each(['proxy', 'oauth', 'disabled-route'] as const)(+ 'does not offer or auto-add speech for an unconfirmed %s connection', async kind => {+ const config = miniMaxConfig();+ if (kind === 'proxy') config.runtimes.codex.baseUrl = 'https://proxy.example/v1';+ selectSpeechProvider(config);+ if (kind === 'oauth') providerSnapshotState.customOverride!.auth = { method: 'oauth' };+ if (kind === 'disabled-route') providerSnapshotState.customOverride!.routing.codex!.disabled = true;+ window.electronAPI.maker.fetchProviderModels = vi.fn(async () => ({ ok: true,+ models: [{ id: 'MiniMax-M3', name: 'Chat' }] }));+ render(<MemoryRouter><ProvidersSection /></MemoryRouter>);+ expect(screen.queryByRole('button', { name: 'settings.providers.speechSetup.add' })).toBeNull();+ fireEvent.keyDown(screen.getByRole('button', { name: 'settings.providers.models.manage.menu' }), { key: 'ArrowDown' });+ expect(screen.queryByRole('menuitem', { name: 'settings.providers.speechSetup.add' })).toBeNull();+ fireEvent.keyDown(screen.getByRole('menu'), { key: 'Escape' });+ await act(async () => { fireEvent.click(screen.getByRole('button', { name: 'settings.providers.models.refreshAria' })); });+ const saved = vi.mocked(updateCustomProvider).mock.lastCall![0];+ expect(buildUserProvider(saved).audioModels ?? []).toEqual([]);+ },+ );+ it.each([0, 1])('moves manual speech additions into management with %s saved models', async count => {+ const config = miniMaxConfig();+ if (!count) config.runtimes.codex.models = [];+ selectSpeechProvider(config);+ window.electronAPI.maker.fetchProviderModels = vi.fn(async () => ({ ok: false }));+ render(<MemoryRouter><ProvidersSection /></MemoryRouter>);+ expect(screen.queryByRole('button', { name: 'settings.providers.speechSetup.add' })).toBeNull();+ fireEvent.keyDown(screen.getByRole('button', { name: 'settings.providers.models.manage.menu' }), { key: 'ArrowDown' });+ fireEvent.click(await screen.findByRole('menuitem', { name: 'settings.providers.speechSetup.add' }));+ expect(await screen.findByRole('dialog', { name: 'settings.providers.speechSetup.add' })).toBeTruthy();+ expect(await screen.findByRole('checkbox', { name: /speech-2.8-turbo/ })).toBeTruthy();+ expect(updateCustomProvider).not.toHaveBeenCalled();+ });+ it.each(['hidden-other-runtime', 'failed-target'] as const)(+ 'does not supplement a reference across runtimes: %s', async kind => {+ const config: CustomProviderConfig = miniMaxConfig();+ config.runtimes.pi = { baseUrl: 'https://proxy.example/v1', models: [+ { id: 'my-speech', name: 'Saved name', mode: 'audio_speech',+ nativeApi: 'openai-audio-speech', defaultEnabled: false },+ ] };+ if (kind === 'failed-target') config.runtimes.pi.models = [{ id: 'my-chat', name: 'My chat' }];+ selectSpeechProvider(config);+ window.electronAPI.maker.fetchProviderModels = vi.fn(async request => (+ kind === 'failed-target' && request.agent === 'codex' ? { ok: false, status: 401 }+ : { ok: true, models: [{ id: 'another-chat', name: 'Another chat' }] }+ ));+ render(<MemoryRouter><ProvidersSection /></MemoryRouter>);+ await act(async () => { fireEvent.click(await screen.findByRole('button', { name: 'settings.providers.models.refreshAria' })); });+ const saved = vi.mocked(updateCustomProvider).mock.lastCall![0];+ expect(saved.runtimes.codex!.models.some(model => model.id === 'speech-2.8-turbo')).toBe(false);+ expect(saved.runtimes.pi!.models).toEqual(expect.arrayContaining(config.runtimes.pi.models));+ expect(setModelVisibilities).not.toHaveBeenCalled();+ },+ );+ it('keeps speech additions out of native subscription management', async () => {+ selectSpeechProvider();+ providerSnapshotState.customOverride = { ...providerSnapshotState.customOverride!,+ id: 'openai', source: 'builtin', auth: { method: 'oauth', native: 'codex' }, routing: {} };+ providerSnapshotState.order = ['openai', 'xd'];+ render(<MemoryRouter><ProvidersSection /></MemoryRouter>);+ expect(screen.queryByRole('button', { name: 'settings.providers.speechSetup.add' })).toBeNull();+ fireEvent.keyDown(screen.getByRole('button', { name: 'settings.providers.models.manage.menu' }), { key: 'ArrowDown' });+ await screen.findByRole('menu');+ expect(screen.queryByRole('menuitem', { name: 'settings.providers.speechSetup.add' })).toBeNull();+ expect(updateCustomProvider).not.toHaveBeenCalled();+ });+ it.each([401, 500])('does not add references when discovery fails with HTTP %s', async status => {+ selectSpeechProvider();+ window.electronAPI.maker.fetchProviderModels = vi.fn(async () => ({ ok: false, status }));+ render(<MemoryRouter><ProvidersSection /></MemoryRouter>);+ await act(async () => { fireEvent.click(await screen.findByRole('button', { name: 'settings.providers.models.refreshAria' })); });+ expect(updateCustomProvider).not.toHaveBeenCalled();+ expect(toast.error).toHaveBeenCalledWith('settings.providers.models.refreshFailed');+ expect(toast.success).not.toHaveBeenCalled();+ });+ it('does not report refresh success when saving the added model is declined', async () => {+ selectSpeechProvider();+ window.electronAPI.maker.fetchProviderModels = vi.fn(async () => ({ ok: true,+ models: [{ id: 'MiniMax-M3', name: 'Chat' }] }));+ vi.mocked(updateCustomProvider).mockResolvedValue({ ok: false,+ confirmationRequired: 'codex-image-generation-reload', busyCount: 1 });+ render(<MemoryRouter><ProvidersSection /></MemoryRouter>);+ await act(async () => { fireEvent.click(await screen.findByRole('button', { name: 'settings.providers.models.refreshAria' })); });+ expect(toast.error).toHaveBeenCalledWith('settings.providers.models.refreshFailed');+ expect(toast.success).not.toHaveBeenCalled();+ });it('keeps a recovery action accessible when the first complete catalog could not be published', async () => {providerSnapshotState.loading = true;providerSnapshotState.error = { reason: 'storage-quota' };diff --git a/apps/desktop/src/renderer/components/settings/AddSpeechModelsDialog.tsx b/apps/desktop/src/renderer/components/settings/AddSpeechModelsDialog.tsxindex 6763d461ea..faab90d0a0 100644--- a/apps/desktop/src/renderer/components/settings/AddSpeechModelsDialog.tsx+++ b/apps/desktop/src/renderer/components/settings/AddSpeechModelsDialog.tsx@@ -77,7 +77,7 @@ export function AddSpeechModelsDialog({let cancelled = false;mounted.current = true;void (async () => {- if (!target || target.needsApiKey) return;+ if (!target) return;const runtime = config.runtimes[target.agent];if (!runtime) return;try {@@ -142,7 +142,7 @@ export function AddSpeechModelsDialog({if (!savingRef.current) dialog.close(onClose);};const save = async () => {- if (savingRef.current || !target || target.needsApiKey || selected.length === 0) return;+ if (savingRef.current || !target || selected.length === 0) return;const runtime = config.runtimes[target.agent];if (!runtime) return;savingRef.current = true;diff --git a/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx b/apps/desktop/src/renderer/components/settings/ProvidersSection.tsxindex 83ddd33879..14c8ff6f6a 100644--- a/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx+++ b/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx@@ -1,5 +1,5 @@import { AddSpeechModelsDialog } from './AddSpeechModelsDialog';-import { providerSpeechSetup } from '../../../shared/speechProviderSetup';+import { missingSpeechReference, providerSpeechSetup } from '../../../shared/speechProviderSetup';import { useCodexRateLimits } from '@/hooks/useCodexRateLimits';import { useCodexRateLimitReset } from '@/hooks/useCodexRateLimitReset';import { CodexResetCredits } from '../status/CodexResetCredits';@@ -2611,6 +2611,7 @@ export function ProvidersSection() {p.id === MANAGED_LLAMACPP_PROVIDER_ID ||p.id === MANAGED_LMSTUDIO_PROVIDER_ID ||providerHasModels(p) ||+ !!providerSpeechSetup(p) ||(p.auth.method === 'oauth' && (!!p.auth.oauth || !!p.auth.native)))) {rows.push(p);@@ -2915,8 +2916,8 @@ export function ProvidersSection() {/*** 自定义供应商「刷新模型」:读回各 runtime 密钥 → fetchProviderModels →- * additions-only 合并进配置。新增模型默认隐藏,避免刷新扩大用户当前可用模型范围;- * 已有模型及其显式可见性不变。+ * additions-only 合并进配置;已确认的 API Key 连接缺少语音型号时补一个参考。+ * 已有型号及其显式可见性不变;后台自动刷新不补参考型号。*/const handleRefreshModels = useCallback(async (p: ProviderView) => {@@ -2924,7 +2925,7 @@ export function ProvidersSection() {try {const config = providerViewToCustomProviderConfig(p);let added = 0;- let anyOk = false;+ const refreshedAgents = new Set<AgentKind>();for (const agent of p.agents) {const rt = config.runtimes[agent];if (!rt?.baseUrl) continue;@@ -2948,7 +2949,7 @@ export function ProvidersSection() {refetch();return;}- anyOk = true;+ refreshedAgents.add(agent);const openRouterCatalog = /^https:\/\/openrouter\.ai\/api(?:\/v1)?\/?$/.test(rt.baseUrl)? (rt.modelsUrl ?? 'https://openrouter.ai/api/v1/models'): undefined;@@ -2960,12 +2961,20 @@ export function ProvidersSection() {rt.models = merged.models;added += merged.addedIds.length;}- if (!anyOk) {+ if (!refreshedAgents.size) {toast.error(t('settings.providers.models.refreshFailed'));return;}- await updateCustomProvider(config, {});- if (added > 0) {+ const reference = missingSpeechReference(p, config, refreshedAgents);+ if (reference) config.runtimes[reference.agent]!.models.push(reference.model);+ const result = await updateCustomProvider(config, {});+ if (!result.ok) {+ toast.error(t('settings.providers.models.refreshFailed'));+ return;+ }+ if (reference) {+ toast.success(t('settings.providers.models.refreshSpeechAdded'));+ } else if (added > 0) {toast.success(t('settings.providers.models.refreshAdded', { count: added }));} else {toast.success(t('settings.providers.models.refreshNoNew'));@@ -3412,9 +3421,7 @@ export function ProvidersSection() {<UnifiedModelListprovider={effectiveSelected}onAddSpeechModels={providerSpeechSetup(effectiveSelected) ? () => {- const setup = providerSpeechSetup(effectiveSelected)!;- if (setup.needsApiKey) setWizard({ entry: { kind: 'preset', presetId: setup.presetId, speechOnly: true } });- else setSpeechProvider({ provider: effectiveSelected, owner: dataOwnerId, generation: ownerGeneration });+ setSpeechProvider({ provider: effectiveSelected, owner: dataOwnerId, generation: ownerGeneration });} : undefined}focusModelId={focusedModel?.providerId === effectiveSelected.iddiff --git a/apps/desktop/src/renderer/components/settings/UnifiedModelList.tsx b/apps/desktop/src/renderer/components/settings/UnifiedModelList.tsxindex b615b3e3e8..8b6366adf8 100644--- a/apps/desktop/src/renderer/components/settings/UnifiedModelList.tsx+++ b/apps/desktop/src/renderer/components/settings/UnifiedModelList.tsx@@ -1095,9 +1095,6 @@ export function UnifiedModelList({)}</p></div>- {onAddSpeechModels && <Button variant="secondary" onClick={onAddSpeechModels}>- {t('settings.providers.speechSetup.add')}- </Button>}{onRefresh && (<buttontype="button"@@ -1115,7 +1112,7 @@ export function UnifiedModelList({<Spinner icon={RefreshCw} size={14} spinning={refreshing} /></button>)}- {unionRows.length > 0 && (+ {(unionRows.length > 0 || onAddSpeechModels) && (<DropdownMenu><DropdownMenuTrigger asChild><Button variant="secondary" size="sm" compact type="button" className="shrink-0">@@ -1124,44 +1121,54 @@ export function UnifiedModelList({</Button></DropdownMenuTrigger><DropdownMenuContent align="end">- <DropdownMenuLabel>- {t('settings.providers.models.manage.arrange')}- </DropdownMenuLabel>- <DropdownMenuRadioGroup- value={managementView}- onValueChange={(value) => {- if (value === 'brand' || value === 'model') setManagementView(value);- }}- >- <DropdownMenuRadioItem value="brand">- {t('settings.providers.models.manage.byBrand')}- </DropdownMenuRadioItem>- <DropdownMenuRadioItem value="model">- {t('settings.providers.models.manage.byName')}- </DropdownMenuRadioItem>- </DropdownMenuRadioGroup>- <DropdownMenuSeparator />- <DropdownMenuLabel>- {t('settings.providers.models.manage.selection')}- </DropdownMenuLabel>- <DropdownMenuItem- disabled={!visibilityWriteAvailable || selectedCount === writableRows.length}- onSelect={() => handleBulk('show')}- >- {t('settings.providers.models.manage.showAll')}- </DropdownMenuItem>- <DropdownMenuItem- disabled={!visibilityWriteAvailable || selectedCount === 0}- onSelect={() => handleBulk('hide')}- >- {t('settings.providers.models.manage.hideAll')}- </DropdownMenuItem>- <DropdownMenuItem- disabled={!visibilityWriteAvailable}- onSelect={() => handleBulk('reset')}- >- {t('settings.providers.models.manage.reset')}- </DropdownMenuItem>+ {onAddSpeechModels && (+ <DropdownMenuItem onSelect={onAddSpeechModels}>+ {t('settings.providers.speechSetup.add')}+ </DropdownMenuItem>+ )}+ {unionRows.length > 0 && (+ <>+ {onAddSpeechModels && <DropdownMenuSeparator />}+ <DropdownMenuLabel>+ {t('settings.providers.models.manage.arrange')}+ </DropdownMenuLabel>+ <DropdownMenuRadioGroup+ value={managementView}+ onValueChange={(value) => {+ if (value === 'brand' || value === 'model') setManagementView(value);+ }}+ >+ <DropdownMenuRadioItem value="brand">+ {t('settings.providers.models.manage.byBrand')}+ </DropdownMenuRadioItem>+ <DropdownMenuRadioItem value="model">+ {t('settings.providers.models.manage.byName')}+ </DropdownMenuRadioItem>+ </DropdownMenuRadioGroup>+ <DropdownMenuSeparator />+ <DropdownMenuLabel>+ {t('settings.providers.models.manage.selection')}+ </DropdownMenuLabel>+ <DropdownMenuItem+ disabled={!visibilityWriteAvailable || selectedCount === writableRows.length}+ onSelect={() => handleBulk('show')}+ >+ {t('settings.providers.models.manage.showAll')}+ </DropdownMenuItem>+ <DropdownMenuItem+ disabled={!visibilityWriteAvailable || selectedCount === 0}+ onSelect={() => handleBulk('hide')}+ >+ {t('settings.providers.models.manage.hideAll')}+ </DropdownMenuItem>+ <DropdownMenuItem+ disabled={!visibilityWriteAvailable}+ onSelect={() => handleBulk('reset')}+ >+ {t('settings.providers.models.manage.reset')}+ </DropdownMenuItem>+ </>+ )}</DropdownMenuContent></DropdownMenu>)}diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 85e2b216b5..817165ac79 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -3382,6 +3382,7 @@"refreshingAria": "Refreshing model list…","refreshDone": "Model list refreshed","refreshAdded": "Found {{count}} new models",+ "refreshSpeechAdded": "Models updated; added 1 suggested speech model","refreshNoNew": "Model list is up to date — nothing new","refreshFailed": "Model list couldn’t be refreshed — try again later","refreshFetchDisabled": "Remote model catalog fetching is disabled — refresh skipped",diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex 883b649811..43f82c65b6 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -3352,6 +3352,7 @@"refreshingAria": "モデル一覧を更新中…","refreshDone": "モデル一覧を再読み込みしました","refreshAdded": "新しいモデルを {{count}} 件検出しました",+ "refreshSpeechAdded": "モデルを更新し、参考の音声モデルを 1 件追加しました","refreshNoNew": "モデル一覧は最新です。新規はありません","refreshFailed": "モデル一覧を更新できませんでした。しばらくしてから再試行してください","refreshFetchDisabled": "モデルカタログのリモート取得が無効のため、更新をスキップしました",diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex 9db003acfd..631825d831 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -3352,6 +3352,7 @@"refreshingAria": "모델 목록 새로고침 중…","refreshDone": "모델 목록을 새로고침했습니다","refreshAdded": "새 모델 {{count}}개를 발견했습니다",+ "refreshSpeechAdded": "모델을 업데이트하고 추천 음성 모델 1개를 추가했습니다","refreshNoNew": "모델 목록이 최신 상태입니다. 새 항목이 없습니다","refreshFailed": "모델 목록을 새로고침하지 못했습니다. 잠시 후 다시 시도해 주세요","refreshFetchDisabled": "모델 카탈로그 원격 가져오기가 비활성화되어 새로고침을 건너뛰었습니다",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex f2bb715680..d35644d31a 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -3352,6 +3352,7 @@"refreshingAria": "正在刷新模型列表…","refreshDone": "模型列表已刷新","refreshAdded": "已发现 {{count}} 个新模型",+ "refreshSpeechAdded": "已更新模型,补充了 1 个语音参考型号","refreshNoNew": "模型列表已是最新,无新增","refreshFailed": "模型列表刷新失败,请稍后再试","refreshFetchDisabled": "模型目录远程拉取未启用,已跳过刷新",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex 4e710c7c9c..59cffe97c2 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -3352,6 +3352,7 @@"refreshingAria": "正在重新整理模型列表…","refreshDone": "模型列表已重新整理","refreshAdded": "已發現 {{count}} 個新模型",+ "refreshSpeechAdded": "已更新模型,補充了 1 個語音參考型號","refreshNoNew": "模型列表已是最新,無新增","refreshFailed": "模型列表重新整理失敗,請稍後再試","refreshFetchDisabled": "模型目錄遠端擷取未啟用,已跳過重新整理",diff --git a/apps/desktop/src/shared/speechProviderSetup.ts b/apps/desktop/src/shared/speechProviderSetup.tsindex 8e0eec17b6..47c78be15c 100644--- a/apps/desktop/src/shared/speechProviderSetup.ts+++ b/apps/desktop/src/shared/speechProviderSetup.ts@@ -174,35 +174,34 @@ export function withSpeechApiPresets(presets: ProviderPreset[]): ProviderPreset[export function providerSpeechSetup(provider: ProviderView,-):- { agent: AgentKind; service: SpeechService; needsApiKey: boolean; presetId: string } | undefined {- if (provider.source === 'organization' || provider.suspended) return;+): { agent: AgentKind; service: SpeechService } | undefined {+ if (provider.source !== 'user' || provider.suspended || provider.auth.method !== 'apiKey') return;for (const agent of ['codex', 'pi', 'claude-code'] as const) {- const upstream = provider.routing[agent]?.upstream;- const service = upstream && speechServiceForUrl(upstream);+ const route = provider.routing[agent];+ if (!route || route.disabled) continue;+ const service = speechServiceForUrl(route.upstream);if (!service) continue;- if (provider.auth.method === 'apiKey' && provider.source !== 'user') continue;- if (!['apiKey', 'oauth'].includes(provider.auth.method)) continue;- return {- agent,- service,- needsApiKey: provider.auth.method === 'oauth',- presetId:- service === 'minimax'- ? ['api.minimax.io', 'api-uw.minimax.io'].includes(new URL(upstream!).hostname)- ? 'minimax-global'- : 'minimax-cn'- : service === 'bailian'- ? new URL(upstream!).hostname === 'dashscope.aliyuncs.com' ||- new URL(upstream!).hostname.endsWith('.cn-beijing.maas.aliyuncs.com')- ? 'aliyun-bailian-api-cn'- : 'aliyun-bailian-api-global'- : `${service}-api`,- };+ return { agent, service };}- // Native OpenAI subscription endpoints are deliberately different from its API.- if (provider.id === 'openai' || provider.auth.native === 'codex')- return { agent: 'codex', service: 'openai', needsApiKey: true, presetId: 'openai-api' };+}++/** Manual refresh only: suggest one reference after successful catalog discovery. */+export function missingSpeechReference(+ provider: ProviderView,+ config: CustomProviderConfig,+ refreshedAgents: ReadonlySet<AgentKind>,+): { agent: AgentKind; model: ProviderRuntimeModelConfig } | undefined {+ const target = providerSpeechSetup(provider);+ if (!target || !refreshedAgents.has(target.agent)) return;+ const models = Object.values(config.runtimes).flatMap(runtime => runtime?.models ?? []);+ // Hidden speech is still a saved choice. Never fill a different runtime or+ // override discovery/user classification of an existing reference ID.+ if (models.some(isSpeechModel)) return;+ const runtime = config.runtimes[target.agent];+ if (!runtime) return;+ const model = speechReferenceModels(runtime.baseUrl).find(reference => reference.defaultEnabled);+ if (!model || models.some(existing => existing.id === model.id)) return;+ return { agent: target.agent, model };}/** Merge under Main's mutation queue, preserving concurrent edits and all existing models. */diff --git a/docs/product-rules/provider-settings.md b/docs/product-rules/provider-settings.mdindex b3a74698c9..27e61cc417 100644--- a/docs/product-rules/provider-settings.md+++ b/docs/product-rules/provider-settings.md@@ -121,9 +121,10 @@ OpenAI、Claude 和 Grok 都允许新增独立登录账号。每次新增生成- 「添加供应商」保持一个入口。API Key 连接沿用选择供应商、连接、选择模型三步;在同一模型页分组展示语音模型、对话与其他模型,语音分组位于普通模型长列表之前。MiniMax、OpenAI API、ElevenLabs、百炼普通 API 提供语音参考型号,在已确认支持的地址默认勾选一个推荐型号,用户可以取消或仅添加语音型号。- 两个添加入口共用实际连接地址的推荐规则,不按预设名称或 Cindy 发行区域推断:公共 `dashscope.aliyuncs.com` / `dashscope-intl.aliyuncs.com` 推荐 `qwen3-tts-flash`;北京 workspace 推荐 `cosyvoice-v3-flash`;新加坡 workspace 推荐公共 Registry 已收录的 `qwen-audio-3.0-tts-flash`。北京 Token Plan 独立推荐 `qwen-audio-3.0-tts-plus`,不套用 workspace 的 CosyVoice 推荐;新加坡 Token Plan、美国公共地址及未确认组合不自动推荐或勾选参考型号,目录发现和手动添加仍可用。推荐遵循 #6660 的原生 HTTP 支持范围,不更换 origin、地域或密钥;返回连接步骤编辑地址后重新计算。已有保存型号与用户显示偏好不因新推荐改变。-- 已有 API Key 连接在模型管理工具行提供「添加语音模型」。操作绑定连接 ID,追加用户选择的新型号;不重填密钥,不覆盖已有名称、协议、模型类型、开关和其他 runtime。Main 在原有供应商修改队列内合并最新配置,按当前预设投影后的有效地址校验弹窗快照,实际地址已变更则要求重新打开;预设补充目录地址不会改写存储值,不使用旧快照替换整个连接。-- 订阅或设备码连接走独立 API Key 连接,不转换、不覆盖原连接。普通百炼 API 与 Coding Plan / Token Plan 入口分开;Token Plan 的语音建议按其官方型号范围独立维护,参考推荐不证明当前账号已开通或具有额度。+- 已有连接不常驻「添加语音模型」按钮。仅已确认支持的厂商 API Key 连接在「管理」菜单保留此入口,空模型列表也可使用;订阅、设备码、未知代理及停用路线不提供该入口。手动追加操作绑定连接 ID,追加用户选择的新型号;不重填密钥,不覆盖已有名称、协议、模型类型、开关和其他 runtime。Main 在原有供应商修改队列内合并最新配置,按当前预设投影后的有效地址校验弹窗快照,实际地址已变更则要求重新打开;预设补充目录地址不会改写存储值,不使用旧快照替换整个连接。+- 用户手动刷新时,先合并接口目录;仅上述 API Key 连接的目标 runtime 目录获取成功、整个连接没有已保存的语音型号(含隐藏型号)时,按实际地址补一个默认显示的推荐参考型号。接口已返回语音型号、推荐 ID 已存在但被用户或目录声明为其他类型、鉴权或目录请求失败时不补。重复刷新不增加其他参考型号,不改已有开关;打开设置和后台刷新不补参考型号。补充成功提示明确称为「语音参考型号」,不称为接口发现或调用成功。+- 订阅或设备码用户通过「添加供应商」建立独立 API Key 连接,不转换、不覆盖原连接。普通百炼 API 与 Coding Plan / Token Plan 入口分开;Token Plan 的语音建议按其官方型号范围独立维护,参考推荐不证明当前账号已开通或具有额度。- 普通厂商没有预置模型且目录获取失败或为空时,同时保留通用型号手填与语音建议;通用手填不强制设为语音。仅明确的语音接入流程或 ElevenLabs 这类语音服务隐藏通用回退。-- 目录返回、公共参考和用户手填是不同来源。参考清单只描述添加建议,名称与能力仍继承公共 Registry;未选中的参考型号不写入账号连接。目录明确返回非 TTS 能力时,不以参考清单把它恢复成语音。+- 目录返回、公共参考和用户手填是不同来源。参考清单只描述添加建议,名称与能力仍继承公共 Registry;添加弹窗未选中的参考型号不写入账号连接,手动刷新仅按上述条件补一个推荐型号。目录明确返回非 TTS 能力时,不以参考清单把它恢复成语音。- 目录返回但未勾选的语音型号保留在连接目录中,默认隐藏,不出现在伙伴朗读选择器中。模型管理页为语音合成提供显示开关,可重新显示先前未勾选的型号;Main 的媒体可用清单复用伙伴朗读的目录、凭证与停用检查,保留隐藏但有资格的路线供管理。媒体投影保留该显示默认值;后续显式显示偏好按连接与 runtime 生效,显示偏好与停用、账号准入独立。已保存为伙伴朗读偏好的隐藏型号仍可恢复、试听、朗读和开始通话;设置中保留显示当前选择,其他隐藏型号不进入候选,也不自动选作默认。停用、凭证丢失或账号不可用仍阻止调用。- 获取目录和保存型号不等于调用成功或已获授权;不自动发起计费合成。音色、试听、逐句朗读属于伙伴语音设置,不进入供应商添加流程。两个添加入口的保存与设置说明统一放在语音模型分组内,对话模型的说明留在对应列表下方。Qwen / CosyVoice 的目录接入不替代各自原生执行器的交付和验证。