@kaitranntt/ccs 8.10.0-dev.20 → 8.10.0-dev.21

package/dist/cliproxy/executor/launch-settings.d.ts

@@ -12,21 +12,18 @@
  * inherited process environment, so the persisted `ANTHROPIC_BASE_URL` (which
  * points straight at CLIProxy) overrides the proxy-chain URL CCS injected via
  * env. Claude then bypasses the proxy chain entirely — breaking tool-name
- * sanitization and Codex system-message folding (the latter surfaces as
- * `400 {"detail":"System messages are not allowed"}`).
+ * sanitization and Codex system-message folding.
  *
- * To keep the proxy chain authoritative regardless of Claude's env precedence,
- * we write a runtime copy of the settings file whose `env` routing keys are
- * overlaid with the resolved launch environment, and pass that copy to
- * `--settings`.
+ * This module delegates to the canonical `src/utils/launch-settings.ts` helper
+ * which unifies overlay and strip-based launch settings.
  */
 /// <reference types="node" />
 /// <reference types="bun-types" />
+import { LAUNCH_ROUTING_ENV_KEYS } from '../../utils/launch-settings';
+export { LAUNCH_ROUTING_ENV_KEYS as ROUTING_ENV_KEYS };
 /**
  * Build a settings object based on the persisted settings file, with routing
- * `env` keys overlaid from the resolved launch environment.
- *
- * @returns The merged settings and whether any routing key actually changed.
+ * env vars overlaid from the resolved launch environment.
  */
 export declare function buildLaunchSettingsOverlay(settingsPath: string, env: NodeJS.ProcessEnv): {
     settings: Record<string, unknown>;
@@ -34,12 +31,6 @@ export declare function buildLaunchSettingsOverlay(settingsPath: string, env: No
 };
 /**
  * Prepare the settings file path to hand to `claude --settings`.
- *
- * When the resolved launch environment changes any routing key relative to the
- * persisted settings file (i.e. a proxy chain is active), a runtime overlay
- * file is written and its path returned together with a cleanup callback that
- * removes it. Otherwise the original `settingsPath` is returned unchanged and
- * cleanup is a no-op.
  */
 export declare function prepareLaunchSettings(settingsPath: string, env: NodeJS.ProcessEnv): {
     settingsPath: string;

package/dist/cliproxy/executor/launch-settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"launch-settings.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/launch-settings.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;AAkCH;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB;IAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CA0BzD;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,IAAI,CAAA;CAAE,CA6C/C"}
+{"version":3,"file":"launch-settings.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/launch-settings.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;;;AAEH,OAAO,EAGL,uBAAuB,EACxB,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,uBAAuB,IAAI,gBAAgB,EAAE,CAAC;AAEvD;;;GAGG;AACH,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB;IAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAgBzD;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,IAAI,CAAA;CAAE,CAU/C"}

package/dist/cliproxy/executor/launch-settings.js

@@ -13,149 +13,49 @@
  * inherited process environment, so the persisted `ANTHROPIC_BASE_URL` (which
  * points straight at CLIProxy) overrides the proxy-chain URL CCS injected via
  * env. Claude then bypasses the proxy chain entirely — breaking tool-name
- * sanitization and Codex system-message folding (the latter surfaces as
- * `400 {"detail":"System messages are not allowed"}`).
+ * sanitization and Codex system-message folding.
  *
- * To keep the proxy chain authoritative regardless of Claude's env precedence,
- * we write a runtime copy of the settings file whose `env` routing keys are
- * overlaid with the resolved launch environment, and pass that copy to
- * `--settings`.
+ * This module delegates to the canonical `src/utils/launch-settings.ts` helper
+ * which unifies overlay and strip-based launch settings.
  */
-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.prepareLaunchSettings = exports.buildLaunchSettingsOverlay = void 0;
-const fs = __importStar(require("fs"));
-const os = __importStar(require("os"));
-const path = __importStar(require("path"));
-const shell_executor_1 = require("../../utils/shell-executor");
-const extended_context_utils_1 = require("../../shared/extended-context-utils");
-// SIBLING HELPER: src/utils/openai-compat-launch-settings.ts solves the same
-// "persisted --settings env clobbers runtime routing env" problem by STRIPPING
-// routing keys (process env wins by absence). This module instead OVERLAYS the
-// resolved values (settings wins by overwrite). The two differ intentionally:
-// strip vs overlay diverge when a key is present on disk but absent from the
-// process env. Unifying them needs an explicit force-absent API — see issue #1609.
-/**
- * Environment keys that control provider routing/model selection and are read
- * by Claude from the settings `env` block. These must reflect the resolved
- * proxy-chain environment, not the persisted on-disk values. Reuses the
- * canonical routing/model key lists from shell-executor, plus the extra model
- * keys the [1m] preference manages (subagent + startup default): a saved bare
- * value there would otherwise clobber the resolved --1m/--no-1m result.
- */
-const ROUTING_ENV_KEYS = [
-    ...shell_executor_1.ANTHROPIC_ROUTING_ENV_KEYS,
-    ...shell_executor_1.ANTHROPIC_MODEL_ENV_KEYS,
-    ...extended_context_utils_1.EXTRA_EXTENDED_CONTEXT_MODEL_ENV_KEYS,
-];
-function isRecord(value) {
-    return typeof value === 'object' && value !== null && !Array.isArray(value);
-}
+exports.prepareLaunchSettings = exports.buildLaunchSettingsOverlay = exports.ROUTING_ENV_KEYS = void 0;
+const launch_settings_1 = require("../../utils/launch-settings");
+Object.defineProperty(exports, "ROUTING_ENV_KEYS", { enumerable: true, get: function () { return launch_settings_1.LAUNCH_ROUTING_ENV_KEYS; } });
 /**
  * Build a settings object based on the persisted settings file, with routing
- * `env` keys overlaid from the resolved launch environment.
- *
- * @returns The merged settings and whether any routing key actually changed.
+ * env vars overlaid from the resolved launch environment.
  */
 function buildLaunchSettingsOverlay(settingsPath, env) {
     let base = {};
     try {
+        const fs = require('fs');
         if (fs.existsSync(settingsPath)) {
             const parsed = JSON.parse(fs.readFileSync(settingsPath, 'utf8'));
-            if (isRecord(parsed)) {
+            if (typeof parsed === 'object' && parsed !== null && !Array.isArray(parsed)) {
                 base = parsed;
             }
         }
     }
     catch {
-        // Corrupt/unreadable settings file: fall back to an env-only overlay.
         base = {};
     }
-    const mergedEnv = isRecord(base.env) ? { ...base.env } : {};
-    let changed = false;
-    for (const key of ROUTING_ENV_KEYS) {
-        const resolved = env[key];
-        if (typeof resolved === 'string' && mergedEnv[key] !== resolved) {
-            mergedEnv[key] = resolved;
-            changed = true;
-        }
-    }
-    return { settings: { ...base, env: mergedEnv }, changed };
+    const { settings, changed } = (0, launch_settings_1.buildUnifiedLaunchSettings)(base, { overlayEnv: env });
+    return { settings: settings, changed };
 }
 exports.buildLaunchSettingsOverlay = buildLaunchSettingsOverlay;
 /**
  * Prepare the settings file path to hand to `claude --settings`.
- *
- * When the resolved launch environment changes any routing key relative to the
- * persisted settings file (i.e. a proxy chain is active), a runtime overlay
- * file is written and its path returned together with a cleanup callback that
- * removes it. Otherwise the original `settingsPath` is returned unchanged and
- * cleanup is a no-op.
  */
 function prepareLaunchSettings(settingsPath, env) {
-    const noop = { settingsPath, cleanup: () => { } };
-    let overlay;
-    try {
-        overlay = buildLaunchSettingsOverlay(settingsPath, env);
-    }
-    catch {
-        return noop;
-    }
-    if (!overlay.changed) {
-        return noop;
-    }
-    try {
-        // Write to a private temp dir (matches createOpenAICompatLaunchSettings) so
-        // the overlay never lands in the user's ~/.ccs and is trivially isolated.
-        const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'ccs-launch-settings-'));
-        fs.chmodSync(tempDir, 0o700);
-        const runtimePath = path.join(tempDir, path.basename(settingsPath) || 'settings.json');
-        fs.writeFileSync(runtimePath, JSON.stringify(overlay.settings, null, 2) + '\n', {
-            encoding: 'utf8',
-            mode: 0o600,
-        });
-        let cleanedUp = false;
-        const cleanup = () => {
-            if (cleanedUp) {
-                return;
-            }
-            cleanedUp = true;
-            try {
-                fs.rmSync(tempDir, { recursive: true, force: true });
-            }
-            catch {
-                // best-effort cleanup
-            }
-        };
-        return { settingsPath: runtimePath, cleanup };
-    }
-    catch {
-        // If we cannot write the overlay, fall back to the persisted file. Routing
-        // may bypass the proxy chain, but the session still launches.
-        return noop;
-    }
+    const result = (0, launch_settings_1.createUnifiedLaunchSettings)(settingsPath, undefined, {
+        overlayEnv: env,
+        forceWrite: false,
+    });
+    return {
+        settingsPath: result.settingsPath,
+        cleanup: result.cleanup,
+    };
 }
 exports.prepareLaunchSettings = prepareLaunchSettings;
 //# sourceMappingURL=launch-settings.js.map

