agent-swarm-kit 1.0.17 → 1.0.18

package/build/index.cjs

@@ -277,6 +277,22 @@ var CC_EMPTY_OUTPUT_PLACEHOLDERS = [
     "I didn’t hear you properly. Can you say that again?",
     "Could you please repeat that? I didn’t catch it.",
 ];
+var CC_SWARM_AGENT_CHANGED = function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+    switch (_a.label) {
+        case 0: return [4 /*yield*/, functoolsKit.sleep(100)];
+        case 1: return [2 /*return*/, _a.sent()];
+    }
+}); }); };
+var CC_SWARM_DEFAULT_AGENT = function (_a, _b, defaultAgent_1) { return __awaiter(void 0, [_a, _b, defaultAgent_1], void 0, function (_c, _d, defaultAgent) {
+    return __generator(this, function (_e) {
+        switch (_e.label) {
+            case 0: return [4 /*yield*/, functoolsKit.sleep(100)];
+            case 1:
+                _e.sent();
+                return [2 /*return*/, defaultAgent];
+        }
+    });
+}); };
 var CC_KEEP_MESSAGES = 5;
 var CC_ANSWER_TIMEOUT_SECONDS = 120000;
 var CC_GET_AGENT_HISTORY = function () { return new functoolsKit.PubsubArrayAdapter(); };
@@ -286,6 +302,8 @@ var GLOBAL_CONFIG = {
     CC_KEEP_MESSAGES: CC_KEEP_MESSAGES,
     CC_ANSWER_TIMEOUT_SECONDS: CC_ANSWER_TIMEOUT_SECONDS,
     CC_GET_AGENT_HISTORY: CC_GET_AGENT_HISTORY,
+    CC_SWARM_AGENT_CHANGED: CC_SWARM_AGENT_CHANGED,
+    CC_SWARM_DEFAULT_AGENT: CC_SWARM_DEFAULT_AGENT,
 };
 var setConfig = function (config) {
     Object.assign(GLOBAL_CONFIG, config);
@@ -1201,7 +1219,8 @@ var ToolSchemaService = /** @class */ (function () {
     return ToolSchemaService;
 }());
 
-var AGENT_REF_CHANGED = Symbol('agent-ref-changed');
+var AGENT_REF_CHANGED = Symbol("agent-ref-changed");
+var AGENT_NEED_FETCH = Symbol("agent-need-fetch");
 /**
  * ClientSwarm class implements the ISwarm interface and manages agents within a swarm.
  */
@@ -1214,6 +1233,7 @@ var ClientSwarm = /** @class */ (function () {
         var _this = this;
         this.params = params;
         this._agentChangedSubject = new functoolsKit.Subject();
+        this._activeAgent = AGENT_NEED_FETCH;
         /**
          * Waits for output from the active agent.
          * @returns {Promise<string>} - The output from the active agent.
@@ -1240,13 +1260,13 @@ var ClientSwarm = /** @class */ (function () {
                                         case 0:
                                             _c = [agentName];
                                             return [4 /*yield*/, agent.waitForOutput()];
-                                        case 1: return [2 /*return*/, _c.concat([
-                                                _e.sent()
-                                            ])];
+                                        case 1: return [2 /*return*/, _c.concat([_e.sent()])];
                                     }
                                 });
                             }); })), false), [
-                                this._agentChangedSubject.toPromise().then(function () { return [AGENT_REF_CHANGED]; }),
+                                this._agentChangedSubject
+                                    .toPromise()
+                                    .then(function () { return [AGENT_REF_CHANGED]; }),
                             ], false))];
                     case 2:
                         _a = __read.apply(void 0, [_c.sent(), 2]), agentName = _a[0], output = _a[1];
