agent-swarm-kit 1.0.60 → 1.0.62

package/build/index.cjs

@@ -123,6 +123,23 @@ function __spreadArray(to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 }
 
+function __await(v) {
+    return this instanceof __await ? (this.v = v, this) : new __await(v);
+}
+
+function __asyncGenerator(thisArg, _arguments, generator) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var g = generator.apply(thisArg, _arguments || []), i, q = [];
+    return i = Object.create((typeof AsyncIterator === "function" ? AsyncIterator : Object).prototype), verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
+    function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
+    function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } }
+    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
+    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
+    function fulfill(value) { resume("next", value); }
+    function reject(value) { resume("throw", value); }
+    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
+}
+
 function __asyncValues(o) {
     if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
     var m = o[Symbol.asyncIterator], i;
@@ -380,6 +397,415 @@ var removeXmlTags = function (input) {
         .trim();
 };
 
+/**
+ * Class representing a History Instance
+ */
+var HistoryInstance = /** @class */ (function () {
+    /**
+     * Create a HistoryInstance.
+     * @param clientId - The client ID.
+     * @param callbacks - The callbacks for the history instance.
+     */
+    function HistoryInstance(clientId, callbacks) {
+        var _this = this;
+        this.clientId = clientId;
+        this.callbacks = callbacks;
+        this._array = [];
+        /**
+         * Wait for the history to initialize.
+         * @param agentName - The agent name.
+         */
+        this.waitForInit = functoolsKit.singleshot(function (agentName) { return __awaiter(_this, void 0, void 0, function () {
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        swarm.loggerService.log("HistoryInstance waitForInit", {
+                            clientId: this.clientId,
+                            agentName: agentName,
+                        });
+                        if (!this.callbacks.getData) return [3 /*break*/, 2];
+                        _a = this;
+                        return [4 /*yield*/, this.callbacks.getData(this.clientId, agentName)];
+                    case 1:
+                        _a._array = _b.sent();
+                        _b.label = 2;
+                    case 2: return [2 /*return*/];
+                }
+            });
+        }); });
+        /**
+         * Push a new message to the history for a given agent.
+         * @param value - The model message to push.
+         * @param agentName - The agent name.
+         * @returns A promise that resolves when the message is pushed.
+         */
+        this.push = function (value, agentName) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                swarm.loggerService.log("HistoryInstance push", {
+                    clientId: this.clientId,
+                    agentName: agentName,
+                });
+                this._array.push(value);
+                this.callbacks.onChange &&
+                    this.callbacks.onChange(this._array, this.clientId, agentName);
+                return [2 /*return*/, Promise.resolve()];
+            });
+        }); };
+        /**
+         * Dispose of the history for a given agent.
+         * @param agentName - The agent name or null.
+         * @returns A promise that resolves when the history is disposed.
+         */
+        this.dispose = function (agentName) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                swarm.loggerService.log("HistoryInstance dispose", {
+                    clientId: this.clientId,
+                    agentName: agentName,
+                });
+                if (agentName === null) {
+                    this.callbacks.onDispose && this.callbacks.onDispose(this.clientId);
+                    this._array = [];
+                }
+                return [2 /*return*/, Promise.resolve()];
+            });
+        }); };
+        swarm.loggerService.log("HistoryInstance CTOR", {
+            clientId: this.clientId,
+        });
+        if (callbacks.onInit) {
+            callbacks.onInit(clientId);
+        }
+        if (callbacks.filterCondition) {
+            this.iterate = function (agentName) {
+                return __asyncGenerator(this, arguments, function () {
+                    var _a, _b, item, e_1_1, _c, _d, item, e_2_1;
+                    var e_1, _e, e_2, _f;
+                    return __generator(this, function (_g) {
+                        switch (_g.label) {
+                            case 0:
+                                swarm.loggerService.log("HistoryInstance iterate condition", {
+                                    clientId: this.clientId,
+                                    agentName: agentName,
+                                });
+                                if (!this.callbacks.onRead) return [3 /*break*/, 12];
+                                _g.label = 1;
+                            case 1:
+                                _g.trys.push([1, 8, 9, 10]);
+                                _a = __values(this._array), _b = _a.next();
+                                _g.label = 2;
+                            case 2:
+                                if (!!_b.done) return [3 /*break*/, 7];
+                                item = _b.value;
+                                return [4 /*yield*/, __await(callbacks.filterCondition(item, this.clientId, agentName))];
+                            case 3:
+                                if (!_g.sent()) return [3 /*break*/, 6];
+                                this.callbacks.onRead(item, this.clientId, agentName);
+                                return [4 /*yield*/, __await(item)];
+                            case 4: return [4 /*yield*/, _g.sent()];
+                            case 5:
+                                _g.sent();
+                                _g.label = 6;
+                            case 6:
+                                _b = _a.next();
+                                return [3 /*break*/, 2];
+                            case 7: return [3 /*break*/, 10];
+                            case 8:
+                                e_1_1 = _g.sent();
+                                e_1 = { error: e_1_1 };
+                                return [3 /*break*/, 10];
+                            case 9:
+                                try {
+                                    if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
+                                }
+                                finally { if (e_1) throw e_1.error; }
+                                return [7 /*endfinally*/];
+                            case 10: return [4 /*yield*/, __await(void 0)];
+                            case 11: return [2 /*return*/, _g.sent()];
+                            case 12:
+                                _g.trys.push([12, 19, 20, 21]);
+                                _c = __values(this._array), _d = _c.next();
+                                _g.label = 13;
+                            case 13:
+                                if (!!_d.done) return [3 /*break*/, 18];
+                                item = _d.value;
+                                return [4 /*yield*/, __await(callbacks.filterCondition(item, this.clientId, agentName))];
+                            case 14:
+                                if (!_g.sent()) return [3 /*break*/, 17];
+                                return [4 /*yield*/, __await(item)];
+                            case 15: return [4 /*yield*/, _g.sent()];
+                            case 16:
+                                _g.sent();
+                                _g.label = 17;
+                            case 17:
+                                _d = _c.next();
+                                return [3 /*break*/, 13];
+                            case 18: return [3 /*break*/, 21];
+                            case 19:
+                                e_2_1 = _g.sent();
+                                e_2 = { error: e_2_1 };
+                                return [3 /*break*/, 21];
+                            case 20:
+                                try {
+                                    if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
+                                }
+                                finally { if (e_2) throw e_2.error; }
+                                return [7 /*endfinally*/];
+                            case 21: return [2 /*return*/];
+                        }
+                    });
+                });
+            };
+        }
+    }
+    /**
+     * Iterate over the history messages for a given agent.
+     * @param agentName - The agent name.
+     * @returns An async iterable iterator of model messages.
+     */
+    HistoryInstance.prototype.iterate = function (agentName) {
+        return __asyncGenerator(this, arguments, function iterate_1() {
+            var _a, _b, item, e_3_1, _c, _d, item, e_4_1;
+            var e_3, _e, e_4, _f;
+            return __generator(this, function (_g) {
+                switch (_g.label) {
+                    case 0:
+                        swarm.loggerService.log("HistoryInstance iterate", {
+                            clientId: this.clientId,
+                            agentName: agentName,
+                        });
+                        if (!this.callbacks.onRead) return [3 /*break*/, 11];
+                        _g.label = 1;
+                    case 1:
+                        _g.trys.push([1, 7, 8, 9]);
+                        _a = __values(this._array), _b = _a.next();
+                        _g.label = 2;
+                    case 2:
+                        if (!!_b.done) return [3 /*break*/, 6];
+                        item = _b.value;
+                        this.callbacks.onRead(item, this.clientId, agentName);
+                        return [4 /*yield*/, __await(item)];
+                    case 3: return [4 /*yield*/, _g.sent()];
+                    case 4:
+                        _g.sent();
+                        _g.label = 5;
+                    case 5:
+                        _b = _a.next();
+                        return [3 /*break*/, 2];
+                    case 6: return [3 /*break*/, 9];
+                    case 7:
+                        e_3_1 = _g.sent();
+                        e_3 = { error: e_3_1 };
+                        return [3 /*break*/, 9];
+                    case 8:
+                        try {
+                            if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
+                        }
+                        finally { if (e_3) throw e_3.error; }
+                        return [7 /*endfinally*/];
+                    case 9: return [4 /*yield*/, __await(void 0)];
+                    case 10: return [2 /*return*/, _g.sent()];
+                    case 11:
+                        _g.trys.push([11, 17, 18, 19]);
+                        _c = __values(this._array), _d = _c.next();
+                        _g.label = 12;
+                    case 12:
+                        if (!!_d.done) return [3 /*break*/, 16];
+                        item = _d.value;
+                        return [4 /*yield*/, __await(item)];
+                    case 13: return [4 /*yield*/, _g.sent()];
+                    case 14:
+                        _g.sent();
+                        _g.label = 15;
+                    case 15:
+                        _d = _c.next();
+                        return [3 /*break*/, 12];
+                    case 16: return [3 /*break*/, 19];
+                    case 17:
+                        e_4_1 = _g.sent();
+                        e_4 = { error: e_4_1 };
+                        return [3 /*break*/, 19];
+                    case 18:
+                        try {
+                            if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
+                        }
+                        finally { if (e_4) throw e_4.error; }
+                        return [7 /*endfinally*/];
+                    case 19: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    return HistoryInstance;
+}());
+/**
+ * Class representing History Utilities
+ */
+var HistoryUtils = /** @class */ (function () {
+    function HistoryUtils() {
+        var _this = this;
+        this.HistoryFactory = HistoryInstance;
+        this.HistoryCallbacks = {};
+        this.getHistory = functoolsKit.memoize(function (_a) {
+            var _b = __read(_a, 1), clientId = _b[0];
+            return clientId;
+        }, function (clientId) {
+            return new _this.HistoryFactory(clientId, _this.HistoryCallbacks);
+        });
+        /**
+         * Use a custom history adapter.
+         * @param Ctor - The constructor for the history instance.
+         */
+        this.useHistoryAdapter = function (Ctor) {
+            swarm.loggerService.log("HistoryUtils useHistoryAdapter");
+            _this.HistoryFactory = Ctor;
+        };
+        /**
+         * Use history lifecycle callbacks.
+         * @param Callbacks - The callbacks dictionary.
+         */
+        this.useHistoryCallbacks = function (Callbacks) {
+            swarm.loggerService.log("HistoryUtils useHistoryCallbacks");
+            _this.HistoryCallbacks = Callbacks;
+        };
+        /**
+         * Push a new message to the history.
+         * @param value - The model message to push.
+         * @param clientId - The client ID.
+         * @param agentName - The agent name.
+         * @returns A promise that resolves when the message is pushed.
+         */
+        this.push = function (value, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+            var isInitial, history;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        swarm.loggerService.log("HistoryUtils push", {
+                            clientId: clientId,
+                            agentName: agentName,
+                            value: value,
+                        });
+                        isInitial = this.getHistory.has(clientId);
+                        return [4 /*yield*/, this.getHistory(clientId)];
+                    case 1:
+                        history = _a.sent();
+                        return [4 /*yield*/, history.waitForInit(agentName, isInitial)];
+                    case 2:
+                        _a.sent();
+                        return [4 /*yield*/, history.push(value, agentName)];
+                    case 3: return [2 /*return*/, _a.sent()];
+                }
+            });
+        }); };
+        /**
+         * Dispose of the history for a given client and agent.
+         * @param clientId - The client ID.
+         * @param agentName - The agent name or null.
+         * @returns A promise that resolves when the history is disposed.
+         */
+        this.dispose = function (clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+            var isInitial, history;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        swarm.loggerService.log("HistoryUtils dispose", {
+                            clientId: clientId,
+                            agentName: agentName,
+                        });
+                        isInitial = this.getHistory.has(clientId);
+                        return [4 /*yield*/, this.getHistory(clientId)];
+                    case 1:
+                        history = _a.sent();
+                        return [4 /*yield*/, history.waitForInit(agentName, isInitial)];
+                    case 2:
+                        _a.sent();
+                        return [4 /*yield*/, history.dispose(agentName)];
+                    case 3:
+                        _a.sent();
+                        if (agentName === null) {
+                            this.getHistory.clear(clientId);
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        }); };
+    }
+    /**
+     * Iterate over the history messages.
+     * @param clientId - The client ID.
+     * @param agentName - The agent name.
+     * @returns An async iterable iterator of model messages.
+     */
+    HistoryUtils.prototype.iterate = function (clientId, agentName) {
+        return __asyncGenerator(this, arguments, function iterate_2() {
+            var isInitial, history, _a, _b, _c, item, e_5_1;
+            var _d, e_5, _e, _f;
+            return __generator(this, function (_g) {
+                switch (_g.label) {
+                    case 0:
+                        swarm.loggerService.log("HistoryUtils iterate", {
+                            clientId: clientId,
+                            agentName: agentName,
+                        });
+                        isInitial = this.getHistory.has(clientId);
+                        return [4 /*yield*/, __await(this.getHistory(clientId))];
+                    case 1:
+                        history = _g.sent();
+                        return [4 /*yield*/, __await(history.waitForInit(agentName, isInitial))];
+                    case 2:
+                        _g.sent();
+                        _g.label = 3;
+                    case 3:
+                        _g.trys.push([3, 10, 11, 16]);
+                        _a = true, _b = __asyncValues(history.iterate(agentName));
+                        _g.label = 4;
+                    case 4: return [4 /*yield*/, __await(_b.next())];
+                    case 5:
+                        if (!(_c = _g.sent(), _d = _c.done, !_d)) return [3 /*break*/, 9];
+                        _f = _c.value;
+                        _a = false;
+                        item = _f;
+                        return [4 /*yield*/, __await(item)];
+                    case 6: return [4 /*yield*/, _g.sent()];
+                    case 7:
+                        _g.sent();
+                        _g.label = 8;
+                    case 8:
+                        _a = true;
+                        return [3 /*break*/, 4];
+                    case 9: return [3 /*break*/, 16];
+                    case 10:
+                        e_5_1 = _g.sent();
+                        e_5 = { error: e_5_1 };
+                        return [3 /*break*/, 16];
+                    case 11:
+                        _g.trys.push([11, , 14, 15]);
+                        if (!(!_a && !_d && (_e = _b.return))) return [3 /*break*/, 13];
+                        return [4 /*yield*/, __await(_e.call(_b))];
+                    case 12:
+                        _g.sent();
+                        _g.label = 13;
+                    case 13: return [3 /*break*/, 15];
+                    case 14:
+                        if (e_5) throw e_5.error;
+                        return [7 /*endfinally*/];
+                    case 15: return [7 /*endfinally*/];
+                    case 16: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    return HistoryUtils;
+}());
+/**
+ * Exported History Adapter instance
+ */
+var HistoryAdapter = new HistoryUtils();
+/**
+ * Exported History Control instance
+ */
+var History = HistoryAdapter;
+
 /**
  * @description `ask for agent function` in `llama3.1:8b` to troubleshoot (need CC_OLLAMA_EMIT_TOOL_PROTOCOL to be turned off)
  */
@@ -432,9 +858,8 @@ var CC_AGENT_HISTORY_FILTER = function (agentName) {
 };
 var CC_AGENT_OUTPUT_TRANSFORM = removeXmlTags;
 var CC_KEEP_MESSAGES = 5;
-var CC_GET_AGENT_HISTORY = function () { return new functoolsKit.PubsubArrayAdapter(); };
+var CC_GET_AGENT_HISTORY_ADAPTER = function () { return HistoryAdapter; };
 var CC_AGENT_OUTPUT_MAP = function (message) { return message; };
-var CC_AGENT_SEPARATE_HISTORY = false;
 var CC_AGENT_SYSTEM_PROMPT = undefined;
 var CC_STORAGE_SEARCH_SIMILARITY = 0.65;
 var CC_STORAGE_SEARCH_POOL = 5;
@@ -442,7 +867,7 @@ var GLOBAL_CONFIG = {
     CC_TOOL_CALL_EXCEPTION_PROMPT: CC_TOOL_CALL_EXCEPTION_PROMPT,
     CC_EMPTY_OUTPUT_PLACEHOLDERS: CC_EMPTY_OUTPUT_PLACEHOLDERS,
     CC_KEEP_MESSAGES: CC_KEEP_MESSAGES,
-    CC_GET_AGENT_HISTORY: CC_GET_AGENT_HISTORY,
+    CC_GET_AGENT_HISTORY_ADAPTER: CC_GET_AGENT_HISTORY_ADAPTER,
     CC_SWARM_AGENT_CHANGED: CC_SWARM_AGENT_CHANGED,
     CC_SWARM_DEFAULT_AGENT: CC_SWARM_DEFAULT_AGENT,
     CC_AGENT_DEFAULT_VALIDATION: CC_AGENT_DEFAULT_VALIDATION,
@@ -450,7 +875,6 @@ var GLOBAL_CONFIG = {
     CC_AGENT_OUTPUT_TRANSFORM: CC_AGENT_OUTPUT_TRANSFORM,
     CC_AGENT_OUTPUT_MAP: CC_AGENT_OUTPUT_MAP,
     CC_AGENT_SYSTEM_PROMPT: CC_AGENT_SYSTEM_PROMPT,
-    CC_AGENT_SEPARATE_HISTORY: CC_AGENT_SEPARATE_HISTORY,
     CC_AGENT_DISALLOWED_TAGS: CC_AGENT_DISALLOWED_TAGS,
     CC_AGENT_DISALLOWED_SYMBOLS: CC_AGENT_DISALLOWED_SYMBOLS,
     CC_STORAGE_SEARCH_SIMILARITY: CC_STORAGE_SEARCH_SIMILARITY,
@@ -1149,7 +1573,7 @@ var ClientHistory = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.params.logger.debug("ClientHistory agentName=".concat(this.params.agentName, " push"), { message: message });
-                        return [4 /*yield*/, this.params.items.push(message)];
+                        return [4 /*yield*/, this.params.items.push(message, this.params.clientId, this.params.agentName)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -1171,7 +1595,7 @@ var ClientHistory = /** @class */ (function () {
                         _g.label = 1;
                     case 1:
                         _g.trys.push([1, 6, 7, 12]);
-                        _a = true, _b = __asyncValues(this.params.items);
+                        _a = true, _b = __asyncValues(this.params.items.iterate(this.params.clientId, this.params.agentName));
                         _g.label = 2;
                     case 2: return [4 /*yield*/, _b.next()];
                     case 3:
@@ -1225,7 +1649,7 @@ var ClientHistory = /** @class */ (function () {
                         _h.label = 1;
                     case 1:
                         _h.trys.push([1, 6, 7, 12]);
-                        _a = true, _b = __asyncValues(this.params.items);
+                        _a = true, _b = __asyncValues(this.params.items.iterate(this.params.clientId, this.params.agentName));
                         _h.label = 2;
                     case 2: return [4 /*yield*/, _b.next()];
                     case 3:
@@ -1352,6 +1776,22 @@ var ClientHistory = /** @class */ (function () {
                 }
             });
         }); };
+        /**
+         * Should call on agent dispose
+         * @returns {Promise<void>}
+         */
+        this.dispose = function () { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " dispose"));
+                        return [4 /*yield*/, this.params.items.dispose(this.params.clientId, this.params.agentName)];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        }); };
         this.params.logger.debug("ClientHistory agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " CTOR"), {
             params: params,
         });
@@ -1370,18 +1810,6 @@ var HistoryConnectionService = /** @class */ (function () {
         this.loggerService = inject(TYPES.loggerService);
         this.contextService = inject(TYPES.contextService);
         this.sessionValidationService = inject(TYPES.sessionValidationService);
-        /**
-         * Retrieves items for a given client and agent.
-         * @param {string} clientId - The client ID.
-         * @param {AgentName} agentName - The agent name.
-         * @returns {IPubsubArray<IModelMessage>} The items.
-         */
-        this.getItems = functoolsKit.memoize(function (_a) {
-            var _b = __read(_a, 1), clientId = _b[0];
-            return clientId;
-        }, function (clientId, agentName) {
-            return GLOBAL_CONFIG.CC_GET_AGENT_HISTORY(clientId, agentName);
-        });
         /**
          * Retrieves the history for a given client and agent.
          * @param {string} clientId - The client ID.
@@ -1396,7 +1824,7 @@ var HistoryConnectionService = /** @class */ (function () {
             return new ClientHistory({
                 clientId: clientId,
                 agentName: agentName,
-                items: _this.getItems(clientId, agentName),
+                items: GLOBAL_CONFIG.CC_GET_AGENT_HISTORY_ADAPTER(clientId, agentName),
                 logger: _this.loggerService,
             });
         });
@@ -1466,13 +1894,9 @@ var HistoryConnectionService = /** @class */ (function () {
                         if (!this.getHistory.has(key)) {
                             return [2 /*return*/];
                         }
-                        if (!GLOBAL_CONFIG.CC_AGENT_SEPARATE_HISTORY) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.getItems(this.contextService.context.clientId, this.contextService.context.agentName).clear()];
+                        return [4 /*yield*/, this.getHistory(this.contextService.context.clientId, this.contextService.context.agentName).dispose()];
                     case 1:
                         _a.sent();
-                        this.getItems.clear(this.contextService.context.clientId);
-                        _a.label = 2;
-                    case 2:
                         this.getHistory.clear(key);
                         this.sessionValidationService.removeHistoryUsage(this.contextService.context.clientId, this.contextService.context.agentName);
                         return [2 /*return*/];
@@ -3399,9 +3823,10 @@ var SessionValidationService = /** @class */ (function () {
     function SessionValidationService() {
         var _this = this;
         this.loggerService = inject(TYPES.loggerService);
+        this._storageSwarmMap = new Map();
         this._historySwarmMap = new Map();
-        this._sessionSwarmMap = new Map();
         this._agentSwarmMap = new Map();
+        this._sessionSwarmMap = new Map();
         this._sessionModeMap = new Map();
         /**
          * Adds a new session.
@@ -3460,6 +3885,26 @@ var SessionValidationService = /** @class */ (function () {
                 _this._historySwarmMap.set(sessionId, [agentName]);
             }
         };
+        /**
+         * Adds a storage usage to a session.
+         * @param {SessionId} sessionId - The ID of the session.
+         * @param {StorageName} storageName - The name of the storage.
+         */
+        this.addStorageUsage = function (sessionId, storageName) {
+            _this.loggerService.log("sessionValidationService addStorageUsage", {
+                sessionId: sessionId,
+                storageName: storageName,
+            });
+            if (_this._storageSwarmMap.has(sessionId)) {
+                var storages = _this._storageSwarmMap.get(sessionId);
+                if (!storages.includes(storageName)) {
+                    storages.push(storageName);
+                }
+            }
+            else {
+                _this._storageSwarmMap.set(sessionId, [storageName]);
+            }
+        };
         /**
          * Removes an agent usage from a session.
          * @param {SessionId} sessionId - The ID of the session.
@@ -3510,6 +3955,31 @@ var SessionValidationService = /** @class */ (function () {
                 throw new Error("No agents found for sessionId=".concat(sessionId));
             }
         };
+        /**
+        * Removes a storage usage from a session.
+        * @param {SessionId} sessionId - The ID of the session.
+        * @param {StorageName} storageName - The name of the storage.
+        * @throws Will throw an error if no storages are found for the session.
+        */
+        this.removeStorageUsage = function (sessionId, storageName) {
+            _this.loggerService.log("sessionValidationService removeStorageUsage", {
+                sessionId: sessionId,
+                storageName: storageName,
+            });
+            if (_this._storageSwarmMap.has(sessionId)) {
+                var agents = _this._storageSwarmMap.get(sessionId);
+                var agentIndex = agents.indexOf(storageName);
+                if (agentIndex !== -1) {
+                    agents.splice(agentIndex, 1);
+                }
+                if (agents.length === 0) {
+                    _this._storageSwarmMap.delete(sessionId);
+                }
+            }
+            else {
+                throw new Error("No agents found for sessionId=".concat(sessionId));
+            }
+        };
         /**
          * Gets the mode of a session.
          * @param {SessionId} clientId - The ID of the client.
@@ -3869,11 +4339,12 @@ var ClientStorage = /** @class */ (function () {
                 args_1[_i - 2] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([search_1, total_1], __read(args_1), false), void 0, function (search, total, score) {
-                var indexed, searchEmbeddings, filtered;
+                var indexed, searchEmbeddings;
                 var _this = this;
+                var _a, _b;
                 if (score === void 0) { score = GLOBAL_CONFIG.CC_STORAGE_SEARCH_SIMILARITY; }
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0:
                             this.params.logger.debug("ClientStorage storageName=".concat(this.params.storageName, " clientId=").concat(this.params.clientId, " take"), {
                                 search: search,
@@ -3882,7 +4353,7 @@ var ClientStorage = /** @class */ (function () {
                             indexed = new functoolsKit.SortedArray();
                             return [4 /*yield*/, this.params.createEmbedding(search)];
                         case 1:
-                            searchEmbeddings = _a.sent();
+                            searchEmbeddings = _c.sent();
                             if (this.params.onCreate) {
                                 this.params.onCreate(search, searchEmbeddings, this.params.clientId, this.params.embedding);
                             }
@@ -3899,7 +4370,7 @@ var ClientStorage = /** @class */ (function () {
                                                 if (this.params.onCompare) {
                                                     this.params.onCompare(search, index, score, this.params.clientId, this.params.embedding);
                                                 }
-                                                indexed.push({ id: item.id }, score);
+                                                indexed.push(item, score);
                                                 return [2 /*return*/];
                                         }
                                     });
@@ -3908,15 +4379,14 @@ var ClientStorage = /** @class */ (function () {
                                     maxExec: GLOBAL_CONFIG.CC_STORAGE_SEARCH_POOL,
                                 })))];
                         case 2:
-                            _a.sent();
+                            _c.sent();
                             this.params.logger.debug("ClientStorage storageName=".concat(this.params.storageName, " clientId=").concat(this.params.clientId, " take indexed"), {
                                 indexed: indexed.getEntries(),
                             });
-                            filtered = indexed.take(total, score);
-                            return [2 /*return*/, filtered.map(function (_a) {
-                                    var id = _a.id;
-                                    return _this._itemMap.get(id);
-                                })];
+                            if ((_a = this.params.callbacks) === null || _a === void 0 ? void 0 : _a.onSearch) {
+                                (_b = this.params.callbacks) === null || _b === void 0 ? void 0 : _b.onSearch(search, indexed, this.params.clientId, this.params.storageName);
+                            }
+                            return [2 /*return*/, indexed.take(total, score)];
                     }
                 });
             });
@@ -4040,6 +4510,7 @@ var StorageConnectionService = /** @class */ (function () {
         this.loggerService = inject(TYPES.loggerService);
         this.contextService = inject(TYPES.contextService);
         this.storageSchemaService = inject(TYPES.storageSchemaService);
+        this.sessionValidationService = inject(TYPES.sessionValidationService);
         this.embeddingSchemaService = inject(TYPES.embeddingSchemaService);
         /**
          * Retrieves a storage instance based on client ID and storage name.
@@ -4051,6 +4522,7 @@ var StorageConnectionService = /** @class */ (function () {
             var _b = __read(_a, 2), clientId = _b[0], storageName = _b[1];
             return "".concat(clientId, "-").concat(storageName);
         }, function (clientId, storageName) {
+            _this.sessionValidationService.addStorageUsage(clientId, storageName);
             var _a = _this.storageSchemaService.get(storageName), createIndex = _a.createIndex, getData = _a.getData, embeddingName = _a.embedding, callbacks = _a.callbacks;
             var _b = _this.embeddingSchemaService.get(embeddingName), calculateSimilarity = _b.calculateSimilarity, createEmbedding = _b.createEmbedding, embedding = _b.callbacks;
             return new ClientStorage(__assign(__assign({ clientId: clientId, storageName: storageName, embedding: embeddingName, calculateSimilarity: calculateSimilarity, createEmbedding: createEmbedding, createIndex: createIndex, getData: getData, logger: _this.loggerService }, embedding), { callbacks: callbacks }));
@@ -4208,6 +4680,7 @@ var StorageConnectionService = /** @class */ (function () {
                     return [2 /*return*/];
                 }
                 this.getStorage.clear(key);
+                this.sessionValidationService.removeStorageUsage(this.contextService.context.clientId, this.contextService.context.storageName);
                 return [2 /*return*/];
             });
         }); };
@@ -5064,6 +5537,9 @@ var disposeConnection = function (clientId, swarmName) { return __awaiter(void 0
                         }); }),
                     ])];
             case 4:
+                _a.sent();
+                return [4 /*yield*/, HistoryAdapter.dispose(clientId, null)];
+            case 5:
                 _a.sent();
                 return [2 /*return*/];
         }