package/dist/cliproxy/executor/launch-settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"launch-settings.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/launch-settings.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"launch-settings.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/launch-settings.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;GAkBG;;;AAEH,iEAIqC;AAED,iGAHlC,yCAAuB,OAG2B;AAEpD;;;GAGG;AACH,SAAgB,0BAA0B,CACxC,YAAoB,EACpB,GAAsB;IAEtB,IAAI,IAAI,GAA4B,EAAE,CAAC;IACvC,IAAI,CAAC;QACH,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACzB,IAAI,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YAChC,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC;YAC1E,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC5E,IAAI,GAAG,MAAiC,CAAC;YAC3C,CAAC;QACH,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,IAAI,GAAG,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAA,4CAA0B,EAAC,IAAI,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;IACpF,OAAO,EAAE,QAAQ,EAAE,QAAmC,EAAE,OAAO,EAAE,CAAC;AACpE,CAAC;AAnBD,gEAmBC;AAED;;GAEG;AACH,SAAgB,qBAAqB,CACnC,YAAoB,EACpB,GAAsB;IAEtB,MAAM,MAAM,GAAG,IAAA,6CAA2B,EAAC,YAAY,EAAE,SAAS,EAAE;QAClE,UAAU,EAAE,GAAG;QACf,UAAU,EAAE,KAAK;KAClB,CAAC,CAAC;IAEH,OAAO;QACL,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,OAAO,EAAE,MAAM,CAAC,OAAO;KACxB,CAAC;AACJ,CAAC;AAbD,sDAaC"}

