agent-swarm-kit 1.0.37 → 1.0.38

package/build/index.cjs

@@ -669,18 +669,19 @@ var ClientAgent = /** @class */ (function () {
          * @param {string} content - The tool output content.
          * @returns {Promise<void>}
          */
-        this.commitToolOutput = function (content) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitToolOutput = function (toolId, content) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " commitToolOutput"), { content: content });
+                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " commitToolOutput"), { content: content, toolId: toolId });
                         this.params.onToolOutput &&
-                            this.params.onToolOutput(this.params.clientId, this.params.agentName, content);
+                            this.params.onToolOutput(toolId, this.params.clientId, this.params.agentName, content);
                         return [4 /*yield*/, this.params.history.push({
                                 role: "tool",
                                 agentName: this.params.agentName,
                                 mode: "tool",
                                 content: content,
+                                tool_call_id: toolId,
                             })];
                     case 1:
                         _a.sent();
@@ -699,9 +700,9 @@ var ClientAgent = /** @class */ (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, _e, _f, _g, _h;
-            return __generator(this, function (_j) {
-                switch (_j.label) {
+            var _d, _e, _f, _g, _h, _j;
+            return __generator(this, function (_k) {
+                switch (_k.label) {
                     case 0:
                         this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " execute begin"), { incoming: incoming, mode: mode });
                         this.params.onExecute &&
@@ -713,45 +714,45 @@ var ClientAgent = /** @class */ (function () {
                                 content: incoming.trim(),
                             })];
                     case 1:
-                        _j.sent();
+                        _k.sent();
                         return [4 /*yield*/, this.getCompletion(mode)];
                     case 2:
-                        message = _j.sent();
+                        message = _k.sent();
                         if (!message.tool_calls) return [3 /*break*/, 11];
                         this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " tool call begin"));
                         _loop_1 = function (tool) {
                             var targetFn, result_2, result_3;
-                            return __generator(this, function (_k) {
-                                switch (_k.label) {
+                            return __generator(this, function (_l) {
+                                switch (_l.label) {
                                     case 0:
                                         targetFn = (_d = this_1.params.tools) === null || _d === void 0 ? void 0 : _d.find(function (t) { return t.function.name === tool.function.name; });
                                         return [4 /*yield*/, this_1.params.history.push(__assign(__assign({}, message), { agentName: this_1.params.agentName }))];
                                     case 1:
-                                        _k.sent();
+                                        _l.sent();
                                         if (!!targetFn) return [3 /*break*/, 4];
                                         this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " clientId=").concat(this_1.params.clientId, " functionName=").concat(tool.function.name, " tool function not found"), this_1.params.tools);
                                         return [4 /*yield*/, this_1._resurrectModel(mode, "No target function for ".concat(tool.function.name))];
                                     case 2:
-                                        result_2 = _k.sent();
+                                        result_2 = _l.sent();
                                         this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " clientId=").concat(this_1.params.clientId, " execute end result=").concat(result_2));
                                         return [4 /*yield*/, this_1._emitOuput(mode, result_2)];
                                     case 3:
-                                        _k.sent();
+                                        _l.sent();
                                         return [2 /*return*/, { value: void 0 }];
                                     case 4:
                                         ((_e = targetFn.callbacks) === null || _e === void 0 ? void 0 : _e.onValidate) &&
                                             ((_f = targetFn.callbacks) === null || _f === void 0 ? void 0 : _f.onValidate(this_1.params.clientId, this_1.params.agentName, tool.function.arguments));
                                         return [4 /*yield*/, functoolsKit.not(targetFn.validate(this_1.params.clientId, this_1.params.agentName, tool.function.arguments))];
                                     case 5:
-                                        if (!_k.sent()) return [3 /*break*/, 8];
+                                        if (!_l.sent()) return [3 /*break*/, 8];
                                         this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " clientId=").concat(this_1.params.clientId, " functionName=").concat(tool.function.name, " tool validation not passed"));
                                         return [4 /*yield*/, this_1._resurrectModel(mode, "Function validation failed: name=".concat(tool.function.name, " arguments=").concat(JSON.stringify(tool.function.arguments)))];
                                     case 6:
-                                        result_3 = _k.sent();
+                                        result_3 = _l.sent();
                                         this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " clientId=").concat(this_1.params.clientId, " execute end result=").concat(result_3));
                                         return [4 /*yield*/, this_1._emitOuput(mode, result_3)];
                                     case 7:
-                                        _k.sent();
+                                        _l.sent();
                                         return [2 /*return*/, { value: void 0 }];
                                     case 8:
                                         ((_g = targetFn.callbacks) === null || _g === void 0 ? void 0 : _g.onCall) &&
@@ -759,40 +760,40 @@ var ClientAgent = /** @class */ (function () {
                                         /**
                                          * @description Do not await to avoid deadlock! The tool can send the message to other agents by emulating user messages
                                          */
-                                        targetFn.call(this_1.params.clientId, this_1.params.agentName, tool.function.arguments);
+                                        targetFn.call((_j = tool.id) !== null && _j !== void 0 ? _j : functoolsKit.randomString(), this_1.params.clientId, this_1.params.agentName, tool.function.arguments);
                                         this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " clientId=").concat(this_1.params.clientId, " functionName=").concat(tool.function.name, " tool call executing"));
                                         return [4 /*yield*/, Promise.race([
                                                 this_1._toolCommitSubject.toPromise(),
                                                 this_1._outputSubject.toPromise(),
                                             ])];
                                     case 9:
-                                        _k.sent();
+                                        _l.sent();
                                         this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " clientId=").concat(this_1.params.clientId, " functionName=").concat(tool.function.name, " tool call end"));
                                         return [2 /*return*/];
                                 }
                             });
                         };
                         this_1 = this;
