yingclaw 2.5.2 → 2.5.3

package/bin/cli.js

@@ -26,6 +26,8 @@ const { clearClaudeDesktopConfig, isDesktopConfigured, openClaudeDesktop, writeC
 const {
   DEFAULT_DESKTOP_GATEWAY_PORT,
   YINGCLAW_GATEWAY_PREFIX,
+  buildDesktopGatewayMappingRows,
+  checkDesktopGatewayStatus,
   createGatewayServer,
   ensureDesktopGatewayConfig,
 } = require('../lib/gateway');
@@ -238,6 +240,7 @@ async function showStatus() {
   const view = buildStatusView(config, {
     apiStatus: valid,
     claudeInstalled: isClaudeInstalled(),
+    desktopGatewayStatus: await checkDesktopGatewayStatus(config),
     env: process.env,
   });
 
@@ -248,7 +251,9 @@ async function showStatus() {
         ? chalk.yellow(value)
         : label === 'Base URL'
           ? chalk.cyan(value)
-          : label === '当前终端' && value === '未生效'
+        : label === 'Desktop Gateway'
+          ? value.includes('已运行') ? chalk.green(value) : chalk.yellow(value)
+        : label === '当前终端' && value === '未生效'
             ? chalk.yellow(value)
             : value;
     return `${chalk.dim(label + ':')} ${coloredValue}`;
@@ -768,7 +773,10 @@ program
         chalk.yellow('直连模式可能被新版 Claude Desktop 拒绝非 Claude 模型名。')
       : chalk.dim('Gateway  ') + chalk.cyan(gatewayUrl) + '\n' +
         chalk.dim('主模型    ') + chalk.yellow(desktopConfig.model) + '\n' +
-        chalk.dim('快速模型  ') + chalk.yellow(desktopConfig.fastModel || desktopConfig.model) + '\n\n' +
+        chalk.dim('快速模型  ') + chalk.yellow(desktopConfig.fastModel || desktopConfig.model) + '\n' +
+        chalk.dim('菜单映射  ') + buildDesktopGatewayMappingRows(desktopConfig)
+          .map((row) => `${chalk.white(row.desktopLabel)} ${chalk.dim('→')} ${chalk.yellow(row.upstreamModel)}`)
+          .join('\n' + chalk.dim('          ')) + '\n\n' +
         chalk.cyan('使用前请运行: claw gateway');
 
     console.log(boxen(
@@ -1032,6 +1040,7 @@ async function renderStatusBar(apiStatus) {
     const view = buildStatusView(config, {
       apiStatus,
       claudeInstalled,
+      desktopGatewayStatus: await checkDesktopGatewayStatus(config, { timeoutMs: 250 }),
       env: process.env,
     });
     const statusLines = buildMenuStatusLines(view, { apiStatus, claudeInstalled, platform: process.platform });
@@ -1039,6 +1048,8 @@ async function renderStatusBar(apiStatus) {
       if (index === 0) return line.replace('API 正常', chalk.green('API 正常')).replace('API Key 无效', chalk.red('API Key 无效')).replace('网络/服务异常', chalk.yellow('网络/服务异常'));
       if (line.startsWith('环境变量未生效')) return chalk.yellow(line);
       if (line.startsWith('旧模型名')) return chalk.yellow(line);
+      if (line.startsWith('Desktop Gateway 未运行')) return chalk.yellow(line);
+      if (line.startsWith('Desktop Gateway 已运行')) return chalk.green(line);
       if (line.startsWith('主模型')) return line.replace(view.mainModel, chalk.yellow(view.mainModel)).replace(view.fastModel, chalk.yellow(view.fastModel));
       return line;
     }).join('\n  ');

package/lib/desktop.js

@@ -12,6 +12,7 @@ const {
 
 const CLAUDE_DESKTOP_LABEL = 'Claude 桌面应用配置';
 const YINGCLAW_ENTRY_NAME = 'yingclaw';
+const MAC_POLICY_BUNDLE = 'com.anthropic.claudefordesktop';
 const DESKTOP_GATEWAY_KEYS = [
   'inferenceProvider',
   'inferenceGatewayBaseUrl',
@@ -22,6 +23,15 @@ const DESKTOP_GATEWAY_KEYS = [
   'deploymentOrganizationUuid',
 ];
 
+function buildRuntimeEnterpriseConfig(entry) {
+  return {
+    ...entry,
+    inferenceGatewayHeaders: [],
+    isClaudeCodeForDesktopEnabled: true,
+    coworkEgressAllowedHosts: ['*'],
+  };
+}
+
 // Claude Desktop 主进程从 Claude-3p/ 目录读取 deploymentMode 和 enterpriseConfig
 function getClaudeDesktopDataDir(options = {}) {
   const platform = options.platform || process.platform;
@@ -85,6 +95,29 @@ function serializeGatewayModels(config) {
   });
 }
 
+function buildClaudeDesktopMacDefaultsCommands(entry) {
+  const runtime = buildRuntimeEnterpriseConfig(entry);
+  return [
+    { command: 'defaults', args: ['write', MAC_POLICY_BUNDLE, 'inferenceProvider', '-string', runtime.inferenceProvider] },
+    { command: 'defaults', args: ['write', MAC_POLICY_BUNDLE, 'inferenceGatewayBaseUrl', '-string', runtime.inferenceGatewayBaseUrl] },
+    { command: 'defaults', args: ['write', MAC_POLICY_BUNDLE, 'inferenceGatewayApiKey', '-string', runtime.inferenceGatewayApiKey] },
+    { command: 'defaults', args: ['write', MAC_POLICY_BUNDLE, 'inferenceGatewayAuthScheme', '-string', runtime.inferenceGatewayAuthScheme] },
+    { command: 'defaults', args: ['write', MAC_POLICY_BUNDLE, 'inferenceGatewayHeaders', '-string', JSON.stringify(runtime.inferenceGatewayHeaders)] },
+    { command: 'defaults', args: ['write', MAC_POLICY_BUNDLE, 'inferenceModels', '-string', JSON.stringify(runtime.inferenceModels)] },
+    { command: 'defaults', args: ['write', MAC_POLICY_BUNDLE, 'isClaudeCodeForDesktopEnabled', '-int', '1'] },
+    { command: 'defaults', args: ['write', MAC_POLICY_BUNDLE, 'coworkEgressAllowedHosts', '-string', JSON.stringify(runtime.coworkEgressAllowedHosts)] },
+  ];
+}
+
+function writeClaudeDesktopMacDefaults(entry) {
+  for (const { command, args } of buildClaudeDesktopMacDefaultsCommands(entry)) {
+    const result = spawnSync(command, args, { encoding: 'utf8' });
+    if (result.status !== 0) {
+      throw new Error(`macOS policy 写入失败: ${args[2] || command}`);
+    }
+  }
+}
+
 function buildClaudeDesktopEnterpriseConfig(config, options = {}) {
   const gatewayConfig = ensureDesktopGatewayConfig(config, options);
   const models = serializeGatewayModels(gatewayConfig);
@@ -196,6 +229,7 @@ function writeClaudeDesktopConfig(config, options = {}) {
     disableDeploymentModeChooser: true,
     deploymentOrganizationUuid: uuid,
   };
+  const runtimeEntry = buildRuntimeEnterpriseConfig(entry);
 
   const otherEntries = existingEntries.filter((entry) => entry && entry.name !== YINGCLAW_ENTRY_NAME);
   const meta = {
@@ -216,10 +250,28 @@ function writeClaudeDesktopConfig(config, options = {}) {
 
   const file = options.configFile || path.join(dataDir, 'claude_desktop_config.json');
   const current = readJsonFile(file);
-  const next = { ...current, deploymentMode: '3p' };
+  const currentEnterprise = current.enterpriseConfig && typeof current.enterpriseConfig === 'object'
+    ? current.enterpriseConfig
+    : {};
+  const next = {
+    ...current,
+    deploymentMode: '3p',
+    enterpriseConfig: {
+      ...currentEnterprise,
+      ...runtimeEntry,
+    },
+  };
   fs.mkdirSync(path.dirname(file), { recursive: true });
   fs.writeFileSync(file, JSON.stringify(next, null, 2) + '\n');
 
+  const shouldWritePlatformPolicy = (options.platform || process.platform) === 'darwin'
+    && !options.dataDir
+    && !options.configFile
+    && options.writePlatformPolicy !== false;
+  if (shouldWritePlatformPolicy) {
+    writeClaudeDesktopMacDefaults(entry);
+  }
+
   return { result: beforeEntry === entryBody ? 'unchanged' : 'updated', file, config: effectiveConfig };
 }
 
@@ -330,6 +382,7 @@ async function openClaudeDesktop(options = {}) {
 module.exports = {
   buildClaudeDesktopEnterpriseConfig,
   buildClaudeDesktopDirectEnterpriseConfig,
+  buildClaudeDesktopMacDefaultsCommands,
   buildClaudeDesktopOpenCommands,
   clearClaudeDesktopConfig,
   getClaudeDesktopConfigLibraryDir,

package/lib/gateway.js

@@ -6,9 +6,9 @@ const DEFAULT_DESKTOP_GATEWAY_PORT = 18080;
 const YINGCLAW_GATEWAY_PREFIX = '/yingclaw';
 const DESKTOP_ROUTE_SPECS = [
   { id: 'claude-sonnet-4-6', displayName: 'Sonnet', upstreamKey: 'model' },
-  { id: 'claude-opus-4-7', displayName: 'Opus', upstreamKey: 'model' },
   { id: 'claude-haiku-4-5', displayName: 'Haiku', upstreamKey: 'fastModel' },
 ];
+const ONE_M_CONTEXT_SUFFIX = ' [1M]';
 
 function createGatewayKey() {
   return `ygw-${crypto.randomUUID()}`;
@@ -27,24 +27,55 @@ function modelSupports1m(model) {
   return /\[1m\]/i.test(String(model || ''));
 }
 
+function stripOneMContextSuffix(model) {
+  const value = String(model || '').trim();
+  return value.replace(/\s*\[1m\]\s*$/i, '');
+}
+
+function desktopRouteId(routeId, supports1m) {
+  const base = stripOneMContextSuffix(routeId);
+  return supports1m ? `${base}${ONE_M_CONTEXT_SUFFIX}` : base;
+}
+
+function desktopRouteLabel(routeId) {
+  const raw = String(routeId || '').trim();
+  const is1m = /\[1m\]\s*$/i.test(raw);
+  const base = stripOneMContextSuffix(raw).replace(/^anthropic\//i, '').replace(/^claude-/i, '');
+  const parts = base.split('-').filter(Boolean);
+  const family = parts.shift() || base;
+  const version = parts.join('.');
+  const label = `${family.charAt(0).toUpperCase()}${family.slice(1)}${version ? ` ${version}` : ''}`;
+  return is1m ? `${label} 1M` : label;
+}
+
 function buildDesktopGatewayRoutes(config) {
   const fastModel = config.fastModel || config.model;
   const source = { model: config.model, fastModel };
   return DESKTOP_ROUTE_SPECS
     .map((spec) => {
       const upstreamModel = source[spec.upstreamKey];
+      const supports1m = modelSupports1m(upstreamModel);
       return upstreamModel ? {
-        id: spec.id,
+        id: desktopRouteId(spec.id, supports1m),
         displayName: spec.displayName,
         upstreamModel,
-        supports1m: modelSupports1m(upstreamModel),
+        supports1m,
       } : null;
     })
     .filter(Boolean);
 }
 
+function buildDesktopGatewayMappingRows(config) {
+  return buildDesktopGatewayRoutes(config).map((route) => ({
+    routeId: route.id,
+    desktopLabel: desktopRouteLabel(route.id),
+    upstreamModel: route.upstreamModel,
+  }));
+}
+
 function mapDesktopRouteToUpstream(config, routeId) {
-  const route = buildDesktopGatewayRoutes(config).find((item) => item.id === routeId);
+  const requested = stripOneMContextSuffix(routeId);
+  const route = buildDesktopGatewayRoutes(config).find((item) => stripOneMContextSuffix(item.id) === requested);
   if (!route) {
     throw new Error(`未配置的 Claude Desktop 模型路由: ${routeId}`);
   }
@@ -98,6 +129,45 @@ function providerMessagesUrl(config) {
   return `${normalizeAnthropicBaseUrl(config.baseUrl)}/v1/messages`;
 }
 
+function buildDesktopGatewayUrl(config = {}) {
+  const port = Number.parseInt(config.desktopGatewayPort || DEFAULT_DESKTOP_GATEWAY_PORT, 10);
+  return {
+    port,
+    url: `http://127.0.0.1:${port}${YINGCLAW_GATEWAY_PREFIX}`,
+  };
+}
+
+async function checkDesktopGatewayStatus(config = {}, options = {}) {
+  const { port, url } = buildDesktopGatewayUrl(config);
+  const fetchImpl = options.fetch || fetch;
+  const configured = !!config.desktopGatewayKey;
+
+  if (!configured) {
+    return { configured: false, running: false, port, url, error: null };
+  }
+
+  try {
+    const response = await fetchImpl(`${url}/health`, {
+      signal: AbortSignal.timeout(options.timeoutMs || 800),
+    });
+    return {
+      configured: true,
+      running: response.ok,
+      port,
+      url,
+      error: response.ok ? null : `HTTP ${response.status}`,
+    };
+  } catch (error) {
+    return {
+      configured: true,
+      running: false,
+      port,
+      url,
+      error: error.message,
+    };
+  }
+}
+
 async function proxyMessages(req, res, config) {
   const raw = await readRequestBody(req);
   let body;
@@ -188,11 +258,18 @@ module.exports = {
   DEFAULT_DESKTOP_GATEWAY_PORT,
   YINGCLAW_GATEWAY_PREFIX,
   DESKTOP_ROUTE_SPECS,
+  ONE_M_CONTEXT_SUFFIX,
   createGatewayKey,
   ensureDesktopGatewayConfig,
   modelSupports1m,
+  stripOneMContextSuffix,
+  desktopRouteId,
+  desktopRouteLabel,
   buildDesktopGatewayRoutes,
+  buildDesktopGatewayMappingRows,
   mapDesktopRouteToUpstream,
   buildGatewayModelsResponse,
+  buildDesktopGatewayUrl,
+  checkDesktopGatewayStatus,
   createGatewayServer,
 };

package/lib/panel.js

@@ -12,6 +12,13 @@ function isEnvActive(config, env) {
   return Object.entries(expected).every(([key, value]) => env[key] === value);
 }
 
+function desktopGatewayStatusText(status) {
+  if (!status) return null;
+  if (!status.configured) return '未配置';
+  if (status.running) return `已运行 · 127.0.0.1:${status.port}`;
+  return '未运行：执行 claw gateway';
+}
+
 function buildStatusView(config, options = {}) {
   const provider = PROVIDERS[config.provider];
   const providerName = config.providerName || provider?.name || config.provider;
@@ -21,6 +28,8 @@ function buildStatusView(config, options = {}) {
   const mainModel = expectedEnv.ANTHROPIC_MODEL;
   const fastModel = expectedEnv.CLAUDE_CODE_SUBAGENT_MODEL;
   const envActive = isEnvActive(config, env);
+  const desktopGatewayStatus = options.desktopGatewayStatus;
+  const desktopGatewayText = desktopGatewayStatusText(desktopGatewayStatus);
   const warnings = [];
 
   if (config.provider === 'deepseek' && (
@@ -31,7 +40,7 @@ function buildStatusView(config, options = {}) {
     warnings.push('检测到旧 DeepSeek 模型名，建议运行 claw switch 更新到 [1m] 长上下文版本');
   }
 
-  return {
+  const view = {
     providerName,
     mainModel,
     fastModel,
@@ -45,9 +54,14 @@ function buildStatusView(config, options = {}) {
       { label: 'API 状态', value: apiStatusText(options.apiStatus) },
       { label: 'Claude Code', value: claudeInstalled ? '已安装' : '未检测到' },
       { label: '当前终端', value: envActive ? '已生效' : '未生效' },
+      ...(desktopGatewayText ? [{ label: 'Desktop Gateway', value: desktopGatewayText }] : []),
       { label: 'Base URL', value: config.baseUrl },
     ],
   };
+  if (desktopGatewayStatus) {
+    view.desktopGatewayStatus = desktopGatewayStatus;
+  }
+  return view;
 }
 
 function buildMenuStatusLines(view, options = {}) {
@@ -66,6 +80,11 @@ function buildMenuStatusLines(view, options = {}) {
 
   lines.push(`主模型 ${view.mainModel} · 快速模型 ${view.fastModel}`);
 
+  const desktopGatewayText = desktopGatewayStatusText(view.desktopGatewayStatus || options.desktopGatewayStatus);
+  if (desktopGatewayText && desktopGatewayText !== '未配置') {
+    lines.push(`Desktop Gateway ${desktopGatewayText}`);
+  }
+
   if (view.warnings.some((warning) => warning.includes('旧 DeepSeek 模型名'))) {
     lines.push('旧模型名：选择下方"切换厂商或模型"更新到 [1m]');
   }
@@ -73,4 +92,4 @@ function buildMenuStatusLines(view, options = {}) {
   return lines;
 }
 
-module.exports = { buildMenuStatusLines, buildStatusView, apiStatusText, isEnvActive };
+module.exports = { buildMenuStatusLines, buildStatusView, apiStatusText, desktopGatewayStatusText, isEnvActive };

package/package.json

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