@@ -1269,9 +1289,19 @@ var ClientSwarm = /** @class */ (function () {
          * @returns {Promise<AgentName>} - The name of the active agent.
          */
         this.getAgentName = function () { return __awaiter(_this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                this.params.logger.debug("ClientSwarm swarmName=".concat(this.params.swarmName, " clientId=").concat(this.params.clientId, " getAgentName"));
-                return [2 /*return*/, this._activeAgent];
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        this.params.logger.debug("ClientSwarm swarmName=".concat(this.params.swarmName, " clientId=").concat(this.params.clientId, " getAgentName"));
+                        if (!(this._activeAgent === AGENT_NEED_FETCH)) return [3 /*break*/, 2];
+                        _a = this;
+                        return [4 /*yield*/, GLOBAL_CONFIG.CC_SWARM_DEFAULT_AGENT(this.params.clientId, this.params.swarmName, this.params.defaultAgent)];
+                    case 1:
+                        _a._activeAgent = _b.sent();
+                        _b.label = 2;
+                    case 2: return [2 /*return*/, this._activeAgent];
+                }
             });
         }); };
         /**
@@ -1319,15 +1349,20 @@ var ClientSwarm = /** @class */ (function () {
          */
         this.setAgentName = function (agentName) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                this.params.logger.debug("ClientSwarm swarmName=".concat(this.params.swarmName, " clientId=").concat(this.params.clientId, " setAgentName agentName=").concat(agentName));
-                this._activeAgent = agentName;
-                return [2 /*return*/];
+                switch (_a.label) {
+                    case 0:
+                        this.params.logger.debug("ClientSwarm swarmName=".concat(this.params.swarmName, " clientId=").concat(this.params.clientId, " setAgentName agentName=").concat(agentName));
+                        this._activeAgent = agentName;
+                        return [4 /*yield*/, this.params.onAgentChanged(this.params.clientId, agentName, this.params.swarmName)];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
             });
         }); };
         this.params.logger.debug("ClientSwarm swarmName=".concat(this.params.swarmName, " clientId=").concat(this.params.clientId, " CTOR"), {
             params: params,
         });
-        this._activeAgent = params.defaultAgent;
     }
     return ClientSwarm;
 }());
@@ -1375,6 +1410,18 @@ var SwarmConnectionService = /** @class */ (function () {
                 defaultAgent: defaultAgent,
                 swarmName: swarmName,
                 logger: _this.loggerService,
+                onAgentChanged: function (clientId, agentName, swarmName) {
+                    return __awaiter(this, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, GLOBAL_CONFIG.CC_SWARM_AGENT_CHANGED(clientId, agentName, swarmName)];
+                                case 1:
+                                    _a.sent();
+                                    return [2 /*return*/];
+                            }
+                        });
+                    });
+                },
             });
         });
         /**
@@ -4078,6 +4125,58 @@ var getAssistantHistory = function (clientId) { return __awaiter(void 0, void 0,
     });
 }); };
 
+/**
+ * Retrieves the last message sent by the assistant from the client's message history.
+ *
+ * @param {string} clientId - The ID of the client whose message history is being retrieved.
+ * @returns {Promise<string | null>} - The content of the last assistant message, or null if no user message is found.
+ */
+var getLastAssistantMessage = function (clientId) { return __awaiter(void 0, void 0, void 0, function () {
+    var history, last;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                swarm.loggerService.log("function getLastAssistantMessage", {
+                    clientId: clientId,
+                });
+                return [4 /*yield*/, getRawHistory(clientId)];
+            case 1:
+                history = _a.sent();
+                last = history.findLast(function (_a) {
+                    var role = _a.role;
+                    return role === "assistant";
+                });
+                return [2 /*return*/, last ? last.content : null];
+        }
+    });
+}); };
+
+/**
+ * Retrieves the last message sent by the system from the client's message history.
+ *
+ * @param {string} clientId - The ID of the client whose message history is being retrieved.
+ * @returns {Promise<string | null>} - The content of the last system message, or null if no user message is found.
+ */
+var getLastSystemMessage = function (clientId) { return __awaiter(void 0, void 0, void 0, function () {
+    var history, last;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                swarm.loggerService.log("function getLastSystemMessage", {
+                    clientId: clientId,
+                });
+                return [4 /*yield*/, getRawHistory(clientId)];
+            case 1:
+                history = _a.sent();
+                last = history.findLast(function (_a) {
+                    var role = _a.role;
+                    return role === "system";
+                });
+                return [2 /*return*/, last ? last.content : null];
+        }
+    });
+}); };
+
 exports.ContextService = ContextService;
 exports.addAgent = addAgent;
 exports.addCompletion = addCompletion;
@@ -4094,6 +4193,8 @@ exports.execute = execute;
 exports.getAgentHistory = getAgentHistory;
 exports.getAgentName = getAgentName;
 exports.getAssistantHistory = getAssistantHistory;
+exports.getLastAssistantMessage = getLastAssistantMessage;
+exports.getLastSystemMessage = getLastSystemMessage;
 exports.getLastUserMessage = getLastUserMessage;
 exports.getRawHistory = getRawHistory;
 exports.getUserHistory = getUserHistory;

package/build/index.mjs

@@ -1,5 +1,5 @@
 import { scoped } from 'di-scoped';
