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(codex): retain Kimi images with pre-V6 catalogs

Chrise5d3735febbe
diff --git a/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.ts b/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.ts
index dac5bbf074..5bf95fa81a 100644
--- a/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.ts
@@ -885,14 +885,47 @@ describe('chatBridgeCapabilitiesForRoute', () => {
['https://api.moonshot.ai/v1', 'kimi-k3.1-pro-highspeed'],
['https://api.kimi.com/coding/v1', 'k3.1-pro'],
['https://api.kimi.com/coding/v1', 'k3.1-pro-highspeed'],
+ ['https://api.kimi.com/coding/v1', 'k3'],
+ ['https://api.kimi.com/coding/v1', 'kimi-for-coding'],
])('translates image input for Kimi on its official route: %s / %s', async (upstream, model) => {
const { chatBridgeCapabilitiesForRoute } = await freshCodexProxyHost();
- const capabilities = chatBridgeCapabilitiesForRoute(upstream, model);
+ const { BUNDLED_CATALOG } = await import('@cindy/model-providers');
+ const { setActiveCatalog } = await import('../active-catalog.js');
const imageUrl = 'data:image/png;base64,eA==';
- const translated = translateResponsesRequest({ model, input: [{ type: 'message', role: 'user',
- content: [{ type: 'input_image', image_url: imageUrl }],
- }] }, { capabilities });
- expect(translated.messages).toEqual([{ role: 'user', content: [{ type: 'image_url', image_url: { url: imageUrl } }] }]);
+ try {
+ // V5 servers cannot send interface bindings; existing image routes must survive negotiation.
+ for (const modelRegistry of [BUNDLED_CATALOG.modelRegistry, {
+ schemaVersion: 5 as const, updatedAt: BUNDLED_CATALOG.modelRegistry!.updatedAt, models: [],
+ }]) {
+ setActiveCatalog({ ...BUNDLED_CATALOG, modelRegistry });
+ const capabilities = chatBridgeCapabilitiesForRoute(upstream, model);
+ const translated = translateResponsesRequest({ model, input: [{ type: 'message', role: 'user',
+ content: [{ type: 'input_image', image_url: imageUrl }],
+ }] }, { capabilities });
+ expect(translated.messages).toEqual([{ role: 'user', content: [{ type: 'image_url', image_url: { url: imageUrl } }] }]);
+ }
+ } finally {
+ setActiveCatalog(BUNDLED_CATALOG);
+ }
+ });
+
+ it.each(['empty', 'retired'] as const)('honors %s V6 declarations instead of restoring bundled image support', async (state) => {
+ const { chatBridgeCapabilitiesForRoute } = await freshCodexProxyHost();
+ const { BUNDLED_CATALOG } = await import('@cindy/model-providers');
+ const { setActiveCatalog } = await import('../active-catalog.js');
+ const catalog = structuredClone(BUNDLED_CATALOG);
+ const registry = catalog.modelRegistry!;
+ registry.interfaceProfiles = state === 'empty' ? [] : registry.interfaceProfiles!.map(profile => ({ ...profile, retired: true }));
+ try {
+ setActiveCatalog(catalog);
+ const capabilities = chatBridgeCapabilitiesForRoute('https://api.kimi.com/coding/v1', 'k3.1-pro');
+ expect(capabilities.imageInput).toBeUndefined();
+ expect(() => translateResponsesRequest({ model: 'k3.1-pro', input: [{ type: 'message', role: 'user',
+ content: [{ type: 'input_image', image_url: 'data:image/png;base64,eA==' }],
+ }] }, { capabilities })).toThrow(/input_image/);
+ } finally {
+ setActiveCatalog(BUNDLED_CATALOG);
+ }
});
it.each([
diff --git a/apps/desktop/src/main/maker-host/codex-proxy-host.ts b/apps/desktop/src/main/maker-host/codex-proxy-host.ts
index b04329eb9a..9e381fa57a 100644
--- a/apps/desktop/src/main/maker-host/codex-proxy-host.ts
+++ b/apps/desktop/src/main/maker-host/codex-proxy-host.ts
@@ -1163,8 +1163,11 @@ function isVerifiedImageChatRoute(upstream: string, realModel: string): boolean
if (url.protocol !== 'https:') return false;
const host = url.hostname.toLowerCase();
// Legacy callers and auxiliary requests use the same catalog bindings, without
- // restoring a parallel model allowlist. An accepted remote registry is complete.
- const registry = getActiveCatalog().modelRegistry ?? BUNDLED_CATALOG.modelRegistry;
+ // restoring a parallel model allowlist. Pre-V6 servers cannot declare bindings;
+ // V6 remains authoritative, including empty or retired declarations.
+ const activeRegistry = getActiveCatalog().modelRegistry;
+ const registry = activeRegistry && activeRegistry.schemaVersion >= 6
+ ? activeRegistry : BUNDLED_CATALOG.modelRegistry;
for (const providerId of new Set((registry?.interfaceProfiles ?? []).map(p => p.providerId))) {
const declared = availableModelInterfaces(registry, providerId, realModel, upstream, 'codex')
.find(p => p.api === 'openai-completions' && p.compatibility.includes('chat-image-v1'));