Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(providers): classify fresh speech models with active registry

JiangJiahaoe357451f2e9b
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/providerHandlers.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/providerHandlers.test.ts
index 9daf7840ba..8e210d4529 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/providerHandlers.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/providerHandlers.test.ts
@@ -2,8 +2,8 @@ import Database from 'better-sqlite3';
import { drizzle } from 'drizzle-orm/better-sqlite3';
import { afterEach, describe, it, expect, vi } from 'vitest';
-import type { AgentKind, CustomProviderConfig, ProviderPreset, ProviderView } from '@cindy/model-providers';
-import { buildUserProvider } from '@cindy/model-providers';
+import type { AgentKind, CustomProviderConfig, DiscoveredModel, ModelRegistry, ProviderPreset, ProviderView } from '@cindy/model-providers';
+import { BUNDLED_CATALOG, buildUserProvider, mergeDiscoveredRuntimeModels } from '@cindy/model-providers';
import { providerViewToCustomProviderConfig } from '../../../renderer/lib/customProviders.js';
import type { ProviderImportPreview } from '../../../shared/providerImport.js';
@@ -130,6 +130,7 @@ function makeDeps(over: Partial<ProviderHandlerDeps> = {}): ProviderHandlerDeps
setProviderOrder: vi.fn(() => true),
getProviderOrder: () => [],
listPresets: () => [],
+ getModelCatalog: () => BUNDLED_CATALOG,
testConnection: vi.fn(async () => ({ ok: true, latencyMs: 1 })),
fetchModels: vi.fn(async () => ({ ok: true, models: [{ id: 'm1', name: 'M1' }] })),
rediscoverModels: vi.fn(async () => null),
@@ -4808,6 +4809,113 @@ it('preserves the actual Vertex API through the probe IPC and rejects unknown SD
expect(deps.testConnection).toHaveBeenCalledOnce();
});
+// #6928 unit regression: discovery returns a new ID without mode, and only the
+// active Registry classifies it. Exercise fetch -> merge -> update -> DB reread;
+// Renderer-only tests cannot prove Main classifies before the one persisted write.
+describe('manual refresh speech references through the real provider update handler', () => {
+ it.each([
+ 'new', 'new-pi', 'hidden', 'hidden-pi', 'transcription', 'discovery-other',
+ 'user-other', 'missing', 'reference-other', 'failed-target', 'disabled', 'oauth', 'proxy',
+ ] as const)('preserves effective classification and saved settings: %s', async kind => {
+ mountDb();
+ const harness = new IpcHarness();
+ const id = kind === 'reference-other' ? 'speech-2.8-turbo' : 'server-only-audio';
+ const registryMode = kind === 'transcription' ? 'audio_transcription' : 'audio_speech';
+ const modelRegistry: ModelRegistry = {
+ ...BUNDLED_CATALOG.modelRegistry!,
+ baseModels: [...BUNDLED_CATALOG.modelRegistry!.baseModels!,
+ { id: 'server-only-audio', aliases: [], defaults: { mode: registryMode } }],
+ };
+ const config: CustomProviderConfig = { id: 'refresh-speech', name: 'My connection', runtimes: {
+ codex: { baseUrl: kind === 'proxy' ? 'https://proxy.example/v1' : 'https://api.minimax.io/v1',
+ wireProtocol: 'openai-chat', models: [{ id: 'MiniMax-M3', name: 'My chat', defaultEnabled: false }] },
+ } };
+ const agent = kind === 'new-pi' || kind === 'hidden-pi' ? 'pi' : 'codex';
+ if (agent === 'pi') config.runtimes.pi = {
+ baseUrl: 'https://api.minimax.io/anthropic', wireProtocol: 'anthropic-messages', models: [],
+ };
+ if (kind === 'hidden' || kind === 'hidden-pi' || kind === 'user-other') {
+ config.runtimes[agent]!.models.push({ id, name: 'My saved audio', defaultEnabled: false,
+ ...(kind === 'user-other' ? { mode: 'other' as const } : {}) });
+ }
+ const discovered: DiscoveredModel[] = ['missing', 'failed-target', 'disabled', 'oauth', 'proxy'].includes(kind)
+ ? [{ id: 'MiniMax-M3', name: 'Upstream chat' }]
+ : [{ id, name: 'Discovered audio', ...(['discovery-other', 'reference-other'].includes(kind)
+ ? { discoveredMetadata: { mode: 'other' as const } } : {}) }];
+ const deps = makeDeps({
+ getModelCatalog: () => ({ modelRegistry }),
+ fetchModels: vi.fn(async () => ({ ok: true as const, models: discovered })),
+ listProviders: async () => {
+ const current = (await getCustomProvider(config.id))!;
+ const provider: ProviderView = { ...buildUserProvider(current, { modelRegistry }), connected: true };
+ if (kind === 'disabled') provider.routing.codex!.disabled = true;
+ if (kind === 'oauth') provider.auth = { method: 'oauth' };
+ return [provider];
+ },
+ });
+ registerProviderHandlers(harness, deps);
+ await harness.invoke(MAKER_INVOKE.PROVIDER_CUSTOM_CREATE, config);
+ vi.mocked(deps.storeCustomProviderKey).mockClear();
+ const fetched = await harness.invoke(MAKER_INVOKE.PROVIDER_MODELS_FETCH, {
+ agent, baseUrl: config.runtimes[agent]!.baseUrl, authMethod: 'apiKey', savedProviderId: config.id,
+ }) as { ok: true; models: DiscoveredModel[] };
+ const merged = structuredClone(config);
+ merged.runtimes[agent]!.models = mergeDiscoveredRuntimeModels(merged.runtimes[agent]!.models, fetched.models);
+ const options = { speechReferenceRefreshAgents: kind === 'failed-target' ? ['pi'] : ['codex', 'pi'] };
+ const shouldAdd = ['transcription', 'discovery-other', 'user-other', 'missing'].includes(kind);
+ expect(await harness.invoke(MAKER_INVOKE.PROVIDER_CUSTOM_UPDATE, merged, {}, options))
+ .toEqual({ ok: true, ...(shouldAdd ? { speechReferenceAdded: true } : {}) });
+ const saved = (await getCustomProvider(config.id))!;
+ const expected = structuredClone(merged);
+ if (shouldAdd) expected.runtimes.codex!.models.push({
+ id: 'speech-2.8-turbo', name: 'MiniMax Speech 2.8 Turbo', defaultEnabled: true,
+ });
+ expect(saved.runtimes).toEqual(expected.runtimes);
+ expect(saved.name).toBe(config.name);
+ expect(deps.storeCustomProviderKey).not.toHaveBeenCalled();
+ const speechIds = buildUserProvider(saved, { modelRegistry }).audioModels
+ ?.filter(model => model.mode === 'audio_speech').map(model => model.id) ?? [];
+ expect(speechIds).toEqual(shouldAdd ? ['speech-2.8-turbo']
+ : ['new', 'new-pi', 'hidden', 'hidden-pi'].includes(kind) ? [id] : []);
+ // A repeated refresh starts from the saved configuration and never adds HD.
+ expect(await harness.invoke(MAKER_INVOKE.PROVIDER_CUSTOM_UPDATE, saved, {}, options)).toEqual({ ok: true });
+ expect((await getCustomProvider(config.id))!.runtimes).toEqual(saved.runtimes);
+ });
+
+ it('rejects invalid refresh routes and incompatible append options before saving', async () => {
+ mountDb();
+ const harness = new IpcHarness();
+ registerProviderHandlers(harness, makeDeps());
+ await harness.invoke(MAKER_INVOKE.PROVIDER_CUSTOM_CREATE, validConfig);
+ for (const agents of [[], ['unknown'], ['codex', 'codex'], 'codex']) {
+ await expect(harness.invoke(MAKER_INVOKE.PROVIDER_CUSTOM_UPDATE, validConfig, {},
+ { speechReferenceRefreshAgents: agents })).rejects.toThrow(/INVALID_PARAMS/);
+ }
+ await expect(harness.invoke(MAKER_INVOKE.PROVIDER_CUSTOM_UPDATE, validConfig, {},
+ { speechReferenceRefreshAgents: ['codex'], appendSpeechModelsOnly: true })).rejects.toThrow(/INVALID_PARAMS/);
+ expect((await getCustomProvider(validConfig.id))!.runtimes).toEqual(validConfig.runtimes);
+ });
+
+ it('does not save after the owner changes during the current provider lookup', async () => {
+ mountDb();
+ const harness = new IpcHarness();
+ const owner = { dataOwnerId: 'owner-a', generation: 1 };
+ const deps = makeDeps({
+ currentOwnerSession: () => ({ ...owner }),
+ listProviders: async () => {
+ owner.generation += 2;
+ return [{ ...buildUserProvider(validConfig), connected: true }];
+ },
+ });
+ registerProviderHandlers(harness, deps);
+ await harness.invoke(MAKER_INVOKE.PROVIDER_CUSTOM_CREATE, validConfig);
+ await expect(harness.invoke(MAKER_INVOKE.PROVIDER_CUSTOM_UPDATE,
+ { ...validConfig, name: 'Stale refresh' }, {}, { speechReferenceRefreshAgents: ['codex'] }))
+ .rejects.toThrow(/INTERNAL/);
+ expect((await getCustomProvider(validConfig.id))!.name).toBe(validConfig.name);
+ });
+});
+
describe('speech additions through the real provider update handler', () => {
it('merges into the latest connection, preserving settings, credentials, duplicate IDs and another connection', async () => {
mountDb();
diff --git a/apps/desktop/src/main/maker-ipc/providerHandlers.ts b/apps/desktop/src/main/maker-ipc/providerHandlers.ts
index 44b42fd89b..f3b3930945 100644
--- a/apps/desktop/src/main/maker-ipc/providerHandlers.ts
+++ b/apps/desktop/src/main/maker-ipc/providerHandlers.ts
@@ -1,4 +1,4 @@
-import { appendSpeechModels } from '../../shared/speechProviderSetup.js';
+import { appendSpeechModels, missingSpeechReference } from '../../shared/speechProviderSetup.js';
import { setProviderPresentation, retainProviderPresentationAfterAuthChange } from '../maker-host/provider-presentation-store.js';
import { pruneProviderGroupBindings } from '../provider-group/bindings.js';
import { writeProviderGroup } from '../provider-group/store.js';
@@ -28,6 +28,7 @@ import {
runtimeCustomProviderId,
storedCustomProviderId,
type AgentKind,
+ type Catalog,
type CustomProviderConfig,
type ProviderModelDiscoveryFailure,
type ProviderPreset,
@@ -196,19 +197,25 @@ function parseCustomProviderUpdateOptions(input: unknown): CustomProviderUpdateO
if (input === undefined) return {};
if (!input || typeof input !== 'object' || Array.isArray(input)) return null;
const entries = Object.entries(input as Record<string, unknown>);
- if (entries.some(([key]) => key !== 'source' && key !== 'codexImageGenerationRestartPolicy' && key !== 'appendSpeechModelsOnly'))
+ if (entries.some(([key]) => key !== 'source' && key !== 'codexImageGenerationRestartPolicy' && key !== 'appendSpeechModelsOnly' && key !== 'speechReferenceRefreshAgents'))
return null;
const source = (input as Record<string, unknown>).source;
if (source !== undefined && source !== 'manual-settings') return null;
const policy = (input as Record<string, unknown>).codexImageGenerationRestartPolicy;
const append = (input as Record<string, unknown>).appendSpeechModelsOnly;
+ const refreshAgents = (input as Record<string, unknown>).speechReferenceRefreshAgents;
+ if (refreshAgents !== undefined && (!Array.isArray(refreshAgents) ||
+ refreshAgents.length === 0 || refreshAgents.length > VALID_AGENTS.length ||
+ refreshAgents.some(agent => !VALID_AGENTS.includes(agent)) ||
+ new Set(refreshAgents).size !== refreshAgents.length)) return null;
if (append !== undefined && append !== true) return null;
if (policy !== undefined && policy !== 'interrupt') return null;
- if (append && (source || policy)) return null;
+ if (append && (source || policy || refreshAgents)) return null;
return {
...(source === 'manual-settings' ? { source } : {}),
...(policy ? { codexImageGenerationRestartPolicy: policy } : {}),
...(append ? { appendSpeechModelsOnly: true as const } : {}),
+ ...(refreshAgents ? { speechReferenceRefreshAgents: refreshAgents as AgentKind[] } : {}),
};
}
@@ -275,7 +282,7 @@ export interface ProviderHandlerDeps {
* 服务 device-link(合成 event)与可能不受信的渲染上下文,所以默认纯读,只有确认 sender
* 是本机主页面时才放行副作用(PR #548 review)。
*/
- listProviders(opts?: { allowSideEffects?: boolean }): Promise<ProviderView[]>;
+ listProviders(opts?: { allowSideEffects?: boolean; snapshotOnly?: boolean }): Promise<ProviderView[]>;
/** Synchronous catalog ownership check; injected to keep this IPC module free of Host cycles. */
isOrganizationManagedProviderId(providerId: string): boolean;
/**
@@ -319,6 +326,8 @@ export interface ProviderHandlerDeps {
getProviderOrder(): string[];
/** 目录 presets 段(生产 = () => getActiveCatalog().presets ?? [])。 */
listPresets(): ProviderPreset[];
+ /** Current Registry and presets for classifying freshly discovered custom models. */
+ getModelCatalog(): Pick<Catalog, 'modelRegistry' | 'presets'>;
/** 测试连接(生产 = testProviderConnection;单测注入 stub 不联网)。 */
testConnection(input: ProviderTestInput): Promise<ProviderTestResult>;
/** 获取模型列表(生产 = fetchProviderModels;单测注入 stub 不联网)。 */
@@ -2055,6 +2064,7 @@ export function registerProviderHandlers(
return withProviderConfigMutation(config.id, async (commitRouteMutation) => {
let generation: symbol | null = null;
let codexHostPrepared = false;
+ let speechReferenceAdded = false;
try {
// per-provider 队列等待结束后才读取该 owner 的 DB / secrets。
assertProviderMutationOwner(ownerAtIngress);
@@ -2075,6 +2085,22 @@ export function registerProviderHandlers(
if (!latestValidation.ok) throwIpcError(latestValidation.code, latestValidation.message);
separated = splitCustomProviderHeaders(config);
}
+ if (options.speechReferenceRefreshAgents) {
+ const providers = await deps.listProviders({ allowSideEffects: false, snapshotOnly: true });
+ assertProviderMutationOwner(ownerAtIngress);
+ const provider = providers.find(p => p.id === runtimeCustomProviderId(config.id));
+ const reference = provider && missingSpeechReference(
+ provider, config, new Set(options.speechReferenceRefreshAgents), deps.getModelCatalog(),
+ );
+ if (reference) {
+ config = structuredClone(config);
+ config.runtimes[reference.agent]!.models.push(reference.model);
+ const validation = validateCustomProviderConfig(config, { allowLegacyXai: true });
+ if (!validation.ok) throwIpcError(validation.code, validation.message);
+ separated = splitCustomProviderHeaders(config);
+ speechReferenceAdded = true;
+ }
+ }
// 即便 OAuth 描述符没变,runtime / model 编辑也必须让旧登录尾部的自动发现失效,
// 否则旧 endpoint 的迟到结果可能合并进刚保存的新配置。
generation = beginOAuthMutation(config.id);
@@ -2174,7 +2200,7 @@ export function registerProviderHandlers(
codexHostChangeRequired ? commitRouteMutation : undefined,
);
assertProviderMutationOwner(ownerAtIngress);
- return { ok: true };
+ return { ok: true, ...(speechReferenceAdded ? { speechReferenceAdded: true as const } : {}) };
} finally {
if (codexHostPrepared) deps.cancelCodexCustomProviderHostChange?.();
if (generation !== null) finishOAuthMutation(config.id, generation);
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.ts
index 8ab84b248d..5f74690e3f 100644
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@ -7201,6 +7201,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
setProviderOrder: (providerIds) => setProviderOrder(providerIds),
getProviderOrder: () => readProviderOrder(),
listPresets: () => getActiveCatalog().presets ?? [],
+ getModelCatalog: () => getActiveCatalog(),
testConnection: (input) => testProviderConnection(input),
fetchModels: async (spec) => {
if (spec.savedProviderId && subscriptionAccountKind(spec.savedProviderId)) {
diff --git a/apps/desktop/src/renderer/__tests__/providersSectionUnavailableModels.test.tsx b/apps/desktop/src/renderer/__tests__/providersSectionUnavailableModels.test.tsx
index 536db40823..93ca7be3f5 100644
--- a/apps/desktop/src/renderer/__tests__/providersSectionUnavailableModels.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/providersSectionUnavailableModels.test.tsx
@@ -269,6 +269,11 @@ describe('ProvidersSection — 双栏管理', () => {
window.electronAPI.maker.fetchProviderModels = vi.fn(async () => ({ ok: true, models: [
{ id: 'MiniMax-M3', name: 'Upstream name' }, ...discovered,
] }));
+ // Reference persistence is covered by the real Main handler tests. The
+ // renderer must display Main's result and send only the discovery merge.
+ if (kind === 'missing') vi.mocked(updateCustomProvider).mockResolvedValueOnce({
+ ok: true, speechReferenceAdded: true,
+ });
const view = render(<MemoryRouter><ProvidersSection /></MemoryRouter>);
// Opening Settings only schedules discovery, never writes reference models.
expect(updateCustomProvider).not.toHaveBeenCalled();
@@ -277,25 +282,50 @@ describe('ProvidersSection — 双栏管理', () => {
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']
+ expect(speech.map(model => model.id)).toEqual(kind === 'missing' ? []
: kind === 'discovered' ? ['new-voice'] : kind === 'hidden' ? ['speech-2.8-hd'] : []);
if (kind === 'hidden') expect(speech[0].defaultEnabled).toBe(false);
expect(setModelVisibilities).not.toHaveBeenCalled();
+ expect(vi.mocked(updateCustomProvider).mock.lastCall![2])
+ .toEqual({ speechReferenceRefreshAgents: ['codex'] });
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);
+ const persisted = structuredClone(saved);
+ persisted.runtimes.codex!.models.push({ id: 'speech-2.8-turbo', name: 'Speech 2.8 Turbo', defaultEnabled: true });
+ selectSpeechProvider(persisted);
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));
+ .toEqual(persisted.runtimes.codex!.models.map(model => model.id));
}
},
);
- // Unit regression for #6928: the real refresh/save path must recognize a saved
- // model classified only by the current Server Registry. Bundled/explicit-mode
- // cases above cannot catch an extra enabled reference beside a hidden model.
+ // #6928: a newly discovered ID has no pre-refresh projection or reported mode.
+ // The active Registry must classify it before a reference can be persisted.
+ it('does not append a reference beside newly discovered Server-only speech', async () => {
+ const config = miniMaxConfig();
+ const discovered = { id: 'server-only-new-speech', name: 'New speech' };
+ const modelRegistry: ModelRegistry = {
+ ...BUNDLED_CATALOG.modelRegistry!,
+ baseModels: [...BUNDLED_CATALOG.modelRegistry!.baseModels!,
+ { id: discovered.id, aliases: [], defaults: { mode: 'audio_speech' } }],
+ };
+ selectSpeechProvider(config, modelRegistry);
+ window.electronAPI.maker.fetchProviderModels = vi.fn(async () => ({ ok: true, models: [discovered] }));
+ 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(vi.mocked(updateCustomProvider).mock.lastCall![2])
+ .toEqual({ speechReferenceRefreshAgents: ['codex'] });
+ expect(buildUserProvider(saved, { modelRegistry }).audioModels?.map(model => model.id))
+ .toEqual([discovered.id]);
+ expect(saved.runtimes.codex!.models.find(model => model.id === discovered.id)?.mode).toBeUndefined();
+ expect(saved.runtimes.codex!.models.find(model => model.id === 'MiniMax-M3'))
+ .toMatchObject(config.runtimes.codex.models[0]);
+ });
+ // Keep raw saved settings through refresh. Main's real handler regression
+ // separately proves classification and reference persistence for these modes.
it.each([
['codex', true, 'audio_speech'],
['codex', false, 'audio_speech'],
@@ -320,7 +350,7 @@ describe('ProvidersSection — 双栏管理', () => {
const saved = vi.mocked(updateCustomProvider).mock.lastCall![0];
expect(saved.runtimes[agent]!.models.find(model => model.id === savedAudio.id)).toEqual(savedAudio);
expect(saved.runtimes.codex!.models.some(model => model.id === 'speech-2.8-turbo'))
- .toBe(mode !== 'audio_speech');
+ .toBe(false);
expect(buildUserProvider(saved, { modelRegistry }).audioModels)
.toEqual(expect.arrayContaining([expect.objectContaining({ id: savedAudio.id, mode, defaultEnabled })]));
expect(setModelVisibilities).not.toHaveBeenCalled();
@@ -375,6 +405,8 @@ describe('ProvidersSection — 双栏管理', () => {
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(vi.mocked(updateCustomProvider).mock.lastCall![2])
+ .toEqual({ speechReferenceRefreshAgents: kind === 'failed-target' ? ['pi'] : ['codex', 'pi'] });
expect(setModelVisibilities).not.toHaveBeenCalled();
},
);
diff --git a/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx b/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx
index 14c8ff6f6a..15a69caf46 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 { missingSpeechReference, providerSpeechSetup } from '../../../shared/speechProviderSetup';
+import { providerSpeechSetup } from '../../../shared/speechProviderSetup';
import { useCodexRateLimits } from '@/hooks/useCodexRateLimits';
import { useCodexRateLimitReset } from '@/hooks/useCodexRateLimitReset';
import { CodexResetCredits } from '../status/CodexResetCredits';
@@ -2965,14 +2965,16 @@ export function ProvidersSection() {
toast.error(t('settings.providers.models.refreshFailed'));
return;
}
- const reference = missingSpeechReference(p, config, refreshedAgents);
- if (reference) config.runtimes[reference.agent]!.models.push(reference.model);
- const result = await updateCustomProvider(config, {});
+ // Main owns the active Registry and classifies the complete discovery
+ // result in the same save, without freezing defaults into user overrides.
+ const result = providerSpeechSetup(p)
+ ? await updateCustomProvider(config, {}, { speechReferenceRefreshAgents: [...refreshedAgents] })
+ : await updateCustomProvider(config, {});
if (!result.ok) {
toast.error(t('settings.providers.models.refreshFailed'));
return;
}
- if (reference) {
+ if (result.speechReferenceAdded) {
toast.success(t('settings.providers.models.refreshSpeechAdded'));
} else if (added > 0) {
toast.success(t('settings.providers.models.refreshAdded', { count: added }));
diff --git a/apps/desktop/src/shared/customProviderUpdate.ts b/apps/desktop/src/shared/customProviderUpdate.ts
index a997160aad..f88935cf44 100644
--- a/apps/desktop/src/shared/customProviderUpdate.ts
+++ b/apps/desktop/src/shared/customProviderUpdate.ts
@@ -1,14 +1,18 @@
+import type { AgentKind } from '@cindy/model-providers';
+
export type CodexImageGenerationRestartPolicy = 'interrupt';
export interface CustomProviderUpdateOptions {
source?: 'manual-settings';
/** Local Settings additions, merged against the latest connection in Main. */
appendSpeechModelsOnly?: true;
+ /** Successful manual discovery routes; Main classifies the merged config before filling a reference. */
+ speechReferenceRefreshAgents?: AgentKind[];
codexImageGenerationRestartPolicy?: CodexImageGenerationRestartPolicy;
}
export type CustomProviderUpdateResult =
- | { ok: true }
+ | { ok: true; speechReferenceAdded?: true }
| {
ok: false;
confirmationRequired: 'codex-image-generation-reload';
diff --git a/apps/desktop/src/shared/speechProviderSetup.ts b/apps/desktop/src/shared/speechProviderSetup.ts
index bff258c133..26b54fd871 100644
--- a/apps/desktop/src/shared/speechProviderSetup.ts
+++ b/apps/desktop/src/shared/speechProviderSetup.ts
@@ -3,6 +3,7 @@ import {
buildUserProvider,
findBaseModel,
type AgentKind,
+ type Catalog,
type CustomProviderConfig,
type ModelMetadata,
type ProviderPreset,
@@ -190,14 +191,18 @@ export function missingSpeechReference(
provider: ProviderView,
config: CustomProviderConfig,
refreshedAgents: ReadonlySet<AgentKind>,
+ catalog: Pick<Catalog, 'modelRegistry' | 'presets'>,
): { 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.
- // Current Server-only classifications live in the projection, not userModelConfig.
- if (provider.audioModels?.some(model => model.mode === 'audio_speech') || models.some(isSpeechModel)) return;
+ // Reproject after discovery: new IDs are absent from the previous ProviderView,
+ // and current Registry defaults must not be persisted as discovery/user fields.
+ const projected = buildUserProvider(config, catalog);
+ if (provider.audioModels?.some(model => model.mode === 'audio_speech') ||
+ projected.audioModels?.some(model => model.mode === 'audio_speech')) return;
const runtime = config.runtimes[target.agent];
if (!runtime) return;
const model = speechReferenceModels(runtime.baseUrl).find(reference => reference.defaultEnabled);
diff --git a/docs/product-rules/provider-settings.md b/docs/product-rules/provider-settings.md
index 27e61cc417..9479aa6108 100644
--- a/docs/product-rules/provider-settings.md
+++ b/docs/product-rules/provider-settings.md
@@ -123,6 +123,7 @@ OpenAI、Claude 和 Grok 都允许新增独立登录账号。每次新增生成
- 两个添加入口共用实际连接地址的推荐规则,不按预设名称或 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 连接的目标 runtime 目录获取成功、整个连接没有已保存的语音型号(含隐藏型号)时,按实际地址补一个默认显示的推荐参考型号。接口已返回语音型号、推荐 ID 已存在但被用户或目录声明为其他类型、鉴权或目录请求失败时不补。重复刷新不增加其他参考型号,不改已有开关;打开设置和后台刷新不补参考型号。补充成功提示明确称为「语音参考型号」,不称为接口发现或调用成功。
+ Main 在同一次保存中,用当前活动 Registry 对合并后的配置重新投影;本轮首次发现且仅由服务端资料识别的语音型号同样阻止补齐。分类默认值不写成接口实报或用户覆盖,界面以保存返回的补齐结果显示提示。
- 订阅或设备码用户通过「添加供应商」建立独立 API Key 连接,不转换、不覆盖原连接。普通百炼 API 与 Coding Plan / Token Plan 入口分开;Token Plan 的语音建议按其官方型号范围独立维护,参考推荐不证明当前账号已开通或具有额度。
- 普通厂商没有预置模型且目录获取失败或为空时,同时保留通用型号手填与语音建议;通用手填不强制设为语音。仅明确的语音接入流程或 ElevenLabs 这类语音服务隐藏通用回退。
- 目录返回、公共参考和用户手填是不同来源。参考清单只描述添加建议,名称与能力仍继承公共 Registry;添加弹窗未选中的参考型号不写入账号连接,手动刷新仅按上述条件补一个推荐型号。目录明确返回非 TTS 能力时,不以参考清单把它恢复成语音。