@kaitranntt/ccs 8.2.0 → 8.3.0-dev.1

package/dist/cliproxy/claude-shadow-warning.js

@@ -0,0 +1,187 @@
+"use strict";
+/**
+ * Claude built-in provider — shadow warning and first-run routing notice
+ *
+ * Shadow warning
+ * --------------
+ * The claude and anthropic provider names are reserved built-ins (priority 0.5).
+ * A user who has a settings profile or account profile named 'claude' or 'anthropic'
+ * will silently get the built-in rather than their own profile.  This module emits
+ * a one-line, TTY-only, once-per-install warning with a rename hint in that case.
+ *
+ * First-run routing notice
+ * ------------------------
+ * On the very first launch of `ccs claude` a one-line notice is printed to stderr
+ * reminding the user that traffic routes through the local CLIProxy instance and
+ * that bare `ccs` still launches native Claude Code.
+ *
+ * Persistence: marker files inside ~/.ccs/cliproxy/ are used for both notices.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.maybeShowClaudeRoutingNotice = exports.maybeWarnClaudeShadow = void 0;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const ui_1 = require("../utils/ui");
+const config_loader_facade_1 = require("../config/config-loader-facade");
+const config_manager_1 = require("../utils/config-manager");
+const profile_registry_1 = require("../auth/profile-registry");
+/** Marker file name inside ~/.ccs/cliproxy/ */
+const SHADOW_WARNED_MARKER = '.claude-shadow-warned';
+/** Names that the claude built-in shadows */
+const SHADOWED_NAMES = new Set(['claude', 'anthropic']);
+/** Get path to the once-per-install dismissal marker. */
+function getShadowWarnedMarkerPath() {
+    return path.join((0, config_loader_facade_1.getCcsDir)(), 'cliproxy', SHADOW_WARNED_MARKER);
+}
+/** Return true if this install has already shown the shadow warning. */
+function shadowWarnAlreadyShown() {
+    try {
+        return fs.existsSync(getShadowWarnedMarkerPath());
+    }
+    catch {
+        return true; // If we can't read, skip warning.
+    }
+}
+/** Persist the warning dismissal. */
+function markShadowWarnShown() {
+    try {
+        const dir = path.join((0, config_loader_facade_1.getCcsDir)(), 'cliproxy');
+        fs.mkdirSync(dir, { recursive: true });
+        fs.writeFileSync(getShadowWarnedMarkerPath(), new Date().toISOString(), {
+            encoding: 'utf8',
+            flag: 'w',
+        });
+    }
+    catch {
+        // Best-effort — failure to persist is not fatal.
+    }
+}
+/**
+ * Check if the user has a settings or account profile named 'claude' or 'anthropic'
+ * that is being shadowed by the built-in provider.
+ */
+function detectShadowedProfile() {
+    try {
+        if ((0, config_loader_facade_1.isUnifiedMode)()) {
+            const unified = (0, config_loader_facade_1.loadOrCreateUnifiedConfig)();
+            const profileNames = Object.keys(unified.profiles || {});
+            const accountNames = Object.keys(unified.accounts || {});
+            const variantNames = Object.keys(unified.cliproxy?.variants || {});
+            for (const name of [...profileNames, ...accountNames, ...variantNames]) {
+                if (SHADOWED_NAMES.has(name.toLowerCase()))
+                    return name;
+            }
+        }
+        else {
+            const config = (0, config_manager_1.readConfig)();
+            const profileNames = Object.keys(config.profiles || {});
+            const cliproxyNames = Object.keys(config.cliproxy || {});
+            // Also check account-based profiles from profiles.json (mirror unified accounts check).
+            const registry = new profile_registry_1.ProfileRegistry();
+            const accountProfileNames = registry.listProfiles();
+            for (const name of [...profileNames, ...cliproxyNames, ...accountProfileNames]) {
+                if (SHADOWED_NAMES.has(name.toLowerCase()))
+                    return name;
+            }
+        }
+    }
+    catch {
+        // If config is unreadable, skip the check silently.
+    }
+    return null;
+}
+/**
+ * Emit the shadow warning if conditions are met.
+ *
+ * Conditions:
+ * - Running in a TTY (no warning in pipes/CI)
+ * - Warning not already shown for this install
+ * - User has a profile named 'claude' or 'anthropic' that the built-in shadows
+ *
+ * Writes to stderr so it does not pollute stdout piped output.
+ */
+function maybeWarnClaudeShadow() {
+    // TTY guard — no warning in non-interactive or CI environments
+    if (!process.stderr.isTTY)
+        return;
+    if (shadowWarnAlreadyShown())
+        return;
+    const shadowedName = detectShadowedProfile();
+    if (!shadowedName)
+        return;
+    markShadowWarnShown();
+    process.stderr.write('\n');
+    process.stderr.write((0, ui_1.warn)(`Profile '${shadowedName}' is shadowed by the built-in claude provider and cannot be reached via 'ccs ${shadowedName}'.`) + '\n');
+    process.stderr.write(`    Rename it to continue using it: ccs config  (or edit ~/.ccs/config.yaml / config.json)\n`);
+    process.stderr.write('\n');
+}
+exports.maybeWarnClaudeShadow = maybeWarnClaudeShadow;
+// ── First-run routing notice ──────────────────────────────────────────────────
+/** Marker file for the once-per-install routing notice. */
+const ROUTING_NOTICE_MARKER = '.claude-routing-noticed';
+function getRoutingNoticeMarkerPath() {
+    return path.join((0, config_loader_facade_1.getCcsDir)(), 'cliproxy', ROUTING_NOTICE_MARKER);
+}
+function routingNoticeAlreadyShown() {
+    try {
+        return fs.existsSync(getRoutingNoticeMarkerPath());
+    }
+    catch {
+        return true;
+    }
+}
+function markRoutingNoticeShown() {
+    try {
+        const dir = path.join((0, config_loader_facade_1.getCcsDir)(), 'cliproxy');
+        fs.mkdirSync(dir, { recursive: true });
+        fs.writeFileSync(getRoutingNoticeMarkerPath(), new Date().toISOString(), {
+            encoding: 'utf8',
+            flag: 'w',
+        });
+    }
+    catch {
+        // Best-effort.
+    }
+}
+/**
+ * Print a one-time routing notice when the claude built-in provider first launches.
+ *
+ * Informs the user that traffic is routed through the local CLIProxy instance
+ * (not the Anthropic API directly) and that bare `ccs` still uses native Claude Code.
+ *
+ * TTY-only; written to stderr.
+ */
+function maybeShowClaudeRoutingNotice() {
+    if (!process.stderr.isTTY)
+        return;
+    if (routingNoticeAlreadyShown())
+        return;
+    markRoutingNoticeShown();
+    process.stderr.write((0, ui_1.info)('ccs claude: traffic routes through the local CLIProxy instance.') + '\n');
+    process.stderr.write(`    Native Claude Code (direct Anthropic API) is still available via bare \`ccs\`.\n`);
+}
+exports.maybeShowClaudeRoutingNotice = maybeShowClaudeRoutingNotice;
+//# sourceMappingURL=claude-shadow-warning.js.map

