yingclaw 1.9.1 → 2.0.0

package/lib/desktop.js

@@ -6,32 +6,37 @@ const { spawnSync } = require('child_process');
 const { normalizeAnthropicBaseUrl } = require('./config');
 
 const CLAUDE_DESKTOP_LABEL = 'Claude 桌面应用配置';
-const DESKTOP_GATEWAY_KEYS = [
-  'inferenceProvider',
-  'inferenceGatewayBaseUrl',
-  'inferenceGatewayApiKey',
-  'inferenceGatewayAuthScheme',
-  'inferenceModels',
-  'disableDeploymentModeChooser',
-  'deploymentOrganizationUuid',
-];
+const CONFIG_NAME = 'yingclaw';
 
-function getClaudeDesktopConfigPath(options = {}) {
+// Claude 3P 数据目录（与 1P 的 Claude/ 目录区分）
+function getClaudeDesktopDataDir(options = {}) {
   const platform = options.platform || process.platform;
   const homeDir = options.homeDir || os.homedir();
 
   if (platform === 'darwin') {
-    return path.join(homeDir, 'Library', 'Application Support', 'Claude', 'claude_desktop_config.json');
+    return path.join(homeDir, 'Library', 'Application Support', 'Claude-3p');
   }
 
   if (platform === 'win32') {
-    const appData = options.appData || process.env.APPDATA || path.join(homeDir, 'AppData', 'Roaming');
-    return path.join(appData, 'Claude', 'claude_desktop_config.json');
+    const localAppData = options.localAppData || process.env.LOCALAPPDATA || path.join(homeDir, 'AppData', 'Local');
+    return path.join(localAppData, 'Claude-3p');
   }
 
   return null;
 }
 
+function getClaudeDesktopConfigLibrary(options = {}) {
+  const dataDir = options.dataDir || getClaudeDesktopDataDir(options);
+  if (!dataDir) return null;
+  return path.join(dataDir, 'configLibrary');
+}
+
+// 兼容旧测试名（指向 _meta.json 入口）
+function getClaudeDesktopConfigPath(options = {}) {
+  const lib = getClaudeDesktopConfigLibrary(options);
+  return lib ? path.join(lib, '_meta.json') : null;
+}
+
 function readJsonFile(file) {
   try {
     return JSON.parse(fs.readFileSync(file, 'utf8'));
@@ -41,14 +46,13 @@ function readJsonFile(file) {
 }
 
 function collectModels(config) {
-  // 优先用 config 中保存的全量模型列表（setup/switch 时联网拉取的）
-  // 退化：主模型 + 快速模型
   const list = Array.isArray(config.availableModels) && config.availableModels.length > 0
     ? [config.model, config.fastModel, ...config.availableModels]
     : [config.model, config.fastModel];
   return [...new Set(list.filter(Boolean))];
 }
 
+// 按官方 schema：所有值必须是字符串（包括布尔、数组都序列化）
 function buildClaudeDesktopEnterpriseConfig(config, options = {}) {
   const models = collectModels(config);
   const baseUrl = normalizeAnthropicBaseUrl(config.baseUrl);
@@ -66,67 +70,97 @@ function buildClaudeDesktopEnterpriseConfig(config, options = {}) {
   };
 }
 
+// 写入官方 3P 配置目录：configLibrary/_meta.json + configLibrary/<id>.json
 function writeClaudeDesktopConfig(config, options = {}) {
-  const file = options.configFile || getClaudeDesktopConfigPath(options);
-  if (!file) {
+  const lib = options.configLibrary || getClaudeDesktopConfigLibrary(options);
+  if (!lib) {
     return { result: 'unsupported', file: null };
   }
 
-  const current = readJsonFile(file);
-  const existingEnterpriseConfig = current.enterpriseConfig && typeof current.enterpriseConfig === 'object'
-    ? current.enterpriseConfig
-    : {};
-  const deploymentOrganizationUuid = existingEnterpriseConfig.deploymentOrganizationUuid || options.uuid;
+  fs.mkdirSync(lib, { recursive: true });
+
+  // 读已有 _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;
+
+  const entryId = existingEntry?.id || crypto.randomUUID();
+
+  // 读已有 <id>.json，复用 deploymentOrganizationUuid
+  const configFile = path.join(lib, `${entryId}.json`);
+  const existingConfig = readJsonFile(configFile);
+  const deploymentUuid = existingConfig.deploymentOrganizationUuid || options.uuid;
+
   const enterpriseConfig = buildClaudeDesktopEnterpriseConfig(config, {
     authScheme: options.authScheme,
-    uuid: deploymentOrganizationUuid,
+    uuid: deploymentUuid,
   });
 
-  const next = {
-    ...current,
-    enterpriseConfig: {
-      ...existingEnterpriseConfig,
-      ...enterpriseConfig,
-    },
+  // 写 <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,
+      },
+    ],
   };
+  fs.writeFileSync(metaFile, JSON.stringify(meta, null, 2) + '\n');
 
-  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);
-  return { result: before === body ? 'unchanged' : 'updated', file };
+  return { result: 'updated', file: lib, entryId };
 }
 
 function clearClaudeDesktopConfig(options = {}) {
-  const file = options.configFile || getClaudeDesktopConfigPath(options);
-  if (!file || !fs.existsSync(file)) {
-    return { result: 'missing', file };
+  const lib = options.configLibrary || getClaudeDesktopConfigLibrary(options);
+  if (!lib || !fs.existsSync(lib)) {
+    return { result: 'missing', file: lib };
   }
 
-  const current = readJsonFile(file);
-  if (!current.enterpriseConfig || typeof current.enterpriseConfig !== 'object') {
-    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 enterpriseConfig = { ...current.enterpriseConfig };
-  for (const key of DESKTOP_GATEWAY_KEYS) {
-    delete enterpriseConfig[key];
+  // 删除 <id>.json
+  const configFile = path.join(lib, `${yingclawEntry.id}.json`);
+  if (fs.existsSync(configFile)) {
+    fs.unlinkSync(configFile);
   }
 
-  const next = { ...current };
-  if (Object.keys(enterpriseConfig).length > 0) {
-    next.enterpriseConfig = enterpriseConfig;
+  // 更新 _meta.json
+  const remaining = entries.filter(e => e.name !== CONFIG_NAME);
+  if (remaining.length === 0) {
+    fs.unlinkSync(metaFile);
   } else {
-    delete next.enterpriseConfig;
+    const newMeta = {
+      appliedId: meta.appliedId === yingclawEntry.id ? (remaining[0]?.id || '') : meta.appliedId,
+      entries: remaining,
+    };
+    fs.writeFileSync(metaFile, JSON.stringify(newMeta, null, 2) + '\n');
   }
 
-  fs.writeFileSync(file, JSON.stringify(next, null, 2) + '\n');
-  return { result: 'updated', file };
+  return { result: 'updated', file: lib };
 }
 
 function buildClaudeDesktopOpenCommands(platform = process.platform) {
   if (platform !== 'darwin') return null;
-  // 先 graceful quit，SIGTERM 兜底，SIGKILL 强制清理，再 open，最后 activate
+  // 必须先完全退出 Claude，新配置只在启动时读取一次
   return [
     { command: 'osascript', args: ['-e', 'tell application "Claude" to quit'], optional: true, waitAfter: 800 },
     { command: 'pkill', args: ['-TERM', '-x', 'Claude'], optional: true, waitAfter: 500 },
@@ -172,6 +206,8 @@ module.exports = {
   buildClaudeDesktopOpenCommands,
   clearClaudeDesktopConfig,
   getClaudeDesktopConfigPath,
+  getClaudeDesktopDataDir,
+  getClaudeDesktopConfigLibrary,
   openClaudeDesktop,
   writeClaudeDesktopConfig,
   CLAUDE_DESKTOP_LABEL,

package/package.json

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