linco-connect 1.1.5 → 1.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linco-connect",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "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) {
@@ -52,6 +54,7 @@ function runAppServerTurn(input, ws, session, config) {
   session.sawPartialAssistantText = false;
   session.codexAssistantEnded = false;
   session.codexEmittedAgentMessageIds = new Set();
+  session.codexToolStates = new Map();
   resetCodexAssistantText(session);
   session._lastWs = ws;
   session._lastConfig = config;
@@ -286,6 +289,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();
@@ -327,6 +359,68 @@ function hasCodexAgentMessageEmitted(session, itemId) {
   return Boolean(id && session.codexEmittedAgentMessageIds?.has(id));
 }
 
+function ensureCodexToolStates(session) {
+  if (!(session.codexToolStates instanceof Map)) {
+    session.codexToolStates = new Map();
+  }
+  return session.codexToolStates;
+}
+
+function codexToolStateFor(session, id) {
+  const toolId = String(id || '').trim();
+  if (!toolId) return null;
+  const states = ensureCodexToolStates(session);
+  return states.get(toolId) || null;
+}
+
+function setCodexToolState(session, id, next) {
+  const toolId = String(id || '').trim();
+  if (!toolId) return;
+  const states = ensureCodexToolStates(session);
+  const previous = states.get(toolId) || {};
+  states.set(toolId, {
+    ...previous,
+    ...next,
+  });
+}
+
+function emitCodexToolCall(ws, session, tool) {
+  if (!ws) return false;
+  const id = String(tool.id || '').trim();
+  const existing = codexToolStateFor(session, id);
+  if (existing?.phase === 'completed' || existing?.phase === 'started') {
+    return false;
+  }
+  const name = String(tool.name || existing?.name || 'tool').trim() || 'tool';
+  const input = tool.input ?? existing?.input ?? '';
+  send(ws, 'tool_call', { id, name, input });
+  setCodexToolState(session, id, { phase: 'started', name, input });
+  return true;
+}
+
+function emitCodexToolResult(ws, session, tool) {
+  if (!ws) return false;
+  const id = String(tool.id || '').trim();
+  const existing = codexToolStateFor(session, id);
+  if (existing?.phase === 'completed') return false;
+
+  const name = String(tool.name || existing?.name || 'tool').trim() || 'tool';
+  const input = tool.input ?? existing?.input ?? '';
+  if (id && existing?.phase !== 'started') {
+    emitCodexToolCall(ws, session, { id, name, input });
+  }
+
+  const output = tool.output ?? '';
+  send(ws, 'tool_result', { id, output });
+  setCodexToolState(session, id, {
+    phase: 'completed',
+    name,
+    input,
+    output,
+  });
+  return true;
+}
+
 function shouldAppendCompletedAgentMessage(session, params) {
   const itemId = codexAgentMessageId(params);
   if (itemId) return !hasCodexAgentMessageEmitted(session, itemId);
@@ -483,14 +577,12 @@ function handleServerRequest(message, session) {
 
   // Tool call from server request
   if (method === 'item/tool/call') {
-    if (ws) {
-      const toolName = params.name || params.tool || '';
-      send(ws, 'tool_call', {
-        id: String(message.id),
-        name: toolName,
-        input: JSON.stringify(params.input || {}).slice(0, 300),
-      });
-    }
+    const toolName = params.name || params.tool || '';
+    emitCodexToolCall(ws, session, {
+      id: String(message.id),
+      name: toolName,
+      input: JSON.stringify(params.input || {}).slice(0, 300),
+    });
     sendJsonRpc(session.codexAppServer, {
       jsonrpc: '2.0',
       id: message.id,
@@ -574,16 +666,19 @@ function handleAppServerMessage(message, session) {
     session._log?.info('codex item completed', { itemType, item: summarizeCodexItemForLog(params.item) });
     if (itemType === 'toolCall' || itemType === 'commandExecution' || itemType === 'webSearch') {
       const itemId = params.item?.id || params.itemId || '';
-      if (itemType === 'webSearch' && params.item?.query) {
-        send(ws, 'tool_call', {
-          id: itemId,
-          name: 'webSearch',
-          input: params.item.query,
-        });
-      }
+      const isCommand = itemType === 'commandExecution';
+      const isWebSearch = itemType === 'webSearch';
+      const toolName = isCommand ? 'exec' : isWebSearch ? 'webSearch' : (params.item?.name || params.item?.tool || '');
+      const toolInput = isCommand
+        ? (params.item?.command || '')
+        : isWebSearch
+          ? (params.item?.query || params.item?.input || params.item?.arguments || {})
+          : (params.item?.input || params.item?.arguments || {});
       const output = params.item?.output || params.item?.result || params.item?.results || params.output || params.result || '';
-      send(ws, 'tool_result', {
+      emitCodexToolResult(ws, session, {
         id: itemId,
+        name: toolName,
+        input: typeof toolInput === 'string' ? toolInput : JSON.stringify(toolInput).slice(0, 300),
         output: typeof output === 'string' ? output : JSON.stringify(output).slice(0, 1000),
       });
       return;
@@ -597,42 +692,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;
   }
 
@@ -647,7 +716,7 @@ function handleAppServerMessage(message, session) {
   if (method === 'tool/start' || method === 'tool_call') {
     const toolName = params.name || params.tool || '';
     if (toolName) {
-      send(ws, 'tool_call', {
+      emitCodexToolCall(ws, session, {
         id: params.id || params.toolId || '',
         name: toolName,
         input: params.input || params.arguments || {},
@@ -657,7 +726,7 @@ function handleAppServerMessage(message, session) {
   }
 
   if (method === 'tool/completed' || method === 'tool_result') {
-    send(ws, 'tool_result', {
+    emitCodexToolResult(ws, session, {
       id: params.id || params.toolId || '',
       output: params.output || params.result || '',
     });
@@ -678,7 +747,7 @@ function handleAppServerMessage(message, session) {
           : (params.item?.input || params.item?.arguments || {});
       const itemId = params.item?.id || params.itemId || '';
       if (toolName) {
-        send(ws, 'tool_call', {
+        emitCodexToolCall(ws, session, {
           id: itemId,
           name: toolName,
           input: typeof toolInput === 'string' ? toolInput : JSON.stringify(toolInput).slice(0, 300),