linco-connect 1.1.5 → 1.1.6

package/package.json

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

package/src/agents/codex.js

@@ -12,6 +12,8 @@ const {
   setPendingPermission,
 } = require('../permissionState');
 
+const CODEX_TURN_COMPLETION_FALLBACK_MS = 1000;
+
 function execute(input, ws, session, config) {
   const textForCheck = stringifyInput(input);
   if (isDangerousCommand(textForCheck) && session.autoApprove !== true) {
@@ -286,6 +288,35 @@ function clearTurnState(session) {
   }
 }
 
+function finishCodexTurn(ws, session, config, reason = 'completed', payload = {}) {
+  if (!session.isTurnActive) return;
+
+  if (reason === 'completed') {
+    updateCodexSessionStats(session, payload);
+  }
+
+  clearTurnState(session);
+  if (session.sawPartialAssistantText) {
+    sendCodexAssistantEnd(ws, session);
+  } else {
+    sendSystem(ws, 'Codex 本次执行没有输出。');
+  }
+  sendTurnEnd(ws, session, reason, payload);
+  if (config) drainQueue(ws, session, config);
+}
+
+function isFinalCodexAssistantItem(params) {
+  const item = params.item || {};
+  return isCodexAssistantMessageType(item.type) && item.phase === 'final_answer';
+}
+
+function armCodexTurnCompletionFallback(ws, session, config) {
+  if (session.turnCompletedTimerId) clearTimeout(session.turnCompletedTimerId);
+  session.turnCompletedTimerId = setTimeout(() => {
+    finishCodexTurn(ws, session, config, 'completed');
+  }, CODEX_TURN_COMPLETION_FALLBACK_MS);
+}
+
 function ensureCodexStreamState(session) {
   if (!session.codexStreamState) {
     session.codexStreamState = createTextStreamBuffer();
@@ -597,42 +628,16 @@ function handleAppServerMessage(message, session) {
       appendCodexAssistantText(text, ws, session, () => send(ws, 'assistant_start', {}));
       markCodexAgentMessageEmitted(session, agentMessageId);
     }
-    // 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) {
-          sendCodexAssistantEnd(ws, session);
-        } else {
-          sendSystem(ws, 'Codex 本次执行没有输出。');
-        }
-        sendTurnEnd(ws, session, 'timeout');
-        const cfg = session._lastConfig;
-        if (cfg) drainQueue(ws, session, cfg);
-      }
-    }, 10000);
+    // Safety fallback: some app-server builds emit task completion without a turn/completed notification.
+    // Arm it only after the final assistant message, not after user/tool/reasoning items.
+    if (isFinalCodexAssistantItem(params)) {
+      armCodexTurnCompletionFallback(ws, session, session._lastConfig);
+    }
     return;
   }
 
   if (method === 'turn/completed' || method === 'turn.completed') {
-    if (session.turnCompletedTimerId) {
-      clearTimeout(session.turnCompletedTimerId);
-      session.turnCompletedTimerId = null;
-    }
-    updateCodexSessionStats(session, params);
-    clearTurnState(session);
-    if (session.sawPartialAssistantText) {
-      sendCodexAssistantEnd(ws, session);
-    } else {
-      sendSystem(ws, 'Codex 本次执行没有输出。');
-    }
-    sendTurnEnd(ws, session);
-    const cfg = session._lastConfig;
-    if (cfg) {
-      drainQueue(ws, session, cfg);
-    }
+    finishCodexTurn(ws, session, session._lastConfig, 'completed', params);
     return;
   }