linco-connect 1.1.0 → 1.1.2

package/package.json

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

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);
 }
 

package/src/agents/openclaw.js

@@ -1,7 +1,7 @@
 const crypto = require('crypto');
 const path = require('path');
 const { isDangerousCommand } = require('../danger');
-const { send, sendError, sendSystem } = require('../protocol');
+const { send, sendError, sendSystem, sendTurnEnd } = require('../protocol');
 const {
   createAgentSessionEntry,
   persistAgentSessionId,
@@ -211,12 +211,14 @@ function handleChatEvent(payload, ws, session, config) {
     flushOpenClawAssistantText(ws, session);
     if (session.streamState?.assistantStarted) send(ws, 'assistant_end', {});
     sendSystem(ws, 'OpenClaw run stopped.');
+    sendTurnEnd(ws, session, 'cancelled');
     finishTurn(ws, session, config, { drain: false });
     return;
   }
 
   if (payload.state === 'error') {
     sendError(ws, payload.errorMessage || 'OpenClaw run failed.');
+    sendTurnEnd(ws, session, 'error', { error: payload.errorMessage || 'OpenClaw run failed.' });
     finishTurn(ws, session, config);
   }
 }
@@ -227,6 +229,7 @@ function completeRun(payload, ws, session, config) {
   if (hadOutput) send(ws, 'assistant_end', {});
   else sendSystem(ws, 'OpenClaw returned no output.');
   updateOpenClawSessionStats(session, payload.usage);
+  sendTurnEnd(ws, session);
   finishTurn(ws, session, config);
 }
 

package/src/attachmentHandler.js

@@ -2,7 +2,7 @@ const crypto = require('crypto');
 const fs = require('fs');
 const path = require('path');
 const { ensureDir } = require('./config');
-const { sendError, sendSystem } = require('./protocol');
+const { sendError, sendSystem, sendTurnEnd } = require('./protocol');
 
 const RESERVED_WINDOWS_NAMES = new Set(['CON', 'PRN', 'AUX', 'NUL', 'COM1', 'COM2', 'COM3', 'COM4', 'COM5', 'COM6', 'COM7', 'COM8', 'COM9', 'LPT1', 'LPT2', 'LPT3', 'LPT4', 'LPT5', 'LPT6', 'LPT7', 'LPT8', 'LPT9']);
 const SUPPORTED_IMAGE_MEDIA_TYPES = new Set(['image/png', 'image/jpeg', 'image/gif', 'image/webp']);
@@ -25,6 +25,7 @@ function handleMessageWithAttachments(msg, ws, session, config, executeAgentQuer
     savedAttachments = saveAttachments(session, attachments, config);
   } catch (err) {
     sendError(ws, `❌ 附件处理失败: ${err.message}`);
+    sendTurnEnd(ws, session, 'error', { error: err.message });
     return;
   }
 

package/src/claudeRunner.js

@@ -3,7 +3,7 @@ const fs = require('fs');
 const path = require('path');
 const { isDangerousCommand } = require('./danger');
 const { buildOutboxSystemPrompt, getOutboxDir } = require('./outgoingAttachmentHandler');
-const { send, sendError, sendSystem } = require('./protocol');
+const { send, sendError, sendSystem, sendTurnEnd } = require('./protocol');
 const { appendTextStream, flushTextStream, resetTextStream } = require('./streamBuffer');
 const { persistClaudeSessionId, stopAgentProcess, updateAgentSessionHistory } = require('./session');
 const {
@@ -193,7 +193,9 @@ function ensureClaudeProcess(ws, session, config) {
     if (session.isTurnActive) {
       session.isTurnActive = false;
       session.currentInputForNoOutput = null;
-      sendError(ws, code === 0 || code === null ? '⚠️ Claude 会话已结束。' : `❌ Claude 进程退出，退出码: ${code}`);
+      const message = code === 0 || code === null ? '⚠️ Claude 会话已结束。' : `❌ Claude 进程退出，退出码: ${code}`;
+      sendError(ws, message);
+      sendTurnEnd(ws, session, 'error', { error: message });
       drainMessageQueue(ws, session, config);
     }
   });
@@ -205,7 +207,9 @@ function ensureClaudeProcess(ws, session, config) {
     session.isTurnActive = false;
     session.currentInputForNoOutput = null;
     flushAssistantText(ws, session);
-    sendError(ws, `❌ 无法启动 Claude: ${err.message}\n请确认已安装 Claude Code 并设置好 API 密钥。`);
+    const message = `❌ 无法启动 Claude: ${err.message}\n请确认已安装 Claude Code 并设置好 API 密钥。`;
+    sendError(ws, message);
+    sendTurnEnd(ws, session, 'error', { error: message });
   });
 
   return child;
@@ -328,6 +332,7 @@ function handleClaudeMessage(parsed, ws, session, config) {
         usage: session.usage,
         messageCount: session.messageCount,
       });
+      sendTurnEnd(ws, session);
       session.isTurnActive = false;
       session.currentInputForNoOutput = null;
       drainMessageQueue(ws, session, config);

package/src/lincoProtocol.js

@@ -132,6 +132,17 @@ function mapLocalEventToLinco(event, session, config, linco) {
       };
     case 'outgoing_attachment':
       return mapOutgoingAttachment(event, base, session);
