yingclaw 2.1.6 → 2.1.8

package/bin/cli.js

@@ -415,7 +415,7 @@ program
     console.log(await getBanner());
 
     try {
-      const ver = execSync('claude --version 2>/dev/null', { encoding: 'utf8' }).trim();
+      const ver = execSync('claude --version', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
       console.log(chalk.green(`\n✔ Claude Code 已安装：${ver}\n`));
       const yes = await confirm({ message: '是否重新安装/更新？', default: false });
       if (!yes) return;
@@ -435,8 +435,8 @@ program
 
     console.log(chalk.dim('\n安装中，实时输出：\n'));
 
-    // 实时输出安装日志
-    const result = spawnSync(installCommand.command, installCommand.args, { stdio: 'inherit' });
+    // 实时输出安装日志（Windows 下 npm 是 npm.cmd，需要 shell: true 才能找到）
+    const result = spawnSync(installCommand.command, installCommand.args, { stdio: 'inherit', shell: process.platform === 'win32' });
 
     if (result.status === 0) {
       console.log(chalk.green('\n✔ Claude Code 安装成功！'));
@@ -857,11 +857,20 @@ program
       return;
     }
 
-    const installCmd = buildClaudeInstallCommand('vpn');
-    const upgradeCmd = { command: installCmd.command, args: [...installCmd.args.slice(0, -1), 'yingclaw@latest'] };
+    const network = await select({ loop: false,
+      message: chalk.cyan('你的网络环境'),
+      choices: [
+        { name: '有梯子 / 海外网络（走官方）', value: 'vpn' },
+        { name: '国内网络 / 没有梯子（走镜像）', value: 'cn' },
+      ],
+    });
+
+    const upgradeArgs = ['install', '-g', 'yingclaw@latest'];
+    if (network === 'cn') upgradeArgs.push('--registry=https://registry.npmmirror.com');
+    const upgradeCmd = { command: 'npm', args: upgradeArgs };
 
     console.log(chalk.dim('\n升级中...\n'));
-    const result = spawnSync(upgradeCmd.command, upgradeCmd.args, { stdio: 'inherit' });
+    const result = spawnSync(upgradeCmd.command, upgradeCmd.args, { stdio: 'inherit', shell: process.platform === 'win32' });
 
     if (result.status === 0) {
       console.log(boxen(
@@ -1042,6 +1051,7 @@ async function runMenu() {
         const child = spawn('claude', [], {
           stdio: 'inherit',
           env: { ...process.env, ...buildClaudeEnv(cfg) },
+          shell: process.platform === 'win32',
         });
         child.on('error', () => {
           console.log(chalk.yellow('\nClaude Code 未找到，请先选择"安装 Claude Code"'));

package/lib/config.js

@@ -407,4 +407,5 @@ module.exports = {
   classifyValidationStatus,
   PROVIDERS,
   CONFIG_FILE,
+  CLAUDE_ENV_KEYS,
 };

package/lib/desktop.js

@@ -6,6 +6,7 @@ const { spawnSync } = require('child_process');
 const { normalizeAnthropicBaseUrl } = require('./config');
 
 const CLAUDE_DESKTOP_LABEL = 'Claude 桌面应用配置';
+const YINGCLAW_ENTRY_NAME = 'yingclaw';
 const DESKTOP_GATEWAY_KEYS = [
   'inferenceProvider',
   'inferenceGatewayBaseUrl',
@@ -84,6 +85,7 @@ function buildClaudeDesktopEnterpriseConfig(config, options = {}) {
   };
 }
 
+// 只清除 yingclaw 写入的那条 entry，保留用户其它 3P 配置
 function clearClaudeDesktopConfigLibrary(options = {}) {
   const dir = options.configLibraryDir || getClaudeDesktopConfigLibraryDir(options);
   if (!dir || !fs.existsSync(dir)) {
@@ -91,27 +93,37 @@ function clearClaudeDesktopConfigLibrary(options = {}) {
   }
 
   const metaFile = path.join(dir, '_meta.json');
+  if (!fs.existsSync(metaFile)) {
+    return { result: 'missing', dir };
+  }
+
   const meta = readJsonFile(metaFile);
-  const ids = new Set();
-  if (typeof meta.appliedId === 'string' && meta.appliedId) {
-    ids.add(meta.appliedId);
+  const entries = Array.isArray(meta.entries) ? meta.entries : [];
+  const yingclawEntries = entries.filter((entry) => entry && entry.name === YINGCLAW_ENTRY_NAME);
+  if (yingclawEntries.length === 0) {
+    return { result: 'missing', dir };
   }
-  if (Array.isArray(meta.entries)) {
-    for (const entry of meta.entries) {
-      if (entry && typeof entry.id === 'string' && entry.id) {
-        ids.add(entry.id);
+
+  for (const entry of yingclawEntries) {
+    if (entry && typeof entry.id === 'string' && entry.id) {
+      const file = path.join(dir, `${entry.id}.json`);
+      if (fs.existsSync(file)) {
+        fs.unlinkSync(file);
       }
     }
   }
 
-  for (const id of ids) {
-    const file = path.join(dir, `${id}.json`);
-    if (fs.existsSync(file)) {
-      fs.unlinkSync(file);
-    }
-  }
-  if (fs.existsSync(metaFile)) {
+  const remaining = entries.filter((entry) => entry && entry.name !== YINGCLAW_ENTRY_NAME);
+  const yingclawIds = new Set(yingclawEntries.map((e) => e.id));
+  const newAppliedId = yingclawIds.has(meta.appliedId)
+    ? (remaining[0]?.id || '')
+    : meta.appliedId;
+
+  if (remaining.length === 0 && !newAppliedId) {
     fs.unlinkSync(metaFile);
+  } else {
+    const newMeta = { ...meta, appliedId: newAppliedId, entries: remaining };
+    fs.writeFileSync(metaFile, JSON.stringify(newMeta, null, 2) + '\n');
   }
 
   return { result: 'updated', dir };
@@ -132,7 +144,10 @@ function writeClaudeDesktopConfig(config, options = {}) {
   const configLibraryDir = path.join(dataDir, 'configLibrary');
   const existingMetaFile = path.join(configLibraryDir, '_meta.json');
   const existingMeta = readJsonFile(existingMetaFile);
-  const uuid = existingMeta.appliedId || options.uuid || crypto.randomUUID();
+  const existingEntries = Array.isArray(existingMeta.entries) ? existingMeta.entries : [];
+  // 用 name='yingclaw' 标记自己的 entry；不复用用户的 appliedId 以免覆盖别家的配置
+  const existingYingclaw = existingEntries.find((entry) => entry && entry.name === YINGCLAW_ENTRY_NAME);
+  const uuid = existingYingclaw?.id || options.uuid || crypto.randomUUID();
 
   const models = collectModels(config);
 
@@ -146,11 +161,13 @@ function writeClaudeDesktopConfig(config, options = {}) {
     deploymentOrganizationUuid: uuid,
   };
 
+  const otherEntries = existingEntries.filter((entry) => entry && entry.name !== YINGCLAW_ENTRY_NAME);
   const meta = {
+    ...existingMeta,
     appliedId: uuid,
-    entries: [{ id: uuid, name: 'yingclaw' }],
-    isManaged: false,
-    platform: process.platform,
+    entries: [...otherEntries, { id: uuid, name: YINGCLAW_ENTRY_NAME }],
+    isManaged: typeof existingMeta.isManaged === 'boolean' ? existingMeta.isManaged : false,
+    platform: existingMeta.platform || process.platform,
   };
 
   fs.mkdirSync(configLibraryDir, { recursive: true });
@@ -210,7 +227,8 @@ function isDesktopConfigured(options = {}) {
   const dir = options.dataDir || getClaudeDesktopDataDir(options);
   if (!dir) return false;
   const meta = readJsonFile(path.join(dir, 'configLibrary', '_meta.json'));
-  return typeof meta.appliedId === 'string' && meta.appliedId.length > 0;
+  if (!Array.isArray(meta.entries)) return false;
+  return meta.entries.some((entry) => entry && entry.name === YINGCLAW_ENTRY_NAME);
 }
 
 function buildClaudeDesktopOpenCommands(platform = process.platform) {

package/package.json

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