linco-connect 1.0.3 → 1.0.4

package/package.json

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

package/public/index.html

@@ -931,12 +931,21 @@
     }
 
     function addPermissionConfirm(data) {
+      const requestId = data.requestId || '';
+      const selector = requestId ? `.permission-confirm[data-request-id="${cssEscape(requestId)}"]` : '';
+      const existing = selector ? messagesEl.querySelector(selector) : null;
+      if (existing) {
+        scrollToBottom();
+        return;
+      }
+
       const container = document.createElement('div');
       container.className = 'danger-confirm permission-confirm';
+      container.dataset.requestId = requestId;
 
       const title = document.createElement('div');
       title.className = 'danger-text';
-      title.textContent = `Claude 请求使用工具：${data.toolName || 'tool'}`;
+      title.textContent = `${agentLabel(currentAgentType)} 请求使用工具：${data.toolName || 'tool'}`;
       container.appendChild(title);
 
       if (data.input) {

package/src/agents/codex.js

@@ -319,12 +319,27 @@ function handleServerRequest(message, session) {
 
   // File change approval — auto-approve but notify user
   if (method === 'item/fileChange/requestApproval') {
+    const toolId = String(message.id);
+    const input = summarizeCodexParams(params);
     session._log?.info('codex auto-approving file change');
+    if (ws) {
+      send(ws, 'tool_call', {
+        id: toolId,
+        name: 'fileChange',
+        input,
+      });
+    }
     sendJsonRpc(session.codexAppServer, {
       jsonrpc: '2.0',
       id: message.id,
       result: { decision: 'accept' },
     });
+    if (ws) {
+      send(ws, 'tool_result', {
+        id: toolId,
+        output: 'approved',
+      });
+    }
     return;
   }
 
@@ -333,8 +348,11 @@ function handleServerRequest(message, session) {
     const cmd = params.command || params.tool || '';
     session._log?.info('codex command execution approval requested', { method, command: cmd });
 
+    if (session.pendingPermission?.requestId === String(message.id)) return;
+
     session.pendingPermission = {
       provider: 'codex',
+      requestId: String(message.id),
       toolName: 'exec',
       input: cmd,
       _codexMethod: method,
@@ -342,11 +360,6 @@ function handleServerRequest(message, session) {
     };
 
     if (ws) {
-      send(ws, 'tool_call', {
-        id: String(message.id),
-        name: 'exec',
-        input: cmd,
-      });
       send(ws, 'permission_request', {
         requestId: String(message.id),
         toolName: 'exec',
@@ -369,12 +382,27 @@ function handleServerRequest(message, session) {
 
   // Apply patch approval — auto-approve
   if (method === 'applyPatchApproval') {
+    const toolId = String(message.id);
+    const input = summarizeCodexParams(params);
     session._log?.info('codex auto-approving patch');
+    if (ws) {
+      send(ws, 'tool_call', {
+        id: toolId,
+        name: 'applyPatch',
+        input,
+      });
+    }
     sendJsonRpc(session.codexAppServer, {
       jsonrpc: '2.0',
       id: message.id,
       result: { decision: 'approved' },
     });
+    if (ws) {
+      send(ws, 'tool_result', {
+        id: toolId,
+        output: 'approved',
+      });
+    }
     return;
   }
 
@@ -477,6 +505,25 @@ function handleAppServerMessage(message, session) {
   }
 
   if (method === 'item/completed') {
+    const itemType = params.item?.type || '';
+    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 output = params.item?.output || params.item?.result || params.item?.results || params.output || params.result || '';
+      send(ws, 'tool_result', {
+        id: itemId,
+        output: typeof output === 'string' ? output : JSON.stringify(output).slice(0, 1000),
+      });
+      return;
+    }
+
     // final content fallback if no deltas were emitted
     const text = extractFinalText(params);
     if (text && !session.sawPartialAssistantText) {
@@ -549,10 +596,16 @@ function handleAppServerMessage(message, session) {
 
   if (method === 'item/started') {
     const itemType = params.item?.type || '';
-    session._log?.info('codex item started', { itemType });
-    if (itemType === 'toolCall' || itemType === 'commandExecution') {
-      const toolName = params.item?.name || params.item?.tool || params.item?.command || '';
-      const toolInput = params.item?.input || params.item?.arguments || {};
+    session._log?.info('codex item started', { itemType, item: summarizeCodexItemForLog(params.item) });
+    if (itemType === 'toolCall' || itemType === 'commandExecution' || itemType === 'webSearch') {
+      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 itemId = params.item?.id || params.itemId || '';
       if (toolName) {
         send(ws, 'tool_call', {
@@ -595,6 +648,30 @@ function extractFinalText(params) {
   return '';
 }
 
+function summarizeCodexItemForLog(item) {
+  if (!item || typeof item !== 'object') return {};
+  const summary = {};
+  for (const key of Object.keys(item)) {
+    const value = item[key];
+    if (typeof value === 'string') {
+      summary[key] = value.slice(0, 200);
+    } else if (Array.isArray(value)) {
+      summary[key] = `[array:${value.length}]`;
+    } else if (value && typeof value === 'object') {
+      summary[key] = `[object:${Object.keys(value).slice(0, 10).join(',')}]`;
+    } else {
+      summary[key] = value;
+    }
+  }
+  return summary;
+}
+
+function summarizeCodexParams(params) {
+  if (!params || typeof params !== 'object') return '';
+  const input = params.path || params.file || params.filePath || params.command || params.patch || params.diff || params.input || params;
+  return typeof input === 'string' ? input.slice(0, 1000) : JSON.stringify(input).slice(0, 1000);
+}
+
 function buildCodexInput(input, workspace) {
   if (Array.isArray(input)) {
     const result = [];

package/src/lincoProtocol.js

@@ -36,7 +36,7 @@ function createLincoAdapter(rawWs, session, config) {
       }
       const payload = mapLocalEventToLinco(event, session, config, linco);
       if (!payload || closed.current) return;
-      const wrapped = wrapLincoEnvelope(payload, config);
+      const wrapped = wrapLincoEnvelope(payload, config, session);
       if (Array.isArray(wrapped)) {
         for (const item of wrapped) rawWs.send(JSON.stringify(item));
         return;
@@ -55,11 +55,11 @@ function createLincoAdapter(rawWs, session, config) {
   };
 }
 
-function wrapLincoEnvelope(payload, config) {
+function wrapLincoEnvelope(payload, config, session) {
   const meta = lincoMetaDefaults(config, {});
   return pruneUndefined({
     ...payload,
-    from: payload.from || (config.agents ? Object.keys(config.agents)[0] : 'claude'),
+    from: payload.from || session?.agentType || (config.agents ? Object.keys(config.agents)[0] : 'claude'),
     to: payload.to || 'robot',
     source: payload.source || 'ws',
     ts: payload.ts || Date.now(),