yingclaw 2.0.1 → 2.0.6

package/README.md

@@ -124,10 +124,10 @@ npm uninstall -g yingclaw
 
 `claw desktop` 会额外写入 Claude Desktop 第三方推理配置：
 
-- macOS：`~/Library/Application Support/Claude-3p/configLibrary/`
-- Windows：`%LOCALAPPDATA%\Claude-3p\configLibrary`
+- macOS：`~/Library/Application Support/Claude-3p/claude_desktop_config.json`
+- Windows：`%APPDATA%\Claude-3p\claude_desktop_config.json`
 
-写入的 `enterpriseConfig` 使用 `inferenceProvider=gateway`、`inferenceGatewayAuthScheme=bearer`，并把可用于 Claude 桌面的模型路由写入 `inferenceModels`。DeepSeek 的终端模型仍使用 `deepseek-v4-pro[1m]` / `deepseek-v4-flash`；Claude 桌面应用会使用 DeepSeek 支持的 Anthropic 路由名：`claude-sonnet-4-5`、`claude-opus-4-5`、`claude-haiku-4-5`。
+写入的 `enterpriseConfig` 使用 `inferenceProvider=gateway`、`inferenceGatewayAuthScheme=bearer`，并按旧版方式把当前厂商模型写入 `inferenceModels`。如果本机存在新版 `configLibrary` 本地配置，`claw desktop` 会同步移除，避免 Claude 优先读取旧的错误配置。DeepSeek 的 Claude Code 终端模型仍使用 `deepseek-v4-pro[1m]`；Claude 桌面应用会写入 `deepseek-v4-pro` 和 `deepseek-v4-flash`。
 
 ## License
 

package/lib/desktop.js

@@ -6,7 +6,15 @@ const { spawnSync } = require('child_process');
 const { normalizeAnthropicBaseUrl } = require('./config');
 
 const CLAUDE_DESKTOP_LABEL = 'Claude 桌面应用配置';
-const CONFIG_NAME = 'yingclaw';
+const DESKTOP_GATEWAY_KEYS = [
+  'inferenceProvider',
+  'inferenceGatewayBaseUrl',
+  'inferenceGatewayApiKey',
+  'inferenceGatewayAuthScheme',
+  'inferenceModels',
+  'disableDeploymentModeChooser',
+  'deploymentOrganizationUuid',
+];
 
 // Claude 3P 数据目录（与 1P 的 Claude/ 目录区分）
 function getClaudeDesktopDataDir(options = {}) {
@@ -18,23 +26,21 @@ function getClaudeDesktopDataDir(options = {}) {
   }
 
   if (platform === 'win32') {
-    const localAppData = options.localAppData || process.env.LOCALAPPDATA || path.join(homeDir, 'AppData', 'Local');
-    return path.join(localAppData, 'Claude-3p');
+    const appData = options.appData || process.env.APPDATA || options.localAppData || path.join(homeDir, 'AppData', 'Roaming');
+    return path.join(appData, 'Claude-3p');
   }
 
   return null;
 }
 
