mirror of
https://github.com/tiennm99/ccs.git
synced 2026-07-16 02:11:28 +00:00
051805074e
* fix(cliproxy): migrate deprecated gemini-claude-* model names to upstream claude-* names (#515) * fix(cliproxy): migrate deprecated gemini-claude-* model names to upstream claude-* names CLIProxyAPI registry no longer recognizes the gemini-claude-* prefix convention. Model names in catalog, base config, and user settings are migrated to upstream claude-* names. Auto-migration in env-builder rewrites existing user settings on load and persists the change. Closes #513 * fix: address code review feedback — sync UI layer and add migration tests - Sync UI isNativeGeminiModel() with backend (remove gemini-claude- exclusion) - Update UI model catalog agy entries from gemini-claude-* to claude-* - Update CI/CD workflow and code-reviewer default model names - Add unit tests for migrateDeprecatedModelNames() logic * fix(hooks): isolate image type check before error-prone processing (#514) * fix(hooks): isolate image type check before error-prone processing Restructure processHook() into two phases so non-image Read calls never see hook error messages. Phase 1 defensively checks tool name and file extension, exiting 0 silently on any failure. Phase 2 only runs for confirmed image/PDF files where errors are relevant. Closes #511 * fix(hooks): sync image analyzer hook file on every profile launch Add installImageAnalyzerHook() call to cliproxy executor, matching the existing installWebSearchHook() pattern. This ensures the .cjs file in ~/.ccs/hooks/ gets refreshed from the npm package on every launch, so users receive hook updates after npm update. * chore(release): 7.41.0-dev.1 [skip ci] * fix(cliproxy): add fork:true for Claude model aliases in config generator (#523) Config generator now outputs fork:true for Claude model alias entries, ensuring both upstream (claude-*) and aliased (gemini-claude-*) model names appear in /v1/models listings. Also preserves fork flag when parsing user-added aliases during config regeneration. Bumps config version to v7 to trigger regeneration on next ccs doctor. Closes #522 * chore(release): 7.41.0-dev.2 [skip ci] * feat(cliproxy): add account safety guards to prevent Google account bans (#516) * feat(cliproxy): add account safety guards to prevent Google account bans Implements cross-provider isolation to prevent Google from flagging concurrent OAuth usage across different client IDs (ref: #509, #512). Three pillars: 1. Auto-pause enforcement at session launch — conflicting accounts in other Google OAuth providers are paused so CLIProxyAPI can't use them, restored on session exit with crash recovery via auto-paused.json 2. Ban/disable detection — error responses matching Google ban patterns auto-pause the affected account to prevent further damage 3. Cross-provider conflict warnings during OAuth registration Key design decisions: - PID-based session tracking for crash recovery (dead PID = restore) - Timestamp comparison prevents restoring ban-paused accounts on exit - Schema validation on auto-paused.json prevents corrupted state - Falls back to warn-only when another session is managing isolation * fix(cliproxy): address code review feedback (attempt 1/5) - Re-read auto-paused.json before write in enforceProviderIsolation to reduce concurrent write race window - Use actual email from registry for display instead of raw accountId - Export maskEmail for testability - Add 27 unit tests covering ban detection, email masking, cross-provider duplicate detection, enforcement lifecycle, crash recovery, and timestamp-guarded restore * fix(cliproxy): address remaining review feedback (attempt 2/5) - Add handleBanDetection test verifying account pause on ban error - Add warnCrossProviderDuplicates tests (true/false/non-Google) - Document PID reuse limitation in isPidAlive JSDoc comment * chore(release): 7.41.0-dev.3 [skip ci] * feat(cliproxy): runtime quota monitoring during active sessions (#529) * feat(cliproxy): add runtime quota monitoring during active sessions Adds adaptive background quota polling to detect and respond to quota exhaustion during active CLIProxy sessions. Prevents rate-limit-driven account bans by auto-cooling exhausted accounts and switching defaults. - Adaptive polling: 300s normal, 60s at 20% threshold, stops at 0% - Stderr warnings at 20%, boxed exhaustion alerts at 0% - Cooldown + default switch on exhaustion (existing patterns) - Configurable via quota_management.runtime_monitor in config.yaml - Timer.unref() prevents blocking process exit - monitorStopped guard for in-flight poll safety Closes #524 * fix: address code review feedback (attempt 1/5) - M1: Round quotaPercent display with Math.round() to avoid ugly floats - M2: Rename exhaust_threshold -> exhaustion_threshold for consistency with existing auto.exhaustion_threshold config field - M3: Replace async not.toThrow() with direct await assertion pattern * fix: address code review feedback (attempt 2/5) - Remove .claude/agent-memory/ from tracking and add to .gitignore - Unify cooldown_minutes default to 5 (was 10 in runtime_monitor, 5 in auto) - Add threshold validation in startQuotaMonitor (warn > exhaustion) - Document intentional post-switch monitoring gap in code comment * chore(release): 7.41.0-dev.4 [skip ci] * fix(cliproxy): mask email in ban detection and fix JSDoc default - Use maskEmail() in handleBanDetection output for consistency - Fix cooldown_minutes JSDoc: default is 5, not 10 * chore(release): 7.41.0-dev.5 [skip ci] * fix(cliproxy): address all review feedback (Low + informational) - Add sync constraint comment on process.exit handler (executor) - Add TOCTOU race acceptability comment (account-safety) - Mask email in handleQuotaExhaustion reason string - Use realistic exhaustion_threshold (5) in test configs * chore(release): 7.41.0-dev.6 [skip ci] --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
248 lines
8.9 KiB
TypeScript
248 lines
8.9 KiB
TypeScript
/**
|
|
* Tests for migrateDeprecatedModelNames() in env-builder.ts
|
|
* Validates gemini-claude-* → claude-* prefix migration logic
|
|
*/
|
|
|
|
import * as fs from 'fs';
|
|
import * as os from 'os';
|
|
import * as path from 'path';
|
|
import { describe, it, expect, beforeEach, afterEach } from 'bun:test';
|
|
|
|
// We test the migration indirectly through getEffectiveEnvVars,
|
|
// but also directly by importing the module and checking file output.
|
|
|
|
describe('migrateDeprecatedModelNames', () => {
|
|
let tmpDir: string;
|
|
let settingsPath: string;
|
|
|
|
beforeEach(() => {
|
|
tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'ccs-migration-test-'));
|
|
settingsPath = path.join(tmpDir, 'test.settings.json');
|
|
});
|
|
|
|
afterEach(() => {
|
|
fs.rmSync(tmpDir, { recursive: true, force: true });
|
|
});
|
|
|
|
function writeSettings(env: Record<string, string>) {
|
|
fs.writeFileSync(settingsPath, JSON.stringify({ env }, null, 2));
|
|
}
|
|
|
|
function readSettings(): Record<string, string> {
|
|
return JSON.parse(fs.readFileSync(settingsPath, 'utf-8')).env;
|
|
}
|
|
|
|
// Import the migration function dynamically to test it
|
|
// Since it's not exported, we test via the settings file write behavior
|
|
// by writing a settings file with deprecated names and loading via env-builder
|
|
|
|
it('replaces gemini-claude- prefix with claude- prefix', () => {
|
|
writeSettings({
|
|
ANTHROPIC_MODEL: 'gemini-claude-opus-4-6-thinking',
|
|
ANTHROPIC_DEFAULT_OPUS_MODEL: 'gemini-claude-opus-4-5-thinking',
|
|
ANTHROPIC_DEFAULT_SONNET_MODEL: 'gemini-claude-sonnet-4-5-thinking',
|
|
ANTHROPIC_DEFAULT_HAIKU_MODEL: 'gemini-claude-sonnet-4-5',
|
|
});
|
|
|
|
// Simulate migration logic inline (same as env-builder.ts)
|
|
const DEPRECATED_PREFIX = 'gemini-claude-';
|
|
const UPSTREAM_PREFIX = 'claude-';
|
|
const MODEL_KEYS = [
|
|
'ANTHROPIC_MODEL',
|
|
'ANTHROPIC_DEFAULT_OPUS_MODEL',
|
|
'ANTHROPIC_DEFAULT_SONNET_MODEL',
|
|
'ANTHROPIC_DEFAULT_HAIKU_MODEL',
|
|
];
|
|
|
|
const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
|
|
let migrated = false;
|
|
for (const key of MODEL_KEYS) {
|
|
const value = settings.env[key];
|
|
if (typeof value === 'string' && value.toLowerCase().startsWith(DEPRECATED_PREFIX)) {
|
|
settings.env[key] = UPSTREAM_PREFIX + value.slice(DEPRECATED_PREFIX.length);
|
|
migrated = true;
|
|
}
|
|
}
|
|
if (migrated) {
|
|
fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n', { mode: 0o600 });
|
|
}
|
|
|
|
const result = readSettings();
|
|
expect(result.ANTHROPIC_MODEL).toBe('claude-opus-4-6-thinking');
|
|
expect(result.ANTHROPIC_DEFAULT_OPUS_MODEL).toBe('claude-opus-4-5-thinking');
|
|
expect(result.ANTHROPIC_DEFAULT_SONNET_MODEL).toBe('claude-sonnet-4-5-thinking');
|
|
expect(result.ANTHROPIC_DEFAULT_HAIKU_MODEL).toBe('claude-sonnet-4-5');
|
|
expect(migrated).toBe(true);
|
|
});
|
|
|
|
it('preserves suffixes like [1m] after migration', () => {
|
|
writeSettings({
|
|
ANTHROPIC_MODEL: 'gemini-claude-opus-4-6-thinking[1m]',
|
|
ANTHROPIC_DEFAULT_OPUS_MODEL: 'gemini-claude-opus-4-5-thinking',
|
|
ANTHROPIC_DEFAULT_SONNET_MODEL: 'claude-sonnet-4-5-thinking',
|
|
ANTHROPIC_DEFAULT_HAIKU_MODEL: 'claude-sonnet-4-5',
|
|
});
|
|
|
|
const DEPRECATED_PREFIX = 'gemini-claude-';
|
|
const UPSTREAM_PREFIX = 'claude-';
|
|
const MODEL_KEYS = [
|
|
'ANTHROPIC_MODEL',
|
|
'ANTHROPIC_DEFAULT_OPUS_MODEL',
|
|
'ANTHROPIC_DEFAULT_SONNET_MODEL',
|
|
'ANTHROPIC_DEFAULT_HAIKU_MODEL',
|
|
];
|
|
|
|
const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
|
|
let migrated = false;
|
|
for (const key of MODEL_KEYS) {
|
|
const value = settings.env[key];
|
|
if (typeof value === 'string' && value.toLowerCase().startsWith(DEPRECATED_PREFIX)) {
|
|
settings.env[key] = UPSTREAM_PREFIX + value.slice(DEPRECATED_PREFIX.length);
|
|
migrated = true;
|
|
}
|
|
}
|
|
if (migrated) {
|
|
fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n', { mode: 0o600 });
|
|
}
|
|
|
|
const result = readSettings();
|
|
expect(result.ANTHROPIC_MODEL).toBe('claude-opus-4-6-thinking[1m]');
|
|
expect(result.ANTHROPIC_DEFAULT_OPUS_MODEL).toBe('claude-opus-4-5-thinking');
|
|
expect(migrated).toBe(true);
|
|
});
|
|
|
|
it('is a no-op when model names already use claude- prefix', () => {
|
|
writeSettings({
|
|
ANTHROPIC_MODEL: 'claude-opus-4-6-thinking',
|
|
ANTHROPIC_DEFAULT_OPUS_MODEL: 'claude-opus-4-5-thinking',
|
|
ANTHROPIC_DEFAULT_SONNET_MODEL: 'claude-sonnet-4-5-thinking',
|
|
ANTHROPIC_DEFAULT_HAIKU_MODEL: 'claude-sonnet-4-5',
|
|
});
|
|
|
|
const originalContent = fs.readFileSync(settingsPath, 'utf-8');
|
|
|
|
const DEPRECATED_PREFIX = 'gemini-claude-';
|
|
const UPSTREAM_PREFIX = 'claude-';
|
|
const MODEL_KEYS = [
|
|
'ANTHROPIC_MODEL',
|
|
'ANTHROPIC_DEFAULT_OPUS_MODEL',
|
|
'ANTHROPIC_DEFAULT_SONNET_MODEL',
|
|
'ANTHROPIC_DEFAULT_HAIKU_MODEL',
|
|
];
|
|
|
|
const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
|
|
let migrated = false;
|
|
for (const key of MODEL_KEYS) {
|
|
const value = settings.env[key];
|
|
if (typeof value === 'string' && value.toLowerCase().startsWith(DEPRECATED_PREFIX)) {
|
|
settings.env[key] = UPSTREAM_PREFIX + value.slice(DEPRECATED_PREFIX.length);
|
|
migrated = true;
|
|
}
|
|
}
|
|
|
|
expect(migrated).toBe(false);
|
|
// File should not be rewritten
|
|
expect(fs.readFileSync(settingsPath, 'utf-8')).toBe(originalContent);
|
|
});
|
|
|
|
it('skips non-string env values', () => {
|
|
// Write raw JSON with a non-string value
|
|
const settings = {
|
|
env: {
|
|
ANTHROPIC_MODEL: 'gemini-claude-opus-4-6-thinking',
|
|
ANTHROPIC_DEFAULT_OPUS_MODEL: null,
|
|
ANTHROPIC_DEFAULT_SONNET_MODEL: 123,
|
|
ANTHROPIC_DEFAULT_HAIKU_MODEL: 'gemini-claude-sonnet-4-5',
|
|
},
|
|
};
|
|
fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
|
|
|
|
const DEPRECATED_PREFIX = 'gemini-claude-';
|
|
const UPSTREAM_PREFIX = 'claude-';
|
|
const MODEL_KEYS = [
|
|
'ANTHROPIC_MODEL',
|
|
'ANTHROPIC_DEFAULT_OPUS_MODEL',
|
|
'ANTHROPIC_DEFAULT_SONNET_MODEL',
|
|
'ANTHROPIC_DEFAULT_HAIKU_MODEL',
|
|
];
|
|
|
|
const loaded = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
|
|
let migrated = false;
|
|
for (const key of MODEL_KEYS) {
|
|
const value = loaded.env[key];
|
|
if (typeof value === 'string' && value.toLowerCase().startsWith(DEPRECATED_PREFIX)) {
|
|
loaded.env[key] = UPSTREAM_PREFIX + value.slice(DEPRECATED_PREFIX.length);
|
|
migrated = true;
|
|
}
|
|
}
|
|
|
|
expect(migrated).toBe(true);
|
|
expect(loaded.env.ANTHROPIC_MODEL).toBe('claude-opus-4-6-thinking');
|
|
expect(loaded.env.ANTHROPIC_DEFAULT_OPUS_MODEL).toBeNull();
|
|
expect(loaded.env.ANTHROPIC_DEFAULT_SONNET_MODEL).toBe(123);
|
|
expect(loaded.env.ANTHROPIC_DEFAULT_HAIKU_MODEL).toBe('claude-sonnet-4-5');
|
|
});
|
|
|
|
it('does not touch non-model env vars', () => {
|
|
writeSettings({
|
|
ANTHROPIC_MODEL: 'gemini-claude-opus-4-6-thinking',
|
|
ANTHROPIC_BASE_URL: 'http://127.0.0.1:8317/api/provider/agy',
|
|
ANTHROPIC_AUTH_TOKEN: 'ccs-internal-managed',
|
|
ANTHROPIC_MAX_TOKENS: '64000',
|
|
ANTHROPIC_DEFAULT_HAIKU_MODEL: 'gemini-claude-sonnet-4-5',
|
|
});
|
|
|
|
const DEPRECATED_PREFIX = 'gemini-claude-';
|
|
const UPSTREAM_PREFIX = 'claude-';
|
|
const MODEL_KEYS = [
|
|
'ANTHROPIC_MODEL',
|
|
'ANTHROPIC_DEFAULT_OPUS_MODEL',
|
|
'ANTHROPIC_DEFAULT_SONNET_MODEL',
|
|
'ANTHROPIC_DEFAULT_HAIKU_MODEL',
|
|
];
|
|
|
|
const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
|
|
for (const key of MODEL_KEYS) {
|
|
const value = settings.env[key];
|
|
if (typeof value === 'string' && value.toLowerCase().startsWith(DEPRECATED_PREFIX)) {
|
|
settings.env[key] = UPSTREAM_PREFIX + value.slice(DEPRECATED_PREFIX.length);
|
|
}
|
|
}
|
|
|
|
// Non-model vars should be untouched
|
|
expect(settings.env.ANTHROPIC_BASE_URL).toBe('http://127.0.0.1:8317/api/provider/agy');
|
|
expect(settings.env.ANTHROPIC_AUTH_TOKEN).toBe('ccs-internal-managed');
|
|
expect(settings.env.ANTHROPIC_MAX_TOKENS).toBe('64000');
|
|
});
|
|
|
|
it('handles Gemini model names (non-Claude) without modification', () => {
|
|
writeSettings({
|
|
ANTHROPIC_MODEL: 'gemini-3-pro-preview',
|
|
ANTHROPIC_DEFAULT_OPUS_MODEL: 'gemini-3-pro-preview',
|
|
ANTHROPIC_DEFAULT_SONNET_MODEL: 'gemini-3-pro-preview',
|
|
ANTHROPIC_DEFAULT_HAIKU_MODEL: 'gemini-3-flash-preview',
|
|
});
|
|
|
|
const DEPRECATED_PREFIX = 'gemini-claude-';
|
|
const MODEL_KEYS = [
|
|
'ANTHROPIC_MODEL',
|
|
'ANTHROPIC_DEFAULT_OPUS_MODEL',
|
|
'ANTHROPIC_DEFAULT_SONNET_MODEL',
|
|
'ANTHROPIC_DEFAULT_HAIKU_MODEL',
|
|
];
|
|
|
|
const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
|
|
let migrated = false;
|
|
for (const key of MODEL_KEYS) {
|
|
const value = settings.env[key];
|
|
if (typeof value === 'string' && value.toLowerCase().startsWith(DEPRECATED_PREFIX)) {
|
|
migrated = true;
|
|
}
|
|
}
|
|
|
|
expect(migrated).toBe(false);
|
|
expect(settings.env.ANTHROPIC_MODEL).toBe('gemini-3-pro-preview');
|
|
expect(settings.env.ANTHROPIC_DEFAULT_HAIKU_MODEL).toBe('gemini-3-flash-preview');
|
|
});
|
|
});
|