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(im): 额度说明的供应商名按运行中会话口径解析

Dash13829d66f791
diff --git a/apps/desktop/src/main/im/shared/__tests__/sessionProviderLabel.test.ts b/apps/desktop/src/main/im/shared/__tests__/sessionProviderLabel.test.ts
new file mode 100644
index 0000000000..da055e105f
--- /dev/null
+++ b/apps/desktop/src/main/im/shared/__tests__/sessionProviderLabel.test.ts
@@ -0,0 +1,89 @@
+/**
+ * 额度说明里的「哪个供应商」必须是任务此刻实际走的那一家 —— 运行中会话口径
+ * (actualSourceIdForModel), 停用 / 退役拷贝不让说明改名或退化成「当前供应商」。
+ */
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import type { ProviderView } from '@cindy/model-providers';
+
+const mocks = vi.hoisted(() => ({
+ row: null as null | { agentKind: string; model: string | null; providerId: string | null },
+ providers: [] as unknown[],
+ live: undefined as undefined | string | null,
+}));
+
+vi.mock('../../../localDb/client/current', () => ({
+ getDbClient: () => ({
+ drizzle: {
+ select: () => ({
+ from: () => ({ where: () => ({ limit: async () => (mocks.row ? [mocks.row] : []) }) }),
+ }),
+ },
+ }),
+}));
+vi.mock('../../../maker-host/createDesktopProviderService', () => ({
+ getDesktopProviderService: () => ({ listProviders: async () => mocks.providers }),
+}));
+vi.mock('../../../maker-host/session-provider-store', () => ({
+ hasSessionProvider: () => mocks.live !== undefined,
+ getSessionProvider: () => mocks.live ?? null,
+}));
+
+const { resolveSessionProviderLabel } = await import('../sessionProviderLabel');
+
+function codexProvider(id: string, name: string, disabled = false): ProviderView {
+ return {
+ id,
+ name,
+ source: 'builtin',
+ agents: ['codex'],
+ auth: { method: 'managed' },
+ routing: { codex: { upstream: 'https://example.test', authStrategy: 'gateway-key' } },
+ models: {
+ codex: [
+ {
+ id: 'gpt-6-astra',
+ name: 'GPT-6 Astra',
+ contextWindow: 200_000,
+ efforts: ['high'],
+ defaultEffort: 'high',
+ ...(disabled ? { disabled: true } : {}),
+ },
+ ],
+ },
+ connected: true,
+ } as ProviderView;
+}
+
+beforeEach(() => {
+ mocks.row = { agentKind: 'codex', model: 'gpt-6-astra', providerId: null };
+ mocks.providers = [codexProvider('openai', 'OpenAI'), codexProvider('xd', 'Cindy AI')];
+ mocks.live = undefined;
+});
+
+describe('resolveSessionProviderLabel', () => {
+ it('names the implicit native default source', async () => {
+ await expect(resolveSessionProviderLabel('s1')).resolves.toBe('OpenAI');
+ });
+
+ it('keeps naming the implicit default when its copy was disabled while the task runs', async () => {
+ // 新路由口径会剔除停用拷贝、落到 Cindy AI —— 说明会把 OpenAI 的花费上限归给别家。
+ mocks.providers = [codexProvider('openai', 'OpenAI', true), codexProvider('xd', 'Cindy AI')];
+ await expect(resolveSessionProviderLabel('s1')).resolves.toBe('OpenAI');
+ });
+
+ it('keeps naming an explicit source whose model was disabled while the task runs', async () => {
+ mocks.row = { agentKind: 'codex', model: 'gpt-6-astra', providerId: 'openai' };
+ mocks.providers = [codexProvider('openai', 'OpenAI', true), codexProvider('xd', 'Cindy AI')];
+ await expect(resolveSessionProviderLabel('s1')).resolves.toBe('OpenAI');
+ });
+
+ it('prefers the in-memory source over the stored one', async () => {
+ mocks.live = 'xd';
+ await expect(resolveSessionProviderLabel('s1')).resolves.toBe('Cindy AI');
+ });
+
+ it('returns null when the task or its model is unknown', async () => {
+ mocks.row = null;
+ await expect(resolveSessionProviderLabel('s1')).resolves.toBeNull();
+ });
+});
diff --git a/apps/desktop/src/main/im/shared/sessionProviderLabel.ts b/apps/desktop/src/main/im/shared/sessionProviderLabel.ts
index 99a46e36e0..46cb31c623 100644
--- a/apps/desktop/src/main/im/shared/sessionProviderLabel.ts
+++ b/apps/desktop/src/main/im/shared/sessionProviderLabel.ts
@@ -5,7 +5,7 @@
* 调用方退回「当前供应商」的说法, 不为一个名字挡住失败消息。
*/
import { eq } from 'drizzle-orm';
-import { effectiveSourceIdForModel } from '@cindy/model-providers';
+import { actualSourceIdForModel } from '@cindy/model-providers';
import { dbToMakerAgentKind } from '../../../shared/agentKindConversion.js';
import { getDbClient } from '../../localDb/client/current';
@@ -28,7 +28,10 @@ export async function resolveSessionProviderLabel(sessionId: string): Promise<st
const providers = await getDesktopProviderService().listProviders({ allowSideEffects: false });
// 内存里的来源比库里新(本轮刚切过、尚未落库时以运行中的为准)。
const selected = hasSessionProvider(sessionId) ? getSessionProvider(sessionId) : row.providerId;
- const providerId = effectiveSourceIdForModel(
+ // 「运行中会话」口径(与实际路由层 provider-route 一致): 停用 / 退役的拷贝仍算数 ——
+ // 运行中的任务不因停用改道, 说明里的供应商必须是真正报额度错的那一家, 不能是
+ // 新路由口径(effectiveSourceIdForModel)过滤后落到的替代来源。
+ const providerId = actualSourceIdForModel(
providers,
selected?.trim() || null,
row.model,