yymaxapi 1.0.101 → 1.0.102

package/bin/yymaxapi.js

@@ -412,6 +412,7 @@ async function promptOpencodeDefaultModelSelection(args = {}, message = '选择
 const BACKUP_FILENAME = 'openclaw-default.json.bak';
 const BACKUP_DIR_NAME = 'backups';
 const MAX_BACKUPS = 10;
+const GATEWAY_CLI_NAMES = ['openclaw'];
 const EXTRA_BIN_DIRS = [
   path.join(os.homedir(), '.npm-global', 'bin'),
   path.join(os.homedir(), '.local', 'bin'),
@@ -1151,7 +1152,7 @@ function dockerCmd(cmd) {
   return _dockerNeedsSudo ? `sudo -n docker ${cmd}` : `docker ${cmd}`;
 }
 
-// 查找包含 openclaw/clawdbot/moltbot 的运行中容器
+// 查找包含 openclaw 的运行中容器
 function findOpenclawDockerContainers() {
   if (_dockerContainerCache !== null) return _dockerContainerCache;
   if (!isDockerAvailable()) { _dockerContainerCache = []; return []; }
@@ -1169,7 +1170,7 @@ function findOpenclawDockerContainers() {
     const status = statusParts.join(' ');
     if (!id) continue;
 
-    // 检查容器内是否有 openclaw/clawdbot/moltbot（用 command -v 代替 which，兼容精简镜像）
+    // 检查容器内是否有 openclaw（用 command -v 代替 which，兼容精简镜像）
     for (const cli of ['openclaw', 'clawdbot', 'moltbot']) {
       const check = safeExec(dockerCmd(`exec ${id} sh -c "command -v ${cli} 2>/dev/null || which ${cli} 2>/dev/null"`), { timeout: 8000 });
       if (check.ok && check.output && check.output.trim()) {
@@ -1343,7 +1344,7 @@ let _wslCliBinaryCache = undefined;
 
 function getWslCliBinary() {
   if (_wslCliBinaryCache !== undefined) return _wslCliBinaryCache;
-  for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
+  for (const name of GATEWAY_CLI_NAMES) {
     try {
       const result = execFileSync('wsl', ['bash', '-lc', `which ${name} 2>/dev/null`], { encoding: 'utf8', timeout: 5000, stdio: 'pipe' }).trim();
       if (result && result.startsWith('/')) {
@@ -1457,7 +1458,7 @@ function cleanupAgentProcesses() {
   try {
     const { execSync } = require('child_process');
     if (process.platform === 'win32') {
-      for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
+      for (const name of GATEWAY_CLI_NAMES) {
         try {
           execSync(`wmic process where "commandline like '%${name}%agent%' and not commandline like '%gateway%'" call terminate 2>nul`, { stdio: 'ignore', timeout: 10000 });
         } catch { /* ignore */ }
@@ -1468,18 +1469,18 @@ function cleanupAgentProcesses() {
       // WSL 内的 agent 也要清理
       if (detectGatewayEnv() === 'wsl') {
         try {
-          execSync('wsl -- bash -lc "pkill -f \'openclaw.*agent\' 2>/dev/null; pkill -f \'clawdbot.*agent\' 2>/dev/null; pkill -f \'moltbot.*agent\' 2>/dev/null; true"', { stdio: 'ignore', timeout: 10000 });
+          execSync('wsl -- bash -lc "pkill -f \'openclaw.*agent\' 2>/dev/null || true"', { stdio: 'ignore', timeout: 10000 });
         } catch { /* ignore */ }
       }
     } else {
-      for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
+      for (const name of GATEWAY_CLI_NAMES) {
         execSync(`pkill -f '${name}.*agent' 2>/dev/null || true`, { stdio: 'ignore' });
       }
     }
     // Docker 容器内的 agent 也要清理
     if (detectGatewayEnv() === 'docker' && _selectedDockerContainer) {
       try {
-        for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
+        for (const name of GATEWAY_CLI_NAMES) {
           safeExec(dockerCmd(`exec ${_selectedDockerContainer.id} sh -c "pkill -f '${name}.*agent' 2>/dev/null || true"`), { timeout: 10000 });
         }
       } catch { /* ignore */ }
@@ -3209,6 +3210,14 @@ function shellQuote(value) {
   return `"${str.replace(/(["\\$`])/g, '\\$1')}"`;
 }
 
+function escapeSingleQuotedShell(value) {
+  return String(value || '').replace(/'/g, "'\\''");
+}
+
+function buildLoginShellCommand(shellPath, command) {
+  return `${shellPath} -lc '${escapeSingleQuotedShell(command)}'`;
+}
+
 function escapeXml(value) {
   return String(value)
     .replace(/&/g, '&')
@@ -3252,7 +3261,7 @@ function resolveCliBinary() {
     }
   }
 
-  const candidates = ['openclaw', 'clawdbot', 'moltbot'];
+  const candidates = GATEWAY_CLI_NAMES;
   const isWin = process.platform === 'win32';
   const searchDirs = (process.env.PATH || '').split(path.delimiter).concat(EXTRA_BIN_DIRS);
   for (const name of candidates) {
@@ -3271,30 +3280,6 @@ function resolveCliBinary() {
     }
   }
 
-  const moltbotRoots = [];
-  if (process.env.MOLTBOT_ROOT) moltbotRoots.push(process.env.MOLTBOT_ROOT);
-  moltbotRoots.push('/opt/moltbot');
-  moltbotRoots.push('/opt/moltbot/app');
-
-  const scriptCandidates = [];
-  for (const root of moltbotRoots) {
-    scriptCandidates.push(
-      path.join(root, 'moltbot.mjs'),
-      path.join(root, 'bin', 'moltbot.mjs'),
-      path.join(root, 'bin', 'moltbot.js'),
-      path.join(root, 'src', 'moltbot.mjs'),
-      path.join(root, 'src', 'moltbot.js')
-    );
-  }
-
-  for (const candidate of scriptCandidates) {
-    try {
-      if (fs.existsSync(candidate) && fs.statSync(candidate).isFile()) {
-        return candidate;
-      }
-    } catch { }
-  }
-
   // Fallback: use login shell to find the binary (loads .zshrc/.bashrc PATH)
   for (const name of candidates) {
     if (process.platform === 'win32') {
@@ -3361,8 +3346,7 @@ function getCliMeta() {
   const cliBinary = resolveCliBinary();
   const cliName = cliBinary ? path.basename(cliBinary) : '';
   const cliLower = cliName.toLowerCase();
-  const isMoltbot = cliLower.startsWith('moltbot') || cliLower.includes('moltbot');
-  const nodeMajor = isMoltbot ? 24 : 22;
+  const nodeMajor = 22;
   return { cliBinary, cliName, nodeMajor };
 }
 
@@ -3875,7 +3859,7 @@ async function tryAutoStartGateway(port, allowAutoDaemon) {
       if (container.cliPath) dockerCmds.push(`${container.cliPath} gateway`);
       dockerCmds.push(`${container.cli} gateway`);
     }
-    for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
+    for (const name of GATEWAY_CLI_NAMES) {
       dockerCmds.push(`${name} gateway`);
     }
 
@@ -3907,7 +3891,7 @@ async function tryAutoStartGateway(port, allowAutoDaemon) {
       }
     } else {
       if (daemonResult.reason === 'cli-not-found') {
-        console.log(chalk.red('❌ 未找到 openclaw/clawdbot/moltbot 命令，无法自动启动 Gateway'));
+        console.log(chalk.red('❌ 未找到 openclaw 命令，无法自动启动 Gateway'));
       } else {
         console.log(chalk.red(`❌ 自动启动失败: ${daemonResult.reason}`));
       }
@@ -3951,15 +3935,9 @@ async function tryAutoStartGateway(port, allowAutoDaemon) {
   const nodeInfo = findCompatibleNode(nodeMajor);
   const env = { ...process.env, PATH: extendPathEnv(nodeInfo ? nodeInfo.path : null) };
   const useNode = cliBinary && nodeInfo && isNodeShebang(cliBinary);
-  const cliCmd = cliBinary
-    ? (useNode ? `"${nodeInfo.path}" "${cliBinary}" gateway` : `"${cliBinary}" gateway`)
-    : null;
-
-  const candidates = [];
-  if (cliCmd) candidates.push(cliCmd);
-  candidates.push('openclaw gateway', 'clawdbot gateway', 'moltbot gateway');
+  const candidates = buildGatewayCommands(cliBinary, nodeInfo, useNode, 'start');
 
-  for (const cmd of [...new Set(candidates)].filter(Boolean)) {
+  for (const cmd of candidates) {
     console.log(chalk.yellow(`⚠️ 尝试启动 Gateway: ${cmd}`));
     if (spawnDetached(cmd, env)) {
       if (await waitForGateway(port, '127.0.0.1', 10000)) {
@@ -3972,8 +3950,8 @@ async function tryAutoStartGateway(port, allowAutoDaemon) {
   if (process.platform !== 'win32') {
     for (const sh of ['/bin/zsh', '/bin/bash']) {
       if (!fs.existsSync(sh)) continue;
-      for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
-        const loginShellCmd = `${sh} -lc '${name} gateway'`;
+      for (const cmd of candidates) {
+        const loginShellCmd = buildLoginShellCommand(sh, cmd);
         console.log(chalk.yellow(`⚠️ 尝试启动 Gateway: ${loginShellCmd}`));
         if (spawnDetached(loginShellCmd, env)) {
           if (await waitForGateway(port, '127.0.0.1', 15000)) {
@@ -5984,7 +5962,7 @@ async function testConnection(paths, args = {}) {
     const container = await selectDockerContainer();
     if (!container) {
       console.log(chalk.red('❌ 未找到包含 OpenClaw/Clawdbot/Moltbot 的 Docker 容器'));
-      console.log(chalk.gray('   请确保容器正在运行且已安装 openclaw/clawdbot/moltbot'));
+      console.log(chalk.gray('   请确保容器正在运行且已安装 openclaw'));
       return;
     }
   }
@@ -6024,8 +6002,6 @@ async function testConnection(paths, args = {}) {
       console.log(chalk.gray(`   然后执行: ${_selectedDockerContainer.cli === 'node' ? `node ${_selectedDockerContainer.cliPath}` : _selectedDockerContainer.cli} gateway`));
     } else {
       console.log(chalk.gray('   请在新的终端执行: openclaw gateway'));
-      console.log(chalk.gray('   或: clawdbot gateway'));
-      console.log(chalk.gray('   或: moltbot gateway'));
     }
     return;
   }
@@ -6035,7 +6011,7 @@ async function testConnection(paths, args = {}) {
   if (!restartOk) {
     console.log(chalk.yellow('⚠️ Gateway 未能通过常规方式重启，当前使用的可能是之前的 Gateway 进程'));
     console.log(chalk.yellow('   新配置可能未生效。如 bot 不回复，请手动重启 Gateway：'));
-    console.log(chalk.gray('   openclaw gateway restart 或 clawdbot gateway restart'));
+    console.log(chalk.gray('   openclaw gateway restart'));
   }
 
   // 步骤2: 通过 Gateway 端点测试（优先使用 CLI agent）
@@ -6160,7 +6136,7 @@ async function testConnection(paths, args = {}) {
         console.log(chalk.gray(`\n   建议操作：`));
         console.log(chalk.gray(`   1) 复制最新地址并重新打开浏览器（不要用旧书签）`));
         console.log(chalk.cyan(`      http://127.0.0.1:${gatewayPort}/#token=${gatewayToken}`));
-        console.log(chalk.gray(`   2) 执行 Gateway 重启：openclaw gateway restart / clawdbot gateway restart`));
+        console.log(chalk.gray(`   2) 执行 Gateway 重启：openclaw gateway restart`));
         console.log(chalk.gray(`   3) 若仍 401，检查是否存在多个配置目录（.openclaw 与 .clawdbot）`));
       }
 
@@ -6170,7 +6146,7 @@ async function testConnection(paths, args = {}) {
         console.log(chalk.gray(`   如遇问题，尝试更新 Gateway: npm install -g openclaw@latest && openclaw gateway restart`));
       }
 
-      console.log(chalk.gray(`\n   提示: 如果 Gateway 未运行，请执行: openclaw gateway / clawdbot gateway / moltbot gateway`));
+      console.log(chalk.gray(`\n   提示: 如果 Gateway 未运行，请执行: openclaw gateway`));
     }
   } catch (error) {
     console.log(chalk.red(`❌ 测试失败: ${error.message}`));
@@ -6214,7 +6190,7 @@ function buildDockerInnerCmds(container, verb) {
     if (container.cliPath) cmds.push(`${container.cliPath} ${verb}`);
     cmds.push(`${container.cli} ${verb}`);
   }
-  for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
+  for (const name of GATEWAY_CLI_NAMES) {
     cmds.push(`${name} ${verb}`);
   }
   return [...new Set(cmds)].filter(Boolean);
@@ -6247,7 +6223,7 @@ async function restartGatewayDocker(gatewayPort, silent = false) {
   // 策略 B：杀容器内旧进程 → spawn 启动新 Gateway → 端口探测
   if (!silent) console.log(chalk.gray('   Docker 内常规重启未生效，尝试杀进程后重新启动...'));
   try {
-    for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
+    for (const name of GATEWAY_CLI_NAMES) {
       safeExec(dockerCmd(`exec ${cid} sh -c "pkill -f '${name}.*gateway' 2>/dev/null || true"`), { timeout: 5000 });
     }
     safeExec(dockerCmd(`exec ${cid} sh -c "lsof -ti :${gatewayPort} 2>/dev/null | xargs -r kill -9 2>/dev/null || true"`), { timeout: 5000 });
@@ -6271,7 +6247,7 @@ async function restartGatewayDocker(gatewayPort, silent = false) {
 async function restartGatewayWsl(gatewayPort, silent = false) {
   if (!silent) console.log(chalk.gray('   [检测] Gateway 运行在 WSL 中'));
   const wslCli = getWslCliBinary();
-  const names = ['openclaw', 'clawdbot', 'moltbot'];
+  const names = GATEWAY_CLI_NAMES;
   const portWasOpenBefore = await isPortOpen(gatewayPort, '127.0.0.1', 500);
   const beforeSignature = portWasOpenBefore ? getGatewayProcessSignature(gatewayPort, 'wsl') : '';
 
@@ -6364,13 +6340,11 @@ async function restartGatewayNative(silent = false) {
   // 策略 C：用 login shell 启动（加载 nvm/fnm 等 PATH）
   if (process.platform !== 'win32') {
     if (!silent) console.log(chalk.gray('   尝试通过 login shell 启动...'));
-    let launched = false;
-    for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
-      if (launched) break;
-      for (const sh of ['/bin/zsh', '/bin/bash']) {
-        if (!fs.existsSync(sh)) continue;
-        if (spawnDetached(`${sh} -lc '${name} gateway'`, env)) {
-          launched = true;
+    for (const sh of ['/bin/zsh', '/bin/bash']) {
+      if (!fs.existsSync(sh)) continue;
+      for (const cmd of startCmds) {
+        const loginShellCmd = buildLoginShellCommand(sh, cmd);
+        if (spawnDetached(loginShellCmd, env)) {
           if (await waitForGateway(gatewayPort, '127.0.0.1', 10000)) {
             if (!silent) console.log(chalk.green('✅ Gateway 已重启 (login shell)'));
             return true;
@@ -6383,10 +6357,8 @@ async function restartGatewayNative(silent = false) {
 
   // 全部失败，输出诊断
   if (!silent) {
-    console.log(chalk.red(`❌ 重启失败: 找不到 openclaw/clawdbot/moltbot 命令`));
+    console.log(chalk.red('❌ 重启失败: 找不到 openclaw 命令'));
     console.log(chalk.gray(`   请手动运行: openclaw gateway restart`));
-    console.log(chalk.gray(`   或: clawdbot gateway restart`));
-    console.log(chalk.gray(`   或: moltbot gateway restart`));
     printGatewayDiagnostics(resolved);
   }
   return false;
@@ -6404,7 +6376,7 @@ function buildGatewayCommands(resolved, nodeInfo, useNode, action) {
     }
   }
 
-  const names = ['openclaw', 'clawdbot', 'moltbot'];
+  const names = GATEWAY_CLI_NAMES;
   for (const name of names) commands.push(`${name} ${verb}`);
 
   return [...new Set(commands)].filter(Boolean);
@@ -6421,13 +6393,13 @@ async function killGatewayProcesses(gatewayPort = 18789) {
         }
       }
       if (isWslAvailable()) {
-        for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
+        for (const name of GATEWAY_CLI_NAMES) {
           safeExec(`wsl -- bash -c "pkill -f '${name}.*gateway' 2>/dev/null || true"`, { timeout: 5000 });
         }
         safeExec(`wsl -- bash -c "lsof -ti :${gatewayPort} 2>/dev/null | xargs -r kill -9 2>/dev/null || true"`, { timeout: 5000 });
       }
     } else {
-      for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
+      for (const name of GATEWAY_CLI_NAMES) {
         safeExec(`pkill -f '${name}.*gateway' 2>/dev/null || true`);
       }
       const lsof = safeExec(`lsof -ti :${gatewayPort} 2>/dev/null`);
@@ -6444,14 +6416,14 @@ function printGatewayDiagnostics(resolved) {
   console.log(chalk.gray(`\n   [诊断] resolveCliBinary = ${resolved || 'null'}`));
   const npmPrefix = safeExec('npm prefix -g');
   if (npmPrefix.ok) console.log(chalk.gray(`   [诊断] npm prefix -g = ${npmPrefix.output}`));
-  for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
+  for (const name of GATEWAY_CLI_NAMES) {
     const which = safeExec(process.platform === 'win32' ? `where ${name} 2>nul` : `/bin/zsh -lc "command -v ${name}" 2>/dev/null || /bin/bash -lc "command -v ${name}" 2>/dev/null`);
     if (which.ok && which.output) console.log(chalk.gray(`   [诊断] ${name} -> ${which.output.split('\n')[0].trim()}`));
   }
   if (isDockerAvailable()) {
     const dContainers = findOpenclawDockerContainers();
     if (dContainers.length > 0) {
-      console.log(chalk.gray(`   [诊断] Docker 容器 (含 openclaw/clawdbot/moltbot):`));
+      console.log(chalk.gray('   [诊断] Docker 容器 (含 openclaw):'));
       for (const c of dContainers) {
         console.log(chalk.gray(`     - ${c.name} (${c.image}) [${c.cli}: ${c.cliPath}]`));
       }
@@ -6542,7 +6514,7 @@ function testGatewayApi(port, token, model, endpoint = '/v1/chat/completions') {
 
     req.on('error', (e) => {
       if (e.code === 'ECONNREFUSED') {
-        resolve({ success: false, error: 'Gateway 未运行，请先启动: openclaw gateway / clawdbot gateway / moltbot gateway' });
+        resolve({ success: false, error: 'Gateway 未运行，请先启动: openclaw gateway' });
       } else {
         resolve({ success: false, error: e.message });
       }
@@ -6569,14 +6541,14 @@ function testGatewayViaAgent(model, agentId = '') {
         const agentCmd = `${wslCli} ${subcommand}`;
         cmd = `wsl -- bash -c '${agentCmd.replace(/'/g, "'\\''")}'`;
       } else {
-        const agentCmd = `openclaw ${subcommand} 2>/dev/null || clawdbot ${subcommand} 2>/dev/null || moltbot ${subcommand}`;
+        const agentCmd = `openclaw ${subcommand}`;
         cmd = `wsl -- bash -lc '${agentCmd.replace(/'/g, "'\\''")}'`;
       }
       execOpts = { timeout: 120000 };
     } else {
       const { cliBinary, nodeMajor } = getCliMeta();
       if (!cliBinary) {
-        resolve({ success: false, usedCli: false, error: '未找到 openclaw/clawdbot/moltbot 命令' });
+        resolve({ success: false, usedCli: false, error: '未找到 openclaw 命令' });
         return;
       }
       const nodeInfo = findCompatibleNode(nodeMajor);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yymaxapi",
-  "version": "1.0.101",
+  "version": "1.0.102",
   "description": "跨平台 OpenClaw/Clawdbot 配置管理工具 - 管理中转地址、模型切换、API Keys、测速优化",
   "main": "bin/yymaxapi.js",
   "bin": {