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: 统一 OpenAI 订阅目录并修复本机 Codex 出图 (#4471)

Dash4b3cea8dc016
diff --git a/apps/desktop/src/main/cindy-media/__tests__/invocationService.test.ts b/apps/desktop/src/main/cindy-media/__tests__/invocationService.test.ts
index 3812b32440..3a3fc32674 100644
--- a/apps/desktop/src/main/cindy-media/__tests__/invocationService.test.ts
+++ b/apps/desktop/src/main/cindy-media/__tests__/invocationService.test.ts
@@ -18,6 +18,7 @@ interface MockTransitionInput {
}
const mocks = vi.hoisted(() => ({
+ localMode: false,
currentUserId: 'media-user-0',
ownerGeneration: 1,
models: vi.fn(),
@@ -50,13 +51,14 @@ vi.mock('../../authManager.js', () => ({
getCurrentUserId: () => mocks.currentUserId,
getActiveAuthRealm: () => 'cn',
getAuthState: () => ({
- user: mocks.currentUserId ? { id: mocks.currentUserId } : null,
- dataOwnerId: mocks.currentUserId,
+ mode: mocks.localMode ? 'local' : 'cloud',
+ user: !mocks.localMode && mocks.currentUserId ? { id: mocks.currentUserId } : null,
+ dataOwnerId: mocks.localMode ? mocks.dbOwnerId : mocks.currentUserId,
ownerGeneration: mocks.ownerGeneration,
}),
}));
vi.mock('../../appCapabilities.js', () => ({
- getAppCapabilities: () => ({ canUseCindyGateway: true }),
+ getAppCapabilities: () => ({ canUseCindyGateway: !mocks.localMode }),
}));
vi.mock('../../model-access/effectiveEndpoint.js', () => ({
effectiveXdGatewayBaseUrl: () => 'https://gateway.example.com',
@@ -236,6 +238,7 @@ describe('Cindy Core media invocation state and security boundary', () => {
beforeEach(() => {
mocks.confirm.mockReset().mockResolvedValue(true);
mocks.currentUserId = `media-user-${crypto.randomUUID()}`;
+ mocks.localMode = false;
mocks.ownerGeneration += 1;
mocks.dbOwnerId = mocks.currentUserId;
mocks.db = {
@@ -394,11 +397,14 @@ describe('Cindy Core media invocation state and security boundary', () => {
expect(JSON.parse(init.body)).toMatchObject({ model: fullModelId });
});
- it('同名媒体模型按 providerId 精确准备并调用第三方来源', async () => {
+ it.each([
+ [false, 'openai'], [true, 'openai'], [true, 'openai-independent'],
+ ] as const)('同名媒体模型按 providerId 精确准备并调用第三方来源 (local=%s, provider=%s)', async (localMode, providerId) => {
+ mocks.localMode = localMode;
const providerModel = {
- id: 'openai/gpt-image-2',
+ id: `${providerId}/gpt-image-2`,
name: 'GPT Image 2',
- providerId: 'openai',
+ providerId,
mode: 'image_generation',
modalities: { input: ['text', 'image'], output: ['image'] },
officialDocs: 'https://platform.openai.com/docs/guides/image-generation',
@@ -412,7 +418,7 @@ describe('Cindy Core media invocation state and security boundary', () => {
const prepared = await callCindyMedia({
action: 'prepare',
- providerId: 'openai',
+ providerId,
modelId: providerModel.id,
capability: 'image.generate',
});
@@ -420,7 +426,7 @@ describe('Cindy Core media invocation state and security boundary', () => {
expect(prepared).toMatchObject({
ok: true,
status: 'prepared',
- provider_id: 'openai',
+ provider_id: providerId,
model_id: providerModel.id,
});
expect(mocks.guide).not.toHaveBeenCalled();
@@ -437,13 +443,41 @@ describe('Cindy Core media invocation state and security boundary', () => {
xdt_image_urls: [`cindy-media://blobs/${'a'.repeat(64)}.png`],
});
expect(mocks.providerInvoke).toHaveBeenCalledWith({
- providerId: 'openai',
+ providerId,
modelId: providerModel.id,
capability: 'image.generate',
prompt: 'cat',
imagePaths: [],
signal: expect.any(AbortSignal),
});
+ expect(mocks.rows.get(prepared.invocation_id as string)?.owner).toBe(
+ localMode ? `local:${mocks.dbOwnerId}` : `cn:${mocks.currentUserId}`,
+ );
+ mocks.localMode = !localMode;
+ mocks.ownerGeneration += 1;
+ await expect(callCindyMedia({ action: 'poll', invocationId: prepared.invocation_id as string }))
+ .resolves.toMatchObject({ ok: false, errorCode: 'INVOCATION_NOT_FOUND' });
+ expect(mocks.providerInvoke).toHaveBeenCalledTimes(1);
+ });
+
+ it('本机准备期间同 owner 代次变化时不保存调用', async () => {
+ mocks.localMode = true;
+ mocks.models.mockImplementationOnce(async () => {
+ mocks.ownerGeneration += 1;
+ return [];
+ });
+ await expect(callCindyMedia({ action: 'prepare', providerId: 'openai', modelId: 'openai/gpt-image-2', capability: 'image.generate' }))
+ .resolves.toMatchObject({ ok: false, errorCode: 'ACCOUNT_CHANGED' });
+ expect(mocks.rows.size).toBe(0);
+ expect(mocks.providerInvoke).not.toHaveBeenCalled();
+ });
+
+ it('本机模式不向 Cindy 网关申请 Guide', async () => {
+ mocks.localMode = true;
+ await expect(callCindyMedia({ action: 'prepare', providerId: 'xd', modelId: 'image-model', capability: 'image.generate' }))
+ .resolves.toMatchObject({ ok: false, errorCode: 'CONNECTION_UNAVAILABLE' });
+ expect(mocks.guide).not.toHaveBeenCalled();
+ expect(mocks.outboundFetch).not.toHaveBeenCalled();
});
it('旧调用未传 providerId 时裸 ID 唯一升级且同名来源优先 Cindy AI', async () => {
diff --git a/apps/desktop/src/main/cindy-media/invocationService.ts b/apps/desktop/src/main/cindy-media/invocationService.ts
index a92225d136..deb0ce39ac 100644
--- a/apps/desktop/src/main/cindy-media/invocationService.ts
+++ b/apps/desktop/src/main/cindy-media/invocationService.ts
@@ -96,11 +96,13 @@ function currentAuthScope(downloadContext?: MediaDownloadContext): MediaAuthScop
const state = authManager.getAuthState();
const userId = state.user?.id ?? null;
const dbOwnerId = state.dataOwnerId;
- if (!userId || !dbOwnerId) {
+ if (!dbOwnerId || (state.mode !== 'local' && !userId) || state.mode === 'signed-out') {
throw new MediaInvocationError('CONNECTION_UNAVAILABLE', '当前没有可用的 Cindy 登录态');
}
return {
- owner: `${authManager.getActiveAuthRealm()}:${userId}`,
+ owner: state.mode === 'local'
+ ? `local:${dbOwnerId}`
+ : `${authManager.getActiveAuthRealm()}:${userId}`,
dbOwnerId,
generation: state.ownerGeneration,
downloadContext,
@@ -1112,7 +1114,9 @@ async function prepareInvocation(
const db = captureMediaDb(scope);
await ensureOwnerRecovered(scope, db);
assertAuthScope(scope);
- const models = await listAvailableMediaModels(capability);
+ const models = await listAvailableMediaModels(capability, {
+ skipGateway: !getAppCapabilities().canUseCindyGateway,
+ });
assertAuthScope(scope);
let matchingModels = models.filter(
(candidate) => candidate.id === modelId && (!providerId || candidate.providerId === providerId),
@@ -1156,6 +1160,9 @@ async function prepareInvocation(
}
preparedGuide = providerImageGuide(providerModel, capability);
} else {
+ if (!getAppCapabilities().canUseCindyGateway) {
+ return failure('CONNECTION_UNAVAILABLE', '当前账号不能使用 Cindy AI 网关');
+ }
let resolvedGuide: ResolvedMediaInvocationGuide;
try {
resolvedGuide = await fetchMediaInvocationGuide(resolvedModelId);
@@ -1312,7 +1319,9 @@ async function submitInvocation(
}
// prepare 与实际付费提交之间可能隔着 Agent 组装参数的时间;提交边界重新读取
// Gateway 清单和客户端停用状态,避免模型/供应商刚被停用后仍发出新请求。
- const models = await listAvailableMediaModels(invocation.capability);
+ const models = await listAvailableMediaModels(invocation.capability, {
+ skipGateway: !getAppCapabilities().canUseCindyGateway,
+ });
assertAuthScope(scope, invocation.owner);
if (!models.some((model) => model.providerId === 'xd' && model.id === invocation.modelId)) {
return failure('MODEL_NOT_AVAILABLE', '该模型已下架或被停用,本次生成未发出');
@@ -1779,7 +1788,7 @@ export async function callCindyMedia(
};
}
if (request.action === 'prepare') {
- return prepareInvocation(
+ return await prepareInvocation(
request.providerId,
request.modelId,
request.capability as MediaCapability,
diff --git a/apps/desktop/src/main/maker-host/__tests__/bundledCatalogIntegrity.test.ts b/apps/desktop/src/main/maker-host/__tests__/bundledCatalogIntegrity.test.ts
index 3c21653917..8b9e2c5fd5 100644
--- a/apps/desktop/src/main/maker-host/__tests__/bundledCatalogIntegrity.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/bundledCatalogIntegrity.test.ts
@@ -104,10 +104,14 @@ it('removes GPT window presets from new choices while preserving runtime history
const legacy = openai.models['claude-code']!.find((m) => m.id.endsWith('[1m]'))!;
expect(legacy).toBeDefined();
const withCustom: Catalog = {
- ...runtime, providers: [...runtime.providers, { ...openai, id: 'user:test', source: 'user' }],
+ ...runtime, providers: [...runtime.providers,
+ { ...openai, id: 'openai-independent', source: 'user', auth: { method: 'oauth', native: 'codex' } },
+ { ...openai, id: 'user:test', source: 'user', auth: { method: 'apiKey' } },
+ ],
};
const selectable = filterLegacyGptContextProfiles(withCustom);
expect(selectable.providers.find((p) => p.id === 'openai')!.models['claude-code']!.some((m) => m.id.endsWith('[1m]'))).toBe(false);
+ expect(selectable.providers.find((p) => p.id === 'openai-independent')!.models['claude-code']!.some((m) => m.id.endsWith('[1m]'))).toBe(false);
expect(selectable.providers.find((p) => p.id === 'user:test')!.models['claude-code']).toContain(legacy);
expect(openai.models['claude-code']).toContain(legacy);
expect(deriveAvailableModels(runtime, 'claude-code').some((m) => m.id === legacy.id)).toBe(false);
diff --git a/apps/desktop/src/main/maker-host/__tests__/openAiAccountCatalogParity.test.ts b/apps/desktop/src/main/maker-host/__tests__/openAiAccountCatalogParity.test.ts
index a44e2d223c..b548c38071 100644
--- a/apps/desktop/src/main/maker-host/__tests__/openAiAccountCatalogParity.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/openAiAccountCatalogParity.test.ts
@@ -2,7 +2,7 @@ import { afterEach, describe, expect, it } from 'vitest';
import { BUNDLED_CATALOG, buildUserProvider, type CatalogModel } from '@cindy/model-providers';
import {
getActiveCatalog, setActiveCatalog, setCustomProviders, setDiscoveredCodexModels,
- setLocalCatalogOverrides,
+ setLocalCatalogOverrides, setCustomProviderConfigs, setDiscoveredProviderMediaModels,
} from '../active-catalog.js';
import { EMPTY_MODEL_CATALOG_OVERRIDES, hasLocalAddition, sanitizeModelCatalogOverrides } from '../model-plane/localCatalogOverrides.js';
@@ -22,11 +22,69 @@ function entry(providerId: string, agent: 'codex' | 'claude-code' | 'pi', id: st
afterEach(() => {
setCustomProviders([]);
setDiscoveredCodexModels([]);
+ setDiscoveredProviderMediaModels('openai', null);
+ setDiscoveredProviderMediaModels(accountId, null);
setLocalCatalogOverrides(EMPTY_MODEL_CATALOG_OVERRIDES);
setActiveCatalog(BUNDLED_CATALOG);
});
describe('OpenAI account catalog identity', () => {
+ it.each(['before', 'after', 'configs'] as const)('updates existing image members and defaults from the public catalog (account: %s)', (order) => {
+ const config = {
+ id: accountId, name: 'OpenAI', auth: { method: 'oauth' as const, native: 'codex' as const },
+ runtimes: { codex: { baseUrl: 'https://chatgpt.com/backend-api/codex', models: [] } },
+ };
+ if (order === 'before') setCustomProviders([account()]);
+ if (order === 'configs') setCustomProviderConfigs([config]);
+ const catalog = structuredClone(BUNDLED_CATALOG);
+ const definition = catalog.providers.find(p => p.id === 'openai')!;
+ definition.imageModels = [{ id: 'openai/gpt-image-fixture', name: 'Public image' }];
+ definition.imageDefaults = { standard: 'openai/gpt-image-fixture', best: 'openai/gpt-image-fixture' };
+ setActiveCatalog(catalog);
+ if (order === 'after') setCustomProviders([account()]);
+ const images = (id: string) => getActiveCatalog().providers.find(p => p.id === id)!;
+ for (const id of ['openai', accountId]) {
+ expect(images(id).imageModels?.map(m => m.id)).toEqual([`${id}/gpt-image-fixture`]);
+ expect(images(id).imageDefaults).toEqual({ standard: `${id}/gpt-image-fixture`, best: `${id}/gpt-image-fixture` });
+ }
+ definition.imageModels = [{ id: 'openai/gpt-image-next', name: 'Next image' }];
+ delete definition.imageDefaults;
+ setActiveCatalog(structuredClone(catalog));
+ for (const id of ['openai', accountId]) {
+ expect(images(id).imageModels?.map(m => m.id)).toEqual([`${id}/gpt-image-next`]);
+ expect(images(id).imageDefaults).toBeUndefined();
+ }
+ definition.imageModels = [];
+ setActiveCatalog(structuredClone(catalog));
+ for (const id of ['openai', accountId]) expect(images(id).imageModels).toEqual([]);
+ delete definition.imageModels;
+ setActiveCatalog(structuredClone(catalog));
+ expect(images(accountId).imageModels?.map(m => m.id.replace(`${accountId}/`, 'openai/')))
+ .toEqual(images('openai').imageModels?.map(m => m.id));
+ expect(images(accountId).imageModels?.length).toBeGreaterThan(0);
+ });
+
+ it('keeps Platform discovery and connection overrides out of other subscription image lists', () => {
+ const catalog = structuredClone(BUNDLED_CATALOG);
+ setActiveCatalog(catalog);
+ setCustomProviders([account()]);
+ setDiscoveredProviderMediaModels('openai', { imageModels: [{ id: 'openai/gpt-image-api-only', name: 'API only' }] });
+ setLocalCatalogOverrides(sanitizeModelCatalogOverrides({ patches: {
+ [`${accountId}:${accountId}/gpt-image-2`]: { base: { name: 'My image' } },
+ } }).overrides);
+ for (let refresh = 0; refresh < 2; refresh++) {
+ const providers = getActiveCatalog().providers;
+ expect(providers.find(p => p.id === 'openai')!.imageModels?.map(m => m.id)).toEqual(['openai/gpt-image-api-only']);
+ const images = providers.find(p => p.id === accountId)!.imageModels!;
+ expect(images.some(m => m.id.endsWith('/gpt-image-api-only'))).toBe(false);
+ expect(images.find(m => m.id === `${accountId}/gpt-image-2`)?.name).toBe('My image');
+ setActiveCatalog(structuredClone(catalog));
+ }
+ setDiscoveredProviderMediaModels(accountId, { imageModels: [] });
+ expect(getActiveCatalog().providers.find(p => p.id === accountId)!.imageModels).toEqual([]);
+ expect(getActiveCatalog().providers.find(p => p.id === 'openai')!.imageModels).toHaveLength(1);
+ });
+
it.each([false, true])('Pro/Cyber keep all Harness routes and inherit available public tiers (old snapshot: %s)', (oldSnapshot) => {
const catalog = structuredClone(BUNDLED_CATALOG);
const slugs = ['gpt-5.4-pro', 'gpt-5.5-pro', 'gpt-5.6-cyber'];
@@ -101,7 +159,7 @@ describe('OpenAI account catalog identity', () => {
const second = providers.find(p => p.id === accountId)!;
for (const agent of ['codex', 'claude-code', 'pi'] as const) {
const ids = second.models[agent]!.map(m => m.id);
- expect(ids).toEqual(expect.arrayContaining(original.models[agent]!.map(m => m.id)));
+ expect([...ids].sort()).toEqual(original.models[agent]!.map(m => m.id).sort());
expect(new Set(ids).size).toBe(ids.length);
}
expect(entry(accountId, 'pi', remotePi.id)).toMatchObject(remotePi);
diff --git a/apps/desktop/src/main/maker-host/__tests__/providerModelAutoRefresh.test.ts b/apps/desktop/src/main/maker-host/__tests__/providerModelAutoRefresh.test.ts
index 181a3ed988..b25f3d0a3d 100644
--- a/apps/desktop/src/main/maker-host/__tests__/providerModelAutoRefresh.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/providerModelAutoRefresh.test.ts
@@ -34,6 +34,24 @@ function deferred(): {
}
describe('provider model auto-refresh coordinator', () => {
+ it('refreshes the public image catalog before manual OpenAI discovery', async () => {
+ const catalog = deferred();
+ const refreshProvider = vi.fn(async () => undefined);
+ const coordinator = createProviderModelRefreshCoordinator({
+ listProviders: async () => [view('openai', true)],
+ refreshCatalog: () => catalog.promise,
+ refreshProvider,
+ getScopeKey: () => 1,
+ now: () => 1_000,
+ log: { debug: vi.fn(), warn: vi.fn() },
+ });
+ const result = coordinator.refreshManually('openai');
+ expect(refreshProvider).not.toHaveBeenCalled();
+ catalog.resolve();
+ await result;
+ expect(refreshProvider).toHaveBeenCalledExactlyOnceWith('openai');
+ });
+
it('refreshes the shared Catalog after cooldown even when xAI is disconnected', async () => {
let now = 1_000;
const refreshCatalog = vi.fn(async () => undefined);
diff --git a/apps/desktop/src/main/maker-host/__tests__/providerModelRefresh.test.ts b/apps/desktop/src/main/maker-host/__tests__/providerModelRefresh.test.ts
index d622abbe92..e277b24d09 100644
--- a/apps/desktop/src/main/maker-host/__tests__/providerModelRefresh.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/providerModelRefresh.test.ts
@@ -2,6 +2,7 @@ import { describe, expect, it, vi } from 'vitest';
import {
refreshBuiltinProviderModels,
+ refreshModelsWithCatalog,
type BuiltinProviderModelRefreshDeps,
} from '../provider-model-refresh.js';
@@ -83,3 +84,45 @@ describe('refreshBuiltinProviderModels', () => {
).rejects.toThrow(/xAI media model discovery/);
});
});
+
+describe('refreshModelsWithCatalog', () => {
+ it('updates the catalog before the selected account discovery and preserves its result', async () => {
+ const steps: string[] = [];
+ const result = await refreshModelsWithCatalog({
+ refreshCatalog: async () => { steps.push('catalog'); },
+ refreshModels: async () => { steps.push('selected-account'); return false; },
+ getScopeKey: () => 1,
+ });
+ expect(steps).toEqual(['catalog', 'selected-account']);
+ expect(result).toBe(false);
+ });
+
+ it('does not discover accounts after a failed catalog refresh', async () => {
+ const refreshModels = vi.fn(async () => true);
+ await expect(refreshModelsWithCatalog({
+ refreshCatalog: async () => { throw new Error('offline'); },
+ refreshModels,
+ getScopeKey: () => 1,
+ })).rejects.toThrow('offline');
+ expect(refreshModels).not.toHaveBeenCalled();
+ });
+
+ it.each(['catalog', 'discovery'] as const)('rejects an owner switch during %s', async (stage) => {
+ let scope = 1;
+ const refreshModels = vi.fn(async () => { scope++; return true; });
+ await expect(refreshModelsWithCatalog({
+ refreshCatalog: async () => { if (stage === 'catalog') scope++; },
+ refreshModels,
+ getScopeKey: () => scope,
+ })).rejects.toThrow('Account changed');
+ expect(refreshModels).toHaveBeenCalledTimes(stage === 'catalog' ? 0 : 1);
+ });
+
+ it('preserves a discovery failure after the public catalog succeeds', async () => {
+ await expect(refreshModelsWithCatalog({
+ refreshCatalog: async () => undefined,
+ refreshModels: async () => { throw new Error('discovery failed'); },
+ getScopeKey: () => 1,
+ })).rejects.toThrow('discovery failed');
+ });
+});
diff --git a/apps/desktop/src/main/maker-host/active-catalog.ts b/apps/desktop/src/main/maker-host/active-catalog.ts
index d8fec3efd6..082edd1f49 100644
--- a/apps/desktop/src/main/maker-host/active-catalog.ts
+++ b/apps/desktop/src/main/maker-host/active-catalog.ts
@@ -1134,7 +1134,29 @@ function computeMerged(): Catalog {
// 自定义供应商先追加、再做通用发现 augment——顺序反了的话,自定义 OAuth 供应商
// 的发现模型永远合不进目录(map 只扫过内置列表)。
- if (custom.length > 0) providers = [...providers, ...custom];
+ if (custom.length > 0) {
+ // Bind the public image definition before applying any account discovery or overrides.
+ // Copying the final builtin connection would leak its Platform-key membership/preferences.
+ const openaiDefinition = providerSources.find((provider) => provider.id === 'openai');
+ const accounts = custom.map((provider) => {
+ if (!isOpenAiSubscriptionProvider(provider)) return provider;
+ const bindId = (id: string): string => id.replace(/^openai\//, `${provider.id}/`);
+ const defaults = openaiDefinition?.imageDefaults;
+ return {
+ ...provider,
+ imageModels: openaiDefinition?.imageModels?.map((model) => ({
+ ...model,
+ id: bindId(model.id),
+ })),
+ imageDefaults: defaults ? {
+ standard: bindId(defaults.standard),
+ ...(defaults.draft ? { draft: bindId(defaults.draft) } : {}),
+ ...(defaults.best ? { best: bindId(defaults.best) } : {}),
+ } : undefined,
+ };
+ });
+ providers = [...providers, ...accounts];
+ }
// 通用 OAuth 供应商的发现模型(additions-only,per provider × agent;内置与自定义同待遇)。
if (discoveredByProvider.size > 0) {
diff --git a/apps/desktop/src/main/maker-host/legacy-context-profiles.ts b/apps/desktop/src/main/maker-host/legacy-context-profiles.ts
index 530120e1fe..16b5e8ebc5 100644
--- a/apps/desktop/src/main/maker-host/legacy-context-profiles.ts
+++ b/apps/desktop/src/main/maker-host/legacy-context-profiles.ts
@@ -1,8 +1,8 @@
-import type { AgentKind, Catalog, Provider } from '@cindy/model-providers';
+import { isOpenAiSubscriptionProvider, type AgentKind, type Catalog, type Provider } from '@cindy/model-providers';
/** Old GPT window presets remain in the runtime catalog for history/resume only. */
-export function isLegacyGptContextProfile(provider: Pick<Provider, 'id' | 'source'>, modelId: string): boolean {
- return provider.source !== 'user' && provider.id === 'openai' &&
+export function isLegacyGptContextProfile(provider: Pick<Provider, 'id' | 'auth'>, modelId: string): boolean {
+ return isOpenAiSubscriptionProvider(provider) &&
/^(?:chatgpt\/)?gpt-[^/]+\[1m\]$/.test(modelId);
}
@@ -10,7 +10,7 @@ export function filterLegacyGptContextProfiles(catalog: Catalog): Catalog {
return {
...catalog,
providers: catalog.providers.map((provider) => {
- if (provider.id !== 'openai' || provider.source === 'user') return provider;
+ if (!isOpenAiSubscriptionProvider(provider)) return provider;
return {
...provider,
models: Object.fromEntries(Object.entries(provider.models).map(([agent, models]) => [
diff --git a/apps/desktop/src/main/maker-host/provider-model-auto-refresh.ts b/apps/desktop/src/main/maker-host/provider-model-auto-refresh.ts
index 84780c92ef..215caa6da3 100644
--- a/apps/desktop/src/main/maker-host/provider-model-auto-refresh.ts
+++ b/apps/desktop/src/main/maker-host/provider-model-auto-refresh.ts
@@ -18,6 +18,7 @@ import {
type ProviderModelAutoRefreshTrigger,
} from '../../shared/providerModelRefresh.js';
import { createLogger, type Logger } from '../logger.js';
+import { refreshModelsWithCatalog } from './provider-model-refresh.js';
export const PROVIDER_MODEL_AUTO_REFRESH_COOLDOWN_MS = 30 * 60_000;
export const PROVIDER_MODEL_AUTO_REFRESH_FAILURE_COOLDOWN_MS = 5 * 60_000;
@@ -313,9 +314,15 @@ export function createProviderModelRefreshCoordinator(
},
async refreshManually(providerId): Promise<void> {
- // xAI 同时有公共静态目录与账号态媒体发现。手动刷新要把两层都刷新;自动路径
- // 已在上方统一先刷新公共目录,再调用 provider hook,因此不会重复拉 Catalog。
- if (providerId === 'xai' && deps.refreshCatalog) await deps.refreshCatalog();
+ // Subscription media declarations can change independently of chat discovery.
+ // Automatic refresh already loads the shared catalog before calling the provider hook.
+ if ((providerId === 'xai' || providerId === 'openai') && deps.refreshCatalog) {
+ return refreshModelsWithCatalog({
+ refreshCatalog: deps.refreshCatalog,
+ refreshModels: () => refresh(providerId, true),
+ getScopeKey: () => deps.getScopeKey?.(),
+ });
+ }
await refresh(providerId, true);
},
resetCooldowns,
diff --git a/apps/desktop/src/main/maker-host/provider-model-refresh.ts b/apps/desktop/src/main/maker-host/provider-model-refresh.ts
index 21af2b6bdb..96ac48cedb 100644
--- a/apps/desktop/src/main/maker-host/provider-model-refresh.ts
+++ b/apps/desktop/src/main/maker-host/provider-model-refresh.ts
@@ -7,6 +7,23 @@
import type { BuiltinRefreshableProviderId } from '../../shared/providerModelRefresh.js';
+/** Refresh public definitions first without carrying an account request across an owner switch. */
+export async function refreshModelsWithCatalog<T>(deps: {
+ refreshCatalog(): Promise<unknown>;
+ refreshModels(): Promise<T>;
+ getScopeKey(): unknown;
+}): Promise<T> {
+ const scope = deps.getScopeKey();
+ const assertCurrent = (): void => {
+ if (deps.getScopeKey() !== scope) throw new Error('Account changed during model discovery');
+ };
+ await deps.refreshCatalog();
+ assertCurrent();
+ const result = await deps.refreshModels();
+ assertCurrent();
+ return result;
+}
+
export interface BuiltinProviderModelRefreshDeps {
refreshXd(): Promise<void>;
refreshAnthropic(): Promise<boolean>;
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.ts
index 10c528df93..a5ad1a1617 100644
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@ -838,7 +838,7 @@ import {
refreshAnthropicModelsFromHttp,
} from '../maker-host/model-discovery/anthropic.js';
import { refreshXaiModelsFromHttp } from '../maker-host/model-discovery/xai.js';
-import { refreshBuiltinProviderModels } from '../maker-host/provider-model-refresh.js';
+import { refreshBuiltinProviderModels, refreshModelsWithCatalog } from '../maker-host/provider-model-refresh.js';
import {
configureProviderModelAutoRefresh,
refreshProviderModelsManually,
@@ -5482,10 +5482,14 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
return { ok: await refreshSubscriptionAccountModels(spec.savedProviderId), models: [] };
}
if (isCodexAccountProvider(spec.savedProviderId)) {
- const owner = getActiveAppSession();
if (spec.agent !== 'codex') throw new Error('Codex account model discovery requires Codex');
- const applied = await maker.refreshAgentLocalModels('codex', { credentialMode: 'oauth-bearer', providerId: spec.savedProviderId! });
- if (getActiveAppSession().generation !== owner.generation) throw new Error('Account changed during model discovery');
+ const applied = await refreshModelsWithCatalog({
+ refreshCatalog: refreshActiveCatalogFromSource,
+ refreshModels: () => maker.refreshAgentLocalModels('codex', {
+ credentialMode: 'oauth-bearer', providerId: spec.savedProviderId!,
+ }),
+ getScopeKey: () => getActiveAppSession().generation,
+ });
return { ok: applied, models: [] };
}
if (spec.authMethod === 'oauth') {
diff --git a/apps/desktop/src/main/model-access/mediaModels.ts b/apps/desktop/src/main/model-access/mediaModels.ts
index 9c909e8147..d1a24fe37d 100644
--- a/apps/desktop/src/main/model-access/mediaModels.ts
+++ b/apps/desktop/src/main/model-access/mediaModels.ts
@@ -226,8 +226,10 @@ async function fetchGatewayMediaModels(): Promise<GatewayMediaCatalogEntry[]> {
export async function listAvailableMediaModels(
capability?: MediaCapability,
+ options?: { skipGateway?: boolean },
): Promise<ExecutableMediaModel[]> {
const providerModels = availableProviderMediaModels(capability);
+ if (options?.skipGateway) return providerModels;
try {
const gatewayModels = filterEnabledGatewayMediaModels(
await fetchGatewayMediaModels(),
diff --git a/packages/model-providers/src/__tests__/user-provider.test.ts b/packages/model-providers/src/__tests__/user-provider.test.ts
index a757ed63ca..98800f5c46 100644
--- a/packages/model-providers/src/__tests__/user-provider.test.ts
+++ b/packages/model-providers/src/__tests__/user-provider.test.ts
@@ -86,7 +86,8 @@ describe("buildUserProvider (per-runtime)", () => {
expect(a.agents).toEqual(['codex', 'claude-code', 'pi']);
expect(a.titleModel).toBeTruthy();
expect(a.models.pi?.length).toBeGreaterThan(0);
- expect(a.imageModels?.every((model) => model.id.startsWith('openai-a/'))).toBe(true);
+ expect(a.imageModels).toBeUndefined(); // bound from the current public catalog by the host
+ expect(a.imageDefaults).toBeUndefined();
expect(a.routing.codex?.authStrategy).toBe('oauth-passthrough');
expect(a.routing.codex?.supportsResponsesCustomTools).not.toBe(false);
expect(a.id).not.toBe(b.id);
diff --git a/packages/model-providers/src/user-provider.ts b/packages/model-providers/src/user-provider.ts
index 1629f24a48..218aaca067 100644
--- a/packages/model-providers/src/user-provider.ts
+++ b/packages/model-providers/src/user-provider.ts
@@ -625,7 +625,10 @@ export function buildUserProvider(
source: 'user',
auth: { method: 'oauth', native: 'codex' },
models: { ...identity.models, codex: models.codex ?? [] },
- imageModels: identity.imageModels?.map((model) => ({ ...model, id: model.id.replace(/^openai\//, `${runtimeProviderId}/`) })),
+ // The active catalog binds the current public image definition to each connection.
+ // Do not freeze bundled membership when an independent account is constructed.
+ imageModels: undefined,
+ imageDefaults: undefined,
};
}
// Selection/import membership does not opt the user into compatibility harnesses.