linco-connect 1.0.9 → 1.1.1

package/bin/linco-connect.js

@@ -16,6 +16,10 @@ const {
 } = require('../src/config');
 const { ensureLocalToken, localUrlWithToken } = require('../src/localAuth');
 const { checkGatewayHealth, resolveHermesGatewayOptions } = require('../src/hermesGateway');
+const {
+  checkGatewayHealth: checkOpenClawGatewayHealth,
+  resolveOpenClawGatewayOptions,
+} = require('../src/openclawGateway');
 const pkg = require('../package.json');
 
 const rootDir = path.resolve(__dirname, '..');
@@ -147,6 +151,8 @@ function mergeInitConfig(current, values) {
     appSecret: values.appSecret,
     enabled: true,
   };
+  if (values.agentType === 'openclaw') accountEntry.openclawAgentId = 'main';
+  const agentType = values.agentType || 'claude';
 
   return {
     ...current,
@@ -157,13 +163,13 @@ function mergeInitConfig(current, values) {
         ...(current.channels?.linco || {}),
         agents: {
           ...(current.channels?.linco?.agents || {}),
-          [values.agentType]: {
-            ...(current.channels?.linco?.agents?.[values.agentType] || {}),
+          [agentType]: {
+            ...(current.channels?.linco?.agents?.[agentType] || {}),
             defaultAccount: values.account,
             accounts: {
-              ...(current.channels?.linco?.agents?.[values.agentType]?.accounts || {}),
+              ...(current.channels?.linco?.agents?.[agentType]?.accounts || {}),
               [values.account]: {
-                ...(current.channels?.linco?.agents?.[values.agentType]?.accounts?.[values.account] || {}),
+                ...(current.channels?.linco?.agents?.[agentType]?.accounts?.[values.account] || {}),
                 ...accountEntry,
               },
             },
@@ -425,6 +431,19 @@ async function doctorCommand() {
       } else {
         checks.push([`${agentType} Gateway`, false, `未运行，且 autoStartGateway=false ${options.gatewayUrl}`]);
       }
+    } else if (agentType === 'openclaw') {
+      const options = resolveOpenClawGatewayOptions(agent);
+      const health = await checkOpenClawGatewayHealth(options.gatewayUrl, agent, { timeoutMs: 3000 });
+      if (health.ok) {
+        checks.push([`${agentType} Gateway`, true, options.gatewayUrl]);
+      } else if (agent.autoStartGateway !== false) {
+        const hasCli = !agent.enabled || (path.isAbsolute(options.openclawBin) ? fs.existsSync(options.openclawBin) : commandExists(options.openclawBin));
+        checks.push([`${agentType} Gateway`, true, `not running; OpenClaw messages will auto-start ${options.gatewayUrl}`]);
+        checks.push([`${agentType} CLI`, hasCli, options.openclawBin]);
+      } else {
+        checks.push([`${agentType} Gateway`, false, `not running and autoStartGateway=false ${options.gatewayUrl}`]);
+      }
+      checks.push([`${agentType} Agent ID`, true, agent.openclawAgentId || 'main']);
     } else {
       checks.push([`${agentType} CLI`, !agent.enabled || (path.isAbsolute(agent.bin) ? fs.existsSync(agent.bin) : commandExists(agent.bin)), agent.bin]);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linco-connect",
-  "version": "1.0.9",
+  "version": "1.1.1",
   "description": "自研 IM 桥接多 Agent 服务",
   "main": "server.js",
   "bin": {

package/public/index.html

@@ -577,6 +577,7 @@
         <option value="claude">Claude Code</option>
         <option value="codex">Codex</option>
         <option value="hermes">Hermes</option>
+        <option value="openclaw">OpenClaw</option>
       </select>
     </div>
     <div id="messages"></div>
@@ -1180,11 +1181,11 @@
 
     function normalizeAgentType(value) {
       const type = String(value || 'claude').trim().toLowerCase();
-      return ['claude', 'codex', 'hermes'].includes(type) ? type : 'claude';
+      return ['claude', 'codex', 'hermes', 'openclaw'].includes(type) ? type : 'claude';
     }
 
     function agentLabel(type) {
-      return type === 'codex' ? 'Codex' : type === 'hermes' ? 'Hermes' : 'Claude Code';
+      return type === 'codex' ? 'Codex' : type === 'hermes' ? 'Hermes' : type === 'openclaw' ? 'OpenClaw' : 'Claude Code';
     }
 
     function setAgentSelection(agentType, options = {}) {

package/src/agentRunner.js

@@ -1,11 +1,13 @@
 const claude = require('./agents/claude');
 const codex = require('./agents/codex');
 const hermes = require('./agents/hermes');
+const openclaw = require('./agents/openclaw');
 
 const providers = {
   claude,
   codex,
   hermes,
+  openclaw,
 };
 
 function providerFor(session) {

package/src/agents/codex.js

@@ -1,6 +1,6 @@
 const { spawn } = require('child_process');
 const { isDangerousCommand } = require('../danger');
-const { send, sendError, sendSystem } = require('../protocol');
+const { send, sendError, sendSystem, sendTurnEnd } = require('../protocol');
 const { persistAgentSessionId, stopAgentProcess: stopSessionProcess, updateAgentSessionHistory } = require('../session');
 const { getOutboxDir } = require('../outgoingAttachmentHandler');
 const { createTextStreamBuffer, appendTextStream, flushTextStream, resetTextStream } = require('../streamBuffer');
@@ -603,6 +603,7 @@ function handleAppServerMessage(message, session) {
         } else {
           sendSystem(ws, 'Codex 本次执行没有输出。');
         }
+        sendTurnEnd(ws, session, 'timeout');
         const cfg = session._lastConfig;
         if (cfg) drainQueue(ws, session, cfg);
       }
@@ -622,6 +623,7 @@ function handleAppServerMessage(message, session) {
     } else {
       sendSystem(ws, 'Codex 本次执行没有输出。');
     }
+    sendTurnEnd(ws, session);
     const cfg = session._lastConfig;
     if (cfg) {
       drainQueue(ws, session, cfg);
@@ -631,6 +633,7 @@ function handleAppServerMessage(message, session) {
 
   if (method === 'error' || method.includes('error')) {
     sendError(ws, params.message || JSON.stringify(params));
+    sendTurnEnd(ws, session, 'error', { error: params.message || JSON.stringify(params) });
     clearTurnState(session);
     return;
   }
@@ -861,6 +864,7 @@ function runExecTurn(input, ws, session, config) {
     if (code === 0) {
       updateCodexSessionStats(session);
     }
+    sendTurnEnd(ws, session, code === 0 ? 'completed' : 'error', code === 0 ? {} : { error: stderr.trim() || `Codex 退出，状态码: ${code}` });
     drainQueue(ws, session, config);
   });
 

package/src/agents/hermes.js

@@ -1,5 +1,5 @@
 const { isDangerousCommand } = require('../danger');
-const { send, sendError, sendSystem } = require('../protocol');
+const { send, sendError, sendSystem, sendTurnEnd } = require('../protocol');
 const { persistAgentSessionId, stopAgentProcess: stopSessionProcess, updateAgentSessionHistory, createAgentSessionEntry, saveSessionMetadata } = require('../session');
 const { getOutboxDir } = require('../outgoingAttachmentHandler');
 const { createTextStreamBuffer, appendTextStream, flushTextStream, resetTextStream } = require('../streamBuffer');
@@ -177,10 +177,12 @@ function handleHermesEvent(event, ws, session, config) {
       return;
     case 'run.failed':
       sendError(ws, event.error || 'Hermes run 执行失败');
+      sendTurnEnd(ws, session, 'error', { error: event.error || 'Hermes run 执行失败' });
       finishTurn(ws, session, config);
       return;
     case 'run.cancelled':
       sendSystem(ws, 'Hermes run 已停止。');
+      sendTurnEnd(ws, session, 'cancelled');
       finishTurn(ws, session, config);
       return;
     default:
@@ -240,6 +242,7 @@ function completeRun(event, ws, session, config) {
     sendSystem(ws, 'Hermes 本次执行没有输出。');
   }
   updateHermesSessionStats(session, event.usage);
+  sendTurnEnd(ws, session);
   finishTurn(ws, session, config);
 }