tiennm99/ccs
1
0 Fork 0
mirror of https://github.com/tiennm99/ccs.git synced 2026-10-14 16:17:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(cliproxy): centralize gemini compatibility and fallback hints

Browse Source
This commit is contained in:
Tam Nhu Tran committed 2026-03-27 17:38:31 -04:00
1 parent 934e6ab52b
commit 2251312411
7 files changed
+63 -33
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ui/src/lib/model-catalogs.ts
+8 -19
View File
@@ -5,13 +5,7 @@
import type { ModelEntry, ProviderCatalog } from '@/components/cliproxy/provider-model-selector';
import { stripModelConfigurationSuffixes } from '@/lib/extended-context-utils';
const GEMINI_MINOR_VERSION_COMPATIBILITY_IDS = Object.freeze({
'gemini-3-pro-preview': 'gemini-3.1-pro-preview',
'gemini-3.1-pro-preview': 'gemini-3-pro-preview',
'gemini-3-flash-preview': 'gemini-3.1-flash-preview',
'gemini-3.1-flash-preview': 'gemini-3-flash-preview',
});
import { GEMINI_MINOR_VERSION_COMPATIBILITY_IDS } from '../../../src/shared/gemini-minor-version-compatibility';
const GEMINI_PREVIEW_MODEL_ID_PATTERN =
/^gemini-(\d+(?:[.-]\d+)*)-(pro|flash)-preview(-customtools)?$/i;
@@ -695,11 +689,7 @@ export function findCatalogModel(provider: string, modelId: string) {
.sort((left, right) => compareGeminiVersions(right.info.version, left.info.version))[0]?.model;
}
export function resolveCatalogModelId(
_provider: string,
modelId: string,
availableModels: CatalogAvailableModel[] = []
): string {
export function resolveCatalogModelId(modelId: string, availableModels: CatalogAvailableModel[] = []): string {
const normalizedModelId = normalizeModelId(modelId);
const liveGeminiModelId = resolveGeminiPreviewModelId(normalizedModelId, availableModels);
if (liveGeminiModelId) return liveGeminiModelId;
@@ -719,15 +709,14 @@ export function resolveCatalogModelId(
}
export function resolvePresetMapping(
provider: string,
presetMapping: NonNullable<ModelEntry['presetMapping']>,
availableModels: CatalogAvailableModel[] = []
) {
return {
default: resolveCatalogModelId(provider, presetMapping.default, availableModels),
opus: resolveCatalogModelId(provider, presetMapping.opus, availableModels),
sonnet: resolveCatalogModelId(provider, presetMapping.sonnet, availableModels),
haiku: resolveCatalogModelId(provider, presetMapping.haiku, availableModels),
default: resolveCatalogModelId(presetMapping.default, availableModels),
opus: resolveCatalogModelId(presetMapping.opus, availableModels),
sonnet: resolveCatalogModelId(presetMapping.sonnet, availableModels),
haiku: resolveCatalogModelId(presetMapping.haiku, availableModels),
};
}
@@ -741,9 +730,9 @@ export function getResolvedCatalogModels(
return catalog.models
.map((model) => {
const resolvedModelId = resolveCatalogModelId(catalog.provider, model.id, availableModels);
const resolvedModelId = resolveCatalogModelId(model.id, availableModels);
const resolvedPresetModelMapping = model.presetMapping
? resolvePresetMapping(catalog.provider, model.presetMapping, availableModels)
? resolvePresetMapping(model.presetMapping, availableModels)
: undefined;
return {
ui/tests/unit/ui/lib/preset-utils.test.ts
+3 -3
View File
@@ -68,10 +68,10 @@ describe('claude preset utils', () => {
{ id: 'gemini-3.1-pro-preview', owned_by: 'antigravity' },
];
expect(resolveCatalogModelId('agy', 'gemini-3.1-pro-preview', availableModels)).toBe(
expect(resolveCatalogModelId('gemini-3.1-pro-preview', availableModels)).toBe(
'gemini-3.9-pro-preview'
);
expect(resolveCatalogModelId('agy', 'gemini-3-flash-preview', availableModels)).toBe(
expect(resolveCatalogModelId('gemini-3-flash-preview', availableModels)).toBe(
'gemini-3-9-flash-preview'
);
expect(findCatalogModel('agy', 'gemini-3.9-pro-preview')?.id).toBe('gemini-3.1-pro-preview');
@@ -88,7 +88,7 @@ describe('claude preset utils', () => {
it('does not silently swap Gemini Flash presets to flash-lite', () => {
const availableModels = [{ id: 'gemini-3.1-flash-lite-preview', owned_by: 'google' }];
expect(resolveCatalogModelId('gemini', 'gemini-3-flash-preview', availableModels)).toBe(
expect(resolveCatalogModelId('gemini-3-flash-preview', availableModels)).toBe(
'gemini-3-flash-preview'
);
});