package/dist/utils/launch-settings.d.ts

@@ -0,0 +1,51 @@
+/// <reference types="node" />
+/// <reference types="bun-types" />
+import type { Settings } from '../types/config';
+/**
+ * Environment keys that control provider routing/model selection and are read
+ * by Claude CLI. Overlaid by default when an active proxy chain is resolved.
+ */
+export declare const LAUNCH_ROUTING_ENV_KEYS: readonly string[];
+export interface UnifiedLaunchSettingsOptions {
+    /**
+     * Key-value map of environment variables to overlay into the settings file's `env` block.
+     */
+    overlayEnv?: NodeJS.ProcessEnv | Record<string, string | undefined>;
+    /**
+     * Keys to explicitly strip/delete from the settings file's `env` block.
+     * Runs AFTER overlayEnv, guaranteeing these keys are completely absent from the output.
+     */
+    stripKeys?: readonly string[];
+    /**
+     * If true, also strip all default Anthropic routing keys via stripAnthropicRoutingEnv.
+     */
+    stripAnthropicRouting?: boolean;
+    /**
+     * When true, snapshot the isolated settings to a durable, profile-scoped
+     * cache directory (~/.ccs/cache/isolated-settings/<hash>/) using atomic temp-and-rename.
+     * Required for background fleet daemon respawns (Issue #1734).
+     */
+    durable?: boolean;
+    /**
+     * If false and no routing/strip changes occurred, ephemeral mode returns the original
+     * settingsPath without writing a temporary file. Defaults to false.
+     */
+    forceWrite?: boolean;
+}
+export interface UnifiedLaunchSettingsResult {
+    settingsPath: string;
+    cleanup: () => void;
+    changed: boolean;
+}
+/**
+ * Builds the modified settings JSON object by applying overlayEnv and stripKeys.
+ */
+export declare function buildUnifiedLaunchSettings(initialSettings: Settings | Record<string, unknown>, options?: UnifiedLaunchSettingsOptions): {
+    settings: Settings;
+    changed: boolean;
+};
+/**
+ * Prepares launch settings with unified overlay, strip, and durable/ephemeral isolation.
+ */
+export declare function createUnifiedLaunchSettings(sourceSettingsPath: string, initialSettings?: Settings | Record<string, unknown>, options?: UnifiedLaunchSettingsOptions): UnifiedLaunchSettingsResult;
+//# sourceMappingURL=launch-settings.d.ts.map

