yingclaw 2.5.3 → 2.5.5

package/bin/cli.js

@@ -20,6 +20,7 @@ const {
 } = require('../lib/config');
 const { execSync, spawn, spawnSync } = require('child_process');
 const pkg = require('../package.json');
+const { getGatewayAutostartStatus, installGatewayAutostart } = require('../lib/autostart');
 const { buildMenuStatusLines, buildStatusView } = require('../lib/panel');
 const { buildClaudeInstallCommand, checkNodeEnv, getNodeInstallGuide, getInstallFailureHints } = require('../lib/install');
 const { clearClaudeDesktopConfig, isDesktopConfigured, openClaudeDesktop, writeClaudeDesktopConfig } = require('../lib/desktop');
@@ -241,6 +242,7 @@ async function showStatus() {
     apiStatus: valid,
     claudeInstalled: isClaudeInstalled(),
     desktopGatewayStatus: await checkDesktopGatewayStatus(config),
+    desktopGatewayAutostartStatus: getGatewayAutostartStatus(),
     env: process.env,
   });
 
@@ -767,6 +769,18 @@ program
     }
 
     const gatewayUrl = `http://127.0.0.1:${desktopConfig.desktopGatewayPort}${YINGCLAW_GATEWAY_PREFIX}`;
+    let autostartLine = '';
+    if (!options.direct) {
+      try {
+        const autostart = installGatewayAutostart();
+        autostartLine = autostart.result === 'installed'
+          ? chalk.green('Gateway 已设置为登录自动运行')
+          : chalk.yellow('当前系统暂不支持自动启动 Gateway，请手动运行: claw gateway');
+      } catch (error) {
+        autostartLine = chalk.yellow(`Gateway 自动启动设置失败，请手动运行: claw gateway (${error.message})`);
+      }
+    }
+
     const modeLines = options.direct
       ? chalk.dim('Base URL  ') + chalk.cyan(desktopConfig.baseUrl) + '\n' +
         chalk.dim('模型      ') + chalk.yellow(desktopConfig.model) + '\n' +
@@ -777,14 +791,14 @@ program
         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');
+        autostartLine;
 
     console.log(boxen(
       chalk.bold(options.direct ? 'Claude 桌面应用已配置为直连 Gateway 模式\n\n' : 'Claude 桌面应用已配置为本机 Gateway 模式\n\n') +
       modeLines + '\n' +
       chalk.dim('认证方式  ') + chalk.cyan('bearer') + '\n\n' +
       chalk.yellow(getDesktopOpenHint()) + '\n' +
-      chalk.dim(options.direct ? '要求：网关必须支持 Anthropic POST /v1/messages，且 Base URL 必须是 HTTPS。' : '要求：保持 claw gateway 运行，Claude Desktop 才能访问第三方模型。'),
+      chalk.dim(options.direct ? '要求：网关必须支持 Anthropic POST /v1/messages，且 Base URL 必须是 HTTPS。' : '要求：Gateway 进程保持运行，Claude Desktop 才能访问第三方模型。'),
       { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'cyan', margin: { top: 1, bottom: 1 } }
     ));
 
@@ -1041,6 +1055,7 @@ async function renderStatusBar(apiStatus) {
       apiStatus,
       claudeInstalled,
       desktopGatewayStatus: await checkDesktopGatewayStatus(config, { timeoutMs: 250 }),
+      desktopGatewayAutostartStatus: getGatewayAutostartStatus(),
       env: process.env,
     });
     const statusLines = buildMenuStatusLines(view, { apiStatus, claudeInstalled, platform: process.platform });

package/lib/autostart.js

