claw-subagent-service 0.0.27 → 0.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claw-subagent-service",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "description": "虾说静态服务",
   "main": "cli.js",
   "bin": {

package/service/rongcloud/message-handler.js

@@ -122,9 +122,6 @@ class MessageHandler {
       this.sendReadReceiptFn(msg).catch(() => {});
     }
 
-    // 先回复"正在处理"，让用户知道消息已被接收
-    this.sendFn(targetId, '🤖 正在思考中，请稍候...', msg.conversationType).catch(() => {});
-
     // 后台执行 openclaw，不阻塞消息队列
     this.openclawClient.chat(msg.content, msg.senderUserId)
       .then(reply => {

package/service/rongcloud/openclaw-client.js

@@ -93,6 +93,38 @@ function getOpenClawEnv(baseEnv = process.env) {
   return env;
 }
 
+/**
+ * 尝试读取 OpenClaw 的 gateway token
+ * openclaw agent 连接 gateway 需要认证，token 通常存储在配置文件中
+ */
+function getGatewayToken() {
+  const homeDir = getRealHomeDir();
+  const possibleFiles = [
+    path.join(homeDir, '.openclaw', 'openclaw.json'),
+    path.join(homeDir, '.openclaw', 'config.json'),
+    path.join(homeDir, '.openclaw', 'tools.json'),
+    path.join(homeDir, '.openclaw', 'settings.json'),
+  ];
+
+  for (const filePath of possibleFiles) {
+    try {
+      if (fs.existsSync(filePath)) {
+        const content = fs.readFileSync(filePath, 'utf-8');
+        const config = JSON.parse(content);
+        // 可能的 token 字段名
+        const token = config.gatewayToken || config.token || config.apiKey || config.api_key || config.password;
+        if (token) {
+          return String(token);
+        }
+      }
+    } catch {
+      // 忽略读取/解析错误
+    }
+  }
+
+  return null;
+}
+
 /**
  * 检测端口是否监听
  */
@@ -139,10 +171,9 @@ function startOpenClawGateway(log) {
     const interval = setInterval(async () => {
       attempts++;
       const gatewayRunning = await checkPort(18789);
-      const apiRunning = await checkPort(5678);
       if (gatewayRunning) {
         clearInterval(interval);
-        log?.info(`[OpenClawClient] OpenClaw gateway 启动成功 (18789)，API 状态: ${apiRunning ? '就绪' : '未就绪'}`);
+        log?.info('[OpenClawClient] OpenClaw gateway 启动成功 (18789)');
         resolve(true);
       } else if (attempts >= maxAttempts) {
         clearInterval(interval);
@@ -173,30 +204,13 @@ class OpenClawClient {
     if (this.gatewayStarted) return true;
 
     const gatewayRunning = await checkPort(18789);
-    const apiRunning = await checkPort(5678);
 
-    if (gatewayRunning && apiRunning) {
-      this.log?.info('[OpenClawClient] OpenClaw gateway 和 API 均已就绪');
+    if (gatewayRunning) {
+      this.log?.info('[OpenClawClient] OpenClaw gateway 已在运行 (18789)');
       this.gatewayStarted = true;
       return true;
     }
 
-    if (gatewayRunning && !apiRunning) {
-      this.log?.info('[OpenClawClient] gateway 已运行 (18789)，但 API (5678) 未就绪，继续等待...');
-      // 等待最多 10 秒让 API 就绪
-      for (let i = 0; i < 10; i++) {
-        await new Promise(r => setTimeout(r, 1000));
-        if (await checkPort(5678)) {
-          this.log?.info('[OpenClawClient] API (5678) 已就绪');
-          this.gatewayStarted = true;
-          return true;
-        }
-      }
-      this.log?.warn('[OpenClawClient] API (5678) 等待超时，gateway 可能未完全初始化');
-      // gateway 在运行但 API 没好，仍然允许继续，让 HTTP fallback 到 CLI
-      return true;
-    }
-
     // 避免并发启动
     if (this.gatewayStarting) {
       this.log?.info('[OpenClawClient] gateway 正在启动中，等待...');
@@ -284,25 +298,33 @@ class OpenClawClient {
       .replace(/\n/g, ' ')
       .replace(/\r/g, ' ');
 
-    const gatewayUrl = 'http://127.0.0.1:5678';
     const realHome = getRealHomeDir();
     this.log?.info(`[OpenClawClient] 使用用户目录: ${realHome}`);
 
+    // 尝试读取 gateway token，解决 SYSTEM 账户下认证问题
+    const gatewayToken = getGatewayToken();
+    if (gatewayToken) {
+      this.log?.info('[OpenClawClient] 已读取到 gateway token');
+    }
+
     const args = ['agent', '-m', escapedMessage, '--session-id', sessionId];
-    this.log?.info(`[OpenClawClient] 执行: openclaw ${args.join(' ')}`);
+    if (gatewayToken) {
+      args.push('--token', gatewayToken);
+    }
+
+    this.log?.info(`[OpenClawClient] 执行: openclaw ${args.map(a => a.includes(' ') ? `"${a}"` : a).join(' ')}`);
 
     return new Promise((resolve) => {
       let stdout = '';
       let stderr = '';
       let killed = false;
 
+      // 关键：不设置 OPENCLAW_GATEWAY_URL，避免触发 "gateway url override requires explicit credentials"
+      // 让 openclaw agent 通过默认方式自动发现本地 gateway
       const child = spawn('openclaw', args, {
         shell: true,
         windowsHide: true,
-        env: {
-          ...getOpenClawEnv(),
-          OPENCLAW_GATEWAY_URL: gatewayUrl,
-        },
+        env: getOpenClawEnv(),
       });
 
       this.log?.info(`[OpenClawClient] CLI 子进程 PID=${child.pid}`);
@@ -314,15 +336,15 @@ class OpenClawClient {
         const text = chunk.toString();
         stderr += text;
         // 实时记录 stderr，方便调试卡死问题
-        this.log?.info(`[OpenClawClient] CLI stderr: ${text.trim().substring(0, 200)}`);
+        this.log?.info(`[OpenClawClient] CLI stderr: ${text.trim().substring(0, 300)}`);
       });
 
-      // 超时兜底（2 分钟）
+      // 超时兜底（30 秒）
       const timeout = setTimeout(() => {
         killed = true;
         child.kill('SIGTERM');
-        this.log?.error('[OpenClawClient] CLI 执行超时（2分钟），强制终止');
-      }, 120000);
+        this.log?.error('[OpenClawClient] CLI 执行超时（30秒），强制终止');
+      }, 30000);
 
       child.on('error', (err) => {
         clearTimeout(timeout);
@@ -338,7 +360,7 @@ class OpenClawClient {
         clearTimeout(timeout);
 
         if (killed) {
-          resolve('OpenClaw CLI 响应超时');
+          resolve('OpenClaw 响应超时（30秒），请检查 openclaw 服务状态');
           return;
         }
 
@@ -348,7 +370,7 @@ class OpenClawClient {
         if (code !== 0) {
           const errOutput = stderr || stdout || '';
           this.log?.error(`[OpenClawClient] CLI 错误输出: ${errOutput.substring(0, 500)}`);
-          resolve(`OpenClaw CLI 调用失败: ${errOutput.substring(0, 200)}`);
+          resolve(`OpenClaw 调用失败: ${errOutput.substring(0, 200)}`);
           return;
         }