openclawsetup 2.8.1 → 2.8.2

package/bin/cli.mjs

@@ -83,6 +83,9 @@ const log = {
 
 const DEFAULT_GATEWAY_PORT = 18789;
 const STRONG_FIX_MAX_PASSES = 3;
+const STATUS_CMD_TIMEOUT_MS = platform() === 'win32' ? 8000 : 5000;
+const PORT_CHECK_TIMEOUT_MS = platform() === 'win32' ? 6000 : 4000;
+const MODEL_CHAT_TIMEOUT_MS = platform() === 'win32' ? 25000 : 18000;
 const STRONG_PORT_CANDIDATES = [
   18789,
   18790,
@@ -863,18 +866,18 @@ function parseStatusOutput(statusOutput) {
   return 'unknown';
 }
 
-function getPortCheckOutput(port) {
+function getPortCheckOutput(port, timeout = PORT_CHECK_TIMEOUT_MS) {
   const cmd = platform() === 'win32'
     ? `netstat -ano | findstr :${port}`
     : `lsof -nP -iTCP:${port} -sTCP:LISTEN 2>/dev/null || netstat -tlnp 2>/dev/null | grep :${port}`;
-  return safeExec(cmd);
+  return safeExec(cmd, { timeout });
 }
 
-function getPortConflictDetail(port) {
+function getPortConflictDetail(port, timeout = PORT_CHECK_TIMEOUT_MS) {
   const cmd = platform() === 'win32'
     ? `netstat -ano | findstr :${port} | findstr LISTENING`
     : `lsof -nP -iTCP:${port} -sTCP:LISTEN 2>/dev/null | head -8`;
-  return safeExec(cmd);
+  return safeExec(cmd, { timeout });
 }
 
 function isLikelyOpenClawProcess(output = '') {
@@ -2288,10 +2291,12 @@ async function runHealthCheck(cliName, autoFix = false, strongMode = false) {
 
 // ============ 交互式菜单 ============
 
-function testModelChat(cliName) {
+function testModelChat(cliName, timeoutMs = MODEL_CHAT_TIMEOUT_MS) {
   return new Promise((resolve) => {
-    const cmd = `${cliName} agent --session-id openclawsetup-test --message "请用一句话回复你的模型名称" --json --timeout 60`;
-    exec(cmd, { timeout: 65000 }, (error, stdout, stderr) => {
+    const agentTimeoutSec = Math.max(12, Math.floor(timeoutMs / 1000));
+    const execTimeoutMs = Math.max(15000, timeoutMs + 5000);
+    const cmd = `${cliName} agent --session-id openclawsetup-test --message "请用一句话回复你的模型名称" --json --timeout ${agentTimeoutSec}`;
+    exec(cmd, { timeout: execTimeoutMs }, (error, stdout, stderr) => {
       if (error) {
         const errMsg = (stderr || stdout || error.message || '').trim();
         // 提取关键错误信息
@@ -2337,6 +2342,7 @@ async function showStatusInfo(cliName) {
   const dashboardUrl = `http://127.0.0.1:${port}/?token=${token}`;
 
   console.log(colors.bold(colors.cyan('\n📊 OpenClaw 状态信息\n')));
+  console.log(colors.gray('  … 正在检查服务状态（超时自动跳过）...'));
 
   // 服务状态（兼容不同 CLI 版本，避免 Windows 下误判）
   const statusAttempts = [
@@ -2345,9 +2351,14 @@ async function showStatusInfo(cliName) {
   ];
   let statusState = 'unknown';
   let statusOutput = '';
+  let statusTimedOut = false;
 
   for (const attempt of statusAttempts) {
-    const statusResult = safeExec(attempt.cmd);
+    const statusResult = safeExec(attempt.cmd, { timeout: STATUS_CMD_TIMEOUT_MS });
+    if (!statusResult.ok && /timed out|etimedout|SIGTERM|killed/i.test(`${statusResult.error || ''} ${statusResult.stderr || ''}`)) {
+      statusTimedOut = true;
+      continue;
+    }
     if (!statusResult.ok || !statusResult.output) continue;
     statusOutput = statusResult.output;
     const parsed = parseStatusOutput(statusResult.output);
@@ -2361,9 +2372,13 @@ async function showStatusInfo(cliName) {
   }
 
   // 端口检查（作为状态命令兜底）
-  const portResult = getPortCheckOutput(port);
+  const portResult = getPortCheckOutput(port, PORT_CHECK_TIMEOUT_MS);
   const portListening = Boolean(portResult.ok && portResult.output);
 
+  if (statusTimedOut) {
+    console.log(colors.yellow('  ⚠ 状态命令超时，已自动切换端口探测模式'));
+  }
+
   if (statusState === 'running') {
     console.log(colors.green('  ✓ Gateway 服务正在运行'));
   } else if (portListening) {
@@ -2413,8 +2428,8 @@ async function showStatusInfo(cliName) {
 
   // 模型对话测试
   if (primaryModel) {
-    console.log(colors.gray('  … 正在测试模型对话...'));
-    const testResult = await testModelChat(cliName);
+    console.log(colors.gray(`  … 正在测试模型对话（最长 ${Math.floor(MODEL_CHAT_TIMEOUT_MS / 1000)} 秒）...`));
+    const testResult = await testModelChat(cliName, MODEL_CHAT_TIMEOUT_MS);
     if (testResult.success) {
       console.log(colors.green('  ✓ 模型对话正常'));
       if (testResult.message) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclawsetup",
-  "version": "2.8.1",
+  "version": "2.8.2",
   "description": "OpenClaw 安装向导 - 智能安装、诊断、自动修复",
   "type": "module",
   "bin": {