linco-connect 1.0.5 → 1.0.7

package/package.json

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

package/src/agents/codex.js

@@ -43,6 +43,7 @@ function runAppServerTurn(input, ws, session, config) {
   session.isTurnActive = true;
   session.currentInputForNoOutput = input;
   session.sawPartialAssistantText = false;
+  session.codexAssistantEnded = false;
   resetCodexAssistantText(session);
   session._lastWs = ws;
   session._lastConfig = config;
@@ -257,6 +258,13 @@ function startNewThread(session, agentConfig) {
   });
 }
 
+function sendCodexAssistantEnd(ws, session) {
+  if (session.codexAssistantEnded) return;
+  session.codexAssistantEnded = true;
+  flushCodexAssistantText(ws, session);
+  send(ws, 'assistant_end', {});
+}
+
 function clearTurnState(session) {
   flushCodexAssistantText(session._lastWs, session);
   session.isTurnActive = false;
@@ -275,6 +283,7 @@ function ensureCodexStreamState(session) {
 }
 
 function appendCodexAssistantText(text, ws, session, ensureAssistantStarted) {
+  if (session.codexAssistantEnded) return;
   const state = ensureCodexStreamState(session);
   state.onStart = ensureAssistantStarted;
   appendTextStream(text, ws, state);
@@ -529,21 +538,21 @@ function handleAppServerMessage(message, session) {
     if (text && !session.sawPartialAssistantText) {
       appendCodexAssistantText(text, ws, session, () => send(ws, 'assistant_start', {}));
     }
-    // Safety fallback: if turn/completed doesn't arrive within 3s,
-    // clear isTurnActive so the next message doesn't get stuck.
+    // Safety fallback: if turn/completed never arrives, clear isTurnActive so the next message doesn't get stuck.
     if (session.turnCompletedTimerId) clearTimeout(session.turnCompletedTimerId);
     session.turnCompletedTimerId = setTimeout(() => {
       if (session.isTurnActive) {
         session.isTurnActive = false;
         session.currentInputForNoOutput = null;
         if (session.sawPartialAssistantText) {
-          flushCodexAssistantText(ws, session);
-          send(ws, 'assistant_end', {});
+          sendCodexAssistantEnd(ws, session);
+        } else {
+          sendSystem(ws, 'Codex 本次执行没有输出。');
         }
         const cfg = session._lastConfig;
         if (cfg) drainQueue(ws, session, cfg);
       }
-    }, 3000);
+    }, 10000);
     return;
   }
 
@@ -555,8 +564,7 @@ function handleAppServerMessage(message, session) {
     updateCodexSessionStats(session, params);
     clearTurnState(session);
     if (session.sawPartialAssistantText) {
-      flushCodexAssistantText(ws, session);
-      send(ws, 'assistant_end', {});
+      sendCodexAssistantEnd(ws, session);
     } else {
       sendSystem(ws, 'Codex 本次执行没有输出。');
     }
@@ -636,13 +644,17 @@ function updateCodexSessionStats(session, params = {}) {
   updateAgentSessionHistory(session);
 }
 
+function isCodexAssistantMessageType(type) {
+  return ['agentMessage', 'agent_message', 'message'].includes(type);
+}
+
 function extractFinalText(params) {
   if (typeof params.text === 'string') return params.text;
   if (typeof params.delta === 'string') return params.delta;
   if (Array.isArray(params.content)) {
     return params.content.map(item => typeof item === 'string' ? item : item?.text || '').join('');
   }
-  if (params.item?.type === 'agent_message' && typeof params.item.text === 'string') {
+  if (isCodexAssistantMessageType(params.item?.type) && typeof params.item.text === 'string') {
     return params.item.text;
   }
   return '';
@@ -725,6 +737,7 @@ function runExecTurn(input, ws, session, config) {
   session.isTurnActive = true;
   session.currentInputForNoOutput = input;
   session.sawPartialAssistantText = false;
+  session.codexAssistantEnded = false;
   resetCodexAssistantText(session);
 
   const agentConfig = config.agents?.codex || {};
@@ -856,7 +869,7 @@ function extractText(event) {
   if (Array.isArray(event.content)) {
     return event.content.map(item => typeof item === 'string' ? item : item?.text || '').join('');
   }
-  if (typeof event.item?.text === 'string' && ['agent_message', 'message'].includes(event.item.type)) {
+  if (typeof event.item?.text === 'string' && isCodexAssistantMessageType(event.item.type)) {
     return event.item.text;
   }
   if (event.item?.type === 'message' && Array.isArray(event.item.content)) {