+    case 'turn_end':
+      return {
+        ...base,
+        ...event,
+        type: 'turn_end',
+        requestId: event.requestId || event.request_id || base.messageId,
+        streamId: event.streamId || event.stream_id || linco.streamId || base.streamId,
+        sessionKey: event.sessionKey || event.session_key || session.id,
+        reason: event.reason || 'completed',
+        ts: event.ts || Date.now(),
+      };
     default:
       return {
         ...base,

package/src/protocol.js

@@ -10,8 +10,39 @@ function sendError(ws, text) {
   send(ws, 'error', { text });
 }
 
+function buildTurnEndPayload(session, reason = 'completed', payload = {}) {
+  const linco = session?.linco || {};
+  return {
+    requestId: payload.requestId || payload.request_id || linco.messageId,
+    streamId: payload.streamId || payload.stream_id || linco.streamId,
+    sessionKey: payload.sessionKey || payload.session_key || session?.id,
+    reason,
+    ts: Date.now(),
+    ...payload,
+  };
+}
+
+function turnEndKey(payload) {
+  return [
+    payload.requestId || '',
+    payload.streamId || '',
+    payload.sessionKey || '',
+  ].join('|');
+}
+
+function sendTurnEnd(ws, session, reason = 'completed', payload = {}) {
+  const turnEndPayload = buildTurnEndPayload(session, reason, payload);
+  const key = turnEndKey(turnEndPayload);
+  if (session && session.lastTurnEndKey === key) return false;
+  if (session) session.lastTurnEndKey = key;
+  send(ws, 'turn_end', turnEndPayload);
+  return true;
+}
+
 module.exports = {
   send,
   sendError,
   sendSystem,
+  sendTurnEnd,
+  buildTurnEndPayload,
 };

package/src/slashCommands.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const { resetOutgoingAttachments, startOutboxWatcher, stopOutboxWatcher } = require('./outgoingAttachmentHandler');
-const { sendError, sendSystem } = require('./protocol');
+const { sendError, sendSystem, sendTurnEnd } = require('./protocol');
 const { removeAgentSessionFromHistory, saveSessionMetadata } = require('./session');
 const { resolvePendingDanger, resolvePendingPermission, stopAgentProcess } = require('./agentRunner');
 const { clearPendingPermissions, pendingPermissionIds } = require('./permissionState');
@@ -35,7 +35,7 @@ function handleSlashCommand(text, ws, session, config) {
 📎 支持附件：默认允许普通文件（如 csv、xlsx、sql、txt、md、pdf、docx 等），高风险可执行/脚本文件默认拦截
 📤 Agent 生成文件后可放入当前会话 outbox 目录自动发送到对话框
 🔁 其他 /xxx 命令会透传给当前 Agent，优先使用当前 Agent 原生斜杠命令能力`);
-      return true;
+      return completeLocalCommand(ws, session);
 
     case '/commands':
       sendSystem(ws, `${localCommandsHelp()}
@@ -44,38 +44,38 @@ function handleSlashCommand(text, ws, session, config) {
 除上述本地命令外，其他 /xxx 会直接发送给当前 Agent，例如 /model、/status、/memory、/compact 等。
 
 ⚠️ 注意：部分 Agent 原生命令只在交互式 CLI/TUI 中更新界面；在 Linco 的 stream-json 模式下可能返回“无输出”或提示当前环境不可用。遇到这种情况不是连接失败，而是该命令不适合当前桥接模式。`);
-      return true;
+      return completeLocalCommand(ws, session);
 
     case '/status':
       sendStatus(ws, session);
-      return true;
+      return completeLocalCommand(ws, session);
 
     case '/pwd':
       if (isHermesSession(session)) {
         sendHermesWorkspaceNotice(ws);
-        return true;
+        return completeLocalCommand(ws, session);
       }
       sendSystem(ws, `📂 ${session.workspace}`);
-      return true;
+      return completeLocalCommand(ws, session);
 
     case '/cd':
       if (isHermesSession(session)) {
         sendHermesWorkspaceNotice(ws);
-        return true;
+        return completeLocalCommand(ws, session);
       }
       handleCd(parts[1], ws, session, config);
-      return true;
+      return completeLocalCommand(ws, session);
 
     case '/new':
       stopAgentProcess(session, { clearAgentSession: true });
       resetOutgoingAttachments(session, config);
       sendSystem(ws, '🆕 已开启新会话，之前上下文已清除。');
-      return true;
+      return completeLocalCommand(ws, session);
 
     case '/stop':
       stopAgentProcess(session, { clearAgentSession: false });
       sendSystem(ws, '⏹️ 已停止当前 Agent 进程，下次消息会尝试恢复当前会话。');
-      return true;
+      return completeLocalCommand(ws, session);
 
     case '/base':
       sendSystem(ws, `🗄️ Linco 运行信息：
@@ -84,33 +84,38 @@ Linco Home: ${config.lincoHome}
 会话运行目录: ${session.runtimeDir}
 附件目录: ${session.attachmentsDir}
 outbox 目录: ${session.outboxDir}`);
-      return true;
+      return completeLocalCommand(ws, session);
 
     case '/list':
       handleList(parts[1], ws, session);
-      return true;
+      return completeLocalCommand(ws, session);
 
     case '/switch':
       handleSwitch(parts[1], ws, session, config);
-      return true;
+      return completeLocalCommand(ws, session);
 
     case '/delete':
       handleDelete(parts[1], ws, session);
-      return true;
+      return completeLocalCommand(ws, session);
 
     case '/approve':
       handleApprove(parts[1], ws, session, config);
-      return true;
+      return completeLocalCommand(ws, session);
 
     case '/usage':
       handleUsage(ws, session);
-      return true;
+      return completeLocalCommand(ws, session);
 
     default:
       return false;
   }
 }
 
+function completeLocalCommand(ws, session) {
+  sendTurnEnd(ws, session);
+  return true;
+}
+
 function sendStatus(ws, session) {
   const processRunning = !!(
     (session.agentProcess || session.claudeProcess) &&