openclawsetup 2.8.7 → 2.8.9

package/bin/cli.mjs

@@ -83,7 +83,7 @@ const log = {
 
 const DEFAULT_GATEWAY_PORT = 18789;
 const STRONG_FIX_MAX_PASSES = 3;
-const STATUS_CMD_TIMEOUT_MS = platform() === 'win32' ? 8000 : 5000;
+const STATUS_CMD_TIMEOUT_MS = platform() === 'win32' ? 15000 : 10000;
 const PORT_CHECK_TIMEOUT_MS = platform() === 'win32' ? 6000 : 4000;
 const MODEL_CHAT_TIMEOUT_MS = platform() === 'win32' ? 25000 : 18000;
 const STRONG_PORT_CANDIDATES = [
@@ -2233,11 +2233,6 @@ async function runHealthCheck(cliName, autoFix = false, strongMode = false) {
     const canUsePortFallback = statusState === 'unknown' || statusProbe.timedOut;
     if (statusState === 'running' || (canUsePortFallback && statusPortListening)) {
       log.success('Gateway 进程正在运行');
-      if (statusProbe.timedOut) {
-        log.hint('状态命令超时，已按端口监听判定为运行中');
-      } else if (canUsePortFallback && statusPortListening) {
-        log.hint('状态命令返回非运行，但端口可访问（兼容判定）');
-      }
     } else {
       const issue = summarizeIssue(
         'error',
@@ -2549,7 +2544,16 @@ function testModelChat(cliName, timeoutMs = MODEL_CHAT_TIMEOUT_MS) {
         const message = parsed?.result?.payloads?.[0]?.text || '';
         const provider = parsed?.result?.meta?.agentMeta?.provider || '';
         const modelId = parsed?.result?.meta?.agentMeta?.model || '';
-        if (message || (provider && modelId)) {
+
+        // 检查回复内容是否实际上是错误信息
+        const msgLower = message.toLowerCase();
+        if (msgLower.includes('401') && (msgLower.includes('invalid api key') || msgLower.includes('unauthorized'))) {
+          resolve({ success: false, error: 'API Key 无效 (401)' });
+        } else if (msgLower.includes('403') && (msgLower.includes('forbidden') || msgLower.includes('access denied'))) {
+          resolve({ success: false, error: 'API 访问被拒绝 (403)' });
+        } else if (/^http\s+\d{3}:/i.test(message.trim())) {
+          resolve({ success: false, error: message.substring(0, 200) });
+        } else if (message || (provider && modelId)) {
           resolve({ success: true, message, provider, model: modelId });
         } else {
           resolve({ success: false, error: '模型未返回内容' });
@@ -2602,7 +2606,7 @@ async function showStatusInfo(cliName) {
   const portResult = getPortCheckOutput(port, PORT_CHECK_TIMEOUT_MS);
   const portListening = Boolean(portResult.ok && portResult.output);
 
-  if (statusTimedOut) {
+  if (statusTimedOut && !portListening) {
     console.log(colors.yellow('  ⚠ 状态命令超时，已自动切换端口探测模式'));
   }
   if (portResolved.source === 'runtime' && Number(config?.port) !== Number(port)) {
@@ -2612,8 +2616,8 @@ async function showStatusInfo(cliName) {
   if (statusState === 'running') {
     console.log(colors.green('  ✓ Gateway 服务正在运行'));
   } else if (portListening) {
-    console.log(colors.yellow('  ⚠ 状态命令显示未运行，但端口可访问'));
-    console.log(colors.gray('    兼容模式判定：Gateway 可能正在运行（常见于旧版/Windows）'));
+    // 端口在监听 = Gateway 在运行，状态命令超时/不准确不影响判断
+    console.log(colors.green('  ✓ Gateway 服务正在运行'));
   } else {
     console.log(colors.red('  ✗ Gateway 服务未运行'));
     if (statusOutput) {

package/package.json

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