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(models): preserve legacy interface metadata across catalog refresh

Chriscad0c38cda42
diff --git a/packages/maker-core/src/agents/claude-code/__tests__/plan-mode.test.ts b/packages/maker-core/src/agents/claude-code/__tests__/plan-mode.test.ts
index 93c861538f..52a46db950 100644
--- a/packages/maker-core/src/agents/claude-code/__tests__/plan-mode.test.ts
+++ b/packages/maker-core/src/agents/claude-code/__tests__/plan-mode.test.ts
@@ -1151,6 +1151,7 @@ describe('ClaudeCodeAgent plan mode', () => {
expect(resolveRemoteClaudeRoute).toHaveBeenCalledWith({
providerId: 'custom-provider',
model: 'custom-model',
+ sessionId: 'session-remote-materialized-route',
});
expect(starts).toHaveLength(1);
const env = starts[0]?.env as Record<string, string> | undefined;
diff --git a/packages/model-providers/src/__tests__/openRouterModelRoute.test.ts b/packages/model-providers/src/__tests__/openRouterModelRoute.test.ts
index 8f62ebfdf7..b6467ba6c1 100644
--- a/packages/model-providers/src/__tests__/openRouterModelRoute.test.ts
+++ b/packages/model-providers/src/__tests__/openRouterModelRoute.test.ts
@@ -34,6 +34,12 @@ it('does not rewrite manual hosts, custom paths, or explicit protocol choices',
['openrouter', 'https://proxy.example/v1', { id: 'model', name: 'Model', api: 'openai-completions' as const }],
['openrouter', 'https://openrouter.ai/api/v1', { id: 'model', name: 'Model', api: 'openai-completions' as const, route: { baseUrl: 'https://openrouter.ai/api/v1', wireProtocol: 'openai-chat' as const, requestPath: '/custom' } }],
[undefined, 'https://openrouter.ai/api/v1', { id: 'model', name: 'Model', api: 'openai-completions' as const }],
- ['openrouter', 'https://openrouter.ai/api/v1', { id: 'model', name: 'Model', api: 'anthropic-messages' as const }],
] as const) expect(providerInterfaceModelRoute(model, 'codex', preset, base)).toBe(model);
+ const explicit = { id: 'model', name: 'Model', api: 'anthropic-messages' as const };
+ const resolved = providerInterfaceModelRoute(explicit, 'codex', 'openrouter', 'https://openrouter.ai/api/v1');
+ expect(resolved).toMatchObject({ ...explicit,
+ route: { baseUrl: 'https://openrouter.ai/api', wireProtocol: 'anthropic-messages' },
+ selectedInterface: { api: 'anthropic-messages' },
+ });
+ expect(explicit).toEqual({ id: 'model', name: 'Model', api: 'anthropic-messages' });
});
diff --git a/packages/model-providers/src/__tests__/piProviderPresets.test.ts b/packages/model-providers/src/__tests__/piProviderPresets.test.ts
index 8a65360905..04b7da482c 100644
--- a/packages/model-providers/src/__tests__/piProviderPresets.test.ts
+++ b/packages/model-providers/src/__tests__/piProviderPresets.test.ts
@@ -34,11 +34,16 @@ describe('Pi supplier connection import', () => {
for (const agent of ['claude-code', 'codex', 'pi'] as const) {
expect(provider.models[agent], `${preset.id}/${agent}`).toHaveLength(rows.length);
rows.forEach((row, index) => {
+ // Cindy's Coding route declarations supersede the imported Pi source
+ // limits; other supplier rows retain their original metadata contract.
+ const kimiCode = preset.id === 'moonshot-kimi-code';
+ const codingWindow = kimiCode && ['k3', 'k3-256k'].includes(row.id);
+ const codingResponses = kimiCode && agent === 'codex' && ['k3', 'k3-256k', 'kimi-for-coding'].includes(row.id);
expect(provider.models[agent]![index], `${preset.id}/${agent}/${row.id}`).toMatchObject({
- id: row.id, api: nativeApis[preset.id]?.[agent] ?? row.execution.pi.api,
+ id: row.id, api: codingResponses ? 'openai-responses' : nativeApis[preset.id]?.[agent] ?? row.execution.pi.api,
...(agent === 'pi' ? { piApi: row.execution.pi.api } : {}),
- ...(row.contextWindow === undefined ? {} : { contextWindow: row.contextWindow }),
- ...(row.maxOutput === undefined ? {} : { maxOutput: row.maxOutput }),
+ ...(row.contextWindow === undefined ? {} : { contextWindow: codingWindow ? 262144 : row.contextWindow }),
+ ...(row.maxOutput === undefined ? {} : { maxOutput: codingWindow ? 262144 : row.maxOutput }),
...(row.supportsImageInput === undefined ? {} : { supportsImageInput: row.supportsImageInput }),
});
});
diff --git a/packages/model-providers/src/providerInterfaceRoutes.ts b/packages/model-providers/src/providerInterfaceRoutes.ts
index 2bd9daef1f..c1be7384d2 100644
--- a/packages/model-providers/src/providerInterfaceRoutes.ts
+++ b/packages/model-providers/src/providerInterfaceRoutes.ts
@@ -145,7 +145,11 @@ export function providerInterfaceModelRoute<T extends ProviderRuntimeModelConfig
}
export function hasDeclaredProviderInterface(model: ProviderRuntimeModelConfig, agent: AgentKind, presetId: string | undefined, baseUrl: string, registry: ModelRegistry = bundledRegistry): boolean {
- return !!presetId && availableModelInterfaces(registry, presetId, model.id, baseUrl, agent)
+ // Older servers cannot declare interface profiles. Retain the bundled proof
+ // for metadata on an already selected route; never fill an empty/retired V6
+ // directory or use this fallback to select a different execution interface.
+ const declarations = registry.schemaVersion < 6 ? bundledRegistry : registry;
+ return !!presetId && availableModelInterfaces(declarations, presetId, model.id, baseUrl, agent)
.some(p => p.api === model.api && clean(p.route.baseUrl) === clean(model.route?.baseUrl ?? baseUrl));
}