yymaxapi 1.0.82 → 1.0.84

package/bin/yymaxapi.js

@@ -636,6 +636,28 @@ function getWslMirrorInfo() {
   return { configPath, authProfiles };
 }
 
+function getGatewayListenOwner(port = 18789) {
+  if (process.platform === 'win32') return null;
+
+  const lsofResult = safeExec(`lsof -nP -iTCP:${port} -sTCP:LISTEN -F u 2>/dev/null`, { timeout: 3000 });
+  const lsofOutput = [lsofResult.output, lsofResult.stdout, lsofResult.stderr].filter(Boolean).join('\n');
+  const userLine = lsofOutput
+    .split('\n')
+    .map(line => line.trim())
+    .find(line => line.startsWith('u'));
+  if (userLine && userLine.length > 1) {
+    return userLine.slice(1).trim() || null;
+  }
+
+  const pidResult = safeExec(`lsof -ti :${port} 2>/dev/null | head -n1`, { timeout: 3000 });
+  const pid = pidResult.ok ? pidResult.output.trim().split('\n')[0] : '';
+  if (!/^\d+$/.test(pid)) return null;
+
+  const ownerResult = safeExec(`ps -o user= -p ${pid} 2>/dev/null`, { timeout: 3000 });
+  if (!ownerResult.ok || !ownerResult.output) return null;
+  return ownerResult.output.trim().split(/\s+/)[0] || null;
+}
+
 function getConfigPath() {
   const homeDir = os.homedir();
   const openclawStateDir = process.env.OPENCLAW_STATE_DIR || path.join(homeDir, '.openclaw');
@@ -664,23 +686,34 @@ function getConfigPath() {
 
   const candidates = [];
   if (envConfig) candidates.push(envConfig);
-  if (preferMoltbot) {
-    candidates.push(...moltbotCandidates, ...openclawCandidates);
-  } else {
-    candidates.push(...openclawCandidates, ...moltbotCandidates);
-  }
+  const rootCandidates = [];
+  let preferRootConfig = false;
+
+  const preferredCandidates = preferMoltbot
+    ? [...moltbotCandidates, ...openclawCandidates]
+    : [...openclawCandidates, ...moltbotCandidates];
 
   // Fallback: 当前用户非 root 时，也检查 /root 下的配置（OpenClaw 常以 root 安装）
   if (process.platform !== 'win32' && homeDir !== '/root') {
     const rootOpenclawDir = '/root/.openclaw';
     const rootClawdbotDir = '/root/.clawdbot';
-    candidates.push(
+    rootCandidates.push(
       path.join(rootOpenclawDir, 'openclaw.json'),
       path.join(rootOpenclawDir, 'moltbot.json'),
       path.join(rootClawdbotDir, 'openclaw.json'),
       path.join(rootClawdbotDir, 'clawdbot.json'),
       path.join(rootClawdbotDir, 'moltbot.json')
     );
+
+    const rootConfigExists = rootCandidates.some(p => p && fs.existsSync(p));
+    const gatewayOwner = getGatewayListenOwner();
+    preferRootConfig = rootConfigExists && gatewayOwner === 'root';
+  }
+
+  if (preferRootConfig) {
+    candidates.push(...rootCandidates, ...preferredCandidates);
+  } else {
+    candidates.push(...preferredCandidates, ...rootCandidates);
   }
 
   // Windows + WSL: 尝试读取 WSL 内的配置文件
@@ -714,18 +747,6 @@ function getConfigPath() {
 
   const configDir = path.dirname(openclawConfig);
 
-  const baseAuthCandidates = buildAuthCandidates([openclawStateDir, clawdbotStateDir]);
-  const moltbotAuthCandidates = buildAuthCandidates(moltbotStateDirs);
-
-  const authCandidates = preferMoltbot
-    ? [...moltbotAuthCandidates, ...baseAuthCandidates]
-    : [...baseAuthCandidates, ...moltbotAuthCandidates];
-
-  const authProfiles = authCandidates.find(p => fs.existsSync(p)) || authCandidates[0];
-  const authSyncTargets = process.platform === 'win32'
-    ? [...new Set(buildAuthCandidates([openclawStateDir, clawdbotStateDir]))].filter(p => p !== authProfiles)
-    : [];
-
   const syncTargets = [];
   if (openclawConfig.startsWith(openclawStateDir) && fs.existsSync(clawdbotStateDir)) {
     syncTargets.push(
@@ -734,6 +755,20 @@ function getConfigPath() {
     );
   }
 
+  const primaryAuthBases = [configDir];
+  const secondaryAuthBases = preferMoltbot
+    ? [...moltbotStateDirs, openclawStateDir, clawdbotStateDir]
+    : [openclawStateDir, clawdbotStateDir, ...moltbotStateDirs];
+  const authCandidates = [...new Set(buildAuthCandidates([...primaryAuthBases, ...secondaryAuthBases]))];
+
+  const authProfiles = authCandidates.find(p => fs.existsSync(p)) || authCandidates[0];
+
+  const authSyncBaseDirs = syncTargets.map(target => path.dirname(target));
+  if (process.platform === 'win32') {
+    authSyncBaseDirs.push(openclawStateDir, clawdbotStateDir);
+  }
+  const authSyncTargets = [...new Set(buildAuthCandidates(authSyncBaseDirs))].filter(p => p !== authProfiles);
+
   return { openclawConfig, authProfiles, configDir, syncTargets, authSyncTargets, wslConfigPath, wslAuthProfiles };
 }
 
@@ -3826,7 +3861,7 @@ async function autoActivate(paths, args = {}) {
   const gwToken = config.gateway?.auth?.token;
   if (gwToken) {
     console.log(chalk.green(`\n🌐 Web Dashboard:`));
-    console.log(chalk.cyan(`   http://127.0.0.1:${gwPort}/?token=${gwToken}`));
+    console.log(chalk.cyan(`   http://127.0.0.1:${gwPort}/#token=${gwToken}`));
   }
 
   // ---- 配置完成后：测试连接 or 退出 ----
@@ -5070,7 +5105,7 @@ async function testConnection(paths, args = {}) {
       console.log(chalk.cyan(`   CLI 对话正常，Gateway 可达`));
       console.log(chalk.gray(`   注: Gateway Dashboard 通过 WebSocket 通信，REST 端点返回 405 属正常现象`));
       console.log(chalk.green(`\n🌐 Web Dashboard 访问地址:`));
-      console.log(chalk.cyan(`   http://127.0.0.1:${gatewayPort}/?token=${gatewayToken}`));
+      console.log(chalk.cyan(`   http://127.0.0.1:${gatewayPort}/#token=${gatewayToken}`));
     } else if (result.success) {
       console.log(chalk.green(`\n✅ Gateway 测试成功！Web Dashboard 可正常使用`));
       console.log(chalk.cyan(`   响应时间: ${latency}ms`));
@@ -5081,7 +5116,7 @@ async function testConnection(paths, args = {}) {
       });
       console.log(chalk.yellow(`   模型回复: ${reply}`));
       console.log(chalk.green(`\n🌐 Web Dashboard 访问地址:`));
-      console.log(chalk.cyan(`   http://127.0.0.1:${gatewayPort}/?token=${gatewayToken}`));
+      console.log(chalk.cyan(`   http://127.0.0.1:${gatewayPort}/#token=${gatewayToken}`));
     } else {
       if (result.reachable) {
         console.log(chalk.yellow(`\n⚠ Gateway HTTP 可达，但接口返回限制`));
@@ -5095,7 +5130,7 @@ async function testConnection(paths, args = {}) {
         console.log(chalk.yellow(`   这通常会导致 Dashboard 网页对话返回 401。`));
         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.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(`   3) 若仍 401，检查是否存在多个配置目录（.openclaw 与 .clawdbot）`));
       }

package/package.json

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