agent-swarm-kit 1.1.94 → 1.1.97

package/build/index.cjs

@@ -7346,6 +7346,7 @@ class ClientSession {
         const outputAwaiter = this.params.swarm.waitForOutput();
         agent.execute(message, mode);
         const output = await outputAwaiter;
+        await swarm$1.executionValidationService.flushCount(this.params.clientId, this.params.swarmName);
         if (await functoolsKit.not(this.params.policy.validateOutput(output, this.params.clientId, this.params.swarmName))) {
             GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
                 this.params.logger.debug(`ClientSession clientId=${this.params.clientId} execution output emit canceled due to the banhammer of a client`, {
@@ -7610,6 +7611,7 @@ class ClientSession {
             clientId: this.params.clientId,
         });
         this._notifySubject.subscribe(async (data) => {
+            await swarm$1.executionValidationService.flushCount(this.params.clientId, this.params.swarmName);
             await connector({
                 data,
                 agentName: await this.params.swarm.getAgentName(),
@@ -7620,6 +7622,7 @@ class ClientSession {
             GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
                 this.params.logger.debug(`ClientSession clientId=${this.params.clientId} connect call`);
             const data = await this.execute(incoming.data, "user");
+            await swarm$1.executionValidationService.flushCount(this.params.clientId, this.params.swarmName);
             if (!data) {
                 return "";
             }
@@ -17796,7 +17799,10 @@ class ExecutionValidationService {
          * @param {SwarmName} swarmName - The name of the swarm associated with the client.
          * @returns {Set<ExecutionId>} A set containing execution IDs for the client and swarm.
          */
-        this.getExecutionCount = functoolsKit.memoize(([clientId, swarmName]) => `${clientId}-${swarmName}`, () => new Set());
+        this.getExecutionCount = functoolsKit.memoize(([clientId, swarmName]) => `${clientId}-${swarmName}`, () => ({
+            executionSet: new Set(),
+            executionIgnore: new functoolsKit.LimitedSet(GLOBAL_CONFIG.CC_MAX_NESTED_EXECUTIONS),
+        }));
         /**
          * Increments the execution count for a client and checks for excessive nested executions.
          * @param {string} executionId - The unique identifier for the execution.
@@ -17815,7 +17821,11 @@ class ExecutionValidationService {
                 return;
             }
             const swarmName = this.sessionValidationService.getSwarm(clientId);
-            const executionSet = this.getExecutionCount(clientId, swarmName).add(executionId);
+            const { executionSet, executionIgnore } = this.getExecutionCount(clientId, swarmName);
+            if (!executionIgnore.has(executionId)) {
+                executionSet.add(executionId);
+                executionIgnore.add(executionId);
+            }
             if (executionSet.size >= GLOBAL_CONFIG.CC_MAX_NESTED_EXECUTIONS) {
                 const ids = [...executionSet].join(",");
                 const msg = `agent-swarm recursive execution prevented for clientId=${clientId} swarmName=${swarmName} executionId=${executionId} size=${executionSet.size} ids=${ids}`;
@@ -17840,7 +17850,30 @@ class ExecutionValidationService {
             if (!this.sessionValidationService.hasSession(clientId)) {
                 return;
             }
-            this.getExecutionCount(clientId, swarmName).delete(executionId);
+            const { executionSet, executionIgnore } = this.getExecutionCount(clientId, swarmName);
+            executionSet.delete(executionId);
+            executionIgnore.add(executionId);
+        };
+        /**
+         * Clears all tracked execution IDs for a specific client and swarm.
+         * This effectively resets the execution count for the given client and swarm context,
+         * but does not remove the memoized entry itself.
+         *
+         * @param {string} clientId - The unique identifier for the client.
+         * @param {SwarmName} swarmName - The name of the swarm associated with the client.
+         * @returns {void}
+         */
+        this.flushCount = (clientId, swarmName) => {
+            GLOBAL_CONFIG.CC_LOGGER_ENABLE_INFO &&
+                this.loggerService.info("executionValidationService dispose", {
+                    clientId,
+                    swarmName,
+                });
+            if (!this.sessionValidationService.hasSession(clientId)) {
+                return;
+            }
+            const { executionSet } = this.getExecutionCount(clientId, swarmName);
+            executionSet.clear();
         };
         /**
          * Clears the memoized execution count for a specific client and swarm.

package/build/index.mjs

@@ -1,6 +1,6 @@
 import { scoped } from 'di-scoped';
 import { createActivator } from 'di-kit';
-import { trycatch, makeExtendable, singleshot, getErrorMessage, not, queued, memoize, retry, Subject, str, randomString, ToolRegistry, createAwaiter, sleep, errorData, isObject as isObject$1, cancelable, CANCELED_PROMISE_SYMBOL, SortedArray, execpool, ttl, compose, Source, and, singlerun, schedule, rate } from 'functools-kit';
+import { trycatch, makeExtendable, singleshot, getErrorMessage, not, queued, memoize, retry, Subject, str, randomString, ToolRegistry, createAwaiter, sleep, errorData, isObject as isObject$1, cancelable, CANCELED_PROMISE_SYMBOL, SortedArray, execpool, ttl, compose, LimitedSet, Source, and, singlerun, schedule, rate } from 'functools-kit';
 import xml2js from 'xml2js';
 import fs, { access, mkdir } from 'fs/promises';
 import path, { join } from 'path';
@@ -7344,6 +7344,7 @@ class ClientSession {
         const outputAwaiter = this.params.swarm.waitForOutput();
         agent.execute(message, mode);
         const output = await outputAwaiter;
+        await swarm$1.executionValidationService.flushCount(this.params.clientId, this.params.swarmName);
         if (await not(this.params.policy.validateOutput(output, this.params.clientId, this.params.swarmName))) {
             GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
                 this.params.logger.debug(`ClientSession clientId=${this.params.clientId} execution output emit canceled due to the banhammer of a client`, {
@@ -7608,6 +7609,7 @@ class ClientSession {
             clientId: this.params.clientId,
         });
         this._notifySubject.subscribe(async (data) => {
+            await swarm$1.executionValidationService.flushCount(this.params.clientId, this.params.swarmName);
             await connector({
                 data,
                 agentName: await this.params.swarm.getAgentName(),
@@ -7618,6 +7620,7 @@ class ClientSession {
             GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
                 this.params.logger.debug(`ClientSession clientId=${this.params.clientId} connect call`);
             const data = await this.execute(incoming.data, "user");
+            await swarm$1.executionValidationService.flushCount(this.params.clientId, this.params.swarmName);
             if (!data) {
                 return "";
             }
@@ -17794,7 +17797,10 @@ class ExecutionValidationService {
          * @param {SwarmName} swarmName - The name of the swarm associated with the client.
          * @returns {Set<ExecutionId>} A set containing execution IDs for the client and swarm.
          */
-        this.getExecutionCount = memoize(([clientId, swarmName]) => `${clientId}-${swarmName}`, () => new Set());
+        this.getExecutionCount = memoize(([clientId, swarmName]) => `${clientId}-${swarmName}`, () => ({
+            executionSet: new Set(),
+            executionIgnore: new LimitedSet(GLOBAL_CONFIG.CC_MAX_NESTED_EXECUTIONS),
+        }));
         /**
          * Increments the execution count for a client and checks for excessive nested executions.
          * @param {string} executionId - The unique identifier for the execution.
@@ -17813,7 +17819,11 @@ class ExecutionValidationService {
                 return;
             }
             const swarmName = this.sessionValidationService.getSwarm(clientId);
-            const executionSet = this.getExecutionCount(clientId, swarmName).add(executionId);
+            const { executionSet, executionIgnore } = this.getExecutionCount(clientId, swarmName);
+            if (!executionIgnore.has(executionId)) {
+                executionSet.add(executionId);
+                executionIgnore.add(executionId);
+            }
             if (executionSet.size >= GLOBAL_CONFIG.CC_MAX_NESTED_EXECUTIONS) {
                 const ids = [...executionSet].join(",");
                 const msg = `agent-swarm recursive execution prevented for clientId=${clientId} swarmName=${swarmName} executionId=${executionId} size=${executionSet.size} ids=${ids}`;
@@ -17838,7 +17848,30 @@ class ExecutionValidationService {
             if (!this.sessionValidationService.hasSession(clientId)) {
                 return;
             }
-            this.getExecutionCount(clientId, swarmName).delete(executionId);
+            const { executionSet, executionIgnore } = this.getExecutionCount(clientId, swarmName);
+            executionSet.delete(executionId);
+            executionIgnore.add(executionId);
+        };
+        /**
+         * Clears all tracked execution IDs for a specific client and swarm.
+         * This effectively resets the execution count for the given client and swarm context,
+         * but does not remove the memoized entry itself.
+         *
+         * @param {string} clientId - The unique identifier for the client.
+         * @param {SwarmName} swarmName - The name of the swarm associated with the client.
+         * @returns {void}
+         */
+        this.flushCount = (clientId, swarmName) => {
+            GLOBAL_CONFIG.CC_LOGGER_ENABLE_INFO &&
+                this.loggerService.info("executionValidationService dispose", {
+                    clientId,
+                    swarmName,
+                });
+            if (!this.sessionValidationService.hasSession(clientId)) {
+                return;
+            }
+            const { executionSet } = this.getExecutionCount(clientId, swarmName);
+            executionSet.clear();
         };
         /**
          * Clears the memoized execution count for a specific client and swarm.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-swarm-kit",
-  "version": "1.1.94",
+  "version": "1.1.97",
   "description": "A TypeScript library for building orchestrated framework-agnostic multi-agent AI systems",
   "author": {
     "name": "Petr Tripolsky",
@@ -81,7 +81,7 @@
   "dependencies": {
     "di-kit": "^1.0.18",
     "di-scoped": "^1.0.20",
-    "functools-kit": "^1.0.82",
+    "functools-kit": "^1.0.85",
     "get-moment-stamp": "^1.1.1",
     "lodash-es": "4.17.21",
     "xml2js": "0.6.2"

package/types.d.ts

@@ -1,5 +1,5 @@
 import * as functools_kit from 'functools-kit';
-import { SortedArray, TSubject, Subject, ToolRegistry } from 'functools-kit';
+import { SortedArray, TSubject, Subject, ToolRegistry, LimitedSet } from 'functools-kit';
 import * as di_scoped from 'di-scoped';
 
 /**
@@ -10641,7 +10641,13 @@ declare class ExecutionValidationService {
      * @param {SwarmName} swarmName - The name of the swarm associated with the client.
      * @returns {Set<ExecutionId>} A set containing execution IDs for the client and swarm.
      */
-    getExecutionCount: ((clientId: string, swarmName: SwarmName) => Set<ExecutionId>) & functools_kit.IClearableMemoize<string> & functools_kit.IControlMemoize<string, Set<string>>;
+    getExecutionCount: ((clientId: string, swarmName: SwarmName) => {
+        executionSet: Set<ExecutionId>;
+        executionIgnore: LimitedSet<ExecutionId>;
+    }) & functools_kit.IClearableMemoize<string> & functools_kit.IControlMemoize<string, {
+        executionSet: Set<ExecutionId>;
+        executionIgnore: LimitedSet<ExecutionId>;
+    }>;
     /**
      * Increments the execution count for a client and checks for excessive nested executions.
      * @param {string} executionId - The unique identifier for the execution.
@@ -10659,6 +10665,16 @@ declare class ExecutionValidationService {
      * @returns {void}
      */
     decrementCount: (executionId: string, clientId: string, swarmName: SwarmName) => void;
+    /**
+     * Clears all tracked execution IDs for a specific client and swarm.
+     * This effectively resets the execution count for the given client and swarm context,
+     * but does not remove the memoized entry itself.
+     *
+     * @param {string} clientId - The unique identifier for the client.
+     * @param {SwarmName} swarmName - The name of the swarm associated with the client.
+     * @returns {void}
+     */
+    flushCount: (clientId: string, swarmName: SwarmName) => void;
     /**
      * Clears the memoized execution count for a specific client and swarm.
      * @param {string} clientId - The unique identifier for the client.