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(desktop): 修复跨 Agent 切换后模型显示回退与连续改选异常 (#4756)

DavidShenXD76759c3dbd04
diff --git a/apps/desktop/src/main/__tests__/sessionRuntimeControlWiring.test.ts b/apps/desktop/src/main/__tests__/sessionRuntimeControlWiring.test.ts
index 36a29e3b66..48ffecf251 100644
--- a/apps/desktop/src/main/__tests__/sessionRuntimeControlWiring.test.ts
+++ b/apps/desktop/src/main/__tests__/sessionRuntimeControlWiring.test.ts
@@ -11,6 +11,10 @@ const registerSource = readFileSync(resolve(mainRoot, 'maker-ipc/register.ts'),
/\r\n?/g,
'\n',
);
+const runtimeControlSource = readFileSync(
+ resolve(mainRoot, 'maker-ipc/sessionRuntimeControl.ts'),
+ 'utf8',
+).replace(/\r\n?/g, '\n');
const deviceLinkHostSource = readFileSync(
resolve(mainRoot, 'device-link/index.ts'),
'utf8',
@@ -931,9 +935,10 @@ describe('session runtime control wiring', () => {
expect(registerSource).toContain('setSessionRuntimeProjector((session) =>');
expect(registerSource).toContain('setSessionRuntimeCleanup((sessionId) =>');
expect(registerSource).toContain('broadcastSessionRuntimeProjection(sessionId');
- expect(registerSource).toContain('runtimeEffective: effective');
- expect(registerSource).toContain('runtimePending: control.pending');
- expect(registerSource).toContain("effort: effective.effort ?? '',");
+ expect(registerSource).toContain('projectSessionRuntimeControl(session.id');
+ expect(runtimeControlSource).toContain('runtimeEffective: effective');
+ expect(runtimeControlSource).toContain('runtimePending: control.pending');
+ expect(runtimeControlSource).toContain("effort: effective.effort ?? '',");
});
// persists Pi runtime-verified windows without catalog replacement: covered by the executable sessionEventPipeline tests.
diff --git a/apps/desktop/src/main/__tests__/touchUserSendBroadcast.test.ts b/apps/desktop/src/main/__tests__/touchUserSendBroadcast.test.ts
index 8a14589f68..2c64cc213f 100644
--- a/apps/desktop/src/main/__tests__/touchUserSendBroadcast.test.ts
+++ b/apps/desktop/src/main/__tests__/touchUserSendBroadcast.test.ts
@@ -15,7 +15,7 @@
* 捕获用的 spy / 数组放进 vi.hoisted —— vi.mock 工厂被提升到文件顶,不能引用普通顶层变量。
*/
-import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
const h = vi.hoisted(() => {
const updateSetCalls: Array<Record<string, unknown>> = [];
@@ -24,10 +24,13 @@ const h = vi.hoisted(() => {
// 需要非默认结果(no-op/MAX updatedAt)的测试先 push 目标行再调函数。
const selectResults: Array<Array<Record<string, unknown>>> = [];
const updateErrors: unknown[] = [];
+ const route = { row: null as Record<string, unknown> | null };
const makeUpdateChain = () => {
const chain: Record<string, unknown> = {};
+ let update: Record<string, unknown> = {};
chain.set = (payload: Record<string, unknown>) => {
+ update = payload;
updateSetCalls.push(payload);
// 自动填充"UPDATE 落地"场景(验证 SELECT 返回该行,广播触发)。
// 若测试预先 push 了结果,队列非空,跳过自动填充,使用预设值。
@@ -38,7 +41,14 @@ const h = vi.hoisted(() => {
};
chain.where = () => {
const error = updateErrors.shift();
- return error === undefined ? Promise.resolve(undefined) : Promise.reject(error);
+ const committed = error === undefined ? Promise.resolve(undefined) : Promise.reject(error);
+ return Object.assign(committed, {
+ returning: () => committed.then(() => {
+ if (!route.row) return [];
+ Object.assign(route.row, update);
+ return [{ ...route.row }];
+ }),
+ });
};
return chain;
};
@@ -66,6 +76,7 @@ const h = vi.hoisted(() => {
updateSetCalls,
selectResults,
updateErrors,
+ route,
fakeDb: {
update: vi.fn(() => makeUpdateChain()),
select: vi.fn(() => makeSelectChain()),
@@ -87,6 +98,11 @@ vi.mock('../security/trustedAppRenderer.js', () => ({
vi.mock('../logger', () => ({
createLogger: () => ({ debug: vi.fn(), info: vi.fn(), warn: vi.fn(), error: vi.fn() }),
}));
+// Route admission is injected into the switch handler; this fixture exercises
+// persistence and projection without loading live provider credentials.
+vi.mock('../maker-host/model-route-guard-live.js', () => ({
+ shouldApplyExclusiveProviderRerouteLive: vi.fn(() => false),
+}));
// 被 sessions.ts 顶层 import 但与本测试无关的副作用模块,全部 stub 掉避免触碰 electron app 路径。
vi.mock('../localDb/dialogueWorkspace', () => ({ ensureDialogueWorkspaceDir: vi.fn() }));
vi.mock('../git-context/prRefsStore', () => ({
@@ -114,7 +130,21 @@ import {
clearSessionContextInDb,
touchUserSendInDb,
persistSessionFields,
+ applyAgentSwitchToSessionRow,
+ broadcastSessionPatched,
} from '../localDb/ipc/sessions.js';
+import { setSessionRuntimeProjector } from '../localDb/mapper';
+import { dbToMakerAgentKind, makerToDbAgentKind } from '../../shared/agentKindConversion';
+import {
+ clearAllSessionRuntimeControlStates, projectSessionRuntimeControl, recordUserSessionRuntimeMutation,
+ type SessionRuntimeProfile,
+} from '../maker-ipc/sessionRuntimeControl';
+import {
+ applyPendingAgentSwitchIfIdle, createPendingAgentSwitchRegistry, performSessionAgentSwitch,
+ type MakerSessionAgentSwitchHandlerDeps, type PublicAgentSwitchIntent,
+} from '../maker-ipc/sessionAgentSwitchHandler';
+import { resolveComposerModelSelection } from '../../renderer/components/new-chat/composerModelSelection';
+import { createSessionSnapshotPatchBuffer } from '../../renderer/features/cc-agent/lib/sessionSnapshotPatchBuffer';
import {
backgroundTurnPredatesSessionClear,
noteSessionClearBoundary,
@@ -122,12 +152,154 @@ import {
beforeEach(() => {
vi.clearAllMocks();
+ h.tapWindowBroadcast.mockReset();
h.ownerCurrent = true;
h.captureOwnerScope = false;
h.upsertRecentWorkdir.mockResolvedValue(true);
h.updateSetCalls.length = 0;
h.selectResults.length = 0;
h.updateErrors.length = 0;
+ h.route.row = null;
+});
+
+afterEach(() => {
+ setSessionRuntimeProjector(null);
+ clearAllSessionRuntimeControlStates();
+});
+
+describe('cross-agent committed model projection', () => {
+ const profiles: SessionRuntimeProfile[] = [
+ { agentKind: 'claude-code', model: 'glm-5.3-flash', providerId: 'xd', effort: 'high', fastMode: false },
+ { agentKind: 'codex', model: 'gpt-6', providerId: 'openai', effort: 'medium', fastMode: true },
+ { agentKind: 'pi', model: 'grok-4.6', providerId: 'xai', effort: 'low', fastMode: false },
+ ];
+
+ function harness(initial: SessionRuntimeProfile) {
+ const id = 'switch-projection';
+ h.route.row = { id, ...initial, agentKind: makerToDbAgentKind(initial.agentKind) };
+ setSessionRuntimeProjector((session) => projectSessionRuntimeControl(session.id, {
+ agentKind: dbToMakerAgentKind(session.agentKind), model: session.model,
+ providerId: session.providerId ?? null, effort: session.effort as SessionRuntimeProfile['effort'], fastMode: session.fastMode,
+ }));
+ const pending = createPendingAgentSwitchRegistry();
+ const deps: MakerSessionAgentSwitchHandlerDeps = {
+ pendingSwitches: pending,
+ getSessionRow: async () => ({
+ id, agentKind: String(h.route.row!.agentKind), model: String(h.route.row!.model),
+ providerId: h.route.row!.providerId as string | null, status: 'active',
+ remoteHostId: null, orcaRole: null, sdkSessionId: null,
+ }),
+ getLiveSession: () => null,
+ closeSession: vi.fn(async () => {}),
+ listMessagesForHandoff: async () => [],
+ applyAgentSwitchToDb: applyAgentSwitchToSessionRow,
+ setSessionProvider: vi.fn(),
+ insertBoundaryMessage: vi.fn(async () => 'boundary'),
+ applyResumeFallbackAtomically: vi.fn(async () => {}),
+ setPendingHandoff: vi.fn(),
+ bootstrapSwitchedSession: vi.fn(async () => {}),
+ withCloseSuppressed: (_id, fn) => fn(),
+ onPendingSwitchChanged: (sessionId, intent) => {
+ if (intent) recordUserSessionRuntimeMutation(sessionId);
+ broadcastSessionPatched(sessionId, { agentSwitchIntent: intent });
+ },
+ log: { info: vi.fn(), warn: vi.fn() },
+ };
+ type Snapshot = {
+ agentKind: string; model: string; providerId: string | null; effort: SessionRuntimeProfile['effort'];
+ fastMode: boolean; runtimeEffective: SessionRuntimeProfile; agentSwitchIntent: PublicAgentSwitchIntent | null;
+ };
+ let snapshot: Snapshot = { ...initial, agentKind: makerToDbAgentKind(initial.agentKind), runtimeEffective: initial, agentSwitchIntent: null };
+ const buffer = createSessionSnapshotPatchBuffer<Snapshot>();
+ buffer.setSession(id);
+ const displays: ReturnType<typeof resolveComposerModelSelection>[] = [];
+ h.tapWindowBroadcast.mockImplementation((channel, event) => {
+ if (channel !== 'local-db:sessions:patched') return;
+ buffer.stage(id, event.patch);
+ snapshot = buffer.merge(id, snapshot);
+ const intent = snapshot.agentSwitchIntent;
+ displays.push(resolveComposerModelSelection({
+ current: { ...snapshot, agentKind: dbToMakerAgentKind(snapshot.agentKind) },
+ effective: snapshot.runtimeEffective,
+ intent: intent ? { ...intent, target: intent.targetAgentKind, effort: intent.effort as SessionRuntimeProfile['effort'] } : null,
+ }));
+ buffer.acknowledgeCommitted(id, snapshot);
+ });
+ return {
+ deps, pending, displays, snapshot: () => snapshot,
+ choose: (profile: SessionRuntimeProfile) => performSessionAgentSwitch(deps, {
+ sessionId: id, targetAgentKind: profile.agentKind, model: profile.model,
+ providerId: profile.providerId, effort: profile.effort, fastMode: profile.fastMode,
+ }),
+ send: () => applyPendingAgentSwitchIfIdle(deps, id),
+ };
+ }
+
+ it.each(profiles.flatMap((from) => profiles.filter((to) => to.agentKind !== from.agentKind).map((to) => ({ from, to }))))(
+ 'publishes every model axis before clearing $from.agentKind → $to.agentKind', async ({ from, to }) => {
+ const h = harness(from);
+ await h.choose(to);
+ expect(h.displays.at(-1)).toEqual({ current: from, display: to, pending: true });
+ await h.send();
+ expect(h.snapshot()).toMatchObject({ model: to.model, runtimeEffective: to, agentSwitchIntent: null });
+ expect(h.displays.at(-1)).toEqual({ current: to, display: to, pending: false });
+ expect(h.displays.every((frame) => JSON.stringify(frame.display) === JSON.stringify(to))).toBe(true);
+ // Every frame after commit has the new profile, even before intent cleanup.
+ const pushed = h.displays.find((frame) => frame.current.model === to.model);
+ expect(pushed?.current).toEqual(to);
+ },
+ );
+
+ it('applies only the last of repeated cross-agent choices before send, then supports repeated sends', async () => {
+ const h = harness(profiles[0]);
+ await h.choose(profiles[1]);
+ await h.choose(profiles[2]);
+ const final = { ...profiles[1], model: 'gpt-6-astra', providerId: 'xd', fastMode: false };
+ await h.choose(final);
+ expect(h.deps.insertBoundaryMessage).not.toHaveBeenCalled();
+ await h.send();
+ expect(h.deps.insertBoundaryMessage).toHaveBeenCalledTimes(1);
+ expect(h.displays.at(-1)?.display).toEqual(final);
+ for (const profile of [profiles[2], profiles[0], profiles[1]]) {
+ await h.choose(profile);
+ await h.send();
+ expect(h.displays.at(-1)).toEqual({ current: profile, display: profile, pending: false });
+ }
+ });
+
+ it('does not erase a newer choice to the same target agent while the first switch commits', async () => {
+ const h = harness(profiles[0]);
+ const newer = { ...profiles[2], model: 'another-pi-model', providerId: 'other-source', effort: 'high' as const };
+ await h.choose(profiles[2]);
+ let release!: () => void;
+ let entered!: () => void;
+ const enteredPromise = new Promise<void>((resolve) => { entered = resolve; });
+ const persist = h.deps.applyAgentSwitchToDb;
+ h.deps.applyAgentSwitchToDb = async (sessionId, patch) => {
+ entered();
+ await new Promise<void>((resolve) => { release = resolve; });
+ await persist(sessionId, patch);
+ };
+ const send = h.send();
+ await enteredPromise;
+ await h.choose(newer);
+ release();
+ await send;
+ expect(h.pending.get('switch-projection')?.model).toBe(newer.model);
+ expect(h.displays.at(-1)).toEqual({ current: profiles[2], display: newer, pending: true });
+ });
+
+ it('retains the selection after a failed commit and converges on retry', async () => {
+ const test = harness(profiles[0]);
+ await test.choose(profiles[2]);
+ h.updateErrors.push(new Error('write failed'));
+ await test.send();
+ expect(test.snapshot().runtimeEffective).toEqual(profiles[0]);
+ expect(test.displays.at(-1)?.display).toEqual(profiles[2]);
+ expect(test.pending.get('switch-projection')).toBeDefined();
+ await test.send();
+ expect(test.displays.at(-1)).toEqual({ current: profiles[2], display: profiles[2], pending: false });
+ });
});
describe('touchUserSendInDb 广播 sessions:patched(device-link 项目归属收敛)', () => {
diff --git a/apps/desktop/src/main/localDb/ipc/sessions.ts b/apps/desktop/src/main/localDb/ipc/sessions.ts
index 4b147db09f..123790e029 100644
--- a/apps/desktop/src/main/localDb/ipc/sessions.ts
+++ b/apps/desktop/src/main/localDb/ipc/sessions.ts
@@ -55,6 +55,7 @@ import {
sessionCreateToRow,
sessionPatchToRow,
persistableSessionEffort,
+ projectSessionRuntimeFields,
normalizeRemoteHostId,
finalizePlainPreview,
} from '../mapper';
@@ -643,8 +644,14 @@ export async function applyAgentSwitchToSessionRow(
if (typeof patch.contextWindow === 'number' && patch.contextWindow > 0) {
setObj.contextWindow = Math.floor(patch.contextWindow);
}
- await db.update(sessions).set(setObj).where(eq(sessions.id, sessionId));
- if (!isOwnerScopeCurrent(ownerScope)) return;
+ // RETURNING keeps the projection tied to this committed write, including axes
+ // omitted by the caller. A later SELECT could observe a newer selection.
+ const [committed] = await db.update(sessions).set(setObj).where(eq(sessions.id, sessionId))
+ .returning({
+ id: sessions.id, agentKind: sessions.agentKind, model: sessions.model,
+ providerId: sessions.providerId, effort: sessions.effort, fastMode: sessions.fastMode,
+ });
+ if (!committed || !isOwnerScopeCurrent(ownerScope)) return;
broadcastSessionPatched(
sessionId,
{
@@ -657,6 +664,9 @@ export async function applyAgentSwitchToSessionRow(
...(typeof patch.contextWindow === 'number' && patch.contextWindow > 0
? { contextWindow: Math.floor(patch.contextWindow) }
: {}),
+ // Publish before the consumed intent is cleared. Otherwise the composer
+ // falls back to runtimeEffective from its last full read.
+ ...projectSessionRuntimeFields({ ...committed, agentKind: normalizeDbAgentKind(committed.agentKind) }),
},
ownerScope,
);
diff --git a/apps/desktop/src/main/localDb/mapper.ts b/apps/desktop/src/main/localDb/mapper.ts
index 9487d4a605..84a9b8e004 100644
--- a/apps/desktop/src/main/localDb/mapper.ts
+++ b/apps/desktop/src/main/localDb/mapper.ts
@@ -92,13 +92,19 @@ type ProjectAutomationConsentInsert = typeof projectAutomationConsents.$inferIns
type ScheduleRunRow = typeof scheduleRuns.$inferSelect;
type ScheduleRunInsert = typeof scheduleRuns.$inferInsert;
-type SessionRuntimeProjector = (session: Session) => Partial<Session>;
+type SessionRuntimeFields = Pick<Session, 'id' | 'agentKind' | 'model' | 'providerId' | 'effort' | 'fastMode'>;
+type SessionRuntimeProjector = (session: SessionRuntimeFields) => Partial<Session>;
let sessionRuntimeProjector: SessionRuntimeProjector | null = null;
export function setSessionRuntimeProjector(projector: SessionRuntimeProjector | null): void {
sessionRuntimeProjector = projector;
}
+/** Full reads and committed route patches must publish the same runtime snapshot. */
+export function projectSessionRuntimeFields(session: SessionRuntimeFields): Partial<Session> {
+ return sessionRuntimeProjector?.(session) ?? {};
+}
+
/**
* SessionRow + 同 session 下 messages 总条数。IPC handler 必须通过 LEFT JOIN + GROUP BY
* 或子查询同时带出 messageCount,再交给 `sessionToCamel`。
@@ -292,7 +298,7 @@ export function sessionToCamel(row: SessionRowWithCount): Session {
hasPendingSessionInterruption(candidate)
? base.activeTurnStartedAt
: null;
- return sessionRuntimeProjector ? { ...base, ...sessionRuntimeProjector(base) } : base;
+ return { ...base, ...projectSessionRuntimeFields(base) };
}
export function messageToCamel(row: MessageRow): Message {
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.ts
index d327336af6..56713ecb46 100644
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@ -974,6 +974,7 @@ import {
deferSessionRuntimeAxisMutation,
getPendingSessionRuntimeMutation,
getSessionRuntimeControlSnapshot,
+ projectSessionRuntimeControl,
isPendingSessionRuntimeRouteExplicit,
mergeSessionRuntimeProfilePatch,
pickSessionRuntimeFallback,
@@ -1175,26 +1176,6 @@ const interruptedTurnAutoResumeGuard = new InterruptedTurnAutoResumeGuard({
let settlePendingSessionRuntimeControlHolder: ((sessionId: string, reason: string) => void) | null =
null;
-function projectSessionRuntimeControl(
- sessionId: string,
- baseline: SessionRuntimeProfile,
-): Partial<RendererSession> {
- const control = getSessionRuntimeControlSnapshot(sessionId);
- const effective = control.effectiveOverride ?? baseline;
- return {
- model: effective.model,
- providerId: effective.providerId,
- // Keep the legacy top-level wire axis string-compatible while explicitly
- // clearing stale effort; runtimeEffective retains the semantic null.
- effort: effective.effort ?? '',
- fastMode: effective.fastMode,
- runtimeGeneration: control.generation,
- runtimeBaseline: baseline,
- runtimeEffective: effective,
- runtimePending: control.pending,
- };
-}
-
// Schedule 不另建重试状态机:真正的恢复仍由 AgentInputCoordinator +
// AutoResumeBookkeeping 独占。这里仅把「这一轮 scheduler run 已被普通自动续跑接管」
// 和「最终仍失败」桥给 runner,让同一个 run 继续等待或正确失败。
diff --git a/apps/desktop/src/main/maker-ipc/sessionRuntimeControl.ts b/apps/desktop/src/main/maker-ipc/sessionRuntimeControl.ts
index 607bd8b9db..f0cdb0af56 100644
--- a/apps/desktop/src/main/maker-ipc/sessionRuntimeControl.ts
+++ b/apps/desktop/src/main/maker-ipc/sessionRuntimeControl.ts
@@ -1,4 +1,5 @@
import type { AgentKind, Effort } from '@cindy/maker-core';
+import type { Session as RendererSession } from '../../renderer/lib/ccAgent.types';
import {
connectedProvidersForAgent,
isModelSelectableForNewRoute,
@@ -30,6 +31,26 @@ export interface SessionRuntimeControlSnapshot {
visitedRoutes: string[];
}
+/** Shared by full session reads and route-change pushes; all axes come from one profile. */
+export function projectSessionRuntimeControl(
+ sessionId: string,
+ baseline: SessionRuntimeProfile,
+): Partial<RendererSession> {
+ const control = getSessionRuntimeControlSnapshot(sessionId);
+ const effective = control.effectiveOverride ?? baseline;
+ return {
+ model: effective.model,
+ providerId: effective.providerId,
+ // The legacy wire axis is string-compatible; the profile preserves null.
+ effort: effective.effort ?? '',
+ fastMode: effective.fastMode,
+ runtimeGeneration: control.generation,
+ runtimeBaseline: baseline,
+ runtimeEffective: effective,
+ runtimePending: control.pending,
+ };
+}
+
export type SessionRuntimeProfilePatch = Partial<
Pick<SessionRuntimeProfile, 'model' | 'providerId' | 'effort' | 'fastMode'>
>;
diff --git a/apps/desktop/src/renderer/__tests__/chatInputModelSelectorRouting.test.ts b/apps/desktop/src/renderer/__tests__/chatInputModelSelectorRouting.test.ts
index f9a4345cdf..8ffb4d2269 100644
--- a/apps/desktop/src/renderer/__tests__/chatInputModelSelectorRouting.test.ts
+++ b/apps/desktop/src/renderer/__tests__/chatInputModelSelectorRouting.test.ts
@@ -352,9 +352,10 @@ describe('ChatInput model source switching wiring', () => {
expect(selectorBlock).toContain(
'engineMarkVendor={unifiedPanelActive ? composerEngineMarkVendor : null}',
);
- expect(chatInputSource).toContain(
- 'resolveModelSelectorAgentIdentity(runtimeAgentKind, composerSelection.pending ? composerSelection.display.agentKind : null)?.vendorKey ??',
- );
+ expect(chatInputSource.includes('runtimeAgentKind ? composerSelection.current.agentKind : runtimeAgentKind')).toBe(true);
+ expect(chatInputSource.includes('composerSelection.pending ? composerSelection.display.agentKind : null')).toBe(true);
+ expect(chatInputSource.includes('composerAgentIdentity?.vendorKey ?? null')).toBe(true);
+ expect(selectorBlock).toContain('? composerAgentIdentity');
// 草稿没有 session 身份可言,当前引擎就是 vendorKey。
expect(chatInputSource).toContain(': (vendorKey ?? null);');
});
diff --git a/apps/desktop/src/renderer/__tests__/fastModeMirrorOnPatched.test.ts b/apps/desktop/src/renderer/__tests__/fastModeMirrorOnPatched.test.ts
index d70762ea7c..169e7a1625 100644
--- a/apps/desktop/src/renderer/__tests__/fastModeMirrorOnPatched.test.ts
+++ b/apps/desktop/src/renderer/__tests__/fastModeMirrorOnPatched.test.ts
@@ -76,6 +76,33 @@ describe('makerChatStore.mirrorSessionFields', () => {
);
});
+ it('keeps a newer model choice for the same agent until the host explicitly consumes it', () => {
+ const s = sid();
+ makerChatStore.setSessionRuntime(s, { agentKind: 'claude-code' });
+ makerChatStore.noteAgentSwitchIntent(s, 'pi', { model: 'newer-model', providerId: 'newer-source' });
+ const revision = makerChatStore.getAgentSwitchIntentRev(s);
+ makerChatStore.mirrorSessionFields(s, {
+ agentKind: 'pi', providerId: 'xai',
+ runtimeEffective: { agentKind: 'pi', model: 'grok-4.6', providerId: 'xai', effort: 'low', fastMode: false },
+ });
+ expect(makerChatStore.getSnapshot(s).agentKind).toBe('pi');
+ expect(makerChatStore.getSnapshot(s).sessionProviderId).toBe('xai');
+ expect(makerChatStore.getAgentSwitchIntent(s)).toMatchObject({ model: 'newer-model', providerId: 'newer-source' });
+ expect(makerChatStore.getAgentSwitchIntentRev(s)).toBe(revision);
+ makerChatStore.mirrorSessionFields(s, { agentSwitchIntent: null });
+ expect(makerChatStore.getAgentSwitchIntent(s)).toBeNull();
+ });
+
+ it('does not infer consumption when a patch explicitly retains an intent for the same agent', () => {
+ const s = sid();
+ makerChatStore.mirrorSessionFields(s, {
+ agentKind: 'pi',
+ agentSwitchIntent: { targetAgentKind: 'pi', model: 'next-pi-model', providerId: null },
+ });
+ expect(makerChatStore.getSnapshot(s).agentKind).toBe('pi');
+ expect(makerChatStore.getAgentSwitchIntent(s)?.model).toBe('next-pi-model');
+ });
+
it('mirrors an explicit same-agent provider patch into later createOpts', () => {
const s = sid();
makerChatStore.mirrorSessionFields(s, { providerId: 'xd' });
diff --git a/apps/desktop/src/renderer/__tests__/localCatalogSnapshot.test.ts b/apps/desktop/src/renderer/__tests__/localCatalogSnapshot.test.ts
index 0cf59d4de5..16472cc352 100644
--- a/apps/desktop/src/renderer/__tests__/localCatalogSnapshot.test.ts
+++ b/apps/desktop/src/renderer/__tests__/localCatalogSnapshot.test.ts
@@ -9,6 +9,7 @@ const mocks = vi.hoisted(() => ({
loadCapabilities: vi.fn(),
beginProviders: vi.fn(),
commitProviders: vi.fn(),
+ failProviders: vi.fn(),
providersCurrent: vi.fn(),
loadProviders: vi.fn(),
initializeVisibility: vi.fn(),
@@ -25,6 +26,7 @@ vi.mock('@/hooks/useAgentCapabilities', () => ({
vi.mock('@/lib/providersSnapshotStore', () => ({
beginProvidersRefresh: mocks.beginProviders,
commitProvidersSnapshot: mocks.commitProviders,
+ failProvidersRefresh: mocks.failProviders,
isProvidersRefreshCurrent: mocks.providersCurrent,
loadProvidersSnapshot: mocks.loadProviders,
}));
@@ -77,6 +79,7 @@ describe('refreshLocalCatalogSnapshot', () => {
expect(mocks.commitProviders).not.toHaveBeenCalled();
expect(mocks.commitCapabilities).not.toHaveBeenCalled();
expect(mocks.warn).toHaveBeenCalledOnce();
+ expect(mocks.failProviders).toHaveBeenCalledWith(1);
});
it('keeps the last valid snapshot when capabilities loading fails', async () => {
@@ -102,6 +105,7 @@ describe('refreshLocalCatalogSnapshot', () => {
await Promise.all([first, latest]);
expect(mocks.loadProviders).toHaveBeenCalledTimes(2);
expect(mocks.commitProviders).toHaveBeenCalledOnce();
+ expect(mocks.failProviders).not.toHaveBeenCalled();
});
it('does not commit capabilities when the provider snapshot owner is stale', async () => {
diff --git a/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroups.test.tsx b/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroups.test.tsx
index 7caf149edd..98e6cebe0a 100644
--- a/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroups.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroups.test.tsx
@@ -24,6 +24,8 @@ vi.mock('react-i18next', async (importOriginal) => ({
'settings.providers.xd.title': 'Cindy AI',
'settings.providers.xd.accountTier.free': '免费版',
'newChat.modelSelector.trigger.placeholder': '选择模型',
+ 'newChat.modelSelector.trigger.loading': '正在读取模型…',
+ 'newChat.modelSelector.trigger.unresolved': '模型信息暂不可用',
'newChat.modelSelector.trigger.aria': `Select model. Current: ${options?.model ?? ''}`,
'newChat.modelSelector.trigger.ariaWithEffort': `Select model. Current: ${options?.model ?? ''}, effort: ${options?.effort ?? ''}`,
'newChat.modelSelector.modelListAria': '模型列表',
@@ -221,10 +223,10 @@ const providersRef = vi.hoisted(() => {
},
},
] as unknown[];
- return { DEFAULT_PROVIDERS, providers: DEFAULT_PROVIDERS };
+ return { DEFAULT_PROVIDERS, providers: DEFAULT_PROVIDERS, loading: false, loadFailed: false };
});
vi.mock('@/hooks/useProviders', () => ({
- useProviders: () => ({ providers: providersRef.providers, providerOrder: [] }),
+ useProviders: () => ({ providers: providersRef.providers, providerOrder: [], loading: providersRef.loading, loadFailed: providersRef.loadFailed }),
}));
vi.mock('@/hooks/useDeviceProviders', () => ({
@@ -278,6 +280,8 @@ beforeEach(() => {
floatingUiMocks.size.mockClear();
floatingUiMocks.useFloating.mockClear();
providersRef.providers = providersRef.DEFAULT_PROVIDERS;
+ providersRef.loading = false;
+ providersRef.loadFailed = false;
modelAccessState.accountTier = null;
visibleModelsRef.models = [];
(window as unknown as { electronAPI: unknown }).electronAPI = {
@@ -409,15 +413,63 @@ describe('model selector display identity during switches', () => {
expect(trigger().textContent).not.toContain(change.modelId ?? props.modelId);
});
- it.each([false, true])('uses the placeholder for an unknown saved model (disconnected=%s)', (sourceDisconnected) => {
+ it.each([false, true])('distinguishes an unknown saved model from an empty selection (disconnected=%s)', (sourceDisconnected) => {
providersRef.providers = [];
render(<ModelSelector {...props} sourceDisconnected={sourceDisconnected} />);
- expect(trigger().textContent).toContain('选择模型');
+ expect(trigger().textContent).toContain('模型信息暂不可用');
+ expect(trigger().textContent).not.toContain('选择模型');
expect(trigger().textContent).not.toContain(props.modelId);
expect(trigger().getAttribute('title')).not.toContain(props.modelId);
expect(trigger().getAttribute('aria-label')).not.toContain(props.modelId);
});
+ it('shows loading for a selected model until its catalog arrives, and keeps the name through refresh', () => {
+ providersRef.providers = [];
+ providersRef.loading = true;
+ const { rerender } = render(<ModelSelector {...props} />);
+ expect(trigger().textContent).toContain('正在读取模型…');
+ providersRef.providers = [provider];
+ providersRef.loading = false;
+ rerender(<ModelSelector {...props} />);
+ expect(trigger().textContent).toContain('GPT-6');
+ providersRef.providers = [];
+ providersRef.loading = true;
+ rerender(<ModelSelector {...props} />);
+ expect(trigger().textContent).toContain('GPT-6');
+ expect(trigger().textContent).not.toContain('正在读取模型…');
+ });
+
+ it('still prompts for a model when there is no selection', () => {
+ render(<ModelSelector {...props} modelId="" />);
+ expect(trigger().textContent).toContain('选择模型');
+ });
+
+ it('settles a failed first catalog load, then recovers through retry without clearing the selection', () => {
+ providersRef.providers = [];
+ providersRef.loading = true;
+ const { rerender } = render(<ModelSelector {...props} />);
+ expect(trigger().textContent).toContain('正在读取模型…');
+
+ providersRef.loadFailed = true;
+ rerender(<ModelSelector {...props} />);
+ expect(trigger().textContent).toContain('模型信息暂不可用');
+ expect(trigger().textContent).not.toContain('正在读取模型…');
+ expect(trigger().textContent).not.toContain('选择模型');
+
+ providersRef.loadFailed = false;
+ rerender(<ModelSelector {...props} />);
+ expect(trigger().textContent).toContain('正在读取模型…');
+ providersRef.providers = [provider];
+ providersRef.loading = false;
+ rerender(<ModelSelector {...props} />);
+ expect(trigger().textContent).toContain('GPT-6');
+
+ providersRef.providers = [];
+ providersRef.loadFailed = true;
+ rerender(<ModelSelector {...props} />);
+ expect(trigger().textContent).toContain('GPT-6');
+ });
+
it('preserves an explicitly supplied diagnostic label', () => {
providersRef.providers = [];
render(<ModelSelector {...props} unknownModelLabel={() => 'Unavailable saved model'} sourceDisconnected />);
diff --git a/apps/desktop/src/renderer/__tests__/modelSelectorTriggerVariant.test.ts b/apps/desktop/src/renderer/__tests__/modelSelectorTriggerVariant.test.ts
index fdb0ab2663..efa69ed074 100644
--- a/apps/desktop/src/renderer/__tests__/modelSelectorTriggerVariant.test.ts
+++ b/apps/desktop/src/renderer/__tests__/modelSelectorTriggerVariant.test.ts
@@ -40,6 +40,8 @@ vi.mock('react-i18next', async (importOriginal) => ({
'settings.providers.anthropic.title': 'Anthropic',
'settings.providers.xd.title': 'Cindy AI',
'newChat.modelSelector.trigger.placeholder': '选择模型',
+ 'newChat.modelSelector.trigger.loading': '正在读取模型…',
+ 'newChat.modelSelector.trigger.unresolved': '模型信息暂不可用',
'newChat.modelSelector.trigger.agent.claudeCode': 'Claude Code',
'newChat.modelSelector.trigger.agent.codex': 'Codex',
'newChat.modelSelector.modelListAria': '模型列表',
@@ -1069,7 +1071,7 @@ describe('ModelSelector trigger variants', () => {
onProviderChange: vi.fn(), onNavigateToProviders: vi.fn(), onReconnectSource: navigate, unifiedPanel: true,
}));
const trigger = screen.getByRole('button', { name: connected ? /模型不可用/ : /已断开/ });
- expect(trigger.textContent).toContain(connected ? '选择模型' : 'GPT-6 Astra');
+ expect(trigger.textContent).toContain(connected ? '模型信息暂不可用' : 'GPT-6 Astra');
expect(trigger.textContent).not.toContain('gpt-6-astra');
fireEvent.click(trigger);
const recovery = await screen.findByRole('button', { name: connected ? '管理来源' : '重新连接' });
@@ -1780,7 +1782,7 @@ describe('ModelSelector trigger variants', () => {
expect(trigger.textContent).not.toContain('high');
});
- it('localizes the placeholder when the current model is unavailable', () => {
+ it('localizes missing model metadata without presenting an empty selection', () => {
render(
React.createElement(ModelSelector, {
modelId: 'missing-model',
@@ -1792,7 +1794,7 @@ describe('ModelSelector trigger variants', () => {
}),
);
- expect(screen.getByRole('button', { name: /选择模型/ }).textContent).toContain('选择模型');
+ expect(screen.getByRole('button', { name: /模型信息暂不可用/ }).textContent).toContain('模型信息暂不可用');
});
it('can hide model effort and Fast editing controls for model-id-only settings', () => {
diff --git a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx
index de4ad74bdc..f1728b622e 100644
--- a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx
@@ -6912,8 +6912,12 @@ export function ChatInput({
// 身份未加载时 resolveModelSelectorAgentIdentity 返回 undefined → 不画
// (绝不拿 vendorKey 的 Claude Code 回退冒充,见 runtimeAgentKind 的 prop 说明);
// · 草稿:没有 session 身份可言,当前引擎就是 vendorKey 本身。
+ const composerAgentIdentity = resolveModelSelectorAgentIdentity(
+ runtimeAgentKind ? composerSelection.current.agentKind : runtimeAgentKind,
+ composerSelection.pending ? composerSelection.display.agentKind : null,
+ );
const composerEngineMarkVendor = sessionId
- ? (resolveModelSelectorAgentIdentity(runtimeAgentKind, composerSelection.pending ? composerSelection.display.agentKind : null)?.vendorKey ?? null)
+ ? (composerAgentIdentity?.vendorKey ?? null)
: (vendorKey ?? null);
/**
@@ -8847,10 +8851,7 @@ export function ChatInput({
// 供重试时也不会长期隐藏身份或把目标冒充为当前 Agent。
agentIdentity={
sessionId
- ? resolveModelSelectorAgentIdentity(
- runtimeAgentKind,
- composerSelection.pending ? composerSelection.display.agentKind : null,
- )
+ ? composerAgentIdentity
: undefined
}
// 统一模型选择器(M5 新会话 / M6 会话内)。composer 是它的两个真实入口;
diff --git a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx
index 0bfb7c325d..09a2cd6989 100644
--- a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx
@@ -749,7 +749,7 @@ interface ModelSelectorProps {
/** 点击当前已选模型行时打开该行的配置浮层,而不是直接收起选择器。 */
selectedRowClickOpensConfiguration?: boolean;
/**
- * modelId 非空但不在可见清单时的 trigger 文案(默认落「选择模型」占位符)。
+ * modelId 非空但不在可见清单时的诊断文案(默认提示模型信息暂不可用)。
* 供展示已持久化偏好的调用方给出诊断性文案,避免把「存过但当前不可用」显示成「没选过」。
*/
unknownModelLabel?: (modelId: string) => string;
@@ -3386,6 +3386,10 @@ export function ModelSelector({
});
const remoteModelLoading = !!deviceId && remoteModelListStatus === 'loading';
const remoteModelLoadFailed = !!deviceId && remoteModelListStatus === 'error';
+ const localModelLoading = !deviceId && !(!providersOverride && localProviders.loadFailed) && (
+ (!providersOverride && localProviders.loading) ||
+ (agentKind === 'codex' ? codex.loading : agentKind === 'pi' ? pi.loading : cc.loading)
+ );
const visibleModels = useMemo(
() =>
selectVisibleModels({
@@ -3442,7 +3446,11 @@ export function ModelSelector({
(remoteModelLoading ? t('newChat.modelSelector.remoteLoading') : null) ??
(remoteModelLoadFailed ? t('newChat.modelSelector.remoteLoadFailedShort') : null) ??
(unknownLabel !== '' ? unknownLabel : null) ??
- t('newChat.modelSelector.trigger.placeholder'));
+ (modelId
+ ? t(localModelLoading
+ ? 'newChat.modelSelector.trigger.loading'
+ : 'newChat.modelSelector.trigger.unresolved')
+ : t('newChat.modelSelector.trigger.placeholder')));
const agentName =
agentIdentity && !fallbackOption?.active
? agentIdentity.vendorKey === 'cc'
diff --git a/apps/desktop/src/renderer/hooks/__tests__/useProviders.test.tsx b/apps/desktop/src/renderer/hooks/__tests__/useProviders.test.tsx
index 5be2e85875..0b06c23c1e 100644
--- a/apps/desktop/src/renderer/hooks/__tests__/useProviders.test.tsx
+++ b/apps/desktop/src/renderer/hooks/__tests__/useProviders.test.tsx
@@ -18,6 +18,7 @@ const mocks = vi.hoisted(() => ({
} | null) => void),
refreshLocalCatalogSnapshot: vi.fn(async () => true),
getCachedProvidersSnapshot: vi.fn(),
+ hasProvidersSnapshotLoadFailed: vi.fn(() => false),
subscribeProvidersSnapshot: vi.fn(),
}));
@@ -31,6 +32,7 @@ vi.mock('@/lib/localCatalogSnapshot', () => ({
vi.mock('@/lib/providersSnapshotStore', () => ({
getCachedProvidersSnapshot: mocks.getCachedProvidersSnapshot,
+ hasProvidersSnapshotLoadFailed: mocks.hasProvidersSnapshotLoadFailed,
subscribeProvidersSnapshot: mocks.subscribeProvidersSnapshot,
}));
@@ -39,6 +41,7 @@ import { useProviders } from '../useProviders';
describe('useProviders', () => {
beforeEach(() => {
vi.clearAllMocks();
+ mocks.hasProvidersSnapshotLoadFailed.mockReturnValue(false);
mocks.authState.dataOwnerId = 'owner-a';
mocks.cachedOwnerId = 'owner-a';
mocks.cachedOwnerGeneration = 1;
@@ -110,4 +113,26 @@ describe('useProviders', () => {
expect(result.current.ownerGeneration).toBe(2);
expect(result.current.loading).toBe(false);
});
+
+ it('updates failure and retry status even when no snapshot has ever loaded', () => {
+ mocks.getCachedProvidersSnapshot.mockReturnValue(null);
+ const { result } = renderHook(() => useProviders());
+ expect(result.current.loading).toBe(true);
+ expect(result.current.loadFailed).toBe(false);
+
+ act(() => {
+ mocks.hasProvidersSnapshotLoadFailed.mockReturnValue(true);
+ mocks.latestListener?.(null);
+ });
+ expect(result.current.loadFailed).toBe(true);
+ // Keep existing readiness guards closed until a usable snapshot arrives.
+ expect(result.current.loading).toBe(true);
+
+ act(() => {
+ mocks.hasProvidersSnapshotLoadFailed.mockReturnValue(false);
+ mocks.latestListener?.(null);
+ });
+ expect(result.current.loadFailed).toBe(false);
+ expect(result.current.loading).toBe(true);
+ });
});
diff --git a/apps/desktop/src/renderer/hooks/useProviders.ts b/apps/desktop/src/renderer/hooks/useProviders.ts
index c7cf7506f2..6f7fc84286 100644
--- a/apps/desktop/src/renderer/hooks/useProviders.ts
+++ b/apps/desktop/src/renderer/hooks/useProviders.ts
@@ -18,6 +18,7 @@ import { getDataOwnerGeneration } from '@/contexts/dataOwnerGeneration';
import { refreshLocalCatalogSnapshot } from '@/lib/localCatalogSnapshot';
import {
getCachedProvidersSnapshot,
+ hasProvidersSnapshotLoadFailed,
subscribeProvidersSnapshot,
type ProvidersSnapshot,
} from '@/lib/providersSnapshotStore';
@@ -27,6 +28,8 @@ export interface UseProvidersReturn {
providerOrder: string[];
ownerGeneration: number | null;
loading: boolean;
+ /** A refresh failed; loading still means no usable snapshot for existing readiness guards. */
+ loadFailed: boolean;
refetch: () => Promise<boolean>;
}
@@ -44,9 +47,9 @@ export interface UseProvidersReturn {
*/
export function useProviders(): UseProvidersReturn {
const { dataOwnerId } = getDataOwnerGeneration();
- const [snapshot, setSnapshot] = useState<ProvidersSnapshot | null>(() =>
- getCachedProvidersSnapshot(),
- );
+ const [{ snapshot }, setSnapshotState] = useState(() => ({
+ snapshot: getCachedProvidersSnapshot(),
+ }));
// AuthContext 会先同步切换全局 data owner 代际、再提交 React state。owner 改变后的
// 首次 render 不能继续暴露旧 state;只接受同 owner state 或 owner-scoped 模块缓存。
@@ -60,8 +63,9 @@ export function useProviders(): UseProvidersReturn {
}, []);
useEffect(() => {
- setSnapshot(getCachedProvidersSnapshot());
- const onRefresh = (next: ProvidersSnapshot | null): void => setSnapshot(next);
+ setSnapshotState({ snapshot: getCachedProvidersSnapshot() });
+ // Status-only notifications must render even when the snapshot is still null.
+ const onRefresh = (next: ProvidersSnapshot | null): void => setSnapshotState({ snapshot: next });
return subscribeProvidersSnapshot(onRefresh);
}, [dataOwnerId]);
@@ -70,6 +74,7 @@ export function useProviders(): UseProvidersReturn {
providerOrder: currentSnapshot?.providerOrder ?? [],
ownerGeneration: currentSnapshot?.ownerGeneration ?? null,
loading: currentSnapshot == null,
+ loadFailed: hasProvidersSnapshotLoadFailed(),
refetch,
};
}
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index 9bfae40f73..5af34d921b 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -8063,6 +8063,8 @@
"trigger": {
"currentAndNext": "Current: {{current}}\nNext message: {{next}}",
"placeholder": "Select model",
+ "loading": "Loading model…",
+ "unresolved": "Model Details Unavailable",
"aria": "Select model. Current: {{model}}",
"ariaWithEffort": "Select model. Current: {{model}}, effort: {{effort}}",
"pendingAria": "Select model. Next message: {{agent}} · {{model}}",
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index 98278b3cbe..3c9821c1ae 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -8061,6 +8061,8 @@
"trigger": {
"currentAndNext": "現在:{{current}}\n次のメッセージ:{{next}}",
"placeholder": "モデルを選択",
+ "loading": "モデルを読み込み中…",
+ "unresolved": "モデル情報を取得できません",
"aria": "モデルを選択。現在:{{model}}",
"ariaWithEffort": "モデルを選択。現在:{{model}}、推論強度:{{effort}}",
"pendingAria": "モデルを選択。次のメッセージ:{{agent}} · {{model}}",
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index 7a3ea30b5f..67cec27490 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -8061,6 +8061,8 @@
"trigger": {
"currentAndNext": "현재: {{current}}\n다음 메시지: {{next}}",
"placeholder": "모델 선택",
+ "loading": "모델을 불러오는 중…",
+ "unresolved": "모델 정보를 사용할 수 없음",
"aria": "모델 선택. 현재: {{model}}",
"ariaWithEffort": "모델 선택. 현재: {{model}}, 추론 강도: {{effort}}",
"pendingAria": "모델 선택. 다음 메시지: {{agent}} · {{model}}",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
index d18582bc55..9e58c7a9ca 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -8061,6 +8061,8 @@
"trigger": {
"currentAndNext": "当前:{{current}}\n下条消息:{{next}}",
"placeholder": "选择模型",
+ "loading": "正在读取模型…",
+ "unresolved": "模型信息暂不可用",
"aria": "选择模型。当前:{{model}}",
"ariaWithEffort": "选择模型。当前:{{model}},推理强度:{{effort}}",
"pendingAria": "选择模型。下条消息:{{agent}} · {{model}}",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
index 9720132331..d07936276b 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -8060,6 +8060,8 @@
"trigger": {
"currentAndNext": "目前:{{current}}\n下一則訊息:{{next}}",
"placeholder": "選擇模型",
+ "loading": "正在讀取模型…",
+ "unresolved": "模型資訊暫時無法使用",
"aria": "選擇模型。當前:{{model}}",
"ariaWithEffort": "選擇模型。當前:{{model}},推理強度:{{effort}}",
"pendingAria": "選擇模型。下條訊息:{{agent}} · {{model}}",
diff --git a/apps/desktop/src/renderer/lib/__tests__/providersSnapshotStore.test.ts b/apps/desktop/src/renderer/lib/__tests__/providersSnapshotStore.test.ts
index 9360a569c0..a184483bb6 100644
--- a/apps/desktop/src/renderer/lib/__tests__/providersSnapshotStore.test.ts
+++ b/apps/desktop/src/renderer/lib/__tests__/providersSnapshotStore.test.ts
@@ -9,6 +9,8 @@ import {
__testing,
beginProvidersRefresh,
commitProvidersSnapshot,
+ failProvidersRefresh,
+ hasProvidersSnapshotLoadFailed,
getCachedProvidersSnapshot,
invalidateProvidersSnapshot,
isProvidersRefreshCurrent,
@@ -21,6 +23,42 @@ describe('providersSnapshotStore owner isolation', () => {
__testing.reset();
});
+ it('notifies failure without a snapshot, clears it for retry, and ignores superseded failures', () => {
+ const listener = vi.fn();
+ const unsubscribe = subscribeProvidersSnapshot(listener);
+ const first = beginProvidersRefresh();
+ failProvidersRefresh(first);
+ expect(hasProvidersSnapshotLoadFailed()).toBe(true);
+ expect(getCachedProvidersSnapshot()).toBeNull();
+ expect(listener).toHaveBeenLastCalledWith(null);
+
+ const retry = beginProvidersRefresh();
+ expect(hasProvidersSnapshotLoadFailed()).toBe(false);
+ expect(listener).toHaveBeenCalledTimes(2);
+ failProvidersRefresh(first);
+ expect(hasProvidersSnapshotLoadFailed()).toBe(false);
+ expect(listener).toHaveBeenCalledTimes(2);
+ const snapshot = { dataOwnerId: null, ownerGeneration: 1, providers: [], providerOrder: [] };
+ expect(commitProvidersSnapshot(retry, snapshot)).toBe(true);
+ failProvidersRefresh(beginProvidersRefresh());
+ expect(hasProvidersSnapshotLoadFailed()).toBe(true);
+ expect(getCachedProvidersSnapshot()).toBe(snapshot);
+ unsubscribe();
+ });
+
+ it('does not expose or accept a failure from the previous owner', () => {
+ setDataOwnerGeneration('owner-a');
+ const first = beginProvidersRefresh();
+ failProvidersRefresh(first);
+ expect(hasProvidersSnapshotLoadFailed()).toBe(true);
+ setDataOwnerGeneration('owner-b');
+ expect(hasProvidersSnapshotLoadFailed()).toBe(false);
+ failProvidersRefresh(first);
+ expect(hasProvidersSnapshotLoadFailed()).toBe(false);
+ invalidateProvidersSnapshot();
+ expect(hasProvidersSnapshotLoadFailed()).toBe(false);
+ });
+
it('hides another owner cache and rejects an in-flight result after owner changes', () => {
const ownerAProvider = { id: 'owner-a-provider' } as ProviderView;
const ownerBProvider = { id: 'owner-b-provider' } as ProviderView;
diff --git a/apps/desktop/src/renderer/lib/localCatalogSnapshot.ts b/apps/desktop/src/renderer/lib/localCatalogSnapshot.ts
index 1a799c53d0..acf7be2506 100644
--- a/apps/desktop/src/renderer/lib/localCatalogSnapshot.ts
+++ b/apps/desktop/src/renderer/lib/localCatalogSnapshot.ts
@@ -19,6 +19,7 @@ import {
import {
beginProvidersRefresh,
commitProvidersSnapshot,
+ failProvidersRefresh,
isProvidersRefreshCurrent,
loadProvidersSnapshot,
} from '@/lib/providersSnapshotStore';
@@ -67,7 +68,10 @@ export async function refreshLocalCatalogSnapshot(): Promise<boolean> {
);
// Failed persistence/locking must reach preload's retry loop. Waiting for another
// renderer's preference write must not publish a stale catalog either.
- if (!initialized || !isCurrent()) return false;
+ if (!initialized || !isCurrent()) {
+ failProvidersRefresh(providersGeneration);
+ return false;
+ }
// 两次提交均为同步通知;React 会把同一事件循环内的 hook 更新批处理到同一帧。
commitLocalCapabilitiesSnapshot(capabilitiesGeneration, capabilities);
@@ -75,6 +79,7 @@ export async function refreshLocalCatalogSnapshot(): Promise<boolean> {
return true;
} catch (error) {
if (refreshGeneration === generation) {
+ failProvidersRefresh(providersGeneration);
log.warn('local catalog snapshot refresh failed; keeping last valid snapshot', error);
}
return false;
diff --git a/apps/desktop/src/renderer/lib/makerChatStore.ts b/apps/desktop/src/renderer/lib/makerChatStore.ts
index fedf122e0e..98cedfd21e 100644
--- a/apps/desktop/src/renderer/lib/makerChatStore.ts
+++ b/apps/desktop/src/renderer/lib/makerChatStore.ts
@@ -16329,6 +16329,7 @@ function mirrorSessionFields(
fastMode?: unknown;
planModeEnabled?: unknown;
agentKind?: unknown;
+ runtimeEffective?: unknown;
providerId?: unknown;
agentSwitchIntent?: unknown;
agentSwitchIntentCanceled?: unknown;
@@ -16350,7 +16351,11 @@ function mirrorSessionFields(
if (patch.agentKind === 'cc' || patch.agentKind === 'codex' || patch.agentKind === 'pi') {
const nextKind = dbToMakerAgentKind(patch.agentKind);
setState(sessionId, (s) => {
- const intentApplied = s.agentSwitchIntent?.target === nextKind;
+ // New hosts publish the full runtime snapshot before explicitly clearing
+ // the consumed intent with CAS. An agent-kind match alone may belong to
+ // an older switch to the same engine, not the user's latest model choice.
+ const intentApplied = !('runtimeEffective' in patch) &&
+ !('agentSwitchIntent' in patch) && s.agentSwitchIntent?.target === nextKind;
if (s.agentKind === nextKind && !intentApplied) return s;
return {
...s,
diff --git a/apps/desktop/src/renderer/lib/providersSnapshotStore.ts b/apps/desktop/src/renderer/lib/providersSnapshotStore.ts
index be6cd1a51d..5f6c655951 100644
--- a/apps/desktop/src/renderer/lib/providersSnapshotStore.ts
+++ b/apps/desktop/src/renderer/lib/providersSnapshotStore.ts
@@ -26,8 +26,20 @@ export interface ProvidersSnapshot {
let cachedProviders: ProvidersSnapshot | null = null;
let providersGeneration = 0;
+let failedRefresh: ProvidersRefreshToken | null = null;
const providerListeners = new Set<(snapshot: ProvidersSnapshot | null) => void>();
+/** Failure is scoped to the latest refresh and owner; absence of a snapshot alone is not progress. */
+export function hasProvidersSnapshotLoadFailed(): boolean {
+ return failedRefresh !== null && isProvidersRefreshCurrent(failedRefresh);
+}
+
+export function failProvidersRefresh(token: ProvidersRefreshToken): void {
+ if (!isProvidersRefreshCurrent(token)) return;
+ failedRefresh = token;
+ for (const listener of providerListeners) listener(getCachedProvidersSnapshot());
+}
+
/** 返回当前 data owner 最近一次完整 provider 快照;未加载或归属不符时为 null。 */
export function getCachedProvidersSnapshot(): ProvidersSnapshot | null {
const { dataOwnerId } = getDataOwnerGeneration();
@@ -44,6 +56,7 @@ export function subscribeProvidersSnapshot(
/** Owner 切换时同步清空旧快照,并通知已挂载的消费者立即隐藏旧 owner 数据。 */
export function invalidateProvidersSnapshot(): void {
+ failedRefresh = null;
cachedProviders = null;
providersGeneration += 1;
for (const listener of providerListeners) listener(null);
@@ -51,7 +64,12 @@ export function invalidateProvidersSnapshot(): void {
/** 为一次 provider 快照读取分配代际;更早请求完成后不得再覆盖缓存。 */
export function beginProvidersRefresh(): ProvidersRefreshToken {
+ const wasFailed = hasProvidersSnapshotLoadFailed();
+ failedRefresh = null;
providersGeneration += 1;
+ if (wasFailed) {
+ for (const listener of providerListeners) listener(getCachedProvidersSnapshot());
+ }
return {
generation: providersGeneration,
owner: getDataOwnerGeneration(),
@@ -86,6 +104,7 @@ export function commitProvidersSnapshot(
next: ProvidersSnapshot,
): boolean {
if (!isProvidersRefreshCurrent(token, next)) return false;
+ failedRefresh = null;
cachedProviders = next;
for (const listener of providerListeners) listener(next);
return true;
@@ -93,6 +112,7 @@ export function commitProvidersSnapshot(
export const __testing = {
reset(): void {
+ failedRefresh = null;
cachedProviders = null;
providersGeneration = 0;
},