yingclaw 2.0.4 → 2.0.7

package/lib/desktop.js

@@ -16,7 +16,7 @@ const DESKTOP_GATEWAY_KEYS = [
   'deploymentOrganizationUuid',
 ];
 
-// Claude 3P 数据目录（与 1P 的 Claude/ 目录区分）
+// Claude Desktop 主进程从 Claude-3p/ 目录读取 deploymentMode 和 enterpriseConfig
 function getClaudeDesktopDataDir(options = {}) {
   const platform = options.platform || process.platform;
   const homeDir = options.homeDir || os.homedir();
@@ -117,39 +117,56 @@ function clearClaudeDesktopConfigLibrary(options = {}) {
   return { result: 'updated', dir };
 }
 
-// 旧版写法：写入 Claude-3p/claude_desktop_config.json，保留用户其他偏好。
+// 写入 Claude-3p/configLibrary/ 下的 enterprise config 条目（主进程从此处读取）
 function writeClaudeDesktopConfig(config, options = {}) {
-  const file = options.configFile || getClaudeDesktopConfigPath(options);
-  if (!file) {
+  const dataDir = options.dataDir || getClaudeDesktopDataDir(options);
+  if (!dataDir) {
     return { result: 'unsupported', file: null };
   }
 
-  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,
-  });
-
-  const next = {
-    ...current,
-    deploymentMode: '3p',
-    enterpriseConfig: {
-      ...existingEnterpriseConfig,
-      ...enterpriseConfig,
-    },
+  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 models = collectModels(config);
+  const baseUrl = normalizeAnthropicBaseUrl(config.baseUrl);
+  if (!baseUrl.startsWith('https://')) {
+    throw new Error('Claude 桌面应用要求 Gateway Base URL 使用 HTTPS');
+  }
+
+  const entry = {
+    inferenceProvider: 'gateway',
+    inferenceGatewayBaseUrl: baseUrl,
+    inferenceGatewayApiKey: config.apiKey,
+    inferenceGatewayAuthScheme: options.authScheme || 'bearer',
+    inferenceModels: models,
+    disableDeploymentModeChooser: true,
+    deploymentOrganizationUuid: uuid,
   };
 
+  const meta = {
+    appliedId: uuid,
+    entries: [{ id: uuid, name: 'yingclaw' }],
+    isManaged: false,
+    platform: process.platform,
+  };
+
+  fs.mkdirSync(configLibraryDir, { recursive: true });
+
+  const entryFile = path.join(configLibraryDir, `${uuid}.json`);
+  const beforeEntry = fs.existsSync(entryFile) ? fs.readFileSync(entryFile, 'utf8') : '';
+  const entryBody = JSON.stringify(entry, null, 2) + '\n';
+  fs.writeFileSync(entryFile, entryBody);
+  fs.writeFileSync(existingMetaFile, JSON.stringify(meta, null, 2) + '\n');
+
+  const file = options.configFile || path.join(dataDir, 'claude_desktop_config.json');
+  const current = readJsonFile(file);
+  const next = { ...current, deploymentMode: '3p' };
   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 };
+  fs.writeFileSync(file, JSON.stringify(next, null, 2) + '\n');
+
+  return { result: beforeEntry === entryBody ? 'unchanged' : 'updated', file };
 }
 
 function clearClaudeDesktopConfig(options = {}) {

package/package.json

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