theclawbay 0.3.54 → 0.3.56

package/dist/commands/logout.js

@@ -27,6 +27,13 @@ const SHELL_START = "# theclawbay-shell-managed:start";
 const SHELL_END = "# theclawbay-shell-managed:end";
 const ENV_FILE = node_path_1.default.join(paths_1.theclawbayConfigDir, "env");
 const ENV_KEY_NAME = "THECLAWBAY_API_KEY";
+const CLAUDE_ENV_API_KEY_NAME = "ANTHROPIC_API_KEY";
+const CLAUDE_ENV_BASE_URL_NAME = "ANTHROPIC_BASE_URL";
+const CLAUDE_ENV_SIMPLE_MODE_NAME = "CLAUDE_CODE_SIMPLE";
+const CLAUDE_ENV_DISABLE_NONESSENTIAL_TRAFFIC_NAME = "CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC";
+const CLAUDE_ENV_ENABLE_TELEMETRY_NAME = "CLAUDE_CODE_ENABLE_TELEMETRY";
+const CLAUDE_CODE_EDITOR_ENV_SETTING = "claudeCode.environmentVariables";
+const CLAUDE_CODE_EDITOR_DISABLE_LOGIN_PROMPT_SETTING = "claudeCode.disableLoginPrompt";
 const CONTINUE_CONFIG_PATH = node_path_1.default.join(node_os_1.default.homedir(), ".continue", "config.yaml");
 const CLINE_GLOBAL_STATE_PATH = node_path_1.default.join(node_os_1.default.homedir(), ".cline", "data", "globalState.json");
 const CLINE_SECRETS_PATH = node_path_1.default.join(node_os_1.default.homedir(), ".cline", "data", "secrets.json");
