claw-subagent-service 0.0.26 → 0.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claw-subagent-service",
-  "version": "0.0.26",
+  "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

@@ -33,6 +33,98 @@ function getRealHomeDir() {
   return homeDir;
 }
 
+/**
+ * 构建 OpenClaw 需要的完整环境变量
+ * Windows SYSTEM 账户下必须设置 HOMEDRIVE/HOMEPATH/APPDATA 等
+ * 策略：从现有环境变量中推断正确路径，避免硬编码任何用户名或目录结构
+ */
+function getOpenClawEnv(baseEnv = process.env) {
+  const realHome = getRealHomeDir();
+  const env = { ...baseEnv };
+  const systemHome = os.homedir();
+
+  // 基础 home 目录变量
+  env.USERPROFILE = realHome;
+  env.HOME = realHome;
+
+  if (process.platform === 'win32') {
+    // 从 realHome 推断 HOMEDRIVE / HOMEPATH（匹配盘符 + 路径）
+    const match = realHome.match(/^([A-Za-z]:)(.*)$/);
+    if (match) {
+      env.HOMEDRIVE = match[1];
+      env.HOMEPATH = match[2];
+    }
+
+    /**
+     * 修复路径：把现有环境变量中的 systemprofile home 路径替换为真实用户 home 路径
+     * 这样能处理 Roaming Profiles、AppData 重定向、非标准安装等各种情况
+     */
+    const fixPath = (originalPath) => {
+      if (!originalPath) return null;
+      const lowerOriginal = originalPath.toLowerCase();
+      const lowerSystemHome = systemHome.toLowerCase();
+      if (lowerOriginal.includes(lowerSystemHome)) {
+        const idx = lowerOriginal.indexOf(lowerSystemHome);
+        return originalPath.substring(0, idx) + realHome + originalPath.substring(idx + systemHome.length);
+      }
+      return null;
+    };
+
+    // APPDATA：优先从现有变量推断，保留原始目录结构
+    if (baseEnv.APPDATA) {
+      const fixed = fixPath(baseEnv.APPDATA);
+      if (fixed) env.APPDATA = fixed;
+    }
+    // 兜底：按标准结构拼接（仅在无法推断时使用）
+    if (!env.APPDATA) {
+      env.APPDATA = path.join(realHome, 'AppData', 'Roaming');
+    }
+
+    // LOCALAPPDATA：同上
+    if (baseEnv.LOCALAPPDATA) {
+      const fixed = fixPath(baseEnv.LOCALAPPDATA);
+      if (fixed) env.LOCALAPPDATA = fixed;
+    }
+    if (!env.LOCALAPPDATA) {
+      env.LOCALAPPDATA = path.join(realHome, 'AppData', 'Local');
+    }
+  }
+
+  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;
+}
+
 /**
  * 检测端口是否监听
  */
@@ -68,24 +160,20 @@ function startOpenClawGateway(log) {
       windowsHide: true,
       detached: true,
       stdio: 'ignore',
-      env: {
-        ...process.env,
-        USERPROFILE: getRealHomeDir(),
-        HOME: getRealHomeDir(),
-      },
+      env: getOpenClawEnv(),
     });
 
     child.unref();
 
-    // 等待 gateway 启动（最多 15 秒）
+    // 等待 gateway 启动（最多 20 秒）
     let attempts = 0;
-    const maxAttempts = 15;
+    const maxAttempts = 20;
     const interval = setInterval(async () => {
       attempts++;
-      const isRunning = await checkPort(18789);
-      if (isRunning) {
+      const gatewayRunning = await checkPort(18789);
+      if (gatewayRunning) {
         clearInterval(interval);
-        log?.info('[OpenClawClient] OpenClaw gateway 启动成功');
+        log?.info('[OpenClawClient] OpenClaw gateway 启动成功 (18789)');
         resolve(true);
       } else if (attempts >= maxAttempts) {
         clearInterval(interval);
@@ -115,9 +203,10 @@ class OpenClawClient {
   async ensureGatewayRunning() {
     if (this.gatewayStarted) return true;
 
-    const isRunning = await checkPort(18789);
-    if (isRunning) {
-      this.log?.info('[OpenClawClient] OpenClaw gateway 已在运行');
+    const gatewayRunning = await checkPort(18789);
+
+    if (gatewayRunning) {
+      this.log?.info('[OpenClawClient] OpenClaw gateway 已在运行 (18789)');
       this.gatewayStarted = true;
       return true;
     }
@@ -125,8 +214,8 @@ class OpenClawClient {
     // 避免并发启动
     if (this.gatewayStarting) {
       this.log?.info('[OpenClawClient] gateway 正在启动中，等待...');
-      // 等待最多 20 秒
-      for (let i = 0; i < 20; i++) {
+      // 等待最多 25 秒
+      for (let i = 0; i < 25; i++) {
         await new Promise(r => setTimeout(r, 1000));
         if (await checkPort(18789)) {
           this.gatewayStarted = true;
@@ -209,41 +298,53 @@ 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: {
-          ...process.env,
-          OPENCLAW_GATEWAY_URL: gatewayUrl,
-          USERPROFILE: realHome,
-          HOME: realHome,
-        },
+        env: getOpenClawEnv(),
       });
 
+      this.log?.info(`[OpenClawClient] CLI 子进程 PID=${child.pid}`);
+
       child.stdout.on('data', (chunk) => {
         stdout += chunk.toString();
       });
       child.stderr.on('data', (chunk) => {
-        stderr += chunk.toString();
+        const text = chunk.toString();
+        stderr += text;
+        // 实时记录 stderr，方便调试卡死问题
+        this.log?.info(`[OpenClawClient] CLI stderr: ${text.trim().substring(0, 300)}`);
       });
 
+      // 超时兜底（30 秒）
       const timeout = setTimeout(() => {
         killed = true;
         child.kill('SIGTERM');
-        this.log?.error('[OpenClawClient] CLI 执行超时，强制终止');
-      }, 1200000);
+        this.log?.error('[OpenClawClient] CLI 执行超时（30秒），强制终止');
+      }, 30000);
 
       child.on('error', (err) => {
         clearTimeout(timeout);
@@ -259,7 +360,7 @@ class OpenClawClient {
         clearTimeout(timeout);
 
         if (killed) {
-          resolve('OpenClaw CLI 响应超时');
+          resolve('OpenClaw 响应超时（30秒），请检查 openclaw 服务状态');
           return;
         }
 
@@ -269,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;
         }