@@ -0,0 +1,168 @@
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+const { spawnSync } = require('child_process');
+
+const GATEWAY_LAUNCH_AGENT_LABEL = 'com.yingclaw.gateway';
+
+function xmlEscape(value) {
+  return String(value)
+    .replace(/&/g, '&')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;')
+    .replace(/'/g, '&apos;');
+}
+
+function getMacLaunchAgentPath(options = {}) {
+  const homeDir = options.homeDir || os.homedir();
+  return path.join(homeDir, 'Library', 'LaunchAgents', `${GATEWAY_LAUNCH_AGENT_LABEL}.plist`);
+}
+
+function buildMacLaunchAgentPlist(options = {}) {
+  const nodePath = options.nodePath || process.execPath;
+  const cliPath = options.cliPath || path.join(__dirname, '..', 'bin', 'cli.js');
+  const workingDirectory = options.workingDirectory || path.join(__dirname, '..');
+  const homeDir = options.homeDir || os.homedir();
+  const logPath = options.logPath || path.join(homeDir, 'Library', 'Logs', 'yingclaw-gateway.log');
+  const errorLogPath = options.errorLogPath || path.join(homeDir, 'Library', 'Logs', 'yingclaw-gateway.err.log');
+
+  return `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key>
+  <string>${GATEWAY_LAUNCH_AGENT_LABEL}</string>
+  <key>ProgramArguments</key>
+  <array>
+    <string>${xmlEscape(nodePath)}</string>
+    <string>${xmlEscape(cliPath)}</string>
+    <string>gateway</string>
+  </array>
+  <key>WorkingDirectory</key>
+  <string>${xmlEscape(workingDirectory)}</string>
+  <key>RunAtLoad</key>
+  <true/>
+  <key>KeepAlive</key>
+  <false/>
+  <key>StandardOutPath</key>
+  <string>${xmlEscape(logPath)}</string>
+  <key>StandardErrorPath</key>
+  <string>${xmlEscape(errorLogPath)}</string>
+</dict>
+</plist>
+`;
+}
+
+function runLaunchctl(runner, args, options = {}) {
+  const result = runner('launchctl', args, { encoding: 'utf8', stdio: 'pipe' });
+  if (result.status !== 0 && !options.optional) {
+    const stderr = String(result.stderr || '').trim();
+    throw new Error(`launchctl ${args.join(' ')} 失败${stderr ? `: ${stderr}` : ''}`);
+  }
+  return result;
+}
+
+function sleepSync(ms) {
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}
+
+function getLaunchAgentRuntimeStatus(runner, service) {
+  const result = runner('launchctl', ['print', service], { encoding: 'utf8', stdio: 'pipe' });
+  const output = `${result.stdout || ''}\n${result.stderr || ''}`;
+  return {
+    loaded: result.status === 0,
+    running: result.status === 0 && /state\s*=\s*running/i.test(output),
+  };
+}
+
+function waitForLaunchAgentUnload(runner, service, options = {}) {
+  const timeoutMs = options.timeoutMs == null ? 1500 : options.timeoutMs;
+  const intervalMs = options.intervalMs == null ? 100 : options.intervalMs;
+  const deadline = Date.now() + timeoutMs;
+
+  do {
+    if (!getLaunchAgentRuntimeStatus(runner, service).loaded) {
+      return true;
+    }
+    if (Date.now() >= deadline) {
+      return false;
+    }
+    sleepSync(intervalMs);
+  } while (true);
+}
+
+function installGatewayAutostart(options = {}) {
+  const platform = options.platform || process.platform;
+  if (platform !== 'darwin') {
+    return { result: 'unsupported', file: null };
+  }
+
+  const homeDir = options.homeDir || os.homedir();
+  const file = options.file || getMacLaunchAgentPath({ homeDir });
+  fs.mkdirSync(path.dirname(file), { recursive: true });
+  fs.mkdirSync(path.join(homeDir, 'Library', 'Logs'), { recursive: true });
+  fs.writeFileSync(file, buildMacLaunchAgentPlist({ ...options, homeDir }), 'utf8');
+
+  const uid = options.uid || (typeof process.getuid === 'function' ? process.getuid() : null);
+  if (uid == null) {
+    return { result: 'installed', file };
+  }
+
+  const runner = options.runner || spawnSync;
+  const domain = `gui/${uid}`;
+  const service = `${domain}/${GATEWAY_LAUNCH_AGENT_LABEL}`;
+
+  const bootout = runLaunchctl(runner, ['bootout', service], { optional: true });
+  if (bootout.status === 0) {
+    waitForLaunchAgentUnload(runner, service, {
+      timeoutMs: options.unloadTimeoutMs,
+      intervalMs: options.unloadPollIntervalMs,
+    });
+  }
+  const bootstrap = runLaunchctl(runner, ['bootstrap', domain, file], { optional: true });
+  if (bootstrap.status !== 0 && !getLaunchAgentRuntimeStatus(runner, service).loaded) {
+    const stderr = String(bootstrap.stderr || '').trim();
+    throw new Error(`launchctl bootstrap ${domain} ${file} 失败${stderr ? `: ${stderr}` : ''}`);
+  }
+  runLaunchctl(runner, ['enable', service]);
+  runLaunchctl(runner, ['kickstart', '-k', service]);
+
+  return { result: 'installed', file };
+}
+
+function getGatewayAutostartStatus(options = {}) {
+  const platform = options.platform || process.platform;
+  if (platform !== 'darwin') {
+    return { supported: false, installed: false, running: false, file: null };
+  }
+
+  const homeDir = options.homeDir || os.homedir();
+  const file = options.file || getMacLaunchAgentPath({ homeDir });
+  const installed = fs.existsSync(file);
+  if (!installed) {
+    return { supported: true, installed: false, running: false, file };
+  }
+
+  const uid = options.uid || (typeof process.getuid === 'function' ? process.getuid() : null);
+  if (uid == null) {
+    return { supported: true, installed: true, running: false, file };
+  }
+
+  const runner = options.runner || spawnSync;
+  const runtimeStatus = getLaunchAgentRuntimeStatus(runner, `gui/${uid}/${GATEWAY_LAUNCH_AGENT_LABEL}`);
+  return {
+    supported: true,
+    installed: true,
+    running: runtimeStatus.running,
+    file,
+  };
+}
+
+module.exports = {
+  GATEWAY_LAUNCH_AGENT_LABEL,
+  buildMacLaunchAgentPlist,
+  getGatewayAutostartStatus,
+  getMacLaunchAgentPath,
+  installGatewayAutostart,
+};

package/lib/panel.js

@@ -12,11 +12,19 @@ function isEnvActive(config, env) {
   return Object.entries(expected).every(([key, value]) => env[key] === value);
 }
 
-function desktopGatewayStatusText(status) {
+function desktopGatewayAutostartText(status) {
+  if (!status || !status.supported) return null;
+  if (status.running || status.installed) return '登录自动运行';
+  return '未设置自动运行';
+}
+
+function desktopGatewayStatusText(status, autostartStatus = null) {
   if (!status) return null;
+  const autostartText = desktopGatewayAutostartText(autostartStatus);
+  const suffix = autostartText ? ` · ${autostartText}` : '';
   if (!status.configured) return '未配置';
-  if (status.running) return `已运行 · 127.0.0.1:${status.port}`;
-  return '未运行：执行 claw gateway';
+  if (status.running) return `已运行 · 127.0.0.1:${status.port}${suffix}`;
+  return `未运行：执行 claw gateway${suffix}`;
 }
 
 function buildStatusView(config, options = {}) {
@@ -29,7 +37,8 @@ function buildStatusView(config, options = {}) {
   const fastModel = expectedEnv.CLAUDE_CODE_SUBAGENT_MODEL;
   const envActive = isEnvActive(config, env);
   const desktopGatewayStatus = options.desktopGatewayStatus;
-  const desktopGatewayText = desktopGatewayStatusText(desktopGatewayStatus);
+  const desktopGatewayAutostartStatus = options.desktopGatewayAutostartStatus;
+  const desktopGatewayText = desktopGatewayStatusText(desktopGatewayStatus, desktopGatewayAutostartStatus);
   const warnings = [];
 
   if (config.provider === 'deepseek' && (
@@ -61,6 +70,9 @@ function buildStatusView(config, options = {}) {
   if (desktopGatewayStatus) {
     view.desktopGatewayStatus = desktopGatewayStatus;
   }
+  if (desktopGatewayAutostartStatus) {
+    view.desktopGatewayAutostartStatus = desktopGatewayAutostartStatus;
+  }
   return view;
 }
 
@@ -80,7 +92,10 @@ function buildMenuStatusLines(view, options = {}) {
 
   lines.push(`主模型 ${view.mainModel} · 快速模型 ${view.fastModel}`);
 
-  const desktopGatewayText = desktopGatewayStatusText(view.desktopGatewayStatus || options.desktopGatewayStatus);
+  const desktopGatewayText = desktopGatewayStatusText(
+    view.desktopGatewayStatus || options.desktopGatewayStatus,
+    view.desktopGatewayAutostartStatus || options.desktopGatewayAutostartStatus,
+  );
   if (desktopGatewayText && desktopGatewayText !== '未配置') {
     lines.push(`Desktop Gateway ${desktopGatewayText}`);
   }
@@ -92,4 +107,4 @@ function buildMenuStatusLines(view, options = {}) {
   return lines;
 }
 
-module.exports = { buildMenuStatusLines, buildStatusView, apiStatusText, desktopGatewayStatusText, isEnvActive };
+module.exports = { buildMenuStatusLines, buildStatusView, apiStatusText, desktopGatewayAutostartText, desktopGatewayStatusText, isEnvActive };

package/package.json

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