package/dist/utils/launch-settings.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"launch-settings.d.ts","sourceRoot":"","sources":["../../src/utils/launch-settings.ts"],"names":[],"mappings":";;AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAShD;;;GAGG;AACH,eAAO,MAAM,uBAAuB,EAAE,SAAS,MAAM,EAIpD,CAAC;AAEF,MAAM,WAAW,4BAA4B;IAC3C;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IACpE;;;OAGG;IACH,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC9B;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,2BAA2B;IAC1C,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;CAClB;AAMD;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,eAAe,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACnD,OAAO,CAAC,EAAE,4BAA4B,GACrC;IAAE,QAAQ,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAiD1C;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,kBAAkB,EAAE,MAAM,EAC1B,eAAe,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpD,OAAO,CAAC,EAAE,4BAA4B,GACrC,2BAA2B,CAoG7B"}

package/dist/utils/launch-settings.js

@@ -0,0 +1,190 @@
+"use strict";
+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.createUnifiedLaunchSettings = exports.buildUnifiedLaunchSettings = exports.LAUNCH_ROUTING_ENV_KEYS = void 0;
+const fs = __importStar(require("fs"));
+const os = __importStar(require("os"));
+const path = __importStar(require("path"));
+const crypto_1 = require("crypto");
+const config_manager_1 = require("./config-manager");
+const shell_executor_1 = require("./shell-executor");
+const extended_context_utils_1 = require("../shared/extended-context-utils");
+/**
+ * Environment keys that control provider routing/model selection and are read
+ * by Claude CLI. Overlaid by default when an active proxy chain is resolved.
+ */
+exports.LAUNCH_ROUTING_ENV_KEYS = [
+    ...shell_executor_1.ANTHROPIC_ROUTING_ENV_KEYS,
+    ...shell_executor_1.ANTHROPIC_MODEL_ENV_KEYS,
+    ...extended_context_utils_1.EXTRA_EXTENDED_CONTEXT_MODEL_ENV_KEYS,
+];
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+/**
+ * Builds the modified settings JSON object by applying overlayEnv and stripKeys.
+ */
+function buildUnifiedLaunchSettings(initialSettings, options) {
+    const base = JSON.parse(JSON.stringify(initialSettings));
+    let mergedEnv = isRecord(base.env) ? { ...base.env } : {};
+    let changed = false;
+    // 1. Apply overlayEnv if provided
+    if (options?.overlayEnv) {
+        const keysToCheck = exports.LAUNCH_ROUTING_ENV_KEYS;
+        for (const key of keysToCheck) {
+            const resolved = options.overlayEnv[key];
+            if (typeof resolved === 'string' && mergedEnv[key] !== resolved) {
+                mergedEnv[key] = resolved;
+                changed = true;
+            }
+        }
+    }
+    // 2. Strip Anthropic routing keys if requested
+    if (options?.stripAnthropicRouting) {
+        const beforeCount = Object.keys(mergedEnv).length;
+        mergedEnv = Object.fromEntries(Object.entries((0, shell_executor_1.stripAnthropicRoutingEnv)(mergedEnv)).filter((entry) => typeof entry[1] === 'string'));
+        if (Object.keys(mergedEnv).length !== beforeCount) {
+            changed = true;
+        }
+    }
+    // 3. Apply explicit stripKeys (forced-absent keys, e.g. ANTHROPIC_API_KEY)
+    if (options?.stripKeys && options.stripKeys.length > 0) {
+        for (const key of options.stripKeys) {
+            if (key in mergedEnv) {
+                delete mergedEnv[key];
+                changed = true;
+            }
+        }
+    }
+    // Clean up empty env
+    if (Object.keys(mergedEnv).length > 0) {
+        base.env = mergedEnv;
+    }
+    else if ('env' in base) {
+        delete base.env;
+        changed = true;
+    }
+    return { settings: base, changed };
+}
+exports.buildUnifiedLaunchSettings = buildUnifiedLaunchSettings;
+/**
+ * Prepares launch settings with unified overlay, strip, and durable/ephemeral isolation.
+ */
+function createUnifiedLaunchSettings(sourceSettingsPath, initialSettings, options) {
+    const noopResult = (changed) => ({
+        settingsPath: sourceSettingsPath,
+        cleanup: () => { },
+        changed,
+    });
+    let baseSettings = initialSettings ?? {};
+    if (!initialSettings && fs.existsSync(sourceSettingsPath)) {
+        try {
+            const parsed = JSON.parse(fs.readFileSync(sourceSettingsPath, 'utf8'));
+            if (isRecord(parsed)) {
+                baseSettings = parsed;
+            }
+        }
+        catch {
+            baseSettings = {};
+        }
+    }
+    const { settings, changed } = buildUnifiedLaunchSettings(baseSettings, options);
+    // If no change and forceWrite is false and not durable, return original path
+    if (!changed && !options?.forceWrite && !options?.durable) {
+        return noopResult(false);
+    }
+    const contentStr = JSON.stringify(settings, null, 2) + '\n';
+    const fileName = path.basename(sourceSettingsPath) || 'settings.json';
+    // 1. Durable mode: stored in ~/.ccs/cache/isolated-settings/<hash>/
+    if (options?.durable) {
+        const pathHash = (0, crypto_1.createHash)('sha256')
+            .update(path.resolve(sourceSettingsPath))
+            .digest('hex')
+            .slice(0, 16);
+        const durableDir = path.join((0, config_manager_1.getCcsDir)(), 'cache', 'isolated-settings', pathHash);
+        fs.mkdirSync(durableDir, { recursive: true, mode: 0o700 });
+        fs.chmodSync(durableDir, 0o700);
+        const targetPath = path.join(durableDir, fileName);
+        const tempFile = path.join(durableDir, `.${fileName}.${(0, crypto_1.randomUUID)()}.tmp`);
+        let renamed = false;
+        try {
+            fs.writeFileSync(tempFile, contentStr, {
+                encoding: 'utf8',
+                mode: 0o600,
+                flag: 'wx',
+            });
+            fs.renameSync(tempFile, targetPath);
+            renamed = true;
+        }
+        finally {
+            if (!renamed) {
+                try {
+                    fs.unlinkSync(tempFile);
+                }
+                catch {
+                    // ignore
+                }
+            }
+        }
+        return {
+            settingsPath: targetPath,
+            cleanup: () => { },
+            changed,
+        };
+    }
+    // 2. Ephemeral mode: os.tmpdir() with 0o700 / 0o600
+    try {
+        const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'ccs-launch-settings-'));
+        fs.chmodSync(tempDir, 0o700);
+        const runtimePath = path.join(tempDir, fileName);
+        fs.writeFileSync(runtimePath, contentStr, {
+            encoding: 'utf8',
+            mode: 0o600,
+        });
+        let cleanedUp = false;
+        const cleanup = () => {
+            if (cleanedUp) {
+                return;
+            }
+            cleanedUp = true;
+            try {
+                fs.rmSync(tempDir, { recursive: true, force: true });
+            }
+            catch {
+                // ignore
+            }
+        };
+        return {
+            settingsPath: runtimePath,
+            cleanup,
+            changed,
+        };
+    }
+    catch {
+        return noopResult(changed);
+    }
+}
+exports.createUnifiedLaunchSettings = createUnifiedLaunchSettings;
+//# sourceMappingURL=launch-settings.js.map