-import { ToolRegistry, PubsubArrayAdapter, Subject, queued, not, trycatch, memoize, schedule, ttl, singleshot } from 'functools-kit';
+import { ToolRegistry, sleep, PubsubArrayAdapter, Subject, queued, not, trycatch, memoize, schedule, ttl, singleshot } from 'functools-kit';
 import { createActivator } from 'di-kit';
 import { omit } from 'lodash-es';
 import xml2js from 'xml2js';
@@ -275,6 +275,22 @@ var CC_EMPTY_OUTPUT_PLACEHOLDERS = [
     "I didn’t hear you properly. Can you say that again?",
     "Could you please repeat that? I didn’t catch it.",
 ];
+var CC_SWARM_AGENT_CHANGED = function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+    switch (_a.label) {
+        case 0: return [4 /*yield*/, sleep(100)];
+        case 1: return [2 /*return*/, _a.sent()];
+    }
+}); }); };
+var CC_SWARM_DEFAULT_AGENT = function (_a, _b, defaultAgent_1) { return __awaiter(void 0, [_a, _b, defaultAgent_1], void 0, function (_c, _d, defaultAgent) {
+    return __generator(this, function (_e) {
+        switch (_e.label) {
+            case 0: return [4 /*yield*/, sleep(100)];
+            case 1:
+                _e.sent();
+                return [2 /*return*/, defaultAgent];
+        }
+    });
+}); };
 var CC_KEEP_MESSAGES = 5;
 var CC_ANSWER_TIMEOUT_SECONDS = 120000;
 var CC_GET_AGENT_HISTORY = function () { return new PubsubArrayAdapter(); };
@@ -284,6 +300,8 @@ var GLOBAL_CONFIG = {
     CC_KEEP_MESSAGES: CC_KEEP_MESSAGES,
     CC_ANSWER_TIMEOUT_SECONDS: CC_ANSWER_TIMEOUT_SECONDS,
     CC_GET_AGENT_HISTORY: CC_GET_AGENT_HISTORY,
+    CC_SWARM_AGENT_CHANGED: CC_SWARM_AGENT_CHANGED,
+    CC_SWARM_DEFAULT_AGENT: CC_SWARM_DEFAULT_AGENT,
 };
 var setConfig = function (config) {
     Object.assign(GLOBAL_CONFIG, config);
@@ -1199,7 +1217,8 @@ var ToolSchemaService = /** @class */ (function () {
     return ToolSchemaService;
 }());
 
-var AGENT_REF_CHANGED = Symbol('agent-ref-changed');
+var AGENT_REF_CHANGED = Symbol("agent-ref-changed");
+var AGENT_NEED_FETCH = Symbol("agent-need-fetch");
 /**
  * ClientSwarm class implements the ISwarm interface and manages agents within a swarm.
  */
@@ -1212,6 +1231,7 @@ var ClientSwarm = /** @class */ (function () {
         var _this = this;
         this.params = params;
         this._agentChangedSubject = new Subject();
+        this._activeAgent = AGENT_NEED_FETCH;
         /**
          * Waits for output from the active agent.
          * @returns {Promise<string>} - The output from the active agent.
@@ -1238,13 +1258,13 @@ var ClientSwarm = /** @class */ (function () {
                                         case 0:
                                             _c = [agentName];
                                             return [4 /*yield*/, agent.waitForOutput()];
-                                        case 1: return [2 /*return*/, _c.concat([
-                                                _e.sent()
-                                            ])];
+                                        case 1: return [2 /*return*/, _c.concat([_e.sent()])];
                                     }
                                 });
                             }); })), false), [
-                                this._agentChangedSubject.toPromise().then(function () { return [AGENT_REF_CHANGED]; }),
+                                this._agentChangedSubject
+                                    .toPromise()
+                                    .then(function () { return [AGENT_REF_CHANGED]; }),
                             ], false))];
                     case 2:
                         _a = __read.apply(void 0, [_c.sent(), 2]), agentName = _a[0], output = _a[1];
