npm - agent-swarm-kit - Versions diffs - 1.0.150 → 1.0.152 - Mend

agent-swarm-kit 1.0.150 → 1.0.152

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/build/index.cjs CHANGED Viewed

@@ -1501,7 +1501,7 @@ var CC_TOOL_CALL_EXCEPTION_RECOMPLETE_PROMPT = functoolsKit.str.newline("Please
 /**
  * @description custom function to fix the model
  */
-var CC_TOOL_CALL_EXCEPTION_CUSTOM_FUNCTION = function () { return Promise.resolve(); };
+var CC_TOOL_CALL_EXCEPTION_CUSTOM_FUNCTION = function () { return Promise.resolve(null); };
 /**
  * @description When the model output is empty just say hello to the customer
  */
@@ -1546,7 +1546,8 @@ var CC_AGENT_HISTORY_FILTER = function (agentName) {
 };
 var CC_AGENT_OUTPUT_TRANSFORM = removeXmlTags;
 var CC_KEEP_MESSAGES = 15;
-var CC_MAX_TOOLS = 1;
+var CC_MAX_TOOL_CALLS = 1;
+var CC_AGENT_MAP_TOOLS = function (tools) { return tools; };
 var CC_GET_AGENT_HISTORY_ADAPTER = function () { return HistoryAdapter; };
 var CC_GET_CLIENT_LOGGER_ADAPTER = function () { return LoggerAdapter; };
 var CC_AGENT_OUTPUT_MAP = function (message) { return message; };
@@ -1559,7 +1560,9 @@ var CC_LOGGER_ENABLE_LOG = true;
 var CC_LOGGER_ENABLE_CONSOLE = false;
 var CC_RESQUE_STRATEGY;
 var CC_NAME_TO_TITLE = nameToTitle;
-var CC_FN_PLANTUML = function () { return Promise.resolve(""); };
+var CC_FN_PLANTUML = function () {
+    return Promise.resolve("");
+};
 var CC_PROCESS_UUID = functoolsKit.randomString();
 var CC_BANHAMMER_PLACEHOLDER = "You have been banned! To continue conversation, please contact the administrator.";
 var GLOBAL_CONFIG = {
@@ -1567,7 +1570,8 @@ var GLOBAL_CONFIG = {
     CC_TOOL_CALL_EXCEPTION_RECOMPLETE_PROMPT: CC_TOOL_CALL_EXCEPTION_RECOMPLETE_PROMPT,
     CC_EMPTY_OUTPUT_PLACEHOLDERS: CC_EMPTY_OUTPUT_PLACEHOLDERS,
     CC_KEEP_MESSAGES: CC_KEEP_MESSAGES,
-    CC_MAX_TOOLS: CC_MAX_TOOLS,
+    CC_MAX_TOOL_CALLS: CC_MAX_TOOL_CALLS,
+    CC_AGENT_MAP_TOOLS: CC_AGENT_MAP_TOOLS,
     CC_GET_AGENT_HISTORY_ADAPTER: CC_GET_AGENT_HISTORY_ADAPTER,
     CC_GET_CLIENT_LOGGER_ADAPTER: CC_GET_CLIENT_LOGGER_ADAPTER,
     CC_SWARM_AGENT_CHANGED: CC_SWARM_AGENT_CHANGED,
@@ -1957,21 +1961,22 @@ var EXECUTE_FN = function (incoming, mode, self) { return __awaiter(void 0, void
                 return [4 /*yield*/, self.params.map(rawMessage, self.params.clientId, self.params.agentName)];
             case 3:
                 message = _g.sent();
-                if (!message.tool_calls) return [3 /*break*/, 9];
+                if (!message.tool_calls) return [3 /*break*/, 10];
                 GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
                     self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " tool call begin"));
-                toolCalls_1 = message.tool_calls
-                    .map(function (call) {
-                    var _a, _b;
-                    return ({
-                        function: call.function,
-                        id: (_a = call.id) !== null && _a !== void 0 ? _a : functoolsKit.randomString(),
-                        type: (_b = call.type) !== null && _b !== void 0 ? _b : "function",
-                    });
-                })
-                    .slice(0, GLOBAL_CONFIG.CC_MAX_TOOLS);
-                return [4 /*yield*/, self.params.history.push(__assign(__assign({}, message), { agentName: self.params.agentName }))];
+                return [4 /*yield*/, self.params.mapToolCalls(message.tool_calls.map(function (call) {
+                        var _a, _b;
+                        return ({
+                            function: call.function,
+                            id: (_a = call.id) !== null && _a !== void 0 ? _a : functoolsKit.randomString(),
+                            type: (_b = call.type) !== null && _b !== void 0 ? _b : "function",
+                        });
+                    }), self.params.clientId, self.params.agentName)];
             case 4:
+                toolCalls_1 = _g.sent();
+                toolCalls_1 = toolCalls_1.slice(0, self.params.maxToolCalls);
+                return [4 /*yield*/, self.params.history.push(__assign(__assign({}, message), { agentName: self.params.agentName }))];
+            case 5:
                 _g.sent();
                 lastToolStatusRef = Promise.resolve(null);
                 _a = __read(functoolsKit.createAwaiter(), 2), runAwaiter_1 = _a[0], run = _a[1].resolve;
@@ -2108,19 +2113,19 @@ var EXECUTE_FN = function (incoming, mode, self) { return __awaiter(void 0, void
                     });
                 };
                 idx = 0;
-                _g.label = 5;
-            case 5:
-                if (!(idx !== toolCalls_1.length)) return [3 /*break*/, 8];
-                return [5 /*yield**/, _loop_1(idx)];
+                _g.label = 6;
             case 6:
+                if (!(idx !== toolCalls_1.length)) return [3 /*break*/, 9];
+                return [5 /*yield**/, _loop_1(idx)];
+            case 7:
                 state_1 = _g.sent();
                 if (typeof state_1 === "object")
                     return [2 /*return*/, state_1.value];
-                _g.label = 7;
-            case 7:
-                idx++;
-                return [3 /*break*/, 5];
+                _g.label = 8;
             case 8:
+                idx++;
+                return [3 /*break*/, 6];
+            case 9:
                 lastToolStatusRef.finally(function () {
                     var _a;
                     ((_a = self.params.callbacks) === null || _a === void 0 ? void 0 : _a.onAfterToolCalls) &&
@@ -2128,35 +2133,35 @@ var EXECUTE_FN = function (incoming, mode, self) { return __awaiter(void 0, void
                 });
                 run(true);
                 return [2 /*return*/];
-            case 9:
+            case 10:
                 if (!message.tool_calls) {
                     GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
                         self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " execute no tool calls detected"));
                 }
                 return [4 /*yield*/, self.params.transform(message.content, self.params.clientId, self.params.agentName)];
-            case 10:
+            case 11:
                 result = _g.sent();
                 return [4 /*yield*/, self.params.history.push(__assign(__assign({}, message), { agentName: self.params.agentName }))];
-            case 11:
+            case 12:
                 _g.sent();
                 validation = null;
                 return [4 /*yield*/, self.params.validate(result)];
-            case 12:
-                if (!(validation = _g.sent())) return [3 /*break*/, 15];
+            case 13:
+                if (!(validation = _g.sent())) return [3 /*break*/, 16];
                 GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
                     self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " execute invalid tool call detected: ").concat(validation), { result: result });
                 return [4 /*yield*/, self._resurrectModel(mode, "Invalid model output: ".concat(result))];
