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(orca): hide local models with no enabled provider from list_available_models

Zhang Yunjin9db0250fc2a6
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaProviderRoutingSnapshotWiring.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaProviderRoutingSnapshotWiring.test.ts
index 1bd54052e5..9726c455ed 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaProviderRoutingSnapshotWiring.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaProviderRoutingSnapshotWiring.test.ts
@@ -4,7 +4,7 @@ import { resolve } from 'node:path';
import { BUNDLED_CATALOG, buildRegistry, type Catalog } from '@cindy/model-providers';
import { describe, expect, it, vi } from 'vitest';
-import { readOrcaWorkerProviderRoutingContext } from '../orcaProviderRoutingContext.js';
+import { localAvailableModels, readOrcaWorkerProviderRoutingContext } from '../orcaProviderRoutingContext.js';
const registerSource = readFileSync(resolve(__dirname, '..', 'register.ts'), 'utf8').replace(
/\r\n?/g,
@@ -169,3 +169,26 @@ describe('Orca provider routing snapshot wiring', () => {
);
});
});
+
+describe('localAvailableModels (#6970)', () => {
+ it('drops catalog models that no enabled provider offers', () => {
+ const models = localAvailableModels(
+ [
+ { id: 'codex/gpt-6.1-sol', displayName: 'GPT 6.1 Sol' },
+ { id: 'anthropic/claude-opus-5-5', displayName: 'Opus 5.5' },
+ ],
+ [{ id: 'chatgpt', name: 'ChatGPT', models: ['codex/gpt-6.1-sol'] }],
+ (_agent, model) => (model === 'codex/gpt-6.1-sol' ? 'chatgpt' : null),
+ 'claude-code',
+ );
+ // 提供商被关后只剩目录骨架的模型(providers 会是空)不能再暴露给 Lead。
+ expect(models).toEqual([
+ {
+ id: 'codex/gpt-6.1-sol',
+ label: 'GPT 6.1 Sol',
+ providers: [{ id: 'chatgpt', name: 'ChatGPT' }],
+ defaultProviderId: 'chatgpt',
+ },
+ ]);
+ });
+});
diff --git a/apps/desktop/src/main/maker-ipc/orcaProviderRoutingContext.ts b/apps/desktop/src/main/maker-ipc/orcaProviderRoutingContext.ts
index 3db0101b45..b083194897 100644
--- a/apps/desktop/src/main/maker-ipc/orcaProviderRoutingContext.ts
+++ b/apps/desktop/src/main/maker-ipc/orcaProviderRoutingContext.ts
@@ -14,6 +14,7 @@ import type { ProviderService } from '../maker-host/provider-service.js';
import {
providerRouteRequiresExplicitSelection,
type OrcaWorkerProviderRoutingContext,
+ type OrcaWorkerProviderSnapshot,
} from './orcaWorkerCreationService.js';
/** The SSH discovery projection is native OpenAI only and already ordered by remote default. */
@@ -113,6 +114,35 @@ export function deviceAvailableModels(views: ProviderView[], agent: AgentKind):
}));
}
+/**
+ * list_available_models 用:本机某种 Agent 的模型、提供它的来源与默认来源。
+ * 没有任何已启用来源提供的模型(提供商被关/断连后只剩目录骨架)不进返回,
+ * 否则 Lead 会把 `providers: []` 的模型当成仍可选(#6970),与 deviceAvailableModels 口径一致。
+ */
+export function localAvailableModels(
+ availableModels: ReadonlyArray<{ id: string; displayName: string }>,
+ providers: ReadonlyArray<OrcaWorkerProviderSnapshot>,
+ resolveDefaultProviderIdForModel: (agent: AgentKind, model: string) => string | null,
+ agent: AgentKind,
+): Array<{
+ id: string;
+ label: string;
+ providers: Array<{ id: string; name: string }>;
+ defaultProviderId: string | null;
+}> {
+ return availableModels.flatMap((m) => {
+ const modelProviders = providers
+ .filter((provider) => provider.models.includes(m.id))
+ .map((provider) => ({ id: provider.id, name: provider.name }));
+ return modelProviders.length === 0 ? [] : [{
+ id: m.id,
+ label: m.displayName,
+ providers: modelProviders,
+ defaultProviderId: resolveDefaultProviderIdForModel(agent, m.id),
+ }];
+ });
+}
+
/**
* Build the Orca worker route snapshot from one post-claim full catalog.
*
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.ts
index bf88cb1401..3c2c118fa1 100644
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@ -1161,6 +1161,7 @@ import {
import {
deviceAvailableModels,
deviceWorkerRoutingContext,
+ localAvailableModels,
readOrcaWorkerProviderRoutingContext,
sshCodexWorkerRoutingContext,
} from './orcaProviderRoutingContext.js';
@@ -17296,15 +17297,12 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
const caps = maker.getCapabilities(a);
// key 必须区分 pi,否则 pi 模型会被塞进 claude_code 键与 CC 模型混淆。
const key = a === 'codex' ? 'codex' : a === 'pi' ? 'pi' : 'claude_code';
- const providers = providerRouting.availability[a] ?? [];
- result[key] = caps.availableModels.map((m) => ({
- id: m.id,
- label: m.displayName,
- providers: providers
- .filter((provider) => provider.models.includes(m.id))
- .map((provider) => ({ id: provider.id, name: provider.name })),
- defaultProviderId: providerRouting.resolveDefaultProviderIdForModel(a, m.id),
- }));
+ result[key] = localAvailableModels(
+ caps.availableModels,
+ providerRouting.availability[a] ?? [],
+ providerRouting.resolveDefaultProviderIdForModel,
+ a,
+ );
}
return { ok: true, agentDeviceId: null, ...(locations ? { locations } : {}), ...result };
} catch (err) {