agent-swarm-kit 1.0.27 → 1.0.29

package/build/index.cjs

@@ -481,6 +481,7 @@ var ClientAgent = /** @class */ (function () {
                         this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " _resurrectModel"));
                         return [4 /*yield*/, this.params.history.push({
                                 role: "resque",
+                                mode: 'tool',
                                 agentName: this.params.agentName,
                                 content: reason || "Unknown error",
                             })];
@@ -488,6 +489,7 @@ var ClientAgent = /** @class */ (function () {
                         _a.sent();
                         return [4 /*yield*/, this.params.history.push({
                                 role: "user",
+                                mode: 'tool',
                                 agentName: this.params.agentName,
                                 content: GLOBAL_CONFIG.CC_TOOL_CALL_EXCEPTION_PROMPT,
                             })];
@@ -506,6 +508,7 @@ var ClientAgent = /** @class */ (function () {
                         return [4 /*yield*/, this.params.history.push({
                                 agentName: this.params.agentName,
                                 role: "assistant",
+                                mode: 'tool',
                                 content: content,
                             })];
                     case 5:
@@ -571,6 +574,7 @@ var ClientAgent = /** @class */ (function () {
                         return [4 /*yield*/, this.params.history.push({
                                 role: "user",
                                 agentName: this.params.agentName,
+                                mode: 'user',
                                 content: message.trim(),
                             })];
                     case 1:
@@ -592,6 +596,7 @@ var ClientAgent = /** @class */ (function () {
                         return [4 /*yield*/, this.params.history.push({
                                 role: "system",
                                 agentName: this.params.agentName,
+                                mode: 'tool',
                                 content: message.trim(),
                             })];
                     case 1:
@@ -613,6 +618,7 @@ var ClientAgent = /** @class */ (function () {
                         return [4 /*yield*/, this.params.history.push({
                                 role: "tool",
                                 agentName: this.params.agentName,
+                                mode: 'tool',
                                 content: content,
                             })];
                     case 1:
@@ -629,16 +635,17 @@ var ClientAgent = /** @class */ (function () {
          * @param {string} incoming - The incoming message content.
          * @returns {Promise<void>}
          */
-        this.execute = functoolsKit.queued(function (incoming) { return __awaiter(_this, void 0, void 0, function () {
+        this.execute = functoolsKit.queued(function (incoming, mode) { return __awaiter(_this, void 0, void 0, function () {
             var message, _loop_1, this_1, _a, _b, tool, state_1, e_1_1, result, validation, result1;
             var e_1, _c;
             var _d;
             return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
-                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " execute begin"), { incoming: incoming });
+                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " execute begin"), { incoming: incoming, mode: mode });
                         return [4 /*yield*/, this.params.history.push({
                                 role: "user",
+                                mode: mode,
                                 agentName: this.params.agentName,
                                 content: incoming.trim(),
                             })];
@@ -807,15 +814,16 @@ var AgentConnectionService = /** @class */ (function () {
          * @param {string} input - The input command.
          * @returns {Promise<any>} The execution result.
          */
-        this.execute = function (input) { return __awaiter(_this, void 0, void 0, function () {
+        this.execute = function (input, mode) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("agentConnectionService execute", {
                             input: input,
+                            mode: mode,
                             context: this.contextService.context,
                         });
-                        return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).execute(input)];
+                        return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).execute(input, mode)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -1068,14 +1076,19 @@ var ClientHistory = /** @class */ (function () {
                         {
                             promptMessages.push({
                                 agentName: this.params.agentName,
+                                mode: 'tool',
                                 content: prompt,
                                 role: "system",
                             });
-                            system && promptMessages.push({
-                                agentName: this.params.agentName,
-                                content: system,
-                                role: "system",
-                            });
+                            system &&
+                                system.forEach(function (content) {
+                                    return promptMessages.push({
+                                        agentName: _this.params.agentName,
+                                        mode: 'tool',
+                                        content: content,
+                                        role: "system",
+                                    });
+                                });
                         }
                         return [2 /*return*/, __spreadArray(__spreadArray(__spreadArray([], __read(promptMessages), false), __read(systemMessages), false), __read(commonMessages), false)];
                 }
@@ -1636,12 +1649,12 @@ var ClientSession = /** @class */ (function () {
          * @param {boolean} [noEmit=false] - Whether to emit the output or not.
          * @returns {Promise<string>} - The output of the execution.
          */
-        this.execute = function (message_1) {
+        this.execute = function (message_1, mode_1) {
             var args_1 = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                args_1[_i - 1] = arguments[_i];
+            for (var _i = 2; _i < arguments.length; _i++) {
+                args_1[_i - 2] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([message_1], __read(args_1), false), void 0, function (message, noEmit) {
+            return __awaiter(_this, __spreadArray([message_1, mode_1], __read(args_1), false), void 0, function (message, mode, noEmit) {
                 var agent, outputAwaiter, output, _a;
                 if (noEmit === void 0) { noEmit = false; }
                 return __generator(this, function (_b) {
@@ -1649,13 +1662,14 @@ var ClientSession = /** @class */ (function () {
                         case 0:
                             this.params.logger.debug("ClientSession clientId=".concat(this.params.clientId, " execute"), {
                                 message: message,
+                                mode: mode,
                                 noEmit: noEmit,
                             });
                             return [4 /*yield*/, this.params.swarm.getAgent()];
                         case 1:
                             agent = _b.sent();
                             outputAwaiter = this.params.swarm.waitForOutput();
-                            agent.execute(message);
+                            agent.execute(message, mode);
                             return [4 /*yield*/, outputAwaiter];
                         case 2:
                             output = _b.sent();
@@ -1768,7 +1782,7 @@ var ClientSession = /** @class */ (function () {
                             this.params.logger.debug("ClientSession clientId=".concat(this.params.clientId, " connect call"));
                             _a = connector;
                             _b = {};
-                            return [4 /*yield*/, this.execute(incoming.data, true)];
+                            return [4 /*yield*/, this.execute(incoming.data, "user", true)];
                         case 1:
                             _b.data = _c.sent();
                             return [4 /*yield*/, this.params.swarm.getAgentName()];
@@ -1837,14 +1851,16 @@ var SessionConnectionService = /** @class */ (function () {
          * @param {string} content - The content to execute.
          * @returns {Promise<string>} A promise that resolves with the execution result.
          */
-        this.execute = function (content) { return __awaiter(_this, void 0, void 0, function () {
+        this.execute = function (content, mode) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("sessionConnectionService execute", {
                             context: this.contextService.context,
+                            content: content,
+                            mode: mode,
                         });
-                        return [4 /*yield*/, this.getSession(this.contextService.context.clientId, this.contextService.context.swarmName).execute(content)];
+                        return [4 /*yield*/, this.getSession(this.contextService.context.clientId, this.contextService.context.swarmName).execute(content, mode)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -1974,7 +1990,7 @@ var AgentPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The name of the agent.
          * @returns {Promise<unknown>} The execution result.
          */
-        this.execute = function (input, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.execute = function (input, mode, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -1983,11 +1999,12 @@ var AgentPublicService = /** @class */ (function () {
                             input: input,
                             clientId: clientId,
                             agentName: agentName,
+                            mode: mode,
                         });
                         return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
-                                        case 0: return [4 /*yield*/, this.agentConnectionService.execute(input)];
+                                        case 0: return [4 /*yield*/, this.agentConnectionService.execute(input, mode)];
                                         case 1: return [2 /*return*/, _a.sent()];
                                     }
                                 });
@@ -2353,20 +2370,21 @@ var SessionPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.execute = function (content, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.execute = function (content, mode, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("sessionPublicService execute", {
                             content: content,
+                            mode: mode,
                             clientId: clientId,
                             swarmName: swarmName,
                         });
                         return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
-                                        case 0: return [4 /*yield*/, this.sessionConnectionService.execute(content)];
+                                        case 0: return [4 /*yield*/, this.sessionConnectionService.execute(content, mode)];
                                         case 1: return [2 /*return*/, _a.sent()];
                                     }
                                 });
@@ -3658,7 +3676,7 @@ var createComplete = functoolsKit.ttl(function (clientId, swarmName) {
                 case 0:
                     swarm.swarmValidationService.validate(swarmName, "complete");
                     swarm.sessionValidationService.addSession(clientId, swarmName, "complete");
-                    return [4 /*yield*/, swarm.sessionPublicService.execute(content, clientId, swarmName)];
+                    return [4 /*yield*/, swarm.sessionPublicService.execute(content, "user", clientId, swarmName)];
                 case 1:
                     result = _a.sent();
                     return [4 /*yield*/, disposeConnection(clientId, swarmName)];
@@ -3743,7 +3761,7 @@ var session = function (clientId, swarmName) {
                 switch (_a.label) {
                     case 0:
                         swarm.sessionValidationService.validate(clientId, "session");
-                        return [4 /*yield*/, swarm.sessionPublicService.execute(content, clientId, swarmName)];
+                        return [4 /*yield*/, swarm.sessionPublicService.execute(content, "user", clientId, swarmName)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -4025,7 +4043,7 @@ var execute = function (content, clientId, agentName) { return __awaiter(void 0,
                     });
                     return [2 /*return*/];
                 }
-                return [4 /*yield*/, swarm.sessionPublicService.execute(content, clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.execute(content, "tool", clientId, swarmName)];
             case 2: return [2 /*return*/, _a.sent()];
         }
     });
@@ -4093,8 +4111,8 @@ var getLastUserMessage = function (clientId) { return __awaiter(void 0, void 0,
             case 1:
                 history = _a.sent();
                 last = history.findLast(function (_a) {
-                    var role = _a.role;
-                    return role === "user";
+                    var role = _a.role, mode = _a.mode;
+                    return role === "user" && mode === "user";
                 });
                 return [2 /*return*/, last ? last.content : null];
         }
@@ -4119,8 +4137,8 @@ var getUserHistory = function (clientId) { return __awaiter(void 0, void 0, void
             case 1:
                 history = _a.sent();
                 return [2 /*return*/, history.filter(function (_a) {
-                        var role = _a.role;
-                        return role === "user";
+                        var role = _a.role, mode = _a.mode;
+                        return role === "user" && mode === "user";
                     })];
         }
     });

package/build/index.mjs

@@ -479,6 +479,7 @@ var ClientAgent = /** @class */ (function () {
                         this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " _resurrectModel"));
                         return [4 /*yield*/, this.params.history.push({
                                 role: "resque",
+                                mode: 'tool',
                                 agentName: this.params.agentName,
                                 content: reason || "Unknown error",
                             })];
@@ -486,6 +487,7 @@ var ClientAgent = /** @class */ (function () {
                         _a.sent();
                         return [4 /*yield*/, this.params.history.push({
                                 role: "user",
+                                mode: 'tool',
                                 agentName: this.params.agentName,
                                 content: GLOBAL_CONFIG.CC_TOOL_CALL_EXCEPTION_PROMPT,
                             })];
@@ -504,6 +506,7 @@ var ClientAgent = /** @class */ (function () {
                         return [4 /*yield*/, this.params.history.push({
                                 agentName: this.params.agentName,
                                 role: "assistant",
+                                mode: 'tool',
                                 content: content,
                             })];
                     case 5:
@@ -569,6 +572,7 @@ var ClientAgent = /** @class */ (function () {
                         return [4 /*yield*/, this.params.history.push({
                                 role: "user",
                                 agentName: this.params.agentName,
+                                mode: 'user',
                                 content: message.trim(),
                             })];
                     case 1:
@@ -590,6 +594,7 @@ var ClientAgent = /** @class */ (function () {
                         return [4 /*yield*/, this.params.history.push({
                                 role: "system",
                                 agentName: this.params.agentName,
+                                mode: 'tool',
                                 content: message.trim(),
                             })];
                     case 1:
@@ -611,6 +616,7 @@ var ClientAgent = /** @class */ (function () {
                         return [4 /*yield*/, this.params.history.push({
                                 role: "tool",
                                 agentName: this.params.agentName,
+                                mode: 'tool',
                                 content: content,
                             })];
                     case 1:
@@ -627,16 +633,17 @@ var ClientAgent = /** @class */ (function () {
          * @param {string} incoming - The incoming message content.
          * @returns {Promise<void>}
          */
-        this.execute = queued(function (incoming) { return __awaiter(_this, void 0, void 0, function () {
+        this.execute = queued(function (incoming, mode) { return __awaiter(_this, void 0, void 0, function () {
             var message, _loop_1, this_1, _a, _b, tool, state_1, e_1_1, result, validation, result1;
             var e_1, _c;
             var _d;
             return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
-                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " execute begin"), { incoming: incoming });
+                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " execute begin"), { incoming: incoming, mode: mode });
                         return [4 /*yield*/, this.params.history.push({
                                 role: "user",
+                                mode: mode,
                                 agentName: this.params.agentName,
                                 content: incoming.trim(),
                             })];
@@ -805,15 +812,16 @@ var AgentConnectionService = /** @class */ (function () {
          * @param {string} input - The input command.
          * @returns {Promise<any>} The execution result.
          */
-        this.execute = function (input) { return __awaiter(_this, void 0, void 0, function () {
+        this.execute = function (input, mode) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("agentConnectionService execute", {
                             input: input,
+                            mode: mode,
                             context: this.contextService.context,
                         });
-                        return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).execute(input)];
+                        return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).execute(input, mode)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -1066,14 +1074,19 @@ var ClientHistory = /** @class */ (function () {
                         {
                             promptMessages.push({
                                 agentName: this.params.agentName,
+                                mode: 'tool',
                                 content: prompt,
                                 role: "system",
                             });
-                            system && promptMessages.push({
-                                agentName: this.params.agentName,
-                                content: system,
-                                role: "system",
-                            });
+                            system &&
+                                system.forEach(function (content) {
+                                    return promptMessages.push({
+                                        agentName: _this.params.agentName,
+                                        mode: 'tool',
+                                        content: content,
+                                        role: "system",
+                                    });
+                                });
                         }
                         return [2 /*return*/, __spreadArray(__spreadArray(__spreadArray([], __read(promptMessages), false), __read(systemMessages), false), __read(commonMessages), false)];
                 }
@@ -1634,12 +1647,12 @@ var ClientSession = /** @class */ (function () {
          * @param {boolean} [noEmit=false] - Whether to emit the output or not.
          * @returns {Promise<string>} - The output of the execution.
          */
-        this.execute = function (message_1) {
+        this.execute = function (message_1, mode_1) {
             var args_1 = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                args_1[_i - 1] = arguments[_i];
+            for (var _i = 2; _i < arguments.length; _i++) {
+                args_1[_i - 2] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([message_1], __read(args_1), false), void 0, function (message, noEmit) {
+            return __awaiter(_this, __spreadArray([message_1, mode_1], __read(args_1), false), void 0, function (message, mode, noEmit) {
                 var agent, outputAwaiter, output, _a;
                 if (noEmit === void 0) { noEmit = false; }
                 return __generator(this, function (_b) {
@@ -1647,13 +1660,14 @@ var ClientSession = /** @class */ (function () {
                         case 0:
                             this.params.logger.debug("ClientSession clientId=".concat(this.params.clientId, " execute"), {
                                 message: message,
+                                mode: mode,
                                 noEmit: noEmit,
                             });
                             return [4 /*yield*/, this.params.swarm.getAgent()];
                         case 1:
                             agent = _b.sent();
                             outputAwaiter = this.params.swarm.waitForOutput();
-                            agent.execute(message);
+                            agent.execute(message, mode);
                             return [4 /*yield*/, outputAwaiter];
                         case 2:
                             output = _b.sent();
@@ -1766,7 +1780,7 @@ var ClientSession = /** @class */ (function () {
                             this.params.logger.debug("ClientSession clientId=".concat(this.params.clientId, " connect call"));
                             _a = connector;
                             _b = {};
-                            return [4 /*yield*/, this.execute(incoming.data, true)];
+                            return [4 /*yield*/, this.execute(incoming.data, "user", true)];
                         case 1:
                             _b.data = _c.sent();
                             return [4 /*yield*/, this.params.swarm.getAgentName()];
@@ -1835,14 +1849,16 @@ var SessionConnectionService = /** @class */ (function () {
          * @param {string} content - The content to execute.
          * @returns {Promise<string>} A promise that resolves with the execution result.
          */
-        this.execute = function (content) { return __awaiter(_this, void 0, void 0, function () {
+        this.execute = function (content, mode) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("sessionConnectionService execute", {
                             context: this.contextService.context,
+                            content: content,
+                            mode: mode,
                         });
-                        return [4 /*yield*/, this.getSession(this.contextService.context.clientId, this.contextService.context.swarmName).execute(content)];
+                        return [4 /*yield*/, this.getSession(this.contextService.context.clientId, this.contextService.context.swarmName).execute(content, mode)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -1972,7 +1988,7 @@ var AgentPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The name of the agent.
          * @returns {Promise<unknown>} The execution result.
          */
-        this.execute = function (input, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.execute = function (input, mode, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -1981,11 +1997,12 @@ var AgentPublicService = /** @class */ (function () {
                             input: input,
                             clientId: clientId,
                             agentName: agentName,
+                            mode: mode,
                         });
                         return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
-                                        case 0: return [4 /*yield*/, this.agentConnectionService.execute(input)];
+                                        case 0: return [4 /*yield*/, this.agentConnectionService.execute(input, mode)];
                                         case 1: return [2 /*return*/, _a.sent()];
                                     }
                                 });
@@ -2351,20 +2368,21 @@ var SessionPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.execute = function (content, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.execute = function (content, mode, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("sessionPublicService execute", {
                             content: content,
+                            mode: mode,
                             clientId: clientId,
                             swarmName: swarmName,
                         });
                         return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
-                                        case 0: return [4 /*yield*/, this.sessionConnectionService.execute(content)];
+                                        case 0: return [4 /*yield*/, this.sessionConnectionService.execute(content, mode)];
                                         case 1: return [2 /*return*/, _a.sent()];
                                     }
                                 });
@@ -3656,7 +3674,7 @@ var createComplete = ttl(function (clientId, swarmName) {
                 case 0:
                     swarm.swarmValidationService.validate(swarmName, "complete");
                     swarm.sessionValidationService.addSession(clientId, swarmName, "complete");
-                    return [4 /*yield*/, swarm.sessionPublicService.execute(content, clientId, swarmName)];
+                    return [4 /*yield*/, swarm.sessionPublicService.execute(content, "user", clientId, swarmName)];
                 case 1:
                     result = _a.sent();
                     return [4 /*yield*/, disposeConnection(clientId, swarmName)];
@@ -3741,7 +3759,7 @@ var session = function (clientId, swarmName) {
                 switch (_a.label) {
                     case 0:
                         swarm.sessionValidationService.validate(clientId, "session");
-                        return [4 /*yield*/, swarm.sessionPublicService.execute(content, clientId, swarmName)];
+                        return [4 /*yield*/, swarm.sessionPublicService.execute(content, "user", clientId, swarmName)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -4023,7 +4041,7 @@ var execute = function (content, clientId, agentName) { return __awaiter(void 0,
                     });
                     return [2 /*return*/];
                 }
-                return [4 /*yield*/, swarm.sessionPublicService.execute(content, clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.execute(content, "tool", clientId, swarmName)];
             case 2: return [2 /*return*/, _a.sent()];
         }
     });
@@ -4091,8 +4109,8 @@ var getLastUserMessage = function (clientId) { return __awaiter(void 0, void 0,
             case 1:
                 history = _a.sent();
                 last = history.findLast(function (_a) {
-                    var role = _a.role;
-                    return role === "user";
+                    var role = _a.role, mode = _a.mode;
+                    return role === "user" && mode === "user";
                 });
                 return [2 /*return*/, last ? last.content : null];
         }
@@ -4117,8 +4135,8 @@ var getUserHistory = function (clientId) { return __awaiter(void 0, void 0, void
             case 1:
                 history = _a.sent();
                 return [2 /*return*/, history.filter(function (_a) {
-                        var role = _a.role;
-                        return role === "user";
+                        var role = _a.role, mode = _a.mode;
+                        return role === "user" && mode === "user";
                     })];
         }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-swarm-kit",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "description": "A TypeScript library for building orchestrated framework-agnostic multi-agent AI systems",
   "author": {
     "name": "Petr Tripolsky",

package/types.d.ts

@@ -1,4 +1,5 @@
 import * as di_scoped from 'di-scoped';
+import { ExecutionMode as ExecutionMode$1 } from 'src/interfaces/Session.interface';
 import * as functools_kit from 'functools-kit';
 import { IPubsubArray, Subject } from 'functools-kit';
 
@@ -10,7 +11,7 @@ interface IModelMessage {
      * The role of the message sender.
      * @type {'assistant' | 'system' | 'tool' | 'user' | 'resque'}
      */
-    role: 'assistant' | 'system' | 'tool' | 'user' | 'resque';
+    role: "assistant" | "system" | "tool" | "user" | "resque";
     /**
      * The name of the agent sending the message.
      * @type {string}
@@ -21,6 +22,11 @@ interface IModelMessage {
      * @type {string}
      */
     content: string;
+    /**
+     * The source of message: tool or user
+     * @type {ExecutionMode}
+     */
+    mode: ExecutionMode$1;
     /**
      * Optional tool calls associated with the message.
      * @type {Array<{ function: { name: string; arguments: { [key: string]: any; }; }; }>}
@@ -66,7 +72,7 @@ interface IHistory {
      * @param {string} prompt - The prompt to filter messages for the agent.
      * @returns {Promise<IModelMessage[]>}
      */
-    toArrayForAgent(prompt: string, system?: string): Promise<IModelMessage[]>;
+    toArrayForAgent(prompt: string, system?: string[]): Promise<IModelMessage[]>;
     /**
      * Converts the history to an array of raw messages.
      * @returns {Promise<IModelMessage[]>}
@@ -219,6 +225,196 @@ interface ICompletionSchema {
  */
 type CompletionName = string;
 
+/**
+ * Interface representing an incoming message.
+ */
+interface IIncomingMessage {
+    /**
+     * The ID of the client sending the message.
+     */
+    clientId: string;
+    /**
+     * The data contained in the message.
+     */
+    data: string;
+    /**
+     * The name of the agent sending the message.
+     */
+    agentName: AgentName;
+}
+/**
+ * Interface representing an outgoing message.
+ */
+interface IOutgoingMessage {
+    /**
+     * The ID of the client receiving the message.
+     */
+    clientId: string;
+    /**
+     * The data contained in the message.
+     */
+    data: string;
+    /**
+     * The name of the agent sending the message.
+     */
+    agentName: AgentName;
+}
+
+/**
+ * Parameters for initializing a swarm.
+ * @interface
+ * @extends {Omit<ISwarmSchema, 'agentList'>}
+ */
+interface ISwarmParams extends Omit<ISwarmSchema, keyof {
+    agentList: never;
+}> {
+    /** Client identifier */
+    clientId: string;
+    /** Logger instance */
+    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.
+ * @interface
+ */
+interface ISwarmSchema {
+    /** Default agent name */
+    defaultAgent: AgentName;
+    /** Name of the swarm */
+    swarmName: string;
+    /** List of agent names */
+    agentList: string[];
+}
+/**
+ * Interface for a swarm.
+ * @interface
+ */
+interface ISwarm {
+    /**
+     * Waits for the output from the swarm.
+     * @returns {Promise<string>} The output from the swarm.
+     */
+    waitForOutput(): Promise<string>;
+    /**
+     * Gets the name of the agent.
+     * @returns {Promise<AgentName>} The name of the agent.
+     */
+    getAgentName(): Promise<AgentName>;
+    /**
+     * Gets the agent instance.
+     * @returns {Promise<IAgent>} The agent instance.
+     */
+    getAgent(): Promise<IAgent>;
+    /**
+     * Sets the reference to an agent.
+     * @param {AgentName} agentName - The name of the agent.
+     * @param {IAgent} agent - The agent instance.
+     * @returns {Promise<void>}
+     */
+    setAgentRef(agentName: AgentName, agent: IAgent): Promise<void>;
+    /**
+     * Sets the name of the agent.
+     * @param {AgentName} agentName - The name of the agent.
+     * @returns {Promise<void>}
+     */
+    setAgentName(agentName: AgentName): Promise<void>;
+}
+/** Type alias for swarm name */
+type SwarmName = string;
+
+/**
+ * Parameters required to create a session.
+ * @interface
+ */
+interface ISessionParams extends ISessionSchema {
+    clientId: string;
+    logger: ILogger;
+    swarm: ISwarm;
+}
+/**
+ * Schema for session data.
+ * @interface
+ */
+interface ISessionSchema {
+}
+/**
+ * Function type for sending messages.
+ * @typedef {function} SendMessageFn
+ * @param {IOutgoingMessage} outgoing - The outgoing message.
+ * @returns {Promise<void> | void}
+ */
+type SendMessageFn$1 = (outgoing: IOutgoingMessage) => Promise<void> | void;
+/**
+ * Function type for receiving messages.
+ * @typedef {function} ReceiveMessageFn
+ * @param {IIncomingMessage} incoming - The incoming message.
+ * @returns {Promise<void> | void}
+ */
+type ReceiveMessageFn = (incoming: IIncomingMessage) => Promise<void> | void;
+/**
+ * Interface for a session.
+ * @interface
+ */
+interface ISession {
+    /**
+     * Emit a message.
+     * @param {string} message - The message to emit.
+     * @returns {Promise<void>}
+     */
+    emit(message: string): Promise<void>;
+    /**
+     * Execute a command.
+     * @param {string} content - The content to execute.
+     * @param {string} mode - The source of execution: tool or user
+     * @returns {Promise<string>}
+     */
+    execute(content: string, mode: ExecutionMode): Promise<string>;
+    /**
+     * Connect to a message sender.
+     * @param {SendMessageFn} connector - The function to send messages.
+     * @returns {ReceiveMessageFn}
+     */
+    connect(connector: SendMessageFn$1): ReceiveMessageFn;
+    /**
+     * Commit tool output.
+     * @param {string} content - The content to commit.
+     * @returns {Promise<void>}
+     */
+    commitToolOutput(content: string): Promise<void>;
+    /**
+     * Commit user message without answer
+     * @param {string} message - The message to commit.
+     * @returns {Promise<void>}
+     */
+    commitUserMessage: (message: string) => Promise<void>;
+    /**
+     * Commit a system message.
+     * @param {string} message - The message to commit.
+     * @returns {Promise<void>}
+     */
+    commitSystemMessage(message: string): Promise<void>;
+}
+/**
+ * Type for session ID.
+ * @typedef {string} SessionId
+ */
+type SessionId = string;
+/**
+ * Type for session mode.
+ * @typedef {"session" | "makeConnection" | "complete"} SessionMode
+ */
+type SessionMode = "session" | "makeConnection" | "complete";
+/**
+ * Tools can emit user messages to trigger user friendly responses.
+ * Should be ignored for `getUserHistory`
+ * @typedef {"tool" | "user"} ExecutionMode
+ */
+type ExecutionMode = "tool" | "user";
+
 /**
  * Interface representing a tool used by an agent.
  * @template T - The type of the parameters for the tool.
@@ -279,7 +475,7 @@ interface IAgentSchema {
     /** The prompt for the agent. */
     prompt: string;
     /** The system prompt. Usually used for tool calling protocol. */
-    system?: string;
+    system?: string[];
     /** The names of the tools used by the agent. */
     tools?: ToolName[];
     /**
@@ -296,9 +492,10 @@ interface IAgent {
     /**
      * Executes the agent with the given input.
      * @param input - The input to execute.
+     * @param mode - The source of execution: tool or user
      * @returns A promise that resolves when the execution is complete.
      */
-    execute: (input: string) => Promise<void>;
+    execute: (input: string, mode: ExecutionMode) => Promise<void>;
     /**
      * Waits for the output from the agent.
      * @returns A promise that resolves to the output string.
@@ -328,72 +525,6 @@ type AgentName = string;
 /** Type representing the name of a tool. */
 type ToolName = string;
 
-/**
- * Parameters for initializing a swarm.
- * @interface
- * @extends {Omit<ISwarmSchema, 'agentList'>}
- */
-interface ISwarmParams extends Omit<ISwarmSchema, keyof {
-    agentList: never;
-}> {
-    /** Client identifier */
-    clientId: string;
-    /** Logger instance */
-    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.
- * @interface
- */
-interface ISwarmSchema {
-    /** Default agent name */
-    defaultAgent: AgentName;
-    /** Name of the swarm */
-    swarmName: string;
-    /** List of agent names */
-    agentList: string[];
-}
-/**
- * Interface for a swarm.
- * @interface
- */
-interface ISwarm {
-    /**
-     * Waits for the output from the swarm.
-     * @returns {Promise<string>} The output from the swarm.
-     */
-    waitForOutput(): Promise<string>;
-    /**
-     * Gets the name of the agent.
-     * @returns {Promise<AgentName>} The name of the agent.
-     */
-    getAgentName(): Promise<AgentName>;
-    /**
-     * Gets the agent instance.
-     * @returns {Promise<IAgent>} The agent instance.
-     */
-    getAgent(): Promise<IAgent>;
-    /**
-     * Sets the reference to an agent.
-     * @param {AgentName} agentName - The name of the agent.
-     * @param {IAgent} agent - The agent instance.
-     * @returns {Promise<void>}
-     */
-    setAgentRef(agentName: AgentName, agent: IAgent): Promise<void>;
-    /**
-     * Sets the name of the agent.
-     * @param {AgentName} agentName - The name of the agent.
-     * @returns {Promise<void>}
-     */
-    setAgentName(agentName: AgentName): Promise<void>;
-}
-/** Type alias for swarm name */
-type SwarmName = string;
-
 /**
  * Interface representing the context.
  */
@@ -523,7 +654,7 @@ declare class AgentConnectionService implements IAgent {
      * @param {string} input - The input command.
      * @returns {Promise<any>} The execution result.
      */
-    execute: (input: string) => Promise<void>;
+    execute: (input: string, mode: ExecutionMode) => Promise<void>;
     /**
      * Waits for the output from the agent.
      * @returns {Promise<any>} The output result.
@@ -582,7 +713,7 @@ declare class ClientHistory implements IHistory {
      * @param {string} system - The tool calling protocol
      * @returns {Promise<IModelMessage[]>} - The array of messages for the agent.
      */
-    toArrayForAgent: (prompt: string, system?: string) => Promise<IModelMessage[]>;
+    toArrayForAgent: (prompt: string, system?: string[]) => Promise<IModelMessage[]>;
 }
 
 /**
@@ -804,123 +935,6 @@ declare class CompletionSchemaService {
     get: (key: string) => ICompletionSchema;
 }
 
-/**
- * Interface representing an incoming message.
- */
-interface IIncomingMessage {
-    /**
-     * The ID of the client sending the message.
-     */
-    clientId: string;
-    /**
-     * The data contained in the message.
-     */
-    data: string;
-    /**
-     * The name of the agent sending the message.
-     */
-    agentName: AgentName;
-}
-/**
- * Interface representing an outgoing message.
- */
-interface IOutgoingMessage {
-    /**
-     * The ID of the client receiving the message.
-     */
-    clientId: string;
-    /**
-     * The data contained in the message.
-     */
-    data: string;
-    /**
-     * The name of the agent sending the message.
-     */
-    agentName: AgentName;
-}
-
-/**
- * Parameters required to create a session.
- * @interface
- */
-interface ISessionParams extends ISessionSchema {
-    clientId: string;
-    logger: ILogger;
-    swarm: ISwarm;
-}
-/**
- * Schema for session data.
- * @interface
- */
-interface ISessionSchema {
-}
-/**
- * Function type for sending messages.
- * @typedef {function} SendMessageFn
- * @param {IOutgoingMessage} outgoing - The outgoing message.
- * @returns {Promise<void> | void}
- */
-type SendMessageFn$1 = (outgoing: IOutgoingMessage) => Promise<void> | void;
-/**
- * Function type for receiving messages.
- * @typedef {function} ReceiveMessageFn
- * @param {IIncomingMessage} incoming - The incoming message.
- * @returns {Promise<void> | void}
- */
-type ReceiveMessageFn = (incoming: IIncomingMessage) => Promise<void> | void;
-/**
- * Interface for a session.
- * @interface
- */
-interface ISession {
-    /**
-     * Emit a message.
-     * @param {string} message - The message to emit.
-     * @returns {Promise<void>}
-     */
-    emit(message: string): Promise<void>;
-    /**
-     * Execute a command.
-     * @param {string} content - The content to execute.
-     * @returns {Promise<string>}
-     */
-    execute(content: string): Promise<string>;
-    /**
-     * Connect to a message sender.
-     * @param {SendMessageFn} connector - The function to send messages.
-     * @returns {ReceiveMessageFn}
-     */
-    connect(connector: SendMessageFn$1): ReceiveMessageFn;
-    /**
-     * Commit tool output.
-     * @param {string} content - The content to commit.
-     * @returns {Promise<void>}
-     */
-    commitToolOutput(content: string): Promise<void>;
-    /**
-     * Commit user message without answer
-     * @param {string} message - The message to commit.
-     * @returns {Promise<void>}
-     */
-    commitUserMessage: (message: string) => Promise<void>;
-    /**
-     * Commit a system message.
-     * @param {string} message - The message to commit.
-     * @returns {Promise<void>}
-     */
-    commitSystemMessage(message: string): Promise<void>;
-}
-/**
- * Type for session ID.
- * @typedef {string} SessionId
- */
-type SessionId = string;
-/**
- * Type for session mode.
- * @typedef {"session" | "makeConnection" | "complete"} SessionMode
- */
-type SessionMode = "session" | "makeConnection" | "complete";
-
 /**
  * ClientSession class implements the ISession interface.
  */
@@ -944,7 +958,7 @@ declare class ClientSession implements ISession {
      * @param {boolean} [noEmit=false] - Whether to emit the output or not.
      * @returns {Promise<string>} - The output of the execution.
      */
-    execute: (message: string, noEmit?: boolean) => Promise<string>;
+    execute: (message: string, mode: ExecutionMode, noEmit?: boolean) => Promise<string>;
     /**
      * Commits tool output.
      * @param {string} content - The content to commit.
@@ -997,7 +1011,7 @@ declare class SessionConnectionService implements ISession {
      * @param {string} content - The content to execute.
      * @returns {Promise<string>} A promise that resolves with the execution result.
      */
-    execute: (content: string) => Promise<string>;
+    execute: (content: string, mode: ExecutionMode) => Promise<string>;
     /**
      * Connects to the session using the provided connector.
      * @param {SendMessageFn} connector - The function to send messages.
@@ -1057,7 +1071,7 @@ declare class AgentPublicService implements TAgentConnectionService {
      * @param {AgentName} agentName - The name of the agent.
      * @returns {Promise<unknown>} The execution result.
      */
-    execute: (input: string, clientId: string, agentName: AgentName) => Promise<void>;
+    execute: (input: string, mode: ExecutionMode, clientId: string, agentName: AgentName) => Promise<void>;
     /**
      * Waits for the agent's output.
      * @param {string} clientId - The client ID.
@@ -1174,7 +1188,7 @@ declare class SessionPublicService implements TSessionConnectionService {
      * @param {SwarmName} swarmName - The swarm name.
      * @returns {Promise<void>}
      */
-    execute: (content: string, clientId: string, swarmName: SwarmName) => Promise<string>;
+    execute: (content: string, mode: ExecutionMode, clientId: string, swarmName: SwarmName) => Promise<string>;
     /**
      * Connects to the session.
      * @param {SendMessageFn} connector - The function to send messages.