-            case 13:
+            case 14:
                 result1 = _g.sent();
                 return [4 /*yield*/, self._emitOutput(mode, result1)];
-            case 14:
+            case 15:
                 _g.sent();
                 return [2 /*return*/];
-            case 15:
+            case 16:
                 GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
                     self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " execute end result=").concat(result));
                 return [4 /*yield*/, self._emitOutput(mode, result)];
-            case 16:
+            case 17:
                 _g.sent();
                 return [2 /*return*/];
         }
@@ -2300,7 +2305,7 @@ var ClientAgent = /** @class */ (function () {
      */
     ClientAgent.prototype._resurrectModel = function (mode_1) {
         return __awaiter(this, arguments, void 0, function (mode, reason) {
-            var rawMessage, content, message, result, validation, content;
+            var placeholder, rawMessage, message, result, validation;
             var _a;
             if (reason === void 0) { reason = "unknown"; }
             return __generator(this, function (_b) {
@@ -2309,27 +2314,22 @@ var ClientAgent = /** @class */ (function () {
                         GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
                             this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " _resurrectModel"));
                         console.warn("agent-swarm model ressurect for agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " strategy=").concat(GLOBAL_CONFIG.CC_RESQUE_STRATEGY, " reason=").concat(reason));
+                        placeholder = createPlaceholder();
                         this.params.onResurrect &&
                             this.params.onResurrect(this.params.clientId, this.params.agentName, mode, reason);
-                        if (!(GLOBAL_CONFIG.CC_RESQUE_STRATEGY === "recomplete")) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.params.history.push({
-                                role: "user",
-                                mode: "tool",
-                                agentName: this.params.agentName,
-                                content: GLOBAL_CONFIG.CC_TOOL_CALL_EXCEPTION_RECOMPLETE_PROMPT,
-                            })];
-                    case 1:
-                        _b.sent();
-                        return [3 /*break*/, 8];
-                    case 2:
-                        if (!(GLOBAL_CONFIG.CC_RESQUE_STRATEGY === "flush")) return [3 /*break*/, 5];
+                        if (GLOBAL_CONFIG.CC_RESQUE_STRATEGY === "recomplete") {
+                            console.warn("agent-swarm model ressurect did not solved the problem (still being called after recomplete patch) for agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " strategy=").concat(GLOBAL_CONFIG.CC_RESQUE_STRATEGY));
+                        }
+                        else if (GLOBAL_CONFIG.CC_RESQUE_STRATEGY === "custom") {
+                            console.warn("agent-swarm model ressurect did not solved the problem (still being called after patchedMessage emit) for agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " strategy=").concat(GLOBAL_CONFIG.CC_RESQUE_STRATEGY));
+                        }
                         return [4 /*yield*/, this.params.history.push({
                                 role: "resque",
                                 mode: "tool",
                                 agentName: this.params.agentName,
-                                content: reason || "Unknown error",
+                                content: reason || "_resurrectModel call",
                             })];
-                    case 3:
+                    case 1:
                         _b.sent();
                         return [4 /*yield*/, this.params.history.push({
                                 role: "user",
@@ -2337,85 +2337,57 @@ var ClientAgent = /** @class */ (function () {
                                 agentName: this.params.agentName,
                                 content: GLOBAL_CONFIG.CC_TOOL_CALL_EXCEPTION_FLUSH_PROMPT,
                             })];
-                    case 4:
-                        _b.sent();
-                        return [3 /*break*/, 8];
-                    case 5:
-                        if (!(GLOBAL_CONFIG.CC_RESQUE_STRATEGY === "custom")) return [3 /*break*/, 7];
-                        return [4 /*yield*/, GLOBAL_CONFIG.CC_TOOL_CALL_EXCEPTION_CUSTOM_FUNCTION(this.params.clientId, this.params.agentName)];
-                    case 6:
+                    case 2:
                         _b.sent();
-                        return [3 /*break*/, 8];
-                    case 7: throw new Error("agent-swarm _resurrectModel invalid strategy value=".concat(GLOBAL_CONFIG.CC_RESQUE_STRATEGY, " agentName=").concat(this.params.agentName, " clientId=").concat(this.params.clientId));
-                    case 8: return [4 /*yield*/, this.getCompletion(mode)];
-                    case 9:
+                        return [4 /*yield*/, this.getCompletion(mode)];
+                    case 3:
                         rawMessage = _b.sent();
-                        if (!((_a = rawMessage.tool_calls) === null || _a === void 0 ? void 0 : _a.length)) return [3 /*break*/, 13];
+                        if (!((_a = rawMessage.tool_calls) === null || _a === void 0 ? void 0 : _a.length)) return [3 /*break*/, 6];
                         GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                            this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " _resurrectModel failed due to tool_calls"));
-                        console.warn("agent-swarm model ressurect did not solved the problem (tool_calls) for agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " strategy=").concat(GLOBAL_CONFIG.CC_RESQUE_STRATEGY));
-                        content = createPlaceholder();
+                            this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " _resurrectModel should not emit tool_calls"));
+                        console.warn("agent-swarm _resurrectModel should not emit tool_calls for agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " strategy=").concat(GLOBAL_CONFIG.CC_RESQUE_STRATEGY));
                         return [4 /*yield*/, this.params.history.push({
                                 role: "resque",
                                 mode: "tool",
                                 agentName: this.params.agentName,
-                                content: reason || "Unknown error",
-                            })];
-                    case 10:
-                        _b.sent();
-                        return [4 /*yield*/, this.params.history.push({
-                                agentName: this.params.agentName,
-                                role: "assistant",
-                                mode: "tool",
-                                content: content,
+                                content: "_resurrectModel should not emit tool calls",
                             })];
-                    case 11:
+                    case 4:
                         _b.sent();
                         return [4 /*yield*/, this._resqueSubject.next(MODEL_RESQUE_SYMBOL)];
-                    case 12:
+                    case 5:
                         _b.sent();
-                        return [2 /*return*/, content];
-                    case 13: return [4 /*yield*/, this.params.map(rawMessage, this.params.clientId, this.params.agentName)];
-                    case 14:
+                        return [2 /*return*/, placeholder];
+                    case 6: return [4 /*yield*/, this.params.map(rawMessage, this.params.clientId, this.params.agentName)];
+                    case 7:
                         message = _b.sent();
                         return [4 /*yield*/, this.params.transform(message.content, this.params.clientId, this.params.agentName)];
-                    case 15:
+                    case 8:
                         result = _b.sent();
                         validation = null;
                         return [4 /*yield*/, this.params.validate(result)];
-                    case 16:
-                        if (!(validation = _b.sent())) return [3 /*break*/, 20];
+                    case 9:
+                        if (!(validation = _b.sent())) return [3 /*break*/, 11];
                         GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
                             this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " _resurrectModel validation error: ").concat(validation));
-                        console.warn("agent-swarm model ressurect did not solved the problem for agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " strategy=").concat(GLOBAL_CONFIG.CC_RESQUE_STRATEGY));
-                        content = createPlaceholder();
+                        console.warn("agent-swarm model ressurect did not solved the problem for agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " strategy=").concat(GLOBAL_CONFIG.CC_RESQUE_STRATEGY, " validation=").concat(validation));
                         return [4 /*yield*/, this.params.history.push({
                                 role: "resque",
                                 mode: "tool",
                                 agentName: this.params.agentName,
-                                content: reason || "Unknown error",
+                                content: "_resurrectModel failed validation: ".concat(validation),
                             })];
-                    case 17:
-                        _b.sent();
-                        return [4 /*yield*/, this.params.history.push({
-                                agentName: this.params.agentName,
-                                role: "assistant",
-                                mode: "tool",
-                                content: content,
-                            })];
-                    case 18:
-                        _b.sent();
-                        return [4 /*yield*/, this._resqueSubject.next(MODEL_RESQUE_SYMBOL)];
-                    case 19:
+                    case 10:
                         _b.sent();
-                        return [2 /*return*/, content];
-                    case 20: return [4 /*yield*/, this.params.history.push(__assign(__assign({}, message), { agentName: this.params.agentName }))];
-                    case 21:
+                        return [3 /*break*/, 13];
+                    case 11: return [4 /*yield*/, this.params.history.push(__assign(__assign({}, message), { agentName: this.params.agentName }))];
+                    case 12:
                         _b.sent();
-                        return [4 /*yield*/, this._resqueSubject.next(MODEL_RESQUE_SYMBOL)];
-                    case 22:
+                        _b.label = 13;
+                    case 13: return [4 /*yield*/, this._resqueSubject.next(MODEL_RESQUE_SYMBOL)];
+                    case 14:
                         _b.sent();
-                        return [2 /*return*/, result];
+                        return [2 /*return*/, placeholder];
                 }
             });
         });
@@ -2443,16 +2415,16 @@ var ClientAgent = /** @class */ (function () {
      */
     ClientAgent.prototype.getCompletion = function (mode) {
         return __awaiter(this, void 0, void 0, function () {
-            var messages, args, output;
-            var _a, _b, _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var messages, args, output, message, result, validation, messages_1, args_1, output_1, output_2;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            return __generator(this, function (_k) {
+                switch (_k.label) {
                     case 0:
                         GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
                             this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " getCompletion"));
                         return [4 /*yield*/, this.params.history.toArrayForAgent(this.params.prompt, this.params.system)];
                     case 1:
-                        messages = _d.sent();
+                        messages = _k.sent();
                         args = {
                             clientId: this.params.clientId,
                             agentName: this.params.agentName,
@@ -2464,9 +2436,63 @@ var ClientAgent = /** @class */ (function () {
                         };
                         return [4 /*yield*/, this.params.completion.getCompletion(args)];
                     case 2:
-                        output = _d.sent();
-                        ((_b = this.params.completion.callbacks) === null || _b === void 0 ? void 0 : _b.onComplete) &&
-                            ((_c = this.params.completion.callbacks) === null || _c === void 0 ? void 0 : _c.onComplete(args, output));
+                        output = _k.sent();
+                        return [4 /*yield*/, this.params.map(output, this.params.clientId, this.params.agentName)];
+                    case 3:
+                        message = _k.sent();
+                        return [4 /*yield*/, this.params.transform(message.content, this.params.clientId, this.params.agentName)];
+                    case 4:
+                        result = _k.sent();
+                        if ((_b = message.tool_calls) === null || _b === void 0 ? void 0 : _b.length) {
+                            return [2 /*return*/, __assign(__assign({}, output), { content: output.content || "" })];
+                        }
+                        return [4 /*yield*/, this.params.validate(result)];
+                    case 5:
+                        validation = _k.sent();
+                        if (!!validation) return [3 /*break*/, 6];
+                        ((_c = this.params.completion.callbacks) === null || _c === void 0 ? void 0 : _c.onComplete) &&
+                            ((_d = this.params.completion.callbacks) === null || _d === void 0 ? void 0 : _d.onComplete(args, output));
+                        return [2 /*return*/, __assign(__assign({}, output), { content: output.content || "" })];
+                    case 6:
+                        if (!(GLOBAL_CONFIG.CC_RESQUE_STRATEGY === "recomplete")) return [3 /*break*/, 10];
+                        console.warn("agent-swarm model using recomplete resurrect for agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " validation=").concat(validation));
+                        return [4 /*yield*/, this.params.history.push({
+                                role: "user",
+                                mode: "tool",
+                                agentName: this.params.agentName,
+                                content: GLOBAL_CONFIG.CC_TOOL_CALL_EXCEPTION_RECOMPLETE_PROMPT,
+                            })];
+                    case 7:
+                        _k.sent();
+                        return [4 /*yield*/, this.params.history.toArrayForAgent(this.params.prompt, this.params.system)];
+                    case 8:
+                        messages_1 = _k.sent();
+                        args_1 = {
+                            clientId: this.params.clientId,
+                            agentName: this.params.agentName,
+                            messages: messages_1,
+                            mode: mode,
+                            tools: (_e = this.params.tools) === null || _e === void 0 ? void 0 : _e.map(function (t) {
+                                return lodashEs.omit(t, "toolName", "docNote", "call", "validate", "callbacks");
+                            }),
+                        };
+                        return [4 /*yield*/, this.params.completion.getCompletion(args_1)];
+                    case 9:
+                        output_1 = _k.sent();
+                        return [2 /*return*/, __assign(__assign({}, output_1), { content: output_1.content || "" })];
+                    case 10:
+                        if (!(GLOBAL_CONFIG.CC_RESQUE_STRATEGY === "custom")) return [3 /*break*/, 12];
+                        console.warn("agent-swarm model using custom resurrect for agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " validation=").concat(validation));
+                        return [4 /*yield*/, GLOBAL_CONFIG.CC_TOOL_CALL_EXCEPTION_CUSTOM_FUNCTION(this.params.clientId, this.params.agentName)];
+                    case 11:
+                        output_2 = _k.sent();
+                        ((_f = this.params.completion.callbacks) === null || _f === void 0 ? void 0 : _f.onComplete) &&
+                            ((_g = this.params.completion.callbacks) === null || _g === void 0 ? void 0 : _g.onComplete(args, output_2));
+                        return [2 /*return*/, output_2];
+                    case 12:
+                        console.warn("agent-swarm model completion pending resurrect for agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " strategy=").concat(GLOBAL_CONFIG.CC_RESQUE_STRATEGY, " validation=").concat(validation));
+                        ((_h = this.params.completion.callbacks) === null || _h === void 0 ? void 0 : _h.onComplete) &&
+                            ((_j = this.params.completion.callbacks) === null || _j === void 0 ? void 0 : _j.onComplete(args, output));
                         return [2 /*return*/, __assign(__assign({}, output), { content: output.content || "" })];
                 }
             });
@@ -2786,7 +2812,7 @@ var AgentConnectionService = /** @class */ (function () {
             var _b = __read(_a, 2), clientId = _b[0], agentName = _b[1];
             return "".concat(clientId, "-").concat(agentName);
         }, function (clientId, agentName) {
-            var _a = _this.agentSchemaService.get(agentName), prompt = _a.prompt, system = _a.system, tools = _a.tools, _b = _a.transform, transform = _b === void 0 ? GLOBAL_CONFIG.CC_AGENT_OUTPUT_TRANSFORM : _b, _c = _a.map, map = _c === void 0 ? GLOBAL_CONFIG.CC_AGENT_OUTPUT_MAP : _c, callbacks = _a.callbacks, storages = _a.storages, states = _a.states, completionName = _a.completion, _d = _a.validate, validate = _d === void 0 ? validateDefault : _d;
+            var _a = _this.agentSchemaService.get(agentName), prompt = _a.prompt, system = _a.system, tools = _a.tools, _b = _a.transform, transform = _b === void 0 ? GLOBAL_CONFIG.CC_AGENT_OUTPUT_TRANSFORM : _b, _c = _a.map, map = _c === void 0 ? GLOBAL_CONFIG.CC_AGENT_OUTPUT_MAP : _c, _d = _a.maxToolCalls, maxToolCalls = _d === void 0 ? GLOBAL_CONFIG.CC_MAX_TOOL_CALLS : _d, _e = _a.mapToolCalls, mapToolCalls = _e === void 0 ? GLOBAL_CONFIG.CC_AGENT_MAP_TOOLS : _e, callbacks = _a.callbacks, storages = _a.storages, states = _a.states, completionName = _a.completion, _f = _a.validate, validate = _f === void 0 ? validateDefault : _f;
             var completion = _this.completionSchemaService.get(completionName);
             _this.sessionValidationService.addAgentUsage(clientId, agentName);
             storages === null || storages === void 0 ? void 0 : storages.forEach(function (storageName) {
@@ -2799,7 +2825,7 @@ var AgentConnectionService = /** @class */ (function () {
                     .getStateRef(clientId, stateName)
                     .waitForInit();
             });
-            return new ClientAgent(__assign({ clientId: clientId, agentName: agentName, validate: validate, logger: _this.loggerService, bus: _this.busService, history: _this.historyConnectionService.getHistory(clientId, agentName), prompt: prompt, system: system, transform: transform, map: map, tools: tools === null || tools === void 0 ? void 0 : tools.map(_this.toolSchemaService.get), completion: completion }, callbacks));
+            return new ClientAgent(__assign({ clientId: clientId, agentName: agentName, validate: validate, maxToolCalls: maxToolCalls, mapToolCalls: mapToolCalls, logger: _this.loggerService, bus: _this.busService, history: _this.historyConnectionService.getHistory(clientId, agentName), prompt: prompt, system: system, transform: transform, map: map, tools: tools === null || tools === void 0 ? void 0 : tools.map(_this.toolSchemaService.get), completion: completion }, callbacks));
         });
         /**
          * Executes an input command.
@@ -3052,7 +3078,7 @@ var ClientHistory = /** @class */ (function () {
         });
     };
     /**
-     * Pushes a message to the history.
+     * Pop a message from the history.
      * @returns {Promise<IModelMessage | null>}
      */
     ClientHistory.prototype.pop = function () {

package/build/index.mjs CHANGED Viewed

@@ -1499,7 +1499,7 @@ var CC_TOOL_CALL_EXCEPTION_RECOMPLETE_PROMPT = str.newline("Please analyze the l
 /**
  * @description custom function to fix the model
  */
-var CC_TOOL_CALL_EXCEPTION_CUSTOM_FUNCTION = function () { return Promise.resolve(); };
+var CC_TOOL_CALL_EXCEPTION_CUSTOM_FUNCTION = function () { return Promise.resolve(null); };
 /**
  * @description When the model output is empty just say hello to the customer
  */
@@ -1544,7 +1544,8 @@ var CC_AGENT_HISTORY_FILTER = function (agentName) {
 };
 var CC_AGENT_OUTPUT_TRANSFORM = removeXmlTags;
 var CC_KEEP_MESSAGES = 15;
-var CC_MAX_TOOLS = 1;
+var CC_MAX_TOOL_CALLS = 1;
+var CC_AGENT_MAP_TOOLS = function (tools) { return tools; };
 var CC_GET_AGENT_HISTORY_ADAPTER = function () { return HistoryAdapter; };
 var CC_GET_CLIENT_LOGGER_ADAPTER = function () { return LoggerAdapter; };
 var CC_AGENT_OUTPUT_MAP = function (message) { return message; };
@@ -1557,7 +1558,9 @@ var CC_LOGGER_ENABLE_LOG = true;
 var CC_LOGGER_ENABLE_CONSOLE = false;
 var CC_RESQUE_STRATEGY;
 var CC_NAME_TO_TITLE = nameToTitle;
-var CC_FN_PLANTUML = function () { return Promise.resolve(""); };
+var CC_FN_PLANTUML = function () {
+    return Promise.resolve("");
+};
 var CC_PROCESS_UUID = randomString();
 var CC_BANHAMMER_PLACEHOLDER = "You have been banned! To continue conversation, please contact the administrator.";
 var GLOBAL_CONFIG = {
@@ -1565,7 +1568,8 @@ var GLOBAL_CONFIG = {
     CC_TOOL_CALL_EXCEPTION_RECOMPLETE_PROMPT: CC_TOOL_CALL_EXCEPTION_RECOMPLETE_PROMPT,
     CC_EMPTY_OUTPUT_PLACEHOLDERS: CC_EMPTY_OUTPUT_PLACEHOLDERS,
     CC_KEEP_MESSAGES: CC_KEEP_MESSAGES,
-    CC_MAX_TOOLS: CC_MAX_TOOLS,
+    CC_MAX_TOOL_CALLS: CC_MAX_TOOL_CALLS,
+    CC_AGENT_MAP_TOOLS: CC_AGENT_MAP_TOOLS,
     CC_GET_AGENT_HISTORY_ADAPTER: CC_GET_AGENT_HISTORY_ADAPTER,
     CC_GET_CLIENT_LOGGER_ADAPTER: CC_GET_CLIENT_LOGGER_ADAPTER,
     CC_SWARM_AGENT_CHANGED: CC_SWARM_AGENT_CHANGED,
@@ -1955,21 +1959,22 @@ var EXECUTE_FN = function (incoming, mode, self) { return __awaiter(void 0, void
                 return [4 /*yield*/, self.params.map(rawMessage, self.params.clientId, self.params.agentName)];
             case 3:
                 message = _g.sent();
-                if (!message.tool_calls) return [3 /*break*/, 9];
+                if (!message.tool_calls) return [3 /*break*/, 10];
                 GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
                     self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " tool call begin"));
-                toolCalls_1 = message.tool_calls
-                    .map(function (call) {
-                    var _a, _b;
-                    return ({
-                        function: call.function,
-                        id: (_a = call.id) !== null && _a !== void 0 ? _a : randomString(),
-                        type: (_b = call.type) !== null && _b !== void 0 ? _b : "function",
-                    });
-                })
-                    .slice(0, GLOBAL_CONFIG.CC_MAX_TOOLS);
-                return [4 /*yield*/, self.params.history.push(__assign(__assign({}, message), { agentName: self.params.agentName }))];
+                return [4 /*yield*/, self.params.mapToolCalls(message.tool_calls.map(function (call) {
+                        var _a, _b;
+                        return ({
+                            function: call.function,
+                            id: (_a = call.id) !== null && _a !== void 0 ? _a : randomString(),
+                            type: (_b = call.type) !== null && _b !== void 0 ? _b : "function",
+                        });
+                    }), self.params.clientId, self.params.agentName)];
             case 4:
+                toolCalls_1 = _g.sent();
+                toolCalls_1 = toolCalls_1.slice(0, self.params.maxToolCalls);
+                return [4 /*yield*/, self.params.history.push(__assign(__assign({}, message), { agentName: self.params.agentName }))];
+            case 5:
                 _g.sent();
                 lastToolStatusRef = Promise.resolve(null);
                 _a = __read(createAwaiter(), 2), runAwaiter_1 = _a[0], run = _a[1].resolve;
@@ -2106,19 +2111,19 @@ var EXECUTE_FN = function (incoming, mode, self) { return __awaiter(void 0, void
                     });
                 };
                 idx = 0;
-                _g.label = 5;
-            case 5:
-                if (!(idx !== toolCalls_1.length)) return [3 /*break*/, 8];
-                return [5 /*yield**/, _loop_1(idx)];
+                _g.label = 6;
             case 6:
+                if (!(idx !== toolCalls_1.length)) return [3 /*break*/, 9];
+                return [5 /*yield**/, _loop_1(idx)];
+            case 7:
                 state_1 = _g.sent();
                 if (typeof state_1 === "object")
                     return [2 /*return*/, state_1.value];
-                _g.label = 7;
-            case 7:
-                idx++;
-                return [3 /*break*/, 5];
+                _g.label = 8;
             case 8:
+                idx++;
+                return [3 /*break*/, 6];
+            case 9:
                 lastToolStatusRef.finally(function () {
                     var _a;
                     ((_a = self.params.callbacks) === null || _a === void 0 ? void 0 : _a.onAfterToolCalls) &&
@@ -2126,35 +2131,35 @@ var EXECUTE_FN = function (incoming, mode, self) { return __awaiter(void 0, void
                 });
                 run(true);
                 return [2 /*return*/];
-            case 9:
+            case 10:
                 if (!message.tool_calls) {
                     GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
                         self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " execute no tool calls detected"));
                 }
                 return [4 /*yield*/, self.params.transform(message.content, self.params.clientId, self.params.agentName)];
-            case 10:
+            case 11:
                 result = _g.sent();
                 return [4 /*yield*/, self.params.history.push(__assign(__assign({}, message), { agentName: self.params.agentName }))];
-            case 11:
+            case 12:
                 _g.sent();
                 validation = null;
                 return [4 /*yield*/, self.params.validate(result)];
-            case 12:
-                if (!(validation = _g.sent())) return [3 /*break*/, 15];
+            case 13:
+                if (!(validation = _g.sent())) return [3 /*break*/, 16];
                 GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
                     self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " execute invalid tool call detected: ").concat(validation), { result: result });
                 return [4 /*yield*/, self._resurrectModel(mode, "Invalid model output: ".concat(result))];
-            case 13:
+            case 14:
                 result1 = _g.sent();
                 return [4 /*yield*/, self._emitOutput(mode, result1)];
-            case 14:
+            case 15:
                 _g.sent();
                 return [2 /*return*/];
-            case 15:
+            case 16:
                 GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
                     self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " execute end result=").concat(result));
                 return [4 /*yield*/, self._emitOutput(mode, result)];
-            case 16:
+            case 17:
                 _g.sent();
                 return [2 /*return*/];
         }
@@ -2298,7 +2303,7 @@ var ClientAgent = /** @class */ (function () {
      */
     ClientAgent.prototype._resurrectModel = function (mode_1) {
         return __awaiter(this, arguments, void 0, function (mode, reason) {
-            var rawMessage, content, message, result, validation, content;
+            var placeholder, rawMessage, message, result, validation;
             var _a;
             if (reason === void 0) { reason = "unknown"; }
             return __generator(this, function (_b) {
@@ -2307,27 +2312,22 @@ var ClientAgent = /** @class */ (function () {
                         GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
                             this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " _resurrectModel"));
                         console.warn("agent-swarm model ressurect for agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " strategy=").concat(GLOBAL_CONFIG.CC_RESQUE_STRATEGY, " reason=").concat(reason));
+                        placeholder = createPlaceholder();
                         this.params.onResurrect &&
                             this.params.onResurrect(this.params.clientId, this.params.agentName, mode, reason);
-                        if (!(GLOBAL_CONFIG.CC_RESQUE_STRATEGY === "recomplete")) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.params.history.push({
-                                role: "user",
-                                mode: "tool",
-                                agentName: this.params.agentName,
-                                content: GLOBAL_CONFIG.CC_TOOL_CALL_EXCEPTION_RECOMPLETE_PROMPT,
-                            })];
-                    case 1:
-                        _b.sent();
-                        return [3 /*break*/, 8];
-                    case 2:
-                        if (!(GLOBAL_CONFIG.CC_RESQUE_STRATEGY === "flush")) return [3 /*break*/, 5];
+                        if (GLOBAL_CONFIG.CC_RESQUE_STRATEGY === "recomplete") {
+                            console.warn("agent-swarm model ressurect did not solved the problem (still being called after recomplete patch) for agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " strategy=").concat(GLOBAL_CONFIG.CC_RESQUE_STRATEGY));
+                        }
+                        else if (GLOBAL_CONFIG.CC_RESQUE_STRATEGY === "custom") {
+                            console.warn("agent-swarm model ressurect did not solved the problem (still being called after patchedMessage emit) for agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " strategy=").concat(GLOBAL_CONFIG.CC_RESQUE_STRATEGY));
+                        }
                         return [4 /*yield*/, this.params.history.push({
                                 role: "resque",
                                 mode: "tool",
                                 agentName: this.params.agentName,
-                                content: reason || "Unknown error",
+                                content: reason || "_resurrectModel call",
                             })];
-                    case 3:
+                    case 1:
                         _b.sent();
                         return [4 /*yield*/, this.params.history.push({
                                 role: "user",
@@ -2335,85 +2335,57 @@ var ClientAgent = /** @class */ (function () {
                                 agentName: this.params.agentName,
                                 content: GLOBAL_CONFIG.CC_TOOL_CALL_EXCEPTION_FLUSH_PROMPT,
                             })];
-                    case 4:
-                        _b.sent();
-                        return [3 /*break*/, 8];
-                    case 5:
-                        if (!(GLOBAL_CONFIG.CC_RESQUE_STRATEGY === "custom")) return [3 /*break*/, 7];
-                        return [4 /*yield*/, GLOBAL_CONFIG.CC_TOOL_CALL_EXCEPTION_CUSTOM_FUNCTION(this.params.clientId, this.params.agentName)];
-                    case 6:
+                    case 2:
                         _b.sent();
-                        return [3 /*break*/, 8];
-                    case 7: throw new Error("agent-swarm _resurrectModel invalid strategy value=".concat(GLOBAL_CONFIG.CC_RESQUE_STRATEGY, " agentName=").concat(this.params.agentName, " clientId=").concat(this.params.clientId));
-                    case 8: return [4 /*yield*/, this.getCompletion(mode)];
-                    case 9:
+                        return [4 /*yield*/, this.getCompletion(mode)];
+                    case 3:
                         rawMessage = _b.sent();
-                        if (!((_a = rawMessage.tool_calls) === null || _a === void 0 ? void 0 : _a.length)) return [3 /*break*/, 13];
+                        if (!((_a = rawMessage.tool_calls) === null || _a === void 0 ? void 0 : _a.length)) return [3 /*break*/, 6];
                         GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                            this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " _resurrectModel failed due to tool_calls"));
-                        console.warn("agent-swarm model ressurect did not solved the problem (tool_calls) for agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " strategy=").concat(GLOBAL_CONFIG.CC_RESQUE_STRATEGY));
-                        content = createPlaceholder();
+                            this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " _resurrectModel should not emit tool_calls"));
+                        console.warn("agent-swarm _resurrectModel should not emit tool_calls for agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " strategy=").concat(GLOBAL_CONFIG.CC_RESQUE_STRATEGY));
                         return [4 /*yield*/, this.params.history.push({
                                 role: "resque",
                                 mode: "tool",
                                 agentName: this.params.agentName,
-                                content: reason || "Unknown error",
-                            })];
-                    case 10:
-                        _b.sent();
-                        return [4 /*yield*/, this.params.history.push({
-                                agentName: this.params.agentName,
-                                role: "assistant",
-                                mode: "tool",
-                                content: content,
+                                content: "_resurrectModel should not emit tool calls",
                             })];
-                    case 11:
+                    case 4:
                         _b.sent();
                         return [4 /*yield*/, this._resqueSubject.next(MODEL_RESQUE_SYMBOL)];
-                    case 12:
+                    case 5:
                         _b.sent();
-                        return [2 /*return*/, content];
-                    case 13: return [4 /*yield*/, this.params.map(rawMessage, this.params.clientId, this.params.agentName)];
-                    case 14:
+                        return [2 /*return*/, placeholder];
+                    case 6: return [4 /*yield*/, this.params.map(rawMessage, this.params.clientId, this.params.agentName)];
+                    case 7:
                         message = _b.sent();
                         return [4 /*yield*/, this.params.transform(message.content, this.params.clientId, this.params.agentName)];
-                    case 15:
+                    case 8:
                         result = _b.sent();
                         validation = null;
                         return [4 /*yield*/, this.params.validate(result)];
-                    case 16:
-                        if (!(validation = _b.sent())) return [3 /*break*/, 20];
+                    case 9:
+                        if (!(validation = _b.sent())) return [3 /*break*/, 11];
                         GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
                             this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " _resurrectModel validation error: ").concat(validation));
-                        console.warn("agent-swarm model ressurect did not solved the problem for agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " strategy=").concat(GLOBAL_CONFIG.CC_RESQUE_STRATEGY));
-                        content = createPlaceholder();
+                        console.warn("agent-swarm model ressurect did not solved the problem for agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " strategy=").concat(GLOBAL_CONFIG.CC_RESQUE_STRATEGY, " validation=").concat(validation));
                         return [4 /*yield*/, this.params.history.push({
                                 role: "resque",
                                 mode: "tool",
                                 agentName: this.params.agentName,
-                                content: reason || "Unknown error",
+                                content: "_resurrectModel failed validation: ".concat(validation),
                             })];
-                    case 17:
-                        _b.sent();
-                        return [4 /*yield*/, this.params.history.push({
-                                agentName: this.params.agentName,
-                                role: "assistant",
-                                mode: "tool",
-                                content: content,
-                            })];
-                    case 18:
-                        _b.sent();
-                        return [4 /*yield*/, this._resqueSubject.next(MODEL_RESQUE_SYMBOL)];
-                    case 19:
+                    case 10:
                         _b.sent();
-                        return [2 /*return*/, content];
-                    case 20: return [4 /*yield*/, this.params.history.push(__assign(__assign({}, message), { agentName: this.params.agentName }))];
-                    case 21:
+                        return [3 /*break*/, 13];
+                    case 11: return [4 /*yield*/, this.params.history.push(__assign(__assign({}, message), { agentName: this.params.agentName }))];
+                    case 12:
                         _b.sent();
-                        return [4 /*yield*/, this._resqueSubject.next(MODEL_RESQUE_SYMBOL)];
-                    case 22:
+                        _b.label = 13;
+                    case 13: return [4 /*yield*/, this._resqueSubject.next(MODEL_RESQUE_SYMBOL)];
+                    case 14:
                         _b.sent();
-                        return [2 /*return*/, result];
+                        return [2 /*return*/, placeholder];
                 }
             });
         });
@@ -2441,16 +2413,16 @@ var ClientAgent = /** @class */ (function () {
      */
     ClientAgent.prototype.getCompletion = function (mode) {
         return __awaiter(this, void 0, void 0, function () {
-            var messages, args, output;
-            var _a, _b, _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var messages, args, output, message, result, validation, messages_1, args_1, output_1, output_2;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            return __generator(this, function (_k) {
+                switch (_k.label) {
                     case 0:
                         GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
                             this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " getCompletion"));
                         return [4 /*yield*/, this.params.history.toArrayForAgent(this.params.prompt, this.params.system)];
                     case 1:
-                        messages = _d.sent();
+                        messages = _k.sent();
                         args = {
                             clientId: this.params.clientId,
                             agentName: this.params.agentName,
@@ -2462,9 +2434,63 @@ var ClientAgent = /** @class */ (function () {
                         };
                         return [4 /*yield*/, this.params.completion.getCompletion(args)];
                     case 2:
-                        output = _d.sent();
-                        ((_b = this.params.completion.callbacks) === null || _b === void 0 ? void 0 : _b.onComplete) &&
-                            ((_c = this.params.completion.callbacks) === null || _c === void 0 ? void 0 : _c.onComplete(args, output));
+                        output = _k.sent();
+                        return [4 /*yield*/, this.params.map(output, this.params.clientId, this.params.agentName)];
+                    case 3:
+                        message = _k.sent();
+                        return [4 /*yield*/, this.params.transform(message.content, this.params.clientId, this.params.agentName)];
+                    case 4:
+                        result = _k.sent();
+                        if ((_b = message.tool_calls) === null || _b === void 0 ? void 0 : _b.length) {
+                            return [2 /*return*/, __assign(__assign({}, output), { content: output.content || "" })];
+                        }
+                        return [4 /*yield*/, this.params.validate(result)];
+                    case 5:
+                        validation = _k.sent();
+                        if (!!validation) return [3 /*break*/, 6];
+                        ((_c = this.params.completion.callbacks) === null || _c === void 0 ? void 0 : _c.onComplete) &&
+                            ((_d = this.params.completion.callbacks) === null || _d === void 0 ? void 0 : _d.onComplete(args, output));
+                        return [2 /*return*/, __assign(__assign({}, output), { content: output.content || "" })];
+                    case 6:
+                        if (!(GLOBAL_CONFIG.CC_RESQUE_STRATEGY === "recomplete")) return [3 /*break*/, 10];
+                        console.warn("agent-swarm model using recomplete resurrect for agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " validation=").concat(validation));
+                        return [4 /*yield*/, this.params.history.push({
+                                role: "user",
+                                mode: "tool",
+                                agentName: this.params.agentName,
+                                content: GLOBAL_CONFIG.CC_TOOL_CALL_EXCEPTION_RECOMPLETE_PROMPT,
+                            })];
+                    case 7:
+                        _k.sent();
+                        return [4 /*yield*/, this.params.history.toArrayForAgent(this.params.prompt, this.params.system)];
+                    case 8:
+                        messages_1 = _k.sent();
+                        args_1 = {
+                            clientId: this.params.clientId,
+                            agentName: this.params.agentName,
+                            messages: messages_1,
+                            mode: mode,
+                            tools: (_e = this.params.tools) === null || _e === void 0 ? void 0 : _e.map(function (t) {
+                                return omit(t, "toolName", "docNote", "call", "validate", "callbacks");
+                            }),
+                        };
+                        return [4 /*yield*/, this.params.completion.getCompletion(args_1)];
+                    case 9:
+                        output_1 = _k.sent();
+                        return [2 /*return*/, __assign(__assign({}, output_1), { content: output_1.content || "" })];
+                    case 10:
+                        if (!(GLOBAL_CONFIG.CC_RESQUE_STRATEGY === "custom")) return [3 /*break*/, 12];
+                        console.warn("agent-swarm model using custom resurrect for agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " validation=").concat(validation));
+                        return [4 /*yield*/, GLOBAL_CONFIG.CC_TOOL_CALL_EXCEPTION_CUSTOM_FUNCTION(this.params.clientId, this.params.agentName)];
+                    case 11:
+                        output_2 = _k.sent();
+                        ((_f = this.params.completion.callbacks) === null || _f === void 0 ? void 0 : _f.onComplete) &&
+                            ((_g = this.params.completion.callbacks) === null || _g === void 0 ? void 0 : _g.onComplete(args, output_2));
+                        return [2 /*return*/, output_2];
+                    case 12:
+                        console.warn("agent-swarm model completion pending resurrect for agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " strategy=").concat(GLOBAL_CONFIG.CC_RESQUE_STRATEGY, " validation=").concat(validation));
+                        ((_h = this.params.completion.callbacks) === null || _h === void 0 ? void 0 : _h.onComplete) &&
+                            ((_j = this.params.completion.callbacks) === null || _j === void 0 ? void 0 : _j.onComplete(args, output));
                         return [2 /*return*/, __assign(__assign({}, output), { content: output.content || "" })];
                 }
             });
@@ -2784,7 +2810,7 @@ var AgentConnectionService = /** @class */ (function () {
             var _b = __read(_a, 2), clientId = _b[0], agentName = _b[1];
             return "".concat(clientId, "-").concat(agentName);
         }, function (clientId, agentName) {
-            var _a = _this.agentSchemaService.get(agentName), prompt = _a.prompt, system = _a.system, tools = _a.tools, _b = _a.transform, transform = _b === void 0 ? GLOBAL_CONFIG.CC_AGENT_OUTPUT_TRANSFORM : _b, _c = _a.map, map = _c === void 0 ? GLOBAL_CONFIG.CC_AGENT_OUTPUT_MAP : _c, callbacks = _a.callbacks, storages = _a.storages, states = _a.states, completionName = _a.completion, _d = _a.validate, validate = _d === void 0 ? validateDefault : _d;
+            var _a = _this.agentSchemaService.get(agentName), prompt = _a.prompt, system = _a.system, tools = _a.tools, _b = _a.transform, transform = _b === void 0 ? GLOBAL_CONFIG.CC_AGENT_OUTPUT_TRANSFORM : _b, _c = _a.map, map = _c === void 0 ? GLOBAL_CONFIG.CC_AGENT_OUTPUT_MAP : _c, _d = _a.maxToolCalls, maxToolCalls = _d === void 0 ? GLOBAL_CONFIG.CC_MAX_TOOL_CALLS : _d, _e = _a.mapToolCalls, mapToolCalls = _e === void 0 ? GLOBAL_CONFIG.CC_AGENT_MAP_TOOLS : _e, callbacks = _a.callbacks, storages = _a.storages, states = _a.states, completionName = _a.completion, _f = _a.validate, validate = _f === void 0 ? validateDefault : _f;
             var completion = _this.completionSchemaService.get(completionName);
             _this.sessionValidationService.addAgentUsage(clientId, agentName);
             storages === null || storages === void 0 ? void 0 : storages.forEach(function (storageName) {
@@ -2797,7 +2823,7 @@ var AgentConnectionService = /** @class */ (function () {
                     .getStateRef(clientId, stateName)
                     .waitForInit();
             });
-            return new ClientAgent(__assign({ clientId: clientId, agentName: agentName, validate: validate, logger: _this.loggerService, bus: _this.busService, history: _this.historyConnectionService.getHistory(clientId, agentName), prompt: prompt, system: system, transform: transform, map: map, tools: tools === null || tools === void 0 ? void 0 : tools.map(_this.toolSchemaService.get), completion: completion }, callbacks));
+            return new ClientAgent(__assign({ clientId: clientId, agentName: agentName, validate: validate, maxToolCalls: maxToolCalls, mapToolCalls: mapToolCalls, logger: _this.loggerService, bus: _this.busService, history: _this.historyConnectionService.getHistory(clientId, agentName), prompt: prompt, system: system, transform: transform, map: map, tools: tools === null || tools === void 0 ? void 0 : tools.map(_this.toolSchemaService.get), completion: completion }, callbacks));
         });
         /**
          * Executes an input command.
@@ -3050,7 +3076,7 @@ var ClientHistory = /** @class */ (function () {
         });
     };
     /**
-     * Pushes a message to the history.
+     * Pop a message from the history.
      * @returns {Promise<IModelMessage | null>}
      */
     ClientHistory.prototype.pop = function () {

package/package.json CHANGED Viewed

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

package/types.d.ts CHANGED Viewed

@@ -1645,6 +1645,10 @@ interface IAgentSchemaCallbacks {
  * Interface representing the schema for an agent.
  */
 interface IAgentSchema {
+    /** The map function to filter unwanted tool calls */
+    mapToolCalls?: (tool: IToolCall[], clientId: string, agentName: AgentName) => IToolCall[] | Promise<IToolCall[]>;
+    /** The maximum quantity of tool calls per complete */
+    maxToolCalls?: number;
     /** The description for documentation */
     docDescription?: string;
     /** The name of the agent. */
@@ -2017,7 +2021,7 @@ declare class ClientHistory implements IHistory {
      */
     push(message: IModelMessage): Promise<void>;
     /**
-     * Pushes a message to the history.
+     * Pop a message from the history.
      * @returns {Promise<IModelMessage | null>}
      */
     pop(): Promise<IModelMessage | null>;
@@ -5342,7 +5346,8 @@ declare const GLOBAL_CONFIG: {
     CC_TOOL_CALL_EXCEPTION_RECOMPLETE_PROMPT: string;
     CC_EMPTY_OUTPUT_PLACEHOLDERS: string[];
     CC_KEEP_MESSAGES: number;
-    CC_MAX_TOOLS: number;
+    CC_MAX_TOOL_CALLS: number;
+    CC_AGENT_MAP_TOOLS: (tool: IToolCall[], clientId: string, agentName: AgentName) => IToolCall[] | Promise<IToolCall[]>;
     CC_GET_AGENT_HISTORY_ADAPTER: (clientId: string, agentName: AgentName) => IHistoryAdapter;
     CC_GET_CLIENT_LOGGER_ADAPTER: () => ILoggerAdapter;
     CC_SWARM_AGENT_CHANGED: (clientId: string, agentName: AgentName, swarmName: SwarmName) => Promise<void>;
@@ -5367,7 +5372,7 @@ declare const GLOBAL_CONFIG: {
     CC_FN_PLANTUML: (uml: string) => Promise<string>;
     CC_PROCESS_UUID: string;
     CC_BANHAMMER_PLACEHOLDER: string;
-    CC_TOOL_CALL_EXCEPTION_CUSTOM_FUNCTION: (clientId: string, agentName: AgentName) => Promise<void>;
+    CC_TOOL_CALL_EXCEPTION_CUSTOM_FUNCTION: (clientId: string, agentName: AgentName) => Promise<IModelMessage | null>;
 };
 declare const setConfig: (config: Partial<typeof GLOBAL_CONFIG>) => void;