ccjk 9.5.6 → 9.7.0

package/dist/chunks/commands2.mjs

@@ -1,412 +1,109 @@
-import process__default from 'node:process';
+import { exec } from 'node:child_process';
+import { promisify } from 'node:util';
 import ansis from 'ansis';
-import { checkAgentBrowserInstalled, getInstallPath } from './installer2.mjs';
+import { ensureI18nInitialized, i18n } from './index.mjs';
 import 'node:fs';
-import 'node:os';
-import 'node:path';
+import 'node:process';
+import 'node:url';
+import 'i18next';
+import 'i18next-fs-backend';
+import 'pathe';
 
-const { cyan: _cyan, yellow: yellow$1, gray: _gray, green: green$1, red: _red, blue: _blue$1, bold: _bold, dim: _dim$1 } = ansis;
-class AgentBrowserSession {
-  options;
-  isRunning = false;
-  sessionId = null;
-  constructor(options = {}) {
-    this.options = {
-      headless: true,
-      verbose: false,
-      timeout: 3e4,
-      browser: "chromium",
-      ...options
-    };
+const execAsync = promisify(exec);
+async function runCcrUi(apiKey) {
+  ensureI18nInitialized();
+  console.log(ansis.green(`
+\u{1F5A5}\uFE0F  ${i18n.t("ccr:startingCcrUi")}`));
+  if (apiKey) {
+    console.log(ansis.bold.green(`
+\u{1F511} ${i18n.t("ccr:ccrUiApiKey") || "CCR UI API Key"}: ${apiKey}`));
+    console.log(ansis.gray(`   ${i18n.t("ccr:ccrUiApiKeyHint") || "Use this API key to login to CCR UI"}
+`));
   }
-  /**
-   * 启动浏览器会话
-   */
-  async start() {
-    if (this.isRunning) {
-      if (this.options.verbose) {
-        console.log(`${yellow$1("!")} Session already running`);
-      }
-      return;
-    }
-    try {
-      const { execSync } = await import('node:child_process');
-      this.sessionId = `session-${Date.now()}`;
-      const headlessFlag = this.options.headless ? "" : "--headed";
-      execSync(`agent-browser start ${headlessFlag} 2>/dev/null || true`, {
-        encoding: "utf-8",
-        stdio: "pipe"
-      });
-      this.isRunning = true;
-      if (this.options.verbose) {
-        console.log(`${green$1("\u2713")} Browser session started: ${this.sessionId}`);
-      }
-    } catch (error) {
-      this.isRunning = false;
-      throw new Error(`Failed to start browser session: ${error instanceof Error ? error.message : "Unknown error"}`);
-    }
-  }
-  /**
-   * 导航到 URL
-   */
-  async navigate(url) {
-    this.ensureRunning();
-    try {
-      const { execSync } = await import('node:child_process');
-      const fullUrl = url.startsWith("http") ? url : `https://${url}`;
-      execSync(`agent-browser open "${fullUrl}"`, {
-        encoding: "utf-8",
-        stdio: this.options.verbose ? "inherit" : "pipe",
-        timeout: this.options.timeout
-      });
-      if (this.options.verbose) {
-        console.log(`${green$1("\u2713")} Navigated to: ${fullUrl}`);
-      }
-    } catch (error) {
-      throw new Error(`Failed to navigate: ${error instanceof Error ? error.message : "Unknown error"}`);
-    }
-  }
-  /**
-   * 获取页面快照
-   */
-  async snapshot(options = {}) {
-    this.ensureRunning();
-    try {
-      const { execSync } = await import('node:child_process');
-      const flags = [];
-      if (options.interactive)
-        flags.push("-i");
-      if (options.compact)
-        flags.push("-c");
-      if (options.depth)
-        flags.push(`-d ${options.depth}`);
-      if (options.json)
-        flags.push("--json");
-      const result = execSync(`agent-browser snapshot ${flags.join(" ")}`, {
-        encoding: "utf-8",
-        timeout: this.options.timeout
-      });
-      return result.trim();
-    } catch (error) {
-      throw new Error(`Failed to get snapshot: ${error instanceof Error ? error.message : "Unknown error"}`);
-    }
-  }
-  /**
-   * 点击元素
-   */
-  async click(ref) {
-    this.ensureRunning();
-    try {
-      const { execSync } = await import('node:child_process');
-      const refId = ref.startsWith("@") ? ref : `@${ref}`;
-      execSync(`agent-browser click ${refId}`, {
-        encoding: "utf-8",
-        stdio: this.options.verbose ? "inherit" : "pipe",
-        timeout: this.options.timeout
-      });
-      if (this.options.verbose) {
-        console.log(`${green$1("\u2713")} Clicked: ${refId}`);
-      }
-    } catch (error) {
-      throw new Error(`Failed to click: ${error instanceof Error ? error.message : "Unknown error"}`);
-    }
-  }
-  /**
-   * 填充输入框
-   */
-  async fill(ref, text) {
-    this.ensureRunning();
-    try {
-      const { execSync } = await import('node:child_process');
-      const refId = ref.startsWith("@") ? ref : `@${ref}`;
-      execSync(`agent-browser fill ${refId} "${text.replace(/"/g, '\\"')}"`, {
-        encoding: "utf-8",
-        stdio: this.options.verbose ? "inherit" : "pipe",
-        timeout: this.options.timeout
-      });
-      if (this.options.verbose) {
-        console.log(`${green$1("\u2713")} Filled ${refId}: ${text}`);
-      }
-    } catch (error) {
-      throw new Error(`Failed to fill: ${error instanceof Error ? error.message : "Unknown error"}`);
-    }
-  }
-  /**
-   * 获取元素文本
-   */
-  async getText(ref) {
-    this.ensureRunning();
-    try {
-      const { execSync } = await import('node:child_process');
-      const refId = ref.startsWith("@") ? ref : `@${ref}`;
-      const result = execSync(`agent-browser get text ${refId}`, {
-        encoding: "utf-8",
-        timeout: this.options.timeout
-      });
-      return result.trim();
-    } catch (error) {
-      throw new Error(`Failed to get text: ${error instanceof Error ? error.message : "Unknown error"}`);
-    }
-  }
-  /**
-   * 截图
-   */
-  async screenshot(path, fullPage = false) {
-    this.ensureRunning();
-    try {
-      const { execSync } = await import('node:child_process');
-      const flags = [];
-      if (fullPage)
-        flags.push("--full");
-      if (path)
-        flags.push(path);
-      const result = execSync(`agent-browser screenshot ${flags.join(" ")}`, {
-        encoding: "utf-8",
-        timeout: this.options.timeout
-      });
-      if (this.options.verbose) {
-        console.log(`${green$1("\u2713")} Screenshot saved: ${path || "screenshot.png"}`);
-      }
-      return result.trim();
-    } catch (error) {
-      throw new Error(`Failed to take screenshot: ${error instanceof Error ? error.message : "Unknown error"}`);
-    }
-  }
-  /**
-   * 等待
-   */
-  async wait(condition) {
-    this.ensureRunning();
-    try {
-      const { execSync } = await import('node:child_process');
-      let cmd;
-      if (typeof condition === "number") {
-        cmd = `agent-browser wait ${condition}`;
-      } else if (condition.startsWith("@")) {
-        cmd = `agent-browser wait ${condition}`;
-      } else {
-        cmd = `agent-browser wait --text "${condition}"`;
-      }
-      execSync(cmd, {
-        encoding: "utf-8",
-        stdio: this.options.verbose ? "inherit" : "pipe",
-        timeout: this.options.timeout
-      });
-    } catch (error) {
-      throw new Error(`Failed to wait: ${error instanceof Error ? error.message : "Unknown error"}`);
-    }
-  }
-  /**
-   * 关闭会话
-   */
-  async close() {
-    if (!this.isRunning) {
-      return;
-    }
-    try {
-      const { execSync } = await import('node:child_process');
-      execSync("agent-browser close 2>/dev/null || true", {
-        encoding: "utf-8",
-        stdio: "pipe"
-      });
-      this.isRunning = false;
-      this.sessionId = null;
-      if (this.options.verbose) {
-        console.log(`${green$1("\u2713")} Browser session closed`);
-      }
-    } catch {
-      this.isRunning = false;
-      this.sessionId = null;
-    }
-  }
-  /**
-   * 获取会话状态
-   */
-  getStatus() {
-    return {
-      running: this.isRunning,
-      sessionId: this.sessionId
-    };
-  }
-  /**
-   * 确保会话正在运行
-   */
-  ensureRunning() {
-    if (!this.isRunning) {
-      throw new Error("Browser session is not running. Call start() first.");
-    }
+  try {
+    const { stdout, stderr } = await execAsync("ccr ui");
+    if (stdout)
+      console.log(stdout);
+    if (stderr)
+      console.error(ansis.yellow(stderr));
+    console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrUiStarted")}`));
+  } catch (error) {
+    console.error(ansis.red(`\u2716 ${i18n.t("ccr:ccrCommandFailed")}: ${error instanceof Error ? error.message : String(error)}`));
+    throw error;
   }
 }
-
-const { cyan, yellow, gray, green, red, blue: _blue, bold, dim: _dim } = ansis;
-function agentBrowserHelp(_options) {
-  console.log(`
-${bold(cyan("Agent Browser"))} - ${gray("Zero-config browser automation for AI agents")}
-
-${yellow("Usage:")}
-  ccjk browser <action> [options]
-  ccjk ab <action> [options]
-
-${yellow("Actions:")}
-  ${cyan("install")}     Install Agent Browser (Rust CLI + Playwright)
-  ${cyan("uninstall")}   Remove Agent Browser
-  ${cyan("status")}      Check installation status
-  ${cyan("start")}       Start a browser session
-  ${cyan("stop")}        Stop current browser session
-  ${cyan("config")}      Configure browser settings
-
-${yellow("Examples:")}
-  ${gray("# Install Agent Browser")}
-  ccjk browser install
-
-  ${gray("# Check status")}
-  ccjk browser status
-
-  ${gray("# Start a session with URL")}
-  ccjk browser start https://example.com
-
-${yellow("Quick Start:")}
-  ${gray("After installation, use these commands directly:")}
-  agent-browser open <url>        ${gray("# Navigate to URL")}
-  agent-browser snapshot -i       ${gray("# Get interactive elements")}
-  agent-browser click @e1         ${gray("# Click by ref")}
-  agent-browser fill @e2 "text"   ${gray("# Fill input")}
-  agent-browser screenshot        ${gray("# Take screenshot")}
-  agent-browser close             ${gray("# Close browser")}
-
-${yellow("Documentation:")}
-  Run ${cyan("/browser")} in Claude Code for full skill documentation
-  `);
-}
-async function agentBrowserStatus(options) {
-  console.log(`
-${bold(cyan("Agent Browser Status"))}
-`);
-  const installed = await checkAgentBrowserInstalled();
-  const installPath = getInstallPath();
-  if (installed) {
-    console.log(`  ${green("\u2713")} Agent Browser is ${green("installed")}`);
-    console.log(`  ${gray("Path:")} ${installPath}`);
-    try {
-      const { execSync } = await import('node:child_process');
-      const version = execSync('agent-browser --version 2>/dev/null || echo "unknown"', {
-        encoding: "utf-8"
-      }).trim();
-      console.log(`  ${gray("Version:")} ${version}`);
-    } catch {
-      console.log(`  ${gray("Version:")} ${yellow("unknown")}`);
-    }
-    try {
-      const { execSync } = await import('node:child_process');
-      execSync("npx playwright --version 2>/dev/null", { encoding: "utf-8" });
-      console.log(`  ${green("\u2713")} Playwright browsers available`);
-    } catch {
-      console.log(`  ${yellow("!")} Playwright browsers may need installation`);
-      console.log(`    ${gray("Run:")} npx playwright install chromium`);
-    }
-  } else {
-    console.log(`  ${red("\u2717")} Agent Browser is ${red("not installed")}`);
-    console.log(`
-  ${gray("To install, run:")}`);
-    console.log(`  ${cyan("ccjk browser install")}`);
-  }
-  if (options.verbose) {
-    console.log(`
-${gray("Debug Info:")}`);
-    console.log(`  ${gray("Install path:")} ${installPath}`);
-    console.log(`  ${gray("Platform:")} ${process__default.platform}`);
-    console.log(`  ${gray("Arch:")} ${process__default.arch}`);
+async function runCcrStatus() {
+  ensureI18nInitialized();
+  console.log(ansis.green(`
+\u{1F4CA} ${i18n.t("ccr:checkingCcrStatus")}`));
+  try {
+    const { stdout, stderr } = await execAsync("ccr status");
+    if (stdout) {
+      console.log(`
+${ansis.bold(i18n.t("ccr:ccrStatusTitle"))}`);
+      console.log(stdout);
+    }
+    if (stderr)
+      console.error(ansis.yellow(stderr));
+  } catch (error) {
+    console.error(ansis.red(`\u2716 ${i18n.t("ccr:ccrCommandFailed")}: ${error instanceof Error ? error.message : String(error)}`));
+    throw error;
   }
-  console.log();
 }
-async function startBrowserSession(url, options = {}) {
-  const installed = await checkAgentBrowserInstalled();
-  if (!installed) {
-    console.log(`
-${red("\u2717")} Agent Browser is not installed`);
-    console.log(`  ${gray("Run:")} ${cyan("ccjk browser install")} ${gray("first")}
-`);
-    return;
-  }
-  console.log(`
-${cyan("Starting browser session...")}
-`);
+async function runCcrRestart() {
+  ensureI18nInitialized();
+  console.log(ansis.green(`
+\u{1F504} ${i18n.t("ccr:restartingCcr")}`));
   try {
-    const session = new AgentBrowserSession({
-      headless: true,
-      verbose: options.verbose
-    });
-    await session.start();
-    if (url) {
-      console.log(`${gray("Navigating to:")} ${url}`);
-      await session.navigate(url);
-    }
-    console.log(`
-${green("\u2713")} Browser session started`);
-    console.log(`
-${yellow("Available commands:")}`);
-    console.log(`  agent-browser snapshot -i    ${gray("# Get interactive elements")}`);
-    console.log(`  agent-browser click @e1      ${gray("# Click element")}`);
-    console.log(`  agent-browser close          ${gray("# Close session")}`);
-    console.log();
+    const { stdout, stderr } = await execAsync("ccr restart");
+    if (stdout)
+      console.log(stdout);
+    if (stderr)
+      console.error(ansis.yellow(stderr));
+    console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrRestarted")}`));
   } catch (error) {
-    console.error(`
-${red("\u2717")} Failed to start browser session`);
-    if (options.verbose && error instanceof Error) {
-      console.error(`  ${gray("Error:")} ${error.message}`);
-    }
-    console.log(`
-${gray("Try running:")} ${cyan("ccjk browser install")} ${gray("to reinstall")}
-`);
+    console.error(ansis.red(`\u2716 ${i18n.t("ccr:ccrCommandFailed")}: ${error instanceof Error ? error.message : String(error)}`));
+    throw error;
   }
 }
-async function stopBrowserSession(options = {}) {
-  console.log(`
-${cyan("Stopping browser session...")}
-`);
+async function runCcrStart() {
+  ensureI18nInitialized();
+  console.log(ansis.green(`
+\u25B6\uFE0F  ${i18n.t("ccr:startingCcr")}`));
   try {
-    const { execSync } = await import('node:child_process');
-    execSync("agent-browser close 2>/dev/null || true", { encoding: "utf-8" });
-    console.log(`${green("\u2713")} Browser session stopped
-`);
+    const { stdout, stderr } = await execAsync("ccr start");
+    if (stdout)
+      console.log(stdout);
+    if (stderr)
+      console.error(ansis.yellow(stderr));
+    console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrStarted")}`));
   } catch (error) {
-    if (options.verbose && error instanceof Error) {
-      console.log(`${yellow("!")} No active session found or already closed`);
-      console.log(`  ${gray("Error:")} ${error.message}`);
+    if (error.stdout && error.stdout.includes("Loaded JSON config from:")) {
+      console.log(error.stdout);
+      if (error.stderr)
+        console.error(ansis.yellow(error.stderr));
+      console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrStarted")}`));
     } else {
-      console.log(`${yellow("!")} No active session found
-`);
+      console.error(ansis.red(`\u2716 ${i18n.t("ccr:ccrCommandFailed")}: ${error instanceof Error ? error.message : String(error)}`));
+      throw error;
     }
   }
 }
-async function configureBrowser(options = {}) {
-  console.log(`
-${bold(cyan("Agent Browser Configuration"))}
-`);
-  const installed = await checkAgentBrowserInstalled();
-  if (!installed) {
-    console.log(`${red("\u2717")} Agent Browser is not installed`);
-    console.log(`  ${gray("Run:")} ${cyan("ccjk browser install")} ${gray("first")}
-`);
-    return;
-  }
-  console.log(`${yellow("Current Settings:")}`);
-  console.log(`  ${gray("Default browser:")} chromium`);
-  console.log(`  ${gray("Headless mode:")} enabled`);
-  console.log(`  ${gray("Timeout:")} 30000ms`);
-  console.log(`
-${yellow("Configuration Options:")}`);
-  console.log(`  ${gray("Environment variables:")}`);
-  console.log(`    AGENT_BROWSER_HEADLESS=false  ${gray("# Show browser window")}`);
-  console.log(`    AGENT_BROWSER_TIMEOUT=60000   ${gray("# Set timeout in ms")}`);
-  console.log(`    AGENT_BROWSER_BROWSER=firefox ${gray("# Use Firefox")}`);
-  if (options.verbose) {
-    console.log(`
-${gray("Advanced:")}`);
-    console.log(`  ${gray("Config file:")} ~/.agent-browser/config.json`);
-    console.log(`  ${gray("Session dir:")} ~/.agent-browser/sessions/`);
+async function runCcrStop() {
+  ensureI18nInitialized();
+  console.log(ansis.green(`
+\u23F9\uFE0F  ${i18n.t("ccr:stoppingCcr")}`));
+  try {
+    const { stdout, stderr } = await execAsync("ccr stop");
+    if (stdout)
+      console.log(stdout);
+    if (stderr)
+      console.error(ansis.yellow(stderr));
+    console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrStopped")}`));
+  } catch (error) {
+    console.error(ansis.red(`\u2716 ${i18n.t("ccr:ccrCommandFailed")}: ${error instanceof Error ? error.message : String(error)}`));
+    throw error;
   }
-  console.log();
 }
 
-export { agentBrowserHelp, agentBrowserStatus, configureBrowser, startBrowserSession, stopBrowserSession };
+export { runCcrRestart, runCcrStart, runCcrStatus, runCcrStop, runCcrUi };

package/dist/chunks/completion.mjs

@@ -2,7 +2,7 @@ import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 import ansis from 'ansis';
-import { i18n } from './index2.mjs';
+import { i18n } from './index.mjs';
 import 'node:process';
 import 'node:url';
 import 'i18next';

package/dist/chunks/config-consolidator.mjs

@@ -5,8 +5,8 @@ import ansis from 'ansis';
 import dayjs from 'dayjs';
 import { join } from 'pathe';
 import { SETTINGS_FILE, ClAUDE_CONFIG_FILE, CLAUDE_VSC_CONFIG_FILE } from './constants.mjs';
-import { S as STATUS } from '../shared/ccjk.zCqdxT2Y.mjs';
-import './index2.mjs';
+import { S as STATUS } from '../shared/ccjk.Br91zBIG.mjs';
+import './index.mjs';
 import 'node:url';
 import 'i18next';
 import 'i18next-fs-backend';

package/dist/chunks/config-switch.mjs

@@ -2,11 +2,11 @@ import process__default from 'node:process';
 import ansis from 'ansis';
 import inquirer from 'inquirer';
 import { resolveCodeToolType, isCodeToolType, DEFAULT_CODE_TOOL_TYPE } from './constants.mjs';
-import { ensureI18nInitialized, i18n } from './index2.mjs';
+import { ensureI18nInitialized, i18n } from './index.mjs';
 import { readZcfConfig } from './ccjk-config.mjs';
 import { ClaudeCodeConfigManager } from './claude-code-config-manager.mjs';
-import { s as switchCodexProvider, l as listCodexProviders, r as readCodexConfig, a as switchToOfficialLogin, b as switchToProvider } from './codex.mjs';
-import { h as handleGeneralError } from '../shared/ccjk.f40us0yY.mjs';
+import { e as switchCodexProvider, l as listCodexProviders, r as readCodexConfig, f as switchToOfficialLogin, h as switchToProvider } from './codex.mjs';
+import { a as handleGeneralError } from '../shared/ccjk.DvIrK0wz.mjs';
 import { a as addNumbersToChoices } from '../shared/ccjk.BFQ7yr5S.mjs';
 import 'node:os';
 import 'pathe';
@@ -30,7 +30,6 @@ import './prompts.mjs';
 import './package.mjs';
 import '../shared/ccjk.DHbrGcgg.mjs';
 import 'inquirer-toggle';
-import '../shared/ccjk.CZgIwikC.mjs';
 import 'node:child_process';
 
 async function configSwitchCommand(options) {

package/dist/chunks/config.mjs

@@ -4,8 +4,8 @@ import dayjs from 'dayjs';
 import inquirer from 'inquirer';
 import { join, dirname } from 'pathe';
 import { SETTINGS_FILE, CLAUDE_VSC_CONFIG_FILE, CLAUDE_DIR, AI_OUTPUT_LANGUAGES } from './constants.mjs';
-import { ensureI18nInitialized, i18n } from './index2.mjs';
-import { d as deepMerge, s as setPrimaryApiKey, c as addCompletedOnboarding } from './claude-config.mjs';
+import { ensureI18nInitialized, i18n } from './index.mjs';
+import { s as setPrimaryApiKey, c as addCompletedOnboarding, d as deepMerge } from './claude-config.mjs';
 import { ensureDir, exists, copyDir, writeFileAtomic, copyFile } from './fs-operations.mjs';
 import { readJsonConfig, writeJsonConfig } from './json-config.mjs';
 
@@ -23,6 +23,55 @@ function clearModelEnv(env) {
   }
 }
 
+const INVALID_PERMISSION_NAMES = /* @__PURE__ */ new Set([
+  "AllowEdit",
+  "AllowWrite",
+  "AllowRead",
+  "AllowExec",
+  "AllowCreateProcess",
+  "AllowKillProcess",
+  "AllowNetworkAccess",
+  "AllowFileSystemAccess",
+  "AllowShellAccess",
+  "AllowHttpAccess"
+]);
+const DANGEROUS_BASH_PATTERNS = /* @__PURE__ */ new Set([
+  "Bash(passwd *)",
+  "Bash(reboot *)",
+  "Bash(shutdown *)",
+  "Bash(halt *)",
+  "Bash(poweroff *)",
+  "Bash(init *)",
+  "Bash(telinit *)",
+  "Bash(rm *)",
+  "Bash(kill *)",
+  "Bash(pkill *)",
+  "Bash(killall *)",
+  "Bash(su *)",
+  "Bash(sudo *)",
+  "Bash(visudo *)",
+  "Bash(useradd *)",
+  "Bash(userdel *)",
+  "Bash(usermod *)",
+  "Bash(groupadd *)",
+  "Bash(groupdel *)",
+  "Bash(groupmod *)",
+  "Bash(modprobe *)",
+  "Bash(insmod *)",
+  "Bash(rmmod *)"
+]);
+function isValidPermission(perm) {
+  if (INVALID_PERMISSION_NAMES.has(perm)) {
+    return false;
+  }
+  if (["mcp__.*", "mcp__*", "mcp__(*)"].includes(perm)) {
+    return false;
+  }
+  if (/^[a-z]/.test(perm) && !perm.startsWith("mcp__")) {
+    return false;
+  }
+  return true;
+}
 function mergeAndCleanPermissions(templatePermissions, userPermissions) {
   const template = templatePermissions || [];
   const user = userPermissions || [];
@@ -31,10 +80,10 @@ function mergeAndCleanPermissions(templatePermissions, userPermissions) {
     if (result.includes(perm)) {
       continue;
     }
-    if (/^[a-z]/.test(perm) && !perm.startsWith("mcp__")) {
+    if (!isValidPermission(perm)) {
       continue;
     }
-    if (["mcp__.*", "mcp__*", "mcp__(*)"].includes(perm)) {
+    if (DANGEROUS_BASH_PATTERNS.has(perm)) {
       continue;
     }
     let isRedundant = false;
@@ -96,10 +145,12 @@ function getDefaultSettings() {
 function configureApi(apiConfig) {
   if (!apiConfig)
     return null;
-  let settings = getDefaultSettings();
   const existingSettings = readJsonConfig(SETTINGS_FILE);
+  let settings;
   if (existingSettings) {
-    settings = deepMerge(settings, existingSettings);
+    settings = existingSettings;
+  } else {
+    settings = getDefaultSettings();
   }
   if (!settings.env) {
     settings.env = {};
@@ -128,6 +179,26 @@ function configureApi(apiConfig) {
   } catch (error) {
     console.error("Failed to set onboarding flag", error);
   }
+  const verification = readJsonConfig(SETTINGS_FILE);
+  if (verification?.env) {
+    const envKey = apiConfig.authType === "api_key" ? "ANTHROPIC_API_KEY" : "ANTHROPIC_AUTH_TOKEN";
+    if (verification.env[envKey] !== apiConfig.key) {
+      console.error(ansis.red("\u26A0 API config write verification failed \u2014 retrying..."));
+      const freshSettings = readJsonConfig(SETTINGS_FILE) || settings;
+      if (!freshSettings.env) freshSettings.env = {};
+      if (apiConfig.authType === "api_key") {
+        freshSettings.env.ANTHROPIC_API_KEY = apiConfig.key;
+        delete freshSettings.env.ANTHROPIC_AUTH_TOKEN;
+      } else if (apiConfig.authType === "auth_token") {
+        freshSettings.env.ANTHROPIC_AUTH_TOKEN = apiConfig.key;
+        delete freshSettings.env.ANTHROPIC_API_KEY;
+      }
+      if (apiConfig.url) {
+        freshSettings.env.ANTHROPIC_BASE_URL = apiConfig.url;
+      }
+      writeJsonConfig(SETTINGS_FILE, freshSettings);
+    }
+  }
   return apiConfig;
 }
 function configureHooks(hooks) {
@@ -381,4 +452,4 @@ const config = {
   updateDefaultModel: updateDefaultModel
 };
 
-export { applyAiLanguageDirective as a, backupExistingConfig as b, clearModelEnv as c, updateDefaultModel as d, getExistingApiConfig as e, configureApi as f, getExistingModelConfig as g, copyConfigFiles as h, ensureClaudeDir as i, config as j, mergeAndCleanPermissions as m, promptApiConfigurationAction as p, switchToOfficialLogin as s, updateCustomModel as u };
+export { copyConfigFiles as a, backupExistingConfig as b, config as c, applyAiLanguageDirective as d, ensureClaudeDir as e, configureApi as f, getExistingApiConfig as g, getExistingModelConfig as h, updateDefaultModel as i, clearModelEnv as j, mergeAndCleanPermissions as m, promptApiConfigurationAction as p, switchToOfficialLogin as s, updateCustomModel as u };