-                        _j.label = 3;
+                        _k.label = 3;
                     case 3:
-                        _j.trys.push([3, 8, 9, 10]);
+                        _k.trys.push([3, 8, 9, 10]);
                         _a = __values(message.tool_calls), _b = _a.next();
-                        _j.label = 4;
+                        _k.label = 4;
                     case 4:
                         if (!!_b.done) return [3 /*break*/, 7];
                         tool = _b.value;
                         return [5 /*yield**/, _loop_1(tool)];
                     case 5:
-                        state_1 = _j.sent();
+                        state_1 = _k.sent();
                         if (typeof state_1 === "object")
                             return [2 /*return*/, state_1.value];
-                        _j.label = 6;
+                        _k.label = 6;
                     case 6:
                         _b = _a.next();
                         return [3 /*break*/, 4];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_1_1 = _j.sent();
+                        e_1_1 = _k.sent();
                         e_1 = { error: e_1_1 };
                         return [3 /*break*/, 10];
                     case 9:
@@ -809,24 +810,24 @@ var ClientAgent = /** @class */ (function () {
                         result = message.content;
                         return [4 /*yield*/, this.params.history.push(__assign(__assign({}, message), { agentName: this.params.agentName }))];
                     case 12:
-                        _j.sent();
+                        _k.sent();
                         validation = null;
                         return [4 /*yield*/, this.params.validate(result)];
                     case 13:
-                        if (!(validation = _j.sent())) return [3 /*break*/, 16];
+                        if (!(validation = _k.sent())) return [3 /*break*/, 16];
                         this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " execute invalid tool call detected: ").concat(validation), { result: result });
                         return [4 /*yield*/, this._resurrectModel(mode, "Invalid model output: ".concat(result))];
                     case 14:
-                        result1 = _j.sent();
+                        result1 = _k.sent();
                         return [4 /*yield*/, this._emitOuput(mode, result1)];
                     case 15:
-                        _j.sent();
+                        _k.sent();
                         return [2 /*return*/];
                     case 16:
                         this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " execute end result=").concat(result));
                         return [4 /*yield*/, this._emitOuput(mode, result)];
                     case 17:
-                        _j.sent();
+                        _k.sent();
                         return [2 /*return*/];
                 }
             });
@@ -918,17 +919,19 @@ var AgentConnectionService = /** @class */ (function () {
         /**
          * Commits tool output.
          * @param {string} content - The tool output content.
+         * @param {string} toolId - The `tool_call_id` for openai history
          * @returns {Promise<any>} The commit result.
          */
-        this.commitToolOutput = function (content) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitToolOutput = function (toolId, content) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("agentConnectionService commitToolOutput", {
                             content: content,
+                            toolId: toolId,
                             context: this.contextService.context,
                         });
-                        return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).commitToolOutput(content)];
+                        return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).commitToolOutput(toolId, content)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -1784,21 +1787,23 @@ var ClientSession = /** @class */ (function () {
         }); };
         /**
          * Commits tool output.
+         * @param {string} toolId - The `tool_call_id` for openai history
          * @param {string} content - The content to commit.
          * @returns {Promise<void>}
          */
