wip

Author: tripolskypetr

TODO.md

@@ -485,6 +485,32 @@ complete=HANG)
 - MergePolicy: бан живёт в одной политике (hasBan per-policy), блокирует весь
   вход, unban именно этой политики восстанавливает.
 
+## 23-й заход: исключение на дубль tool_call id + конфигурируемые таймеры (+4 теста)
+
+### Изменения поведения (по требованию)
+1. Дубликат tool_call id от модели теперь КИДАЕТ ИСКЛЮЧЕНИЕ (раньше оба вызова
+   молча выполнялись). `src/client/ClientAgent.ts`: проверка уникальности id
+   после нормализации, до среза maxToolCalls; ошибка доставляется через
+   errorSubject + флоу восстанавливается placeholder'ом (не виснет).
+   `src/functions/target/session.ts`: session.complete подписан на errorSubject
+   (раньше только execute/executeForce/runStateless*/chat/json) — теперь
+   session.complete реджектится и на дубль id, и на ошибки провайдера.
+2. Таймеры вынесены в GLOBAL_CONFIG (тестируемость через setConfig в воркере):
+   - CC_OPERATOR_SIGNAL_TIMEOUT (было константой 90_000 в ClientOperator);
+   - CC_CHAT_INACTIVITY_CHECK (было 60с в Chat.ts);
+   - CC_CHAT_INACTIVITY_TIMEOUT (было 15мин в Chat.ts).
+   Дефолты не изменены. Файлы: config/params.ts, model/GlobalConfig.model.ts,
+   client/ClientOperator.ts, classes/Chat.ts.
+
+### Новые тесты (4), сьют вырос до 246/246 — test/spec/modelguard.test.mjs
+- дубль tool_call id → session.complete реджектится ("duplicate tool call id"),
+  ни один из вызовов не выполнен, сессия остаётся рабочей;
+- дубль tool_call id → execute() тоже кидает;
+- операторский таймаут: оператор молчит → complete возвращает "" через
+  ~CC_OPERATOR_SIGNAL_TIMEOUT (300мс в тесте);
+- Chat: простаивающий чат авто-диспоузится по CC_CHAT_INACTIVITY_TIMEOUT
+  (onDispose колбэк, hasSession=false).
+
 ## Найденные и исправленные баги (24 итого)
 
 ### 1. Дедлок waitForOutput при functools-kit v4 (причина 39 упавших тестов)

src/classes/Chat.ts

