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(runtime): honor model wire protocols in fallback

Dante74238adcd379
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/sessionRuntimeControl.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/sessionRuntimeControl.test.ts
index 483af4e44a..9e41dd6bd0 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/sessionRuntimeControl.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/sessionRuntimeControl.test.ts
@@ -674,6 +674,34 @@ describe('session runtime fallback selection', () => {
expect(result).toMatchObject({ providerId: 'native', model: 'recommended' });
});
+ it('honors explicit model routes over provider defaults on both sides of fallback', () => {
+ const source = provider('openai', [{ id: 'gpt-main' }]);
+ source.routing.codex!.wireProtocol = 'openai-chat';
+ source.models.codex![0]!.route = {
+ baseUrl: 'https://example.com/v1', wireProtocol: 'openai-responses',
+ };
+ const chat = provider('chat', [{ id: 'gpt-main' }]);
+ chat.routing.codex!.wireProtocol = 'openai-chat';
+ const native = provider('native', [{ id: 'gpt-main' }]);
+ native.routing.codex!.wireProtocol = 'openai-chat';
+ native.models.codex![0]!.route = {
+ baseUrl: 'https://example.com/v1', wireProtocol: 'openai-responses',
+ };
+ expect(pickSessionRuntimeFallback({
+ providers: [source, chat, native],
+ current, visitedRoutes: [], currentHop: 0, maxHops: 2,
+ })).toMatchObject({ providerId: 'native', model: 'gpt-main' });
+
+ const bridge = provider('bridge', [{ id: 'gpt-main' }]);
+ bridge.models.codex![0]!.route = {
+ baseUrl: 'https://example.com/v1', wireProtocol: 'openai-chat',
+ };
+ expect(pickSessionRuntimeFallback({
+ providers: [provider('openai', [{ id: 'gpt-main' }]), bridge],
+ current, visitedRoutes: [], currentHop: 0, maxHops: 2,
+ })).toBeNull();
+ });
+
it('honors model-level bridge overrides and fails closed without the current route', () => {
const mixed = provider('mixed', [{ id: 'gpt-main' }]);
mixed.models.codex![0]!.codexCompatibilityWireProtocol = 'openai-chat';
diff --git a/apps/desktop/src/main/maker-ipc/sessionRuntimeControl.ts b/apps/desktop/src/main/maker-ipc/sessionRuntimeControl.ts
index e084c2de05..102ecf129e 100644
--- a/apps/desktop/src/main/maker-ipc/sessionRuntimeControl.ts
+++ b/apps/desktop/src/main/maker-ipc/sessionRuntimeControl.ts
@@ -467,13 +467,18 @@ export function pickSessionRuntimeFallback(params: {
// web_search_call may be serializable by a bridge while the next native search
// remains unsupported. Generic fallback has no task/request capability proof,
// so keep Codex on its current transport instead of silently introducing a bridge.
- const currentCompatibility = currentProvider
- ? resolveCodexCompatibilityWireProtocol(currentProvider, params.current.agentKind, currentModel)
+ // Explicit model routes override provider defaults in the actual Codex route.
+ const effectiveWireProtocol = (provider: ProviderView, model: CatalogModel): string =>
+ model.route?.wireProtocol ??
+ resolveCodexCompatibilityWireProtocol(provider, params.current.agentKind, model) ??
+ provider.routing.codex?.wireProtocol ?? 'openai-responses';
+ const currentCompatibility = currentProvider && currentModel
+ ? effectiveWireProtocol(currentProvider, currentModel)
: null;
const compatibleProvider = (provider: ProviderView, model: CatalogModel): boolean =>
params.current.agentKind !== 'codex' || (
currentProvider !== undefined && currentModel !== undefined &&
- resolveCodexCompatibilityWireProtocol(provider, params.current.agentKind, model) === currentCompatibility
+ effectiveWireProtocol(provider, model) === currentCompatibility
);
for (const provider of rail) {