yingclaw 2.5.18 → 2.5.19

package/bin/cli.js

@@ -21,7 +21,7 @@ const {
 } = require('../lib/config');
 const { execSync, spawn, spawnSync } = require('child_process');
 const pkg = require('../package.json');
-const { getGatewayAutostartStatus, installGatewayAutostart } = require('../lib/autostart');
+const { getGatewayAutostartStatus, installGatewayAutostart, removeGatewayAutostart } = require('../lib/autostart');
 const { buildMenuStatusLines, buildStatusView } = require('../lib/panel');
 const { buildClaudeInstallCommand, checkNodeEnv, getNodeInstallGuide, getInstallFailureHints } = require('../lib/install');
 const { clearClaudeDesktopConfig, isDesktopConfigured, openClaudeDesktop, writeClaudeDesktopConfig } = require('../lib/desktop');
@@ -102,6 +102,20 @@ function getSavedConfigHint() {
   return '⚠ API Key 以明文存储在 ~/.clawai.json';
 }
 
+function clearCurrentProcessClaudeEnv() {
+  for (const key of CLEAR_CLAUDE_ENV_KEYS) {
+    delete process.env[key];
+  }
+}
+
+function desktopConfigClearedPaths(result) {
+  const path = require('path');
+  return [
+    ...(Array.isArray(result.dataDirs) ? result.dataDirs.map(dir => path.join(dir, 'configLibrary/')) : []),
+    ...(Array.isArray(result.files) ? result.files : [result.file]),
+  ].filter(Boolean);
+}
+
 async function offerDesktopSync(chalk, ora, config) {
   if (!isDesktopConfigured()) return;
   const syncDesktop = await confirm({ message: 'Claude 桌面应用已配置，是否同步新模型？', default: true });
@@ -789,7 +803,10 @@ program
         spinner.warn(chalk.yellow('当前系统暂不支持自动配置 Claude 桌面应用'));
         return;
       }