-        this.commitToolOutput = function (content) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitToolOutput = function (toolId, content) { return __awaiter(_this, void 0, void 0, function () {
             var agent;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.params.logger.debug("ClientSession clientId=".concat(this.params.clientId, " commitToolOutput"), {
                             content: content,
+                            toolId: toolId,
                         });
                         return [4 /*yield*/, this.params.swarm.getAgent()];
                     case 1:
                         agent = _a.sent();
-                        return [4 /*yield*/, agent.commitToolOutput(content)];
+                        return [4 /*yield*/, agent.commitToolOutput(toolId, content)];
                     case 2: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -2006,18 +2011,20 @@ var SessionConnectionService = /** @class */ (function () {
         };
         /**
          * Commits tool output to the session.
+         * @param {string} toolId - The `tool_call_id` for openai history
          * @param {string} content - The content to commit.
          * @returns {Promise<void>} A promise that resolves when the content is committed.
          */
-        this.commitToolOutput = function (content) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitToolOutput = function (toolId, content) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("sessionConnectionService commitToolOutput", {
                             context: this.contextService.context,
                             content: content,
+                            toolId: toolId,
                         });
-                        return [4 /*yield*/, this.getSession(this.contextService.context.clientId, this.contextService.context.swarmName).commitToolOutput(content)];
+                        return [4 /*yield*/, this.getSession(this.contextService.context.clientId, this.contextService.context.swarmName).commitToolOutput(toolId, content)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -2204,12 +2211,13 @@ var AgentPublicService = /** @class */ (function () {
         }); };
         /**
          * Commits tool output to the agent.
+         * @param {string} toolId - The `tool_call_id` for openai history
          * @param {string} content - The content to commit.
          * @param {string} clientId - The client ID.
          * @param {AgentName} agentName - The name of the agent.
          * @returns {Promise<unknown>} The commit result.
          */
-        this.commitToolOutput = function (content, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitToolOutput = function (toolId, content, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -2217,12 +2225,13 @@ var AgentPublicService = /** @class */ (function () {
                         this.loggerService.log("agentPublicService commitToolOutput", {
                             content: content,
                             clientId: clientId,
+                            toolId: toolId,
                             agentName: agentName,
                         });
                         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.commitToolOutput(content)];
+                                        case 0: return [4 /*yield*/, this.agentConnectionService.commitToolOutput(toolId, content)];
                                         case 1: return [2 /*return*/, _a.sent()];
                                     }
                                 });
@@ -2632,17 +2641,19 @@ var SessionPublicService = /** @class */ (function () {
         };
         /**
          * Commits tool output to the session.
+         * @param {string} toolId - The `tool_call_id` for openai history
          * @param {string} content - The content to commit.
          * @param {string} clientId - The client ID.
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.commitToolOutput = function (content, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitToolOutput = function (toolId, content, 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 commitToolOutput", {
+                            toolId: toolId,
                             content: content,
                             clientId: clientId,
                             swarmName: swarmName,
@@ -2650,7 +2661,7 @@ var SessionPublicService = /** @class */ (function () {
                         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.commitToolOutput(content)];
+                                        case 0: return [4 /*yield*/, this.sessionConnectionService.commitToolOutput(toolId, content)];
                                         case 1: return [2 /*return*/, _a.sent()];
                                     }
                                 });
@@ -4151,12 +4162,13 @@ var getAgentHistory = function (clientId, agentName) { return __awaiter(void 0,
  * @param {AgentName} agentName - The name of the agent committing the output.
  * @returns {Promise<void>} - A promise that resolves when the operation is complete.
  */
-var commitToolOutput = function (content, clientId, agentName) { return __awaiter(void 0, void 0, void 0, function () {
+var commitToolOutput = function (toolId, content, clientId, agentName) { return __awaiter(void 0, void 0, void 0, function () {
     var swarmName, currentAgentName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
                 swarm.loggerService.log('function commitToolOutput', {
+                    toolId: toolId,
                     content: content,
                     clientId: clientId,
                     agentName: agentName,
@@ -4170,13 +4182,14 @@ var commitToolOutput = function (content, clientId, agentName) { return __awaite
                 currentAgentName = _a.sent();
                 if (currentAgentName !== agentName) {
                     swarm.loggerService.log('function "commitToolOutput" skipped due to the agent change', {
+                        toolId: toolId,
                         currentAgentName: currentAgentName,
                         agentName: agentName,
                         clientId: clientId,
                     });
                     return [2 /*return*/];
                 }
-                return [4 /*yield*/, swarm.sessionPublicService.commitToolOutput(content, clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.commitToolOutput(toolId, content, clientId, swarmName)];
             case 2:
                 _a.sent();
                 return [2 /*return*/];

package/build/index.mjs

@@ -1,5 +1,5 @@
 import { scoped } from 'di-scoped';
-import { ToolRegistry, trycatch, sleep, PubsubArrayAdapter, Subject, queued, not, memoize, createAwaiter, cancelable, CANCELED_PROMISE_SYMBOL, schedule, ttl, singleshot, Source } from 'functools-kit';
+import { ToolRegistry, trycatch, sleep, PubsubArrayAdapter, Subject, queued, randomString, not, memoize, createAwaiter, cancelable, CANCELED_PROMISE_SYMBOL, schedule, ttl, singleshot, Source } from 'functools-kit';
 import { createActivator } from 'di-kit';
 import { omit } from 'lodash-es';
 import xml2js from 'xml2js';
@@ -667,18 +667,19 @@ var ClientAgent = /** @class */ (function () {
          * @param {string} content - The tool output content.
          * @returns {Promise<void>}
          */
-        this.commitToolOutput = function (content) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitToolOutput = function (toolId, content) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " commitToolOutput"), { content: content });
+                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " commitToolOutput"), { content: content, toolId: toolId });
                         this.params.onToolOutput &&
-                            this.params.onToolOutput(this.params.clientId, this.params.agentName, content);
+                            this.params.onToolOutput(toolId, this.params.clientId, this.params.agentName, content);
                         return [4 /*yield*/, this.params.history.push({
                                 role: "tool",
                                 agentName: this.params.agentName,
                                 mode: "tool",
                                 content: content,
+                                tool_call_id: toolId,
                             })];
                     case 1:
                         _a.sent();
@@ -697,9 +698,9 @@ var ClientAgent = /** @class */ (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, _e, _f, _g, _h;
-            return __generator(this, function (_j) {
-                switch (_j.label) {
+            var _d, _e, _f, _g, _h, _j;
+            return __generator(this, function (_k) {
+                switch (_k.label) {
                     case 0:
                         this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " execute begin"), { incoming: incoming, mode: mode });
                         this.params.onExecute &&
@@ -711,45 +712,45 @@ var ClientAgent = /** @class */ (function () {
                                 content: incoming.trim(),
                             })];
                     case 1:
-                        _j.sent();
+                        _k.sent();
                         return [4 /*yield*/, this.getCompletion(mode)];
                     case 2:
-                        message = _j.sent();
+                        message = _k.sent();
                         if (!message.tool_calls) return [3 /*break*/, 11];
                         this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " tool call begin"));
                         _loop_1 = function (tool) {
                             var targetFn, result_2, result_3;
-                            return __generator(this, function (_k) {
-                                switch (_k.label) {
+                            return __generator(this, function (_l) {
+                                switch (_l.label) {
                                     case 0:
                                         targetFn = (_d = this_1.params.tools) === null || _d === void 0 ? void 0 : _d.find(function (t) { return t.function.name === tool.function.name; });
                                         return [4 /*yield*/, this_1.params.history.push(__assign(__assign({}, message), { agentName: this_1.params.agentName }))];
                                     case 1:
-                                        _k.sent();
+                                        _l.sent();
                                         if (!!targetFn) return [3 /*break*/, 4];
                                         this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " clientId=").concat(this_1.params.clientId, " functionName=").concat(tool.function.name, " tool function not found"), this_1.params.tools);
                                         return [4 /*yield*/, this_1._resurrectModel(mode, "No target function for ".concat(tool.function.name))];
                                     case 2:
-                                        result_2 = _k.sent();
+                                        result_2 = _l.sent();
                                         this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " clientId=").concat(this_1.params.clientId, " execute end result=").concat(result_2));
                                         return [4 /*yield*/, this_1._emitOuput(mode, result_2)];
                                     case 3:
-                                        _k.sent();
+                                        _l.sent();
                                         return [2 /*return*/, { value: void 0 }];
                                     case 4:
                                         ((_e = targetFn.callbacks) === null || _e === void 0 ? void 0 : _e.onValidate) &&
                                             ((_f = targetFn.callbacks) === null || _f === void 0 ? void 0 : _f.onValidate(this_1.params.clientId, this_1.params.agentName, tool.function.arguments));
                                         return [4 /*yield*/, not(targetFn.validate(this_1.params.clientId, this_1.params.agentName, tool.function.arguments))];
                                     case 5:
-                                        if (!_k.sent()) return [3 /*break*/, 8];
+                                        if (!_l.sent()) return [3 /*break*/, 8];
                                         this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " clientId=").concat(this_1.params.clientId, " functionName=").concat(tool.function.name, " tool validation not passed"));
                                         return [4 /*yield*/, this_1._resurrectModel(mode, "Function validation failed: name=".concat(tool.function.name, " arguments=").concat(JSON.stringify(tool.function.arguments)))];
                                     case 6:
-                                        result_3 = _k.sent();
+                                        result_3 = _l.sent();
                                         this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " clientId=").concat(this_1.params.clientId, " execute end result=").concat(result_3));
                                         return [4 /*yield*/, this_1._emitOuput(mode, result_3)];
                                     case 7:
-                                        _k.sent();
+                                        _l.sent();
                                         return [2 /*return*/, { value: void 0 }];
                                     case 8:
                                         ((_g = targetFn.callbacks) === null || _g === void 0 ? void 0 : _g.onCall) &&
@@ -757,40 +758,40 @@ var ClientAgent = /** @class */ (function () {
                                         /**
                                          * @description Do not await to avoid deadlock! The tool can send the message to other agents by emulating user messages
                                          */
-                                        targetFn.call(this_1.params.clientId, this_1.params.agentName, tool.function.arguments);
+                                        targetFn.call((_j = tool.id) !== null && _j !== void 0 ? _j : randomString(), this_1.params.clientId, this_1.params.agentName, tool.function.arguments);
                                         this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " clientId=").concat(this_1.params.clientId, " functionName=").concat(tool.function.name, " tool call executing"));
                                         return [4 /*yield*/, Promise.race([
                                                 this_1._toolCommitSubject.toPromise(),
                                                 this_1._outputSubject.toPromise(),
                                             ])];
                                     case 9:
-                                        _k.sent();
+                                        _l.sent();
                                         this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " clientId=").concat(this_1.params.clientId, " functionName=").concat(tool.function.name, " tool call end"));
                                         return [2 /*return*/];
                                 }
                             });
                         };
                         this_1 = this;
-                        _j.label = 3;
+                        _k.label = 3;
                     case 3:
-                        _j.trys.push([3, 8, 9, 10]);
+                        _k.trys.push([3, 8, 9, 10]);
                         _a = __values(message.tool_calls), _b = _a.next();
-                        _j.label = 4;
+                        _k.label = 4;
                     case 4:
                         if (!!_b.done) return [3 /*break*/, 7];
                         tool = _b.value;
                         return [5 /*yield**/, _loop_1(tool)];
                     case 5:
-                        state_1 = _j.sent();
+                        state_1 = _k.sent();
                         if (typeof state_1 === "object")
                             return [2 /*return*/, state_1.value];
-                        _j.label = 6;
+                        _k.label = 6;
                     case 6:
                         _b = _a.next();
                         return [3 /*break*/, 4];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_1_1 = _j.sent();
+                        e_1_1 = _k.sent();
                         e_1 = { error: e_1_1 };
                         return [3 /*break*/, 10];
                     case 9:
@@ -807,24 +808,24 @@ var ClientAgent = /** @class */ (function () {
                         result = message.content;
                         return [4 /*yield*/, this.params.history.push(__assign(__assign({}, message), { agentName: this.params.agentName }))];
                     case 12:
-                        _j.sent();
+                        _k.sent();
                         validation = null;
                         return [4 /*yield*/, this.params.validate(result)];
                     case 13:
-                        if (!(validation = _j.sent())) return [3 /*break*/, 16];
+                        if (!(validation = _k.sent())) return [3 /*break*/, 16];
                         this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " execute invalid tool call detected: ").concat(validation), { result: result });
                         return [4 /*yield*/, this._resurrectModel(mode, "Invalid model output: ".concat(result))];
                     case 14:
-                        result1 = _j.sent();
+                        result1 = _k.sent();
                         return [4 /*yield*/, this._emitOuput(mode, result1)];
                     case 15:
-                        _j.sent();
+                        _k.sent();
                         return [2 /*return*/];
                     case 16:
                         this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " execute end result=").concat(result));
                         return [4 /*yield*/, this._emitOuput(mode, result)];
                     case 17:
-                        _j.sent();
+                        _k.sent();
                         return [2 /*return*/];
                 }
             });
@@ -916,17 +917,19 @@ var AgentConnectionService = /** @class */ (function () {
         /**
          * Commits tool output.
          * @param {string} content - The tool output content.
+         * @param {string} toolId - The `tool_call_id` for openai history
          * @returns {Promise<any>} The commit result.
          */
-        this.commitToolOutput = function (content) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitToolOutput = function (toolId, content) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("agentConnectionService commitToolOutput", {
                             content: content,
+                            toolId: toolId,
                             context: this.contextService.context,
                         });
-                        return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).commitToolOutput(content)];
+                        return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).commitToolOutput(toolId, content)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -1782,21 +1785,23 @@ var ClientSession = /** @class */ (function () {
         }); };
         /**
          * Commits tool output.
+         * @param {string} toolId - The `tool_call_id` for openai history
          * @param {string} content - The content to commit.
          * @returns {Promise<void>}
          */
-        this.commitToolOutput = function (content) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitToolOutput = function (toolId, content) { return __awaiter(_this, void 0, void 0, function () {
             var agent;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.params.logger.debug("ClientSession clientId=".concat(this.params.clientId, " commitToolOutput"), {
                             content: content,
+                            toolId: toolId,
                         });
                         return [4 /*yield*/, this.params.swarm.getAgent()];
                     case 1:
                         agent = _a.sent();
-                        return [4 /*yield*/, agent.commitToolOutput(content)];
+                        return [4 /*yield*/, agent.commitToolOutput(toolId, content)];
                     case 2: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -2004,18 +2009,20 @@ var SessionConnectionService = /** @class */ (function () {
         };
         /**
          * Commits tool output to the session.
+         * @param {string} toolId - The `tool_call_id` for openai history
          * @param {string} content - The content to commit.
          * @returns {Promise<void>} A promise that resolves when the content is committed.
          */
-        this.commitToolOutput = function (content) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitToolOutput = function (toolId, content) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("sessionConnectionService commitToolOutput", {
                             context: this.contextService.context,
                             content: content,
+                            toolId: toolId,
                         });
-                        return [4 /*yield*/, this.getSession(this.contextService.context.clientId, this.contextService.context.swarmName).commitToolOutput(content)];
+                        return [4 /*yield*/, this.getSession(this.contextService.context.clientId, this.contextService.context.swarmName).commitToolOutput(toolId, content)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -2202,12 +2209,13 @@ var AgentPublicService = /** @class */ (function () {
         }); };
         /**
          * Commits tool output to the agent.
+         * @param {string} toolId - The `tool_call_id` for openai history
          * @param {string} content - The content to commit.
          * @param {string} clientId - The client ID.
          * @param {AgentName} agentName - The name of the agent.
          * @returns {Promise<unknown>} The commit result.
          */
-        this.commitToolOutput = function (content, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitToolOutput = function (toolId, content, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -2215,12 +2223,13 @@ var AgentPublicService = /** @class */ (function () {
                         this.loggerService.log("agentPublicService commitToolOutput", {
                             content: content,
                             clientId: clientId,
+                            toolId: toolId,
                             agentName: agentName,
                         });
                         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.commitToolOutput(content)];
+                                        case 0: return [4 /*yield*/, this.agentConnectionService.commitToolOutput(toolId, content)];
                                         case 1: return [2 /*return*/, _a.sent()];
                                     }
                                 });
@@ -2630,17 +2639,19 @@ var SessionPublicService = /** @class */ (function () {
         };
         /**
          * Commits tool output to the session.
+         * @param {string} toolId - The `tool_call_id` for openai history
          * @param {string} content - The content to commit.
          * @param {string} clientId - The client ID.
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.commitToolOutput = function (content, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitToolOutput = function (toolId, content, 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 commitToolOutput", {
+                            toolId: toolId,
                             content: content,
                             clientId: clientId,
                             swarmName: swarmName,
@@ -2648,7 +2659,7 @@ var SessionPublicService = /** @class */ (function () {
                         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.commitToolOutput(content)];
+                                        case 0: return [4 /*yield*/, this.sessionConnectionService.commitToolOutput(toolId, content)];
                                         case 1: return [2 /*return*/, _a.sent()];
                                     }
                                 });
@@ -4149,12 +4160,13 @@ var getAgentHistory = function (clientId, agentName) { return __awaiter(void 0,
  * @param {AgentName} agentName - The name of the agent committing the output.
  * @returns {Promise<void>} - A promise that resolves when the operation is complete.
  */
-var commitToolOutput = function (content, clientId, agentName) { return __awaiter(void 0, void 0, void 0, function () {
+var commitToolOutput = function (toolId, content, clientId, agentName) { return __awaiter(void 0, void 0, void 0, function () {
     var swarmName, currentAgentName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
                 swarm.loggerService.log('function commitToolOutput', {
+                    toolId: toolId,
                     content: content,
                     clientId: clientId,
                     agentName: agentName,
@@ -4168,13 +4180,14 @@ var commitToolOutput = function (content, clientId, agentName) { return __awaite
                 currentAgentName = _a.sent();
                 if (currentAgentName !== agentName) {
                     swarm.loggerService.log('function "commitToolOutput" skipped due to the agent change', {
+                        toolId: toolId,
                         currentAgentName: currentAgentName,
                         agentName: agentName,
                         clientId: clientId,
                     });
                     return [2 /*return*/];
                 }
-                return [4 /*yield*/, swarm.sessionPublicService.commitToolOutput(content, clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.commitToolOutput(toolId, content, clientId, swarmName)];
             case 2:
                 _a.sent();
                 return [2 /*return*/];

package/package.json

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

package/types.d.ts

@@ -218,10 +218,11 @@ interface ISession {
     connect(connector: SendMessageFn$1): ReceiveMessageFn;
     /**
      * Commit tool output.
+     * @param {string} toolId - The `tool_call_id` for openai history
      * @param {string} content - The content to commit.
      * @returns {Promise<void>}
      */
-    commitToolOutput(content: string): Promise<void>;
+    commitToolOutput(toolId: string, content: string): Promise<void>;
     /**
      * Commit user message without answer
      * @param {string} message - The message to commit.
@@ -257,6 +258,86 @@ type SessionMode = "session" | "makeConnection" | "complete";
  */
 type ExecutionMode = "tool" | "user";
 
+/**
+ * Represents a tool call with a function name and arguments.
+ */
+interface IToolCall {
+    /**
+     * The ID of the tool call.
+     */
+    id: string;
+    /**
+     * The type of the tool. Currently, only `function` is supported.
+     */
+    type: 'function';
+    /**
+     * The function that the model called.
+     */
+    function: {
+        /**
+         * The name of the function to be called.
+         */
+        name: string;
+        /**
+         * The arguments to be passed to the function.
+         */
+        arguments: {
+            [key: string]: any;
+        };
+    };
+}
+/**
+ * Represents a tool with a type and function details.
+ */
+interface ITool {
+    /**
+     * The type of the tool.
+     */
+    type: string;
+    function: {
+        /**
+         * The name of the function.
+         */
+        name: string;
+        /**
+         * The description of the function.
+         */
+        description: string;
+        /**
+         * The parameters required by the function.
+         */
+        parameters: {
+            /**
+             * The type of the parameters.
+             */
+            type: string;
+            /**
+             * The list of required parameters.
+             */
+            required: string[];
+            /**
+             * The properties of the parameters.
+             */
+            properties: {
+                [key: string]: {
+                    /**
+                     * The type of the property.
+                     */
+                    type: string;
+                    /**
+                     * The description of the property.
+                     */
+                    description: string;
+                    /**
+                     * The possible values for the property.
+                     */
+                    enum?: string[];
+                };
+            };
+        };
+    };
+}
+
 /**
  * Interface representing a model message.
  */
@@ -285,14 +366,11 @@ interface IModelMessage {
      * Optional tool calls associated with the message.
      * @type {Array<{ function: { name: string; arguments: { [key: string]: any; }; }; }>}
      */
-    tool_calls?: {
-        function: {
-            name: string;
-            arguments: {
-                [key: string]: any;
-            };
-        };
-    }[];
+    tool_calls?: IToolCall[];
+    /**
+     * Tool call that this message is responding to.
+     */
+    tool_call_id?: string;
 }
 
 /**
@@ -348,75 +426,6 @@ interface IHistorySchema {
     items: IPubsubArray<IModelMessage>;
 }
 
-/**
- * Represents a tool call with a function name and arguments.
- */
-interface IToolCall {
-    function: {
-        /**
-         * The name of the function to be called.
-         */
-        name: string;
-        /**
-         * The arguments to be passed to the function.
-         */
-        arguments: {
-            [key: string]: any;
-        };
-    };
-}
-/**
- * Represents a tool with a type and function details.
- */
-interface ITool {
-    /**
-     * The type of the tool.
-     */
-    type: string;
-    function: {
-        /**
-         * The name of the function.
-         */
-        name: string;
-        /**
-         * The description of the function.
-         */
-        description: string;
-        /**
-         * The parameters required by the function.
-         */
-        parameters: {
-            /**
-             * The type of the parameters.
-             */
-            type: string;
-            /**
-             * The list of required parameters.
-             */
-            required: string[];
-            /**
-             * The properties of the parameters.
-             */
-            properties: {
-                [key: string]: {
-                    /**
-                     * The type of the property.
-                     */
-                    type: string;
-                    /**
-                     * The description of the property.
-                     */
-                    description: string;
-                    /**
-                     * The possible values for the property.
-                     */
-                    enum?: string[];
-                };
-            };
-        };
-    };
-}
-
 /**
  * Interface representing a completion.
  */
@@ -518,7 +527,7 @@ interface IAgentTool<T = Record<string, unknown>> extends ITool {
      * @param params - The parameters for the tool.
      * @returns A promise that resolves when the tool call is complete.
      */
-    call(clientId: string, agentName: AgentName, params: T): Promise<void>;
+    call(toolId: string, clientId: string, agentName: AgentName, params: T): Promise<void>;
     /**
      * Validates the parameters for the tool.
      * @param clientId - The ID of the client.
@@ -569,11 +578,12 @@ interface IAgentSchemaCallbacks {
     onExecute?: (clientId: string, agentName: AgentName, input: string, mode: ExecutionMode) => void;
     /**
      * Callback triggered when there is tool output.
+     * @param toolId - The `tool_call_id` for openai history
      * @param clientId - The ID of the client.
      * @param agentName - The name of the agent.
      * @param content - The content of the tool output.
      */
-    onToolOutput?: (clientId: string, agentName: AgentName, content: string) => void;
+    onToolOutput?: (toolId: string, clientId: string, agentName: AgentName, content: string) => void;
     /**
      * Callback triggered when there is a system message.
      * @param clientId - The ID of the client.
@@ -665,10 +675,11 @@ interface IAgent {
     waitForOutput: () => Promise<string>;
     /**
      * Commits the tool output.
+     * @param {string} toolId - The `tool_call_id` for openai history
      * @param content - The content of the tool output.
      * @returns A promise that resolves when the tool output is committed.
      */
-    commitToolOutput(content: string): Promise<void>;
+    commitToolOutput(toolId: string, content: string): Promise<void>;
     /**
      * Commits a system message.
      * @param message - The system message to commit.
@@ -793,7 +804,7 @@ declare class ClientAgent implements IAgent {
      * @param {string} content - The tool output content.
      * @returns {Promise<void>}
      */
-    commitToolOutput: (content: string) => Promise<void>;
+    commitToolOutput: (toolId: string, content: string) => Promise<void>;
     /**
      * Executes the incoming message and processes tool calls if any.
      * @param {string} incoming - The incoming message content.
@@ -840,9 +851,10 @@ declare class AgentConnectionService implements IAgent {
     /**
      * Commits tool output.
      * @param {string} content - The tool output content.
+     * @param {string} toolId - The `tool_call_id` for openai history
      * @returns {Promise<any>} The commit result.
      */
-    commitToolOutput: (content: string) => Promise<void>;
+    commitToolOutput: (toolId: string, content: string) => Promise<void>;
     /**
      * Commits a system message.
      * @param {string} message - The system message.
@@ -1148,10 +1160,11 @@ declare class ClientSession implements ISession {
     execute: (message: string, mode: ExecutionMode) => Promise<string>;
     /**
      * Commits tool output.
+     * @param {string} toolId - The `tool_call_id` for openai history
      * @param {string} content - The content to commit.
      * @returns {Promise<void>}
      */
-    commitToolOutput: (content: string) => Promise<void>;
+    commitToolOutput: (toolId: string, content: string) => Promise<void>;
     /**
      * Commits user message without answer.
      * @param {string} message - The message to commit.
@@ -1218,10 +1231,11 @@ declare class SessionConnectionService implements ISession {
     connect: (connector: SendMessageFn$1) => ReceiveMessageFn;
     /**
      * Commits tool output to the session.
+     * @param {string} toolId - The `tool_call_id` for openai history
      * @param {string} content - The content to commit.
      * @returns {Promise<void>} A promise that resolves when the content is committed.
      */
-    commitToolOutput: (content: string) => Promise<void>;
+    commitToolOutput: (toolId: string, content: string) => Promise<void>;
     /**
      * Commits a system message to the session.
      * @param {string} message - The message to commit.
@@ -1285,12 +1299,13 @@ declare class AgentPublicService implements TAgentConnectionService {
     waitForOutput: (clientId: string, agentName: AgentName) => Promise<string>;
     /**
      * Commits tool output to the agent.
+     * @param {string} toolId - The `tool_call_id` for openai history
      * @param {string} content - The content to commit.
      * @param {string} clientId - The client ID.
      * @param {AgentName} agentName - The name of the agent.
      * @returns {Promise<unknown>} The commit result.
      */
-    commitToolOutput: (content: string, clientId: string, agentName: AgentName) => Promise<void>;
+    commitToolOutput: (toolId: string, content: string, clientId: string, agentName: AgentName) => Promise<void>;
     /**
      * Commits a system message to the agent.
      * @param {string} message - The message to commit.
@@ -1410,12 +1425,13 @@ declare class SessionPublicService implements TSessionConnectionService {
     connect: (connector: SendMessageFn$1, clientId: string, swarmName: SwarmName) => ReceiveMessageFn;
     /**
      * Commits tool output to the session.
+     * @param {string} toolId - The `tool_call_id` for openai history
      * @param {string} content - The content to commit.
      * @param {string} clientId - The client ID.
      * @param {SwarmName} swarmName - The swarm name.
      * @returns {Promise<void>}
      */
-    commitToolOutput: (content: string, clientId: string, swarmName: SwarmName) => Promise<void>;
+    commitToolOutput: (toolId: string, content: string, clientId: string, swarmName: SwarmName) => Promise<void>;
     /**
      * Commits a system message to the session.
      * @param {string} message - The message to commit.
@@ -1907,7 +1923,7 @@ declare const getAgentHistory: (clientId: string, agentName: AgentName) => Promi
  * @param {AgentName} agentName - The name of the agent committing the output.
  * @returns {Promise<void>} - A promise that resolves when the operation is complete.
  */
-declare const commitToolOutput: (content: string, clientId: string, agentName: AgentName) => Promise<void>;
+declare const commitToolOutput: (toolId: string, content: string, clientId: string, agentName: AgentName) => Promise<void>;
 
 /**
  * Commits a system message to the active agent in as swarm.