linco-connect 1.1.6 → 1.1.7

package/package.json

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

package/src/agents/codex.js

@@ -54,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;
@@ -358,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);
@@ -514,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,
@@ -605,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;
@@ -652,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 || {},
@@ -662,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 || '',
     });
@@ -683,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),