-function getClaudeDesktopConfigLibrary(options = {}) {
+function getClaudeDesktopConfigPath(options = {}) {
   const dataDir = options.dataDir || getClaudeDesktopDataDir(options);
-  if (!dataDir) return null;
-  return path.join(dataDir, 'configLibrary');
+  return dataDir ? path.join(dataDir, 'claude_desktop_config.json') : null;
 }
 
-// 兼容旧测试名（指向 _meta.json 入口）
-function getClaudeDesktopConfigPath(options = {}) {
-  const lib = getClaudeDesktopConfigLibrary(options);
-  return lib ? path.join(lib, '_meta.json') : null;
+function getClaudeDesktopConfigLibraryDir(options = {}) {
+  const dataDir = options.dataDir || getClaudeDesktopDataDir(options);
+  return dataDir ? path.join(dataDir, 'configLibrary') : null;
 }
 
 function readJsonFile(file) {
@@ -45,24 +51,19 @@ function readJsonFile(file) {
   }
 }
 
-function isDeepSeekConfig(config) {
-  const baseUrl = normalizeAnthropicBaseUrl(config.baseUrl);
-  return config.provider === 'deepseek' || baseUrl === 'https://api.deepseek.com/anthropic';
+function normalizeLegacyDesktopModelId(model) {
+  return model.replace(/\[\w+\]$/, '');
 }
 
-function getDesktopGatewayModels(config) {
-  if (isDeepSeekConfig(config)) {
-    return ['claude-sonnet-4-5', 'claude-opus-4-5', 'claude-haiku-4-5'];
-  }
+function toDesktopModelId(model) {
+  return model.startsWith('claude-') ? model : `claude-${model}`;
+}
 
+function collectModels(config) {
   const list = Array.isArray(config.availableModels) && config.availableModels.length > 0
     ? [config.model, config.fastModel, ...config.availableModels]
     : [config.model, config.fastModel];
-  return list.filter(Boolean);
-}
-
-function collectModels(config) {
-  return [...new Set(getDesktopGatewayModels(config))];
+  return [...new Set(list.filter(Boolean).map(normalizeLegacyDesktopModelId).map(toDesktopModelId))];
 }
 
 // 按官方 schema：所有值必须是字符串（包括布尔、数组都序列化）
@@ -83,92 +84,104 @@ function buildClaudeDesktopEnterpriseConfig(config, options = {}) {
   };
 }
 
-// 写入官方 3P 配置目录：configLibrary/_meta.json + configLibrary/<id>.json
-function writeClaudeDesktopConfig(config, options = {}) {
-  const lib = options.configLibrary || getClaudeDesktopConfigLibrary(options);
-  if (!lib) {
-    return { result: 'unsupported', file: null };
+function clearClaudeDesktopConfigLibrary(options = {}) {
+  const dir = options.configLibraryDir || getClaudeDesktopConfigLibraryDir(options);
+  if (!dir || !fs.existsSync(dir)) {
+    return { result: 'missing', dir };
+  }
+
+  const metaFile = path.join(dir, '_meta.json');
+  const meta = readJsonFile(metaFile);
+  const ids = new Set();
+  if (typeof meta.appliedId === 'string' && meta.appliedId) {
+    ids.add(meta.appliedId);
+  }
+  if (Array.isArray(meta.entries)) {
+    for (const entry of meta.entries) {
+      if (entry && typeof entry.id === 'string' && entry.id) {
+        ids.add(entry.id);
+      }
+    }
   }
 
-  fs.mkdirSync(lib, { recursive: true });
+  for (const id of ids) {
+    const file = path.join(dir, `${id}.json`);
+    if (fs.existsSync(file)) {
+      fs.unlinkSync(file);
+    }
+  }
+  if (fs.existsSync(metaFile)) {
+    fs.unlinkSync(metaFile);
+  }
 
-  // 读已有 _meta.json，复用 entry id（保持稳定 UUID）
-  const metaFile = path.join(lib, '_meta.json');
-  const existingMeta = readJsonFile(metaFile);
-  const existingEntry = Array.isArray(existingMeta.entries)
-    ? existingMeta.entries.find(e => e.name === CONFIG_NAME)
-    : null;
+  return { result: 'updated', dir };
+}
 
-  const entryId = existingEntry?.id || crypto.randomUUID();
+// 旧版写法：写入 Claude-3p/claude_desktop_config.json，保留用户其他偏好。
+function writeClaudeDesktopConfig(config, options = {}) {
+  const file = options.configFile || getClaudeDesktopConfigPath(options);
+  if (!file) {
+    return { result: 'unsupported', file: null };
+  }
 
-  // 读已有 <id>.json，复用 deploymentOrganizationUuid
-  const configFile = path.join(lib, `${entryId}.json`);
-  const existingConfig = readJsonFile(configFile);
-  const deploymentUuid = existingConfig.deploymentOrganizationUuid || options.uuid;
+  const current = readJsonFile(file);
+  const existingEnterpriseConfig = current.enterpriseConfig && typeof current.enterpriseConfig === 'object'
+    ? current.enterpriseConfig
+    : {};
+  const deploymentUuid = existingEnterpriseConfig.deploymentOrganizationUuid || options.uuid;
 
   const enterpriseConfig = buildClaudeDesktopEnterpriseConfig(config, {
     authScheme: options.authScheme,
     uuid: deploymentUuid,
   });
 
-  // 写 <id>.json
-  fs.writeFileSync(configFile, JSON.stringify(enterpriseConfig, null, 2) + '\n');
-
-  // 更新 _meta.json：appliedId + entries（复用其他 entry，仅替换 yingclaw 这一条）
-  const otherEntries = Array.isArray(existingMeta.entries)
-    ? existingMeta.entries.filter(e => e.name !== CONFIG_NAME)
-    : [];
-  const meta = {
-    appliedId: entryId,
-    entries: [
-      ...otherEntries,
-      {
-        id: entryId,
-        name: CONFIG_NAME,
-        provider: 'gateway',
-        note: enterpriseConfig.inferenceGatewayBaseUrl,
-      },
-    ],
+  const next = {
+    ...current,
+    deploymentMode: '3p',
+    enterpriseConfig: {
+      ...existingEnterpriseConfig,
+      ...enterpriseConfig,
+    },
   };
-  fs.writeFileSync(metaFile, JSON.stringify(meta, null, 2) + '\n');
 
-  return { result: 'updated', file: lib, entryId };
+  fs.mkdirSync(path.dirname(file), { recursive: true });
+  const before = fs.existsSync(file) ? fs.readFileSync(file, 'utf8') : '';
+  const body = JSON.stringify(next, null, 2) + '\n';
+  fs.writeFileSync(file, body);
+  clearClaudeDesktopConfigLibrary({ ...options, dataDir: path.dirname(file) });
+  return { result: before === body ? 'unchanged' : 'updated', file };
 }
 
 function clearClaudeDesktopConfig(options = {}) {
-  const lib = options.configLibrary || getClaudeDesktopConfigLibrary(options);
-  if (!lib || !fs.existsSync(lib)) {
-    return { result: 'missing', file: lib };
+  const file = options.configFile || getClaudeDesktopConfigPath(options);
+  if (!file || !fs.existsSync(file)) {
+    return { result: 'missing', file };
   }
 
-  const metaFile = path.join(lib, '_meta.json');
-  const meta = readJsonFile(metaFile);
-  const entries = Array.isArray(meta.entries) ? meta.entries : [];
-  const yingclawEntry = entries.find(e => e.name === CONFIG_NAME);
-
-  if (!yingclawEntry) {
-    return { result: 'missing', file: lib };
+  const current = readJsonFile(file);
+  if (!current.enterpriseConfig || typeof current.enterpriseConfig !== 'object') {
+    return { result: 'missing', file };
   }
 
-  // 删除 <id>.json
-  const configFile = path.join(lib, `${yingclawEntry.id}.json`);
-  if (fs.existsSync(configFile)) {
-    fs.unlinkSync(configFile);
+  const enterpriseConfig = { ...current.enterpriseConfig };
+  for (const key of DESKTOP_GATEWAY_KEYS) {
+    delete enterpriseConfig[key];
   }
 
-  // 更新 _meta.json
-  const remaining = entries.filter(e => e.name !== CONFIG_NAME);
-  if (remaining.length === 0) {
-    fs.unlinkSync(metaFile);
+  const next = { ...current };
+  if (Object.keys(enterpriseConfig).length > 0) {
+    next.enterpriseConfig = enterpriseConfig;
   } else {
-    const newMeta = {
-      appliedId: meta.appliedId === yingclawEntry.id ? (remaining[0]?.id || '') : meta.appliedId,
-      entries: remaining,
-    };
-    fs.writeFileSync(metaFile, JSON.stringify(newMeta, null, 2) + '\n');
+    delete next.enterpriseConfig;
+  }
+  if (Object.keys(next).length === 1 && next.deploymentMode === '3p') {
+    delete next.deploymentMode;
   }
 
-  return { result: 'updated', file: lib };
+  fs.writeFileSync(file, JSON.stringify(next, null, 2) + '\n');
+  clearClaudeDesktopConfigLibrary({ ...options, dataDir: path.dirname(file) });
+
+  return { result: 'updated', file };
 }
 
 function buildClaudeDesktopOpenCommands(platform = process.platform) {
@@ -194,10 +207,11 @@ async function openClaudeDesktop(options = {}) {
 
   const runner = options.runner || spawnSync;
   const isMocked = options.runner !== undefined;
+  const timeoutMs = options.timeoutMs || 5000;
 
   const trace = [];
   for (const { command, args, optional, waitAfter } of commands) {
-    const result = runner(command, args, { stdio: 'pipe', encoding: 'utf8', windowsHide: true });
+    const result = runner(command, args, { stdio: 'pipe', encoding: 'utf8', windowsHide: true, timeout: timeoutMs });
     const stderr = (result.stderr || '').toString().trim();
     trace.push({ command, args, status: result.status, stderr });
 
@@ -220,7 +234,6 @@ module.exports = {
   clearClaudeDesktopConfig,
   getClaudeDesktopConfigPath,
   getClaudeDesktopDataDir,
-  getClaudeDesktopConfigLibrary,
   openClaudeDesktop,
   writeClaudeDesktopConfig,
   CLAUDE_DESKTOP_LABEL,

package/package.json

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