ccman 3.3.25 → 3.3.29

package/dist/index.js

@@ -304,12 +304,28 @@ function loadCodexTemplateConfig() {
   return CODEX_DEFAULT_CONFIG;
 }
 function removeDeprecatedKeys(config) {
-  if (config.features && typeof config.features === "object" && !Array.isArray(config.features) && "web_search_request" in config.features) {
-    delete config.features.web_search_request;
+  const deprecatedFeatureKeys = [
+    "web_search_request",
+    "web_search_cached",
+    "web_search",
+    "plan_tool",
+    "view_image_tool",
+    "streamable_shell",
+    "rmcp_client"
+  ];
+  if (config.features && typeof config.features === "object" && !Array.isArray(config.features)) {
+    const features = config.features;
+    for (const key of deprecatedFeatureKeys) {
+      if (key in features)
+        delete features[key];
+    }
   }
   if ("web_search_request" in config) {
     delete config.web_search_request;
   }
+  if ("network_access" in config) {
+    delete config.network_access;
+  }
 }
 function loadExistingCodexConfig(configPath) {
   if (!fileExists(configPath)) {
@@ -338,7 +354,7 @@ function writeCodexConfigOverwrite(provider) {
   removeDeprecatedKeys(nextConfig);
   const providerKey = resolveCodexProviderKey(provider);
   nextConfig.model_provider = providerKey;
-  nextConfig.model = provider.model || nextConfig.model || "gpt-5.4";
+  nextConfig.model = provider.model || nextConfig.model || "gpt-5.5";
   nextConfig.model_providers = {
     [providerKey]: buildManagedProvider(provider, providerKey)
   };
@@ -356,7 +372,7 @@ function writeCodexConfigMerge(provider) {
   const providerKey = resolveCodexProviderKey(provider);
   removeDeprecatedKeys(nextConfig);
   nextConfig.model_provider = providerKey;
-  nextConfig.model = provider.model || nextConfig.model || "gpt-5.4";
+  nextConfig.model = provider.model || nextConfig.model || "gpt-5.5";
   const existingProviders = nextConfig.model_providers && typeof nextConfig.model_providers === "object" && !Array.isArray(nextConfig.model_providers) ? { ...nextConfig.model_providers } : {};
   const lowerProviderKey = providerKey.toLowerCase();
   for (const key of Object.keys(existingProviders)) {
@@ -401,8 +417,13 @@ var init_codex = __esm({
     __filename = fileURLToPath2(import.meta.url);
     __dirname = path3.dirname(__filename);
     CODEX_DEFAULT_CONFIG = {
-      model: "gpt-5.4",
+      model: "gpt-5.5",
+      review_model: "gpt-5.5",
       model_reasoning_effort: "xhigh",
+      plan_mode_reasoning_effort: "xhigh",
+      model_reasoning_summary: "auto",
+      model_verbosity: "high",
+      personality: "pragmatic",
       disable_response_storage: true,
       sandbox_mode: "danger-full-access",
       windows_wsl_setup_acknowledged: true,
@@ -425,13 +446,14 @@ var init_codex = __esm({
         network_access: true
       },
       features: {
-        plan_tool: true,
         apply_patch_freeform: true,
-        view_image_tool: true,
         unified_exec: false,
-        streamable_shell: false,
-        rmcp_client: true,
-        elevated_windows_sandbox: true
+        elevated_windows_sandbox: true,
+        multi_agent: true,
+        shell_tool: true,
+        shell_snapshot: true,
+        fast_mode: true,
+        personality: true
       },
       profiles: {
         "auto-max": {
@@ -448,7 +470,7 @@ var init_codex = __esm({
       }
     };
     GMN_PROVIDER_HOSTS = [
-      "gmn.chuangzuoli.com",
+      "ai.gmncode.com",
       "cdn-gmn.chuangzuoli.com",
       "gmncodex.com",
       "gmncode.cn",
@@ -524,6 +546,7 @@ var init_claude = __esm({
     __filename2 = fileURLToPath3(import.meta.url);
     __dirname2 = path4.dirname(__filename2);
     CLAUDE_CONFIG_TEMPLATE = {
+      model: "sonnet",
       env: {
         ANTHROPIC_AUTH_TOKEN: "{{apiKey}}",
         ANTHROPIC_BASE_URL: "{{baseUrl}}",
@@ -704,7 +727,7 @@ function createDualGmnPresets(transformBaseUrl = (baseUrl) => baseUrl) {
     {
       name: "GMN",
       baseUrl: transformBaseUrl(GMN_ROOT_URL),
-      description: "GMN \u4E3B\u57DF\u540D\u7EBF\u8DEF (gmn.chuangzuoli.com)"
+      description: "GMN \u4E3B\u57DF\u540D\u7EBF\u8DEF (ai.gmncode.com)"
     },
     {
       name: "GMN1",
@@ -717,7 +740,7 @@ var GMN_ROOT_URL, GMN1_ROOT_URL;
 var init_gmn = __esm({
   "../core/dist/presets/gmn.js"() {
     "use strict";
-    GMN_ROOT_URL = "https://gmn.chuangzuoli.com";
+    GMN_ROOT_URL = "https://ai.gmncode.com";
     GMN1_ROOT_URL = "https://gmncode.cn";
   }
 });
@@ -990,12 +1013,16 @@ function writeGeminiConfig(provider, options = {}) {
     ...existingEnv,
     ...templateEnv
   };
+  const existingGeminiModel = existingEnv.GEMINI_MODEL;
   if (!templateEnv.GOOGLE_GEMINI_BASE_URL) {
     delete env.GOOGLE_GEMINI_BASE_URL;
   }
   if (!templateEnv.GEMINI_API_KEY) {
     delete env.GEMINI_API_KEY;
   }
+  if (options.mode !== "overwrite" && existingGeminiModel) {
+    env.GEMINI_MODEL = existingGeminiModel;
+  }
   let modelMeta = null;
   if (provider.model && provider.model.trim().length > 0) {
     try {
@@ -1015,7 +1042,7 @@ function writeGeminiConfig(provider, options = {}) {
         }
       }
     }
-    if (!env.GEMINI_MODEL && modelMeta.defaultModel) {
+    if (modelMeta.defaultModel && (!existingGeminiModel || options.mode === "overwrite")) {
       env.GEMINI_MODEL = modelMeta.defaultModel;
     }
   }
@@ -1043,7 +1070,8 @@ var init_gemini2 = __esm({
     GEMINI_ENV_TEMPLATE = [
       "# Managed by ccman",
       "GOOGLE_GEMINI_BASE_URL={{baseUrl}}",
-      "GEMINI_API_KEY={{apiKey}}"
+      "GEMINI_API_KEY={{apiKey}}",
+      "GEMINI_MODEL=gemini-3.5-flash"
     ].join("\n");
   }
 });
@@ -1123,17 +1151,6 @@ function enforceModelStoreFalse(models) {
         high: {},
         xhigh: {}
       }
-    },
-    [OPENCODE_SECONDARY_MODEL_KEY]: {
-      options: {
-        store: false
-      },
-      variants: {
-        low: {},
-        medium: {},
-        high: {},
-        xhigh: {}
-      }
     }
   });
 }
@@ -1173,7 +1190,7 @@ function writeOpenCodeConfig(provider, options = {}) {
   };
   writeJSON(configPath, nextConfig);
 }
-var OPENCODE_SCHEMA, OPENCODE_PROVIDER_KEY, OPENCODE_MODEL, OPENCODE_MODEL_KEY, OPENCODE_SECONDARY_MODEL_KEY, __filename4, __dirname4, DEFAULT_MODELS, OPENCODE_CONFIG_TEMPLATE;
+var OPENCODE_SCHEMA, OPENCODE_PROVIDER_KEY, OPENCODE_MODEL, OPENCODE_MODEL_KEY, __filename4, __dirname4, DEFAULT_MODELS, OPENCODE_CONFIG_TEMPLATE;
 var init_opencode2 = __esm({
   "../core/dist/writers/opencode.js"() {
     "use strict";
@@ -1182,26 +1199,13 @@ var init_opencode2 = __esm({
     init_template();
     OPENCODE_SCHEMA = "https://opencode.ai/config.json";
     OPENCODE_PROVIDER_KEY = "openai";
-    OPENCODE_MODEL = "openai/gpt-5.4";
-    OPENCODE_MODEL_KEY = "gpt-5.4";
-    OPENCODE_SECONDARY_MODEL_KEY = "gpt-5.3-codex";
+    OPENCODE_MODEL = "openai/gpt-5.5";
+    OPENCODE_MODEL_KEY = "gpt-5.5";
     __filename4 = fileURLToPath5(import.meta.url);
     __dirname4 = path7.dirname(__filename4);
     DEFAULT_MODELS = {
       [OPENCODE_MODEL_KEY]: {
-        name: "GPT-5.4",
-        options: {
-          store: false
-        },
-        variants: {
-          low: {},
-          medium: {},
-          high: {},
-          xhigh: {}
-        }
-      },
-      [OPENCODE_SECONDARY_MODEL_KEY]: {
-        name: "GPT-5.3 Codex",
+        name: "GPT-5.5",
         options: {
           store: false
         },
@@ -1354,10 +1358,10 @@ function writeOpenClawConfig(provider, options = {}) {
         defaults: {
           ...nextOpenClawConfig.agents?.defaults || {},
           workspace: homeDir,
-          imageModel: nextOpenClawConfig.agents?.defaults?.imageModel || `${providerName}/gpt-5.4`,
+          imageModel: nextOpenClawConfig.agents?.defaults?.imageModel || `${providerName}/gpt-5.5`,
           model: {
             ...nextOpenClawConfig.agents?.defaults?.model || {},
-            primary: nextOpenClawConfig.agents?.defaults?.model?.primary || `${providerName}/gpt-5.4`
+            primary: nextOpenClawConfig.agents?.defaults?.model?.primary || `${providerName}/gpt-5.5`
           }
         }
       }
@@ -1375,8 +1379,8 @@ function writeOpenClawConfig(provider, options = {}) {
   const mergedAgents = deepMerge(nextOpenClawConfig.agents || {}, existingOpenClawConfig.agents || {});
   const mergedDefaults = mergedAgents.defaults || {};
   const mergedModel = mergedDefaults.model || {};
-  const templatePrimary = nextOpenClawConfig.agents?.defaults?.model?.primary || `${providerName}/gpt-5.4`;
-  const templateImageModel = nextOpenClawConfig.agents?.defaults?.imageModel || `${providerName}/gpt-5.4`;
+  const templatePrimary = nextOpenClawConfig.agents?.defaults?.model?.primary || `${providerName}/gpt-5.5`;
+  const templateImageModel = nextOpenClawConfig.agents?.defaults?.imageModel || `${providerName}/gpt-5.5`;
   const workspace = typeof mergedDefaults.workspace === "string" && mergedDefaults.workspace.trim() ? mergedDefaults.workspace : homeDir;
   const finalOpenClawConfig = {
     ...existingOpenClawConfig,
@@ -1403,7 +1407,7 @@ function writeOpenClawConfig(provider, options = {}) {
   writeJSON(configPath, finalOpenClawConfig);
   writeJSON(modelsPath, finalModelsConfig);
 }
-var DEFAULT_PROVIDER_NAME, PRIMARY_MODEL_ID, SECONDARY_MODEL_ID, PRIMARY_MODEL_INPUTS, SECONDARY_MODEL_INPUTS, __filename5, __dirname5, OPENCLAW_CONFIG_TEMPLATE, OPENCLAW_MODELS_TEMPLATE;
+var DEFAULT_PROVIDER_NAME, PRIMARY_MODEL_ID, PRIMARY_MODEL_INPUTS, __filename5, __dirname5, OPENCLAW_CONFIG_TEMPLATE, OPENCLAW_MODELS_TEMPLATE;
 var init_openclaw2 = __esm({
   "../core/dist/writers/openclaw.js"() {
     "use strict";
@@ -1411,10 +1415,8 @@ var init_openclaw2 = __esm({
     init_file();
     init_template();
     DEFAULT_PROVIDER_NAME = "gmn";
-    PRIMARY_MODEL_ID = "gpt-5.4";
-    SECONDARY_MODEL_ID = "gpt-5.3-codex";
+    PRIMARY_MODEL_ID = "gpt-5.5";
     PRIMARY_MODEL_INPUTS = ["text", "image"];
-    SECONDARY_MODEL_INPUTS = ["text", "image"];
     __filename5 = fileURLToPath6(import.meta.url);
     __dirname5 = path8.dirname(__filename5);
     OPENCLAW_CONFIG_TEMPLATE = {
@@ -1432,24 +1434,14 @@ var init_openclaw2 = __esm({
             authHeader: true,
             models: [
               {
-                id: "gpt-5.4",
-                name: "gpt-5.4",
+                id: "gpt-5.5",
+                name: "gpt-5.5",
                 api: "openai-responses",
                 reasoning: true,
                 input: PRIMARY_MODEL_INPUTS,
                 cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
                 contextWindow: 105e4,
                 maxTokens: 128e3
-              },
-              {
-                id: SECONDARY_MODEL_ID,
-                name: SECONDARY_MODEL_ID,
-                api: "openai-responses",
-                reasoning: false,
-                input: SECONDARY_MODEL_INPUTS,
-                cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-                contextWindow: 4e5,
-                maxTokens: 128e3
               }
             ]
           }
@@ -1458,9 +1450,9 @@ var init_openclaw2 = __esm({
       agents: {
         defaults: {
           workspace: "",
-          imageModel: "{{providerName}}/gpt-5.4",
+          imageModel: "{{providerName}}/gpt-5.5",
           model: {
-            primary: "{{providerName}}/gpt-5.4"
+            primary: "{{providerName}}/gpt-5.5"
           },
           thinkingDefault: "xhigh"
         }
@@ -1479,24 +1471,14 @@ var init_openclaw2 = __esm({
           },
           models: [
             {
-              id: "gpt-5.4",
-              name: "gpt-5.4",
+              id: "gpt-5.5",
+              name: "gpt-5.5",
               api: "openai-responses",
               reasoning: true,
               input: PRIMARY_MODEL_INPUTS,
               cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
               contextWindow: 105e4,
               maxTokens: 128e3
-            },
-            {
-              id: SECONDARY_MODEL_ID,
-              name: SECONDARY_MODEL_ID,
-              api: "openai-responses",
-              reasoning: false,
-              input: SECONDARY_MODEL_INPUTS,
-              cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-              contextWindow: 4e5,
-              maxTokens: 128e3
             }
           ]
         }
@@ -3007,23 +2989,303 @@ var init_sync_config = __esm({
   }
 });
 
+// src/commands/sync/helpers.ts
+import chalk5 from "chalk";
+import { Command, Option } from "commander";
+import inquirer2 from "inquirer";
+function normalizeText(value) {
+  if (value === void 0) {
+    return void 0;
+  }
+  const trimmed = value.trim();
+  return trimmed ? trimmed : void 0;
+}
+function resolveTextOption(cliValue, envKey, env) {
+  return normalizeText(cliValue) ?? normalizeText(env[envKey]);
+}
+function resolveAuthType(cliValue, env) {
+  const value = resolveTextOption(cliValue, SYNC_ENV_KEYS.authType, env);
+  if (!value) {
+    return void 0;
+  }
+  if (value === "password" || value === "digest") {
+    return value;
+  }
+  throw new Error(`\u65E0\u6548\u7684\u8BA4\u8BC1\u7C7B\u578B: ${value}\uFF0C\u4EC5\u652F\u6301 password \u6216 digest`);
+}
+function hasSyncEnvInput(env) {
+  return Object.values(SYNC_ENV_KEYS).some((key) => normalizeText(env[key]));
+}
+function formatMissingFields(fields) {
+  const labels = {
+    webdavUrl: "--webdav-url",
+    username: "--username",
+    password: "--password",
+    authType: "--auth-type",
+    remoteDir: "--remote-dir",
+    syncPassword: "--sync-password"
+  };
+  return fields.map((field) => labels[field] || field).join(", ");
+}
+function addSyncConnectionOptions(command, options = {}) {
+  command.option("--webdav-url <url>", `WebDAV \u670D\u52A1\u5668\u5730\u5740\uFF08\u6216\u73AF\u5883\u53D8\u91CF ${SYNC_ENV_KEYS.webdavUrl}\uFF09`).option("--username <username>", `WebDAV \u7528\u6237\u540D\uFF08\u6216\u73AF\u5883\u53D8\u91CF ${SYNC_ENV_KEYS.username}\uFF09`).option("--password <password>", `WebDAV \u5BC6\u7801\uFF08\u6216\u73AF\u5883\u53D8\u91CF ${SYNC_ENV_KEYS.password}\uFF09`).addOption(
+    new Option(
+      "--auth-type <type>",
+      `\u8BA4\u8BC1\u7C7B\u578B\uFF08password|digest\uFF0C\u6216\u73AF\u5883\u53D8\u91CF ${SYNC_ENV_KEYS.authType}\uFF09`
+    ).choices(["password", "digest"])
+  ).option("--remote-dir <dir>", `\u8FDC\u7A0B\u540C\u6B65\u76EE\u5F55\uFF08\u6216\u73AF\u5883\u53D8\u91CF ${SYNC_ENV_KEYS.remoteDir}\uFF09`);
+  if (options.includeSyncPassword) {
+    command.option(
+      "--sync-password <password>",
+      `\u540C\u6B65\u5BC6\u7801\uFF08\u6216\u73AF\u5883\u53D8\u91CF ${SYNC_ENV_KEYS.syncPassword}\uFF09`
+    );
+  }
+  if (options.includeConfirm) {
+    command.option("-y, --yes", "\u8DF3\u8FC7\u786E\u8BA4\u63D0\u793A");
+  }
+  if (options.includeRememberFlags) {
+    command.option("--remember-sync-password", "\u4FDD\u5B58\u540C\u6B65\u5BC6\u7801\u5230\u672C\u5730\u914D\u7F6E").option("--forget-sync-password", "\u4E0D\u4FDD\u5B58\u540C\u6B65\u5BC6\u7801\u5230\u672C\u5730\u914D\u7F6E");
+  }
+  if (options.includeTestFlag) {
+    command.option("--test", "\u4FDD\u5B58\u540E\u7ACB\u5373\u6D4B\u8BD5\u8FDE\u63A5");
+  }
+}
+function collectSyncCommandInput(options = {}, env = process.env) {
+  if (options.rememberSyncPassword && options.forgetSyncPassword) {
+    throw new Error("\u4E0D\u80FD\u540C\u65F6\u4F7F\u7528 --remember-sync-password \u548C --forget-sync-password");
+  }
+  const overrides = {
+    webdavUrl: resolveTextOption(options.webdavUrl, SYNC_ENV_KEYS.webdavUrl, env),
+    username: resolveTextOption(options.username, SYNC_ENV_KEYS.username, env),
+    password: resolveTextOption(options.password, SYNC_ENV_KEYS.password, env),
+    authType: resolveAuthType(options.authType, env),
+    remoteDir: resolveTextOption(options.remoteDir, SYNC_ENV_KEYS.remoteDir, env),
+    syncPassword: resolveTextOption(options.syncPassword, SYNC_ENV_KEYS.syncPassword, env)
+  };
+  const rememberSyncPassword = options.rememberSyncPassword ? true : options.forgetSyncPassword ? false : void 0;
+  const nonInteractive = options.yes === true || rememberSyncPassword !== void 0 || hasSyncEnvInput(env) || Object.values(overrides).some((value) => value !== void 0);
+  return {
+    overrides,
+    rememberSyncPassword,
+    yes: options.yes === true,
+    shouldTest: options.test === true,
+    nonInteractive
+  };
+}
+function mergeSyncConfig(baseConfig, overrides) {
+  return {
+    ...baseConfig || {},
+    ...Object.fromEntries(Object.entries(overrides).filter(([, value]) => value !== void 0))
+  };
+}
+function getMissingConnectionFields(config) {
+  return REQUIRED_CONNECTION_FIELDS.filter((field) => !normalizeText(config[field]));
+}
+function buildRuntimeSyncConfig(existingConfig, input) {
+  return mergeSyncConfig(existingConfig, input.overrides);
+}
+function assertCompleteSyncConfig(config) {
+  const missingFields = getMissingConnectionFields(config);
+  if (missingFields.length > 0) {
+    throw new Error(`\u7F3A\u5C11\u540C\u6B65\u914D\u7F6E\u53C2\u6570: ${formatMissingFields(missingFields)}`);
+  }
+}
+async function ensureConfigExists(options = {}) {
+  const existingConfig = loadSyncConfig();
+  const input = collectSyncCommandInput(options);
+  const mergedConfig = buildRuntimeSyncConfig(existingConfig, input);
+  if (getMissingConnectionFields(mergedConfig).length === 0) {
+    assertCompleteSyncConfig(mergedConfig);
+    return mergedConfig;
+  }
+  if (input.nonInteractive) {
+    assertCompleteSyncConfig(mergedConfig);
+  }
+  console.log(chalk5.yellow("\n\u26A0\uFE0F  \u672A\u627E\u5230 WebDAV \u914D\u7F6E\n"));
+  const shouldConfig = await promptConfirm("\u662F\u5426\u73B0\u5728\u914D\u7F6E WebDAV?", true);
+  if (!shouldConfig) {
+    return null;
+  }
+  const { configCommand: configCommand2 } = await Promise.resolve().then(() => (init_config2(), config_exports));
+  const cmd = new Command();
+  configCommand2(cmd);
+  await cmd.parseAsync(["node", "ccman", "config"]);
+  return loadSyncConfig();
+}
+async function resolveSyncPassword(config, options = {}) {
+  const input = collectSyncCommandInput(options);
+  const syncPassword = normalizeText(input.overrides.syncPassword) || normalizeText(config.syncPassword);
+  if (syncPassword) {
+    return syncPassword;
+  }
+  if (input.nonInteractive) {
+    throw new Error(`\u7F3A\u5C11\u540C\u6B65\u5BC6\u7801: ${formatMissingFields(["syncPassword"])}`);
+  }
+  const { password } = await inquirer2.prompt([
+    {
+      type: "password",
+      name: "password",
+      message: "\u8BF7\u8F93\u5165\u540C\u6B65\u5BC6\u7801:",
+      mask: "*",
+      validate: (value) => value ? true : "\u540C\u6B65\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A"
+    }
+  ]);
+  return password;
+}
+async function confirmOrExit(message, defaultValue, options = {}) {
+  const input = collectSyncCommandInput(options);
+  if (input.yes) {
+    return true;
+  }
+  if (input.nonInteractive) {
+    throw new Error(`\u975E\u4EA4\u4E92\u6A21\u5F0F\u8BF7\u901A\u8FC7 --yes \u786E\u8BA4\u64CD\u4F5C`);
+  }
+  return promptConfirm(message, defaultValue);
+}
+var SYNC_ENV_KEYS, REQUIRED_CONNECTION_FIELDS;
+var init_helpers = __esm({
+  "src/commands/sync/helpers.ts"() {
+    "use strict";
+    init_sync_config();
+    init_confirm();
+    SYNC_ENV_KEYS = {
+      webdavUrl: "CCMAN_WEBDAV_URL",
+      username: "CCMAN_WEBDAV_USERNAME",
+      password: "CCMAN_WEBDAV_PASSWORD",
+      authType: "CCMAN_WEBDAV_AUTH_TYPE",
+      remoteDir: "CCMAN_WEBDAV_REMOTE_DIR",
+      syncPassword: "CCMAN_SYNC_PASSWORD"
+    };
+    REQUIRED_CONNECTION_FIELDS = ["webdavUrl", "username", "password"];
+  }
+});
+
 // src/commands/sync/config.ts
 var config_exports = {};
 __export(config_exports, {
   configCommand: () => configCommand
 });
-import chalk3 from "chalk";
-import inquirer2 from "inquirer";
+import chalk6 from "chalk";
+import inquirer3 from "inquirer";
+function validateWebdavUrl(url) {
+  if (!url.startsWith("http://") && !url.startsWith("https://")) {
+    throw new Error("WebDAV \u5730\u5740\u5FC5\u987B\u4EE5 http:// \u6216 https:// \u5F00\u5934");
+  }
+}
+function hasConfigChanges(existingConfig, newConfig) {
+  if (!existingConfig) {
+    return true;
+  }
+  return existingConfig.webdavUrl !== newConfig.webdavUrl || existingConfig.username !== newConfig.username || existingConfig.password !== newConfig.password || existingConfig.authType !== newConfig.authType || existingConfig.remoteDir !== newConfig.remoteDir || existingConfig.syncPassword !== newConfig.syncPassword || existingConfig.rememberSyncPassword !== newConfig.rememberSyncPassword;
+}
+function buildConfigFromInput(existingConfig, input) {
+  const nextConfig = existingConfig ? { ...existingConfig } : {
+    webdavUrl: "",
+    username: "",
+    password: "",
+    authType: "password",
+    remoteDir: "/",
+    syncPassword: void 0,
+    rememberSyncPassword: true,
+    lastSync: void 0
+  };
+  if (input.overrides.webdavUrl !== void 0) {
+    nextConfig.webdavUrl = input.overrides.webdavUrl;
+  }
+  if (input.overrides.username !== void 0) {
+    nextConfig.username = input.overrides.username;
+  }
+  if (input.overrides.password !== void 0) {
+    nextConfig.password = input.overrides.password;
+  }
+  if (input.overrides.authType !== void 0) {
+    nextConfig.authType = input.overrides.authType;
+  }
+  if (input.overrides.remoteDir !== void 0) {
+    nextConfig.remoteDir = input.overrides.remoteDir;
+  }
+  if (input.overrides.syncPassword !== void 0) {
+    nextConfig.syncPassword = input.overrides.syncPassword;
+  }
+  if (input.rememberSyncPassword !== void 0) {
+    nextConfig.rememberSyncPassword = input.rememberSyncPassword;
+  }
+  nextConfig.authType = nextConfig.authType || "password";
+  nextConfig.remoteDir = nextConfig.remoteDir || "/";
+  nextConfig.rememberSyncPassword = nextConfig.rememberSyncPassword ?? true;
+  const missingFields = getMissingConnectionFields(nextConfig);
+  if (missingFields.length > 0) {
+    throw new Error(
+      `\u7F3A\u5C11\u540C\u6B65\u914D\u7F6E\u53C2\u6570: ${missingFields.map((field) => `--${field.replace(/[A-Z]/g, (m) => `-${m.toLowerCase()}`)}`).join(", ")}`
+    );
+  }
+  validateWebdavUrl(nextConfig.webdavUrl);
+  if (!existingConfig && !nextConfig.syncPassword) {
+    throw new Error("\u7F3A\u5C11\u540C\u6B65\u914D\u7F6E\u53C2\u6570: --sync-password");
+  }
+  return nextConfig;
+}
+async function printConnectionTestResult(config) {
+  console.log(chalk6.bold("\n\u{1F50D} \u6D4B\u8BD5 WebDAV \u8FDE\u63A5...\n"));
+  const success = await testWebDAVConnection(config);
+  if (success) {
+    console.log(chalk6.green("\u2705 \u8FDE\u63A5\u6210\u529F"));
+    console.log();
+    console.log("  ", chalk6.gray("URL:"), config.webdavUrl);
+    console.log("  ", chalk6.gray("\u7528\u6237:"), config.username);
+    console.log("  ", chalk6.gray("\u8FDC\u7A0B\u76EE\u5F55:"), config.remoteDir || "/");
+    console.log(
+      "  ",
+      chalk6.gray("\u8BA4\u8BC1\u7C7B\u578B:"),
+      config.authType === "password" ? "Basic Auth" : "Digest Auth"
+    );
+    console.log();
+    return;
+  }
+  console.log(chalk6.red("\u274C \u8FDE\u63A5\u5931\u8D25"));
+  console.log();
+  console.log(chalk6.yellow("\u8BF7\u68C0\u67E5:"));
+  console.log("  1. WebDAV \u670D\u52A1\u5668\u5730\u5740\u662F\u5426\u6B63\u786E");
+  console.log("  2. \u7528\u6237\u540D\u548C\u5BC6\u7801\u662F\u5426\u6B63\u786E");
+  console.log("  3. \u7F51\u7EDC\u8FDE\u63A5\u662F\u5426\u6B63\u5E38");
+  console.log();
+}
 function configCommand(program2) {
-  program2.command("config").description("\u914D\u7F6E WebDAV \u8FDE\u63A5").action(async () => {
+  const command = program2.command("config").description("\u914D\u7F6E WebDAV \u8FDE\u63A5");
+  addSyncConnectionOptions(command, {
+    includeSyncPassword: true,
+    includeRememberFlags: true,
+    includeTestFlag: true
+  });
+  command.action(async (options) => {
     try {
-      console.log(chalk3.bold("\n\u2699\uFE0F  \u914D\u7F6E WebDAV \u540C\u6B65\n"));
+      console.log(chalk6.bold("\n\u2699\uFE0F  \u914D\u7F6E WebDAV \u540C\u6B65\n"));
       const existingConfig = loadSyncConfig();
+      const input = collectSyncCommandInput(options);
+      if (input.nonInteractive) {
+        const newConfig2 = buildConfigFromInput(existingConfig, input);
+        if (!hasConfigChanges(existingConfig, newConfig2)) {
+          console.log();
+          console.log(chalk6.yellow("\u2139\uFE0F  \u672A\u68C0\u6D4B\u5230\u914D\u7F6E\u53D8\u66F4\uFF0C\u4E0D\u9700\u8981\u66F4\u65B0"));
+          console.log();
+          return;
+        }
+        saveSyncConfig2(newConfig2);
+        console.log();
+        console.log(chalk6.green("\u2705 \u914D\u7F6E\u4FDD\u5B58\u6210\u529F"));
+        console.log();
+        console.log(chalk6.gray("\u914D\u7F6E\u6587\u4EF6:"), getSyncConfigPath());
+        console.log();
+        if (input.shouldTest) {
+          await printConnectionTestResult(newConfig2);
+        }
+        return;
+      }
       if (existingConfig) {
-        console.log(chalk3.blue("\u2139\uFE0F  \u68C0\u6D4B\u5230\u5DF2\u6709\u914D\u7F6E\uFF0C\u53EF\u4EE5\u66F4\u65B0 WebDAV \u5B57\u6BB5"));
-        console.log(chalk3.gray("   \u7559\u7A7A\u8868\u793A\u4E0D\u66F4\u65B0\u8BE5\u5B57\u6BB5\n"));
+        console.log(chalk6.blue("\u2139\uFE0F  \u68C0\u6D4B\u5230\u5DF2\u6709\u914D\u7F6E\uFF0C\u53EF\u4EE5\u66F4\u65B0 WebDAV \u5B57\u6BB5"));
+        console.log(chalk6.gray("   \u7559\u7A7A\u8868\u793A\u4E0D\u66F4\u65B0\u8BE5\u5B57\u6BB5\n"));
       }
-      const answers = await inquirer2.prompt([
+      const answers = await inquirer3.prompt([
         {
           type: "input",
           name: "webdavUrl",
@@ -3094,7 +3356,7 @@ function configCommand(program2) {
         const hasSelectChange = trimmedAnswers.authType !== existingConfig.authType || trimmedAnswers.rememberSyncPassword !== existingConfig.rememberSyncPassword;
         if (!hasTextInput && !hasSelectChange) {
           console.log();
-          console.log(chalk3.yellow("\u2139\uFE0F  \u672A\u68C0\u6D4B\u5230\u914D\u7F6E\u53D8\u66F4\uFF0C\u4E0D\u9700\u8981\u66F4\u65B0"));
+          console.log(chalk6.yellow("\u2139\uFE0F  \u672A\u68C0\u6D4B\u5230\u914D\u7F6E\u53D8\u66F4\uFF0C\u4E0D\u9700\u8981\u66F4\u65B0"));
           console.log();
           return;
         }
@@ -3159,40 +3421,22 @@ function configCommand(program2) {
       }
       if (!hasChanges && existingConfig) {
         console.log();
-        console.log(chalk3.yellow("\u2139\uFE0F  \u672A\u68C0\u6D4B\u5230\u914D\u7F6E\u53D8\u66F4\uFF0C\u4E0D\u9700\u8981\u66F4\u65B0"));
+        console.log(chalk6.yellow("\u2139\uFE0F  \u672A\u68C0\u6D4B\u5230\u914D\u7F6E\u53D8\u66F4\uFF0C\u4E0D\u9700\u8981\u66F4\u65B0"));
         console.log();
         return;
       }
       saveSyncConfig2(newConfig);
       console.log();
-      console.log(chalk3.green("\u2705 \u914D\u7F6E\u4FDD\u5B58\u6210\u529F"));
+      console.log(chalk6.green("\u2705 \u914D\u7F6E\u4FDD\u5B58\u6210\u529F"));
       console.log();
-      console.log(chalk3.gray("\u914D\u7F6E\u6587\u4EF6:"), getSyncConfigPath());
+      console.log(chalk6.gray("\u914D\u7F6E\u6587\u4EF6:"), getSyncConfigPath());
       console.log();
       const testNow = await promptConfirm("\u662F\u5426\u7ACB\u5373\u6D4B\u8BD5\u8FDE\u63A5?", true);
       if (testNow) {
-        console.log(chalk3.bold("\n\u{1F50D} \u6D4B\u8BD5 WebDAV \u8FDE\u63A5...\n"));
-        const success = await testWebDAVConnection(newConfig);
-        if (success) {
-          console.log(chalk3.green("\u2705 \u8FDE\u63A5\u6210\u529F"));
-          console.log();
-          console.log("  ", chalk3.gray("URL:"), newConfig.webdavUrl);
-          console.log("  ", chalk3.gray("\u7528\u6237:"), newConfig.username);
-          console.log("  ", chalk3.gray("\u8FDC\u7A0B\u76EE\u5F55:"), newConfig.remoteDir || "/");
-          console.log("  ", chalk3.gray("\u8BA4\u8BC1\u7C7B\u578B:"), newConfig.authType === "password" ? "Basic Auth" : "Digest Auth");
-          console.log();
-        } else {
-          console.log(chalk3.red("\u274C \u8FDE\u63A5\u5931\u8D25"));
-          console.log();
-          console.log(chalk3.yellow("\u8BF7\u68C0\u67E5:"));
-          console.log("  1. WebDAV \u670D\u52A1\u5668\u5730\u5740\u662F\u5426\u6B63\u786E");
-          console.log("  2. \u7528\u6237\u540D\u548C\u5BC6\u7801\u662F\u5426\u6B63\u786E");
-          console.log("  3. \u7F51\u7EDC\u8FDE\u63A5\u662F\u5426\u6B63\u5E38");
-          console.log();
-        }
+        await printConnectionTestResult(newConfig);
       }
     } catch (error) {
-      console.error(chalk3.red(`
+      console.error(chalk6.red(`
 \u274C ${error.message}
 `));
     }
@@ -3204,33 +3448,7 @@ var init_config2 = __esm({
     init_sync_config();
     init_dist2();
     init_confirm();
-  }
-});
-
-// src/commands/sync/helpers.ts
-import chalk4 from "chalk";
-import { Command } from "commander";
-async function ensureConfigExists() {
-  const config = loadSyncConfig();
-  if (config) {
-    return config;
-  }
-  console.log(chalk4.yellow("\n\u26A0\uFE0F  \u672A\u627E\u5230 WebDAV \u914D\u7F6E\n"));
-  const shouldConfig = await promptConfirm("\u662F\u5426\u73B0\u5728\u914D\u7F6E WebDAV?", true);
-  if (!shouldConfig) {
-    return null;
-  }
-  const { configCommand: configCommand2 } = await Promise.resolve().then(() => (init_config2(), config_exports));
-  const cmd = new Command();
-  configCommand2(cmd);
-  await cmd.parseAsync(["node", "ccman", "config"]);
-  return loadSyncConfig();
-}
-var init_helpers = __esm({
-  "src/commands/sync/helpers.ts"() {
-    "use strict";
-    init_sync_config();
-    init_confirm();
+    init_helpers();
   }
 });
 
@@ -3239,36 +3457,42 @@ var test_exports = {};
 __export(test_exports, {
   testCommand: () => testCommand
 });
-import chalk5 from "chalk";
+import chalk7 from "chalk";
 function testCommand(program2) {
-  program2.command("test").description("\u6D4B\u8BD5 WebDAV \u8FDE\u63A5").action(async () => {
+  const command = program2.command("test").description("\u6D4B\u8BD5 WebDAV \u8FDE\u63A5");
+  addSyncConnectionOptions(command);
+  command.action(async (options) => {
     try {
-      const config = await ensureConfigExists();
+      const config = await ensureConfigExists(options);
       if (!config) {
-        console.log(chalk5.gray("\n\u5DF2\u53D6\u6D88\n"));
+        console.log(chalk7.gray("\n\u5DF2\u53D6\u6D88\n"));
         return;
       }
-      console.log(chalk5.bold("\n\u{1F50D} \u6D4B\u8BD5 WebDAV \u8FDE\u63A5...\n"));
+      console.log(chalk7.bold("\n\u{1F50D} \u6D4B\u8BD5 WebDAV \u8FDE\u63A5...\n"));
       const success = await testWebDAVConnection(config);
       if (success) {
-        console.log(chalk5.green("\u2705 \u8FDE\u63A5\u6210\u529F"));
+        console.log(chalk7.green("\u2705 \u8FDE\u63A5\u6210\u529F"));
         console.log();
-        console.log("  ", chalk5.gray("URL:"), config.webdavUrl);
-        console.log("  ", chalk5.gray("\u7528\u6237:"), config.username);
-        console.log("  ", chalk5.gray("\u8FDC\u7A0B\u76EE\u5F55:"), config.remoteDir);
-        console.log("  ", chalk5.gray("\u8BA4\u8BC1\u7C7B\u578B:"), config.authType === "password" ? "Basic Auth" : "Digest Auth");
+        console.log("  ", chalk7.gray("URL:"), config.webdavUrl);
+        console.log("  ", chalk7.gray("\u7528\u6237:"), config.username);
+        console.log("  ", chalk7.gray("\u8FDC\u7A0B\u76EE\u5F55:"), config.remoteDir || "/");
+        console.log(
+          "  ",
+          chalk7.gray("\u8BA4\u8BC1\u7C7B\u578B:"),
+          config.authType === "password" ? "Basic Auth" : "Digest Auth"
+        );
         console.log();
       } else {
-        console.log(chalk5.red("\u274C \u8FDE\u63A5\u5931\u8D25"));
+        console.log(chalk7.red("\u274C \u8FDE\u63A5\u5931\u8D25"));
         console.log();
-        console.log(chalk5.yellow("\u8BF7\u68C0\u67E5:"));
+        console.log(chalk7.yellow("\u8BF7\u68C0\u67E5:"));
         console.log("  1. WebDAV \u670D\u52A1\u5668\u5730\u5740\u662F\u5426\u6B63\u786E");
         console.log("  2. \u7528\u6237\u540D\u548C\u5BC6\u7801\u662F\u5426\u6B63\u786E");
         console.log("  3. \u7F51\u7EDC\u8FDE\u63A5\u662F\u5426\u6B63\u5E38");
         console.log();
       }
     } catch (error) {
-      console.error(chalk5.red(`
+      console.error(chalk7.red(`
 \u274C ${error.message}
 `));
     }
@@ -3287,29 +3511,21 @@ var upload_exports = {};
 __export(upload_exports, {
   uploadCommand: () => uploadCommand
 });
-import chalk6 from "chalk";
-import inquirer3 from "inquirer";
+import chalk8 from "chalk";
 function uploadCommand(program2) {
-  program2.command("upload").description("\u4E0A\u4F20\u672C\u5730\u914D\u7F6E\u5230\u4E91\u7AEF").action(async () => {
+  const command = program2.command("upload").description("\u4E0A\u4F20\u672C\u5730\u914D\u7F6E\u5230\u4E91\u7AEF");
+  addSyncConnectionOptions(command, {
+    includeSyncPassword: true,
+    includeConfirm: true
+  });
+  command.action(async (options) => {
     try {
-      const config = await ensureConfigExists();
+      const config = await ensureConfigExists(options);
       if (!config) {
-        console.log(chalk6.gray("\n\u5DF2\u53D6\u6D88\n"));
+        console.log(chalk8.gray("\n\u5DF2\u53D6\u6D88\n"));
         return;
       }
-      let syncPassword = config.syncPassword || "";
-      if (!syncPassword) {
-        const { password } = await inquirer3.prompt([
-          {
-            type: "password",
-            name: "password",
-            message: "\u8BF7\u8F93\u5165\u540C\u6B65\u5BC6\u7801:",
-            mask: "*",
-            validate: (value) => value ? true : "\u540C\u6B65\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A"
-          }
-        ]);
-        syncPassword = password;
-      }
+      const syncPassword = await resolveSyncPassword(config, options);
       const codexManager = createCodexManager();
       const claudeManager = createClaudeManager();
       const geminiManager = createGeminiManager();
@@ -3318,36 +3534,37 @@ function uploadCommand(program2) {
       const claudeProviders = claudeManager.list();
       const geminiProviders = geminiManager.list();
       const openclawProviders = openclawManager.list();
-      console.log(chalk6.bold("\n\u{1F4E4} \u4E0A\u4F20\u914D\u7F6E\u5230\u4E91\u7AEF\n"));
+      console.log(chalk8.bold("\n\u{1F4E4} \u4E0A\u4F20\u914D\u7F6E\u5230\u4E91\u7AEF\n"));
       console.log("\u914D\u7F6E\u4FE1\u606F:");
-      console.log(`  Codex \u670D\u52A1\u5546: ${chalk6.cyan(codexProviders.length)} \u4E2A`);
-      console.log(`  Claude \u670D\u52A1\u5546: ${chalk6.cyan(claudeProviders.length)} \u4E2A`);
-      console.log(`  Gemini \u670D\u52A1\u5546: ${chalk6.cyan(geminiProviders.length)} \u4E2A`);
-      console.log(`  OpenClaw \u670D\u52A1\u5546: ${chalk6.cyan(openclawProviders.length)} \u4E2A`);
+      console.log(`  Codex \u670D\u52A1\u5546: ${chalk8.cyan(codexProviders.length)} \u4E2A`);
+      console.log(`  Claude \u670D\u52A1\u5546: ${chalk8.cyan(claudeProviders.length)} \u4E2A`);
+      console.log(`  Gemini \u670D\u52A1\u5546: ${chalk8.cyan(geminiProviders.length)} \u4E2A`);
+      console.log(`  OpenClaw \u670D\u52A1\u5546: ${chalk8.cyan(openclawProviders.length)} \u4E2A`);
       console.log();
-      console.log(chalk6.yellow("\u26A0\uFE0F  \u4E91\u7AEF\u73B0\u6709\u914D\u7F6E\u5C06\u88AB\u8986\u76D6"));
+      console.log(chalk8.yellow("\u26A0\uFE0F  \u4E91\u7AEF\u73B0\u6709\u914D\u7F6E\u5C06\u88AB\u8986\u76D6"));
       console.log();
-      const confirm = await promptConfirm("\u786E\u8BA4\u4E0A\u4F20?", false);
+      const confirm = await confirmOrExit("\u786E\u8BA4\u4E0A\u4F20?", false, options);
       if (!confirm) {
-        console.log(chalk6.gray("\n\u274C \u5DF2\u53D6\u6D88\n"));
+        console.log(chalk8.gray("\n\u274C \u5DF2\u53D6\u6D88\n"));
         return;
       }
       console.log();
-      console.log(chalk6.gray("\u{1F510} \u52A0\u5BC6 API Key..."));
-      console.log(chalk6.gray("\u{1F4E4} \u4E0A\u4F20\u5230 WebDAV..."));
+      console.log(chalk8.gray("\u{1F510} \u52A0\u5BC6 API Key..."));
+      console.log(chalk8.gray("\u{1F4E4} \u4E0A\u4F20\u5230 WebDAV..."));
       await uploadToCloud(config, syncPassword);
       console.log();
-      console.log(chalk6.green("\u2705 \u4E0A\u4F20\u6210\u529F"));
+      console.log(chalk8.green("\u2705 \u4E0A\u4F20\u6210\u529F"));
       console.log();
-      console.log(chalk6.gray("\u8FDC\u7A0B\u6587\u4EF6:"));
-      console.log(chalk6.gray(`  ${config.webdavUrl}${config.remoteDir}/.ccman/codex.json`));
-      console.log(chalk6.gray(`  ${config.webdavUrl}${config.remoteDir}/.ccman/claude.json`));
-      console.log(chalk6.gray(`  ${config.webdavUrl}${config.remoteDir}/.ccman/gemini.json`));
-      console.log(chalk6.gray(`  ${config.webdavUrl}${config.remoteDir}/.ccman/openclaw.json`));
+      const remoteDir = config.remoteDir || "/";
+      console.log(chalk8.gray("\u8FDC\u7A0B\u6587\u4EF6:"));
+      console.log(chalk8.gray(`  ${config.webdavUrl}${remoteDir}/.ccman/codex.json`));
+      console.log(chalk8.gray(`  ${config.webdavUrl}${remoteDir}/.ccman/claude.json`));
+      console.log(chalk8.gray(`  ${config.webdavUrl}${remoteDir}/.ccman/gemini.json`));
+      console.log(chalk8.gray(`  ${config.webdavUrl}${remoteDir}/.ccman/openclaw.json`));
       console.log();
-      console.log(chalk6.blue("\u{1F4A1} \u5176\u4ED6\u8BBE\u5907\u53EF\u901A\u8FC7 'ccman sync download' \u83B7\u53D6\u914D\u7F6E\n"));
+      console.log(chalk8.blue("\u{1F4A1} \u5176\u4ED6\u8BBE\u5907\u53EF\u901A\u8FC7 'ccman sync download' \u83B7\u53D6\u914D\u7F6E\n"));
     } catch (error) {
-      console.error(chalk6.red(`
+      console.error(chalk8.red(`
 \u274C ${error.message}
 `));
     }
@@ -3358,7 +3575,6 @@ var init_upload = __esm({
     "use strict";
     init_dist2();
     init_helpers();
-    init_confirm();
   }
 });
 
@@ -3367,55 +3583,47 @@ var download_exports = {};
 __export(download_exports, {
   downloadCommand: () => downloadCommand
 });
-import chalk7 from "chalk";
-import inquirer4 from "inquirer";
+import chalk9 from "chalk";
 function downloadCommand(program2) {
-  program2.command("download").description("\u4ECE\u4E91\u7AEF\u4E0B\u8F7D\u914D\u7F6E\u5230\u672C\u5730").action(async () => {
+  const command = program2.command("download").description("\u4ECE\u4E91\u7AEF\u4E0B\u8F7D\u914D\u7F6E\u5230\u672C\u5730");
+  addSyncConnectionOptions(command, {
+    includeSyncPassword: true,
+    includeConfirm: true
+  });
+  command.action(async (options) => {
     try {
-      const config = await ensureConfigExists();
+      const config = await ensureConfigExists(options);
       if (!config) {
-        console.log(chalk7.gray("\n\u5DF2\u53D6\u6D88\n"));
+        console.log(chalk9.gray("\n\u5DF2\u53D6\u6D88\n"));
         return;
       }
-      let syncPassword = config.syncPassword || "";
-      if (!syncPassword) {
-        const { password } = await inquirer4.prompt([
-          {
-            type: "password",
-            name: "password",
-            message: "\u8BF7\u8F93\u5165\u540C\u6B65\u5BC6\u7801:",
-            mask: "*",
-            validate: (value) => value ? true : "\u540C\u6B65\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A"
-          }
-        ]);
-        syncPassword = password;
-      }
-      console.log(chalk7.bold("\n\u{1F4E5} \u4ECE\u4E91\u7AEF\u4E0B\u8F7D\u914D\u7F6E\n"));
-      console.log(chalk7.yellow("\u26A0\uFE0F  \u5C06\u8986\u76D6\u672C\u5730\u914D\u7F6E\uFF08\u81EA\u52A8\u5907\u4EFD\uFF09"));
+      const syncPassword = await resolveSyncPassword(config, options);
+      console.log(chalk9.bold("\n\u{1F4E5} \u4ECE\u4E91\u7AEF\u4E0B\u8F7D\u914D\u7F6E\n"));
+      console.log(chalk9.yellow("\u26A0\uFE0F  \u5C06\u8986\u76D6\u672C\u5730\u914D\u7F6E\uFF08\u81EA\u52A8\u5907\u4EFD\uFF09"));
       console.log();
-      const confirm = await promptConfirm("\u786E\u8BA4\u4E0B\u8F7D?", false);
+      const confirm = await confirmOrExit("\u786E\u8BA4\u4E0B\u8F7D?", false, options);
       if (!confirm) {
-        console.log(chalk7.gray("\n\u274C \u5DF2\u53D6\u6D88\n"));
+        console.log(chalk9.gray("\n\u274C \u5DF2\u53D6\u6D88\n"));
         return;
       }
       console.log();
-      console.log(chalk7.gray("\u{1F4BE} \u5907\u4EFD\u672C\u5730\u914D\u7F6E..."));
-      console.log(chalk7.gray("\u{1F4E5} \u4E0B\u8F7D\u8FDC\u7A0B\u914D\u7F6E..."));
-      console.log(chalk7.gray("\u{1F513} \u89E3\u5BC6 API Key..."));
+      console.log(chalk9.gray("\u{1F4BE} \u5907\u4EFD\u672C\u5730\u914D\u7F6E..."));
+      console.log(chalk9.gray("\u{1F4E5} \u4E0B\u8F7D\u8FDC\u7A0B\u914D\u7F6E..."));
+      console.log(chalk9.gray("\u{1F513} \u89E3\u5BC6 API Key..."));
       const backupPaths = await downloadFromCloud(config, syncPassword);
       console.log();
-      console.log(chalk7.green("\u2705 \u4E0B\u8F7D\u6210\u529F"));
+      console.log(chalk9.green("\u2705 \u4E0B\u8F7D\u6210\u529F"));
       console.log();
       if (backupPaths.length > 0) {
-        console.log(chalk7.gray("\u672C\u5730\u5907\u4EFD:"));
+        console.log(chalk9.gray("\u672C\u5730\u5907\u4EFD:"));
         backupPaths.forEach((path16) => {
-          console.log(chalk7.gray(`  ${path16}`));
+          console.log(chalk9.gray(`  ${path16}`));
         });
         console.log();
       }
-      console.log(chalk7.blue("\u{1F4A1} \u914D\u7F6E\u5DF2\u66F4\u65B0\uFF0C\u91CD\u65B0\u52A0\u8F7D\u751F\u6548\n"));
+      console.log(chalk9.blue("\u{1F4A1} \u914D\u7F6E\u5DF2\u66F4\u65B0\uFF0C\u91CD\u65B0\u52A0\u8F7D\u751F\u6548\n"));
     } catch (error) {
-      console.error(chalk7.red(`
+      console.error(chalk9.red(`
 \u274C ${error.message}
 `));
     }
@@ -3426,7 +3634,6 @@ var init_download = __esm({
     "use strict";
     init_dist2();
     init_helpers();
-    init_confirm();
   }
 });
 
@@ -3435,54 +3642,45 @@ var merge_exports = {};
 __export(merge_exports, {
   mergeCommand: () => mergeCommand
 });
-import chalk8 from "chalk";
-import inquirer5 from "inquirer";
+import chalk10 from "chalk";
 function mergeCommand(program2) {
-  program2.command("merge").description("\u667A\u80FD\u5408\u5E76\u672C\u5730\u548C\u4E91\u7AEF\u914D\u7F6E").action(async () => {
+  const command = program2.command("merge").description("\u667A\u80FD\u5408\u5E76\u672C\u5730\u548C\u4E91\u7AEF\u914D\u7F6E");
+  addSyncConnectionOptions(command, {
+    includeSyncPassword: true
+  });
+  command.action(async (options) => {
     try {
-      const config = await ensureConfigExists();
+      const config = await ensureConfigExists(options);
       if (!config) {
-        console.log(chalk8.gray("\n\u5DF2\u53D6\u6D88\n"));
+        console.log(chalk10.gray("\n\u5DF2\u53D6\u6D88\n"));
         return;
       }
-      let syncPassword = config.syncPassword || "";
-      if (!syncPassword) {
-        const { password } = await inquirer5.prompt([
-          {
-            type: "password",
-            name: "password",
-            message: "\u8BF7\u8F93\u5165\u540C\u6B65\u5BC6\u7801:",
-            mask: "*",
-            validate: (value) => value ? true : "\u540C\u6B65\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A"
-          }
-        ]);
-        syncPassword = password;
-      }
-      console.log(chalk8.bold("\n\u{1F504} \u667A\u80FD\u5408\u5E76\u914D\u7F6E\n"));
-      console.log(chalk8.gray("\u5206\u6790\u672C\u5730\u548C\u4E91\u7AEF\u914D\u7F6E..."));
+      const syncPassword = await resolveSyncPassword(config, options);
+      console.log(chalk10.bold("\n\u{1F504} \u667A\u80FD\u5408\u5E76\u914D\u7F6E\n"));
+      console.log(chalk10.gray("\u5206\u6790\u672C\u5730\u548C\u4E91\u7AEF\u914D\u7F6E..."));
       const result = await mergeSync(config, syncPassword);
       if (!result.hasChanges) {
         console.log();
-        console.log(chalk8.blue("\u2139\uFE0F  \u914D\u7F6E\u5DF2\u540C\u6B65\uFF0C\u65E0\u9700\u64CD\u4F5C\n"));
+        console.log(chalk10.blue("\u2139\uFE0F  \u914D\u7F6E\u5DF2\u540C\u6B65\uFF0C\u65E0\u9700\u64CD\u4F5C\n"));
         return;
       }
       console.log();
-      console.log(chalk8.green("\u2705 \u914D\u7F6E\u5DF2\u667A\u80FD\u5408\u5E76\u5E76\u540C\u6B65"));
+      console.log(chalk10.green("\u2705 \u914D\u7F6E\u5DF2\u667A\u80FD\u5408\u5E76\u5E76\u540C\u6B65"));
       console.log();
       if (result.backupPaths.length > 0) {
-        console.log(chalk8.gray("\u5907\u4EFD:"));
+        console.log(chalk10.gray("\u5907\u4EFD:"));
         result.backupPaths.forEach((path16) => {
-          console.log(chalk8.gray(`  ${path16}`));
+          console.log(chalk10.gray(`  ${path16}`));
         });
         console.log();
       }
-      console.log(chalk8.blue("\u5408\u5E76\u89C4\u5219:"));
-      console.log(chalk8.gray("  \u2022 \u76F8\u540C ID\uFF1A\u4FDD\u7559\u6700\u65B0\u4FEE\u6539"));
-      console.log(chalk8.gray("  \u2022 \u76F8\u540C\u914D\u7F6E\uFF08URL+Key\uFF09\uFF1A\u4FDD\u7559\u6700\u65B0\u4FEE\u6539"));
-      console.log(chalk8.gray("  \u2022 \u4E0D\u540C\u914D\u7F6E\uFF1A\u5168\u90E8\u4FDD\u7559\uFF0C\u81EA\u52A8\u5904\u7406 name \u51B2\u7A81"));
+      console.log(chalk10.blue("\u5408\u5E76\u89C4\u5219:"));
+      console.log(chalk10.gray("  \u2022 \u76F8\u540C ID\uFF1A\u4FDD\u7559\u6700\u65B0\u4FEE\u6539"));
+      console.log(chalk10.gray("  \u2022 \u76F8\u540C\u914D\u7F6E\uFF08URL+Key\uFF09\uFF1A\u4FDD\u7559\u6700\u65B0\u4FEE\u6539"));
+      console.log(chalk10.gray("  \u2022 \u4E0D\u540C\u914D\u7F6E\uFF1A\u5168\u90E8\u4FDD\u7559\uFF0C\u81EA\u52A8\u5904\u7406 name \u51B2\u7A81"));
       console.log();
     } catch (error) {
-      console.error(chalk8.red(`
+      console.error(chalk10.red(`
 \u274C ${error.message}
 `));
     }
@@ -3501,27 +3699,27 @@ var status_exports = {};
 __export(status_exports, {
   statusCommand: () => statusCommand
 });
-import chalk9 from "chalk";
+import chalk11 from "chalk";
 function statusCommand(program2) {
   program2.command("status").description("\u67E5\u770B\u540C\u6B65\u72B6\u6001").action(async () => {
     try {
       const config = loadSyncConfig();
-      console.log(chalk9.bold("\n\u{1F4CA} \u540C\u6B65\u72B6\u6001\n"));
+      console.log(chalk11.bold("\n\u{1F4CA} \u540C\u6B65\u72B6\u6001\n"));
       if (!config) {
-        console.log(chalk9.yellow("\u26A0\uFE0F  \u672A\u914D\u7F6E WebDAV \u540C\u6B65"));
+        console.log(chalk11.yellow("\u26A0\uFE0F  \u672A\u914D\u7F6E WebDAV \u540C\u6B65"));
         console.log();
-        console.log(chalk9.blue("\u{1F4A1} \u5F00\u59CB\u914D\u7F6E: ccman sync config\n"));
+        console.log(chalk11.blue("\u{1F4A1} \u5F00\u59CB\u914D\u7F6E: ccman sync config\n"));
         return;
       }
-      console.log(chalk9.bold("WebDAV \u914D\u7F6E:"));
-      console.log(`  URL: ${chalk9.gray(config.webdavUrl)}`);
-      console.log(`  \u7528\u6237: ${chalk9.gray(config.username)}`);
-      console.log(`  \u8FDC\u7A0B\u76EE\u5F55: ${chalk9.gray(config.remoteDir)}`);
+      console.log(chalk11.bold("WebDAV \u914D\u7F6E:"));
+      console.log(`  URL: ${chalk11.gray(config.webdavUrl)}`);
+      console.log(`  \u7528\u6237: ${chalk11.gray(config.username)}`);
+      console.log(`  \u8FDC\u7A0B\u76EE\u5F55: ${chalk11.gray(config.remoteDir)}`);
       console.log(
-        `  \u8BA4\u8BC1: ${chalk9.gray(config.authType === "password" ? "Basic Auth" : "Digest Auth")}`
+        `  \u8BA4\u8BC1: ${chalk11.gray(config.authType === "password" ? "Basic Auth" : "Digest Auth")}`
       );
       console.log(
-        `  \u540C\u6B65\u5BC6\u7801: ${config.syncPassword ? chalk9.green("\u2713 \u5DF2\u4FDD\u5B58") : chalk9.yellow("\u2717 \u672A\u4FDD\u5B58")}`
+        `  \u540C\u6B65\u5BC6\u7801: ${config.syncPassword ? chalk11.green("\u2713 \u5DF2\u4FDD\u5B58") : chalk11.yellow("\u2717 \u672A\u4FDD\u5B58")}`
       );
       console.log();
       const codexManager = createCodexManager();
@@ -3532,23 +3730,23 @@ function statusCommand(program2) {
       const claudeProviders = claudeManager.list();
       const geminiProviders = geminiManager.list();
       const openclawProviders = openclawManager.list();
-      console.log(chalk9.bold("\u672C\u5730\u914D\u7F6E:"));
-      console.log(`  Codex: ${chalk9.cyan(codexProviders.length)} \u4E2A\u670D\u52A1\u5546`);
-      console.log(`  Claude: ${chalk9.cyan(claudeProviders.length)} \u4E2A\u670D\u52A1\u5546`);
-      console.log(`  Gemini: ${chalk9.cyan(geminiProviders.length)} \u4E2A\u670D\u52A1\u5546`);
-      console.log(`  OpenClaw: ${chalk9.cyan(openclawProviders.length)} \u4E2A\u670D\u52A1\u5546`);
+      console.log(chalk11.bold("\u672C\u5730\u914D\u7F6E:"));
+      console.log(`  Codex: ${chalk11.cyan(codexProviders.length)} \u4E2A\u670D\u52A1\u5546`);
+      console.log(`  Claude: ${chalk11.cyan(claudeProviders.length)} \u4E2A\u670D\u52A1\u5546`);
+      console.log(`  Gemini: ${chalk11.cyan(geminiProviders.length)} \u4E2A\u670D\u52A1\u5546`);
+      console.log(`  OpenClaw: ${chalk11.cyan(openclawProviders.length)} \u4E2A\u670D\u52A1\u5546`);
       if (config.lastSync) {
         const date = new Date(config.lastSync).toLocaleString("zh-CN");
-        console.log(`  \u6700\u540E\u540C\u6B65: ${chalk9.gray(date)}`);
+        console.log(`  \u6700\u540E\u540C\u6B65: ${chalk11.gray(date)}`);
       }
       console.log();
-      console.log(chalk9.bold("\u540C\u6B65\u5EFA\u8BAE:"));
-      console.log(chalk9.blue("  \u{1F4A1} \u4E0A\u4F20\u5230\u4E91\u7AEF: ccman sync upload"));
-      console.log(chalk9.blue("  \u{1F4A1} \u4ECE\u4E91\u7AEF\u4E0B\u8F7D: ccman sync download"));
-      console.log(chalk9.blue("  \u{1F4A1} \u667A\u80FD\u5408\u5E76: ccman sync merge"));
+      console.log(chalk11.bold("\u540C\u6B65\u5EFA\u8BAE:"));
+      console.log(chalk11.blue("  \u{1F4A1} \u4E0A\u4F20\u5230\u4E91\u7AEF: ccman sync upload"));
+      console.log(chalk11.blue("  \u{1F4A1} \u4ECE\u4E91\u7AEF\u4E0B\u8F7D: ccman sync download"));
+      console.log(chalk11.blue("  \u{1F4A1} \u667A\u80FD\u5408\u5E76: ccman sync merge"));
       console.log();
     } catch (error) {
-      console.error(chalk9.red(`
+      console.error(chalk11.red(`
 \u274C ${error.message}
 `));
     }
@@ -3569,8 +3767,8 @@ __export(sync_exports, {
   startSyncMenu: () => startSyncMenu
 });
 import { Command as Command2 } from "commander";
-import inquirer6 from "inquirer";
-import chalk10 from "chalk";
+import inquirer4 from "inquirer";
+import chalk12 from "chalk";
 function createSyncCommands(program2) {
   configCommand(program2);
   testCommand(program2);
@@ -3582,7 +3780,7 @@ function createSyncCommands(program2) {
 async function startSyncMenu() {
   while (true) {
     console.log();
-    const { action } = await inquirer6.prompt([
+    const { action } = await inquirer4.prompt([
       {
         type: "list",
         name: "action",
@@ -3647,11 +3845,11 @@ async function startSyncMenu() {
         }
       }
     } catch (error) {
-      console.error(chalk10.red(`
+      console.error(chalk12.red(`
 \u274C ${error.message}
 `));
     }
-    await inquirer6.prompt([
+    await inquirer4.prompt([
       {
         type: "input",
         name: "continue",
@@ -3674,7 +3872,7 @@ var init_sync = __esm({
 
 // src/index.ts
 import { Command as Command3 } from "commander";
-import chalk55 from "chalk";
+import chalk57 from "chalk";
 
 // src/utils/logo.ts
 init_dist2();
@@ -3699,26 +3897,33 @@ function printLogo() {
 
 // src/commands/codex/add.ts
 init_dist2();
-import chalk12 from "chalk";
-import inquirer8 from "inquirer";
+import chalk14 from "chalk";
+import inquirer6 from "inquirer";
 
 // src/interactive.ts
 init_dist2();
-import inquirer7 from "inquirer";
-import chalk11 from "chalk";
+import inquirer5 from "inquirer";
+import chalk13 from "chalk";
 
 // src/utils/format.ts
 import chalk2 from "chalk";
-function formatProviderTable(providers, currentId) {
+function formatProviderTable(providers, currentId, title) {
   const lines = [];
-  lines.push("");
+  if (title) {
+    lines.push(chalk2.bold(`
+\u{1F4CB} ${title}`));
+    lines.push("");
+  } else {
+    lines.push("");
+  }
   providers.forEach((p, index) => {
     const isCurrent = p.id === currentId;
     const marker = isCurrent ? chalk2.green("\u25CF") : chalk2.gray("\u25CB");
     const name = isCurrent ? chalk2.green.bold(p.name) : chalk2.white(p.name);
     const tag = isCurrent ? chalk2.green(" [\u5F53\u524D]") : "";
     lines.push(`  ${marker}  ${name}${tag}`);
-    const url = isCurrent ? chalk2.green(p.baseUrl) : chalk2.gray(p.baseUrl);
+    const urlText = p.baseUrl || "(\u9ED8\u8BA4\u7AEF\u70B9)";
+    const url = isCurrent ? chalk2.green(urlText) : chalk2.gray(urlText);
     lines.push(`     ${url}`);
     if (p.desc) {
       const desc = isCurrent ? chalk2.green(p.desc) : chalk2.gray(p.desc);
@@ -3734,6 +3939,64 @@ function formatProviderTable(providers, currentId) {
 
 // src/interactive.ts
 init_confirm();
+
+// src/utils/cli-theme.ts
+import chalk3 from "chalk";
+var TOOL_COLORS = {
+  codex: chalk3.hex("#10A37F"),
+  // OpenAI 绿
+  claude: chalk3.hex("#D97706"),
+  // Anthropic 橙
+  gemini: chalk3.hex("#4285F4"),
+  // Google 蓝
+  opencode: chalk3.hex("#FF6B35"),
+  // 活力橙
+  openclaw: chalk3.hex("#E74C3C"),
+  // 红色
+  mcp: chalk3.hex("#9B59B6")
+  // 紫色
+};
+var TOOL_NAMES = {
+  codex: "Codex",
+  claude: "Claude Code",
+  gemini: "Gemini CLI",
+  opencode: "OpenCode",
+  openclaw: "OpenClaw",
+  mcp: "MCP"
+};
+function toolBadge(tool) {
+  const color = TOOL_COLORS[tool] || chalk3.blue;
+  const label = TOOL_NAMES[tool] || tool;
+  return color.bold(`[${label}]`);
+}
+
+// src/utils/cli-output.ts
+import chalk4 from "chalk";
+function printBlock(header, lines = []) {
+  console.log();
+  console.log(header);
+  if (lines.length > 0) {
+    console.log();
+    lines.forEach((line) => console.log(`  ${line}`));
+  }
+  console.log();
+}
+function printSuccess(title, details = []) {
+  printBlock(chalk4.green(`\u2705 ${title}`), details);
+}
+function printInfo(title, lines = []) {
+  printBlock(chalk4.bold(title), lines);
+}
+function printWarning(message) {
+  console.log(chalk4.yellow(`
+\u26A0\uFE0F  ${message}
+`));
+}
+function printTip(message) {
+  console.log(chalk4.blue("\u{1F4A1} ") + message);
+}
+
+// src/interactive.ts
 var CLI_TOOL_CONFIG = {
   [TOOL_TYPES.CODEX]: { name: "Codex", emoji: "\u{1F536}", cmd: "cx" },
   [TOOL_TYPES.CLAUDE]: { name: "Claude", emoji: "\u{1F537}", cmd: "cc" },
@@ -3756,7 +4019,7 @@ function getManager(tool) {
   }
 }
 async function promptProviderForm(defaults) {
-  const answers = await inquirer7.prompt([
+  const answers = await inquirer5.prompt([
     {
       type: "input",
       name: "name",
@@ -3809,7 +4072,7 @@ async function promptProviderForm(defaults) {
 async function startMainMenu() {
   while (true) {
     console.log();
-    const { choice } = await inquirer7.prompt([
+    const { choice } = await inquirer5.prompt([
       {
         type: "list",
         name: "choice",
@@ -3827,7 +4090,7 @@ async function startMainMenu() {
       }
     ]);
     if (choice === "exit") {
-      console.log(chalk11.gray("\n\u{1F44B} \u518D\u89C1!\n"));
+      console.log(chalk13.gray("\n\u{1F44B} \u518D\u89C1!\n"));
       break;
     }
     if (choice === "claude") {
@@ -3864,14 +4127,14 @@ async function startOpenClawMenu() {
   await showToolMenu(TOOL_TYPES.OPENCLAW);
 }
 async function showToolMenu(tool) {
-  const { name: toolName, emoji: toolEmoji } = CLI_TOOL_CONFIG[tool];
+  const { name: toolDisplayName, emoji } = CLI_TOOL_CONFIG[tool];
   while (true) {
     console.log();
-    const { action } = await inquirer7.prompt([
+    const { action } = await inquirer5.prompt([
       {
         type: "list",
         name: "action",
-        message: `${toolEmoji} ${toolName} \u64CD\u4F5C:`,
+        message: `${emoji} ${toolDisplayName} \u64CD\u4F5C:`,
         choices: [
           { name: "\u2795 \u6DFB\u52A0\u670D\u52A1\u5546", value: "add" },
           { name: "\u{1F504} \u5207\u6362\u670D\u52A1\u5546", value: "switch" },
@@ -3912,11 +4175,11 @@ async function showToolMenu(tool) {
           break;
       }
     } catch (error) {
-      console.error(chalk11.red(`
+      console.error(chalk13.red(`
 \u274C ${error.message}
 `));
     }
-    await inquirer7.prompt([
+    await inquirer5.prompt([
       {
         type: "input",
         name: "continue",
@@ -3926,16 +4189,16 @@ async function showToolMenu(tool) {
   }
 }
 async function showPresetsMenu() {
-  console.log(chalk11.yellow("\n\u26A0\uFE0F  \u9884\u7F6E\u670D\u52A1\u5546\u7BA1\u7406\u529F\u80FD\u5373\u5C06\u63A8\u51FA\n"));
+  console.log(chalk13.yellow("\n\u26A0\uFE0F  \u9884\u7F6E\u670D\u52A1\u5546\u7BA1\u7406\u529F\u80FD\u5373\u5C06\u63A8\u51FA\n"));
 }
 async function handleAdd(tool) {
   const manager = getManager(tool);
-  const { name: toolName, cmd } = CLI_TOOL_CONFIG[tool];
   const presets = manager.listPresets();
-  console.log(chalk11.bold(`
+  const { name: toolName, cmd } = CLI_TOOL_CONFIG[tool];
+  console.log(chalk13.bold(`
 \u{1F4DD} \u6DFB\u52A0 ${toolName} \u670D\u52A1\u5546
 `));
-  const { usePreset } = await inquirer7.prompt([
+  const { usePreset } = await inquirer5.prompt([
     {
       type: "list",
       name: "usePreset",
@@ -3951,7 +4214,7 @@ async function handleAdd(tool) {
   let baseUrl;
   let apiKey;
   if (usePreset) {
-    const { presetName } = await inquirer7.prompt([
+    const { presetName } = await inquirer5.prompt([
       {
         type: "list",
         name: "presetName",
@@ -3963,7 +4226,7 @@ async function handleAdd(tool) {
       }
     ]);
     const preset = presets.find((p) => p.name === presetName);
-    console.log(chalk11.blue(`
+    console.log(chalk13.blue(`
 \u4F7F\u7528\u9884\u8BBE: ${preset.name} - ${preset.description}
 `));
     const input = await promptProviderForm({
@@ -3977,7 +4240,7 @@ async function handleAdd(tool) {
     baseUrl = input.baseUrl;
     apiKey = input.apiKey;
   } else {
-    const answers = await inquirer7.prompt([
+    const answers = await inquirer5.prompt([
       {
         type: "input",
         name: "name",
@@ -4010,19 +4273,16 @@ async function handleAdd(tool) {
     apiKey = answers.apiKey;
   }
   const provider = manager.add({ name, desc, baseUrl, apiKey });
-  console.log();
-  console.log(chalk11.green("\u2705 \u6DFB\u52A0\u6210\u529F"));
-  console.log();
-  console.log(`  ${chalk11.bold(provider.name)} ${chalk11.blue(`[${toolName}]`)}`);
-  console.log(`  ${chalk11.gray(provider.baseUrl)}`);
-  console.log();
+  printSuccess("\u6DFB\u52A0\u6210\u529F", [
+    `${chalk13.bold(provider.name)} ${toolBadge(tool)}`,
+    chalk13.gray(provider.baseUrl)
+  ]);
   const switchNow = await promptConfirm("\u662F\u5426\u7ACB\u5373\u5207\u6362\u5230\u6B64\u670D\u52A1\u5546?", true);
   if (switchNow) {
     manager.switch(provider.id);
-    console.log(chalk11.green("\u2705 \u5DF2\u5207\u6362\u5230\u65B0\u670D\u52A1\u5546\n"));
+    printSuccess("\u5DF2\u5207\u6362\u5230\u65B0\u670D\u52A1\u5546");
   } else {
-    console.log(chalk11.blue("\u{1F4A1} \u7A0D\u540E\u5207\u6362:") + chalk11.white(` ccman ${cmd} use "${provider.name}"
-`));
+    printTip(`\u7A0D\u540E\u5207\u6362: ${chalk13.white(`ccman ${cmd} use "${provider.name}"`)}`);
   }
 }
 async function handleSwitch(tool) {
@@ -4030,70 +4290,66 @@ async function handleSwitch(tool) {
   const providers = manager.list();
   const current = manager.getCurrent();
   if (providers.length === 0) {
-    console.log(chalk11.yellow("\n\u26A0\uFE0F  \u6682\u65E0\u670D\u52A1\u5546\n"));
+    printWarning("\u6682\u65E0\u670D\u52A1\u5546");
     return;
   }
-  const { providerId } = await inquirer7.prompt([
+  const { providerId } = await inquirer5.prompt([
     {
       type: "list",
       name: "providerId",
       message: "\u9009\u62E9\u8981\u5207\u6362\u7684\u670D\u52A1\u5546:",
       choices: providers.map((p) => ({
-        name: `${p.name}${current?.id === p.id ? chalk11.green(" (\u5F53\u524D)") : ""}`,
+        name: `${p.name}${current?.id === p.id ? chalk13.green(" (\u5F53\u524D)") : ""}`,
         value: p.id
       }))
     }
   ]);
   manager.switch(providerId);
   const provider = providers.find((p) => p.id === providerId);
-  console.log(chalk11.green(`
-\u2705 \u5DF2\u5207\u6362\u5230: ${provider.name}
-`));
+  printSuccess("\u5207\u6362\u6210\u529F", [
+    `${chalk13.bold(provider.name)} ${toolBadge(tool)}`,
+    chalk13.gray(provider.baseUrl)
+  ]);
 }
 async function handleList(tool) {
   const manager = getManager(tool);
   const providers = manager.list();
   const current = manager.getCurrent();
-  const { name: toolName } = CLI_TOOL_CONFIG[tool];
+  const { name: tn, cmd } = CLI_TOOL_CONFIG[tool];
   if (providers.length === 0) {
-    console.log(chalk11.yellow(`
-\u26A0\uFE0F  \u6682\u65E0 ${toolName} \u670D\u52A1\u5546
-`));
+    printWarning(`\u6682\u65E0 ${tn} \u670D\u52A1\u5546`);
+    printTip(`\u6DFB\u52A0\u670D\u52A1\u5546: ${chalk13.white(`ccman ${cmd} add`)}`);
     return;
   }
-  console.log(chalk11.bold(`
-\u{1F4CB} ${toolName} \u670D\u52A1\u5546 (${providers.length} \u4E2A)`));
-  console.log(formatProviderTable(providers, current?.id));
+  console.log(formatProviderTable(providers, current?.id, `${tn} \u670D\u52A1\u5546 (${providers.length} \u4E2A)`));
 }
 async function handleCurrent(tool) {
   const manager = getManager(tool);
   const current = manager.getCurrent();
-  const { name: toolName } = CLI_TOOL_CONFIG[tool];
+  const { name: tn, cmd } = CLI_TOOL_CONFIG[tool];
   if (!current) {
-    console.log(chalk11.yellow(`
-\u26A0\uFE0F  \u672A\u9009\u62E9\u4EFB\u4F55 ${toolName} \u670D\u52A1\u5546
-`));
+    printWarning(`\u672A\u9009\u62E9\u4EFB\u4F55 ${tn} \u670D\u52A1\u5546`);
+    printTip(`\u9009\u62E9\u670D\u52A1\u5546: ${chalk13.white(`ccman ${cmd} use`)}`);
     return;
   }
-  console.log(chalk11.bold(`
-\u{1F441}\uFE0F  \u5F53\u524D ${toolName} \u670D\u52A1\u5546
-`));
-  console.log(`  ${chalk11.green.bold(current.name)}`);
-  console.log(`  ${chalk11.gray(current.baseUrl)}`);
+  const lines = [
+    chalk13.green.bold(current.name),
+    chalk13.gray(`ID: ${current.id}`),
+    chalk13.gray(`URL: ${current.baseUrl || "(\u9ED8\u8BA4\u7AEF\u70B9)"}`)
+  ];
   if (current.lastUsedAt) {
-    const date = new Date(current.lastUsedAt).toLocaleString("zh-CN");
-    console.log(`  ${chalk11.gray(`\u6700\u540E\u4F7F\u7528: ${date}`)}`);
+    lines.push(chalk13.gray(`\u6700\u540E\u4F7F\u7528: ${new Date(current.lastUsedAt).toLocaleString("zh-CN")}`));
   }
-  console.log();
+  printInfo(`\u{1F4CD} \u5F53\u524D ${tn} \u670D\u52A1\u5546`, lines);
 }
 async function handleEdit(tool) {
   const manager = getManager(tool);
   const providers = manager.list();
   if (providers.length === 0) {
-    console.log(chalk11.yellow("\n\u26A0\uFE0F  \u6682\u65E0\u670D\u52A1\u5546\n"));
+    printWarning("\u6682\u65E0\u670D\u52A1\u5546");
     return;
   }
-  const { providerId } = await inquirer7.prompt([
+  const { providerId } = await inquirer5.prompt([
     {
       type: "list",
       name: "providerId",
@@ -4105,7 +4361,7 @@ async function handleEdit(tool) {
     }
   ]);
   const provider = providers.find((p) => p.id === providerId);
-  const answers = await inquirer7.prompt([
+  const answers = await inquirer5.prompt([
     {
       type: "input",
       name: "name",
@@ -4145,16 +4401,16 @@ async function handleEdit(tool) {
     baseUrl: answers.baseUrl,
     apiKey: answers.apiKey || void 0
   });
-  console.log(chalk11.green("\n\u2705 \u7F16\u8F91\u6210\u529F\n"));
+  printSuccess("\u7F16\u8F91\u6210\u529F");
 }
 async function handleClone(tool) {
   const manager = getManager(tool);
   const providers = manager.list();
   if (providers.length === 0) {
-    console.log(chalk11.yellow("\n\u26A0\uFE0F  \u6682\u65E0\u670D\u52A1\u5546\n"));
+    printWarning("\u6682\u65E0\u670D\u52A1\u5546");
     return;
   }
-  const { providerId } = await inquirer7.prompt([
+  const { providerId } = await inquirer5.prompt([
     {
       type: "list",
       name: "providerId",
@@ -4166,7 +4422,7 @@ async function handleClone(tool) {
     }
   ]);
   const provider = providers.find((p) => p.id === providerId);
-  const answers = await inquirer7.prompt([
+  const answers = await inquirer5.prompt([
     {
       type: "input",
       name: "name",
@@ -4189,19 +4445,16 @@ async function handleClone(tool) {
     baseUrl: provider.baseUrl,
     apiKey: answers.apiKey
   });
-  console.log(chalk11.green("\n\u2705 \u514B\u9686\u6210\u529F\n"));
-  console.log(`  ${chalk11.bold(newProvider.name)}`);
-  console.log(`  ${chalk11.gray(newProvider.baseUrl)}`);
-  console.log();
+  printSuccess("\u514B\u9686\u6210\u529F", [chalk13.bold(newProvider.name), chalk13.gray(newProvider.baseUrl)]);
 }
 async function handleRemove(tool) {
   const manager = getManager(tool);
   const providers = manager.list();
   if (providers.length === 0) {
-    console.log(chalk11.yellow("\n\u26A0\uFE0F  \u6682\u65E0\u670D\u52A1\u5546\n"));
+    printWarning("\u6682\u65E0\u670D\u52A1\u5546");
     return;
   }
-  const { providerId } = await inquirer7.prompt([
+  const { providerId } = await inquirer5.prompt([
     {
       type: "list",
       name: "providerId",
@@ -4216,22 +4469,153 @@ async function handleRemove(tool) {
   const confirm = await promptConfirm(`\u786E\u5B9A\u8981\u5220\u9664 "${provider.name}" \u5417?`, false);
   if (confirm) {
     manager.remove(providerId);
-    console.log(chalk11.green(`
-\u2705 \u5DF2\u5220\u9664: ${provider.name}
-`));
+    printSuccess(`\u5DF2\u5220\u9664: ${provider.name}`);
   } else {
-    console.log(chalk11.gray("\n\u274C \u5DF2\u53D6\u6D88\n"));
+    console.log(chalk13.gray("\n\u274C \u5DF2\u53D6\u6D88\n"));
   }
 }
 
 // src/commands/codex/add.ts
 init_confirm();
+
+// src/utils/provider-params.ts
+init_confirm();
+function trimCliValue(value) {
+  if (value === void 0) {
+    return void 0;
+  }
+  return value.trim();
+}
+function validateBaseUrl(baseUrl, allowEmpty = false) {
+  if (!baseUrl) {
+    if (allowEmpty) {
+      return;
+    }
+    throw new Error("\u7F3A\u5C11\u53C2\u6570: --base-url");
+  }
+  if (!baseUrl.startsWith("http://") && !baseUrl.startsWith("https://")) {
+    throw new Error("API \u5730\u5740\u5FC5\u987B\u4EE5 http:// \u6216 https:// \u5F00\u5934");
+  }
+}
+function validateApiKey(apiKey, allowEmpty = false) {
+  if (!apiKey && !allowEmpty) {
+    throw new Error("\u7F3A\u5C11\u53C2\u6570: --api-key");
+  }
+}
+function resolvePreset(presets, presetName) {
+  const normalizedName = trimCliValue(presetName);
+  if (!normalizedName) {
+    return void 0;
+  }
+  const preset = presets.find((item) => item.name.toLowerCase() === normalizedName.toLowerCase());
+  if (!preset) {
+    throw new Error(`\u9884\u8BBE\u4E0D\u5B58\u5728: ${normalizedName}`);
+  }
+  return preset;
+}
+function addProviderAddOptions(command) {
+  command.option("--preset <name>", "\u4F7F\u7528\u6307\u5B9A\u9884\u8BBE").option("--name <name>", "\u670D\u52A1\u5546\u540D\u79F0").option("--desc <desc>", "\u63CF\u8FF0").option("--base-url <url>", "API \u5730\u5740").option("--api-key <key>", "API \u5BC6\u94A5").option("--switch", "\u6DFB\u52A0\u540E\u7ACB\u5373\u5207\u6362").option("--skip-switch", "\u6DFB\u52A0\u540E\u4E0D\u5207\u6362");
+}
+function addProviderEditOptions(command) {
+  command.option("--new-name <name>", "\u65B0\u7684\u670D\u52A1\u5546\u540D\u79F0").option("--desc <desc>", "\u65B0\u7684\u63CF\u8FF0\uFF1B\u4F20\u7A7A\u5B57\u7B26\u4E32\u53EF\u6E05\u7A7A").option("--base-url <url>", "\u65B0\u7684 API \u5730\u5740").option("--api-key <key>", "\u65B0\u7684 API \u5BC6\u94A5");
+}
+function addProviderRemoveOptions(command) {
+  command.option("-y, --yes", "\u8DF3\u8FC7\u5220\u9664\u786E\u8BA4");
+}
+function resolveProviderAddInput(options, presets, rules = {}) {
+  if (options.switch && options.skipSwitch) {
+    throw new Error("\u4E0D\u80FD\u540C\u65F6\u4F7F\u7528 --switch \u548C --skip-switch");
+  }
+  const nonInteractive = options.preset !== void 0 || options.name !== void 0 || options.desc !== void 0 || options.baseUrl !== void 0 || options.apiKey !== void 0 || options.switch === true || options.skipSwitch === true;
+  if (!nonInteractive) {
+    return {
+      nonInteractive: false,
+      switchNow: false
+    };
+  }
+  const preset = resolvePreset(presets, options.preset);
+  const name = trimCliValue(options.name) ?? preset?.name;
+  const desc = options.desc === void 0 ? void 0 : options.desc.trim() || void 0;
+  const baseUrl = trimCliValue(options.baseUrl) ?? preset?.baseUrl ?? "";
+  const apiKey = options.apiKey === void 0 ? "" : options.apiKey.trim();
+  if (!name) {
+    throw new Error("\u7F3A\u5C11\u53C2\u6570: --name");
+  }
+  validateBaseUrl(baseUrl, rules.allowEmptyBaseUrl);
+  validateApiKey(apiKey, rules.allowEmptyApiKey);
+  return {
+    nonInteractive: true,
+    switchNow: options.switch === true,
+    input: {
+      name,
+      desc,
+      baseUrl,
+      apiKey
+    }
+  };
+}
+function resolveProviderEditInput(options, rules = {}) {
+  const nonInteractive = options.newName !== void 0 || options.desc !== void 0 || options.baseUrl !== void 0 || options.apiKey !== void 0;
+  const updates = {};
+  if (options.newName !== void 0) {
+    const newName = trimCliValue(options.newName);
+    if (!newName) {
+      throw new Error("\u670D\u52A1\u5546\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A");
+    }
+    updates.name = newName;
+  }
+  if (options.desc !== void 0) {
+    updates.desc = options.desc.trim();
+  }
+  if (options.baseUrl !== void 0) {
+    const baseUrl = trimCliValue(options.baseUrl) ?? "";
+    validateBaseUrl(baseUrl, rules.allowEmptyBaseUrl);
+    updates.baseUrl = baseUrl;
+  }
+  if (options.apiKey !== void 0) {
+    const apiKey = options.apiKey.trim();
+    validateApiKey(apiKey, rules.allowEmptyApiKey);
+    updates.apiKey = apiKey;
+  }
+  return {
+    nonInteractive,
+    updates
+  };
+}
+async function confirmProviderRemoval(providerName, options = {}) {
+  if (options.yes) {
+    return true;
+  }
+  return promptConfirm(`\u786E\u5B9A\u5220\u9664 "${providerName}"?`, false);
+}
+
+// src/commands/codex/add.ts
 function addCommand(program2) {
-  program2.command("add").description("\u6DFB\u52A0\u65B0\u7684 Codex \u670D\u52A1\u5546(\u4EA4\u4E92\u5F0F)").action(async () => {
+  const command = program2.command("add").description("\u6DFB\u52A0\u65B0\u7684 Codex \u670D\u52A1\u5546");
+  addProviderAddOptions(command);
+  command.action(async (options) => {
     try {
       const manager = createCodexManager();
-      console.log(chalk12.bold("\n\u{1F4DD} \u6DFB\u52A0 Codex \u670D\u52A1\u5546\n"));
-      const { usePreset } = await inquirer8.prompt([
+      console.log(chalk14.bold("\n\u{1F4DD} \u6DFB\u52A0 Codex \u670D\u52A1\u5546\n"));
+      const resolved = resolveProviderAddInput(options, CODEX_PRESETS);
+      if (resolved.nonInteractive && resolved.input) {
+        const provider2 = manager.add(resolved.input);
+        printSuccess("\u6DFB\u52A0\u6210\u529F", [
+          `${chalk14.bold(provider2.name)} ${toolBadge("codex")}`,
+          chalk14.gray(provider2.baseUrl)
+        ]);
+        if (resolved.switchNow) {
+          manager.switch(provider2.id);
+          printSuccess("\u5DF2\u5207\u6362\u5230\u65B0\u670D\u52A1\u5546", [
+            chalk14.gray(`\u914D\u7F6E\u5DF2\u66F4\u65B0: ${getCodexConfigPath()}`),
+            chalk14.gray(`\u914D\u7F6E\u5DF2\u66F4\u65B0: ${getCodexAuthPath()}`)
+          ]);
+        } else {
+          printTip(`\u7A0D\u540E\u5207\u6362: ${chalk14.white(`ccman cx use "${provider2.name}"`)}`);
+        }
+        return;
+      }
+      const { usePreset } = await inquirer6.prompt([
         {
           type: "list",
           name: "usePreset",
@@ -4247,7 +4631,7 @@ function addCommand(program2) {
       let baseUrl;
       let apiKey;
       if (usePreset) {
-        const { presetName } = await inquirer8.prompt([
+        const { presetName } = await inquirer6.prompt([
           {
             type: "list",
             name: "presetName",
@@ -4259,7 +4643,7 @@ function addCommand(program2) {
           }
         ]);
         const preset = CODEX_PRESETS.find((p) => p.name === presetName);
-        console.log(chalk12.blue(`
+        console.log(chalk14.blue(`
 \u4F7F\u7528\u9884\u8BBE: ${preset.name} - ${preset.description}
 `));
         const input = await promptProviderForm({
@@ -4273,7 +4657,7 @@ function addCommand(program2) {
         baseUrl = input.baseUrl;
         apiKey = input.apiKey;
       } else {
-        const answers = await inquirer8.prompt([
+        const answers = await inquirer6.prompt([
           {
             type: "input",
             name: "name",
@@ -4312,25 +4696,22 @@ function addCommand(program2) {
         apiKey = answers.apiKey;
       }
       const provider = manager.add({ name, desc, baseUrl, apiKey });
-      console.log();
-      console.log(chalk12.green("\u2705 \u6DFB\u52A0\u6210\u529F"));
-      console.log();
-      console.log(`  ${chalk12.bold(provider.name)} ${chalk12.blue("[Codex]")}`);
-      console.log(`  ${chalk12.gray(provider.baseUrl)}`);
-      console.log();
+      printSuccess("\u6DFB\u52A0\u6210\u529F", [
+        `${chalk14.bold(provider.name)} ${toolBadge("codex")}`,
+        chalk14.gray(provider.baseUrl)
+      ]);
       const switchNow = await promptConfirm("\u662F\u5426\u7ACB\u5373\u5207\u6362\u5230\u6B64\u670D\u52A1\u5546?", true);
       if (switchNow) {
         manager.switch(provider.id);
-        console.log(chalk12.green("\u2705 \u5DF2\u5207\u6362\u5230\u65B0\u670D\u52A1\u5546"));
-        console.log();
-        console.log(chalk12.gray("\u914D\u7F6E\u5DF2\u66F4\u65B0:"));
-        console.log(chalk12.gray(`  - ${getCodexConfigPath()}`));
-        console.log(chalk12.gray(`  - ${getCodexAuthPath()}`));
+        printSuccess("\u5DF2\u5207\u6362\u5230\u65B0\u670D\u52A1\u5546", [
+          chalk14.gray(`\u914D\u7F6E\u5DF2\u66F4\u65B0: ${getCodexConfigPath()}`),
+          chalk14.gray(`\u914D\u7F6E\u5DF2\u66F4\u65B0: ${getCodexAuthPath()}`)
+        ]);
       } else {
-        console.log(chalk12.blue("\u{1F4A1} \u7A0D\u540E\u5207\u6362:") + chalk12.white(` ccman cx use "${provider.name}"`));
+        printTip(`\u7A0D\u540E\u5207\u6362: ${chalk14.white(`ccman cx use "${provider.name}"`)}`);
       }
     } catch (error) {
-      console.error(chalk12.red(`
+      console.error(chalk14.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -4340,7 +4721,7 @@ function addCommand(program2) {
 
 // src/commands/codex/list.ts
 init_dist2();
-import chalk13 from "chalk";
+import chalk15 from "chalk";
 function listCommand(program2) {
   program2.command("list").alias("ls").description("\u5217\u51FA\u6240\u6709 Codex \u670D\u52A1\u5546").action(async () => {
     try {
@@ -4348,15 +4729,15 @@ function listCommand(program2) {
       const providers = manager.list();
       const current = manager.getCurrent();
       if (providers.length === 0) {
-        console.log(chalk13.yellow("\n\u26A0\uFE0F  \u6682\u65E0 Codex \u670D\u52A1\u5546\n"));
-        console.log(chalk13.blue("\u{1F4A1} \u6DFB\u52A0\u670D\u52A1\u5546:") + chalk13.white(" ccman cx add\n"));
+        printWarning("\u6682\u65E0 Codex \u670D\u52A1\u5546");
+        printTip("\u6DFB\u52A0\u670D\u52A1\u5546: " + chalk15.white("ccman cx add"));
         return;
       }
-      console.log(chalk13.bold(`
-\u{1F4CB} Codex \u670D\u52A1\u5546 (${providers.length} \u4E2A)`));
-      console.log(formatProviderTable(providers, current?.id));
+      console.log(
+        formatProviderTable(providers, current?.id, `Codex \u670D\u52A1\u5546 (${providers.length} \u4E2A)`)
+      );
     } catch (error) {
-      console.error(chalk13.red(`
+      console.error(chalk15.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -4366,16 +4747,16 @@ function listCommand(program2) {
 
 // src/commands/codex/use.ts
 init_dist2();
-import chalk14 from "chalk";
-import inquirer9 from "inquirer";
+import chalk16 from "chalk";
+import inquirer7 from "inquirer";
 function useCommand(program2) {
   program2.command("use [name]").description("\u5207\u6362 Codex \u670D\u52A1\u5546").action(async (name) => {
     try {
       const manager = createCodexManager();
       const providers = manager.list();
       if (providers.length === 0) {
-        console.log(chalk14.yellow("\n\u26A0\uFE0F  \u6682\u65E0 Codex \u670D\u52A1\u5546\n"));
-        console.log(chalk14.blue("\u{1F4A1} \u6DFB\u52A0\u670D\u52A1\u5546:") + chalk14.white(" ccman cx add\n"));
+        printWarning("\u6682\u65E0 Codex \u670D\u52A1\u5546");
+        printTip("\u6DFB\u52A0\u670D\u52A1\u5546: " + chalk16.white("ccman cx add"));
         return;
       }
       let targetId;
@@ -4386,7 +4767,7 @@ function useCommand(program2) {
         }
         targetId = provider2.id;
       } else {
-        const { selectedId } = await inquirer9.prompt([
+        const { selectedId } = await inquirer7.prompt([
           {
             type: "list",
             name: "selectedId",
@@ -4401,24 +4782,20 @@ function useCommand(program2) {
       }
       manager.switch(targetId);
       const provider = manager.get(targetId);
-      console.log();
-      console.log(chalk14.green("\u2705 \u5207\u6362\u6210\u529F"));
-      console.log();
-      console.log(`  ${chalk14.bold(provider.name)} ${chalk14.blue("[Codex]")}`);
-      console.log(`  ${chalk14.gray(`URL: ${provider.baseUrl}`)}`);
-      console.log();
-      console.log(chalk14.gray("\u914D\u7F6E\u5DF2\u66F4\u65B0:"));
-      console.log(chalk14.gray(`  - ${getCodexConfigPath()}`));
-      console.log(chalk14.gray(`  - ${getCodexAuthPath()}`));
-      console.log();
+      printSuccess("\u5207\u6362\u6210\u529F", [
+        `${chalk16.bold(provider.name)} ${toolBadge("codex")}`,
+        chalk16.gray(`URL: ${provider.baseUrl}`),
+        chalk16.gray(`\u914D\u7F6E\u5DF2\u66F4\u65B0: ${getCodexConfigPath()}`),
+        chalk16.gray(`\u914D\u7F6E\u5DF2\u66F4\u65B0: ${getCodexAuthPath()}`)
+      ]);
     } catch (error) {
       if (error instanceof ProviderNotFoundError) {
-        console.error(chalk14.red(`
+        console.error(chalk16.red(`
 \u274C \u670D\u52A1\u5546\u4E0D\u5B58\u5728: ${error.message}
 `));
-        console.log(chalk14.blue("\u{1F4A1} \u67E5\u770B\u6240\u6709\u670D\u52A1\u5546:") + chalk14.white(" ccman cx list\n"));
+        console.log(chalk16.blue("\u{1F4A1} \u67E5\u770B\u6240\u6709\u670D\u52A1\u5546:") + chalk16.white(" ccman cx list\n"));
       } else {
-        console.error(chalk14.red(`
+        console.error(chalk16.red(`
 \u274C ${error.message}
 `));
       }
@@ -4429,28 +4806,30 @@ function useCommand(program2) {
 
 // src/commands/codex/current.ts
 init_dist2();
-import chalk15 from "chalk";
+import chalk17 from "chalk";
 function currentCommand(program2) {
   program2.command("current").description("\u663E\u793A\u5F53\u524D\u4F7F\u7528\u7684 Codex \u670D\u52A1\u5546").action(async () => {
     try {
       const manager = createCodexManager();
       const current = manager.getCurrent();
       if (!current) {
-        console.log(chalk15.yellow("\n\u26A0\uFE0F  \u672A\u9009\u62E9\u4EFB\u4F55 Codex \u670D\u52A1\u5546\n"));
-        console.log(chalk15.blue("\u{1F4A1} \u9009\u62E9\u670D\u52A1\u5546:") + chalk15.white(" ccman cx use\n"));
+        printWarning("\u672A\u9009\u62E9\u4EFB\u4F55 Codex \u670D\u52A1\u5546");
+        printTip("\u9009\u62E9\u670D\u52A1\u5546: " + chalk17.white("ccman cx use"));
         return;
       }
-      console.log(chalk15.bold("\n\u{1F4CD} \u5F53\u524D Codex \u670D\u52A1\u5546\n"));
-      console.log(`  ${chalk15.green.bold(current.name)}`);
-      console.log(`  ${chalk15.gray(`ID: ${current.id}`)}`);
-      console.log(`  ${chalk15.gray(`URL: ${current.baseUrl}`)}`);
+      const lines = [
+        chalk17.green.bold(current.name),
+        chalk17.gray(`ID: ${current.id}`),
+        chalk17.gray(`URL: ${current.baseUrl}`)
+      ];
       if (current.lastUsedAt) {
-        const date = new Date(current.lastUsedAt).toLocaleString("zh-CN");
-        console.log(`  ${chalk15.gray(`\u6700\u540E\u4F7F\u7528: ${date}`)}`);
+        lines.push(
+          chalk17.gray(`\u6700\u540E\u4F7F\u7528: ${new Date(current.lastUsedAt).toLocaleString("zh-CN")}`)
+        );
       }
-      console.log();
+      printInfo("\u{1F4CD} \u5F53\u524D Codex \u670D\u52A1\u5546", lines);
     } catch (error) {
-      console.error(chalk15.red(`
+      console.error(chalk17.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -4460,16 +4839,17 @@ function currentCommand(program2) {
 
 // src/commands/codex/remove.ts
 init_dist2();
-init_confirm();
-import chalk16 from "chalk";
-import inquirer10 from "inquirer";
+import chalk18 from "chalk";
+import inquirer8 from "inquirer";
 function removeCommand(program2) {
-  program2.command("remove [name]").alias("rm").description("\u5220\u9664 Codex \u670D\u52A1\u5546").action(async (name) => {
+  const command = program2.command("remove [name]").alias("rm").description("\u5220\u9664 Codex \u670D\u52A1\u5546");
+  addProviderRemoveOptions(command);
+  command.action(async (name, options) => {
     try {
       const manager = createCodexManager();
       const providers = manager.list();
       if (providers.length === 0) {
-        console.log(chalk16.yellow("\n\u26A0\uFE0F  \u6682\u65E0 Codex \u670D\u52A1\u5546\n"));
+        console.log(chalk18.yellow("\n\u26A0\uFE0F  \u6682\u65E0 Codex \u670D\u52A1\u5546\n"));
         return;
       }
       let targetId;
@@ -4481,8 +4861,10 @@ function removeCommand(program2) {
         }
         targetId = provider.id;
         targetName = provider.name;
+      } else if (options.yes) {
+        throw new Error("\u975E\u4EA4\u4E92\u6A21\u5F0F\u8BF7\u63D0\u4F9B\u8981\u5220\u9664\u7684\u670D\u52A1\u5546\u540D\u79F0");
       } else {
-        const { selectedId } = await inquirer10.prompt([
+        const { selectedId } = await inquirer8.prompt([
           {
             type: "list",
             name: "selectedId",
@@ -4497,23 +4879,23 @@ function removeCommand(program2) {
         targetId = selectedId;
         targetName = provider.name;
       }
-      const confirmed = await promptConfirm(`\u786E\u5B9A\u5220\u9664 "${targetName}"?`, false);
+      const confirmed = await confirmProviderRemoval(targetName, options);
       if (!confirmed) {
-        console.log(chalk16.gray("\n\u5DF2\u53D6\u6D88\n"));
+        console.log(chalk18.gray("\n\u5DF2\u53D6\u6D88\n"));
         return;
       }
       manager.remove(targetId);
       console.log();
-      console.log(chalk16.green(`\u2705 \u5DF2\u5220\u9664: ${targetName}`));
+      console.log(chalk18.green(`\u2705 \u5DF2\u5220\u9664: ${targetName}`));
       console.log();
     } catch (error) {
       if (error instanceof ProviderNotFoundError) {
-        console.error(chalk16.red(`
+        console.error(chalk18.red(`
 \u274C \u670D\u52A1\u5546\u4E0D\u5B58\u5728
 `));
-        console.log(chalk16.blue("\u{1F4A1} \u67E5\u770B\u6240\u6709\u670D\u52A1\u5546:") + chalk16.white(" ccman cx list\n"));
+        console.log(chalk18.blue("\u{1F4A1} \u67E5\u770B\u6240\u6709\u670D\u52A1\u5546:") + chalk18.white(" ccman cx list\n"));
       } else {
-        console.error(chalk16.red(`
+        console.error(chalk18.red(`
 \u274C ${error.message}
 `));
       }
@@ -4524,17 +4906,20 @@ function removeCommand(program2) {
 
 // src/commands/codex/edit.ts
 init_dist2();
-import chalk17 from "chalk";
-import inquirer11 from "inquirer";
+import chalk19 from "chalk";
+import inquirer9 from "inquirer";
 function editCommand(program2) {
-  program2.command("edit [name]").description("\u7F16\u8F91 Codex \u670D\u52A1\u5546").action(async (name) => {
+  const command = program2.command("edit [name]").description("\u7F16\u8F91 Codex \u670D\u52A1\u5546");
+  addProviderEditOptions(command);
+  command.action(async (name, options) => {
     try {
       const manager = createCodexManager();
       const providers = manager.list();
       if (providers.length === 0) {
-        console.log(chalk17.yellow("\n\u26A0\uFE0F  \u6682\u65E0 Codex \u670D\u52A1\u5546\n"));
+        console.log(chalk19.yellow("\n\u26A0\uFE0F  \u6682\u65E0 Codex \u670D\u52A1\u5546\n"));
         return;
       }
+      const resolved = resolveProviderEditInput(options);
       let targetId;
       if (name) {
         const provider2 = manager.findByName(name);
@@ -4542,8 +4927,10 @@ function editCommand(program2) {
           throw new ProviderNotFoundError(name);
         }
         targetId = provider2.id;
+      } else if (resolved.nonInteractive) {
+        throw new Error("\u975E\u4EA4\u4E92\u6A21\u5F0F\u8BF7\u63D0\u4F9B\u8981\u7F16\u8F91\u7684\u670D\u52A1\u5546\u540D\u79F0");
       } else {
-        const { selectedId } = await inquirer11.prompt([
+        const { selectedId } = await inquirer9.prompt([
           {
             type: "list",
             name: "selectedId",
@@ -4557,9 +4944,24 @@ function editCommand(program2) {
         targetId = selectedId;
       }
       const provider = manager.get(targetId);
-      console.log(chalk17.bold("\n\u270F\uFE0F  \u7F16\u8F91\u670D\u52A1\u5546\n"));
-      console.log(chalk17.gray("\u63D0\u793A: \u7559\u7A7A\u5219\u4FDD\u6301\u539F\u503C\n"));
-      const answers = await inquirer11.prompt([
+      if (resolved.nonInteractive) {
+        if (Object.keys(resolved.updates).length === 0) {
+          console.log(chalk19.gray("\n\u672A\u505A\u4EFB\u4F55\u4FEE\u6539\n"));
+          return;
+        }
+        const updated2 = manager.edit(targetId, resolved.updates);
+        console.log();
+        console.log(chalk19.green("\u2705 \u7F16\u8F91\u6210\u529F"));
+        console.log();
+        console.log(`  ${chalk19.bold(updated2.name)} ${chalk19.blue("[Codex]")}`);
+        console.log(`  ${chalk19.gray(`ID: ${updated2.id}`)}`);
+        console.log(`  ${chalk19.gray(`URL: ${updated2.baseUrl}`)}`);
+        console.log();
+        return;
+      }
+      console.log(chalk19.bold("\n\u270F\uFE0F  \u7F16\u8F91\u670D\u52A1\u5546\n"));
+      console.log(chalk19.gray("\u63D0\u793A: \u7559\u7A7A\u5219\u4FDD\u6301\u539F\u503C\n"));
+      const answers = await inquirer9.prompt([
         {
           type: "input",
           name: "name",
@@ -4590,19 +4992,19 @@ function editCommand(program2) {
       if (answers.baseUrl && answers.baseUrl !== provider.baseUrl) updates.baseUrl = answers.baseUrl;
       if (answers.apiKey) updates.apiKey = answers.apiKey;
       if (Object.keys(updates).length === 0) {
-        console.log(chalk17.gray("\n\u672A\u505A\u4EFB\u4F55\u4FEE\u6539\n"));
+        console.log(chalk19.gray("\n\u672A\u505A\u4EFB\u4F55\u4FEE\u6539\n"));
         return;
       }
       const updated = manager.edit(targetId, updates);
       console.log();
-      console.log(chalk17.green("\u2705 \u7F16\u8F91\u6210\u529F"));
+      console.log(chalk19.green("\u2705 \u7F16\u8F91\u6210\u529F"));
       console.log();
-      console.log(`  ${chalk17.bold(updated.name)} ${chalk17.blue("[Codex]")}`);
-      console.log(`  ${chalk17.gray(`ID: ${updated.id}`)}`);
-      console.log(`  ${chalk17.gray(`URL: ${updated.baseUrl}`)}`);
+      console.log(`  ${chalk19.bold(updated.name)} ${chalk19.blue("[Codex]")}`);
+      console.log(`  ${chalk19.gray(`ID: ${updated.id}`)}`);
+      console.log(`  ${chalk19.gray(`URL: ${updated.baseUrl}`)}`);
       console.log();
     } catch (error) {
-      console.error(chalk17.red(`
+      console.error(chalk19.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -4612,15 +5014,15 @@ function editCommand(program2) {
 
 // src/commands/codex/clone.ts
 init_dist2();
-import chalk18 from "chalk";
-import inquirer12 from "inquirer";
+import chalk20 from "chalk";
+import inquirer10 from "inquirer";
 function cloneCommand(program2) {
   program2.command("clone [source-name] [new-name]").description("\u514B\u9686 Codex \u670D\u52A1\u5546").action(async (sourceName, newName) => {
     try {
       const manager = createCodexManager();
       const providers = manager.list();
       if (providers.length === 0) {
-        console.log(chalk18.yellow("\n\u26A0\uFE0F  \u6682\u65E0 Codex \u670D\u52A1\u5546\n"));
+        console.log(chalk20.yellow("\n\u26A0\uFE0F  \u6682\u65E0 Codex \u670D\u52A1\u5546\n"));
         return;
       }
       let sourceId;
@@ -4631,7 +5033,7 @@ function cloneCommand(program2) {
         }
         sourceId = provider.id;
       } else {
-        const { selectedId } = await inquirer12.prompt([
+        const { selectedId } = await inquirer10.prompt([
           {
             type: "list",
             name: "selectedId",
@@ -4649,7 +5051,7 @@ function cloneCommand(program2) {
       if (newName) {
         cloned = manager.clone(sourceId, newName);
       } else {
-        console.log(chalk18.blue(`
+        console.log(chalk20.blue(`
 \u514B\u9686\u81EA: ${source.name}
 `));
         const input = await promptProviderForm({
@@ -4662,14 +5064,14 @@ function cloneCommand(program2) {
         cloned = manager.add(input);
       }
       console.log();
-      console.log(chalk18.green("\u2705 \u514B\u9686\u6210\u529F"));
+      console.log(chalk20.green("\u2705 \u514B\u9686\u6210\u529F"));
       console.log();
-      console.log(`  ${chalk18.bold(cloned.name)} ${chalk18.blue("[Codex]")}`);
-      console.log(`  ${chalk18.gray(`ID: ${cloned.id}`)}`);
-      console.log(`  ${chalk18.gray(`URL: ${cloned.baseUrl}`)}`);
+      console.log(`  ${chalk20.bold(cloned.name)} ${chalk20.blue("[Codex]")}`);
+      console.log(`  ${chalk20.gray(`ID: ${cloned.id}`)}`);
+      console.log(`  ${chalk20.gray(`URL: ${cloned.baseUrl}`)}`);
       console.log();
     } catch (error) {
-      console.error(chalk18.red(`
+      console.error(chalk20.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -4690,15 +5092,32 @@ function createCodexCommands(program2) {
 
 // src/commands/claude/add.ts
 init_dist2();
-import chalk19 from "chalk";
-import inquirer13 from "inquirer";
+import chalk21 from "chalk";
+import inquirer11 from "inquirer";
 init_confirm();
 function addCommand2(program2) {
-  program2.command("add").description("\u6DFB\u52A0\u65B0\u7684 Claude Code \u670D\u52A1\u5546(\u4EA4\u4E92\u5F0F)").action(async () => {
+  const command = program2.command("add").description("\u6DFB\u52A0\u65B0\u7684 Claude Code \u670D\u52A1\u5546");
+  addProviderAddOptions(command);
+  command.action(async (options) => {
     try {
       const manager = createClaudeManager();
-      console.log(chalk19.bold("\n\u{1F4DD} \u6DFB\u52A0 Claude Code \u670D\u52A1\u5546\n"));
-      const { usePreset } = await inquirer13.prompt([
+      console.log(chalk21.bold("\n\u{1F4DD} \u6DFB\u52A0 Claude Code \u670D\u52A1\u5546\n"));
+      const resolved = resolveProviderAddInput(options, CC_PRESETS);
+      if (resolved.nonInteractive && resolved.input) {
+        const provider2 = manager.add(resolved.input);
+        printSuccess("\u6DFB\u52A0\u6210\u529F", [
+          `${chalk21.bold(provider2.name)} ${toolBadge("claude")}`,
+          chalk21.gray(provider2.baseUrl)
+        ]);
+        if (resolved.switchNow) {
+          manager.switch(provider2.id);
+          printSuccess("\u5DF2\u5207\u6362\u5230\u65B0\u670D\u52A1\u5546", [chalk21.gray(`\u914D\u7F6E\u5DF2\u66F4\u65B0: ${getClaudeConfigPath()}`)]);
+        } else {
+          printTip(`\u7A0D\u540E\u5207\u6362: ${chalk21.white(`ccman cc use "${provider2.name}"`)}`);
+        }
+        return;
+      }
+      const { usePreset } = await inquirer11.prompt([
         {
           type: "list",
           name: "usePreset",
@@ -4714,7 +5133,7 @@ function addCommand2(program2) {
       let baseUrl;
       let apiKey;
       if (usePreset) {
-        const { presetName } = await inquirer13.prompt([
+        const { presetName } = await inquirer11.prompt([
           {
             type: "list",
             name: "presetName",
@@ -4726,7 +5145,7 @@ function addCommand2(program2) {
           }
         ]);
         const preset = CC_PRESETS.find((p) => p.name === presetName);
-        console.log(chalk19.blue(`
+        console.log(chalk21.blue(`
 \u4F7F\u7528\u9884\u8BBE: ${preset.name} - ${preset.description}
 `));
         const input = await promptProviderForm({
@@ -4740,7 +5159,7 @@ function addCommand2(program2) {
         baseUrl = input.baseUrl;
         apiKey = input.apiKey;
       } else {
-        const answers = await inquirer13.prompt([
+        const answers = await inquirer11.prompt([
           {
             type: "input",
             name: "name",
@@ -4779,24 +5198,19 @@ function addCommand2(program2) {
         apiKey = answers.apiKey;
       }
       const provider = manager.add({ name, desc, baseUrl, apiKey });
-      console.log();
-      console.log(chalk19.green("\u2705 \u6DFB\u52A0\u6210\u529F"));
-      console.log();
-      console.log(`  ${chalk19.bold(provider.name)} ${chalk19.blue("[Claude Code]")}`);
-      console.log(`  ${chalk19.gray(provider.baseUrl)}`);
-      console.log();
+      printSuccess("\u6DFB\u52A0\u6210\u529F", [
+        `${chalk21.bold(provider.name)} ${toolBadge("claude")}`,
+        chalk21.gray(provider.baseUrl)
+      ]);
       const switchNow = await promptConfirm("\u662F\u5426\u7ACB\u5373\u5207\u6362\u5230\u6B64\u670D\u52A1\u5546?", true);
       if (switchNow) {
         manager.switch(provider.id);
-        console.log(chalk19.green("\u2705 \u5DF2\u5207\u6362\u5230\u65B0\u670D\u52A1\u5546"));
-        console.log();
-        console.log(chalk19.gray("\u914D\u7F6E\u5DF2\u66F4\u65B0:"));
-        console.log(chalk19.gray(`  - ${getClaudeConfigPath()}`));
+        printSuccess("\u5DF2\u5207\u6362\u5230\u65B0\u670D\u52A1\u5546", [chalk21.gray(`\u914D\u7F6E\u5DF2\u66F4\u65B0: ${getClaudeConfigPath()}`)]);
       } else {
-        console.log(chalk19.blue("\u{1F4A1} \u7A0D\u540E\u5207\u6362:") + chalk19.white(` ccman cc use "${provider.name}"`));
+        printTip(`\u7A0D\u540E\u5207\u6362: ${chalk21.white(`ccman cc use "${provider.name}"`)}`);
       }
     } catch (error) {
-      console.error(chalk19.red(`
+      console.error(chalk21.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -4806,7 +5220,7 @@ function addCommand2(program2) {
 
 // src/commands/claude/list.ts
 init_dist2();
-import chalk20 from "chalk";
+import chalk22 from "chalk";
 function listCommand2(program2) {
   program2.command("list").alias("ls").description("\u5217\u51FA\u6240\u6709 Claude Code \u670D\u52A1\u5546").action(async () => {
     try {
@@ -4814,15 +5228,15 @@ function listCommand2(program2) {
       const providers = manager.list();
       const current = manager.getCurrent();
       if (providers.length === 0) {
-        console.log(chalk20.yellow("\n\u26A0\uFE0F  \u6682\u65E0 Claude Code \u670D\u52A1\u5546\n"));
-        console.log(chalk20.blue("\u{1F4A1} \u6DFB\u52A0\u670D\u52A1\u5546:") + chalk20.white(" ccman cc add\n"));
+        printWarning("\u6682\u65E0 Claude Code \u670D\u52A1\u5546");
+        printTip("\u6DFB\u52A0\u670D\u52A1\u5546: " + chalk22.white("ccman cc add"));
         return;
       }
-      console.log(chalk20.bold(`
-\u{1F4CB} Claude Code \u670D\u52A1\u5546 (${providers.length} \u4E2A)`));
-      console.log(formatProviderTable(providers, current?.id));
+      console.log(
+        formatProviderTable(providers, current?.id, `Claude Code \u670D\u52A1\u5546 (${providers.length} \u4E2A)`)
+      );
     } catch (error) {
-      console.error(chalk20.red(`
+      console.error(chalk22.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -4832,16 +5246,16 @@ function listCommand2(program2) {
 
 // src/commands/claude/use.ts
 init_dist2();
-import chalk21 from "chalk";
-import inquirer14 from "inquirer";
+import chalk23 from "chalk";
+import inquirer12 from "inquirer";
 function useCommand2(program2) {
   program2.command("use [name]").description("\u5207\u6362 Claude Code \u670D\u52A1\u5546").action(async (name) => {
     try {
       const manager = createClaudeManager();
       const providers = manager.list();
       if (providers.length === 0) {
-        console.log(chalk21.yellow("\n\u26A0\uFE0F  \u6682\u65E0 Claude Code \u670D\u52A1\u5546\n"));
-        console.log(chalk21.blue("\u{1F4A1} \u6DFB\u52A0\u670D\u52A1\u5546:") + chalk21.white(" ccman cc add\n"));
+        printWarning("\u6682\u65E0 Claude Code \u670D\u52A1\u5546");
+        printTip("\u6DFB\u52A0\u670D\u52A1\u5546: " + chalk23.white("ccman cc add"));
         return;
       }
       let targetId;
@@ -4852,7 +5266,7 @@ function useCommand2(program2) {
         }
         targetId = provider2.id;
       } else {
-        const { selectedId } = await inquirer14.prompt([
+        const { selectedId } = await inquirer12.prompt([
           {
             type: "list",
             name: "selectedId",
@@ -4867,23 +5281,19 @@ function useCommand2(program2) {
       }
       manager.switch(targetId);
       const provider = manager.get(targetId);
-      console.log();
-      console.log(chalk21.green("\u2705 \u5207\u6362\u6210\u529F"));
-      console.log();
-      console.log(`  ${chalk21.bold(provider.name)} ${chalk21.blue("[Claude Code]")}`);
-      console.log(`  ${chalk21.gray(`URL: ${provider.baseUrl}`)}`);
-      console.log();
-      console.log(chalk21.gray("\u914D\u7F6E\u5DF2\u66F4\u65B0:"));
-      console.log(chalk21.gray(`  - ${getClaudeConfigPath()}`));
-      console.log();
+      printSuccess("\u5207\u6362\u6210\u529F", [
+        `${chalk23.bold(provider.name)} ${toolBadge("claude")}`,
+        chalk23.gray(`URL: ${provider.baseUrl}`),
+        chalk23.gray(`\u914D\u7F6E\u5DF2\u66F4\u65B0: ${getClaudeConfigPath()}`)
+      ]);
     } catch (error) {
       if (error instanceof ProviderNotFoundError) {
-        console.error(chalk21.red(`
+        console.error(chalk23.red(`
 \u274C \u670D\u52A1\u5546\u4E0D\u5B58\u5728: ${error.message}
 `));
-        console.log(chalk21.blue("\u{1F4A1} \u67E5\u770B\u6240\u6709\u670D\u52A1\u5546:") + chalk21.white(" ccman cc list\n"));
+        console.log(chalk23.blue("\u{1F4A1} \u67E5\u770B\u6240\u6709\u670D\u52A1\u5546:") + chalk23.white(" ccman cc list\n"));
       } else {
-        console.error(chalk21.red(`
+        console.error(chalk23.red(`
 \u274C ${error.message}
 `));
       }
@@ -4894,28 +5304,30 @@ function useCommand2(program2) {
 
 // src/commands/claude/current.ts
 init_dist2();
-import chalk22 from "chalk";
+import chalk24 from "chalk";
 function currentCommand2(program2) {
   program2.command("current").description("\u663E\u793A\u5F53\u524D\u4F7F\u7528\u7684 Claude Code \u670D\u52A1\u5546").action(async () => {
     try {
       const manager = createClaudeManager();
       const current = manager.getCurrent();
       if (!current) {
-        console.log(chalk22.yellow("\n\u26A0\uFE0F  \u672A\u9009\u62E9\u4EFB\u4F55 Claude Code \u670D\u52A1\u5546\n"));
-        console.log(chalk22.blue("\u{1F4A1} \u9009\u62E9\u670D\u52A1\u5546:") + chalk22.white(" ccman cc use\n"));
+        printWarning("\u672A\u9009\u62E9\u4EFB\u4F55 Claude Code \u670D\u52A1\u5546");
+        printTip("\u9009\u62E9\u670D\u52A1\u5546: " + chalk24.white("ccman cc use"));
         return;
       }
-      console.log(chalk22.bold("\n\u{1F4CD} \u5F53\u524D Claude Code \u670D\u52A1\u5546\n"));
-      console.log(`  ${chalk22.green.bold(current.name)}`);
-      console.log(`  ${chalk22.gray(`ID: ${current.id}`)}`);
-      console.log(`  ${chalk22.gray(`URL: ${current.baseUrl}`)}`);
+      const lines = [
+        chalk24.green.bold(current.name),
+        chalk24.gray(`ID: ${current.id}`),
+        chalk24.gray(`URL: ${current.baseUrl}`)
+      ];
       if (current.lastUsedAt) {
-        const date = new Date(current.lastUsedAt).toLocaleString("zh-CN");
-        console.log(`  ${chalk22.gray(`\u6700\u540E\u4F7F\u7528: ${date}`)}`);
+        lines.push(
+          chalk24.gray(`\u6700\u540E\u4F7F\u7528: ${new Date(current.lastUsedAt).toLocaleString("zh-CN")}`)
+        );
       }
-      console.log();
+      printInfo("\u{1F4CD} \u5F53\u524D Claude Code \u670D\u52A1\u5546", lines);
     } catch (error) {
-      console.error(chalk22.red(`
+      console.error(chalk24.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -4925,16 +5337,17 @@ function currentCommand2(program2) {
 
 // src/commands/claude/remove.ts
 init_dist2();
-init_confirm();
-import chalk23 from "chalk";
-import inquirer15 from "inquirer";
+import chalk25 from "chalk";
+import inquirer13 from "inquirer";
 function removeCommand2(program2) {
-  program2.command("remove [name]").alias("rm").description("\u5220\u9664 Claude Code \u670D\u52A1\u5546").action(async (name) => {
+  const command = program2.command("remove [name]").alias("rm").description("\u5220\u9664 Claude Code \u670D\u52A1\u5546");
+  addProviderRemoveOptions(command);
+  command.action(async (name, options) => {
     try {
       const manager = createClaudeManager();
       const providers = manager.list();
       if (providers.length === 0) {
-        console.log(chalk23.yellow("\n\u26A0\uFE0F  \u6682\u65E0 Claude Code \u670D\u52A1\u5546\n"));
+        console.log(chalk25.yellow("\n\u26A0\uFE0F  \u6682\u65E0 Claude Code \u670D\u52A1\u5546\n"));
         return;
       }
       let targetId;
@@ -4946,8 +5359,10 @@ function removeCommand2(program2) {
         }
         targetId = provider.id;
         targetName = provider.name;
+      } else if (options.yes) {
+        throw new Error("\u975E\u4EA4\u4E92\u6A21\u5F0F\u8BF7\u63D0\u4F9B\u8981\u5220\u9664\u7684\u670D\u52A1\u5546\u540D\u79F0");
       } else {
-        const { selectedId } = await inquirer15.prompt([
+        const { selectedId } = await inquirer13.prompt([
           {
             type: "list",
             name: "selectedId",
@@ -4962,23 +5377,23 @@ function removeCommand2(program2) {
         targetId = selectedId;
         targetName = provider.name;
       }
-      const confirmed = await promptConfirm(`\u786E\u5B9A\u5220\u9664 "${targetName}"?`, false);
+      const confirmed = await confirmProviderRemoval(targetName, options);
       if (!confirmed) {
-        console.log(chalk23.gray("\n\u5DF2\u53D6\u6D88\n"));
+        console.log(chalk25.gray("\n\u5DF2\u53D6\u6D88\n"));
         return;
       }
       manager.remove(targetId);
       console.log();
-      console.log(chalk23.green(`\u2705 \u5DF2\u5220\u9664: ${targetName}`));
+      console.log(chalk25.green(`\u2705 \u5DF2\u5220\u9664: ${targetName}`));
       console.log();
     } catch (error) {
       if (error instanceof ProviderNotFoundError) {
-        console.error(chalk23.red(`
+        console.error(chalk25.red(`
 \u274C \u670D\u52A1\u5546\u4E0D\u5B58\u5728
 `));
-        console.log(chalk23.blue("\u{1F4A1} \u67E5\u770B\u6240\u6709\u670D\u52A1\u5546:") + chalk23.white(" ccman cc list\n"));
+        console.log(chalk25.blue("\u{1F4A1} \u67E5\u770B\u6240\u6709\u670D\u52A1\u5546:") + chalk25.white(" ccman cc list\n"));
       } else {
-        console.error(chalk23.red(`
+        console.error(chalk25.red(`
 \u274C ${error.message}
 `));
       }
@@ -4989,17 +5404,20 @@ function removeCommand2(program2) {
 
 // src/commands/claude/edit.ts
 init_dist2();
-import chalk24 from "chalk";
-import inquirer16 from "inquirer";
+import chalk26 from "chalk";
+import inquirer14 from "inquirer";
 function editCommand2(program2) {
-  program2.command("edit [name]").description("\u7F16\u8F91 Claude Code \u670D\u52A1\u5546").action(async (name) => {
+  const command = program2.command("edit [name]").description("\u7F16\u8F91 Claude Code \u670D\u52A1\u5546");
+  addProviderEditOptions(command);
+  command.action(async (name, options) => {
     try {
       const manager = createClaudeManager();
       const providers = manager.list();
       if (providers.length === 0) {
-        console.log(chalk24.yellow("\n\u26A0\uFE0F  \u6682\u65E0 Claude Code \u670D\u52A1\u5546\n"));
+        console.log(chalk26.yellow("\n\u26A0\uFE0F  \u6682\u65E0 Claude Code \u670D\u52A1\u5546\n"));
         return;
       }
+      const resolved = resolveProviderEditInput(options);
       let targetId;
       if (name) {
         const provider2 = manager.findByName(name);
@@ -5007,8 +5425,10 @@ function editCommand2(program2) {
           throw new ProviderNotFoundError(name);
         }
         targetId = provider2.id;
+      } else if (resolved.nonInteractive) {
+        throw new Error("\u975E\u4EA4\u4E92\u6A21\u5F0F\u8BF7\u63D0\u4F9B\u8981\u7F16\u8F91\u7684\u670D\u52A1\u5546\u540D\u79F0");
       } else {
-        const { selectedId } = await inquirer16.prompt([
+        const { selectedId } = await inquirer14.prompt([
           {
             type: "list",
             name: "selectedId",
@@ -5022,9 +5442,24 @@ function editCommand2(program2) {
         targetId = selectedId;
       }
       const provider = manager.get(targetId);
-      console.log(chalk24.bold("\n\u270F\uFE0F  \u7F16\u8F91\u670D\u52A1\u5546\n"));
-      console.log(chalk24.gray("\u63D0\u793A: \u7559\u7A7A\u5219\u4FDD\u6301\u539F\u503C\n"));
-      const answers = await inquirer16.prompt([
+      if (resolved.nonInteractive) {
+        if (Object.keys(resolved.updates).length === 0) {
+          console.log(chalk26.gray("\n\u672A\u505A\u4EFB\u4F55\u4FEE\u6539\n"));
+          return;
+        }
+        const updated2 = manager.edit(targetId, resolved.updates);
+        console.log();
+        console.log(chalk26.green("\u2705 \u7F16\u8F91\u6210\u529F"));
+        console.log();
+        console.log(`  ${chalk26.bold(updated2.name)} ${chalk26.blue("[Claude Code]")}`);
+        console.log(`  ${chalk26.gray(`ID: ${updated2.id}`)}`);
+        console.log(`  ${chalk26.gray(`URL: ${updated2.baseUrl}`)}`);
+        console.log();
+        return;
+      }
+      console.log(chalk26.bold("\n\u270F\uFE0F  \u7F16\u8F91\u670D\u52A1\u5546\n"));
+      console.log(chalk26.gray("\u63D0\u793A: \u7559\u7A7A\u5219\u4FDD\u6301\u539F\u503C\n"));
+      const answers = await inquirer14.prompt([
         {
           type: "input",
           name: "name",
@@ -5055,19 +5490,19 @@ function editCommand2(program2) {
       if (answers.baseUrl && answers.baseUrl !== provider.baseUrl) updates.baseUrl = answers.baseUrl;
       if (answers.apiKey) updates.apiKey = answers.apiKey;
       if (Object.keys(updates).length === 0) {
-        console.log(chalk24.gray("\n\u672A\u505A\u4EFB\u4F55\u4FEE\u6539\n"));
+        console.log(chalk26.gray("\n\u672A\u505A\u4EFB\u4F55\u4FEE\u6539\n"));
         return;
       }
       const updated = manager.edit(targetId, updates);
       console.log();
-      console.log(chalk24.green("\u2705 \u7F16\u8F91\u6210\u529F"));
+      console.log(chalk26.green("\u2705 \u7F16\u8F91\u6210\u529F"));
       console.log();
-      console.log(`  ${chalk24.bold(updated.name)} ${chalk24.blue("[Claude Code]")}`);
-      console.log(`  ${chalk24.gray(`ID: ${updated.id}`)}`);
-      console.log(`  ${chalk24.gray(`URL: ${updated.baseUrl}`)}`);
+      console.log(`  ${chalk26.bold(updated.name)} ${chalk26.blue("[Claude Code]")}`);
+      console.log(`  ${chalk26.gray(`ID: ${updated.id}`)}`);
+      console.log(`  ${chalk26.gray(`URL: ${updated.baseUrl}`)}`);
       console.log();
     } catch (error) {
-      console.error(chalk24.red(`
+      console.error(chalk26.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -5077,15 +5512,15 @@ function editCommand2(program2) {
 
 // src/commands/claude/clone.ts
 init_dist2();
-import chalk25 from "chalk";
-import inquirer17 from "inquirer";
+import chalk27 from "chalk";
+import inquirer15 from "inquirer";
 function cloneCommand2(program2) {
   program2.command("clone [source-name] [new-name]").description("\u514B\u9686 Claude Code \u670D\u52A1\u5546").action(async (sourceName, newName) => {
     try {
       const manager = createClaudeManager();
       const providers = manager.list();
       if (providers.length === 0) {
-        console.log(chalk25.yellow("\n\u26A0\uFE0F  \u6682\u65E0 Claude Code \u670D\u52A1\u5546\n"));
+        console.log(chalk27.yellow("\n\u26A0\uFE0F  \u6682\u65E0 Claude Code \u670D\u52A1\u5546\n"));
         return;
       }
       let sourceId;
@@ -5096,7 +5531,7 @@ function cloneCommand2(program2) {
         }
         sourceId = provider.id;
       } else {
-        const { selectedId } = await inquirer17.prompt([
+        const { selectedId } = await inquirer15.prompt([
           {
             type: "list",
             name: "selectedId",
@@ -5114,7 +5549,7 @@ function cloneCommand2(program2) {
       if (newName) {
         cloned = manager.clone(sourceId, newName);
       } else {
-        console.log(chalk25.blue(`
+        console.log(chalk27.blue(`
 \u514B\u9686\u81EA: ${source.name}
 `));
         const input = await promptProviderForm({
@@ -5127,14 +5562,14 @@ function cloneCommand2(program2) {
         cloned = manager.add(input);
       }
       console.log();
-      console.log(chalk25.green("\u2705 \u514B\u9686\u6210\u529F"));
+      console.log(chalk27.green("\u2705 \u514B\u9686\u6210\u529F"));
       console.log();
-      console.log(`  ${chalk25.bold(cloned.name)} ${chalk25.blue("[Claude Code]")}`);
-      console.log(`  ${chalk25.gray(`ID: ${cloned.id}`)}`);
-      console.log(`  ${chalk25.gray(`URL: ${cloned.baseUrl}`)}`);
+      console.log(`  ${chalk27.bold(cloned.name)} ${chalk27.blue("[Claude Code]")}`);
+      console.log(`  ${chalk27.gray(`ID: ${cloned.id}`)}`);
+      console.log(`  ${chalk27.gray(`URL: ${cloned.baseUrl}`)}`);
       console.log();
     } catch (error) {
-      console.error(chalk25.red(`
+      console.error(chalk27.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -5145,8 +5580,8 @@ function cloneCommand2(program2) {
 // src/commands/clean.ts
 init_dist2();
 init_confirm();
-import chalk26 from "chalk";
-import inquirer18 from "inquirer";
+import chalk28 from "chalk";
+import inquirer16 from "inquirer";
 function formatBytes2(bytes) {
   if (bytes < 1024) return `${bytes} B`;
   if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
@@ -5154,30 +5589,30 @@ function formatBytes2(bytes) {
 }
 function displayAnalysis() {
   try {
-    console.log(chalk26.bold("\n\u{1F4CA} \u5206\u6790 ~/.claude.json\n"));
+    console.log(chalk28.bold("\n\u{1F4CA} \u5206\u6790 ~/.claude.json\n"));
     const analysis = analyzeClaudeJson();
-    console.log(chalk26.cyan("\u6587\u4EF6\u5927\u5C0F:"), chalk26.bold(analysis.fileSizeFormatted));
+    console.log(chalk28.cyan("\u6587\u4EF6\u5927\u5C0F:"), chalk28.bold(analysis.fileSizeFormatted));
     console.log();
-    console.log(chalk26.cyan("\u9879\u76EE\u7EDF\u8BA1:"));
-    console.log(`  \u9879\u76EE\u603B\u6570: ${chalk26.bold(analysis.projectCount)}`);
-    console.log(`  \u5386\u53F2\u8BB0\u5F55\u603B\u6570: ${chalk26.bold(analysis.totalHistoryCount)} \u6761`);
+    console.log(chalk28.cyan("\u9879\u76EE\u7EDF\u8BA1:"));
+    console.log(`  \u9879\u76EE\u603B\u6570: ${chalk28.bold(analysis.projectCount)}`);
+    console.log(`  \u5386\u53F2\u8BB0\u5F55\u603B\u6570: ${chalk28.bold(analysis.totalHistoryCount)} \u6761`);
     console.log();
-    console.log(chalk26.cyan("\u5386\u53F2\u8BB0\u5F55\u6700\u591A\u7684\u9879\u76EE:"));
+    console.log(chalk28.cyan("\u5386\u53F2\u8BB0\u5F55\u6700\u591A\u7684\u9879\u76EE:"));
     const top5 = analysis.projectHistory.slice(0, 5);
     for (const project of top5) {
       const displayPath = project.path.length > 50 ? "..." + project.path.slice(-47) : project.path;
-      console.log(`  ${chalk26.bold(project.count.toString().padStart(3))} \u6761  ${displayPath}`);
+      console.log(`  ${chalk28.bold(project.count.toString().padStart(3))} \u6761  ${displayPath}`);
     }
     console.log();
-    console.log(chalk26.cyan("\u9884\u8BA1\u53EF\u8282\u7701\u7A7A\u95F4:"));
-    console.log(`  ${chalk26.green("\u4FDD\u5B88\u6E05\u7406")} (\u4FDD\u755910\u6761): ${chalk26.bold(formatBytes2(analysis.estimatedSavings.conservative))}`);
-    console.log(`  ${chalk26.yellow("\u4E2D\u7B49\u6E05\u7406")} (\u4FDD\u75595\u6761):  ${chalk26.bold(formatBytes2(analysis.estimatedSavings.moderate))}`);
-    console.log(`  ${chalk26.red("\u6FC0\u8FDB\u6E05\u7406")} (\u6E05\u7A7A\u5386\u53F2):  ${chalk26.bold(formatBytes2(analysis.estimatedSavings.aggressive))}`);
+    console.log(chalk28.cyan("\u9884\u8BA1\u53EF\u8282\u7701\u7A7A\u95F4:"));
+    console.log(`  ${chalk28.green("\u4FDD\u5B88\u6E05\u7406")} (\u4FDD\u755910\u6761): ${chalk28.bold(formatBytes2(analysis.estimatedSavings.conservative))}`);
+    console.log(`  ${chalk28.yellow("\u4E2D\u7B49\u6E05\u7406")} (\u4FDD\u75595\u6761):  ${chalk28.bold(formatBytes2(analysis.estimatedSavings.moderate))}`);
+    console.log(`  ${chalk28.red("\u6FC0\u8FDB\u6E05\u7406")} (\u6E05\u7A7A\u5386\u53F2):  ${chalk28.bold(formatBytes2(analysis.estimatedSavings.aggressive))}`);
     console.log();
-    console.log(chalk26.blue(`\u{1F4A1} \u6267\u884C\u6E05\u7406: ccman cc clean
+    console.log(chalk28.blue(`\u{1F4A1} \u6267\u884C\u6E05\u7406: ccman cc clean
 `));
   } catch (error) {
-    console.error(chalk26.red(`
+    console.error(chalk28.red(`
 \u274C ${error.message}
 `));
     process.exit(1);
@@ -5191,9 +5626,9 @@ function cleanAnalyzeCommand(program2) {
 function cleanCommand(program2) {
   program2.command("clean").description("\u6E05\u7406 ~/.claude.json \u6587\u4EF6\uFF08\u5386\u53F2\u8BB0\u5F55\u3001\u7F13\u5B58\u7B49\uFF09").option("--preset <type>", "\u4F7F\u7528\u9884\u8BBE\u65B9\u6848 (conservative|moderate|aggressive)").option("--keep <count>", "\u4FDD\u7559\u6700\u8FD1N\u6761\u5386\u53F2\u8BB0\u5F55").option("--cache", "\u6E05\u7406\u7F13\u5B58\u6570\u636E").option("--stats", "\u91CD\u7F6E\u4F7F\u7528\u7EDF\u8BA1").option("--projects <paths>", "\u53EA\u6E05\u7406\u6307\u5B9A\u9879\u76EE\uFF08\u9017\u53F7\u5206\u9694\uFF09").action(async (options) => {
     try {
-      console.log(chalk26.bold("\n\u{1F9F9} \u6E05\u7406 ~/.claude.json\n"));
+      console.log(chalk28.bold("\n\u{1F9F9} \u6E05\u7406 ~/.claude.json\n"));
       const analysis = analyzeClaudeJson();
-      console.log(`\u5F53\u524D\u6587\u4EF6\u5927\u5C0F: ${chalk26.bold(analysis.fileSizeFormatted)}`);
+      console.log(`\u5F53\u524D\u6587\u4EF6\u5927\u5C0F: ${chalk28.bold(analysis.fileSizeFormatted)}`);
       console.log(`\u9879\u76EE\u6570: ${analysis.projectCount}, \u5386\u53F2\u8BB0\u5F55: ${analysis.totalHistoryCount} \u6761`);
       console.log();
       let cleanOptions;
@@ -5204,30 +5639,30 @@ function cleanCommand(program2) {
       }
       const confirmed = await promptConfirm("\u786E\u8BA4\u6267\u884C\u6E05\u7406\uFF1F\uFF08\u4F1A\u81EA\u52A8\u5907\u4EFD\u539F\u6587\u4EF6\uFF09", true);
       if (!confirmed) {
-        console.log(chalk26.yellow("\n\u274C \u5DF2\u53D6\u6D88\n"));
+        console.log(chalk28.yellow("\n\u274C \u5DF2\u53D6\u6D88\n"));
         return;
       }
-      console.log(chalk26.cyan("\n\u6B63\u5728\u6E05\u7406...\n"));
+      console.log(chalk28.cyan("\n\u6B63\u5728\u6E05\u7406...\n"));
       const result = cleanClaudeJson(cleanOptions);
-      console.log(chalk26.green("\u2705 \u6E05\u7406\u5B8C\u6210\n"));
-      console.log(`\u6E05\u7406\u524D: ${chalk26.bold(formatBytes2(result.sizeBefore))}`);
-      console.log(`\u6E05\u7406\u540E: ${chalk26.bold(formatBytes2(result.sizeAfter))}`);
-      console.log(`\u8282\u7701\u7A7A\u95F4: ${chalk26.green.bold(formatBytes2(result.saved))} (${(result.saved / result.sizeBefore * 100).toFixed(1)}%)`);
+      console.log(chalk28.green("\u2705 \u6E05\u7406\u5B8C\u6210\n"));
+      console.log(`\u6E05\u7406\u524D: ${chalk28.bold(formatBytes2(result.sizeBefore))}`);
+      console.log(`\u6E05\u7406\u540E: ${chalk28.bold(formatBytes2(result.sizeAfter))}`);
+      console.log(`\u8282\u7701\u7A7A\u95F4: ${chalk28.green.bold(formatBytes2(result.saved))} (${(result.saved / result.sizeBefore * 100).toFixed(1)}%)`);
       console.log();
       if (result.cleanedItems.projectHistory > 0) {
-        console.log(`\u6E05\u7406\u5386\u53F2\u8BB0\u5F55: ${chalk26.bold(result.cleanedItems.projectHistory)} \u6761`);
+        console.log(`\u6E05\u7406\u5386\u53F2\u8BB0\u5F55: ${chalk28.bold(result.cleanedItems.projectHistory)} \u6761`);
       }
       if (result.cleanedItems.cache) {
-        console.log(`\u6E05\u7406\u7F13\u5B58: ${chalk26.green("\u2713")}`);
+        console.log(`\u6E05\u7406\u7F13\u5B58: ${chalk28.green("\u2713")}`);
       }
       if (result.cleanedItems.stats) {
-        console.log(`\u91CD\u7F6E\u7EDF\u8BA1: ${chalk26.green("\u2713")}`);
+        console.log(`\u91CD\u7F6E\u7EDF\u8BA1: ${chalk28.green("\u2713")}`);
       }
       console.log();
-      console.log(`\u5907\u4EFD\u6587\u4EF6: ${chalk26.cyan(result.backupPath)}`);
+      console.log(`\u5907\u4EFD\u6587\u4EF6: ${chalk28.cyan(result.backupPath)}`);
       console.log();
     } catch (error) {
-      console.error(chalk26.red(`
+      console.error(chalk28.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -5265,32 +5700,32 @@ function buildOptionsFromArgs(args) {
     options.projectPaths = args.projects.split(",").map((p) => p.trim());
   }
   if (!options.cleanProjectHistory && !options.cleanCache && !options.cleanStats) {
-    console.log(chalk26.yellow("\u672A\u6307\u5B9A\u6E05\u7406\u9009\u9879\uFF0C\u4F7F\u7528\u4FDD\u5B88\u9884\u8BBE\n"));
+    console.log(chalk28.yellow("\u672A\u6307\u5B9A\u6E05\u7406\u9009\u9879\uFF0C\u4F7F\u7528\u4FDD\u5B88\u9884\u8BBE\n"));
     return CleanPresets.conservative();
   }
   return options;
 }
 async function promptForOptions(analysis) {
-  const answers = await inquirer18.prompt([
+  const answers = await inquirer16.prompt([
     {
       type: "list",
       name: "preset",
       message: "\u9009\u62E9\u6E05\u7406\u65B9\u6848:",
       choices: [
         {
-          name: `${chalk26.green("\u4FDD\u5B88\u6E05\u7406")} - \u4FDD\u7559\u6700\u8FD110\u6761\u8BB0\u5F55\uFF0C\u6E05\u7406\u7F13\u5B58 (\u8282\u7701\u7EA6 ${formatBytes2(analysis.estimatedSavings.conservative)})`,
+          name: `${chalk28.green("\u4FDD\u5B88\u6E05\u7406")} - \u4FDD\u7559\u6700\u8FD110\u6761\u8BB0\u5F55\uFF0C\u6E05\u7406\u7F13\u5B58 (\u8282\u7701\u7EA6 ${formatBytes2(analysis.estimatedSavings.conservative)})`,
           value: "conservative"
         },
         {
-          name: `${chalk26.yellow("\u4E2D\u7B49\u6E05\u7406")} - \u4FDD\u7559\u6700\u8FD15\u6761\u8BB0\u5F55\uFF0C\u6E05\u7406\u7F13\u5B58\u548C\u7EDF\u8BA1 (\u8282\u7701\u7EA6 ${formatBytes2(analysis.estimatedSavings.moderate)})`,
+          name: `${chalk28.yellow("\u4E2D\u7B49\u6E05\u7406")} - \u4FDD\u7559\u6700\u8FD15\u6761\u8BB0\u5F55\uFF0C\u6E05\u7406\u7F13\u5B58\u548C\u7EDF\u8BA1 (\u8282\u7701\u7EA6 ${formatBytes2(analysis.estimatedSavings.moderate)})`,
           value: "moderate"
         },
         {
-          name: `${chalk26.red("\u6FC0\u8FDB\u6E05\u7406")} - \u6E05\u7A7A\u5386\u53F2\u8BB0\u5F55\uFF0C\u6E05\u7406\u7F13\u5B58\u548C\u7EDF\u8BA1 (\u8282\u7701\u7EA6 ${formatBytes2(analysis.estimatedSavings.aggressive)})`,
+          name: `${chalk28.red("\u6FC0\u8FDB\u6E05\u7406")} - \u6E05\u7A7A\u5386\u53F2\u8BB0\u5F55\uFF0C\u6E05\u7406\u7F13\u5B58\u548C\u7EDF\u8BA1 (\u8282\u7701\u7EA6 ${formatBytes2(analysis.estimatedSavings.aggressive)})`,
           value: "aggressive"
         },
         {
-          name: `${chalk26.cyan("\u81EA\u5B9A\u4E49")} - \u81EA\u5B9A\u4E49\u6E05\u7406\u9009\u9879`,
+          name: `${chalk28.cyan("\u81EA\u5B9A\u4E49")} - \u81EA\u5B9A\u4E49\u6E05\u7406\u9009\u9879`,
           value: "custom"
         }
       ]
@@ -5308,7 +5743,7 @@ async function promptForOptions(analysis) {
   const cleanHistory = await promptConfirm("\u6E05\u7406\u9879\u76EE\u5386\u53F2\u8BB0\u5F55\uFF1F", true);
   let keepCount = 10;
   if (cleanHistory) {
-    const answers2 = await inquirer18.prompt([
+    const answers2 = await inquirer16.prompt([
       {
         type: "number",
         name: "keepCount",
@@ -5343,14 +5778,14 @@ function createClaudeCommands(program2) {
 
 // src/commands/mcp/add.ts
 init_dist2();
-import chalk27 from "chalk";
-import inquirer19 from "inquirer";
+import chalk29 from "chalk";
+import inquirer17 from "inquirer";
 function addCommand3(program2) {
   program2.command("add").description("\u6DFB\u52A0\u65B0\u7684 MCP \u670D\u52A1\u5668(\u4EA4\u4E92\u5F0F)").action(async () => {
     try {
       const manager = createMCPManager();
-      console.log(chalk27.bold("\n\u{1F4DD} \u6DFB\u52A0 MCP \u670D\u52A1\u5668\n"));
-      const { usePreset } = await inquirer19.prompt([
+      console.log(chalk29.bold("\n\u{1F4DD} \u6DFB\u52A0 MCP \u670D\u52A1\u5668\n"));
+      const { usePreset } = await inquirer17.prompt([
         {
           type: "list",
           name: "usePreset",
@@ -5366,7 +5801,7 @@ function addCommand3(program2) {
       let args;
       let env;
       if (usePreset) {
-        const { presetName } = await inquirer19.prompt([
+        const { presetName } = await inquirer17.prompt([
           {
             type: "list",
             name: "presetName",
@@ -5378,18 +5813,18 @@ function addCommand3(program2) {
           }
         ]);
         const preset = MCP_PRESETS_DETAIL.find((p) => p.name === presetName);
-        console.log(chalk27.blue(`
+        console.log(chalk29.blue(`
 \u4F7F\u7528\u9884\u8BBE: ${preset.name} - ${preset.description}
 `));
         if (preset.argsPlaceholder) {
-          console.log(chalk27.yellow(`\u26A0\uFE0F  ${preset.argsPlaceholder}
+          console.log(chalk29.yellow(`\u26A0\uFE0F  ${preset.argsPlaceholder}
 `));
         }
         if (preset.envRequired && preset.envRequired.length > 0) {
-          console.log(chalk27.yellow(`\u26A0\uFE0F  \u9700\u8981\u914D\u7F6E\u73AF\u5883\u53D8\u91CF: ${preset.envRequired.join(", ")}
+          console.log(chalk29.yellow(`\u26A0\uFE0F  \u9700\u8981\u914D\u7F6E\u73AF\u5883\u53D8\u91CF: ${preset.envRequired.join(", ")}
 `));
         }
-        const input = await inquirer19.prompt([
+        const input = await inquirer17.prompt([
           {
             type: "input",
             name: "name",
@@ -5432,7 +5867,7 @@ function addCommand3(program2) {
         args = input.args.split(" ").filter((arg) => arg.length > 0);
         env = input.env ? JSON.parse(input.env) : void 0;
       } else {
-        const answers = await inquirer19.prompt([
+        const answers = await inquirer17.prompt([
           {
             type: "input",
             name: "name",
@@ -5480,21 +5915,21 @@ function addCommand3(program2) {
         model: env ? JSON.stringify(env) : void 0
       });
       console.log();
-      console.log(chalk27.green("\u2705 MCP \u670D\u52A1\u5668\u6DFB\u52A0\u6210\u529F"));
+      console.log(chalk29.green("\u2705 MCP \u670D\u52A1\u5668\u6DFB\u52A0\u6210\u529F"));
       console.log();
-      console.log(`  ${chalk27.bold(provider.name)} ${chalk27.blue("[MCP]")}`);
-      console.log(`  ${chalk27.gray(`${command} ${args.join(" ")}`)}`);
+      console.log(`  ${chalk29.bold(provider.name)} ${chalk29.blue("[MCP]")}`);
+      console.log(`  ${chalk29.gray(`${command} ${args.join(" ")}`)}`);
       if (env) {
-        console.log(chalk27.gray(`  \u73AF\u5883\u53D8\u91CF: ${Object.keys(env).join(", ")}`));
+        console.log(chalk29.gray(`  \u73AF\u5883\u53D8\u91CF: ${Object.keys(env).join(", ")}`));
       }
       console.log();
-      console.log(chalk27.green("\u2705 \u914D\u7F6E\u5DF2\u81EA\u52A8\u540C\u6B65\u5230 ~/.claude.json"));
+      console.log(chalk29.green("\u2705 \u914D\u7F6E\u5DF2\u81EA\u52A8\u540C\u6B65\u5230 ~/.claude.json"));
       console.log();
-      console.log(chalk27.gray("\u914D\u7F6E\u6587\u4EF6:"));
-      console.log(chalk27.gray(`  - ${getClaudeConfigPath()}`));
+      console.log(chalk29.gray("\u914D\u7F6E\u6587\u4EF6:"));
+      console.log(chalk29.gray(`  - ${getClaudeConfigPath()}`));
       console.log();
     } catch (error) {
-      console.error(chalk27.red(`
+      console.error(chalk29.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -5504,25 +5939,25 @@ function addCommand3(program2) {
 
 // src/commands/mcp/list.ts
 init_dist2();
-import chalk28 from "chalk";
+import chalk30 from "chalk";
 function listCommand3(program2) {
   program2.command("list").alias("ls").description("\u5217\u51FA\u6240\u6709 MCP \u670D\u52A1\u5668").action(async () => {
     try {
       const manager = createMCPManager();
       const providers = manager.list();
       if (providers.length === 0) {
-        console.log(chalk28.yellow("\n\u26A0\uFE0F  \u6682\u65E0 MCP \u670D\u52A1\u5668\n"));
-        console.log(chalk28.blue("\u{1F4A1} \u6DFB\u52A0 MCP \u670D\u52A1\u5668:") + chalk28.white(" ccman mcp add\n"));
+        console.log(chalk30.yellow("\n\u26A0\uFE0F  \u6682\u65E0 MCP \u670D\u52A1\u5668\n"));
+        console.log(chalk30.blue("\u{1F4A1} \u6DFB\u52A0 MCP \u670D\u52A1\u5668:") + chalk30.white(" ccman mcp add\n"));
         return;
       }
-      console.log(chalk28.bold(`
+      console.log(chalk30.bold(`
 \u{1F4CB} MCP \u670D\u52A1\u5668 (${providers.length} \u4E2A)
 `));
       providers.forEach((provider) => {
         const isActive = false;
-        const indicator = isActive ? chalk28.green("\u25CF") : chalk28.gray("\u25CB");
-        const nameDisplay = chalk28.bold(provider.name);
-        const commandDisplay = chalk28.gray(`${provider.baseUrl} ${provider.apiKey}`);
+        const indicator = isActive ? chalk30.green("\u25CF") : chalk30.gray("\u25CB");
+        const nameDisplay = chalk30.bold(provider.name);
+        const commandDisplay = chalk30.gray(`${provider.baseUrl} ${provider.apiKey}`);
         console.log(`  ${indicator} ${nameDisplay}`);
         console.log(`    ${commandDisplay}`);
         if (provider.model) {
@@ -5530,17 +5965,17 @@ function listCommand3(program2) {
             const env = JSON.parse(provider.model);
             const envKeys = Object.keys(env);
             if (envKeys.length > 0) {
-              console.log(chalk28.gray(`    \u73AF\u5883\u53D8\u91CF: ${envKeys.join(", ")}`));
+              console.log(chalk30.gray(`    \u73AF\u5883\u53D8\u91CF: ${envKeys.join(", ")}`));
             }
           } catch {
           }
         }
         console.log();
       });
-      console.log(chalk28.gray("\u63D0\u793A: \u6240\u6709\u914D\u7F6E\u7684 MCP \u670D\u52A1\u5668\u4F1A\u81EA\u52A8\u540C\u6B65\u5230 ~/.claude.json"));
+      console.log(chalk30.gray("\u63D0\u793A: \u6240\u6709\u914D\u7F6E\u7684 MCP \u670D\u52A1\u5668\u4F1A\u81EA\u52A8\u540C\u6B65\u5230 ~/.claude.json"));
       console.log();
     } catch (error) {
-      console.error(chalk28.red(`
+      console.error(chalk30.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -5551,15 +5986,15 @@ function listCommand3(program2) {
 // src/commands/mcp/remove.ts
 init_dist2();
 init_confirm();
-import chalk29 from "chalk";
-import inquirer20 from "inquirer";
+import chalk31 from "chalk";
+import inquirer18 from "inquirer";
 function removeCommand3(program2) {
   program2.command("remove [name]").alias("rm").description("\u5220\u9664 MCP \u670D\u52A1\u5668").action(async (name) => {
     try {
       const manager = createMCPManager();
       const providers = manager.list();
       if (providers.length === 0) {
-        console.log(chalk29.yellow("\n\u26A0\uFE0F  \u6682\u65E0 MCP \u670D\u52A1\u5668\n"));
+        console.log(chalk31.yellow("\n\u26A0\uFE0F  \u6682\u65E0 MCP \u670D\u52A1\u5668\n"));
         return;
       }
       let targetId;
@@ -5572,7 +6007,7 @@ function removeCommand3(program2) {
         targetId = provider.id;
         targetName = provider.name;
       } else {
-        const { selectedId } = await inquirer20.prompt([
+        const { selectedId } = await inquirer18.prompt([
           {
             type: "list",
             name: "selectedId",
@@ -5589,26 +6024,26 @@ function removeCommand3(program2) {
       }
       const confirmed = await promptConfirm(`\u786E\u5B9A\u5220\u9664 "${targetName}"?`, false);
       if (!confirmed) {
-        console.log(chalk29.gray("\n\u5DF2\u53D6\u6D88\n"));
+        console.log(chalk31.gray("\n\u5DF2\u53D6\u6D88\n"));
         return;
       }
       manager.remove(targetId);
       console.log();
-      console.log(chalk29.green(`\u2705 \u5DF2\u5220\u9664: ${targetName}`));
+      console.log(chalk31.green(`\u2705 \u5DF2\u5220\u9664: ${targetName}`));
       console.log();
-      console.log(chalk29.green("\u2705 \u914D\u7F6E\u5DF2\u81EA\u52A8\u540C\u6B65\u5230 ~/.claude.json"));
+      console.log(chalk31.green("\u2705 \u914D\u7F6E\u5DF2\u81EA\u52A8\u540C\u6B65\u5230 ~/.claude.json"));
       console.log();
-      console.log(chalk29.gray("\u914D\u7F6E\u6587\u4EF6:"));
-      console.log(chalk29.gray(`  - ${getClaudeConfigPath()}`));
+      console.log(chalk31.gray("\u914D\u7F6E\u6587\u4EF6:"));
+      console.log(chalk31.gray(`  - ${getClaudeConfigPath()}`));
       console.log();
     } catch (error) {
       if (error instanceof ProviderNotFoundError) {
-        console.error(chalk29.red(`
+        console.error(chalk31.red(`
 \u274C MCP \u670D\u52A1\u5668\u4E0D\u5B58\u5728
 `));
-        console.log(chalk29.blue("\u{1F4A1} \u67E5\u770B\u6240\u6709 MCP \u670D\u52A1\u5668:") + chalk29.white(" ccman mcp list\n"));
+        console.log(chalk31.blue("\u{1F4A1} \u67E5\u770B\u6240\u6709 MCP \u670D\u52A1\u5668:") + chalk31.white(" ccman mcp list\n"));
       } else {
-        console.error(chalk29.red(`
+        console.error(chalk31.red(`
 \u274C ${error.message}
 `));
       }
@@ -5619,15 +6054,15 @@ function removeCommand3(program2) {
 
 // src/commands/mcp/edit.ts
 init_dist2();
-import chalk30 from "chalk";
-import inquirer21 from "inquirer";
+import chalk32 from "chalk";
+import inquirer19 from "inquirer";
 function editCommand3(program2) {
   program2.command("edit [name]").description("\u7F16\u8F91 MCP \u670D\u52A1\u5668").action(async (name) => {
     try {
       const manager = createMCPManager();
       const providers = manager.list();
       if (providers.length === 0) {
-        console.log(chalk30.yellow("\n\u26A0\uFE0F  \u6682\u65E0 MCP \u670D\u52A1\u5668\n"));
+        console.log(chalk32.yellow("\n\u26A0\uFE0F  \u6682\u65E0 MCP \u670D\u52A1\u5668\n"));
         return;
       }
       let targetId;
@@ -5638,7 +6073,7 @@ function editCommand3(program2) {
         }
         targetId = provider2.id;
       } else {
-        const { selectedId } = await inquirer21.prompt([
+        const { selectedId } = await inquirer19.prompt([
           {
             type: "list",
             name: "selectedId",
@@ -5655,9 +6090,9 @@ function editCommand3(program2) {
       const currentCommand6 = provider.baseUrl;
       const currentArgs = provider.apiKey;
       const currentEnv = provider.model;
-      console.log(chalk30.bold("\n\u270F\uFE0F  \u7F16\u8F91 MCP \u670D\u52A1\u5668\n"));
-      console.log(chalk30.gray("\u63D0\u793A: \u7559\u7A7A\u5219\u4FDD\u6301\u539F\u503C\n"));
-      const answers = await inquirer21.prompt([
+      console.log(chalk32.bold("\n\u270F\uFE0F  \u7F16\u8F91 MCP \u670D\u52A1\u5668\n"));
+      console.log(chalk32.gray("\u63D0\u793A: \u7559\u7A7A\u5219\u4FDD\u6301\u539F\u503C\n"));
+      const answers = await inquirer19.prompt([
         {
           type: "input",
           name: "name",
@@ -5697,30 +6132,30 @@ function editCommand3(program2) {
         updates.model = answers.env || void 0;
       }
       if (Object.keys(updates).length === 0) {
-        console.log(chalk30.gray("\n\u672A\u505A\u4EFB\u4F55\u4FEE\u6539\n"));
+        console.log(chalk32.gray("\n\u672A\u505A\u4EFB\u4F55\u4FEE\u6539\n"));
         return;
       }
       const updated = manager.edit(targetId, updates);
       console.log();
-      console.log(chalk30.green("\u2705 \u7F16\u8F91\u6210\u529F"));
+      console.log(chalk32.green("\u2705 \u7F16\u8F91\u6210\u529F"));
       console.log();
-      console.log(`  ${chalk30.bold(updated.name)} ${chalk30.blue("[MCP]")}`);
-      console.log(`  ${chalk30.gray(`\u547D\u4EE4: ${updated.baseUrl} ${updated.apiKey}`)}`);
+      console.log(`  ${chalk32.bold(updated.name)} ${chalk32.blue("[MCP]")}`);
+      console.log(`  ${chalk32.gray(`\u547D\u4EE4: ${updated.baseUrl} ${updated.apiKey}`)}`);
       if (updated.model) {
         try {
           const env = JSON.parse(updated.model);
-          console.log(chalk30.gray(`  \u73AF\u5883\u53D8\u91CF: ${Object.keys(env).join(", ")}`));
+          console.log(chalk32.gray(`  \u73AF\u5883\u53D8\u91CF: ${Object.keys(env).join(", ")}`));
         } catch {
         }
       }
       console.log();
-      console.log(chalk30.green("\u2705 \u914D\u7F6E\u5DF2\u81EA\u52A8\u540C\u6B65\u5230 ~/.claude.json"));
+      console.log(chalk32.green("\u2705 \u914D\u7F6E\u5DF2\u81EA\u52A8\u540C\u6B65\u5230 ~/.claude.json"));
       console.log();
-      console.log(chalk30.gray("\u914D\u7F6E\u6587\u4EF6:"));
-      console.log(chalk30.gray(`  - ${getClaudeConfigPath()}`));
+      console.log(chalk32.gray("\u914D\u7F6E\u6587\u4EF6:"));
+      console.log(chalk32.gray(`  - ${getClaudeConfigPath()}`));
       console.log();
     } catch (error) {
-      console.error(chalk30.red(`
+      console.error(chalk32.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -5738,15 +6173,38 @@ function createMCPCommands(program2) {
 
 // src/commands/gemini/add.ts
 init_dist2();
-import chalk31 from "chalk";
-import inquirer22 from "inquirer";
+import chalk33 from "chalk";
+import inquirer20 from "inquirer";
 init_confirm();
 function addCommand4(program2) {
-  program2.command("add").description("\u6DFB\u52A0\u65B0\u7684 Gemini CLI \u670D\u52A1\u5546(\u4EA4\u4E92\u5F0F)").action(async () => {
+  const command = program2.command("add").description("\u6DFB\u52A0\u65B0\u7684 Gemini CLI \u670D\u52A1\u5546");
+  addProviderAddOptions(command);
+  command.action(async (options) => {
     try {
       const manager = createGeminiManager();
-      console.log(chalk31.bold("\n\u{1F4DD} \u6DFB\u52A0 Gemini CLI \u670D\u52A1\u5546\n"));
-      const { usePreset } = await inquirer22.prompt([
+      console.log(chalk33.bold("\n\u{1F4DD} \u6DFB\u52A0 Gemini CLI \u670D\u52A1\u5546\n"));
+      const resolved = resolveProviderAddInput(options, GEMINI_PRESETS, {
+        allowEmptyBaseUrl: true,
+        allowEmptyApiKey: true
+      });
+      if (resolved.nonInteractive && resolved.input) {
+        const provider2 = manager.add(resolved.input);
+        printSuccess("\u6DFB\u52A0\u6210\u529F", [
+          `${chalk33.bold(provider2.name)} ${toolBadge("gemini")}`,
+          chalk33.gray(provider2.baseUrl || "(\u4F7F\u7528\u9ED8\u8BA4\u7AEF\u70B9)")
+        ]);
+        if (resolved.switchNow) {
+          manager.switch(provider2.id);
+          printSuccess("\u5DF2\u5207\u6362\u5230\u65B0\u670D\u52A1\u5546", [
+            chalk33.gray(`\u914D\u7F6E\u5DF2\u66F4\u65B0: ${getGeminiSettingsPath()}`),
+            chalk33.gray(`\u914D\u7F6E\u5DF2\u66F4\u65B0: ${getGeminiEnvPath()}`)
+          ]);
+        } else {
+          printTip(`\u7A0D\u540E\u5207\u6362: ${chalk33.white(`ccman gm use "${provider2.name}"`)}`);
+        }
+        return;
+      }
+      const { usePreset } = await inquirer20.prompt([
         {
           type: "list",
           name: "usePreset",
@@ -5762,7 +6220,7 @@ function addCommand4(program2) {
       let baseUrl;
       let apiKey;
       if (usePreset) {
-        const { presetName } = await inquirer22.prompt([
+        const { presetName } = await inquirer20.prompt([
           {
             type: "list",
             name: "presetName",
@@ -5774,7 +6232,7 @@ function addCommand4(program2) {
           }
         ]);
         const preset = GEMINI_PRESETS.find((p) => p.name === presetName);
-        console.log(chalk31.blue(`
+        console.log(chalk33.blue(`
 \u4F7F\u7528\u9884\u8BBE: ${preset.name} - ${preset.description}
 `));
         const input = await promptProviderForm({
@@ -5788,7 +6246,7 @@ function addCommand4(program2) {
         baseUrl = input.baseUrl;
         apiKey = input.apiKey;
       } else {
-        const answers = await inquirer22.prompt([
+        const answers = await inquirer20.prompt([
           {
             type: "input",
             name: "name",
@@ -5823,25 +6281,22 @@ function addCommand4(program2) {
         apiKey = answers.apiKey || "";
       }
       const provider = manager.add({ name, desc, baseUrl, apiKey });
-      console.log();
-      console.log(chalk31.green("\u2705 \u6DFB\u52A0\u6210\u529F"));
-      console.log();
-      console.log(`  ${chalk31.bold(provider.name)} ${chalk31.blue("[Gemini CLI]")}`);
-      console.log(`  ${chalk31.gray(provider.baseUrl || "(\u4F7F\u7528\u9ED8\u8BA4\u7AEF\u70B9)")}`);
-      console.log();
+      printSuccess("\u6DFB\u52A0\u6210\u529F", [
+        `${chalk33.bold(provider.name)} ${toolBadge("gemini")}`,
+        chalk33.gray(provider.baseUrl || "(\u4F7F\u7528\u9ED8\u8BA4\u7AEF\u70B9)")
+      ]);
       const switchNow = await promptConfirm("\u662F\u5426\u7ACB\u5373\u5207\u6362\u5230\u6B64\u670D\u52A1\u5546?", true);
       if (switchNow) {
         manager.switch(provider.id);
-        console.log(chalk31.green("\u2705 \u5DF2\u5207\u6362\u5230\u65B0\u670D\u52A1\u5546"));
-        console.log();
-        console.log(chalk31.gray("\u914D\u7F6E\u5DF2\u66F4\u65B0:"));
-        console.log(chalk31.gray(`  - ${getGeminiSettingsPath()}`));
-        console.log(chalk31.gray(`  - ${getGeminiEnvPath()}`));
+        printSuccess("\u5DF2\u5207\u6362\u5230\u65B0\u670D\u52A1\u5546", [
+          chalk33.gray(`\u914D\u7F6E\u5DF2\u66F4\u65B0: ${getGeminiSettingsPath()}`),
+          chalk33.gray(`\u914D\u7F6E\u5DF2\u66F4\u65B0: ${getGeminiEnvPath()}`)
+        ]);
       } else {
-        console.log(chalk31.blue("\u{1F4A1} \u7A0D\u540E\u5207\u6362:") + chalk31.white(` ccman gm use "${provider.name}"`));
+        printTip(`\u7A0D\u540E\u5207\u6362: ${chalk33.white(`ccman gm use "${provider.name}"`)}`);
       }
     } catch (error) {
-      console.error(chalk31.red(`
+      console.error(chalk33.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -5851,7 +6306,7 @@ function addCommand4(program2) {
 
 // src/commands/gemini/list.ts
 init_dist2();
-import chalk32 from "chalk";
+import chalk34 from "chalk";
 function listCommand4(program2) {
   program2.command("list").alias("ls").description("\u5217\u51FA\u6240\u6709 Gemini CLI \u670D\u52A1\u5546").action(async () => {
     try {
@@ -5859,15 +6314,15 @@ function listCommand4(program2) {
       const providers = manager.list();
       const current = manager.getCurrent();
       if (providers.length === 0) {
-        console.log(chalk32.yellow("\n\u26A0\uFE0F  \u6682\u65E0 Gemini CLI \u670D\u52A1\u5546\n"));
-        console.log(chalk32.blue("\u{1F4A1} \u6DFB\u52A0\u670D\u52A1\u5546:") + chalk32.white(" ccman gm add\n"));
+        printWarning("\u6682\u65E0 Gemini CLI \u670D\u52A1\u5546");
+        printTip("\u6DFB\u52A0\u670D\u52A1\u5546: " + chalk34.white("ccman gm add"));
         return;
       }
-      console.log(chalk32.bold(`
-\u{1F4CB} Gemini CLI \u670D\u52A1\u5546 (${providers.length} \u4E2A)`));
-      console.log(formatProviderTable(providers, current?.id));
+      console.log(
+        formatProviderTable(providers, current?.id, `Gemini CLI \u670D\u52A1\u5546 (${providers.length} \u4E2A)`)
+      );
     } catch (error) {
-      console.error(chalk32.red(`
+      console.error(chalk34.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -5877,16 +6332,16 @@ function listCommand4(program2) {
 
 // src/commands/gemini/use.ts
 init_dist2();
-import chalk33 from "chalk";
-import inquirer23 from "inquirer";
+import chalk35 from "chalk";
+import inquirer21 from "inquirer";
 function useCommand3(program2) {
   program2.command("use [name]").description("\u5207\u6362 Gemini CLI \u670D\u52A1\u5546").action(async (name) => {
     try {
       const manager = createGeminiManager();
       const providers = manager.list();
       if (providers.length === 0) {
-        console.log(chalk33.yellow("\n\u26A0\uFE0F  \u6682\u65E0 Gemini CLI \u670D\u52A1\u5546\n"));
-        console.log(chalk33.blue("\u{1F4A1} \u6DFB\u52A0\u670D\u52A1\u5546:") + chalk33.white(" ccman gm add\n"));
+        printWarning("\u6682\u65E0 Gemini CLI \u670D\u52A1\u5546");
+        printTip("\u6DFB\u52A0\u670D\u52A1\u5546: " + chalk35.white("ccman gm add"));
         return;
       }
       let targetId;
@@ -5897,7 +6352,7 @@ function useCommand3(program2) {
         }
         targetId = provider2.id;
       } else {
-        const { selectedId } = await inquirer23.prompt([
+        const { selectedId } = await inquirer21.prompt([
           {
             type: "list",
             name: "selectedId",
@@ -5912,24 +6367,20 @@ function useCommand3(program2) {
       }
       manager.switch(targetId);
       const provider = manager.get(targetId);
-      console.log();
-      console.log(chalk33.green("\u2705 \u5207\u6362\u6210\u529F"));
-      console.log();
-      console.log(`  ${chalk33.bold(provider.name)} ${chalk33.blue("[Gemini CLI]")}`);
-      console.log(`  ${chalk33.gray(`URL: ${provider.baseUrl || "(\u9ED8\u8BA4\u7AEF\u70B9)"}`)}`);
-      console.log();
-      console.log(chalk33.gray("\u914D\u7F6E\u5DF2\u66F4\u65B0:"));
-      console.log(chalk33.gray(`  - ${getGeminiSettingsPath()}`));
-      console.log(chalk33.gray(`  - ${getGeminiEnvPath()}`));
-      console.log();
+      printSuccess("\u5207\u6362\u6210\u529F", [
+        `${chalk35.bold(provider.name)} ${toolBadge("gemini")}`,
+        chalk35.gray(`URL: ${provider.baseUrl || "(\u9ED8\u8BA4\u7AEF\u70B9)"}`),
+        chalk35.gray(`\u914D\u7F6E\u5DF2\u66F4\u65B0: ${getGeminiSettingsPath()}`),
+        chalk35.gray(`\u914D\u7F6E\u5DF2\u66F4\u65B0: ${getGeminiEnvPath()}`)
+      ]);
     } catch (error) {
       if (error instanceof ProviderNotFoundError) {
-        console.error(chalk33.red(`
+        console.error(chalk35.red(`
 \u274C \u670D\u52A1\u5546\u4E0D\u5B58\u5728: ${error.message}
 `));
-        console.log(chalk33.blue("\u{1F4A1} \u67E5\u770B\u6240\u6709\u670D\u52A1\u5546:") + chalk33.white(" ccman gm list\n"));
+        console.log(chalk35.blue("\u{1F4A1} \u67E5\u770B\u6240\u6709\u670D\u52A1\u5546:") + chalk35.white(" ccman gm list\n"));
       } else {
-        console.error(chalk33.red(`
+        console.error(chalk35.red(`
 \u274C ${error.message}
 `));
       }
@@ -5940,23 +6391,30 @@ function useCommand3(program2) {
 
 // src/commands/gemini/current.ts
 init_dist2();
-import chalk34 from "chalk";
+import chalk36 from "chalk";
 function currentCommand3(program2) {
   program2.command("current").description("\u663E\u793A\u5F53\u524D Gemini CLI \u670D\u52A1\u5546").action(async () => {
     try {
       const manager = createGeminiManager();
       const current = manager.getCurrent();
       if (!current) {
-        console.log(chalk34.yellow("\n\u26A0\uFE0F  \u5F53\u524D\u6CA1\u6709\u6FC0\u6D3B\u7684 Gemini CLI \u670D\u52A1\u5546\n"));
-        console.log(chalk34.blue("\u{1F4A1} \u5217\u51FA\u670D\u52A1\u5546:") + chalk34.white(" ccman gm list\n"));
+        printWarning("\u672A\u9009\u62E9\u4EFB\u4F55 Gemini CLI \u670D\u52A1\u5546");
+        printTip("\u9009\u62E9\u670D\u52A1\u5546: " + chalk36.white("ccman gm use"));
         return;
       }
-      console.log(chalk34.bold("\n\u{1F3AF} \u5F53\u524D Gemini CLI \u670D\u52A1\u5546\n"));
-      console.log(`  \u540D\u79F0: ${chalk34.bold(current.name)}`);
-      console.log(`  \u5730\u5740: ${chalk34.gray(current.baseUrl || "(\u9ED8\u8BA4\u7AEF\u70B9)")}`);
-      console.log();
+      const lines = [
+        chalk36.green.bold(current.name),
+        chalk36.gray(`ID: ${current.id}`),
+        chalk36.gray(`URL: ${current.baseUrl || "(\u9ED8\u8BA4\u7AEF\u70B9)"}`)
+      ];
+      if (current.lastUsedAt) {
+        lines.push(
+          chalk36.gray(`\u6700\u540E\u4F7F\u7528: ${new Date(current.lastUsedAt).toLocaleString("zh-CN")}`)
+        );
+      }
+      printInfo("\u{1F4CD} \u5F53\u524D Gemini CLI \u670D\u52A1\u5546", lines);
     } catch (error) {
-      console.error(chalk34.red(`
+      console.error(chalk36.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -5966,17 +6424,18 @@ function currentCommand3(program2) {
 
 // src/commands/gemini/remove.ts
 init_dist2();
-init_confirm();
-import chalk35 from "chalk";
-import inquirer24 from "inquirer";
+import chalk37 from "chalk";
+import inquirer22 from "inquirer";
 function removeCommand4(program2) {
-  program2.command("remove [name]").alias("rm").description("\u5220\u9664 Gemini CLI \u670D\u52A1\u5546").action(async (name) => {
+  const command = program2.command("remove [name]").alias("rm").description("\u5220\u9664 Gemini CLI \u670D\u52A1\u5546");
+  addProviderRemoveOptions(command);
+  command.action(async (name, options) => {
     try {
       const manager = createGeminiManager();
       const providers = manager.list();
       if (providers.length === 0) {
-        console.log(chalk35.yellow("\n\u26A0\uFE0F  \u6682\u65E0 Gemini CLI \u670D\u52A1\u5546\n"));
-        console.log(chalk35.blue("\u{1F4A1} \u6DFB\u52A0\u670D\u52A1\u5546:") + chalk35.white(" ccman gm add\n"));
+        console.log(chalk37.yellow("\n\u26A0\uFE0F  \u6682\u65E0 Gemini CLI \u670D\u52A1\u5546\n"));
+        console.log(chalk37.blue("\u{1F4A1} \u6DFB\u52A0\u670D\u52A1\u5546:") + chalk37.white(" ccman gm add\n"));
         return;
       }
       let targetId;
@@ -5984,15 +6443,14 @@ function removeCommand4(program2) {
       if (name) {
         const provider = manager.findByName(name);
         if (!provider) {
-          console.log(chalk35.red(`
-\u274C \u670D\u52A1\u5546\u4E0D\u5B58\u5728: ${name}
-`));
-          process.exit(1);
+          throw new ProviderNotFoundError(name);
         }
         targetId = provider.id;
         targetName = provider.name;
+      } else if (options.yes) {
+        throw new Error("\u975E\u4EA4\u4E92\u6A21\u5F0F\u8BF7\u63D0\u4F9B\u8981\u5220\u9664\u7684\u670D\u52A1\u5546\u540D\u79F0");
       } else {
-        const { selectedId } = await inquirer24.prompt([
+        const { selectedId } = await inquirer22.prompt([
           {
             type: "list",
             name: "selectedId",
@@ -6007,17 +6465,23 @@ function removeCommand4(program2) {
         targetId = provider.id;
         targetName = provider.name;
       }
-      const confirm = await promptConfirm(`\u786E\u5B9A\u8981\u5220\u9664\u670D\u52A1\u5546 "${targetName}" \u5417\uFF1F`, false);
+      const confirm = await confirmProviderRemoval(targetName, options);
       if (!confirm) {
-        console.log(chalk35.gray("\n\u5DF2\u53D6\u6D88\u5220\u9664\n"));
+        console.log(chalk37.gray("\n\u5DF2\u53D6\u6D88\u5220\u9664\n"));
         return;
       }
       manager.remove(targetId);
-      console.log(chalk35.green("\n\u2705 \u5DF2\u5220\u9664\u670D\u52A1\u5546\n"));
+      console.log(chalk37.green("\n\u2705 \u5DF2\u5220\u9664\u670D\u52A1\u5546\n"));
     } catch (error) {
-      console.error(chalk35.red(`
+      if (error instanceof ProviderNotFoundError) {
+        console.error(chalk37.red(`
+\u274C \u670D\u52A1\u5546\u4E0D\u5B58\u5728: ${name}
+`));
+      } else {
+        console.error(chalk37.red(`
 \u274C ${error.message}
 `));
+      }
       process.exit(1);
     }
   });
@@ -6025,30 +6489,35 @@ function removeCommand4(program2) {
 
 // src/commands/gemini/edit.ts
 init_dist2();
-import chalk36 from "chalk";
-import inquirer25 from "inquirer";
+import chalk38 from "chalk";
+import inquirer23 from "inquirer";
 function editCommand4(program2) {
-  program2.command("edit [name]").description("\u7F16\u8F91 Gemini CLI \u670D\u52A1\u5546").action(async (name) => {
+  const command = program2.command("edit [name]").description("\u7F16\u8F91 Gemini CLI \u670D\u52A1\u5546");
+  addProviderEditOptions(command);
+  command.action(async (name, options) => {
     try {
       const manager = createGeminiManager();
       const providers = manager.list();
       if (providers.length === 0) {
-        console.log(chalk36.yellow("\n\u26A0\uFE0F  \u6682\u65E0 Gemini CLI \u670D\u52A1\u5546\n"));
-        console.log(chalk36.blue("\u{1F4A1} \u6DFB\u52A0\u670D\u52A1\u5546:") + chalk36.white(" ccman gm add\n"));
+        console.log(chalk38.yellow("\n\u26A0\uFE0F  \u6682\u65E0 Gemini CLI \u670D\u52A1\u5546\n"));
+        console.log(chalk38.blue("\u{1F4A1} \u6DFB\u52A0\u670D\u52A1\u5546:") + chalk38.white(" ccman gm add\n"));
         return;
       }
+      const resolved = resolveProviderEditInput(options, {
+        allowEmptyBaseUrl: true,
+        allowEmptyApiKey: true
+      });
       let targetId;
       if (name) {
         const provider2 = manager.findByName(name);
         if (!provider2) {
-          console.log(chalk36.red(`
-\u274C \u670D\u52A1\u5546\u4E0D\u5B58\u5728: ${name}
-`));
-          process.exit(1);
+          throw new ProviderNotFoundError(name);
         }
         targetId = provider2.id;
+      } else if (resolved.nonInteractive) {
+        throw new Error("\u975E\u4EA4\u4E92\u6A21\u5F0F\u8BF7\u63D0\u4F9B\u8981\u7F16\u8F91\u7684\u670D\u52A1\u5546\u540D\u79F0");
       } else {
-        const { selectedId } = await inquirer25.prompt([
+        const { selectedId } = await inquirer23.prompt([
           {
             type: "list",
             name: "selectedId",
@@ -6062,6 +6531,15 @@ function editCommand4(program2) {
         targetId = selectedId;
       }
       const provider = manager.get(targetId);
+      if (resolved.nonInteractive) {
+        if (Object.keys(resolved.updates).length === 0) {
+          console.log(chalk38.gray("\n\u672A\u505A\u4EFB\u4F55\u4FEE\u6539\n"));
+          return;
+        }
+        manager.edit(targetId, resolved.updates);
+        console.log(chalk38.green("\n\u2705 \u7F16\u8F91\u6210\u529F\n"));
+        return;
+      }
       const input = await promptProviderForm({
         name: provider.name,
         desc: provider.desc ?? "",
@@ -6074,11 +6552,17 @@ function editCommand4(program2) {
         baseUrl: input.baseUrl,
         apiKey: input.apiKey
       });
-      console.log(chalk36.green("\n\u2705 \u7F16\u8F91\u6210\u529F\n"));
+      console.log(chalk38.green("\n\u2705 \u7F16\u8F91\u6210\u529F\n"));
     } catch (error) {
-      console.error(chalk36.red(`
+      if (error instanceof ProviderNotFoundError) {
+        console.error(chalk38.red(`
+\u274C \u670D\u52A1\u5546\u4E0D\u5B58\u5728: ${name}
+`));
+      } else {
+        console.error(chalk38.red(`
 \u274C ${error.message}
 `));
+      }
       process.exit(1);
     }
   });
@@ -6086,30 +6570,30 @@ function editCommand4(program2) {
 
 // src/commands/gemini/clone.ts
 init_dist2();
-import chalk37 from "chalk";
-import inquirer26 from "inquirer";
+import chalk39 from "chalk";
+import inquirer24 from "inquirer";
 function cloneCommand3(program2) {
   program2.command("clone [name]").description("\u514B\u9686 Gemini CLI \u670D\u52A1\u5546").action(async (name) => {
     try {
       const manager = createGeminiManager();
       const providers = manager.list();
       if (providers.length === 0) {
-        console.log(chalk37.yellow("\n\u26A0\uFE0F  \u6682\u65E0 Gemini CLI \u670D\u52A1\u5546\n"));
-        console.log(chalk37.blue("\u{1F4A1} \u6DFB\u52A0\u670D\u52A1\u5546:") + chalk37.white(" ccman gm add\n"));
+        console.log(chalk39.yellow("\n\u26A0\uFE0F  \u6682\u65E0 Gemini CLI \u670D\u52A1\u5546\n"));
+        console.log(chalk39.blue("\u{1F4A1} \u6DFB\u52A0\u670D\u52A1\u5546:") + chalk39.white(" ccman gm add\n"));
         return;
       }
       let sourceId;
       if (name) {
         const provider = manager.findByName(name);
         if (!provider) {
-          console.log(chalk37.red(`
+          console.log(chalk39.red(`
 \u274C \u670D\u52A1\u5546\u4E0D\u5B58\u5728: ${name}
 `));
           process.exit(1);
         }
         sourceId = provider.id;
       } else {
-        const { selectedId } = await inquirer26.prompt([
+        const { selectedId } = await inquirer24.prompt([
           {
             type: "list",
             name: "selectedId",
@@ -6122,7 +6606,7 @@ function cloneCommand3(program2) {
         ]);
         sourceId = selectedId;
       }
-      const { newName } = await inquirer26.prompt([
+      const { newName } = await inquirer24.prompt([
         {
           type: "input",
           name: "newName",
@@ -6135,13 +6619,13 @@ function cloneCommand3(program2) {
       ]);
       const newProvider = manager.clone(sourceId, newName);
       console.log();
-      console.log(chalk37.green("\u2705 \u514B\u9686\u6210\u529F"));
+      console.log(chalk39.green("\u2705 \u514B\u9686\u6210\u529F"));
       console.log();
-      console.log(`  ${chalk37.bold(newProvider.name)} ${chalk37.blue("[Gemini CLI]")}`);
-      console.log(`  ${chalk37.gray(newProvider.baseUrl || "(\u9ED8\u8BA4\u7AEF\u70B9)")}`);
+      console.log(`  ${chalk39.bold(newProvider.name)} ${chalk39.blue("[Gemini CLI]")}`);
+      console.log(`  ${chalk39.gray(newProvider.baseUrl || "(\u9ED8\u8BA4\u7AEF\u70B9)")}`);
       console.log();
     } catch (error) {
-      console.error(chalk37.red(`
+      console.error(chalk39.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -6162,15 +6646,32 @@ function createGeminiCommands(program2) {
 
 // src/commands/opencode/add.ts
 init_dist2();
-import chalk38 from "chalk";
-import inquirer27 from "inquirer";
+import chalk40 from "chalk";
+import inquirer25 from "inquirer";
 init_confirm();
 function addCommand5(program2) {
-  program2.command("add").description("\u6DFB\u52A0\u65B0\u7684 OpenCode \u670D\u52A1\u5546(\u4EA4\u4E92\u5F0F)").action(async () => {
+  const command = program2.command("add").description("\u6DFB\u52A0\u65B0\u7684 OpenCode \u670D\u52A1\u5546");
+  addProviderAddOptions(command);
+  command.action(async (options) => {
     try {
       const manager = createOpenCodeManager();
-      console.log(chalk38.bold("\n\u{1F4DD} \u6DFB\u52A0 OpenCode \u670D\u52A1\u5546\n"));
-      const { usePreset } = await inquirer27.prompt([
+      console.log(chalk40.bold("\n\u{1F4DD} \u6DFB\u52A0 OpenCode \u670D\u52A1\u5546\n"));
+      const resolved = resolveProviderAddInput(options, OPENCODE_PRESETS);
+      if (resolved.nonInteractive && resolved.input) {
+        const provider2 = manager.add(resolved.input);
+        printSuccess("\u6DFB\u52A0\u6210\u529F", [
+          `${chalk40.bold(provider2.name)} ${toolBadge("opencode")}`,
+          chalk40.gray(provider2.baseUrl)
+        ]);
+        if (resolved.switchNow) {
+          manager.switch(provider2.id);
+          printSuccess("\u5DF2\u5207\u6362\u5230\u65B0\u670D\u52A1\u5546", [chalk40.gray(`\u914D\u7F6E\u5DF2\u66F4\u65B0: ${getOpenCodeConfigPath()}`)]);
+        } else {
+          printTip(`\u7A0D\u540E\u5207\u6362: ${chalk40.white(`ccman oc use "${provider2.name}"`)}`);
+        }
+        return;
+      }
+      const { usePreset } = await inquirer25.prompt([
         {
           type: "list",
           name: "usePreset",
@@ -6186,7 +6687,7 @@ function addCommand5(program2) {
       let baseUrl;
       let apiKey;
       if (usePreset) {
-        const { presetName } = await inquirer27.prompt([
+        const { presetName } = await inquirer25.prompt([
           {
             type: "list",
             name: "presetName",
@@ -6198,7 +6699,7 @@ function addCommand5(program2) {
           }
         ]);
         const preset = OPENCODE_PRESETS.find((p) => p.name === presetName);
-        console.log(chalk38.blue(`
+        console.log(chalk40.blue(`
 \u4F7F\u7528\u9884\u8BBE: ${preset.name} - ${preset.description}
 `));
         const input = await promptProviderForm({
@@ -6212,7 +6713,7 @@ function addCommand5(program2) {
         baseUrl = input.baseUrl;
         apiKey = input.apiKey;
       } else {
-        const answers = await inquirer27.prompt([
+        const answers = await inquirer25.prompt([
           {
             type: "input",
             name: "name",
@@ -6250,24 +6751,19 @@ function addCommand5(program2) {
         baseUrl,
         apiKey
       });
-      console.log();
-      console.log(chalk38.green("\u2705 \u6DFB\u52A0\u6210\u529F"));
-      console.log();
-      console.log(`  ${chalk38.bold(provider.name)} ${chalk38.blue("[OpenCode]")}`);
-      console.log(`  ${chalk38.gray(provider.baseUrl)}`);
-      console.log();
+      printSuccess("\u6DFB\u52A0\u6210\u529F", [
+        `${chalk40.bold(provider.name)} ${toolBadge("opencode")}`,
+        chalk40.gray(provider.baseUrl)
+      ]);
       const switchNow = await promptConfirm("\u662F\u5426\u7ACB\u5373\u5207\u6362\u5230\u6B64\u670D\u52A1\u5546?", true);
       if (switchNow) {
         manager.switch(provider.id);
-        console.log(chalk38.green("\u2705 \u5DF2\u5207\u6362\u5230\u65B0\u670D\u52A1\u5546"));
-        console.log();
-        console.log(chalk38.gray("\u914D\u7F6E\u5DF2\u66F4\u65B0:"));
-        console.log(chalk38.gray(`  - ${getOpenCodeConfigPath()}`));
+        printSuccess("\u5DF2\u5207\u6362\u5230\u65B0\u670D\u52A1\u5546", [chalk40.gray(`\u914D\u7F6E\u5DF2\u66F4\u65B0: ${getOpenCodeConfigPath()}`)]);
       } else {
-        console.log(chalk38.blue("\u{1F4A1} \u7A0D\u540E\u5207\u6362:") + chalk38.white(` ccman oc use "${provider.name}"`));
+        printTip(`\u7A0D\u540E\u5207\u6362: ${chalk40.white(`ccman oc use "${provider.name}"`)}`);
       }
     } catch (error) {
-      console.error(chalk38.red(`
+      console.error(chalk40.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -6277,7 +6773,7 @@ function addCommand5(program2) {
 
 // src/commands/opencode/list.ts
 init_dist2();
-import chalk39 from "chalk";
+import chalk41 from "chalk";
 function listCommand5(program2) {
   program2.command("list").alias("ls").description("\u5217\u51FA\u6240\u6709 OpenCode \u670D\u52A1\u5546").action(async () => {
     try {
@@ -6285,15 +6781,15 @@ function listCommand5(program2) {
       const providers = manager.list();
       const current = manager.getCurrent();
       if (providers.length === 0) {
-        console.log(chalk39.yellow("\n\u26A0\uFE0F  \u6682\u65E0 OpenCode \u670D\u52A1\u5546\n"));
-        console.log(chalk39.blue("\u{1F4A1} \u6DFB\u52A0\u670D\u52A1\u5546:") + chalk39.white(" ccman oc add\n"));
+        printWarning("\u6682\u65E0 OpenCode \u670D\u52A1\u5546");
+        printTip("\u6DFB\u52A0\u670D\u52A1\u5546: " + chalk41.white("ccman oc add"));
         return;
       }
-      console.log(chalk39.bold(`
-\u{1F4CB} OpenCode \u670D\u52A1\u5546 (${providers.length} \u4E2A)`));
-      console.log(formatProviderTable(providers, current?.id));
+      console.log(
+        formatProviderTable(providers, current?.id, `OpenCode \u670D\u52A1\u5546 (${providers.length} \u4E2A)`)
+      );
     } catch (error) {
-      console.error(chalk39.red(`
+      console.error(chalk41.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -6303,16 +6799,16 @@ function listCommand5(program2) {
 
 // src/commands/opencode/use.ts
 init_dist2();
-import chalk40 from "chalk";
-import inquirer28 from "inquirer";
+import chalk42 from "chalk";
+import inquirer26 from "inquirer";
 function useCommand4(program2) {
   program2.command("use [name]").description("\u5207\u6362 OpenCode \u670D\u52A1\u5546").action(async (name) => {
     try {
       const manager = createOpenCodeManager();
       const providers = manager.list();
       if (providers.length === 0) {
-        console.log(chalk40.yellow("\n\u26A0\uFE0F  \u6682\u65E0 OpenCode \u670D\u52A1\u5546\n"));
-        console.log(chalk40.blue("\u{1F4A1} \u6DFB\u52A0\u670D\u52A1\u5546:") + chalk40.white(" ccman oc add\n"));
+        printWarning("\u6682\u65E0 OpenCode \u670D\u52A1\u5546");
+        printTip("\u6DFB\u52A0\u670D\u52A1\u5546: " + chalk42.white("ccman oc add"));
         return;
       }
       let targetId;
@@ -6323,7 +6819,7 @@ function useCommand4(program2) {
         }
         targetId = provider2.id;
       } else {
-        const { selectedId } = await inquirer28.prompt([
+        const { selectedId } = await inquirer26.prompt([
           {
             type: "list",
             name: "selectedId",
@@ -6338,19 +6834,18 @@ function useCommand4(program2) {
       }
       manager.switch(targetId);
       const provider = manager.get(targetId);
-      console.log(chalk40.green("\n\u2705 \u5207\u6362\u6210\u529F\n"));
-      console.log(`  ${chalk40.bold(provider.name)} ${chalk40.blue("[OpenCode]")}`);
-      console.log(`  ${chalk40.gray(`URL: ${provider.baseUrl}`)}`);
-      console.log();
-      console.log(chalk40.gray("\u914D\u7F6E\u5DF2\u66F4\u65B0:"));
-      console.log(chalk40.gray(`  - ${getOpenCodeConfigPath()}`));
+      printSuccess("\u5207\u6362\u6210\u529F", [
+        `${chalk42.bold(provider.name)} ${toolBadge("opencode")}`,
+        chalk42.gray(`URL: ${provider.baseUrl}`),
+        chalk42.gray(`\u914D\u7F6E\u5DF2\u66F4\u65B0: ${getOpenCodeConfigPath()}`)
+      ]);
     } catch (error) {
       if (error instanceof ProviderNotFoundError) {
-        console.error(chalk40.red(`
+        console.error(chalk42.red(`
 \u274C \u670D\u52A1\u5546\u4E0D\u5B58\u5728: ${name}
 `));
       } else {
-        console.error(chalk40.red(`
+        console.error(chalk42.red(`
 \u274C ${error.message}
 `));
       }
@@ -6361,23 +6856,30 @@ function useCommand4(program2) {
 
 // src/commands/opencode/current.ts
 init_dist2();
-import chalk41 from "chalk";
+import chalk43 from "chalk";
 function currentCommand4(program2) {
   program2.command("current").description("\u663E\u793A\u5F53\u524D OpenCode \u670D\u52A1\u5546").action(async () => {
     try {
       const manager = createOpenCodeManager();
       const current = manager.getCurrent();
       if (!current) {
-        console.log(chalk41.yellow("\n\u26A0\uFE0F  \u5F53\u524D\u6CA1\u6709\u6FC0\u6D3B\u7684 OpenCode \u670D\u52A1\u5546\n"));
-        console.log(chalk41.blue("\u{1F4A1} \u5217\u51FA\u670D\u52A1\u5546:") + chalk41.white(" ccman oc list\n"));
+        printWarning("\u672A\u9009\u62E9\u4EFB\u4F55 OpenCode \u670D\u52A1\u5546");
+        printTip("\u9009\u62E9\u670D\u52A1\u5546: " + chalk43.white("ccman oc use"));
         return;
       }
-      console.log(chalk41.bold("\n\u{1F3AF} \u5F53\u524D OpenCode \u670D\u52A1\u5546\n"));
-      console.log(`  \u540D\u79F0: ${chalk41.bold(current.name)}`);
-      console.log(`  \u5730\u5740: ${chalk41.gray(current.baseUrl)}`);
-      console.log();
+      const lines = [
+        chalk43.green.bold(current.name),
+        chalk43.gray(`ID: ${current.id}`),
+        chalk43.gray(`URL: ${current.baseUrl}`)
+      ];
+      if (current.lastUsedAt) {
+        lines.push(
+          chalk43.gray(`\u6700\u540E\u4F7F\u7528: ${new Date(current.lastUsedAt).toLocaleString("zh-CN")}`)
+        );
+      }
+      printInfo("\u{1F4CD} \u5F53\u524D OpenCode \u670D\u52A1\u5546", lines);
     } catch (error) {
-      console.error(chalk41.red(`
+      console.error(chalk43.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -6387,18 +6889,21 @@ function currentCommand4(program2) {
 
 // src/commands/opencode/edit.ts
 init_dist2();
-import chalk42 from "chalk";
-import inquirer29 from "inquirer";
+import chalk44 from "chalk";
+import inquirer27 from "inquirer";
 function editCommand5(program2) {
-  program2.command("edit [name]").description("\u7F16\u8F91 OpenCode \u670D\u52A1\u5546").action(async (name) => {
+  const command = program2.command("edit [name]").description("\u7F16\u8F91 OpenCode \u670D\u52A1\u5546");
+  addProviderEditOptions(command);
+  command.action(async (name, options) => {
     try {
       const manager = createOpenCodeManager();
       const providers = manager.list();
       if (providers.length === 0) {
-        console.log(chalk42.yellow("\n\u26A0\uFE0F  \u6682\u65E0 OpenCode \u670D\u52A1\u5546\n"));
-        console.log(chalk42.blue("\u{1F4A1} \u6DFB\u52A0\u670D\u52A1\u5546:") + chalk42.white(" ccman oc add\n"));
+        console.log(chalk44.yellow("\n\u26A0\uFE0F  \u6682\u65E0 OpenCode \u670D\u52A1\u5546\n"));
+        console.log(chalk44.blue("\u{1F4A1} \u6DFB\u52A0\u670D\u52A1\u5546:") + chalk44.white(" ccman oc add\n"));
         return;
       }
+      const resolved = resolveProviderEditInput(options);
       let targetId;
       if (name) {
         const provider2 = manager.findByName(name);
@@ -6406,8 +6911,10 @@ function editCommand5(program2) {
           throw new ProviderNotFoundError(name);
         }
         targetId = provider2.id;
+      } else if (resolved.nonInteractive) {
+        throw new Error("\u975E\u4EA4\u4E92\u6A21\u5F0F\u8BF7\u63D0\u4F9B\u8981\u7F16\u8F91\u7684\u670D\u52A1\u5546\u540D\u79F0");
       } else {
-        const { selectedId } = await inquirer29.prompt([
+        const { selectedId } = await inquirer27.prompt([
           {
             type: "list",
             name: "selectedId",
@@ -6421,6 +6928,15 @@ function editCommand5(program2) {
         targetId = selectedId;
       }
       const provider = manager.get(targetId);
+      if (resolved.nonInteractive) {
+        if (Object.keys(resolved.updates).length === 0) {
+          console.log(chalk44.gray("\n\u672A\u505A\u4EFB\u4F55\u4FEE\u6539\n"));
+          return;
+        }
+        manager.edit(targetId, resolved.updates);
+        console.log(chalk44.green("\n\u2705 \u7F16\u8F91\u6210\u529F\n"));
+        return;
+      }
       const input = await promptProviderForm({
         name: provider.name,
         desc: provider.desc ?? "",
@@ -6433,14 +6949,14 @@ function editCommand5(program2) {
         baseUrl: input.baseUrl,
         apiKey: input.apiKey
       });
-      console.log(chalk42.green("\n\u2705 \u7F16\u8F91\u6210\u529F\n"));
+      console.log(chalk44.green("\n\u2705 \u7F16\u8F91\u6210\u529F\n"));
     } catch (error) {
       if (error instanceof ProviderNotFoundError) {
-        console.error(chalk42.red(`
+        console.error(chalk44.red(`
 \u274C \u670D\u52A1\u5546\u4E0D\u5B58\u5728: ${name}
 `));
       } else {
-        console.error(chalk42.red(`
+        console.error(chalk44.red(`
 \u274C ${error.message}
 `));
       }
@@ -6451,16 +6967,17 @@ function editCommand5(program2) {
 
 // src/commands/opencode/remove.ts
 init_dist2();
-init_confirm();
-import chalk43 from "chalk";
-import inquirer30 from "inquirer";
+import chalk45 from "chalk";
+import inquirer28 from "inquirer";
 function removeCommand5(program2) {
-  program2.command("remove [name]").alias("rm").description("\u5220\u9664 OpenCode \u670D\u52A1\u5546").action(async (name) => {
+  const command = program2.command("remove [name]").alias("rm").description("\u5220\u9664 OpenCode \u670D\u52A1\u5546");
+  addProviderRemoveOptions(command);
+  command.action(async (name, options) => {
     try {
       const manager = createOpenCodeManager();
       const providers = manager.list();
       if (providers.length === 0) {
-        console.log(chalk43.yellow("\n\u26A0\uFE0F  \u6682\u65E0 OpenCode \u670D\u52A1\u5546\n"));
+        console.log(chalk45.yellow("\n\u26A0\uFE0F  \u6682\u65E0 OpenCode \u670D\u52A1\u5546\n"));
         return;
       }
       let targetId;
@@ -6472,8 +6989,10 @@ function removeCommand5(program2) {
         }
         targetId = provider.id;
         targetName = provider.name;
+      } else if (options.yes) {
+        throw new Error("\u975E\u4EA4\u4E92\u6A21\u5F0F\u8BF7\u63D0\u4F9B\u8981\u5220\u9664\u7684\u670D\u52A1\u5546\u540D\u79F0");
       } else {
-        const { selectedId } = await inquirer30.prompt([
+        const { selectedId } = await inquirer28.prompt([
           {
             type: "list",
             name: "selectedId",
@@ -6488,22 +7007,22 @@ function removeCommand5(program2) {
         targetId = selectedId;
         targetName = provider.name;
       }
-      const confirmed = await promptConfirm(`\u786E\u5B9A\u5220\u9664 "${targetName}"?`, false);
+      const confirmed = await confirmProviderRemoval(targetName, options);
       if (!confirmed) {
-        console.log(chalk43.gray("\n\u5DF2\u53D6\u6D88\n"));
+        console.log(chalk45.gray("\n\u5DF2\u53D6\u6D88\n"));
         return;
       }
       manager.remove(targetId);
-      console.log(chalk43.green(`
+      console.log(chalk45.green(`
 \u2705 \u5DF2\u5220\u9664: ${targetName}
 `));
     } catch (error) {
       if (error instanceof ProviderNotFoundError) {
-        console.error(chalk43.red(`
+        console.error(chalk45.red(`
 \u274C \u670D\u52A1\u5546\u4E0D\u5B58\u5728: ${name}
 `));
       } else {
-        console.error(chalk43.red(`
+        console.error(chalk45.red(`
 \u274C ${error.message}
 `));
       }
@@ -6514,15 +7033,15 @@ function removeCommand5(program2) {
 
 // src/commands/opencode/clone.ts
 init_dist2();
-import chalk44 from "chalk";
-import inquirer31 from "inquirer";
+import chalk46 from "chalk";
+import inquirer29 from "inquirer";
 function cloneCommand4(program2) {
   program2.command("clone [source-name] [new-name]").description("\u514B\u9686 OpenCode \u670D\u52A1\u5546").action(async (sourceName, newName) => {
     try {
       const manager = createOpenCodeManager();
       const providers = manager.list();
       if (providers.length === 0) {
-        console.log(chalk44.yellow("\n\u26A0\uFE0F  \u6682\u65E0 OpenCode \u670D\u52A1\u5546\n"));
+        console.log(chalk46.yellow("\n\u26A0\uFE0F  \u6682\u65E0 OpenCode \u670D\u52A1\u5546\n"));
         return;
       }
       let sourceId;
@@ -6533,7 +7052,7 @@ function cloneCommand4(program2) {
         }
         sourceId = provider.id;
       } else {
-        const { selectedId } = await inquirer31.prompt([
+        const { selectedId } = await inquirer29.prompt([
           {
             type: "list",
             name: "selectedId",
@@ -6551,7 +7070,7 @@ function cloneCommand4(program2) {
       if (newName) {
         cloned = manager.clone(sourceId, newName);
       } else {
-        console.log(chalk44.blue(`
+        console.log(chalk46.blue(`
 \u514B\u9686\u81EA: ${source.name}
 `));
         const input = await promptProviderForm({
@@ -6568,14 +7087,14 @@ function cloneCommand4(program2) {
         });
       }
       console.log();
-      console.log(chalk44.green("\u2705 \u514B\u9686\u6210\u529F"));
+      console.log(chalk46.green("\u2705 \u514B\u9686\u6210\u529F"));
       console.log();
-      console.log(`  ${chalk44.bold(cloned.name)} ${chalk44.blue("[OpenCode]")}`);
-      console.log(`  ${chalk44.gray(`ID: ${cloned.id}`)}`);
-      console.log(`  ${chalk44.gray(`URL: ${cloned.baseUrl}`)}`);
+      console.log(`  ${chalk46.bold(cloned.name)} ${chalk46.blue("[OpenCode]")}`);
+      console.log(`  ${chalk46.gray(`ID: ${cloned.id}`)}`);
+      console.log(`  ${chalk46.gray(`URL: ${cloned.baseUrl}`)}`);
       console.log();
     } catch (error) {
-      console.error(chalk44.red(`
+      console.error(chalk46.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -6596,15 +7115,35 @@ function createOpenCodeCommands(program2) {
 
 // src/commands/openclaw/add.ts
 init_dist2();
-import chalk45 from "chalk";
-import inquirer32 from "inquirer";
+import chalk47 from "chalk";
+import inquirer30 from "inquirer";
 init_confirm();
 function addCommand6(program2) {
-  program2.command("add").description("\u6DFB\u52A0\u65B0\u7684 OpenClaw \u670D\u52A1\u5546(\u4EA4\u4E92\u5F0F)").action(async () => {
+  const command = program2.command("add").description("\u6DFB\u52A0\u65B0\u7684 OpenClaw \u670D\u52A1\u5546");
+  addProviderAddOptions(command);
+  command.action(async (options) => {
     try {
       const manager = createOpenClawManager();
-      console.log(chalk45.bold("\n\u{1F4DD} \u6DFB\u52A0 OpenClaw \u670D\u52A1\u5546\n"));
-      const { usePreset } = await inquirer32.prompt([
+      console.log(chalk47.bold("\n\u{1F4DD} \u6DFB\u52A0 OpenClaw \u670D\u52A1\u5546\n"));
+      const resolved = resolveProviderAddInput(options, OPENCLAW_PRESETS);
+      if (resolved.nonInteractive && resolved.input) {
+        const provider2 = manager.add(resolved.input);
+        printSuccess("\u6DFB\u52A0\u6210\u529F", [
+          `${chalk47.bold(provider2.name)} ${toolBadge("openclaw")}`,
+          chalk47.gray(provider2.baseUrl)
+        ]);
+        if (resolved.switchNow) {
+          manager.switch(provider2.id);
+          printSuccess("\u5DF2\u5207\u6362\u5230\u65B0\u670D\u52A1\u5546", [
+            chalk47.gray(`\u914D\u7F6E\u5DF2\u66F4\u65B0: ${getOpenClawConfigPath()}`),
+            chalk47.gray(`\u914D\u7F6E\u5DF2\u66F4\u65B0: ${getOpenClawModelsPath()}`)
+          ]);
+        } else {
+          printTip(`\u7A0D\u540E\u5207\u6362: ${chalk47.white(`ccman openclaw use "${provider2.name}"`)}`);
+        }
+        return;
+      }
+      const { usePreset } = await inquirer30.prompt([
         {
           type: "list",
           name: "usePreset",
@@ -6620,7 +7159,7 @@ function addCommand6(program2) {
       let baseUrl;
       let apiKey;
       if (usePreset) {
-        const { presetName } = await inquirer32.prompt([
+        const { presetName } = await inquirer30.prompt([
           {
             type: "list",
             name: "presetName",
@@ -6632,7 +7171,7 @@ function addCommand6(program2) {
           }
         ]);
         const preset = OPENCLAW_PRESETS.find((p) => p.name === presetName);
-        console.log(chalk45.blue(`
+        console.log(chalk47.blue(`
 \u4F7F\u7528\u9884\u8BBE: ${preset.name} - ${preset.description}
 `));
         const input = await promptProviderForm({
@@ -6646,7 +7185,7 @@ function addCommand6(program2) {
         baseUrl = input.baseUrl;
         apiKey = input.apiKey;
       } else {
-        const answers = await inquirer32.prompt([
+        const answers = await inquirer30.prompt([
           {
             type: "input",
             name: "name",
@@ -6684,27 +7223,22 @@ function addCommand6(program2) {
         baseUrl,
         apiKey
       });
-      console.log();
-      console.log(chalk45.green("\u2705 \u6DFB\u52A0\u6210\u529F"));
-      console.log();
-      console.log(`  ${chalk45.bold(provider.name)} ${chalk45.blue("[OpenClaw]")}`);
-      console.log(`  ${chalk45.gray(provider.baseUrl)}`);
-      console.log();
+      printSuccess("\u6DFB\u52A0\u6210\u529F", [
+        `${chalk47.bold(provider.name)} ${toolBadge("openclaw")}`,
+        chalk47.gray(provider.baseUrl)
+      ]);
       const switchNow = await promptConfirm("\u662F\u5426\u7ACB\u5373\u5207\u6362\u5230\u6B64\u670D\u52A1\u5546?", true);
       if (switchNow) {
         manager.switch(provider.id);
-        console.log(chalk45.green("\u2705 \u5DF2\u5207\u6362\u5230\u65B0\u670D\u52A1\u5546"));
-        console.log();
-        console.log(chalk45.gray("\u914D\u7F6E\u5DF2\u66F4\u65B0:"));
-        console.log(chalk45.gray(`  - ${getOpenClawConfigPath()}`));
-        console.log(chalk45.gray(`  - ${getOpenClawModelsPath()}`));
+        printSuccess("\u5DF2\u5207\u6362\u5230\u65B0\u670D\u52A1\u5546", [
+          chalk47.gray(`\u914D\u7F6E\u5DF2\u66F4\u65B0: ${getOpenClawConfigPath()}`),
+          chalk47.gray(`\u914D\u7F6E\u5DF2\u66F4\u65B0: ${getOpenClawModelsPath()}`)
+        ]);
       } else {
-        console.log(
-          chalk45.blue("\u{1F4A1} \u7A0D\u540E\u5207\u6362:") + chalk45.white(` ccman openclaw use "${provider.name}"`)
-        );
+        printTip(`\u7A0D\u540E\u5207\u6362: ${chalk47.white(`ccman openclaw use "${provider.name}"`)}`);
       }
     } catch (error) {
-      console.error(chalk45.red(`
+      console.error(chalk47.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -6714,7 +7248,7 @@ function addCommand6(program2) {
 
 // src/commands/openclaw/list.ts
 init_dist2();
-import chalk46 from "chalk";
+import chalk48 from "chalk";
 function listCommand6(program2) {
   program2.command("list").alias("ls").description("\u5217\u51FA\u6240\u6709 OpenClaw \u670D\u52A1\u5546").action(async () => {
     try {
@@ -6722,15 +7256,15 @@ function listCommand6(program2) {
       const providers = manager.list();
       const current = manager.getCurrent();
       if (providers.length === 0) {
-        console.log(chalk46.yellow("\n\u26A0\uFE0F  \u6682\u65E0 OpenClaw \u670D\u52A1\u5546\n"));
-        console.log(chalk46.blue("\u{1F4A1} \u6DFB\u52A0\u670D\u52A1\u5546:") + chalk46.white(" ccman openclaw add\n"));
+        printWarning("\u6682\u65E0 OpenClaw \u670D\u52A1\u5546");
+        printTip("\u6DFB\u52A0\u670D\u52A1\u5546: " + chalk48.white("ccman openclaw add"));
         return;
       }
-      console.log(chalk46.bold(`
-\u{1F4CB} OpenClaw \u670D\u52A1\u5546 (${providers.length} \u4E2A)`));
-      console.log(formatProviderTable(providers, current?.id));
+      console.log(
+        formatProviderTable(providers, current?.id, `OpenClaw \u670D\u52A1\u5546 (${providers.length} \u4E2A)`)
+      );
     } catch (error) {
-      console.error(chalk46.red(`
+      console.error(chalk48.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -6740,16 +7274,16 @@ function listCommand6(program2) {
 
 // src/commands/openclaw/use.ts
 init_dist2();
-import chalk47 from "chalk";
-import inquirer33 from "inquirer";
+import chalk49 from "chalk";
+import inquirer31 from "inquirer";
 function useCommand5(program2) {
   program2.command("use [name]").description("\u5207\u6362 OpenClaw \u670D\u52A1\u5546").action(async (name) => {
     try {
       const manager = createOpenClawManager();
       const providers = manager.list();
       if (providers.length === 0) {
-        console.log(chalk47.yellow("\n\u26A0\uFE0F  \u6682\u65E0 OpenClaw \u670D\u52A1\u5546\n"));
-        console.log(chalk47.blue("\u{1F4A1} \u6DFB\u52A0\u670D\u52A1\u5546:") + chalk47.white(" ccman openclaw add\n"));
+        printWarning("\u6682\u65E0 OpenClaw \u670D\u52A1\u5546");
+        printTip("\u6DFB\u52A0\u670D\u52A1\u5546: " + chalk49.white("ccman openclaw add"));
         return;
       }
       let targetId;
@@ -6760,7 +7294,7 @@ function useCommand5(program2) {
         }
         targetId = provider2.id;
       } else {
-        const { selectedId } = await inquirer33.prompt([
+        const { selectedId } = await inquirer31.prompt([
           {
             type: "list",
             name: "selectedId",
@@ -6775,20 +7309,19 @@ function useCommand5(program2) {
       }
       manager.switch(targetId);
       const provider = manager.get(targetId);
-      console.log(chalk47.green("\n\u2705 \u5207\u6362\u6210\u529F\n"));
-      console.log(`  ${chalk47.bold(provider.name)} ${chalk47.blue("[OpenClaw]")}`);
-      console.log(`  ${chalk47.gray(`URL: ${provider.baseUrl}`)}`);
-      console.log();
-      console.log(chalk47.gray("\u914D\u7F6E\u5DF2\u66F4\u65B0:"));
-      console.log(chalk47.gray(`  - ${getOpenClawConfigPath()}`));
-      console.log(chalk47.gray(`  - ${getOpenClawModelsPath()}`));
+      printSuccess("\u5207\u6362\u6210\u529F", [
+        `${chalk49.bold(provider.name)} ${toolBadge("openclaw")}`,
+        chalk49.gray(`URL: ${provider.baseUrl}`),
+        chalk49.gray(`\u914D\u7F6E\u5DF2\u66F4\u65B0: ${getOpenClawConfigPath()}`),
+        chalk49.gray(`\u914D\u7F6E\u5DF2\u66F4\u65B0: ${getOpenClawModelsPath()}`)
+      ]);
     } catch (error) {
       if (error instanceof ProviderNotFoundError) {
-        console.error(chalk47.red(`
+        console.error(chalk49.red(`
 \u274C \u670D\u52A1\u5546\u4E0D\u5B58\u5728: ${name}
 `));
       } else {
-        console.error(chalk47.red(`
+        console.error(chalk49.red(`
 \u274C ${error.message}
 `));
       }
@@ -6799,23 +7332,30 @@ function useCommand5(program2) {
 
 // src/commands/openclaw/current.ts
 init_dist2();
-import chalk48 from "chalk";
+import chalk50 from "chalk";
 function currentCommand5(program2) {
   program2.command("current").description("\u663E\u793A\u5F53\u524D OpenClaw \u670D\u52A1\u5546").action(async () => {
     try {
       const manager = createOpenClawManager();
       const current = manager.getCurrent();
       if (!current) {
-        console.log(chalk48.yellow("\n\u26A0\uFE0F  \u5F53\u524D\u6CA1\u6709\u6FC0\u6D3B\u7684 OpenClaw \u670D\u52A1\u5546\n"));
-        console.log(chalk48.blue("\u{1F4A1} \u5217\u51FA\u670D\u52A1\u5546:") + chalk48.white(" ccman openclaw list\n"));
+        printWarning("\u672A\u9009\u62E9\u4EFB\u4F55 OpenClaw \u670D\u52A1\u5546");
+        printTip("\u9009\u62E9\u670D\u52A1\u5546: " + chalk50.white("ccman openclaw use"));
         return;
       }
-      console.log(chalk48.bold("\n\u{1F3AF} \u5F53\u524D OpenClaw \u670D\u52A1\u5546\n"));
-      console.log(`  \u540D\u79F0: ${chalk48.bold(current.name)}`);
-      console.log(`  \u5730\u5740: ${chalk48.gray(current.baseUrl)}`);
-      console.log();
+      const lines = [
+        chalk50.green.bold(current.name),
+        chalk50.gray(`ID: ${current.id}`),
+        chalk50.gray(`URL: ${current.baseUrl}`)
+      ];
+      if (current.lastUsedAt) {
+        lines.push(
+          chalk50.gray(`\u6700\u540E\u4F7F\u7528: ${new Date(current.lastUsedAt).toLocaleString("zh-CN")}`)
+        );
+      }
+      printInfo("\u{1F4CD} \u5F53\u524D OpenClaw \u670D\u52A1\u5546", lines);
     } catch (error) {
-      console.error(chalk48.red(`
+      console.error(chalk50.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -6825,18 +7365,21 @@ function currentCommand5(program2) {
 
 // src/commands/openclaw/edit.ts
 init_dist2();
-import chalk49 from "chalk";
-import inquirer34 from "inquirer";
+import chalk51 from "chalk";
+import inquirer32 from "inquirer";
 function editCommand6(program2) {
-  program2.command("edit [name]").description("\u7F16\u8F91 OpenClaw \u670D\u52A1\u5546").action(async (name) => {
+  const command = program2.command("edit [name]").description("\u7F16\u8F91 OpenClaw \u670D\u52A1\u5546");
+  addProviderEditOptions(command);
+  command.action(async (name, options) => {
     try {
       const manager = createOpenClawManager();
       const providers = manager.list();
       if (providers.length === 0) {
-        console.log(chalk49.yellow("\n\u26A0\uFE0F  \u6682\u65E0 OpenClaw \u670D\u52A1\u5546\n"));
-        console.log(chalk49.blue("\u{1F4A1} \u6DFB\u52A0\u670D\u52A1\u5546:") + chalk49.white(" ccman openclaw add\n"));
+        console.log(chalk51.yellow("\n\u26A0\uFE0F  \u6682\u65E0 OpenClaw \u670D\u52A1\u5546\n"));
+        console.log(chalk51.blue("\u{1F4A1} \u6DFB\u52A0\u670D\u52A1\u5546:") + chalk51.white(" ccman openclaw add\n"));
         return;
       }
+      const resolved = resolveProviderEditInput(options);
       let targetId;
       if (name) {
         const provider2 = manager.findByName(name);
@@ -6844,8 +7387,10 @@ function editCommand6(program2) {
           throw new ProviderNotFoundError(name);
         }
         targetId = provider2.id;
+      } else if (resolved.nonInteractive) {
+        throw new Error("\u975E\u4EA4\u4E92\u6A21\u5F0F\u8BF7\u63D0\u4F9B\u8981\u7F16\u8F91\u7684\u670D\u52A1\u5546\u540D\u79F0");
       } else {
-        const { selectedId } = await inquirer34.prompt([
+        const { selectedId } = await inquirer32.prompt([
           {
             type: "list",
             name: "selectedId",
@@ -6859,6 +7404,15 @@ function editCommand6(program2) {
         targetId = selectedId;
       }
       const provider = manager.get(targetId);
+      if (resolved.nonInteractive) {
+        if (Object.keys(resolved.updates).length === 0) {
+          console.log(chalk51.gray("\n\u672A\u505A\u4EFB\u4F55\u4FEE\u6539\n"));
+          return;
+        }
+        manager.edit(targetId, resolved.updates);
+        console.log(chalk51.green("\n\u2705 \u7F16\u8F91\u6210\u529F\n"));
+        return;
+      }
       const input = await promptProviderForm({
         name: provider.name,
         desc: provider.desc ?? "",
@@ -6871,14 +7425,14 @@ function editCommand6(program2) {
         baseUrl: input.baseUrl,
         apiKey: input.apiKey
       });
-      console.log(chalk49.green("\n\u2705 \u7F16\u8F91\u6210\u529F\n"));
+      console.log(chalk51.green("\n\u2705 \u7F16\u8F91\u6210\u529F\n"));
     } catch (error) {
       if (error instanceof ProviderNotFoundError) {
-        console.error(chalk49.red(`
+        console.error(chalk51.red(`
 \u274C \u670D\u52A1\u5546\u4E0D\u5B58\u5728: ${name}
 `));
       } else {
-        console.error(chalk49.red(`
+        console.error(chalk51.red(`
 \u274C ${error.message}
 `));
       }
@@ -6889,16 +7443,17 @@ function editCommand6(program2) {
 
 // src/commands/openclaw/remove.ts
 init_dist2();
-init_confirm();
-import chalk50 from "chalk";
-import inquirer35 from "inquirer";
+import chalk52 from "chalk";
+import inquirer33 from "inquirer";
 function removeCommand6(program2) {
-  program2.command("remove [name]").alias("rm").description("\u5220\u9664 OpenClaw \u670D\u52A1\u5546").action(async (name) => {
+  const command = program2.command("remove [name]").alias("rm").description("\u5220\u9664 OpenClaw \u670D\u52A1\u5546");
+  addProviderRemoveOptions(command);
+  command.action(async (name, options) => {
     try {
       const manager = createOpenClawManager();
       const providers = manager.list();
       if (providers.length === 0) {
-        console.log(chalk50.yellow("\n\u26A0\uFE0F  \u6682\u65E0 OpenClaw \u670D\u52A1\u5546\n"));
+        console.log(chalk52.yellow("\n\u26A0\uFE0F  \u6682\u65E0 OpenClaw \u670D\u52A1\u5546\n"));
         return;
       }
       let targetId;
@@ -6910,8 +7465,10 @@ function removeCommand6(program2) {
         }
         targetId = provider.id;
         targetName = provider.name;
+      } else if (options.yes) {
+        throw new Error("\u975E\u4EA4\u4E92\u6A21\u5F0F\u8BF7\u63D0\u4F9B\u8981\u5220\u9664\u7684\u670D\u52A1\u5546\u540D\u79F0");
       } else {
-        const { selectedId } = await inquirer35.prompt([
+        const { selectedId } = await inquirer33.prompt([
           {
             type: "list",
             name: "selectedId",
@@ -6926,22 +7483,22 @@ function removeCommand6(program2) {
         targetId = selectedId;
         targetName = provider.name;
       }
-      const confirmed = await promptConfirm(`\u786E\u5B9A\u5220\u9664 "${targetName}"?`, false);
+      const confirmed = await confirmProviderRemoval(targetName, options);
       if (!confirmed) {
-        console.log(chalk50.gray("\n\u5DF2\u53D6\u6D88\n"));
+        console.log(chalk52.gray("\n\u5DF2\u53D6\u6D88\n"));
         return;
       }
       manager.remove(targetId);
-      console.log(chalk50.green(`
+      console.log(chalk52.green(`
 \u2705 \u5DF2\u5220\u9664: ${targetName}
 `));
     } catch (error) {
       if (error instanceof ProviderNotFoundError) {
-        console.error(chalk50.red(`
+        console.error(chalk52.red(`
 \u274C \u670D\u52A1\u5546\u4E0D\u5B58\u5728: ${name}
 `));
       } else {
-        console.error(chalk50.red(`
+        console.error(chalk52.red(`
 \u274C ${error.message}
 `));
       }
@@ -6952,15 +7509,15 @@ function removeCommand6(program2) {
 
 // src/commands/openclaw/clone.ts
 init_dist2();
-import chalk51 from "chalk";
-import inquirer36 from "inquirer";
+import chalk53 from "chalk";
+import inquirer34 from "inquirer";
 function cloneCommand5(program2) {
   program2.command("clone [source-name] [new-name]").description("\u514B\u9686 OpenClaw \u670D\u52A1\u5546").action(async (sourceName, newName) => {
     try {
       const manager = createOpenClawManager();
       const providers = manager.list();
       if (providers.length === 0) {
-        console.log(chalk51.yellow("\n\u26A0\uFE0F  \u6682\u65E0 OpenClaw \u670D\u52A1\u5546\n"));
+        console.log(chalk53.yellow("\n\u26A0\uFE0F  \u6682\u65E0 OpenClaw \u670D\u52A1\u5546\n"));
         return;
       }
       let sourceId;
@@ -6971,7 +7528,7 @@ function cloneCommand5(program2) {
         }
         sourceId = provider.id;
       } else {
-        const { selectedId } = await inquirer36.prompt([
+        const { selectedId } = await inquirer34.prompt([
           {
             type: "list",
             name: "selectedId",
@@ -6989,7 +7546,7 @@ function cloneCommand5(program2) {
       if (newName) {
         cloned = manager.clone(sourceId, newName);
       } else {
-        console.log(chalk51.blue(`
+        console.log(chalk53.blue(`
 \u514B\u9686\u81EA: ${source.name}
 `));
         const input = await promptProviderForm({
@@ -7006,14 +7563,14 @@ function cloneCommand5(program2) {
         });
       }
       console.log();
-      console.log(chalk51.green("\u2705 \u514B\u9686\u6210\u529F"));
+      console.log(chalk53.green("\u2705 \u514B\u9686\u6210\u529F"));
       console.log();
-      console.log(`  ${chalk51.bold(cloned.name)} ${chalk51.blue("[OpenClaw]")}`);
-      console.log(`  ${chalk51.gray(`ID: ${cloned.id}`)}`);
-      console.log(`  ${chalk51.gray(`URL: ${cloned.baseUrl}`)}`);
+      console.log(`  ${chalk53.bold(cloned.name)} ${chalk53.blue("[OpenClaw]")}`);
+      console.log(`  ${chalk53.gray(`ID: ${cloned.id}`)}`);
+      console.log(`  ${chalk53.gray(`URL: ${cloned.baseUrl}`)}`);
       console.log();
     } catch (error) {
-      console.error(chalk51.red(`
+      console.error(chalk53.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -7037,40 +7594,40 @@ init_sync();
 
 // src/commands/export.ts
 init_dist2();
-import chalk52 from "chalk";
+import chalk54 from "chalk";
 import path13 from "path";
 function exportCommand(program2) {
   program2.command("export <\u76EE\u6807\u76EE\u5F55>").description("\u5BFC\u51FA\u914D\u7F6E\u5230\u672C\u5730\u76EE\u5F55\uFF08\u5305\u542B API Key\uFF09").action(async (targetDir) => {
     try {
-      console.log(chalk52.bold("\n\u{1F4E6} \u5BFC\u51FA\u914D\u7F6E\n"));
+      console.log(chalk54.bold("\n\u{1F4E6} \u5BFC\u51FA\u914D\u7F6E\n"));
       const validation = validateExport();
       if (!validation.valid) {
-        console.log(chalk52.red(`\u274C ${validation.message}
+        console.log(chalk54.red(`\u274C ${validation.message}
 `));
         process.exit(1);
       }
       const resolvedPath = targetDir.startsWith("~") ? path13.join(process.env.HOME || "", targetDir.slice(1)) : path13.resolve(targetDir);
       console.log("\u5BFC\u51FA\u6587\u4EF6\uFF08\u5B58\u5728\u5219\u5BFC\u51FA\uFF0C\u4E0D\u5B58\u5728\u5219\u8DF3\u8FC7\uFF09:");
-      console.log(`  ${chalk52.cyan("codex.json")}    - Codex \u914D\u7F6E`);
-      console.log(`  ${chalk52.cyan("claude.json")}   - Claude \u914D\u7F6E`);
-      console.log(`  ${chalk52.cyan("openclaw.json")} - OpenClaw \u914D\u7F6E`);
+      console.log(`  ${chalk54.cyan("codex.json")}    - Codex \u914D\u7F6E`);
+      console.log(`  ${chalk54.cyan("claude.json")}   - Claude \u914D\u7F6E`);
+      console.log(`  ${chalk54.cyan("openclaw.json")} - OpenClaw \u914D\u7F6E`);
       console.log();
-      console.log(`\u76EE\u6807\u76EE\u5F55: ${chalk52.cyan(resolvedPath)}`);
+      console.log(`\u76EE\u6807\u76EE\u5F55: ${chalk54.cyan(resolvedPath)}`);
       console.log();
-      console.log(chalk52.yellow("\u26A0\uFE0F  \u5BFC\u51FA\u6587\u4EF6\u5305\u542B API Key\uFF0C\u8BF7\u59A5\u5584\u4FDD\u7BA1"));
+      console.log(chalk54.yellow("\u26A0\uFE0F  \u5BFC\u51FA\u6587\u4EF6\u5305\u542B API Key\uFF0C\u8BF7\u59A5\u5584\u4FDD\u7BA1"));
       console.log();
       const result = exportConfig(resolvedPath);
-      console.log(chalk52.green("\u2705 \u5BFC\u51FA\u6210\u529F"));
+      console.log(chalk54.green("\u2705 \u5BFC\u51FA\u6210\u529F"));
       console.log();
       console.log("\u5DF2\u5BFC\u51FA\u6587\u4EF6:");
       for (const file of result.exportedFiles) {
-        console.log(`  ${chalk52.cyan("\u2713")} ${file}`);
+        console.log(`  ${chalk54.cyan("\u2713")} ${file}`);
       }
       console.log();
-      console.log(chalk52.blue(`\u{1F4A1} \u5BFC\u5165\u547D\u4EE4: ccman import ${resolvedPath}
+      console.log(chalk54.blue(`\u{1F4A1} \u5BFC\u5165\u547D\u4EE4: ccman import ${resolvedPath}
 `));
     } catch (error) {
-      console.error(chalk52.red(`
+      console.error(chalk54.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -7081,66 +7638,66 @@ function exportCommand(program2) {
 // src/commands/import.ts
 init_dist2();
 init_confirm();
-import chalk53 from "chalk";
+import chalk55 from "chalk";
 import path14 from "path";
 function importCommand(program2) {
   program2.command("import <\u6E90\u76EE\u5F55>").description("\u4ECE\u672C\u5730\u76EE\u5F55\u5BFC\u5165\u914D\u7F6E\uFF08\u4F1A\u8986\u76D6\u5F53\u524D\u914D\u7F6E\uFF09").action(async (sourceDir) => {
     try {
       const resolvedPath = sourceDir.startsWith("~") ? path14.join(process.env.HOME || "", sourceDir.slice(1)) : path14.resolve(sourceDir);
-      console.log(chalk53.bold("\n\u{1F4E5} \u5BFC\u5165\u914D\u7F6E\n"));
+      console.log(chalk55.bold("\n\u{1F4E5} \u5BFC\u5165\u914D\u7F6E\n"));
       const validation = validateImportDir(resolvedPath);
       if (!validation.valid) {
-        console.log(chalk53.red(`\u274C ${validation.message}
+        console.log(chalk55.red(`\u274C ${validation.message}
 `));
         process.exit(1);
       }
-      console.log(chalk53.yellow("\u26A0\uFE0F  \u8B66\u544A\uFF1A\u5BFC\u5165\u5C06\u8986\u76D6\u5F53\u524D\u914D\u7F6E\n"));
-      console.log(`\u6E90\u76EE\u5F55: ${chalk53.cyan(resolvedPath)}`);
+      console.log(chalk55.yellow("\u26A0\uFE0F  \u8B66\u544A\uFF1A\u5BFC\u5165\u5C06\u8986\u76D6\u5F53\u524D\u914D\u7F6E\n"));
+      console.log(`\u6E90\u76EE\u5F55: ${chalk55.cyan(resolvedPath)}`);
       console.log();
       console.log("\u627E\u5230\u914D\u7F6E\u6587\u4EF6:");
       for (const file of validation.foundFiles) {
-        console.log(`  ${chalk53.cyan("\u2713")} ${file}`);
+        console.log(`  ${chalk55.cyan("\u2713")} ${file}`);
       }
       console.log();
-      console.log(chalk53.gray("\u672A\u627E\u5230\u7684\u53D7\u652F\u6301\u6587\u4EF6\u5C06\u81EA\u52A8\u8DF3\u8FC7\uFF0C\u4E0D\u4F1A\u4E2D\u65AD\u5BFC\u5165"));
+      console.log(chalk55.gray("\u672A\u627E\u5230\u7684\u53D7\u652F\u6301\u6587\u4EF6\u5C06\u81EA\u52A8\u8DF3\u8FC7\uFF0C\u4E0D\u4F1A\u4E2D\u65AD\u5BFC\u5165"));
       console.log();
-      console.log(chalk53.gray("\u5F53\u524D\u914D\u7F6E\u5C06\u88AB\u8986\u76D6\uFF08\u81EA\u52A8\u5907\u4EFD\uFF09"));
+      console.log(chalk55.gray("\u5F53\u524D\u914D\u7F6E\u5C06\u88AB\u8986\u76D6\uFF08\u81EA\u52A8\u5907\u4EFD\uFF09"));
       console.log();
       const confirmFirst = await promptConfirm("\u786E\u8BA4\u5BFC\u5165\uFF1F", false);
       if (!confirmFirst) {
-        console.log(chalk53.gray("\n\u274C \u5DF2\u53D6\u6D88\n"));
+        console.log(chalk55.gray("\n\u274C \u5DF2\u53D6\u6D88\n"));
         return;
       }
       console.log();
-      console.log(chalk53.red.bold("\u26A0\uFE0F  \u6700\u540E\u786E\u8BA4\uFF1A\u6B64\u64CD\u4F5C\u5C06\u8986\u76D6\u6240\u6709\u5F53\u524D\u914D\u7F6E\uFF01"));
+      console.log(chalk55.red.bold("\u26A0\uFE0F  \u6700\u540E\u786E\u8BA4\uFF1A\u6B64\u64CD\u4F5C\u5C06\u8986\u76D6\u6240\u6709\u5F53\u524D\u914D\u7F6E\uFF01"));
       console.log();
       const confirmSecond = await promptConfirm("\u771F\u7684\u8981\u7EE7\u7EED\u5417\uFF1F", false);
       if (!confirmSecond) {
-        console.log(chalk53.gray("\n\u274C \u5DF2\u53D6\u6D88\n"));
+        console.log(chalk55.gray("\n\u274C \u5DF2\u53D6\u6D88\n"));
         return;
       }
       console.log();
-      console.log(chalk53.gray("\u{1F4BE} \u5907\u4EFD\u5F53\u524D\u914D\u7F6E..."));
-      console.log(chalk53.gray("\u{1F4E5} \u5BFC\u5165\u65B0\u914D\u7F6E..."));
+      console.log(chalk55.gray("\u{1F4BE} \u5907\u4EFD\u5F53\u524D\u914D\u7F6E..."));
+      console.log(chalk55.gray("\u{1F4E5} \u5BFC\u5165\u65B0\u914D\u7F6E..."));
       const result = importConfig(resolvedPath);
       console.log();
-      console.log(chalk53.green("\u2705 \u5BFC\u5165\u6210\u529F"));
+      console.log(chalk55.green("\u2705 \u5BFC\u5165\u6210\u529F"));
       console.log();
       if (result.backupPaths.length > 0) {
         console.log("\u5907\u4EFD\u6587\u4EF6:");
         for (const backupPath of result.backupPaths) {
-          console.log(`  ${chalk53.gray(backupPath)}`);
+          console.log(`  ${chalk55.gray(backupPath)}`);
         }
         console.log();
       }
       console.log("\u5DF2\u5BFC\u5165\u6587\u4EF6:");
       for (const file of result.importedFiles) {
-        console.log(`  ${chalk53.cyan("\u2713")} ${file}`);
+        console.log(`  ${chalk55.cyan("\u2713")} ${file}`);
       }
       console.log();
-      console.log(chalk53.blue("\u{1F4A1} \u8BF7\u4F7F\u7528 'ccman cx use' \u6216 'ccman cc use' \u5207\u6362\u670D\u52A1\u5546\n"));
+      console.log(chalk55.blue("\u{1F4A1} \u8BF7\u4F7F\u7528 'ccman cx use' \u6216 'ccman cc use' \u5207\u6362\u670D\u52A1\u5546\n"));
     } catch (error) {
-      console.error(chalk53.red(`
+      console.error(chalk55.red(`
 \u274C ${error.message}
 `));
       process.exit(1);
@@ -7152,8 +7709,8 @@ function importCommand(program2) {
 init_dist2();
 import fs13 from "fs";
 import path15 from "path";
-import chalk54 from "chalk";
-import inquirer37 from "inquirer";
+import chalk56 from "chalk";
+import inquirer35 from "inquirer";
 
 // src/utils/endpoint-latency.ts
 import { request as httpRequest } from "http";
@@ -7278,7 +7835,7 @@ var GMN_PROFILE = {
   baseUrls: [
     {
       label: "GMN \u4E3B\u7AD9",
-      url: "https://gmn.chuangzuoli.com",
+      url: "https://ai.gmncode.com",
       description: "GMN \u4E3B\u57DF\u540D\u5165\u53E3"
     },
     {
@@ -7345,7 +7902,7 @@ function renderStep(current, total, title) {
 function printBanner(title) {
   printLogo();
   console.log(
-    chalk54.cyanBright(
+    chalk56.cyanBright(
       [
         "  \u2588\u2588\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2588\u2557   \u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2557   \u2588\u2588\u2557",
         " \u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D  \u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2551",
@@ -7357,11 +7914,11 @@ function printBanner(title) {
       ].join("\n")
     )
   );
-  console.log(chalk54.gray("\u81EA\u52A8\u5199\u5165\u9009\u4E2D\u5DE5\u5177\u914D\u7F6E\uFF0C\u652F\u6301\u591A\u9009\u3002\n"));
+  console.log(chalk56.gray("\u81EA\u52A8\u5199\u5165\u9009\u4E2D\u5DE5\u5177\u914D\u7F6E\uFF0C\u652F\u6301\u591A\u9009\u3002\n"));
 }
 function printKeyNotice() {
   console.log(
-    chalk54.yellow(
+    chalk56.yellow(
       [
         "\u63D0\u793A\uFF1A\u672C\u547D\u4EE4\u652F\u6301 Codex\u3001OpenCode\u3001OpenClaw \u4E09\u4E2A\u5E73\u53F0\u3002",
         "Codex \u4E0E OpenCode \u5171\u4EAB OpenAI \u7AEF\u70B9\uFF1BOpenClaw \u4F7F\u7528 /v1 \u7AEF\u70B9\u3002",
@@ -7371,22 +7928,22 @@ function printKeyNotice() {
   );
 }
 function printWriteTargets(platforms) {
-  console.log(chalk54.gray(`\u5199\u5165\u76EE\u5F55: ${getCcmanDir()}`));
+  console.log(chalk56.gray(`\u5199\u5165\u76EE\u5F55: ${getCcmanDir()}`));
   if (platforms.includes("codex")) {
-    console.log(chalk54.gray(`  - Codex: ${getCodexConfigPath()}`));
-    console.log(chalk54.gray(`  - Codex: ${getCodexAuthPath()}`));
+    console.log(chalk56.gray(`  - Codex: ${getCodexConfigPath()}`));
+    console.log(chalk56.gray(`  - Codex: ${getCodexAuthPath()}`));
   }
   if (platforms.includes("opencode")) {
-    console.log(chalk54.gray(`  - OpenCode: ${getOpenCodeConfigPath()}`));
+    console.log(chalk56.gray(`  - OpenCode: ${getOpenCodeConfigPath()}`));
   }
   if (platforms.includes("openclaw")) {
-    console.log(chalk54.gray(`  - OpenClaw: ${getOpenClawConfigPath()}`));
-    console.log(chalk54.gray(`  - OpenClaw: ${getOpenClawModelsPath()}`));
+    console.log(chalk56.gray(`  - OpenClaw: ${getOpenClawConfigPath()}`));
+    console.log(chalk56.gray(`  - OpenClaw: ${getOpenClawModelsPath()}`));
   }
   const env = process.env.NODE_ENV;
   if (env === "development" || env === "test") {
     console.log(
-      chalk54.yellow(
+      chalk56.yellow(
         `\u26A0\uFE0F \u5F53\u524D NODE_ENV=${env}\uFF0C\u5C06\u5199\u5165\u5F00\u53D1/\u6D4B\u8BD5\u76EE\u5F55\uFF1B\u5982\u9700\u5199\u5165\u771F\u5B9E HOME\uFF0C\u8BF7\u5728\u751F\u4EA7\u73AF\u5883\u8FD0\u884C\uFF08unset NODE_ENV\uFF09\u3002`
       )
     );
@@ -7405,7 +7962,7 @@ function parsePlatforms(platformArg) {
   return platforms;
 }
 async function promptApiKey(title) {
-  const answers = await inquirer37.prompt([
+  const answers = await inquirer35.prompt([
     {
       type: "password",
       name: "apiKey",
@@ -7420,7 +7977,7 @@ async function promptApiKey(title) {
   return answers.apiKey.trim();
 }
 async function promptPlatforms(title) {
-  const answers = await inquirer37.prompt([
+  const answers = await inquirer35.prompt([
     {
       type: "checkbox",
       name: "platforms",
@@ -7466,20 +8023,20 @@ function buildProbeCandidates(baseUrls, platforms) {
 }
 function printBaseUrlProbeResults(profile, results, platforms) {
   const usingOpenClawPath = platforms.length === 1 && platforms[0] === "openclaw";
-  console.log(chalk54.bold(`\u5F53\u524D\u6D4B\u901F\u8303\u56F4\uFF1A${profile.endpointGroupLabel}`));
-  console.log(chalk54.gray(`${profile.endpointGroupDescription}\uFF08\u5171 ${results.length} \u6761\uFF09`));
+  console.log(chalk56.bold(`\u5F53\u524D\u6D4B\u901F\u8303\u56F4\uFF1A${profile.endpointGroupLabel}`));
+  console.log(chalk56.gray(`${profile.endpointGroupDescription}\uFF08\u5171 ${results.length} \u6761\uFF09`));
   console.log(
-    chalk54.gray(
+    chalk56.gray(
       `\u6D4B\u901F\u65B9\u5F0F\uFF1AHTTPS \u9996\u5305\u5EF6\u8FDF\uFF08${BASE_URL_PROBE_SAMPLE_COUNT} \u6B21\u4E2D\u4F4D\u6570\uFF09${usingOpenClawPath ? "\uFF0C\u5F53\u524D\u4EC5\u68C0\u6D4B OpenClaw \u7684 /v1 \u7AEF\u70B9" : ""}`
     )
   );
   console.log();
   for (const [index, result] of results.entries()) {
-    const latencyText = result.latencyMs === null ? chalk54.red(formatLatency(result)) : chalk54.green(formatLatency(result));
-    console.log(`  ${chalk54.cyan(`${index + 1}. ${result.label}`)}`);
-    console.log(chalk54.gray(`     \u57DF\u540D: ${getEndpointHost(result.url)}`));
-    console.log(chalk54.gray(`     \u5730\u5740: ${result.url}`));
-    console.log(chalk54.gray(`     \u8BF4\u660E: ${result.description}`));
+    const latencyText = result.latencyMs === null ? chalk56.red(formatLatency(result)) : chalk56.green(formatLatency(result));
+    console.log(`  ${chalk56.cyan(`${index + 1}. ${result.label}`)}`);
+    console.log(chalk56.gray(`     \u57DF\u540D: ${getEndpointHost(result.url)}`));
+    console.log(chalk56.gray(`     \u5730\u5740: ${result.url}`));
+    console.log(chalk56.gray(`     \u8BF4\u660E: ${result.description}`));
     console.log(`     \u5EF6\u8FDF: ${latencyText}`);
     console.log();
   }
@@ -7487,7 +8044,7 @@ function printBaseUrlProbeResults(profile, results, platforms) {
 async function resolveOpenAiBaseUrl(profile, platforms, baseUrlArg) {
   if (baseUrlArg && baseUrlArg.trim().length > 0) {
     const normalized = normalizeEndpointUrl(baseUrlArg);
-    console.log(chalk54.gray(`\u5DF2\u901A\u8FC7\u53C2\u6570\u6307\u5B9A Base URL: ${normalized}`));
+    console.log(chalk56.gray(`\u5DF2\u901A\u8FC7\u53C2\u6570\u6307\u5B9A Base URL: ${normalized}`));
     return normalized;
   }
   const probeResults = sortEndpointProbeResults(
@@ -7503,19 +8060,19 @@ async function resolveOpenAiBaseUrl(profile, platforms, baseUrlArg) {
   const defaultResult = pickDefaultEndpoint(probeResults) || probeResults[0];
   const allFailed = probeResults.every((result) => result.latencyMs === null);
   if (allFailed) {
-    console.log(chalk54.yellow("\u26A0\uFE0F \u6240\u6709\u5019\u9009\u5730\u5740\u6D4B\u901F\u5931\u8D25\uFF0C\u5C06\u9ED8\u8BA4\u9009\u4E2D\u7B2C\u4E00\u4E2A\u5730\u5740\uFF0C\u4F60\u4E5F\u53EF\u4EE5\u624B\u52A8\u5207\u6362\u3002"));
+    console.log(chalk56.yellow("\u26A0\uFE0F \u6240\u6709\u5019\u9009\u5730\u5740\u6D4B\u901F\u5931\u8D25\uFF0C\u5C06\u9ED8\u8BA4\u9009\u4E2D\u7B2C\u4E00\u4E2A\u5730\u5740\uFF0C\u4F60\u4E5F\u53EF\u4EE5\u624B\u52A8\u5207\u6362\u3002"));
   } else {
-    console.log(chalk54.gray(`\u9ED8\u8BA4\u5DF2\u9009\u6700\u4F4E\u5EF6\u8FDF\u7EBF\u8DEF\uFF1A${defaultResult.url}`));
+    console.log(chalk56.gray(`\u9ED8\u8BA4\u5DF2\u9009\u6700\u4F4E\u5EF6\u8FDF\u7EBF\u8DEF\uFF1A${defaultResult.url}`));
   }
   if (probeResults.length === 1) {
-    console.log(chalk54.green(`\u5DF2\u81EA\u52A8\u9009\u62E9: ${defaultResult.url}`));
+    console.log(chalk56.green(`\u5DF2\u81EA\u52A8\u9009\u62E9: ${defaultResult.url}`));
     return defaultResult.url;
   }
   if (!process.stdin.isTTY || !process.stdout.isTTY) {
-    console.log(chalk54.yellow(`\u975E\u4EA4\u4E92\u73AF\u5883\uFF0C\u5DF2\u81EA\u52A8\u4F7F\u7528\u9ED8\u8BA4\u5730\u5740\uFF1A${defaultResult.url}`));
+    console.log(chalk56.yellow(`\u975E\u4EA4\u4E92\u73AF\u5883\uFF0C\u5DF2\u81EA\u52A8\u4F7F\u7528\u9ED8\u8BA4\u5730\u5740\uFF1A${defaultResult.url}`));
     return defaultResult.url;
   }
-  const answers = await inquirer37.prompt([
+  const answers = await inquirer35.prompt([
     {
       type: "list",
       name: "baseUrl",
@@ -7623,24 +8180,24 @@ async function runGmnCommand(profile, apiKey, platformArg, providerNameArg, base
   let platforms;
   let providerName;
   try {
-    console.log(chalk54.cyan(`
+    console.log(chalk56.cyan(`
 ${renderStep(1, TOTAL_STEPS, "\u9009\u62E9\u8981\u914D\u7F6E\u7684\u5DE5\u5177")}`));
     platforms = await resolvePlatforms(platformArg, profile.title);
     providerName = resolveProviderName2(profile, providerNameArg);
   } catch (error) {
-    console.error(chalk54.red(`\u274C ${error.message}`));
+    console.error(chalk56.red(`\u274C ${error.message}`));
     process.exit(1);
   }
-  console.log(chalk54.gray(`\u5DF2\u9009\u62E9: ${platforms.join(", ")}`));
-  console.log(chalk54.gray(`\u670D\u52A1\u5546\u540D\u79F0: ${providerName}`));
+  console.log(chalk56.gray(`\u5DF2\u9009\u62E9: ${platforms.join(", ")}`));
+  console.log(chalk56.gray(`\u670D\u52A1\u5546\u540D\u79F0: ${providerName}`));
   printKeyNotice();
-  console.log(chalk54.cyan(`
+  console.log(chalk56.cyan(`
 ${renderStep(2, TOTAL_STEPS, "\u6D4B\u901F\u5E76\u9009\u62E9 Base URL")}`));
   let openaiBaseUrl;
   try {
     openaiBaseUrl = await resolveOpenAiBaseUrl(profile, platforms, baseUrlArg);
   } catch (error) {
-    console.error(chalk54.red(`\u274C ${error.message}`));
+    console.error(chalk56.red(`\u274C ${error.message}`));
     process.exit(1);
   }
   const openclawBaseUrl = buildOpenClawBaseUrl(openaiBaseUrl);
@@ -7650,23 +8207,23 @@ ${renderStep(2, TOTAL_STEPS, "\u6D4B\u901F\u5E76\u9009\u62E9 Base URL")}`));
     openclaw: openclawBaseUrl
   };
   let resolvedApiKey = apiKey?.trim();
-  console.log(chalk54.cyan(`
+  console.log(chalk56.cyan(`
 ${renderStep(3, TOTAL_STEPS, "\u8F93\u5165 API Key")}`));
   if (!resolvedApiKey) {
     resolvedApiKey = await promptApiKey(profile.title);
   } else {
-    console.log(chalk54.gray("\u5DF2\u901A\u8FC7\u53C2\u6570\u63D0\u4F9B API Key\uFF08\u5DF2\u9690\u85CF\uFF09"));
+    console.log(chalk56.gray("\u5DF2\u901A\u8FC7\u53C2\u6570\u63D0\u4F9B API Key\uFF08\u5DF2\u9690\u85CF\uFF09"));
   }
   if (!resolvedApiKey?.trim()) {
-    console.error(chalk54.red("\u274C \u9519\u8BEF: API Key \u4E0D\u80FD\u4E3A\u7A7A"));
+    console.error(chalk56.red("\u274C \u9519\u8BEF: API Key \u4E0D\u80FD\u4E3A\u7A7A"));
     process.exit(1);
   }
-  console.log(chalk54.cyan(`
+  console.log(chalk56.cyan(`
 ${renderStep(4, TOTAL_STEPS, "\u5F00\u59CB\u5199\u5165\u914D\u7F6E")}`));
-  console.log(chalk54.gray(`\u5DF2\u9009\u62E9\u5E73\u53F0: ${platforms.join(", ")}`));
-  console.log(chalk54.gray(`OpenAI Base URL: ${openaiBaseUrl}`));
+  console.log(chalk56.gray(`\u5DF2\u9009\u62E9\u5E73\u53F0: ${platforms.join(", ")}`));
+  console.log(chalk56.gray(`OpenAI Base URL: ${openaiBaseUrl}`));
   if (platforms.includes("openclaw")) {
-    console.log(chalk54.gray(`OpenClaw Base URL: ${openclawBaseUrl}`));
+    console.log(chalk56.gray(`OpenClaw Base URL: ${openclawBaseUrl}`));
   }
   printWriteTargets(platforms);
   console.log();
@@ -7676,7 +8233,7 @@ ${renderStep(4, TOTAL_STEPS, "\u5F00\u59CB\u5199\u5165\u914D\u7F6E")}`));
     `${profile.commandName}-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`
   );
   fs13.mkdirSync(backupRootDir, { recursive: true, mode: 448 });
-  console.log(chalk54.gray(`\u5907\u4EFD\u6839\u76EE\u5F55: ${backupRootDir}`));
+  console.log(chalk56.gray(`\u5907\u4EFD\u6839\u76EE\u5F55: ${backupRootDir}`));
   console.log();
   const ALL_TOOLS = {
     codex: { name: "Codex", manager: createCodexManager() },
@@ -7692,13 +8249,13 @@ ${renderStep(4, TOTAL_STEPS, "\u5F00\u59CB\u5199\u5165\u914D\u7F6E")}`));
   for (const { platform, name, manager } of tools) {
     let backupResult = null;
     try {
-      console.log(chalk54.gray(`\u2192 \u914D\u7F6E ${name}...`));
+      console.log(chalk56.gray(`\u2192 \u914D\u7F6E ${name}...`));
       backupResult = createPlatformBackupOrThrow(platform, backupRootDir);
       const backupFiles = backupResult.entries.map((entry) => entry.backupPath).filter((p) => p !== null);
       if (backupFiles.length > 0) {
-        console.log(chalk54.gray(`  \u5DF2\u5907\u4EFD ${backupFiles.length} \u4E2A\u6587\u4EF6`));
+        console.log(chalk56.gray(`  \u5DF2\u5907\u4EFD ${backupFiles.length} \u4E2A\u6587\u4EF6`));
       } else {
-        console.log(chalk54.gray("  \u65E0\u5386\u53F2\u6587\u4EF6\u53EF\u5907\u4EFD"));
+        console.log(chalk56.gray("  \u65E0\u5386\u53F2\u6587\u4EF6\u53EF\u5907\u4EFD"));
       }
       const baseUrl = platformBaseUrls[platform];
       const existing = findPreferredProvider(manager.list(), providerName);
@@ -7709,7 +8266,7 @@ ${renderStep(4, TOTAL_STEPS, "\u5F00\u59CB\u5199\u5165\u914D\u7F6E")}`));
       ) : manager.add({ name: providerName, baseUrl, apiKey: resolvedApiKey });
       manager.switch(provider.id, { mode: "overwrite" });
       completed += 1;
-      console.log(chalk54.green(`\u2705 ${name}`));
+      console.log(chalk56.green(`\u2705 ${name}`));
       successBackups.push({
         name,
         backupDir: backupResult.backupDir,
@@ -7720,38 +8277,38 @@ ${renderStep(4, TOTAL_STEPS, "\u5F00\u59CB\u5199\u5165\u914D\u7F6E")}`));
       if (backupResult !== null) {
         try {
           rollbackFromBackupOrThrow(backupResult);
-          console.error(chalk54.red(`\u274C ${name}: ${operationError.message}\uFF08\u5DF2\u56DE\u6EDA\u5386\u53F2\u6587\u4EF6\uFF09`));
+          console.error(chalk56.red(`\u274C ${name}: ${operationError.message}\uFF08\u5DF2\u56DE\u6EDA\u5386\u53F2\u6587\u4EF6\uFF09`));
         } catch (rollbackError) {
           console.error(
-            chalk54.red(
+            chalk56.red(
               `\u274C ${name}: ${operationError.message}\uFF1B\u56DE\u6EDA\u4E5F\u5931\u8D25: ${rollbackError.message}`
             )
           );
         }
       } else {
-        console.error(chalk54.red(`\u274C ${name}: ${operationError.message}`));
+        console.error(chalk56.red(`\u274C ${name}: ${operationError.message}`));
       }
     }
   }
-  console.log(chalk54.green(`
+  console.log(chalk56.green(`
 \u{1F389} ${profile.title} \u914D\u7F6E\u5B8C\u6210\uFF01(${completed}/${tools.length})`));
   console.log();
-  console.log(chalk54.bold("\u5907\u4EFD\u4FE1\u606F:"));
+  console.log(chalk56.bold("\u5907\u4EFD\u4FE1\u606F:"));
   if (successBackups.length === 0) {
-    console.log(chalk54.gray("  \u65E0\u6210\u529F\u914D\u7F6E\u9879\uFF0C\u672A\u751F\u6210\u53EF\u7528\u5907\u4EFD\u76EE\u5F55\u3002"));
+    console.log(chalk56.gray("  \u65E0\u6210\u529F\u914D\u7F6E\u9879\uFF0C\u672A\u751F\u6210\u53EF\u7528\u5907\u4EFD\u76EE\u5F55\u3002"));
   } else {
     for (const item of successBackups) {
-      console.log(chalk54.gray(`  ${item.name}: ${item.backupDir}`));
+      console.log(chalk56.gray(`  ${item.name}: ${item.backupDir}`));
       if (item.backupFiles.length === 0) {
-        console.log(chalk54.gray("    - \u65E0\u5386\u53F2\u6587\u4EF6\u53EF\u5907\u4EFD"));
+        console.log(chalk56.gray("    - \u65E0\u5386\u53F2\u6587\u4EF6\u53EF\u5907\u4EFD"));
       } else {
         for (const file of item.backupFiles) {
-          console.log(chalk54.gray(`    - ${file}`));
+          console.log(chalk56.gray(`    - ${file}`));
         }
       }
     }
   }
-  console.log(chalk54.gray("\u63D0\u793A\uFF1A\u8BF7\u91CD\u542F\u5BF9\u5E94\u5DE5\u5177/\u63D2\u4EF6\u4EE5\u4F7F\u914D\u7F6E\u751F\u6548\u3002"));
+  console.log(chalk56.gray("\u63D0\u793A\uFF1A\u8BF7\u91CD\u542F\u5BF9\u5E94\u5DE5\u5177/\u63D2\u4EF6\u4EE5\u4F7F\u914D\u7F6E\u751F\u6548\u3002"));
 }
 async function gmnCommand(apiKey, platformArg, providerNameArg, baseUrlArg) {
   await runGmnCommand(GMN_PROFILE, apiKey, platformArg, providerNameArg, baseUrlArg);
@@ -7763,12 +8320,12 @@ async function gmn1Command(apiKey, platformArg, providerNameArg, baseUrlArg) {
 // src/index.ts
 init_dist2();
 if (process.env.NODE_ENV === "development") {
-  console.log(chalk55.gray("\n[\u5F00\u53D1\u6A21\u5F0F] \u914D\u7F6E\u76EE\u5F55:"));
-  console.log(chalk55.gray(`  ccman: ${getCcmanDir()}`));
-  console.log(chalk55.gray(`  codex:  ${getCodexDir()}`));
-  console.log(chalk55.gray(`  claude: ${getClaudeDir()}`));
-  console.log(chalk55.gray(`  opencode: ${getOpenCodeDir()}`));
-  console.log(chalk55.gray(`  openclaw: ${getOpenClawDir()}`));
+  console.log(chalk57.gray("\n[\u5F00\u53D1\u6A21\u5F0F] \u914D\u7F6E\u76EE\u5F55:"));
+  console.log(chalk57.gray(`  ccman: ${getCcmanDir()}`));
+  console.log(chalk57.gray(`  codex:  ${getCodexDir()}`));
+  console.log(chalk57.gray(`  claude: ${getClaudeDir()}`));
+  console.log(chalk57.gray(`  opencode: ${getOpenCodeDir()}`));
+  console.log(chalk57.gray(`  openclaw: ${getOpenClawDir()}`));
   console.log();
 }
 var program = new Command3();
@@ -7780,7 +8337,7 @@ program.name("ccman").description("Codex/Claude Code/Gemini/OpenCode/OpenClaw AP
 });
 program.on("command:*", (operands) => {
   const unknownCommand = operands[0];
-  console.error(chalk55.red(`
+  console.error(chalk57.red(`
 \u274C \u672A\u77E5\u547D\u4EE4: ${unknownCommand}
 `));
   const availableCommands = [
@@ -7802,13 +8359,13 @@ program.on("command:*", (operands) => {
     (cmd) => cmd.includes(unknownCommand) || unknownCommand.includes(cmd)
   );
   if (suggestions.length > 0) {
-    console.log(chalk55.yellow("\u{1F4A1} \u4F60\u662F\u4E0D\u662F\u60F3\u8F93\u5165:"));
+    console.log(chalk57.yellow("\u{1F4A1} \u4F60\u662F\u4E0D\u662F\u60F3\u8F93\u5165:"));
     suggestions.forEach((cmd) => {
-      console.log(chalk55.cyan(`   ccman ${cmd}`));
+      console.log(chalk57.cyan(`   ccman ${cmd}`));
     });
     console.log();
   }
-  console.log(chalk55.gray("\u67E5\u770B\u6240\u6709\u53EF\u7528\u547D\u4EE4: ") + chalk55.cyan("ccman --help"));
+  console.log(chalk57.gray("\u67E5\u770B\u6240\u6709\u53EF\u7528\u547D\u4EE4: ") + chalk57.cyan("ccman --help"));
   console.log();
   process.exit(1);
 });