package/dist/cliproxy/claude-shadow-warning.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"claude-shadow-warning.js","sourceRoot":"","sources":["../../src/cliproxy/claude-shadow-warning.ts"],"names":[],"mappings":"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"}

package/dist/cliproxy/config/base-config-loader.d.ts

@@ -14,10 +14,10 @@ interface BaseSettings {
     env: {
         ANTHROPIC_BASE_URL: string;
         ANTHROPIC_AUTH_TOKEN: string;
-        ANTHROPIC_MODEL: string;
-        ANTHROPIC_DEFAULT_OPUS_MODEL: string;
-        ANTHROPIC_DEFAULT_SONNET_MODEL: string;
-        ANTHROPIC_DEFAULT_HAIKU_MODEL: string;
+        ANTHROPIC_MODEL?: string;
+        ANTHROPIC_DEFAULT_OPUS_MODEL?: string;
+        ANTHROPIC_DEFAULT_SONNET_MODEL?: string;
+        ANTHROPIC_DEFAULT_HAIKU_MODEL?: string;
     };
 }
 /**
@@ -27,7 +27,8 @@ interface BaseSettings {
 export declare function loadBaseConfig(provider: CLIProxyProvider): BaseSettings;
 /**
  * Get model mapping from base config
- * Extracts model names from env vars
+ * Extracts model names from env vars.
+ * Returns undefined model fields for the claude provider (model-neutral passthrough).
  */
 export declare function getModelMappingFromConfig(provider: CLIProxyProvider): ProviderModelMapping;
 /**

package/dist/cliproxy/config/base-config-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-config-loader.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/config/base-config-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;;;AAIH,OAAO,KAAK,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEvE,mCAAmC;AACnC,UAAU,YAAY;IACpB,GAAG,EAAE;QACH,kBAAkB,EAAE,MAAM,CAAC;QAC3B,oBAAoB,EAAE,MAAM,CAAC;QAC7B,eAAe,EAAE,MAAM,CAAC;QACxB,4BAA4B,EAAE,MAAM,CAAC;QACrC,8BAA8B,EAAE,MAAM,CAAC;QACvC,6BAA6B,EAAE,MAAM,CAAC;KACvC,CAAC;CACH;AAgBD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,GAAG,YAAY,CA6CvE;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,oBAAoB,CAU1F;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,CAAC,UAAU,CAGlF;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,IAAI,CAEvC"}
+{"version":3,"file":"base-config-loader.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/config/base-config-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;;;AAIH,OAAO,KAAK,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEvE,mCAAmC;AACnC,UAAU,YAAY;IACpB,GAAG,EAAE;QACH,kBAAkB,EAAE,MAAM,CAAC;QAC3B,oBAAoB,EAAE,MAAM,CAAC;QAC7B,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,4BAA4B,CAAC,EAAE,MAAM,CAAC;QACtC,8BAA8B,CAAC,EAAE,MAAM,CAAC;QACxC,6BAA6B,CAAC,EAAE,MAAM,CAAC;KACxC,CAAC;CACH;AAgBD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,GAAG,YAAY,CAiDvE;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,oBAAoB,CAY1F;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,CAAC,UAAU,CAGlF;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,IAAI,CAEvC"}

package/dist/cliproxy/config/base-config-loader.js

@@ -68,15 +68,19 @@ function loadBaseConfig(provider) {
         if (!settings.env || typeof settings.env !== 'object') {
             throw new Error('Missing or invalid "env" object');
         }
-        const required = [
-            'ANTHROPIC_MODEL',
-            'ANTHROPIC_DEFAULT_OPUS_MODEL',
-            'ANTHROPIC_DEFAULT_SONNET_MODEL',
-            'ANTHROPIC_DEFAULT_HAIKU_MODEL',
-        ];
-        for (const field of required) {
-            if (!settings.env[field]) {
-                throw new Error(`Missing required field: env.${field}`);
+        // claude provider is model-neutral: it does not pin model env vars so that
+        // the user's own Claude Code model selection is respected end-to-end.
+        if (provider !== 'claude') {
+            const required = [
+                'ANTHROPIC_MODEL',
+                'ANTHROPIC_DEFAULT_OPUS_MODEL',
+                'ANTHROPIC_DEFAULT_SONNET_MODEL',
+                'ANTHROPIC_DEFAULT_HAIKU_MODEL',
+            ];
+            for (const field of required) {
+                if (!settings.env[field]) {
+                    throw new Error(`Missing required field: env.${field}`);
+                }
             }
         }
         // Cache and return
@@ -91,13 +95,16 @@ function loadBaseConfig(provider) {
 exports.loadBaseConfig = loadBaseConfig;
 /**
  * Get model mapping from base config
- * Extracts model names from env vars
+ * Extracts model names from env vars.
+ * Returns undefined model fields for the claude provider (model-neutral passthrough).
  */
 function getModelMappingFromConfig(provider) {
     const config = loadBaseConfig(provider);
+    // claude is model-neutral: ANTHROPIC_MODEL is absent from its config; callers
+    // that need model IDs (e.g. getClaudeEnvVars) guard on provider !== 'claude'.
     return {
-        defaultModel: config.env.ANTHROPIC_MODEL,
-        claudeModel: config.env.ANTHROPIC_MODEL,
+        defaultModel: config.env.ANTHROPIC_MODEL ?? '',
+        claudeModel: config.env.ANTHROPIC_MODEL ?? '',
         opusModel: config.env.ANTHROPIC_DEFAULT_OPUS_MODEL,
         sonnetModel: config.env.ANTHROPIC_DEFAULT_SONNET_MODEL,
         haikuModel: config.env.ANTHROPIC_DEFAULT_HAIKU_MODEL,

package/dist/cliproxy/config/base-config-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-config-loader.js","sourceRoot":"","sources":["../../../src/cliproxy/config/base-config-loader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base-config-loader.js","sourceRoot":"","sources":["../../../src/cliproxy/config/base-config-loader.ts"],"names":[],"mappings":"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"}

package/dist/cliproxy/config/env-builder.d.ts

@@ -22,6 +22,9 @@ export declare function getModelMapping(provider: CLIProxyProvider): ProviderMod
  * Get environment variables for Claude CLI (bundled defaults)
  * Uses provider-specific endpoint (e.g., /api/provider/gemini) for explicit routing.
  * This enables concurrent gemini/codex usage - each session routes to its provider via URL path.
+ *
+ * For the claude built-in provider the model env vars are intentionally omitted so that
+ * the user's own Claude Code /model selection is honored end-to-end (model-neutral passthrough).
  */
 export declare function getClaudeEnvVars(provider: CLIProxyProvider, port?: number): NodeJS.ProcessEnv;
 /**

package/dist/cliproxy/config/env-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"env-builder.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/config/env-builder.ts"],"names":[],"mappings":"AAAA;;;GAGG;;;AAIH,OAAO,KAAK,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAMvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAyK7E,mDAAmD;AACnD,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,gBAAgB,GAAG,oBAAoB,CAEhF;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,GAAE,MAA8B,GACnC,MAAM,CAAC,UAAU,CAmCnB;AAyBD;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,CA4B9E;AA2HD;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,GAAE,MAA8B,EACpC,kBAAkB,CAAC,EAAE,MAAM,EAC3B,mBAAmB,CAAC,EAAE,wBAAwB,GAC7C,MAAM,CAAC,UAAU,CAsEnB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAsGvE;AAED;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,EAC7F,kBAAkB,CAAC,EAAE,MAAM,GAC1B,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAqFxB;AAED,qEAAqE;AACrE,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,mBAAmB,CAAC;IAAC,KAAK,EAAE,mBAAmB,CAAA;CAAE,EAC7F,WAAW,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,EACxC,IAAI,GAAE,MAA8B,EACpC,kBAAkB,CAAC,EAAE,MAAM,EAC3B,YAAY,CAAC,EAAE,qBAAqB,GACnC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAiFxB"}
+{"version":3,"file":"env-builder.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/config/env-builder.ts"],"names":[],"mappings":"AAAA;;;GAGG;;;AAIH,OAAO,KAAK,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAMvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AA4K7E,mDAAmD;AACnD,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,gBAAgB,GAAG,oBAAoB,CAEhF;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,GAAE,MAA8B,GACnC,MAAM,CAAC,UAAU,CAsCnB;AAyBD;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,CA4B9E;AA2HD;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,GAAE,MAA8B,EACpC,kBAAkB,CAAC,EAAE,MAAM,EAC3B,mBAAmB,CAAC,EAAE,wBAAwB,GAC7C,MAAM,CAAC,UAAU,CAsEnB;AA8FD;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CA4HvE;AAED;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,EAC7F,kBAAkB,CAAC,EAAE,MAAM,GAC1B,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA+GxB;AAED,qEAAqE;AACrE,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,mBAAmB,CAAC;IAAC,KAAK,EAAE,mBAAmB,CAAA;CAAE,EAC7F,WAAW,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,EACxC,IAAI,GAAE,MAA8B,EACpC,kBAAkB,CAAC,EAAE,MAAM,EAC3B,YAAY,CAAC,EAAE,qBAAqB,GACnC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAiFxB"}

package/dist/cliproxy/config/env-builder.js

@@ -51,6 +51,8 @@ const REQUIRED_PROVIDER_ENV_KEYS = [
     'ANTHROPIC_DEFAULT_SONNET_MODEL',
     'ANTHROPIC_DEFAULT_HAIKU_MODEL',
 ];
+/** Minimum required env vars for the claude built-in provider (model-neutral). */
+const REQUIRED_CLAUDE_ENV_KEYS = ['ANTHROPIC_BASE_URL', 'ANTHROPIC_AUTH_TOKEN'];
 const CURSOR_LEGACY_ENV_OVERRIDE_KEYS = new Set([
     'ANTHROPIC_BASE_URL',
     'ANTHROPIC_AUTH_TOKEN',
@@ -176,23 +178,29 @@ exports.getModelMapping = getModelMapping;
  * Get environment variables for Claude CLI (bundled defaults)
  * Uses provider-specific endpoint (e.g., /api/provider/gemini) for explicit routing.
  * This enables concurrent gemini/codex usage - each session routes to its provider via URL path.
+ *
+ * For the claude built-in provider the model env vars are intentionally omitted so that
+ * the user's own Claude Code /model selection is honored end-to-end (model-neutral passthrough).
  */
 function getClaudeEnvVars(provider, port = port_manager_1.CLIPROXY_DEFAULT_PORT) {
-    const models = getModelMapping(provider);
     // Base env vars from config file (includes ANTHROPIC_MAX_TOKENS, etc.)
     const baseEnvVars = (0, base_config_loader_1.getEnvVarsFromConfig)(provider);
-    // Core env vars that we always set dynamically
+    // Filter out model pins and URL/auth from base config (we set them dynamically)
+    const { ANTHROPIC_BASE_URL: _baseUrl, ANTHROPIC_AUTH_TOKEN: _authToken, ANTHROPIC_MODEL: _model, ANTHROPIC_DEFAULT_OPUS_MODEL: _opusModel, ANTHROPIC_DEFAULT_SONNET_MODEL: _sonnetModel, ANTHROPIC_DEFAULT_HAIKU_MODEL: _haikuModel, ...additionalEnvVars } = baseEnvVars;
+    // Core transport env vars set dynamically for all providers
     const coreEnvVars = {
-        // Provider-specific endpoint - routes to correct provider via URL path
         ANTHROPIC_BASE_URL: `http://127.0.0.1:${port}/api/provider/${provider}`,
         ANTHROPIC_AUTH_TOKEN: (0, auth_token_manager_1.getEffectiveApiKey)(),
-        ANTHROPIC_MODEL: models.claudeModel,
-        ANTHROPIC_DEFAULT_OPUS_MODEL: models.opusModel || models.claudeModel,
-        ANTHROPIC_DEFAULT_SONNET_MODEL: models.sonnetModel || models.claudeModel,
-        ANTHROPIC_DEFAULT_HAIKU_MODEL: models.haikuModel || models.claudeModel,
     };
-    // Filter out core env vars from base config to avoid conflicts
-    const { ANTHROPIC_BASE_URL: _baseUrl, ANTHROPIC_AUTH_TOKEN: _authToken, ANTHROPIC_MODEL: _model, ANTHROPIC_DEFAULT_OPUS_MODEL: _opusModel, ANTHROPIC_DEFAULT_SONNET_MODEL: _sonnetModel, ANTHROPIC_DEFAULT_HAIKU_MODEL: _haikuModel, ...additionalEnvVars } = baseEnvVars;
+    // Model pins: omitted for claude provider (model-neutral passthrough).
+    // For all other providers, set model vars from the base config model mapping.
+    if (provider !== 'claude') {
+        const models = getModelMapping(provider);
+        coreEnvVars.ANTHROPIC_MODEL = models.claudeModel;
+        coreEnvVars.ANTHROPIC_DEFAULT_OPUS_MODEL = models.opusModel || models.claudeModel;
+        coreEnvVars.ANTHROPIC_DEFAULT_SONNET_MODEL = models.sonnetModel || models.claudeModel;
+        coreEnvVars.ANTHROPIC_DEFAULT_HAIKU_MODEL = models.haikuModel || models.claudeModel;
+    }
     // Merge core env vars with additional env vars from base config
     const mergedEnv = {
         ...coreEnvVars,
@@ -421,6 +429,94 @@ function getEffectiveEnvVars(provider, port = port_manager_1.CLIPROXY_DEFAULT_PO
     return { ...globalEnv, ...getClaudeEnvVars(provider, port) };
 }
 exports.getEffectiveEnvVars = getEffectiveEnvVars;
+/**
+ * All historically-shipped default model pins that CCS auto-wrote into
+ * claude.settings.json before the model-neutral passthrough change.
+ * A key is removed only when the stored value exactly matches one of the values
+ * in that key's set, so user-customised values are always preserved.
+ */
+const CLAUDE_STALE_MODEL_DEFAULTS = {
+    ANTHROPIC_MODEL: new Set([
+        'claude-sonnet-4-20250514',
+        'claude-sonnet-4-5-20250929',
+        'claude-sonnet-4-6',
+    ]),
+    ANTHROPIC_DEFAULT_OPUS_MODEL: new Set([
+        'claude-opus-4-20250514',
+        'claude-opus-4-5-20251101',
+        'claude-opus-4-6',
+        'claude-opus-4-7',
+    ]),
+    ANTHROPIC_DEFAULT_SONNET_MODEL: new Set([
+        'claude-sonnet-4-20250514',
+        'claude-sonnet-4-5-20250929',
+        'claude-sonnet-4-6',
+    ]),
+    ANTHROPIC_DEFAULT_HAIKU_MODEL: new Set([
+        'claude-haiku-3-5-20241022',
+        'claude-haiku-4-5-20251001',
+    ]),
+};
+/** Marker file that records when the one-time stale-pin migration has run. */
+const CLAUDE_MODEL_MIGRATED_MARKER = '.claude-model-migrated';
+/** Return true if the one-time stale-pin migration has already been applied. */
+function claudeModelMigrationDone() {
+    try {
+        return fs.existsSync(path.join((0, config_loader_facade_1.getCcsDir)(), 'cliproxy', CLAUDE_MODEL_MIGRATED_MARKER));
+    }
+    catch {
+        return true; // Cannot read — treat as done to avoid repeated rewrites.
+    }
+}
+/** Record that the one-time stale-pin migration has been applied. */
+function markClaudeModelMigrationDone() {
+    try {
+        const dir = path.join((0, config_loader_facade_1.getCcsDir)(), 'cliproxy');
+        fs.mkdirSync(dir, { recursive: true });
+        fs.writeFileSync(path.join(dir, CLAUDE_MODEL_MIGRATED_MARKER), new Date().toISOString(), {
+            encoding: 'utf8',
+            flag: 'w',
+        });
+    }
+    catch {
+        // Best-effort — failure to persist is not fatal.
+    }
+}
+/**
+ * Remove stale model pins from an existing claude.settings.json env block.
+ * Only removes keys whose values appear in the set of historically-shipped
+ * defaults for that key, preserving user-customised values.
+ * Returns true when at least one key was removed (signals file needs rewriting).
+ */
+function migrateClaudeStaleModelPins(env) {
+    let mutated = false;
+    for (const [key, staleValues] of Object.entries(CLAUDE_STALE_MODEL_DEFAULTS)) {
+        if (staleValues.has(env[key])) {
+            delete env[key];
+            mutated = true;
+        }
+    }
+    return mutated;
+}
+/**
+ * Read-level equivalent of the stale-pin migration for paths that must not
+ * mutate the settings file (e.g. the remote env builder).  Returns a copy of
+ * the env with any value equal to a historical default dropped per-key, while
+ * user-custom pins are preserved.  Same per-key Sets as the local migration, so
+ * local / --config / remote read paths agree on which pins are stale.
+ *
+ * No marker is consulted or written: this is purely a read-time filter, so it
+ * is idempotent across launches without a one-shot guard.
+ */
+function filterClaudeStaleModelPins(env) {
+    const result = { ...env };
+    for (const [key, staleValues] of Object.entries(CLAUDE_STALE_MODEL_DEFAULTS)) {
+        if (staleValues.has(result[key])) {
+            delete result[key];
+        }
+    }
+    return result;
+}
 /**
  * Copy bundled settings template to user directory if not exists
  * Called during installation/first run
@@ -435,8 +531,13 @@ function ensureProviderSettings(provider) {
         });
     };
     // Create initial file when missing.
+    // A freshly created file has no stale pins by construction, so mark migration
+    // done immediately to prevent the one-time strip from running unnecessarily.
     if (!fs.existsSync(settingsPath)) {
         writeSettings({ env: defaultEnv });
+        if (provider === 'claude') {
+            markClaudeModelMigrationDone();
+        }
         return;
     }
     // Existing file: repair missing/invalid core env keys without dropping user data.
@@ -472,11 +573,25 @@ function ensureProviderSettings(provider) {
         ? { ...envCandidate }
         : {};
     let mutated = !(envCandidate && typeof envCandidate === 'object' && !Array.isArray(envCandidate));
-    for (const key of REQUIRED_PROVIDER_ENV_KEYS) {
+    // One-time migration: strip stale model pins written by older CCS versions into
+    // claude.settings.json.  Guarded by a marker file so a user-re-pin that happens
+    // to equal a stale default value is not silently stripped on every subsequent launch.
+    if (provider === 'claude' && !claudeModelMigrationDone()) {
+        if (migrateClaudeStaleModelPins(mergedEnv)) {
+            mutated = true;
+        }
+        markClaudeModelMigrationDone();
+    }
+    // claude is model-neutral: only transport keys (URL + auth) are required; model pins are omitted.
+    const requiredKeys = provider === 'claude' ? REQUIRED_CLAUDE_ENV_KEYS : REQUIRED_PROVIDER_ENV_KEYS;
+    for (const key of requiredKeys) {
         const current = mergedEnv[key];
         if (typeof current !== 'string' || current.trim().length === 0) {
-            mergedEnv[key] = defaultEnv[key] || '';
-            mutated = true;
+            const fallback = defaultEnv[key];
+            if (fallback) {
+                mergedEnv[key] = fallback;
+                mutated = true;
+            }
         }
     }
     // Canonicalize provider-specific model aliases (e.g., AGY Sonnet 4.6 thinking legacy IDs).
@@ -580,6 +695,21 @@ function getRemoteEnvVars(provider, remoteConfig, customSettingsPath) {
                     migrateDeprecatedModelNames(settingsPath, provider, settings);
                     migrateIFlowPlaceholderModel(settingsPath, provider, settings);
                     userEnvVars = settings.env;
+                    // claude is model-neutral. The local launch path runs the one-time
+                    // stale-pin migration (ensureProviderSettings), but the remote path
+                    // never rewrites the file, so a remote-only user whose settings still
+                    // carry an old auto-written default would stay pinned. Filter stale
+                    // defaults at read level so values equal to a historical default are
+                    // dropped while user-custom pins survive. Once the migration marker
+                    // exists the file has already been cleaned, so any pin present after
+                    // that is user-intentional (e.g. an explicit `ccs claude --config`
+                    // pick that happens to equal a historical default) and must NOT be
+                    // filtered. Priority 1 (explicit custom settings path) is
+                    // intentionally left untouched: an explicitly passed settings file
+                    // is the user's deliberate choice.
+                    if (provider === 'claude' && !claudeModelMigrationDone()) {
+                        userEnvVars = filterClaudeStaleModelPins(userEnvVars);
+                    }
                 }
             }
             catch {
@@ -589,17 +719,25 @@ function getRemoteEnvVars(provider, remoteConfig, customSettingsPath) {
     }
     // Priority 3: Base config defaults
     if (Object.keys(userEnvVars).length === 0) {
-        const models = getModelMapping(provider);
         const baseEnvVars = (0, base_config_loader_1.getEnvVarsFromConfig)(provider);
         // Filter out URL/auth from base config (we'll set those from remote config)
         const { ANTHROPIC_BASE_URL: _baseUrl, ANTHROPIC_AUTH_TOKEN: _authToken, ...additionalEnvVars } = baseEnvVars;
-        userEnvVars = {
-            ...additionalEnvVars,
-            ANTHROPIC_MODEL: models.claudeModel,
-            ANTHROPIC_DEFAULT_OPUS_MODEL: models.opusModel || models.claudeModel,
-            ANTHROPIC_DEFAULT_SONNET_MODEL: models.sonnetModel || models.claudeModel,
-            ANTHROPIC_DEFAULT_HAIKU_MODEL: models.haikuModel || models.claudeModel,
-        };
+        // claude is model-neutral: omit model pins so Claude Code's own /model
+        // selection is respected on remote launches too.
+        if (provider === 'claude') {
+            // Filter out undefined values coming from NodeJS.ProcessEnv spread.
+            userEnvVars = Object.fromEntries(Object.entries(additionalEnvVars).filter((entry) => typeof entry[1] === 'string'));
+        }
+        else {
+            const models = getModelMapping(provider);
+            userEnvVars = {
+                ...additionalEnvVars,
+                ANTHROPIC_MODEL: models.claudeModel,
+                ANTHROPIC_DEFAULT_OPUS_MODEL: models.opusModel || models.claudeModel,
+                ANTHROPIC_DEFAULT_SONNET_MODEL: models.sonnetModel || models.claudeModel,
+                ANTHROPIC_DEFAULT_HAIKU_MODEL: models.haikuModel || models.claudeModel,
+            };
+        }
     }
     // Build final env: global + user settings + remote URL/auth override
     const env = {