agent-swarm-kit 1.0.35 → 1.0.37

package/build/index.cjs

@@ -355,6 +355,10 @@ var validateDefault = function (output) { return __awaiter(void 0, void 0, void
     });
 }); };
 
+var removeXmlTags = function (input) {
+    return input.replace(/<[^>]*>.*?<\/[^>]*>/g, '');
+};
+
 /**
  * @description `ask for agent function` in `llama3.1:8b` to troubleshoot (need CC_OLLAMA_EMIT_TOOL_PROTOCOL to be turned off)
  */
@@ -396,8 +400,20 @@ var CC_AGENT_DISALLOWED_SYMBOLS = [
     "{",
     "}",
 ];
+var CC_AGENT_HISTORY_FILTER = function (agentName) { return function (message) {
+    var isOk = true;
+    if (message.role === "tool") {
+        isOk = isOk && message.agentName === agentName;
+    }
+    if (message.tool_calls) {
+        isOk = isOk && message.agentName === agentName;
+    }
+    return isOk;
+}; };
+var CC_AGENT_OUTPUT_TRANSFORM = removeXmlTags;
 var CC_KEEP_MESSAGES = 5;
 var CC_GET_AGENT_HISTORY = function () { return new functoolsKit.PubsubArrayAdapter(); };
+var CC_AGENT_SEPARATE_HISTORY = false;
 var GLOBAL_CONFIG = {
     CC_TOOL_CALL_EXCEPTION_PROMPT: CC_TOOL_CALL_EXCEPTION_PROMPT,
     CC_EMPTY_OUTPUT_PLACEHOLDERS: CC_EMPTY_OUTPUT_PLACEHOLDERS,
@@ -406,6 +422,9 @@ var GLOBAL_CONFIG = {
     CC_SWARM_AGENT_CHANGED: CC_SWARM_AGENT_CHANGED,
     CC_SWARM_DEFAULT_AGENT: CC_SWARM_DEFAULT_AGENT,
     CC_AGENT_DEFAULT_VALIDATION: CC_AGENT_DEFAULT_VALIDATION,
+    CC_AGENT_HISTORY_FILTER: CC_AGENT_HISTORY_FILTER,
+    CC_AGENT_OUTPUT_TRANSFORM: CC_AGENT_OUTPUT_TRANSFORM,
+    CC_AGENT_SEPARATE_HISTORY: CC_AGENT_SEPARATE_HISTORY,
     CC_AGENT_DISALLOWED_TAGS: CC_AGENT_DISALLOWED_TAGS,
     CC_AGENT_DISALLOWED_SYMBOLS: CC_AGENT_DISALLOWED_SYMBOLS,
 };
@@ -436,19 +455,21 @@ var ClientAgent = /** @class */ (function () {
          * @returns {Promise<void>}
          * @private
          */
-        this._emitOuput = function (mode, result) { return __awaiter(_this, void 0, void 0, function () {
-            var validation, result_1;
+        this._emitOuput = function (mode, rawResult) { return __awaiter(_this, void 0, void 0, function () {
+            var result, validation, rawResult_1, result_1;
             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, " _emitOuput"));
+                        result = this.params.transform(rawResult);
+                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " _emitOuput"), { mode: mode, result: result, rawResult: rawResult });
                         validation = null;
                         return [4 /*yield*/, this.params.validate(result)];
                     case 1:
                         if (!(validation = _a.sent())) return [3 /*break*/, 5];
                         return [4 /*yield*/, this._resurrectModel(mode, validation)];
                     case 2:
-                        result_1 = _a.sent();
+                        rawResult_1 = _a.sent();
+                        result_1 = this.params.transform(rawResult_1);
                         return [4 /*yield*/, this.params.validate(result_1)];
                     case 3:
                         if ((validation = _a.sent())) {
@@ -854,10 +875,10 @@ 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, callbacks = _a.callbacks, completionName = _a.completion, _b = _a.validate, validate = _b === void 0 ? validateDefault : _b;
+            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, callbacks = _a.callbacks, completionName = _a.completion, _c = _a.validate, validate = _c === void 0 ? validateDefault : _c;
             var completion = _this.completionSchemaService.get(completionName);
             _this.sessionValidationService.addAgentUsage(clientId, agentName);
-            return new ClientAgent(__assign({ clientId: clientId, agentName: agentName, validate: validate, logger: _this.loggerService, history: _this.historyConnectionService.getHistory(clientId, agentName), prompt: prompt, system: system, 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, logger: _this.loggerService, history: _this.historyConnectionService.getHistory(clientId, agentName), prompt: prompt, system: system, transform: transform, tools: tools === null || tools === void 0 ? void 0 : tools.map(_this.toolSchemaService.get), completion: completion }, callbacks));
         });
         /**
          * Executes an input command.
@@ -1137,17 +1158,7 @@ var ClientHistory = /** @class */ (function () {
                             return agentName === _this.params.agentName;
                         });
                         commonMessages = commonMessagesRaw
-                            .filter(function (_a) {
-                            var role = _a.role, agentName = _a.agentName, tool_calls = _a.tool_calls;
-                            var isOk = true;
-                            if (role === "tool") {
-                                isOk = isOk && agentName === _this.params.agentName;
-                            }
-                            if (tool_calls) {
-                                isOk = isOk && agentName === _this.params.agentName;
-                            }
-                            return isOk;
-                        })
+                            .filter(this._filterCondition)
                             .slice(-GLOBAL_CONFIG.CC_KEEP_MESSAGES);
                         promptMessages = [];
                         {
@@ -1174,6 +1185,7 @@ var ClientHistory = /** @class */ (function () {
         this.params.logger.debug("ClientHistory agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " CTOR"), {
             params: params,
         });
+        this._filterCondition = GLOBAL_CONFIG.CC_AGENT_HISTORY_FILTER(this.params.agentName);
     }
     return ClientHistory;
 }());
@@ -1279,10 +1291,13 @@ var HistoryConnectionService = /** @class */ (function () {
                         this.loggerService.log("historyConnectionService dispose", {
                             context: this.contextService.context,
                         });
+                        if (!GLOBAL_CONFIG.CC_AGENT_SEPARATE_HISTORY) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.getItems(this.contextService.context.clientId, this.contextService.context.agentName).clear()];
                     case 1:
                         _a.sent();
                         this.getItems.clear(this.contextService.context.clientId);
+                        _a.label = 2;
+                    case 2:
                         this.getHistory.clear("".concat(this.contextService.context.clientId, "-").concat(this.contextService.context.agentName));
                         this.sessionValidationService.removeHistoryUsage(this.contextService.context.clientId, this.contextService.context.agentName);
                         return [2 /*return*/];

package/build/index.mjs

@@ -353,6 +353,10 @@ var validateDefault = function (output) { return __awaiter(void 0, void 0, void
     });
 }); };
 
+var removeXmlTags = function (input) {
+    return input.replace(/<[^>]*>.*?<\/[^>]*>/g, '');
+};
+
 /**
  * @description `ask for agent function` in `llama3.1:8b` to troubleshoot (need CC_OLLAMA_EMIT_TOOL_PROTOCOL to be turned off)
  */
@@ -394,8 +398,20 @@ var CC_AGENT_DISALLOWED_SYMBOLS = [
     "{",
     "}",
 ];
+var CC_AGENT_HISTORY_FILTER = function (agentName) { return function (message) {
+    var isOk = true;
+    if (message.role === "tool") {
+        isOk = isOk && message.agentName === agentName;
+    }
+    if (message.tool_calls) {
+        isOk = isOk && message.agentName === agentName;
+    }
+    return isOk;
+}; };
+var CC_AGENT_OUTPUT_TRANSFORM = removeXmlTags;
 var CC_KEEP_MESSAGES = 5;
 var CC_GET_AGENT_HISTORY = function () { return new PubsubArrayAdapter(); };
+var CC_AGENT_SEPARATE_HISTORY = false;
 var GLOBAL_CONFIG = {
     CC_TOOL_CALL_EXCEPTION_PROMPT: CC_TOOL_CALL_EXCEPTION_PROMPT,
     CC_EMPTY_OUTPUT_PLACEHOLDERS: CC_EMPTY_OUTPUT_PLACEHOLDERS,
@@ -404,6 +420,9 @@ var GLOBAL_CONFIG = {
     CC_SWARM_AGENT_CHANGED: CC_SWARM_AGENT_CHANGED,
     CC_SWARM_DEFAULT_AGENT: CC_SWARM_DEFAULT_AGENT,
     CC_AGENT_DEFAULT_VALIDATION: CC_AGENT_DEFAULT_VALIDATION,
+    CC_AGENT_HISTORY_FILTER: CC_AGENT_HISTORY_FILTER,
+    CC_AGENT_OUTPUT_TRANSFORM: CC_AGENT_OUTPUT_TRANSFORM,
+    CC_AGENT_SEPARATE_HISTORY: CC_AGENT_SEPARATE_HISTORY,
     CC_AGENT_DISALLOWED_TAGS: CC_AGENT_DISALLOWED_TAGS,
     CC_AGENT_DISALLOWED_SYMBOLS: CC_AGENT_DISALLOWED_SYMBOLS,
 };
@@ -434,19 +453,21 @@ var ClientAgent = /** @class */ (function () {
          * @returns {Promise<void>}
          * @private
          */
-        this._emitOuput = function (mode, result) { return __awaiter(_this, void 0, void 0, function () {
-            var validation, result_1;
+        this._emitOuput = function (mode, rawResult) { return __awaiter(_this, void 0, void 0, function () {
+            var result, validation, rawResult_1, result_1;
             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, " _emitOuput"));
+                        result = this.params.transform(rawResult);
+                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " _emitOuput"), { mode: mode, result: result, rawResult: rawResult });
                         validation = null;
                         return [4 /*yield*/, this.params.validate(result)];
                     case 1:
                         if (!(validation = _a.sent())) return [3 /*break*/, 5];
                         return [4 /*yield*/, this._resurrectModel(mode, validation)];
                     case 2:
-                        result_1 = _a.sent();
+                        rawResult_1 = _a.sent();
+                        result_1 = this.params.transform(rawResult_1);
                         return [4 /*yield*/, this.params.validate(result_1)];
                     case 3:
                         if ((validation = _a.sent())) {
@@ -852,10 +873,10 @@ 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, callbacks = _a.callbacks, completionName = _a.completion, _b = _a.validate, validate = _b === void 0 ? validateDefault : _b;
+            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, callbacks = _a.callbacks, completionName = _a.completion, _c = _a.validate, validate = _c === void 0 ? validateDefault : _c;
             var completion = _this.completionSchemaService.get(completionName);
             _this.sessionValidationService.addAgentUsage(clientId, agentName);
-            return new ClientAgent(__assign({ clientId: clientId, agentName: agentName, validate: validate, logger: _this.loggerService, history: _this.historyConnectionService.getHistory(clientId, agentName), prompt: prompt, system: system, 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, logger: _this.loggerService, history: _this.historyConnectionService.getHistory(clientId, agentName), prompt: prompt, system: system, transform: transform, tools: tools === null || tools === void 0 ? void 0 : tools.map(_this.toolSchemaService.get), completion: completion }, callbacks));
         });
         /**
          * Executes an input command.
@@ -1135,17 +1156,7 @@ var ClientHistory = /** @class */ (function () {
                             return agentName === _this.params.agentName;
                         });
                         commonMessages = commonMessagesRaw
-                            .filter(function (_a) {
-                            var role = _a.role, agentName = _a.agentName, tool_calls = _a.tool_calls;
-                            var isOk = true;
-                            if (role === "tool") {
-                                isOk = isOk && agentName === _this.params.agentName;
-                            }
-                            if (tool_calls) {
-                                isOk = isOk && agentName === _this.params.agentName;
-                            }
-                            return isOk;
-                        })
+                            .filter(this._filterCondition)
                             .slice(-GLOBAL_CONFIG.CC_KEEP_MESSAGES);
                         promptMessages = [];
                         {
@@ -1172,6 +1183,7 @@ var ClientHistory = /** @class */ (function () {
         this.params.logger.debug("ClientHistory agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " CTOR"), {
             params: params,
         });
+        this._filterCondition = GLOBAL_CONFIG.CC_AGENT_HISTORY_FILTER(this.params.agentName);
     }
     return ClientHistory;
 }());
@@ -1277,10 +1289,13 @@ var HistoryConnectionService = /** @class */ (function () {
                         this.loggerService.log("historyConnectionService dispose", {
                             context: this.contextService.context,
                         });
+                        if (!GLOBAL_CONFIG.CC_AGENT_SEPARATE_HISTORY) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.getItems(this.contextService.context.clientId, this.contextService.context.agentName).clear()];
                     case 1:
                         _a.sent();
                         this.getItems.clear(this.contextService.context.clientId);
+                        _a.label = 2;
+                    case 2:
                         this.getHistory.clear("".concat(this.contextService.context.clientId, "-").concat(this.contextService.context.agentName));
                         this.sessionValidationService.removeHistoryUsage(this.contextService.context.clientId, this.contextService.context.agentName);
                         return [2 /*return*/];

package/package.json

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

package/types.d.ts

@@ -642,6 +642,8 @@ interface IAgentSchema {
      * @returns A promise that resolves to a string or null.
      */
     validate?: (output: string) => Promise<string | null>;
+    /** The transform function for model output */
+    transform?: (input: string) => string;
     /** The lifecycle calbacks of the agent. */
     callbacks?: Partial<IAgentSchemaCallbacks>;
 }
@@ -751,7 +753,7 @@ declare class ClientAgent implements IAgent {
      * @returns {Promise<void>}
      * @private
      */
-    _emitOuput: (mode: ExecutionMode, result: string) => Promise<void>;
+    _emitOuput: (mode: ExecutionMode, rawResult: string) => Promise<void>;
     /**
      * Resurrects the model based on the given reason.
      * @param {string} [reason] - The reason for resurrecting the model.
@@ -871,6 +873,10 @@ declare class AgentConnectionService implements IAgent {
  */
 declare class ClientHistory implements IHistory {
     readonly params: IHistoryParams;
+    /**
+     * Filter condition for `toArrayForAgent`
+     */
+    _filterCondition: (message: IModelMessage) => boolean;
     /**
      * Creates an instance of ClientHistory.
      * @param {IHistoryParams} params - The parameters for the history.
@@ -2044,6 +2050,9 @@ declare const GLOBAL_CONFIG: {
     CC_SWARM_AGENT_CHANGED: (clientId: string, agentName: AgentName, swarmName: SwarmName) => Promise<void>;
     CC_SWARM_DEFAULT_AGENT: (clientId: string, swarmName: SwarmName, defaultAgent: AgentName) => Promise<AgentName>;
     CC_AGENT_DEFAULT_VALIDATION: (output: string) => Promise<string | null>;
+    CC_AGENT_HISTORY_FILTER: (agentName: AgentName) => (message: IModelMessage) => boolean;
+    CC_AGENT_OUTPUT_TRANSFORM: (input: string) => string;
+    CC_AGENT_SEPARATE_HISTORY: boolean;
     CC_AGENT_DISALLOWED_TAGS: string[];
     CC_AGENT_DISALLOWED_SYMBOLS: string[];
 };