@@ -1267,9 +1287,19 @@ var ClientSwarm = /** @class */ (function () {
          * @returns {Promise<AgentName>} - The name of the active agent.
          */
         this.getAgentName = function () { return __awaiter(_this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                this.params.logger.debug("ClientSwarm swarmName=".concat(this.params.swarmName, " clientId=").concat(this.params.clientId, " getAgentName"));
-                return [2 /*return*/, this._activeAgent];
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        this.params.logger.debug("ClientSwarm swarmName=".concat(this.params.swarmName, " clientId=").concat(this.params.clientId, " getAgentName"));
+                        if (!(this._activeAgent === AGENT_NEED_FETCH)) return [3 /*break*/, 2];
+                        _a = this;
+                        return [4 /*yield*/, GLOBAL_CONFIG.CC_SWARM_DEFAULT_AGENT(this.params.clientId, this.params.swarmName, this.params.defaultAgent)];
+                    case 1:
+                        _a._activeAgent = _b.sent();
+                        _b.label = 2;
+                    case 2: return [2 /*return*/, this._activeAgent];
+                }
             });
         }); };
         /**
@@ -1317,15 +1347,20 @@ var ClientSwarm = /** @class */ (function () {
          */
         this.setAgentName = function (agentName) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                this.params.logger.debug("ClientSwarm swarmName=".concat(this.params.swarmName, " clientId=").concat(this.params.clientId, " setAgentName agentName=").concat(agentName));
-                this._activeAgent = agentName;
-                return [2 /*return*/];
+                switch (_a.label) {
+                    case 0:
+                        this.params.logger.debug("ClientSwarm swarmName=".concat(this.params.swarmName, " clientId=").concat(this.params.clientId, " setAgentName agentName=").concat(agentName));
+                        this._activeAgent = agentName;
+                        return [4 /*yield*/, this.params.onAgentChanged(this.params.clientId, agentName, this.params.swarmName)];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
             });
         }); };
         this.params.logger.debug("ClientSwarm swarmName=".concat(this.params.swarmName, " clientId=").concat(this.params.clientId, " CTOR"), {
             params: params,
         });
-        this._activeAgent = params.defaultAgent;
     }
     return ClientSwarm;
 }());