@@ -40,6 +47,9 @@ const GSD_RESTORE_STATE_PATH = node_path_1.default.join(paths_1.theclawbayStateD
 const OPENCODE_RESTORE_STATE_PATH = node_path_1.default.join(paths_1.theclawbayStateDir, "opencode.restore.json");
 const KILO_RESTORE_STATE_PATH = node_path_1.default.join(paths_1.theclawbayStateDir, "kilo.restore.json");
 const ROO_SETTINGS_STATE_PATH = node_path_1.default.join(paths_1.theclawbayStateDir, "roo-settings.restore.json");
+const EDITOR_TERMINAL_ENV_STATE_PATH = node_path_1.default.join(paths_1.theclawbayStateDir, "editor-terminal-env.restore.json");
+const CLAUDE_EDITOR_SETTINGS_STATE_PATH = node_path_1.default.join(paths_1.theclawbayStateDir, "claude-editor-settings.restore.json");
+const CODEX_FEATURE_FLAGS_STATE_PATH = node_path_1.default.join(paths_1.theclawbayStateDir, "codex-features.restore.json");
 const ROO_IMPORT_FILE = node_path_1.default.join(paths_1.theclawbayConfigDir, "roo-code-settings.json");
 const MIGRATION_STATE_FILE = node_path_1.default.join(paths_1.codexDir, "theclawbay.migration.json");
 const HISTORY_PROVIDER_NEUTRALIZE_SOURCES = new Set([
@@ -126,6 +136,118 @@ function removeTopLevelProviderSelection(source) {
     }
     return `${filtered.join("\n").trimEnd()}\n`;
 }
+function removeTopLevelKeyLineIf(source, key, shouldRemove) {
+    const lines = source.split(/\r?\n/);
+    const filtered = [];
+    let removed = false;
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i] ?? "";
+        if (/^\s*\[/.test(line)) {
+            filtered.push(...lines.slice(i));
+            break;
+        }
+        if (/^\s*#/.test(line) || !line.trim()) {
+            filtered.push(line);
+            continue;
+        }
+        const match = line.match(new RegExp(`^\\s*${key}\\s*=\\s*\"([^\"]*)\"\\s*$`));
+        if (!match) {
+            filtered.push(line);
+            continue;
+        }
+        if (shouldRemove(match[1] ?? "")) {
+            removed = true;
+            continue;
+        }
+        filtered.push(line);
+    }
+    if (!removed)
+        return source;
+    return `${filtered.join("\n").trimEnd()}\n`;
+}
+function setTopLevelTableKey(source, tableName, key, tomlValue) {
+    const header = `[${tableName}]`;
+    const lines = source.split(/\r?\n/);
+    let tableStart = -1;
+    for (let i = 0; i < lines.length; i++) {
+        if ((lines[i] ?? "").trim() === header) {
+            tableStart = i;
+            break;
+        }
+    }
+    if (tableStart < 0) {
+        const block = `${header}\n${key} = ${tomlValue}\n`;
+        if (!source.trim())
+            return block;
+        return `${source.trimEnd()}\n\n${block}`;
+    }
+    let tableEnd = lines.length;
+    for (let i = tableStart + 1; i < lines.length; i++) {
+        if (/^\s*\[[^\]]+\]\s*$/.test(lines[i] ?? "")) {
+            tableEnd = i;
+            break;
+        }
+    }
+    for (let i = tableStart + 1; i < tableEnd; i++) {
+        const line = lines[i] ?? "";
+        if (/^\s*#/.test(line))
+            continue;
+        if (new RegExp(`^\\s*${key}\\s*=`).test(line)) {
+            lines[i] = `${key} = ${tomlValue}`;
+            return `${lines.join("\n").trimEnd()}\n`;
+        }
+    }
+    lines.splice(tableEnd, 0, `${key} = ${tomlValue}`);
+    return `${lines.join("\n").trimEnd()}\n`;
+}
+function removeTopLevelTableKey(source, tableName, key) {
+    const header = `[${tableName}]`;
+    const lines = source.split(/\r?\n/);
+    let tableStart = -1;
+    for (let i = 0; i < lines.length; i++) {
+        if ((lines[i] ?? "").trim() === header) {
+            tableStart = i;
+            break;
+        }
+    }
+    if (tableStart < 0)
+        return source;
+    let tableEnd = lines.length;
+    for (let i = tableStart + 1; i < lines.length; i++) {
+        if (/^\s*\[[^\]]+\]\s*$/.test(lines[i] ?? "")) {
+            tableEnd = i;
+            break;
+        }
+    }
+    let removed = false;
+    const nextLines = [...lines];
+    for (let i = tableStart + 1; i < tableEnd; i++) {
+        const line = nextLines[i] ?? "";
+        if (/^\s*#/.test(line))
+            continue;
+        if (new RegExp(`^\\s*${key}\\s*=`).test(line)) {
+            nextLines.splice(i, 1);
+            removed = true;
+            break;
+        }
+    }
+    if (!removed)
+        return source;
+    return `${nextLines.join("\n").trimEnd()}\n`;
+}
+function isTheClawBayChatgptBaseUrl(value) {
+    const trimmed = value.trim().replace(/\/+$/g, "");
+    if (!trimmed)
+        return false;
+    try {
+        const parsed = new URL(trimmed);
+        const hostname = parsed.hostname.toLowerCase();
+        return hostname === THECLAWBAY_CANONICAL_API_HOST || THECLAWBAY_WEBSITE_HOSTS.has(hostname);
+    }
+    catch {
+        return false;
+    }
+}
 async function readFileIfExists(filePath) {
     try {
         return await promises_1.default.readFile(filePath, "utf8");
@@ -321,6 +443,7 @@ async function cleanupCodexConfig() {
     next = removeManagedBlock(next, MANAGED_START, MANAGED_END);
     next = removeProviderTable(next, DEFAULT_PROVIDER_ID);
     next = removeTopLevelProviderSelection(next);
+    next = removeTopLevelKeyLineIf(next, "chatgpt_base_url", isTheClawBayChatgptBaseUrl);
     return writeIfChanged(configPath, next, existing);
 }
 async function cleanupContinueConfig() {
@@ -675,6 +798,131 @@ async function cleanupVsCodeHooks() {
     }
     return updated;
 }
+function terminalIntegratedEnvSettingsKey() {
+    if (node_os_1.default.platform() === "darwin")
+        return "terminal.integrated.env.osx";
+    if (node_os_1.default.platform() === "win32")
+        return "terminal.integrated.env.windows";
+    return "terminal.integrated.env.linux";
+}
+async function cleanupEditorTerminalEnvSettings() {
+    const snapshotRaw = await readFileIfExists(EDITOR_TERMINAL_ENV_STATE_PATH);
+    if (snapshotRaw === null || !snapshotRaw.trim())
+        return [];
+    let entries = [];
+    try {
+        entries = JSON.parse(snapshotRaw);
+    }
+    catch {
+        return [];
+    }
+    const settingsKey = terminalIntegratedEnvSettingsKey();
+    const updated = [];
+    for (const entry of entries) {
+        const settings = await readJsonObjectFile(entry.settingsPath);
+        if (!entry.hadKey) {
+            if (Object.prototype.hasOwnProperty.call(settings, settingsKey)) {
+                delete settings[settingsKey];
+            }
+        }
+        else {
+            settings[settingsKey] = entry.previousValue;
+        }
+        if (entry.existed || Object.keys(settings).length > 0) {
+            const next = `${JSON.stringify(settings, null, 2)}\n`;
+            const existing = await readFileIfExists(entry.settingsPath);
+            if (existing !== next) {
+                await promises_1.default.mkdir(node_path_1.default.dirname(entry.settingsPath), { recursive: true });
+                await promises_1.default.writeFile(entry.settingsPath, next, "utf8");
+                updated.push(entry.settingsPath);
+            }
+            continue;
+        }
+        if (await removeFileIfExists(entry.settingsPath)) {
+            updated.push(entry.settingsPath);
+        }
+    }
+    await removeFileIfExists(EDITOR_TERMINAL_ENV_STATE_PATH);
+    return updated;
+}
+async function cleanupClaudeEditorSettings() {
+    const snapshotRaw = await readFileIfExists(CLAUDE_EDITOR_SETTINGS_STATE_PATH);
+    if (snapshotRaw === null || !snapshotRaw.trim())
+        return [];
+    let entries = [];
+    try {
+        entries = JSON.parse(snapshotRaw);
+    }
+    catch {
+        return [];
+    }
+    const updated = [];
+    for (const entry of entries) {
+        const settings = await readJsonObjectFile(entry.settingsPath);
+        if (!entry.envHadKey) {
+            delete settings[CLAUDE_CODE_EDITOR_ENV_SETTING];
+        }
+        else {
+            settings[CLAUDE_CODE_EDITOR_ENV_SETTING] = entry.envPreviousValue;
+        }
+        if (!entry.disableLoginPromptHadKey) {
+            delete settings[CLAUDE_CODE_EDITOR_DISABLE_LOGIN_PROMPT_SETTING];
+        }
+        else {
+            settings[CLAUDE_CODE_EDITOR_DISABLE_LOGIN_PROMPT_SETTING] = entry.disableLoginPromptPreviousValue;
+        }
+        if (entry.existed || Object.keys(settings).length > 0) {
+            const next = `${JSON.stringify(settings, null, 2)}\n`;
+            const existing = await readFileIfExists(entry.settingsPath);
+            if (existing !== next) {
+                await promises_1.default.mkdir(node_path_1.default.dirname(entry.settingsPath), { recursive: true });
+                await promises_1.default.writeFile(entry.settingsPath, next, "utf8");
+                updated.push(entry.settingsPath);
+            }
+            continue;
+        }
+        if (await removeFileIfExists(entry.settingsPath)) {
+            updated.push(entry.settingsPath);
+        }
+    }
+    await removeFileIfExists(CLAUDE_EDITOR_SETTINGS_STATE_PATH);
+    return updated;
+}
+async function cleanupCodexFeatureFlags() {
+    const snapshotRaw = await readFileIfExists(CODEX_FEATURE_FLAGS_STATE_PATH);
+    if (snapshotRaw === null || !snapshotRaw.trim())
+        return false;
+    let snapshot = null;
+    try {
+        snapshot = JSON.parse(snapshotRaw);
+    }
+    catch {
+        snapshot = null;
+    }
+    if (!snapshot)
+        return false;
+    const configPath = node_path_1.default.join(paths_1.codexDir, "config.toml");
+    const existing = await readFileIfExists(configPath);
+    if (existing === null) {
+        await removeFileIfExists(CODEX_FEATURE_FLAGS_STATE_PATH);
+        return false;
+    }
+    let next = existing;
+    if (snapshot.appsHadKey && snapshot.appsPreviousValue !== null) {
+        next = setTopLevelTableKey(next, "features", "apps", snapshot.appsPreviousValue);
+    }
+    else {
+        next = removeTopLevelTableKey(next, "features", "apps");
+    }
+    if (snapshot.appsMcpGatewayHadKey && snapshot.appsMcpGatewayPreviousValue !== null) {
+        next = setTopLevelTableKey(next, "features", "apps_mcp_gateway", snapshot.appsMcpGatewayPreviousValue);
+    }
+    else {
+        next = removeTopLevelTableKey(next, "features", "apps_mcp_gateway");
+    }
+    await removeFileIfExists(CODEX_FEATURE_FLAGS_STATE_PATH);
+    return writeIfChanged(configPath, next, existing);
+}
 async function cleanupOpenClawConfig() {
     const configPath = node_path_1.default.join(node_os_1.default.homedir(), ".openclaw", "openclaw.json");
     const existingRaw = await readFileIfExists(configPath);
@@ -937,7 +1185,10 @@ class LogoutCommand extends base_command_1.BaseCommand {
             let updatedShellFiles = [];
             let updatedPowerShellProfiles = [];
             let updatedVsCodeHooks = [];
+            let updatedEditorTerminalSettings = [];
+            let updatedClaudeEditorSettings = [];
             let updatedCodexConfig = false;
+            let updatedCodexFeatures = false;
             let updatedContinueConfig = false;
             let updatedClineConfig = false;
             let updatedGsdConfig = false;
@@ -986,8 +1237,11 @@ class LogoutCommand extends base_command_1.BaseCommand {
                 updatedShellFiles = await cleanupShellFiles();
                 updatedPowerShellProfiles = await cleanupPowerShellProfiles();
                 updatedVsCodeHooks = await cleanupVsCodeHooks();
+                updatedEditorTerminalSettings = await cleanupEditorTerminalEnvSettings();
+                updatedClaudeEditorSettings = await cleanupClaudeEditorSettings();
                 progress.update("Reverting Codex");
                 updatedCodexConfig = await cleanupCodexConfig();
+                updatedCodexFeatures = await cleanupCodexFeatureFlags();
                 sessionMigration = await (0, codex_history_migration_1.migrateSessionProviders)({
                     codexHome: paths_1.codexDir,
                     migrationStateFile: MIGRATION_STATE_FILE,
@@ -1028,8 +1282,11 @@ class LogoutCommand extends base_command_1.BaseCommand {
                 throw error;
             }
             delete process.env[ENV_KEY_NAME];
-            delete process.env.ANTHROPIC_API_KEY;
-            delete process.env.ANTHROPIC_BASE_URL;
+            delete process.env[CLAUDE_ENV_API_KEY_NAME];
+            delete process.env[CLAUDE_ENV_BASE_URL_NAME];
+            delete process.env[CLAUDE_ENV_SIMPLE_MODE_NAME];
+            delete process.env[CLAUDE_ENV_DISABLE_NONESSENTIAL_TRAFFIC_NAME];
+            delete process.env[CLAUDE_ENV_ENABLE_TELEMETRY_NAME];
             if (!debugOutput && process.stdout.isTTY) {
                 progress.succeed("Logout complete");
             }
@@ -1038,7 +1295,10 @@ class LogoutCommand extends base_command_1.BaseCommand {
             }
             const revertedTargets = [];
             const codexChanged = updatedCodexConfig ||
+                updatedCodexFeatures ||
                 updatedVsCodeHooks.length > 0 ||
+                updatedEditorTerminalSettings.length > 0 ||
+                updatedClaudeEditorSettings.length > 0 ||
                 sessionMigration.rewritten > 0 ||
                 sessionMigration.retimed > 0 ||
                 stateDbMigration.updated > 0 ||
@@ -1086,7 +1346,9 @@ class LogoutCommand extends base_command_1.BaseCommand {
                         removedEnvFile ||
                         updatedShellFiles.length > 0 ||
                         updatedPowerShellProfiles.length > 0 ||
-                        updatedVsCodeHooks.length > 0,
+                        updatedVsCodeHooks.length > 0 ||
+                        updatedEditorTerminalSettings.length > 0 ||
+                        updatedClaudeEditorSettings.length > 0,
                     notes: Array.from(summaryNotes),
                 });
                 return;
@@ -1102,7 +1364,10 @@ class LogoutCommand extends base_command_1.BaseCommand {
             this.log(`- Shell profiles updated: ${updatedShellFiles.length ? updatedShellFiles.join(", ") : "none"}`);
             this.log(`- PowerShell profiles updated: ${updatedPowerShellProfiles.length ? updatedPowerShellProfiles.join(", ") : "none"}`);
             this.log(`- VS Code env hooks updated: ${updatedVsCodeHooks.length ? updatedVsCodeHooks.join(", ") : "none"}`);
+            this.log(`- Editor terminal env updated: ${updatedEditorTerminalSettings.length ? updatedEditorTerminalSettings.join(", ") : "none"}`);
+            this.log(`- Claude editor settings updated: ${updatedClaudeEditorSettings.length ? updatedClaudeEditorSettings.join(", ") : "none"}`);
             this.log(`- Codex config cleaned: ${updatedCodexConfig ? "yes" : "no"}`);
+            this.log(`- Codex Apps feature flags restored: ${updatedCodexFeatures ? "yes" : "no"}`);
             if (sessionMigration.rewritten > 0) {
                 this.log(`- Conversations: updated ${sessionMigration.rewritten}/${sessionMigration.scanned} local sessions for cross-provider visibility.`);
             }

package/dist/commands/setup.js

@@ -42,6 +42,18 @@ const ENV_KEY_NAME = "THECLAWBAY_API_KEY";
 const CLAUDE_ENV_API_KEY_NAME = "ANTHROPIC_API_KEY";
 const CLAUDE_ENV_BASE_URL_NAME = "ANTHROPIC_BASE_URL";
 const CLAUDE_ENV_SIMPLE_MODE_NAME = "CLAUDE_CODE_SIMPLE";
+const CLAUDE_ENV_DISABLE_NONESSENTIAL_TRAFFIC_NAME = "CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC";
+const CLAUDE_ENV_ENABLE_TELEMETRY_NAME = "CLAUDE_CODE_ENABLE_TELEMETRY";
+const CLAUDE_CODE_EDITOR_ENV_SETTING = "claudeCode.environmentVariables";
+const CLAUDE_CODE_EDITOR_DISABLE_LOGIN_PROMPT_SETTING = "claudeCode.disableLoginPrompt";
+const MANAGED_EDITOR_TERMINAL_ENV_NAMES = [
+    ENV_KEY_NAME,
+    CLAUDE_ENV_API_KEY_NAME,
+    CLAUDE_ENV_BASE_URL_NAME,
+    CLAUDE_ENV_SIMPLE_MODE_NAME,
+    CLAUDE_ENV_DISABLE_NONESSENTIAL_TRAFFIC_NAME,
+    CLAUDE_ENV_ENABLE_TELEMETRY_NAME,
+];
 const ENV_FILE = node_path_1.default.join(paths_1.theclawbayConfigDir, "env");
 const CONTINUE_CONFIG_PATH = node_path_1.default.join(node_os_1.default.homedir(), ".continue", "config.yaml");
 const CLINE_GLOBAL_STATE_PATH = node_path_1.default.join(node_os_1.default.homedir(), ".cline", "data", "globalState.json");
@@ -56,6 +68,9 @@ const GSD_RESTORE_STATE_PATH = node_path_1.default.join(paths_1.theclawbayStateD
 const OPENCODE_RESTORE_STATE_PATH = node_path_1.default.join(paths_1.theclawbayStateDir, "opencode.restore.json");
 const KILO_RESTORE_STATE_PATH = node_path_1.default.join(paths_1.theclawbayStateDir, "kilo.restore.json");
 const ROO_SETTINGS_STATE_PATH = node_path_1.default.join(paths_1.theclawbayStateDir, "roo-settings.restore.json");
+const EDITOR_TERMINAL_ENV_STATE_PATH = node_path_1.default.join(paths_1.theclawbayStateDir, "editor-terminal-env.restore.json");
+const CLAUDE_EDITOR_SETTINGS_STATE_PATH = node_path_1.default.join(paths_1.theclawbayStateDir, "claude-editor-settings.restore.json");
+const CODEX_FEATURE_FLAGS_STATE_PATH = node_path_1.default.join(paths_1.theclawbayStateDir, "codex-features.restore.json");
 const ROO_IMPORT_FILE = node_path_1.default.join(paths_1.theclawbayConfigDir, "roo-code-settings.json");
 const MIGRATION_STATE_FILE = node_path_1.default.join(paths_1.codexDir, "theclawbay.migration.json");
 const MANAGED_START = "# theclawbay-managed:start";
@@ -455,6 +470,99 @@ function upsertFirstKeyLine(source, key, tomlValue) {
     }
     return `${`${key} = ${tomlValue}\n${source}`.trimEnd()}\n`;
 }
+function parseTomlScalarValue(line) {
+    const match = line.match(/^\s*[A-Za-z0-9_.-]+\s*=\s*(.+?)\s*$/);
+    return match?.[1]?.trim() ?? null;
+}
+function upsertTopLevelTableKey(source, tableName, key, tomlValue) {
+    const header = `[${tableName}]`;
+    const lines = source.split(/\r?\n/);
+    let tableStart = -1;
+    for (let i = 0; i < lines.length; i++) {
+        if ((lines[i] ?? "").trim() === header) {
+            tableStart = i;
+            break;
+        }
+    }
+    if (tableStart < 0) {
+        const block = `${header}\n${key} = ${tomlValue}\n`;
+        if (!source.trim())
+            return block;
+        return `${source.trimEnd()}\n\n${block}`;
+    }
+    let tableEnd = lines.length;
+    for (let i = tableStart + 1; i < lines.length; i++) {
+        if (/^\s*\[[^\]]+\]\s*$/.test(lines[i] ?? "")) {
+            tableEnd = i;
+            break;
+        }
+    }
+    for (let i = tableStart + 1; i < tableEnd; i++) {
+        const line = lines[i] ?? "";
+        if (/^\s*#/.test(line))
+            continue;
+        if (new RegExp(`^\\s*${key}\\s*=`).test(line)) {
+            lines[i] = `${key} = ${tomlValue}`;
+            return `${lines.join("\n").trimEnd()}\n`;
+        }
+    }
+    lines.splice(tableEnd, 0, `${key} = ${tomlValue}`);
+    return `${lines.join("\n").trimEnd()}\n`;
+}
+function readTopLevelTableKeyValue(source, tableName, key) {
+    const header = `[${tableName}]`;
+    const lines = source.split(/\r?\n/);
+    let tableStart = -1;
+    for (let i = 0; i < lines.length; i++) {
+        if ((lines[i] ?? "").trim() === header) {
+            tableStart = i;
+            break;
+        }
+    }
+    if (tableStart < 0) {
+        return { hadTable: false, hadKey: false, value: null };
+    }
+    for (let i = tableStart + 1; i < lines.length; i++) {
+        const line = lines[i] ?? "";
+        if (/^\s*\[[^\]]+\]\s*$/.test(line))
+            break;
+        if (/^\s*#/.test(line) || !line.trim())
+            continue;
+        if (new RegExp(`^\\s*${key}\\s*=`).test(line)) {
+            return { hadTable: true, hadKey: true, value: parseTomlScalarValue(line) };
+        }
+    }
+    return { hadTable: true, hadKey: false, value: null };
+}
+function removeTopLevelKeyLineIf(source, key, shouldRemove) {
+    const lines = source.split(/\r?\n/);
+    const filtered = [];
+    let removed = false;
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i] ?? "";
+        if (/^\s*\[/.test(line)) {
+            filtered.push(...lines.slice(i));
+            break;
+        }
+        if (/^\s*#/.test(line) || !line.trim()) {
+            filtered.push(line);
+            continue;
+        }
+        const match = line.match(new RegExp(`^\\s*${key}\\s*=\\s*\"([^\"]*)\"\\s*$`));
+        if (!match) {
+            filtered.push(line);
+            continue;
+        }
+        if (shouldRemove(match[1] ?? "")) {
+            removed = true;
+            continue;
+        }
+        filtered.push(line);
+    }
+    if (!removed)
+        return source;
+    return `${filtered.join("\n").trimEnd()}\n`;
+}
 function shellQuote(value) {
     return `'${value.replace(/'/g, `'\\''`)}'`;
 }
@@ -480,6 +588,19 @@ function publicApiOriginForBackendUrl(backendUrl) {
         return trimmed;
     }
 }
+function isTheClawBayChatgptBaseUrl(value) {
+    const trimmed = trimTrailingSlash(value.trim());
+    if (!trimmed)
+        return false;
+    try {
+        const parsed = new URL(trimmed);
+        const hostname = parsed.hostname.toLowerCase();
+        return hostname === THECLAWBAY_CANONICAL_API_HOST || THECLAWBAY_WEBSITE_HOSTS.has(hostname);
+    }
+    catch {
+        return false;
+    }
+}
 function openAiCompatibleProxyUrl(backendUrl) {
     return `${publicApiOriginForBackendUrl(backendUrl)}${CANONICAL_THECLAWBAY_OPENAI_PROXY_SUFFIX}`;
 }
@@ -1305,7 +1426,22 @@ async function writeCodexConfig(params) {
     next = removeProviderTable(next, DEFAULT_PROVIDER_ID);
     next = upsertFirstKeyLine(next, "model_provider", `"${DEFAULT_PROVIDER_ID}"`);
     next = upsertFirstKeyLine(next, "model", `"${params.model}"`);
-    next = upsertFirstKeyLine(next, "chatgpt_base_url", `"${proxyRoot}"`);
+    next = removeTopLevelKeyLineIf(next, "chatgpt_base_url", isTheClawBayChatgptBaseUrl);
+    const existingFeatureSnapshot = await readFileIfExists(CODEX_FEATURE_FLAGS_STATE_PATH);
+    if (!existingFeatureSnapshot?.trim()) {
+        const appsState = readTopLevelTableKeyValue(next, "features", "apps");
+        const appsMcpGatewayState = readTopLevelTableKeyValue(next, "features", "apps_mcp_gateway");
+        const snapshot = {
+            hadFeaturesTable: appsState.hadTable || appsMcpGatewayState.hadTable,
+            appsHadKey: appsState.hadKey,
+            appsPreviousValue: appsState.value,
+            appsMcpGatewayHadKey: appsMcpGatewayState.hadKey,
+            appsMcpGatewayPreviousValue: appsMcpGatewayState.value,
+        };
+        await writeJsonObjectFile(CODEX_FEATURE_FLAGS_STATE_PATH, snapshot, 0o600);
+    }
+    next = upsertTopLevelTableKey(next, "features", "apps", "false");
+    next = upsertTopLevelTableKey(next, "features", "apps_mcp_gateway", "false");
     const managedBlock = appendManagedBlock("", [
         MANAGED_START,
         `[model_providers.${DEFAULT_PROVIDER_ID}]`,
@@ -1563,7 +1699,7 @@ async function persistApiKeyEnv(params) {
         `export ${ENV_KEY_NAME}=${shellQuote(params.apiKey)}`,
     ];
     if (params.claudeEnabled) {
-        envLines.push("", "# Official Claude Code CLI", `export ${CLAUDE_ENV_API_KEY_NAME}=${shellQuote(params.apiKey)}`, `export ${CLAUDE_ENV_BASE_URL_NAME}=${shellQuote(anthropicCompatibleProxyUrl(params.backendUrl))}`, `export ${CLAUDE_ENV_SIMPLE_MODE_NAME}=1`);
+        envLines.push("", "# Official Claude Code CLI", `export ${CLAUDE_ENV_API_KEY_NAME}=${shellQuote(params.apiKey)}`, `export ${CLAUDE_ENV_BASE_URL_NAME}=${shellQuote(anthropicCompatibleProxyUrl(params.backendUrl))}`, `export ${CLAUDE_ENV_SIMPLE_MODE_NAME}=1`, `export ${CLAUDE_ENV_DISABLE_NONESSENTIAL_TRAFFIC_NAME}=1`, `export ${CLAUDE_ENV_ENABLE_TELEMETRY_NAME}=0`);
     }
     const envContents = `${envLines.join("\n")}\n`;
     await promises_1.default.writeFile(ENV_FILE, envContents, "utf8");
@@ -1599,11 +1735,15 @@ async function persistApiKeyEnv(params) {
         process.env[CLAUDE_ENV_API_KEY_NAME] = params.apiKey;
         process.env[CLAUDE_ENV_BASE_URL_NAME] = anthropicCompatibleProxyUrl(params.backendUrl);
         process.env[CLAUDE_ENV_SIMPLE_MODE_NAME] = "1";
+        process.env[CLAUDE_ENV_DISABLE_NONESSENTIAL_TRAFFIC_NAME] = "1";
+        process.env[CLAUDE_ENV_ENABLE_TELEMETRY_NAME] = "0";
     }
     else {
         delete process.env[CLAUDE_ENV_API_KEY_NAME];
         delete process.env[CLAUDE_ENV_BASE_URL_NAME];
         delete process.env[CLAUDE_ENV_SIMPLE_MODE_NAME];
+        delete process.env[CLAUDE_ENV_DISABLE_NONESSENTIAL_TRAFFIC_NAME];
+        delete process.env[CLAUDE_ENV_ENABLE_TELEMETRY_NAME];
     }
     return updated;
 }
@@ -1615,7 +1755,7 @@ async function persistFishEnv(params) {
         `set -gx ${ENV_KEY_NAME} ${shellQuote(params.apiKey)}`,
     ];
     if (params.claudeEnabled) {
-        lines.push("", "# Official Claude Code CLI", `set -gx ${CLAUDE_ENV_API_KEY_NAME} ${shellQuote(params.apiKey)}`, `set -gx ${CLAUDE_ENV_BASE_URL_NAME} ${shellQuote(anthropicCompatibleProxyUrl(params.backendUrl))}`, `set -gx ${CLAUDE_ENV_SIMPLE_MODE_NAME} 1`);
+        lines.push("", "# Official Claude Code CLI", `set -gx ${CLAUDE_ENV_API_KEY_NAME} ${shellQuote(params.apiKey)}`, `set -gx ${CLAUDE_ENV_BASE_URL_NAME} ${shellQuote(anthropicCompatibleProxyUrl(params.backendUrl))}`, `set -gx ${CLAUDE_ENV_SIMPLE_MODE_NAME} 1`, `set -gx ${CLAUDE_ENV_DISABLE_NONESSENTIAL_TRAFFIC_NAME} 1`, `set -gx ${CLAUDE_ENV_ENABLE_TELEMETRY_NAME} 0`);
     }
     await promises_1.default.writeFile(fishConfPath, `${lines.join("\n")}\n`, "utf8");
     return [fishConfPath];
@@ -1640,7 +1780,7 @@ async function persistPowerShellEnv(params) {
             `$env:${ENV_KEY_NAME} = ${powerShellQuote(params.apiKey)}`,
         ];
         if (params.claudeEnabled) {
-            lines.push(`$env:${CLAUDE_ENV_API_KEY_NAME} = ${powerShellQuote(params.apiKey)}`, `$env:${CLAUDE_ENV_BASE_URL_NAME} = ${powerShellQuote(anthropicCompatibleProxyUrl(params.backendUrl))}`, `$env:${CLAUDE_ENV_SIMPLE_MODE_NAME} = "1"`);
+            lines.push(`$env:${CLAUDE_ENV_API_KEY_NAME} = ${powerShellQuote(params.apiKey)}`, `$env:${CLAUDE_ENV_BASE_URL_NAME} = ${powerShellQuote(anthropicCompatibleProxyUrl(params.backendUrl))}`, `$env:${CLAUDE_ENV_SIMPLE_MODE_NAME} = "1"`, `$env:${CLAUDE_ENV_DISABLE_NONESSENTIAL_TRAFFIC_NAME} = "1"`, `$env:${CLAUDE_ENV_ENABLE_TELEMETRY_NAME} = "0"`);
         }
         lines.push(SHELL_END);
         const next = appendManagedBlock(cleaned, lines);
@@ -1677,6 +1817,165 @@ async function persistVsCodeServerEnvSource() {
     }
     return updated;
 }
+function terminalIntegratedEnvSettingsKey() {
+    if (node_os_1.default.platform() === "darwin")
+        return "terminal.integrated.env.osx";
+    if (node_os_1.default.platform() === "win32")
+        return "terminal.integrated.env.windows";
+    return "terminal.integrated.env.linux";
+}
+function buildManagedEditorTerminalEnv(params) {
+    const env = {
+        [ENV_KEY_NAME]: params.apiKey,
+    };
+    if (params.claudeEnabled) {
+        env[CLAUDE_ENV_API_KEY_NAME] = params.apiKey;
+        env[CLAUDE_ENV_BASE_URL_NAME] = anthropicCompatibleProxyUrl(params.backendUrl);
+        env[CLAUDE_ENV_SIMPLE_MODE_NAME] = "1";
+        env[CLAUDE_ENV_DISABLE_NONESSENTIAL_TRAFFIC_NAME] = "1";
+        env[CLAUDE_ENV_ENABLE_TELEMETRY_NAME] = "0";
+    }
+    return env;
+}
+function buildManagedClaudeEditorEnv(params) {
+    return {
+        [CLAUDE_ENV_API_KEY_NAME]: params.apiKey,
+        [CLAUDE_ENV_BASE_URL_NAME]: anthropicCompatibleProxyUrl(params.backendUrl),
+        [CLAUDE_ENV_SIMPLE_MODE_NAME]: "1",
+        [CLAUDE_ENV_DISABLE_NONESSENTIAL_TRAFFIC_NAME]: "1",
+        [CLAUDE_ENV_ENABLE_TELEMETRY_NAME]: "0",
+    };
+}
+async function persistEditorTerminalEnvSettings(params) {
+    const settingsKey = terminalIntegratedEnvSettingsKey();
+    const desiredEnv = buildManagedEditorTerminalEnv(params);
+    const existingSnapshotRaw = await readFileIfExists(EDITOR_TERMINAL_ENV_STATE_PATH);
+    let existingSnapshot = [];
+    if (existingSnapshotRaw?.trim()) {
+        try {
+            existingSnapshot = JSON.parse(existingSnapshotRaw);
+        }
+        catch {
+            existingSnapshot = [];
+        }
+    }
+    const snapshotByPath = new Map(existingSnapshot.map((entry) => [entry.settingsPath, entry]));
+    const managedPaths = [];
+    for (const host of editorHosts()) {
+        const settingsPath = host.userSettingsPath;
+        const hostPresent = (await pathExists(host.extensionDir)) ||
+            (await pathExists(settingsPath)) ||
+            (await pathExists(node_path_1.default.dirname(settingsPath)));
+        if (!hostPresent)
+            continue;
+        const existed = await pathExists(settingsPath);
+        const settings = await readJsonObjectFile(settingsPath);
+        const currentValue = settings[settingsKey];
+        const currentEnv = typeof currentValue === "object" && currentValue !== null && !Array.isArray(currentValue)
+            ? { ...currentValue }
+            : {};
+        let changed = false;
+        for (const [name, value] of Object.entries(desiredEnv)) {
+            if (currentEnv[name] === value)
+                continue;
+            currentEnv[name] = value;
+            changed = true;
+        }
+        for (const name of MANAGED_EDITOR_TERMINAL_ENV_NAMES) {
+            if (name in desiredEnv || !(name in currentEnv))
+                continue;
+            delete currentEnv[name];
+            changed = true;
+        }
+        if (!changed)
+            continue;
+        if (!snapshotByPath.has(settingsPath)) {
+            snapshotByPath.set(settingsPath, {
+                settingsPath,
+                existed,
+                hadKey: Object.prototype.hasOwnProperty.call(settings, settingsKey),
+                previousValue: currentValue ?? null,
+            });
+        }
+        settings[settingsKey] = currentEnv;
+        await writeJsonObjectFile(settingsPath, settings);
+        managedPaths.push(settingsPath);
+    }
+    await writeJsonObjectFile(EDITOR_TERMINAL_ENV_STATE_PATH, Array.from(snapshotByPath.values()), 0o600);
+    return managedPaths;
+}
+async function persistClaudeEditorSettings(params) {
+    const existingSnapshotRaw = await readFileIfExists(CLAUDE_EDITOR_SETTINGS_STATE_PATH);
+    let existingSnapshot = [];
+    if (existingSnapshotRaw?.trim()) {
+        try {
+            existingSnapshot = JSON.parse(existingSnapshotRaw);
+        }
+        catch {
+            existingSnapshot = [];
+        }
+    }
+    const snapshotByPath = new Map(existingSnapshot.map((entry) => [entry.settingsPath, entry]));
+    const managedPaths = [];
+    const desiredEnv = params.claudeEnabled
+        ? buildManagedClaudeEditorEnv({ apiKey: params.apiKey, backendUrl: params.backendUrl })
+        : null;
+    for (const host of editorHosts()) {
+        const settingsPath = host.userSettingsPath;
+        const hostPresent = (await pathExists(host.extensionDir)) ||
+            (await pathExists(settingsPath)) ||
+            (await pathExists(node_path_1.default.dirname(settingsPath)));
+        if (!hostPresent)
+            continue;
+        const existed = await pathExists(settingsPath);
+        const settings = await readJsonObjectFile(settingsPath);
+        const currentEnvValue = settings[CLAUDE_CODE_EDITOR_ENV_SETTING];
+        const currentEnv = typeof currentEnvValue === "object" && currentEnvValue !== null && !Array.isArray(currentEnvValue)
+            ? { ...currentEnvValue }
+            : {};
+        let changed = false;
+        if (!snapshotByPath.has(settingsPath)) {
+            snapshotByPath.set(settingsPath, {
+                settingsPath,
+                existed,
+                envHadKey: Object.prototype.hasOwnProperty.call(settings, CLAUDE_CODE_EDITOR_ENV_SETTING),
+                envPreviousValue: currentEnvValue ?? null,
+                disableLoginPromptHadKey: Object.prototype.hasOwnProperty.call(settings, CLAUDE_CODE_EDITOR_DISABLE_LOGIN_PROMPT_SETTING),
+                disableLoginPromptPreviousValue: settings[CLAUDE_CODE_EDITOR_DISABLE_LOGIN_PROMPT_SETTING] ?? null,
+            });
+        }
+        if (desiredEnv) {
+            const nextEnv = { ...currentEnv };
+            for (const [name, value] of Object.entries(desiredEnv)) {
+                if (nextEnv[name] === value)
+                    continue;
+                nextEnv[name] = value;
+                changed = true;
+            }
+            settings[CLAUDE_CODE_EDITOR_ENV_SETTING] = nextEnv;
+            if (settings[CLAUDE_CODE_EDITOR_DISABLE_LOGIN_PROMPT_SETTING] !== true) {
+                settings[CLAUDE_CODE_EDITOR_DISABLE_LOGIN_PROMPT_SETTING] = true;
+                changed = true;
+            }
+        }
+        else {
+            if (Object.prototype.hasOwnProperty.call(settings, CLAUDE_CODE_EDITOR_ENV_SETTING)) {
+                delete settings[CLAUDE_CODE_EDITOR_ENV_SETTING];
+                changed = true;
+            }
+            if (Object.prototype.hasOwnProperty.call(settings, CLAUDE_CODE_EDITOR_DISABLE_LOGIN_PROMPT_SETTING)) {
+                delete settings[CLAUDE_CODE_EDITOR_DISABLE_LOGIN_PROMPT_SETTING];
+                changed = true;
+            }
+        }
+        if (!changed)
+            continue;
+        await writeJsonObjectFile(settingsPath, settings);
+        managedPaths.push(settingsPath);
+    }
+    await writeJsonObjectFile(CLAUDE_EDITOR_SETTINGS_STATE_PATH, Array.from(snapshotByPath.values()), 0o600);
+    return managedPaths;
+}
 function runOpenClawConfigCommand(args) {
     const run = (0, node_child_process_1.spawnSync)("openclaw", args, {
         encoding: "utf8",
@@ -2017,6 +2316,7 @@ async function writeOpenCodeFamilyConfig(params) {
         const optionsRoot = objectRecordOr(managedOpenAiProvider.options, {});
         optionsRoot.baseURL = openAiCompatibleProxyUrl(params.backendUrl);
         optionsRoot.apiKey = params.apiKey;
+        optionsRoot.setCacheKey = true;
         managedOpenAiProvider.options = optionsRoot;
         managedOpenAiProvider.models = buildOpenCodeModelsObject(params.models);
         managedOpenAiProvider.whitelist = params.models.map((entry) => entry.id).filter(Boolean);
@@ -2144,7 +2444,7 @@ class SetupCommand extends base_command_1.BaseCommand {
             const setupClients = [
                 {
                     id: "codex",
-                    label: "Codex CLI, VS Code extension, and Codex app",
+                    label: "Codex CLI and VS Code extension",
                     summaryLabel: "Codex",
                     detected: codexDetected,
                     recommended: true,
@@ -2299,6 +2599,8 @@ class SetupCommand extends base_command_1.BaseCommand {
             let updatedPowerShellProfiles = [];
             let codexConfigPath = null;
             let updatedVsCodeEnvFiles = [];
+            let updatedEditorTerminalSettings = [];
+            let updatedClaudeEditorSettings = [];
             let sessionMigration = null;
             let authSeed = null;
             let authSeedCleanup = null;
@@ -2328,6 +2630,8 @@ class SetupCommand extends base_command_1.BaseCommand {
                 if (!resolved?.authRejected && claudeAccess.authRejected) {
                     throw new Error(describeCredentialRejection(authType, claudeAccess.failure));
                 }
+                const claudeSelected = selectedSetupClients.has("claude");
+                const claudeEnvEnabled = claudeSelected && claudeAccess.enabled;
                 progress.update("Saving shared machine config");
                 await (0, config_1.writeManagedConfig)({
                     backendUrl,
@@ -2339,20 +2643,32 @@ class SetupCommand extends base_command_1.BaseCommand {
                 updatedShellFiles = await persistApiKeyEnv({
                     apiKey: authCredential,
                     backendUrl,
-                    claudeEnabled: claudeAccess.enabled,
+                    claudeEnabled: claudeEnvEnabled,
                 });
                 updatedFishFiles = await persistFishEnv({
                     apiKey: authCredential,
                     backendUrl,
-                    claudeEnabled: claudeAccess.enabled,
+                    claudeEnabled: claudeEnvEnabled,
                 });
                 updatedPowerShellProfiles = await persistPowerShellEnv({
                     apiKey: authCredential,
                     backendUrl,
-                    claudeEnabled: claudeAccess.enabled,
+                    claudeEnabled: claudeEnvEnabled,
                 });
                 if (selectedSetupClients.has("codex") || selectedSetupClients.has("claude")) {
                     updatedVsCodeEnvFiles = await persistVsCodeServerEnvSource();
+                    updatedEditorTerminalSettings = await persistEditorTerminalEnvSettings({
+                        apiKey: authCredential,
+                        backendUrl,
+                        claudeEnabled: claudeEnvEnabled,
+                    });
+                    if (selectedSetupClients.has("claude")) {
+                        updatedClaudeEditorSettings = await persistClaudeEditorSettings({
+                            apiKey: authCredential,
+                            backendUrl,
+                            claudeEnabled: claudeEnvEnabled,
+                        });
+                    }
                 }
                 if (selectedSetupClients.has("codex")) {
                     progress.update("Configuring Codex");
@@ -2487,11 +2803,11 @@ class SetupCommand extends base_command_1.BaseCommand {
             const summaryNotes = new Set();
             if (resolved?.note)
                 summaryNotes.add(resolved.note);
-            if (claudeAccess?.enabled) {
-                summaryNotes.add("Claude Code: exported ANTHROPIC_BASE_URL, ANTHROPIC_API_KEY, and CLAUDE_CODE_SIMPLE=1 for the official client.");
+            if (selectedSetupClients.has("claude") && claudeAccess?.enabled) {
+                summaryNotes.add("Claude Code: exported ANTHROPIC_BASE_URL, ANTHROPIC_API_KEY, CLAUDE_CODE_SIMPLE=1, disabled nonessential traffic, and disabled telemetry.");
                 summaryNotes.add("If Claude Code is already open, restart it so the custom-key env takes effect cleanly. `claude auth status` should show `authMethod: api_key` once the new env is loaded.");
             }
-            else if (claudeAccess?.note) {
+            else if (selectedSetupClients.has("claude") && claudeAccess?.note) {
                 summaryNotes.add(claudeAccess.note);
             }
             if (selectedSetupClients.has("trae")) {
@@ -2543,11 +2859,10 @@ class SetupCommand extends base_command_1.BaseCommand {
             }
             if (resolved?.note)
                 this.log(resolved.note);
-            if (claudeAccess?.enabled) {
+            if (selectedSetupClients.has("claude") && claudeAccess?.enabled) {
                 this.log(`- Claude Code base URL: ${anthropicCompatibleProxyUrl(backendUrl)}`);
-                this.log(`- Claude Code selected: ${selectedSetupClients.has("claude") ? "yes" : "no"}`);
             }
-            else if (claudeAccess?.note) {
+            else if (selectedSetupClients.has("claude") && claudeAccess?.note) {
                 this.log(`- Claude Code: ${claudeAccess.note}`);
             }
             this.log(`- Local credential env: ${ENV_FILE}`);
@@ -2558,6 +2873,12 @@ class SetupCommand extends base_command_1.BaseCommand {
             if (updatedPowerShellProfiles.length > 0) {
                 this.log(`- PowerShell profiles updated: ${updatedPowerShellProfiles.join(", ")}`);
             }
+            if (updatedEditorTerminalSettings.length > 0) {
+                this.log(`- Editor terminal env updated: ${updatedEditorTerminalSettings.join(", ")}`);
+            }
+            if (updatedClaudeEditorSettings.length > 0) {
+                this.log(`- Claude editor settings updated: ${updatedClaudeEditorSettings.join(", ")}`);
+            }
             if (selectedSetupClients.has("codex")) {
                 this.log(`- Codex: configured (${codexConfigPath})`);
                 if (resolved)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "theclawbay",
-  "version": "0.3.54",
+  "version": "0.3.56",
   "description": "CLI for connecting Codex, Continue, Cline, GSD, OpenClaw, OpenCode, Kilo, Roo Code, Aider, experimental Trae, and experimental Zo to The Claw Bay.",
   "license": "MIT",
   "bin": {