@@ -5926,14 +6402,14 @@ var StorageUtils = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        swarm.loggerService.log("StorageStatic take", {
+                        swarm.loggerService.log("StorageUtils take", {
                             search: payload.search,
                             total: payload.total,
                             clientId: payload.clientId,
                             storageName: payload.storageName,
                             score: payload.score,
                         });
-                        swarm.storageValidationService.validate(payload.storageName, "StorageStatic");
+                        swarm.storageValidationService.validate(payload.storageName, "StorageUtils");
                         if (!swarm.agentValidationService.hasStorage(payload.agentName, payload.storageName)) {
                             throw new Error("agent-swarm StorageUtils ".concat(payload.storageName, " not registered in ").concat(payload.agentName, " (take)"));
                         }
@@ -5955,12 +6431,12 @@ var StorageUtils = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        swarm.loggerService.log("StorageStatic upsert", {
+                        swarm.loggerService.log("StorageUtils upsert", {
                             item: payload.item,
                             clientId: payload.clientId,
                             storageName: payload.storageName,
                         });
-                        swarm.storageValidationService.validate(payload.storageName, "StorageStatic");
+                        swarm.storageValidationService.validate(payload.storageName, "StorageUtils");
                         if (!swarm.agentValidationService.hasStorage(payload.agentName, payload.storageName)) {
                             throw new Error("agent-swarm StorageUtils ".concat(payload.storageName, " not registered in ").concat(payload.agentName, " (upsert)"));
                         }
@@ -5981,12 +6457,12 @@ var StorageUtils = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        swarm.loggerService.log("StorageStatic remove", {
+                        swarm.loggerService.log("StorageUtils remove", {
                             itemId: payload.itemId,
                             clientId: payload.clientId,
                             storageName: payload.storageName,
                         });
-                        swarm.storageValidationService.validate(payload.storageName, "StorageStatic");
+                        swarm.storageValidationService.validate(payload.storageName, "StorageUtils");
                         if (!swarm.agentValidationService.hasStorage(payload.agentName, payload.storageName)) {
                             throw new Error("agent-swarm StorageUtils ".concat(payload.storageName, " not registered in ").concat(payload.agentName, " (remove)"));
                         }
@@ -6008,12 +6484,12 @@ var StorageUtils = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        swarm.loggerService.log("StorageStatic get", {
+                        swarm.loggerService.log("StorageUtils get", {
                             itemId: payload.itemId,
                             clientId: payload.clientId,
                             storageName: payload.storageName,
                         });
-                        swarm.storageValidationService.validate(payload.storageName, "StorageStatic");
+                        swarm.storageValidationService.validate(payload.storageName, "StorageUtils");
                         if (!swarm.agentValidationService.hasStorage(payload.agentName, payload.storageName)) {
                             throw new Error("agent-swarm StorageUtils ".concat(payload.storageName, " not registered in ").concat(payload.agentName, " (get)"));
                         }
@@ -6035,11 +6511,11 @@ var StorageUtils = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        swarm.loggerService.log("StorageStatic list", {
+                        swarm.loggerService.log("StorageUtils list", {
                             clientId: payload.clientId,
                             storageName: payload.storageName,
                         });
-                        swarm.storageValidationService.validate(payload.storageName, "StorageStatic");
+                        swarm.storageValidationService.validate(payload.storageName, "StorageUtils");
                         if (!swarm.agentValidationService.hasStorage(payload.agentName, payload.storageName)) {
                             throw new Error("agent-swarm StorageUtils ".concat(payload.storageName, " not registered in ").concat(payload.agentName, " (list)"));
                         }
@@ -6059,11 +6535,11 @@ var StorageUtils = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        swarm.loggerService.log("StorageStatic clear", {
+                        swarm.loggerService.log("StorageUtils clear", {
                             clientId: payload.clientId,
                             storageName: payload.storageName,
                         });
-                        swarm.storageValidationService.validate(payload.storageName, "StorageStatic");
+                        swarm.storageValidationService.validate(payload.storageName, "StorageUtils");
                         if (!swarm.agentValidationService.hasStorage(payload.agentName, payload.storageName)) {
                             throw new Error("agent-swarm StorageUtils ".concat(payload.storageName, " not registered in ").concat(payload.agentName, " (clear)"));
                         }
@@ -6078,7 +6554,10 @@ var StorageUtils = /** @class */ (function () {
 var Storage = new StorageUtils();
 
 exports.ContextService = ContextService;
+exports.History = History;
 exports.Storage = Storage;
+exports._HistoryAdapter = HistoryAdapter;
+exports._HistoryInstance = HistoryInstance;
 exports.addAgent = addAgent;
 exports.addCompletion = addCompletion;
 exports.addEmbedding = addEmbedding;