@@ -1373,6 +1408,18 @@ var SwarmConnectionService = /** @class */ (function () {
                 defaultAgent: defaultAgent,
                 swarmName: swarmName,
                 logger: _this.loggerService,
+                onAgentChanged: function (clientId, agentName, swarmName) {
+                    return __awaiter(this, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, GLOBAL_CONFIG.CC_SWARM_AGENT_CHANGED(clientId, agentName, swarmName)];
+                                case 1:
+                                    _a.sent();
+                                    return [2 /*return*/];
+                            }
+                        });
+                    });
+                },
             });
         });
         /**
@@ -4076,4 +4123,56 @@ var getAssistantHistory = function (clientId) { return __awaiter(void 0, void 0,
     });
 }); };
 
-export { ContextService, addAgent, addCompletion, addSwarm, addTool, changeAgent, commitSystemMessage, commitToolOutput, commitUserMessage, complete, disposeConnection, emit, execute, getAgentHistory, getAgentName, getAssistantHistory, getLastUserMessage, getRawHistory, getUserHistory, makeConnection, session, setConfig, swarm };
+/**
+ * Retrieves the last message sent by the assistant from the client's message history.
+ *
+ * @param {string} clientId - The ID of the client whose message history is being retrieved.
+ * @returns {Promise<string | null>} - The content of the last assistant message, or null if no user message is found.
+ */
+var getLastAssistantMessage = function (clientId) { return __awaiter(void 0, void 0, void 0, function () {
+    var history, last;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                swarm.loggerService.log("function getLastAssistantMessage", {
+                    clientId: clientId,
+                });
+                return [4 /*yield*/, getRawHistory(clientId)];
+            case 1:
+                history = _a.sent();
+                last = history.findLast(function (_a) {
+                    var role = _a.role;
+                    return role === "assistant";
+                });
+                return [2 /*return*/, last ? last.content : null];
+        }
+    });
+}); };
+
+/**
+ * Retrieves the last message sent by the system from the client's message history.
+ *
+ * @param {string} clientId - The ID of the client whose message history is being retrieved.
+ * @returns {Promise<string | null>} - The content of the last system message, or null if no user message is found.
+ */
+var getLastSystemMessage = function (clientId) { return __awaiter(void 0, void 0, void 0, function () {
+    var history, last;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                swarm.loggerService.log("function getLastSystemMessage", {
+                    clientId: clientId,
+                });
+                return [4 /*yield*/, getRawHistory(clientId)];
+            case 1:
+                history = _a.sent();
+                last = history.findLast(function (_a) {
+                    var role = _a.role;
+                    return role === "system";
+                });
+                return [2 /*return*/, last ? last.content : null];
+        }
+    });
+}); };
+
+export { ContextService, addAgent, addCompletion, addSwarm, addTool, changeAgent, commitSystemMessage, commitToolOutput, commitUserMessage, complete, disposeConnection, emit, execute, getAgentHistory, getAgentName, getAssistantHistory, getLastAssistantMessage, getLastSystemMessage, getLastUserMessage, getRawHistory, getUserHistory, makeConnection, session, setConfig, swarm };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-swarm-kit",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "description": "A TypeScript library for building orchestrated framework-agnostic multi-agent AI systems",
   "author": {
     "name": "Petr Tripolsky",
@@ -39,6 +39,7 @@
   "scripts": {
     "build": "rollup -c",
     "test": "npm run build && node ./test/index.mjs",
+    "benchmark": "npm run build && node ./benchmark/index.mjs",
     "build:docs": "rimraf docs && mkdir docs && node ./scripts/dts-docs.cjs ./types.d.ts ./docs",
     "docs:gpt": "npm run build && node ./scripts/gpt-docs.mjs",
     "repl": "dotenv -e .env -- npm run build && node -e \"import('./scripts/repl.mjs')\" --interactive"

package/types.d.ts

@@ -340,6 +340,8 @@ interface ISwarmParams extends Omit<ISwarmSchema, keyof {
     logger: ILogger;
     /** Map of agent names to agent instances */
     agentMap: Record<AgentName, IAgent>;
+    /** Emit the callback on agent change */
+    onAgentChanged(clientId: string, agentName: AgentName, swarmName: SwarmName): Promise<void>;
 }
 /**
  * Schema for defining a swarm.
@@ -1727,13 +1729,31 @@ declare const getUserHistory: (clientId: string) => Promise<IModelMessage[]>;
  */
 declare const getAssistantHistory: (clientId: string) => Promise<IModelMessage[]>;
 
+/**
+ * Retrieves the last message sent by the assistant from the client's message history.
+ *
+ * @param {string} clientId - The ID of the client whose message history is being retrieved.
+ * @returns {Promise<string | null>} - The content of the last assistant message, or null if no user message is found.
+ */
+declare const getLastAssistantMessage: (clientId: string) => Promise<string>;
+
+/**
+ * Retrieves the last message sent by the system from the client's message history.
+ *
+ * @param {string} clientId - The ID of the client whose message history is being retrieved.
+ * @returns {Promise<string | null>} - The content of the last system message, or null if no user message is found.
+ */
+declare const getLastSystemMessage: (clientId: string) => Promise<string>;
+
 declare const GLOBAL_CONFIG: {
     CC_TOOL_CALL_EXCEPTION_PROMPT: string;
     CC_EMPTY_OUTPUT_PLACEHOLDERS: string[];
     CC_KEEP_MESSAGES: number;
     CC_ANSWER_TIMEOUT_SECONDS: number;
     CC_GET_AGENT_HISTORY: (clientId: string, agentName: AgentName) => IPubsubArray<IModelMessage>;
+    CC_SWARM_AGENT_CHANGED: (clientId: string, agentName: AgentName, swarmName: SwarmName) => Promise<void>;
+    CC_SWARM_DEFAULT_AGENT: (clientId: string, swarmName: SwarmName, defaultAgent: AgentName) => Promise<AgentName>;
 };
 declare const setConfig: (config: typeof GLOBAL_CONFIG) => void;
 
-export { ContextService, type IAgentSchema, type IAgentTool, type ICompletionSchema, type IIncomingMessage, type IModelMessage, type IOutgoingMessage, type ISwarmSchema, type ITool, type IToolCall, type ReceiveMessageFn, type SendMessageFn$1 as SendMessageFn, addAgent, addCompletion, addSwarm, addTool, changeAgent, commitSystemMessage, commitToolOutput, commitUserMessage, complete, disposeConnection, emit, execute, getAgentHistory, getAgentName, getAssistantHistory, getLastUserMessage, getRawHistory, getUserHistory, makeConnection, session, setConfig, swarm };
+export { ContextService, type IAgentSchema, type IAgentTool, type ICompletionSchema, type IIncomingMessage, type IModelMessage, type IOutgoingMessage, type ISwarmSchema, type ITool, type IToolCall, type ReceiveMessageFn, type SendMessageFn$1 as SendMessageFn, addAgent, addCompletion, addSwarm, addTool, changeAgent, commitSystemMessage, commitToolOutput, commitUserMessage, complete, disposeConnection, emit, execute, getAgentHistory, getAgentName, getAssistantHistory, getLastAssistantMessage, getLastSystemMessage, getLastUserMessage, getRawHistory, getUserHistory, makeConnection, session, setConfig, swarm };