package/dist/utils/launch-settings.js.map

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

package/dist/utils/openai-compat-launch-settings.d.ts

@@ -6,12 +6,14 @@ export interface OpenAICompatLaunchSettings {
 export interface OpenAICompatLaunchSettingsOptions {
     /**
      * When true, snapshot the isolated settings to a durable, profile-scoped
-     * location under ~/.ccs/cache/isolated-settings/ instead of an ephemeral $TMPDIR.
-     * This ensures background fleet daemons respawning sessions can continue to read
-     * the settings file after the parent CCS launch process exits (Issue #1734).
-     * Default: false (ephemeral tempdir with automatic deletion on cleanup).
+     * cache directory (~/.ccs/cache/isolated-settings/<hash>/) using atomic temp-and-rename.
      */
     durable?: boolean;
 }
+/**
+ * Creates isolated launch settings for OpenAI-compatible profiles.
+ * Strips Anthropic routing variables and guarantees ANTHROPIC_API_KEY is absent
+ * so spawned processes route exclusively through proxyEnv without auth bypass.
+ */
 export declare function createOpenAICompatLaunchSettings(settingsPath: string, settings: Settings, options?: OpenAICompatLaunchSettingsOptions): OpenAICompatLaunchSettings;
 //# sourceMappingURL=openai-compat-launch-settings.d.ts.map

package/dist/utils/openai-compat-launch-settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openai-compat-launch-settings.d.ts","sourceRoot":"","sources":["../../src/utils/openai-compat-launch-settings.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAIhD,MAAM,WAAW,0BAA0B;IACzC,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,MAAM,WAAW,iCAAiC;IAChD;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAQD,wBAAgB,gCAAgC,CAC9C,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,iCAAiC,GAC1C,0BAA0B,CAoF5B"}
+{"version":3,"file":"openai-compat-launch-settings.d.ts","sourceRoot":"","sources":["../../src/utils/openai-compat-launch-settings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAOhD,MAAM,WAAW,0BAA0B;IACzC,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,MAAM,WAAW,iCAAiC;IAChD;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;;GAIG;AACH,wBAAgB,gCAAgC,CAC9C,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,iCAAiC,GAC1C,0BAA0B,CAkB5B"}

package/dist/utils/openai-compat-launch-settings.js

@@ -1,116 +1,23 @@
 "use strict";
-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.createOpenAICompatLaunchSettings = void 0;
-const fs = __importStar(require("fs"));
-const os = __importStar(require("os"));
-const path = __importStar(require("path"));
-const crypto_1 = require("crypto");
-const config_manager_1 = require("./config-manager");
-const shell_executor_1 = require("./shell-executor");
-// SIBLING HELPER: src/cliproxy/executor/launch-settings.ts (prepareLaunchSettings)
-// solves the same problem by OVERLAYING resolved routing values instead of
-// stripping them. This strip-based variant is required where callers deliberately
-// delete a routing key (e.g. ANTHROPIC_API_KEY in settings-flow) and need it
-// ABSENT from the launch settings. Do not unify without an explicit force-absent
-// key list — see issue #1609.
+const launch_settings_1 = require("./launch-settings");
+/**
+ * Creates isolated launch settings for OpenAI-compatible profiles.
+ * Strips Anthropic routing variables and guarantees ANTHROPIC_API_KEY is absent
+ * so spawned processes route exclusively through proxyEnv without auth bypass.
+ */
 function createOpenAICompatLaunchSettings(settingsPath, settings, options) {
-    const launchSettings = JSON.parse(JSON.stringify(settings));
-    const sanitizedEnv = Object.fromEntries(Object.entries((0, shell_executor_1.stripAnthropicRoutingEnv)({ ...(launchSettings.env ?? {}) })).filter((entry) => typeof entry[1] === 'string'));
-    if (Object.keys(sanitizedEnv).length > 0) {
-        launchSettings.env = sanitizedEnv;
-    }
-    else {
-        delete launchSettings.env;
-    }
-    const contentStr = JSON.stringify(launchSettings, null, 2) + '\n';
-    if (options?.durable) {
-        // Durable mode: key one private directory per canonical settings path so each
-        // profile has exactly one snapshot, atomically replaced on content updates.
-        // Do not fall back to $TMPDIR: failure here must fail the launch early rather than
-        // causing a deferred background fleet respawn crash (Issue #1734).
-        const pathHash = (0, crypto_1.createHash)('sha256')
-            .update(path.resolve(settingsPath))
-            .digest('hex')
-            .slice(0, 16);
-        const durableDir = path.join((0, config_manager_1.getCcsDir)(), 'cache', 'isolated-settings', pathHash);
-        fs.mkdirSync(durableDir, { recursive: true, mode: 0o700 });
-        fs.chmodSync(durableDir, 0o700);
-        const launchSettingsPath = path.join(durableDir, path.basename(settingsPath));
-        const tempFile = path.join(durableDir, `.${path.basename(settingsPath)}.${(0, crypto_1.randomUUID)()}.tmp`);
-        let renamed = false;
-        try {
-            fs.writeFileSync(tempFile, contentStr, {
-                encoding: 'utf8',
-                mode: 0o600,
-                flag: 'wx',
-            });
-            fs.renameSync(tempFile, launchSettingsPath);
-            renamed = true;
-        }
-        finally {
-            if (!renamed) {
-                try {
-                    fs.unlinkSync(tempFile);
-                }
-                catch {
-                    // best-effort cleanup on failure
-                }
-            }
-        }
-        return {
-            settingsPath: launchSettingsPath,
-            cleanup: () => {
-                // No-op in durable mode: snapshot persists for background fleet daemon respawns.
-            },
-        };
-    }
-    // Ephemeral mode (default / headless): create isolated tempdir in os.tmpdir() and purge on cleanup.
-    const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'ccs-openai-compat-settings-'));
-    fs.chmodSync(tempDir, 0o700);
-    const launchSettingsPath = path.join(tempDir, path.basename(settingsPath));
-    fs.writeFileSync(launchSettingsPath, contentStr, {
-        encoding: 'utf8',
-        mode: 0o600,
-    });
-    let cleanedUp = false;
-    const cleanup = () => {
-        if (cleanedUp) {
-            return;
-        }
-        cleanedUp = true;
-        try {
-            fs.rmSync(tempDir, { recursive: true, force: true });
-        }
-        catch {
-            // best-effort cleanup
-        }
+    const unifiedOptions = {
+        stripAnthropicRouting: true,
+        stripKeys: ['ANTHROPIC_API_KEY'],
+        durable: options?.durable,
+        forceWrite: true,
     };
+    const result = (0, launch_settings_1.createUnifiedLaunchSettings)(settingsPath, settings, unifiedOptions);
     return {
-        settingsPath: launchSettingsPath,
-        cleanup,
+        settingsPath: result.settingsPath,
+        cleanup: result.cleanup,
     };
 }
 exports.createOpenAICompatLaunchSettings = createOpenAICompatLaunchSettings;

package/dist/utils/openai-compat-launch-settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"openai-compat-launch-settings.js","sourceRoot":"","sources":["../../src/utils/openai-compat-launch-settings.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"openai-compat-launch-settings.js","sourceRoot":"","sources":["../../src/utils/openai-compat-launch-settings.ts"],"names":[],"mappings":";;;AACA,uDAI2B;AAe3B;;;;GAIG;AACH,SAAgB,gCAAgC,CAC9C,YAAoB,EACpB,QAAkB,EAClB,OAA2C;IAE3C,MAAM,cAAc,GAAiC;QACnD,qBAAqB,EAAE,IAAI;QAC3B,SAAS,EAAE,CAAC,mBAAmB,CAAC;QAChC,OAAO,EAAE,OAAO,EAAE,OAAO;QACzB,UAAU,EAAE,IAAI;KACjB,CAAC;IAEF,MAAM,MAAM,GAAgC,IAAA,6CAA2B,EACrE,YAAY,EACZ,QAAQ,EACR,cAAc,CACf,CAAC;IAEF,OAAO;QACL,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,OAAO,EAAE,MAAM,CAAC,OAAO;KACxB,CAAC;AACJ,CAAC;AAtBD,4EAsBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaitranntt/ccs",
-  "version": "8.10.0-dev.20",
+  "version": "8.10.0-dev.21",
   "description": "Claude Codex Switch - Instant profile switching between Claude, GLM, Kimi, and more",
   "keywords": [
     "cli",