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): confirm Codex restart on model refresh

JiangJiahaoa454a9de1318
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 8e210d4529..c1b1360127 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/providerHandlers.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/providerHandlers.test.ts
@@ -4813,6 +4813,60 @@ it('preserves the actual Vertex API through the probe IPC and rejects unknown SD
// 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', () => {
+ // #6928 P1, unit with an in-memory DB: the real update handler/signature must
+ // gate a reference-only Responses route change before persistence/Host restart.
+ // The existing speech cases use openai-chat, so they never require a restart.
+ it.each([true, false])('gates reference-only Responses changes before saving (busy=%s)', async busy => {
+ mountDb();
+ const harness = new IpcHarness();
+ const config = imageProviderConfig('refresh-image-speech', {
+ baseUrl: 'https://api.openai.com/v1',
+ models: [{ id: 'chat-model', name: 'My chat', defaultEnabled: false }],
+ });
+ let busyIds: string[] = [];
+ const deps = makeDeps({
+ listBusyLocalCodexSessionIds: () => busyIds,
+ listProviders: async () => [{ ...buildUserProvider((await getCustomProvider(config.id))!), connected: true }],
+ });
+ registerProviderHandlers(harness, deps);
+ await harness.invoke(MAKER_INVOKE.PROVIDER_CUSTOM_CREATE, config);
+ const before = (await getCustomProvider(config.id))!;
+ vi.mocked(deps.prepareCodexCustomProviderHostChange!).mockClear().mockImplementation(async () => {
+ expect((await getCustomProvider(config.id))!.runtimes).toEqual(before.runtimes);
+ });
+ vi.mocked(deps.finalizeCodexCustomProviderHostChange!).mockClear();
+ vi.mocked(deps.storeCustomProviderKey).mockClear();
+ vi.mocked(deps.refreshCatalog).mockClear();
+ busyIds = busy ? ['local-codex-running'] : [];
+ const options = { source: 'manual-settings', speechReferenceRefreshAgents: ['codex'] };
+ const first = await harness.invoke(MAKER_INVOKE.PROVIDER_CUSTOM_UPDATE, before, {}, options);
+ if (busy) {
+ expect(first).toEqual({ ok: false, confirmationRequired: 'codex-image-generation-reload', busyCount: 1 });
+ expect((await getCustomProvider(config.id))!.runtimes).toEqual(before.runtimes);
+ expect(deps.prepareCodexCustomProviderHostChange).not.toHaveBeenCalled();
+ expect(deps.finalizeCodexCustomProviderHostChange).not.toHaveBeenCalled();
+ expect(deps.storeCustomProviderKey).not.toHaveBeenCalled();
+ expect(deps.refreshCatalog).not.toHaveBeenCalled();
+ expect(await harness.invoke(MAKER_INVOKE.PROVIDER_CUSTOM_UPDATE, before, {}, {
+ ...options, codexImageGenerationRestartPolicy: 'interrupt',
+ })).toEqual({ ok: true, speechReferenceAdded: true });
+ } else {
+ expect(first).toEqual({ ok: true, speechReferenceAdded: true });
+ }
+ const saved = (await getCustomProvider(config.id))!;
+ expect(saved.runtimes.codex!.models).toEqual([
+ before.runtimes.codex!.models[0],
+ expect.objectContaining({ id: 'gpt-4o-mini-tts', defaultEnabled: true }),
+ ]);
+ expect(deps.prepareCodexCustomProviderHostChange).toHaveBeenCalledOnce();
+ expect(deps.finalizeCodexCustomProviderHostChange).toHaveBeenCalledOnce();
+ expect(deps.storeCustomProviderKey).not.toHaveBeenCalled();
+ // Refreshing the saved reference neither duplicates it nor restarts again.
+ expect(await harness.invoke(MAKER_INVOKE.PROVIDER_CUSTOM_UPDATE, saved, {}, options)).toEqual({ ok: true });
+ expect((await getCustomProvider(config.id))!.runtimes).toEqual(saved.runtimes);
+ expect(deps.prepareCodexCustomProviderHostChange).toHaveBeenCalledOnce();
+ });
+
it.each([
'new', 'new-pi', 'hidden', 'hidden-pi', 'transcription', 'discovery-other',
'user-other', 'missing', 'reference-other', 'failed-target', 'disabled', 'oauth', 'proxy',
diff --git a/apps/desktop/src/renderer/__tests__/providersSectionUnavailableModels.test.tsx b/apps/desktop/src/renderer/__tests__/providersSectionUnavailableModels.test.tsx
index 93ca7be3f5..1c90e7cad8 100644
--- a/apps/desktop/src/renderer/__tests__/providersSectionUnavailableModels.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/providersSectionUnavailableModels.test.tsx
@@ -21,6 +21,7 @@ const {
requestAutoRefreshSpy,
setProviderOrderSpy,
refetchProvidersSpy,
+ confirmSpy,
authState,
providerSnapshotState,
wizardSpy,
@@ -29,6 +30,7 @@ const {
requestAutoRefreshSpy: vi.fn(async () => ({ ok: true as const })),
setProviderOrderSpy: vi.fn(async () => ({ ok: true as const })),
refetchProvidersSpy: vi.fn(),
+ confirmSpy: vi.fn(async () => false),
authState: { dataOwnerId: 'owner-1' as string | null },
providerSnapshotState: {
dataOwnerId: 'owner-1' as string | null,
@@ -157,7 +159,7 @@ vi.mock('@/hooks/useModelAccessStatus', () => ({
}));
vi.mock('@/components/ui/confirm-dialog-provider', () => ({
- useConfirmDialog: () => ({ confirm: vi.fn() }),
+ useConfirmDialog: () => ({ confirm: confirmSpy }),
}));
vi.mock('@/lib/toast', () => ({
@@ -218,6 +220,7 @@ beforeEach(() => {
providerSnapshotState.error = null;
providerSnapshotState.order = ['anthropic', 'xd', 'custom'];
scanResult = { detections: [] };
+ confirmSpy.mockReset().mockResolvedValue(false);
vi.mocked(updateCustomProvider).mockResolvedValue({ ok: true });
(window as unknown as { electronAPI: unknown }).electronAPI = {
maker: {
@@ -287,7 +290,7 @@ describe('ProvidersSection — 双栏管理', () => {
if (kind === 'hidden') expect(speech[0].defaultEnabled).toBe(false);
expect(setModelVisibilities).not.toHaveBeenCalled();
expect(vi.mocked(updateCustomProvider).mock.lastCall![2])
- .toEqual({ speechReferenceRefreshAgents: ['codex'] });
+ .toEqual({ source: 'manual-settings', speechReferenceRefreshAgents: ['codex'] });
if (kind === 'missing') {
expect(toast.success).toHaveBeenLastCalledWith('settings.providers.models.refreshSpeechAdded');
// A second click sees the saved reference; it does not add HD/other defaults.
@@ -317,7 +320,7 @@ describe('ProvidersSection — 双栏管理', () => {
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'] });
+ .toEqual({ source: 'manual-settings', 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();
@@ -406,7 +409,7 @@ describe('ProvidersSection — 双栏管理', () => {
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'] });
+ .toEqual({ source: 'manual-settings', speechReferenceRefreshAgents: kind === 'failed-target' ? ['pi'] : ['codex', 'pi'] });
expect(setModelVisibilities).not.toHaveBeenCalled();
},
);
@@ -431,17 +434,58 @@ describe('ProvidersSection — 双栏管理', () => {
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();
- });
+ // #6928 P1, renderer unit: real refresh -> existing confirmation -> save/retry.
+ // Earlier chat-only cases did not protect a busy Responses image Host from
+ // a speech-only addition. Cancel must stay silent; retry must retain discovery
+ // options and use the final save result, even if Main no longer adds a model.
+ it.each(['cancel', 'interrupt', 'idle', 'no-add-on-retry'] as const)(
+ 'confirms speech refresh Host changes: %s', async action => {
+ const config: CustomProviderConfig = { id: 'openai-api', name: 'My OpenAI', runtimes: {
+ codex: { baseUrl: 'https://api.openai.com/v1', wireProtocol: 'openai-responses',
+ supportsImageGeneration: true,
+ models: [{ id: 'chat-model', name: 'My chat', defaultEnabled: false }] },
+ } };
+ selectSpeechProvider(config);
+ window.electronAPI.maker.fetchProviderModels = vi.fn(async () => ({ ok: true,
+ models: [{ id: 'chat-model', name: 'Upstream chat' }] }));
+ if (action !== 'idle') vi.mocked(updateCustomProvider).mockResolvedValueOnce({ ok: false,
+ confirmationRequired: 'codex-image-generation-reload', busyCount: 1 });
+ vi.mocked(updateCustomProvider).mockResolvedValue({ ok: true,
+ ...(action !== 'no-add-on-retry' ? { speechReferenceAdded: true } : {}) });
+ confirmSpy.mockResolvedValue(action !== 'cancel');
+ render(<MemoryRouter><ProvidersSection /></MemoryRouter>);
+ await act(async () => { fireEvent.click(await screen.findByRole('button', { name: 'settings.providers.models.refreshAria' })); });
+ const saved = vi.mocked(updateCustomProvider).mock.calls[0][0];
+ expect(saved.runtimes.codex!.models[0]).toMatchObject(config.runtimes.codex!.models[0]);
+ expect(updateCustomProvider).toHaveBeenNthCalledWith(1, saved, {}, {
+ source: 'manual-settings', speechReferenceRefreshAgents: ['codex'],
+ });
+ expect(confirmSpy).toHaveBeenCalledTimes(action === 'idle' ? 0 : 1);
+ if (action !== 'idle') expect(confirmSpy).toHaveBeenCalledWith(expect.objectContaining({
+ title: 'settings.providers.custom.imageGenerationReload.title',
+ confirmText: 'settings.providers.custom.imageGenerationReload.interrupt',
+ cancelText: 'settings.providers.custom.imageGenerationReload.cancel',
+ }));
+ expect(updateCustomProvider).toHaveBeenCalledTimes(action === 'cancel' || action === 'idle' ? 1 : 2);
+ if (action === 'interrupt' || action === 'no-add-on-retry') {
+ expect(updateCustomProvider).toHaveBeenNthCalledWith(2, saved, {}, {
+ source: 'manual-settings', codexImageGenerationRestartPolicy: 'interrupt',
+ speechReferenceRefreshAgents: ['codex'],
+ });
+ }
+ expect(toast.error).not.toHaveBeenCalled();
+ if (action === 'cancel') {
+ expect(toast.success).not.toHaveBeenCalled();
+ expect(refetchProvidersSpy).not.toHaveBeenCalled();
+ } else {
+ expect(toast.success).toHaveBeenCalledWith(action === 'no-add-on-retry'
+ ? 'settings.providers.models.refreshNoNew' : 'settings.providers.models.refreshSpeechAdded');
+ expect(refetchProvidersSpy).toHaveBeenCalledOnce();
+ }
+ expect(window.electronAPI.maker.fetchProviderModels).toHaveBeenCalledOnce();
+ expect(screen.getByRole('button', { name: 'settings.providers.models.refreshAria' }).hasAttribute('disabled')).toBe(false);
+ },
+ );
it('keeps a recovery action accessible when the first complete catalog could not be published', async () => {
providerSnapshotState.loading = true;
providerSnapshotState.error = { reason: 'storage-quota' };
@@ -504,7 +548,7 @@ describe('ProvidersSection — 双栏管理', () => {
expect.objectContaining({ id: 'new-model', discoveredMetadata: { nativeApi: 'openai-responses' } }),
...(hasModels ? [expect.objectContaining({ id: 'old-model', contextWindow: 64000, defaultEnabled: false })] : []),
]) }) }),
- }), {});
+ }), {}, { source: 'manual-settings' });
const saved = vi.mocked(updateCustomProvider).mock.calls[0]![0];
// Refresh adds membership without freezing a visibility choice. Native
// projection decides defaults; compatibility still requires an override.
diff --git a/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx b/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx
index f3b96f704a..89562e1a1f 100644
--- a/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx
+++ b/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx
@@ -2969,14 +2969,17 @@ export function ProvidersSection() {
}
// 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 (result.speechReferenceAdded) {
+ let speechReferenceAdded = false;
+ const saved = await confirmProviderChange(async (options) => {
+ const result = await updateCustomProvider(config, {}, {
+ ...options,
+ ...(providerSpeechSetup(p) ? { speechReferenceRefreshAgents: [...refreshedAgents] } : {}),
+ });
+ speechReferenceAdded = result.ok && result.speechReferenceAdded === true;
+ return result;
+ });
+ if (!saved) return;
+ if (speechReferenceAdded) {
toast.success(t('settings.providers.models.refreshSpeechAdded'));
} else if (added > 0) {
toast.success(t('settings.providers.models.refreshAdded', { count: added }));
@@ -2990,7 +2993,7 @@ export function ProvidersSection() {
finishProviderRefresh(p.id);
}
},
- [beginProviderRefresh, finishProviderRefresh, refetch, t],
+ [beginProviderRefresh, confirmProviderChange, finishProviderRefresh, refetch, t],
);
/** 内置四家复用 main 已有的 provider-specific 真源刷新,不在 Renderer 复制网络逻辑。 */