-      spinner.succeed(chalk.green(`Claude 桌面应用配置已写入 → ${result.file}`));
+      const extraFiles = Array.isArray(result.files) && result.files.length > 1
+        ? chalk.dim(`（已同步 ${result.files.length} 个配置位置）`)
+        : '';
+      spinner.succeed(chalk.green(`Claude 桌面应用配置已写入 → ${result.file}`) + extraFiles);
     } catch (e) {
       spinner.fail(chalk.red(`写入失败: ${e.message}`));
       return;
@@ -882,10 +899,7 @@ program
 
     if (result.result === 'updated') {
       spinner.succeed(chalk.green('Claude 桌面应用已恢复默认'));
-      const cleared = [
-        result.dataDir ? require('path').join(result.dataDir, 'configLibrary/') : null,
-        result.file,
-      ].filter(Boolean);
+      const cleared = desktopConfigClearedPaths(result);
       console.log(boxen(
         chalk.bold('已清除 Claude 桌面应用第三方推理配置：\n\n') +
         cleared.map(f => chalk.cyan('  • ' + f)).join('\n'),
@@ -942,8 +956,11 @@ program
     const cleared = resetConfig();
     const desktopCleared = clearClaudeDesktopConfig();
     if (desktopCleared.result === 'updated') {
-      if (desktopCleared.dataDir) cleared.push(require('path').join(desktopCleared.dataDir, 'configLibrary/'));
-      if (desktopCleared.file) cleared.push(desktopCleared.file);
+      cleared.push(...desktopConfigClearedPaths(desktopCleared));
+    }
+    const autostartCleared = removeGatewayAutostart();
+    if (autostartCleared.result === 'removed' && autostartCleared.file) {
+      cleared.push(autostartCleared.file);
     }
 
     if (cleared.length === 0) {
@@ -1272,10 +1289,13 @@ async function runMenu() {
     });
 
     // 改 config 的命令需要刷新缓存
-    if (['config', 'switch', 'reset', 'code-reset'].includes(resolvedAction)) {
+    if (['config', 'switch', 'reset', 'code-reset', 'desktop-reset'].includes(resolvedAction)) {
       lastCheckResult = undefined;
       lastCheckedHash = null;
     }
+    if (process.platform === 'win32' && ['reset', 'code-reset'].includes(resolvedAction)) {
+      clearCurrentProcessClaudeEnv();
+    }
     // 安装 Claude 后刷新检测缓存
     if (resolvedAction === 'install') {
       invalidateClaudeInstalledCache();

package/lib/autostart.js

@@ -188,6 +188,36 @@ function installGatewayAutostart(options = {}) {
   return { result: 'installed', file };
 }
 
+function removeGatewayAutostart(options = {}) {
+  const platform = options.platform || process.platform;
+  if (platform === 'win32') {
+    const file = options.file || getWindowsStartupScriptPath(options);
+    if (!fs.existsSync(file)) {
+      return { result: 'missing', file };
+    }
+    fs.unlinkSync(file);
+    return { result: 'removed', file };
+  }
+
+  if (platform !== 'darwin') {
+    return { result: 'unsupported', file: null };
+  }
+
+  const homeDir = options.homeDir || os.homedir();
+  const file = options.file || getMacLaunchAgentPath({ homeDir });
+  const uid = options.uid || (typeof process.getuid === 'function' ? process.getuid() : null);
+  const runner = options.runner || spawnSync;
+
+  if (uid != null) {
+    runLaunchctl(runner, ['bootout', `gui/${uid}/${GATEWAY_LAUNCH_AGENT_LABEL}`], { optional: true });
+  }
+  if (!fs.existsSync(file)) {
+    return { result: 'missing', file };
+  }
+  fs.unlinkSync(file);
+  return { result: 'removed', file };
+}
+
 function getGatewayAutostartStatus(options = {}) {
   const platform = options.platform || process.platform;
   if (platform === 'win32') {
@@ -237,4 +267,5 @@ module.exports = {
   getMacLaunchAgentPath,
   getWindowsStartupScriptPath,
   installGatewayAutostart,
+  removeGatewayAutostart,
 };

package/lib/config.js

@@ -407,6 +407,9 @@ function clearClaudeCodeEnv(options = {}) {
 
   if (platform === 'win32') {
     runWindowsEnvCommands(buildWindowsClearEnvCommands(), options.runner || spawnSync, { ignoreErrors: true });
+    for (const key of CLEAR_CLAUDE_ENV_KEYS) {
+      delete process.env[key];
+    }
     cleared.push(WINDOWS_ENV_LABEL);
     return cleared;
   }

package/lib/desktop.js

@@ -55,6 +55,25 @@ function getClaudeDesktopDataDir(options = {}) {
   return null;
 }
 
+function getClaudeDesktopDataDirs(options = {}) {
+  if (options.dataDir) return [options.dataDir];
+
+  const platform = options.platform || process.platform;
+  const homeDir = options.homeDir || os.homedir();
+
+  if (platform === 'win32') {
+    const roamingAppData = options.appData || process.env.APPDATA || [homeDir, 'AppData', 'Roaming'].join('\\');
+    const localAppData = options.localAppData || process.env.LOCALAPPDATA || [homeDir, 'AppData', 'Local'].join('\\');
+    return [...new Set([
+      roamingAppData + '\\Claude-3p',
+      localAppData + '\\Claude-3p',
+    ])];
+  }
+
+  const dataDir = getClaudeDesktopDataDir(options);
+  return dataDir ? [dataDir] : [];
+}
+
 function getClaudeDesktopConfigPath(options = {}) {
   const platform = options.platform || process.platform;
   const dataDir = options.dataDir || getClaudeDesktopDataDir(options);
@@ -172,7 +191,8 @@ function buildClaudeDesktopDirectEnterpriseConfig(config, options = {}) {
 
 // 只清除 yingclaw 写入的那条 entry，保留用户其它 3P 配置
 function clearClaudeDesktopConfigLibrary(options = {}) {
-  const dir = options.configLibraryDir || getClaudeDesktopConfigLibraryDir(options);
+  const dataDir = options.dataDir || getClaudeDesktopDataDir(options);
+  const dir = options.configLibraryDir || (dataDir ? path.join(dataDir, 'configLibrary') : null);
   if (!dir || !fs.existsSync(dir)) {
     return { result: 'missing', dir };
   }
@@ -214,17 +234,11 @@ function clearClaudeDesktopConfigLibrary(options = {}) {
   return { result: 'updated', dir };
 }
 
-// 写入 Claude-3p/configLibrary/ 下的 enterprise config 条目（主进程从此处读取）
-function writeClaudeDesktopConfig(config, options = {}) {
+function writeClaudeDesktopConfigToDir(config, options, dataDir) {
   const effectiveConfig = options.direct
     ? config
     : ensureDesktopGatewayConfig(config, options);
 
-  const dataDir = options.dataDir || getClaudeDesktopDataDir(options);
-  if (!dataDir) {
-    return { result: 'unsupported', file: null };
-  }
-
   const configLibraryDir = path.join(dataDir, 'configLibrary');
   const existingMetaFile = path.join(configLibraryDir, '_meta.json');
   const existingMeta = readJsonFile(existingMetaFile);
@@ -257,7 +271,7 @@ function writeClaudeDesktopConfig(config, options = {}) {
     appliedId: uuid,
     entries: [...otherEntries, { id: uuid, name: YINGCLAW_ENTRY_NAME }],
     isManaged: typeof existingMeta.isManaged === 'boolean' ? existingMeta.isManaged : false,
-    platform: existingMeta.platform || process.platform,
+    platform: existingMeta.platform || options.platform || process.platform,
   };
 
   fs.mkdirSync(configLibraryDir, { recursive: true });
@@ -295,9 +309,32 @@ function writeClaudeDesktopConfig(config, options = {}) {
   return { result: beforeEntry === entryBody ? 'unchanged' : 'updated', file, config: effectiveConfig };
 }
 
-function clearClaudeDesktopConfig(options = {}) {
+// 写入 Claude-3p/configLibrary/ 下的 enterprise config 条目（主进程从此处读取）
+function writeClaudeDesktopConfig(config, options = {}) {
+  const dataDirs = options.configFile
+    ? [options.dataDir || path.dirname(options.configFile)]
+    : getClaudeDesktopDataDirs(options);
+  if (dataDirs.length === 0) {
+    return { result: 'unsupported', file: null, files: [] };
+  }
+
+  const results = dataDirs.map((dataDir, index) => {
+    const writeOptions = index === 0
+      ? options
+      : { ...options, configFile: null, dataDir };
+    return writeClaudeDesktopConfigToDir(config, writeOptions, dataDir);
+  });
+  const primary = results[0];
+  return {
+    ...primary,
+    result: results.some((item) => item.result === 'updated') ? 'updated' : primary.result,
+    files: results.map((item) => item.file).filter(Boolean),
+    dataDirs,
+  };
+}
+
+function clearClaudeDesktopConfigAtDir(options = {}, dataDir) {
   // Derive dataDir only when configFile is not explicitly overridden (to avoid touching real system dirs in tests)
-  const dataDir = options.dataDir || (options.configFile ? null : getClaudeDesktopDataDir(options));
   const file = options.configFile || (dataDir ? path.join(dataDir, 'claude_desktop_config.json') : null);
 
   // Clear configLibrary regardless of whether the main config file exists
@@ -320,7 +357,7 @@ function clearClaudeDesktopConfig(options = {}) {
   // Remove legacy enterpriseConfig gateway keys
   if (next.enterpriseConfig && typeof next.enterpriseConfig === 'object') {
     const enterpriseConfig = { ...next.enterpriseConfig };
-    for (const key of DESKTOP_GATEWAY_KEYS) {
+    for (const key of MAC_POLICY_KEYS) {
       delete enterpriseConfig[key];
     }
     if (Object.keys(enterpriseConfig).length > 0) {
@@ -338,12 +375,36 @@ function clearClaudeDesktopConfig(options = {}) {
   return { result: 'updated', file, dataDir };
 }
 
+function clearClaudeDesktopConfig(options = {}) {
+  const dataDirs = options.configFile
+    ? [options.dataDir || path.dirname(options.configFile)]
+    : getClaudeDesktopDataDirs(options);
+
+  if (dataDirs.length === 0) {
+    return { result: 'missing', file: null, files: [], dataDir: null, dataDirs: [] };
+  }
+
+  const results = dataDirs.map((dataDir, index) => {
+    const clearOptions = index === 0
+      ? options
+      : { ...options, configFile: null, dataDir };
+    return clearClaudeDesktopConfigAtDir(clearOptions, dataDir);
+  });
+  const primary = results[0];
+  return {
+    ...primary,
+    result: results.some((item) => item.result === 'updated') ? 'updated' : primary.result,
+    files: results.map((item) => item.file).filter(Boolean),
+    dataDirs,
+  };
+}
+
 function isDesktopConfigured(options = {}) {
-  const dir = options.dataDir || getClaudeDesktopDataDir(options);
-  if (!dir) return false;
-  const meta = readJsonFile(path.join(dir, 'configLibrary', '_meta.json'));
-  if (!Array.isArray(meta.entries)) return false;
-  return meta.entries.some((entry) => entry && entry.name === YINGCLAW_ENTRY_NAME);
+  return getClaudeDesktopDataDirs(options).some((dir) => {
+    const meta = readJsonFile(path.join(dir, 'configLibrary', '_meta.json'));
+    if (!Array.isArray(meta.entries)) return false;
+    return meta.entries.some((entry) => entry && entry.name === YINGCLAW_ENTRY_NAME);
+  });
 }
 
 function buildClaudeDesktopOpenCommands(platform = process.platform, options = {}) {
@@ -432,6 +493,7 @@ module.exports = {
   getClaudeDesktopConfigLibraryDir,
   getClaudeDesktopConfigPath,
   getClaudeDesktopDataDir,
+  getClaudeDesktopDataDirs,
   isDesktopConfigured,
   openClaudeDesktop,
   writeClaudeDesktopConfig,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yingclaw",
-  "version": "2.5.18",
+  "version": "2.5.19",
   "description": "Claude Code × 国产大模型一键接入：DeepSeek、Kimi、Qwen、MiniMax、GLM、MiMo",
   "main": "index.js",
   "bin": {