@@ -17,10 +17,7 @@ interface TChatInstance extends IChatInstance {
  */
 type DisposeFn = () => void;
 
-/** @constant {number} INACTIVITY_CHECK - Interval for checking inactivity in milliseconds (1 minute)*/
-const INACTIVITY_CHECK = 60 * 1_000;
-/** @constant {number} INACTIVITY_TIMEOUT - Timeout duration for inactivity in milliseconds (15 minutes)*/
-const INACTIVITY_TIMEOUT = 15 * 60 * 1000;
+
 
 /**
  * @constant {Function} BEGIN_CHAT_FN
@@ -179,7 +176,8 @@ class ChatInstance<Payload extends unknown = any> implements IChatInstance {
         clientId: this.clientId,
         swarmName: this.swarmName,
       });
-    const isActive = now - this._lastActivity <= INACTIVITY_TIMEOUT;
+    const isActive =
+      now - this._lastActivity <= GLOBAL_CONFIG.CC_CHAT_INACTIVITY_TIMEOUT;
     this.callbacks.onCheckActivity &&
       this.callbacks.onCheckActivity(
         this.clientId,
@@ -269,7 +267,7 @@ export class ChatUtils implements IChatControl {
         await chat.dispose();
       }
     };
-    setInterval(handleCleanup, INACTIVITY_CHECK);
+    setInterval(handleCleanup, GLOBAL_CONFIG.CC_CHAT_INACTIVITY_CHECK);
   });
 
   /**

src/client/ClientAgent.ts

@@ -21,6 +21,7 @@ import { IBusEvent } from "../model/Event.model";
 import { MCPToolProperties } from "../interfaces/MCP.interface";
 import createToolRequest from "../utils/createToolRequest";
 import { resolveTools } from "../utils/resolveTools";
+import { errorSubject } from "../config/emitters";
 import swarm from "../lib";
 
 const CANCEL_OUTPUT_SYMBOL = Symbol("cancel-output");
@@ -388,6 +389,29 @@ const EXECUTE_FN = async (
       self.params.clientId,
       self.params.agentName
     );
+    {
+      const toolCallIds = new Set(toolCalls.map(({ id }) => id));
+      if (toolCallIds.size !== toolCalls.length) {
+        // Duplicate ids break the call-to-output linkage in history and mean
+        // the model output is malformed: surface it as an exception to the
+        // caller (via errorSubject) and recover the flow with a placeholder.
+        const error = new Error(
+          `agent-swarm duplicate tool call id detected agentName=${
+            self.params.agentName
+          } clientId=${self.params.clientId} ids=${JSON.stringify(
+            toolCalls.map(({ id }) => id)
+          )}`
+        );
+        console.error(error.message);
+        await errorSubject.next([self.params.clientId, error]);
+        const result = await self._resurrectModel(
+          mode,
+          `Duplicate tool call id in model output`
+        );
+        await self._emitOutput(mode, result, outputEpoch);
+        return;
+      }
+    }
     toolCalls = toolCalls.slice(-self.params.maxToolCalls);
 
     {

src/client/ClientOperator.ts

@@ -10,9 +10,6 @@ import { GLOBAL_CONFIG } from "../config/params";
 */
 type DisposeFn = () => void;
 
-/** Timeout duration for operator signal in milliseconds*/
-const OPERATOR_SIGNAL_TIMEOUT = 90_000;
-
 /** Symbol representing operator timeout*/
 const OPERATOR_SIGNAL_SYMBOL = Symbol("operator-timeout");
 
@@ -139,12 +136,14 @@ export class ClientOperator implements IAgent {
     }
     const result = await Promise.race([
       this._outgoingSubject.toPromise(),
-      sleep(OPERATOR_SIGNAL_TIMEOUT).then(() => OPERATOR_SIGNAL_SYMBOL),
+      sleep(GLOBAL_CONFIG.CC_OPERATOR_SIGNAL_TIMEOUT).then(
+        () => OPERATOR_SIGNAL_SYMBOL
+      ),
     ]);
     if (typeof result === "symbol") {
       GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
         this.params.logger.debug(
-          `ClientOperator agentName=${this.params.agentName} clientId=${this.params.clientId} waitForOutput timeout after ${OPERATOR_SIGNAL_TIMEOUT}ms`
+          `ClientOperator agentName=${this.params.agentName} clientId=${this.params.clientId} waitForOutput timeout after ${GLOBAL_CONFIG.CC_OPERATOR_SIGNAL_TIMEOUT}ms`
         );
       await this._operatorSignal.dispose();
       return "";

src/config/params.ts

@@ -211,6 +211,12 @@ const CC_DEFAULT_CONNECT_OPERATOR = (clientId: string, agentName: AgentName) =>
 */
 const CC_ENABLE_OPERATOR_TIMEOUT = false;
 
+const CC_OPERATOR_SIGNAL_TIMEOUT = 90_000;
+
+const CC_CHAT_INACTIVITY_CHECK = 60 * 1_000;
+
+const CC_CHAT_INACTIVITY_TIMEOUT = 15 * 60 * 1_000;
+
 /**
  * Disable fetch of data from all storages. Quite usefull for unit tests
 */
@@ -272,6 +278,9 @@ const GLOBAL_CONFIG: IGlobalConfig = {
   CC_THROW_WHEN_NAVIGATION_RECURSION,
   CC_DEFAULT_CONNECT_OPERATOR,
   CC_ENABLE_OPERATOR_TIMEOUT,
+  CC_OPERATOR_SIGNAL_TIMEOUT,
+  CC_CHAT_INACTIVITY_CHECK,
+  CC_CHAT_INACTIVITY_TIMEOUT,
   CC_STORAGE_DISABLE_GET_DATA,
   CC_MAX_NESTED_EXECUTIONS,
 };

src/functions/target/session.ts

@@ -12,6 +12,7 @@ import { disposeConnection } from "./disposeConnection";
 import beginContext from "../../utils/beginContext";
 import PayloadContextService from "../../lib/services/context/PayloadContextService";
 import { markOnline } from "../other/markOnline";
+import { errorSubject } from "../../config/emitters";
 
 /**
  * Type definition for the complete function used in session objects.
@@ -61,13 +62,29 @@ const sessionInternal = (
         swarm.navigationValidationService.beginMonit(clientId, swarmName);
         try {
           swarm.busService.commitExecutionBegin(clientId, { swarmName });
+
+          let errorValue: Error = null;
+
+          const unError = errorSubject.subscribe(([errorClientId, error]) => {
+            if (clientId === errorClientId) {
+              errorValue = error;
+            }
+          });
+
           const result = await swarm.sessionPublicService.execute(
             content,
             "user",
             METHOD_NAME,
             clientId,
             swarmName
           );
+
+          unError();
+
+          if (errorValue) {
+            throw errorValue;
+          }
+
           isFinished = swarm.perfService.endExecution(
             executionId,
             clientId,

src/model/GlobalConfig.model.ts

@@ -467,6 +467,22 @@ export interface IGlobalConfig {
    */
   CC_ENABLE_OPERATOR_TIMEOUT: boolean;
 
+  /**
+   * Timeout in milliseconds for operator signal waiting in `ClientOperator.waitForOutput`.
+   * Applied only when CC_ENABLE_OPERATOR_TIMEOUT is true; expired wait resolves with an empty output.
+   */
+  CC_OPERATOR_SIGNAL_TIMEOUT: number;
+
+  /**
+   * Interval in milliseconds between chat inactivity sweeps in `ChatUtils`.
+   */
+  CC_CHAT_INACTIVITY_CHECK: number;
+
+  /**
+   * Inactivity duration in milliseconds after which an idle chat instance is disposed by `ChatUtils`.
+   */
+  CC_CHAT_INACTIVITY_TIMEOUT: number;
+
   /**
    * Disable fetch of data from all storages. Quite usefull for unit tests
    */

test/index.mjs

@@ -35,6 +35,7 @@ import "./spec/doublesend.test.mjs";
 import "./spec/lifecycle.test.mjs";
 import "./spec/numindex.test.mjs";
 import "./spec/banhammer.test.mjs";
+import "./spec/modelguard.test.mjs";
 
 run(import.meta.url, () => {
     console.log("All tests are finished");