agent-swarm-kit 1.0.24 → 1.0.26

package/build/index.cjs

@@ -258,6 +258,103 @@ var AgentSchemaService = /** @class */ (function () {
     return AgentSchemaService;
 }());
 
+/**
+ * Validates that the given output string is not empty.
+ *
+ * @param {string} output - The output string to validate.
+ * @returns {Promise<string | null>} - Returns a promise that resolves to "Empty output" if the string is empty, otherwise null.
+ */
+var validateNoEmptyResult = function (output) { return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+        if (!output.trim()) {
+            return [2 /*return*/, "Empty output"];
+        }
+        return [2 /*return*/, null];
+    });
+}); };
+
+var toolParser = new xml2js.Parser();
+/**
+ * Validates that the given output string does not contain any tool call entries or disallowed symbols.
+ * @see https://github.com/ollama/ollama/issues/8287
+ *
+ * @param {string} output - The output string to validate.
+ * @returns {Promise<string | null>} - A promise that resolves to a string indicating a tool call in the text output, or null if no tool call is found.
+ * @throws {Error} - If an error occurs during XML parsing.
+ */
+var validateNoToolCall = functoolsKit.trycatch(function (output) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, _b, symbol, result, _c, _d, tag;
+    var e_1, _e, e_2, _f;
+    return __generator(this, function (_g) {
+        switch (_g.label) {
+            case 0:
+                try {
+                    for (_a = __values(GLOBAL_CONFIG.CC_AGENT_DISALLOWED_SYMBOLS), _b = _a.next(); !_b.done; _b = _a.next()) {
+                        symbol = _b.value;
+                        if (output.includes(symbol)) {
+                            return [2 /*return*/, "Tool call in text output"];
+                        }
+                    }
+                }
+                catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                finally {
+                    try {
+                        if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
+                    }
+                    finally { if (e_1) throw e_1.error; }
+                }
+                return [4 /*yield*/, toolParser.parseStringPromise(output)];
+            case 1:
+                result = _g.sent();
+                try {
+                    for (_c = __values(GLOBAL_CONFIG.CC_AGENT_DISALLOWED_TAGS), _d = _c.next(); !_d.done; _d = _c.next()) {
+                        tag = _d.value;
+                        if (result[tag]) {
+                            return [2 /*return*/, "Tool call in text output"];
+                        }
+                    }
+                }
+                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                finally {
+                    try {
+                        if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
+                    }
+                    finally { if (e_2) throw e_2.error; }
+                }
+                return [2 /*return*/, null];
+        }
+    });
+}); }, {
+    defaultValue: null,
+});
+
+/**
+ * Validates the given output string using a series of validation functions.
+ *
+ * @param {string} output - The output string to validate.
+ * @returns {Promise<string | null>} - A promise that resolves to a validation error message if any validation fails, or null if all validations pass.
+ */
+var validateDefault = function (output) { return __awaiter(void 0, void 0, void 0, function () {
+    var validation;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                validation = null;
+                return [4 /*yield*/, validateNoEmptyResult(output)];
+            case 1:
+                if (validation = _a.sent()) {
+                    return [2 /*return*/, validation];
+                }
+                return [4 /*yield*/, validateNoToolCall(output)];
+            case 2:
+                if (validation = _a.sent()) {
+                    return [2 /*return*/, validation];
+                }
+                return [2 /*return*/, null];
+        }
+    });
+}); };
+
 /**
  * @description `ask for agent function` in `llama3.1:8b` to troubleshoot (need CC_OLLAMA_EMIT_TOOL_PROTOCOL to be turned off)
  */
@@ -293,6 +390,12 @@ var CC_SWARM_DEFAULT_AGENT = function (_a, _b, defaultAgent_1) { return __awaite
         }
     });
 }); };
+var CC_AGENT_DEFAULT_VALIDATION = validateDefault;
+var CC_AGENT_DISALLOWED_TAGS = ["tool_call", "toolcall", "tool"];
+var CC_AGENT_DISALLOWED_SYMBOLS = [
+    "{",
+    "}",
+];
 var CC_KEEP_MESSAGES = 5;
 var CC_ANSWER_TIMEOUT = 120000;
 var CC_GET_AGENT_HISTORY = function () { return new functoolsKit.PubsubArrayAdapter(); };
@@ -304,6 +407,9 @@ var GLOBAL_CONFIG = {
     CC_GET_AGENT_HISTORY: CC_GET_AGENT_HISTORY,
     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_DISALLOWED_TAGS: CC_AGENT_DISALLOWED_TAGS,
+    CC_AGENT_DISALLOWED_SYMBOLS: CC_AGENT_DISALLOWED_SYMBOLS,
 };
 var setConfig = function (config) {
     Object.assign(GLOBAL_CONFIG, config);
@@ -657,108 +763,6 @@ var ClientAgent = /** @class */ (function () {
     return ClientAgent;
 }());
 
-/**
- * Validates that the given output string is not empty.
- *
- * @param {string} output - The output string to validate.
- * @returns {Promise<string | null>} - Returns a promise that resolves to "Empty output" if the string is empty, otherwise null.
- */
-var validateNoEmptyResult = function (output) { return __awaiter(void 0, void 0, void 0, function () {
-    return __generator(this, function (_a) {
-        if (!output.trim()) {
-            return [2 /*return*/, "Empty output"];
-        }
-        return [2 /*return*/, null];
-    });
-}); };
-
-var toolParser = new xml2js.Parser();
-var TOOL_CALL_ENTRIES = ["tool_call", "toolcall", "tool"];
-var DISALLOWED_SYMBOLS = [
-    "{",
-    "}",
-];
-/**
- * Validates that the given output string does not contain any tool call entries or disallowed symbols.
- * @see https://github.com/ollama/ollama/issues/8287
- *
- * @param {string} output - The output string to validate.
- * @returns {Promise<string | null>} - A promise that resolves to a string indicating a tool call in the text output, or null if no tool call is found.
- * @throws {Error} - If an error occurs during XML parsing.
- */
-var validateNoToolCall = functoolsKit.trycatch(function (output) { return __awaiter(void 0, void 0, void 0, function () {
-    var DISALLOWED_SYMBOLS_1, DISALLOWED_SYMBOLS_1_1, symbol, result, TOOL_CALL_ENTRIES_1, TOOL_CALL_ENTRIES_1_1, tag;
-    var e_1, _a, e_2, _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
-            case 0:
-                try {
-                    for (DISALLOWED_SYMBOLS_1 = __values(DISALLOWED_SYMBOLS), DISALLOWED_SYMBOLS_1_1 = DISALLOWED_SYMBOLS_1.next(); !DISALLOWED_SYMBOLS_1_1.done; DISALLOWED_SYMBOLS_1_1 = DISALLOWED_SYMBOLS_1.next()) {
-                        symbol = DISALLOWED_SYMBOLS_1_1.value;
-                        if (output.includes(symbol)) {
-                            return [2 /*return*/, "Tool call in text output"];
-                        }
-                    }
-                }
-                catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                finally {
-                    try {
-                        if (DISALLOWED_SYMBOLS_1_1 && !DISALLOWED_SYMBOLS_1_1.done && (_a = DISALLOWED_SYMBOLS_1.return)) _a.call(DISALLOWED_SYMBOLS_1);
-                    }
-                    finally { if (e_1) throw e_1.error; }
-                }
-                return [4 /*yield*/, toolParser.parseStringPromise(output)];
-            case 1:
-                result = _c.sent();
-                try {
-                    for (TOOL_CALL_ENTRIES_1 = __values(TOOL_CALL_ENTRIES), TOOL_CALL_ENTRIES_1_1 = TOOL_CALL_ENTRIES_1.next(); !TOOL_CALL_ENTRIES_1_1.done; TOOL_CALL_ENTRIES_1_1 = TOOL_CALL_ENTRIES_1.next()) {
-                        tag = TOOL_CALL_ENTRIES_1_1.value;
-                        if (result[tag]) {
-                            return [2 /*return*/, "Tool call in text output"];
-                        }
-                    }
-                }
-                catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                finally {
-                    try {
-                        if (TOOL_CALL_ENTRIES_1_1 && !TOOL_CALL_ENTRIES_1_1.done && (_b = TOOL_CALL_ENTRIES_1.return)) _b.call(TOOL_CALL_ENTRIES_1);
-                    }
-                    finally { if (e_2) throw e_2.error; }
-                }
-                return [2 /*return*/, null];
-        }
-    });
-}); }, {
-    defaultValue: null,
-});
-
-/**
- * Validates the given output string using a series of validation functions.
- *
- * @param {string} output - The output string to validate.
- * @returns {Promise<string | null>} - A promise that resolves to a validation error message if any validation fails, or null if all validations pass.
- */
-var validateDefault = function (output) { return __awaiter(void 0, void 0, void 0, function () {
-    var validation;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                validation = null;
-                return [4 /*yield*/, validateNoEmptyResult(output)];
-            case 1:
-                if (validation = _a.sent()) {
-                    return [2 /*return*/, validation];
-                }
-                return [4 /*yield*/, validateNoToolCall(output)];
-            case 2:
-                if (validation = _a.sent()) {
-                    return [2 /*return*/, validation];
-                }
-                return [2 /*return*/, null];
-        }
-    });
-}); };
-
 /**
  * Service for managing agent connections.
  * @implements {IAgent}

package/build/index.mjs

@@ -1,5 +1,5 @@
 import { scoped } from 'di-scoped';
-import { ToolRegistry, sleep, PubsubArrayAdapter, Subject, queued, not, trycatch, memoize, schedule, ttl, singleshot, Source } from 'functools-kit';
+import { ToolRegistry, trycatch, sleep, PubsubArrayAdapter, Subject, queued, not, memoize, schedule, ttl, singleshot, Source } from 'functools-kit';
 import { createActivator } from 'di-kit';
 import { omit } from 'lodash-es';
 import xml2js from 'xml2js';
@@ -256,6 +256,103 @@ var AgentSchemaService = /** @class */ (function () {
     return AgentSchemaService;
 }());
 
+/**
+ * Validates that the given output string is not empty.
+ *
+ * @param {string} output - The output string to validate.
+ * @returns {Promise<string | null>} - Returns a promise that resolves to "Empty output" if the string is empty, otherwise null.
+ */
+var validateNoEmptyResult = function (output) { return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+        if (!output.trim()) {
+            return [2 /*return*/, "Empty output"];
+        }
+        return [2 /*return*/, null];
+    });
+}); };
+
+var toolParser = new xml2js.Parser();
+/**
+ * Validates that the given output string does not contain any tool call entries or disallowed symbols.
+ * @see https://github.com/ollama/ollama/issues/8287
+ *
+ * @param {string} output - The output string to validate.
+ * @returns {Promise<string | null>} - A promise that resolves to a string indicating a tool call in the text output, or null if no tool call is found.
+ * @throws {Error} - If an error occurs during XML parsing.
+ */
+var validateNoToolCall = trycatch(function (output) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, _b, symbol, result, _c, _d, tag;
+    var e_1, _e, e_2, _f;
+    return __generator(this, function (_g) {
+        switch (_g.label) {
+            case 0:
+                try {
+                    for (_a = __values(GLOBAL_CONFIG.CC_AGENT_DISALLOWED_SYMBOLS), _b = _a.next(); !_b.done; _b = _a.next()) {
+                        symbol = _b.value;
+                        if (output.includes(symbol)) {
+                            return [2 /*return*/, "Tool call in text output"];
+                        }
+                    }
+                }
+                catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                finally {
+                    try {
+                        if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
+                    }
+                    finally { if (e_1) throw e_1.error; }
+                }
+                return [4 /*yield*/, toolParser.parseStringPromise(output)];
+            case 1:
+                result = _g.sent();
+                try {
+                    for (_c = __values(GLOBAL_CONFIG.CC_AGENT_DISALLOWED_TAGS), _d = _c.next(); !_d.done; _d = _c.next()) {
+                        tag = _d.value;
+                        if (result[tag]) {
+                            return [2 /*return*/, "Tool call in text output"];
+                        }
+                    }
+                }
+                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                finally {
+                    try {
+                        if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
+                    }
+                    finally { if (e_2) throw e_2.error; }
+                }
+                return [2 /*return*/, null];
+        }
+    });
+}); }, {
+    defaultValue: null,
+});
+
+/**
+ * Validates the given output string using a series of validation functions.
+ *
+ * @param {string} output - The output string to validate.
+ * @returns {Promise<string | null>} - A promise that resolves to a validation error message if any validation fails, or null if all validations pass.
+ */
+var validateDefault = function (output) { return __awaiter(void 0, void 0, void 0, function () {
+    var validation;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                validation = null;
+                return [4 /*yield*/, validateNoEmptyResult(output)];
+            case 1:
+                if (validation = _a.sent()) {
+                    return [2 /*return*/, validation];
+                }
+                return [4 /*yield*/, validateNoToolCall(output)];
+            case 2:
+                if (validation = _a.sent()) {
+                    return [2 /*return*/, validation];
+                }
+                return [2 /*return*/, null];
+        }
+    });
+}); };
+
 /**
  * @description `ask for agent function` in `llama3.1:8b` to troubleshoot (need CC_OLLAMA_EMIT_TOOL_PROTOCOL to be turned off)
  */
@@ -291,6 +388,12 @@ var CC_SWARM_DEFAULT_AGENT = function (_a, _b, defaultAgent_1) { return __awaite
         }
     });
 }); };
+var CC_AGENT_DEFAULT_VALIDATION = validateDefault;
+var CC_AGENT_DISALLOWED_TAGS = ["tool_call", "toolcall", "tool"];
+var CC_AGENT_DISALLOWED_SYMBOLS = [
+    "{",
+    "}",
+];
 var CC_KEEP_MESSAGES = 5;
 var CC_ANSWER_TIMEOUT = 120000;
 var CC_GET_AGENT_HISTORY = function () { return new PubsubArrayAdapter(); };
@@ -302,6 +405,9 @@ var GLOBAL_CONFIG = {
     CC_GET_AGENT_HISTORY: CC_GET_AGENT_HISTORY,
     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_DISALLOWED_TAGS: CC_AGENT_DISALLOWED_TAGS,
+    CC_AGENT_DISALLOWED_SYMBOLS: CC_AGENT_DISALLOWED_SYMBOLS,
 };
 var setConfig = function (config) {
     Object.assign(GLOBAL_CONFIG, config);
@@ -655,108 +761,6 @@ var ClientAgent = /** @class */ (function () {
     return ClientAgent;
 }());
 
-/**
- * Validates that the given output string is not empty.
- *
- * @param {string} output - The output string to validate.
- * @returns {Promise<string | null>} - Returns a promise that resolves to "Empty output" if the string is empty, otherwise null.
- */
-var validateNoEmptyResult = function (output) { return __awaiter(void 0, void 0, void 0, function () {
-    return __generator(this, function (_a) {
-        if (!output.trim()) {
-            return [2 /*return*/, "Empty output"];
-        }
-        return [2 /*return*/, null];
-    });
-}); };
-
-var toolParser = new xml2js.Parser();
-var TOOL_CALL_ENTRIES = ["tool_call", "toolcall", "tool"];
-var DISALLOWED_SYMBOLS = [
-    "{",
-    "}",
-];
-/**
- * Validates that the given output string does not contain any tool call entries or disallowed symbols.
- * @see https://github.com/ollama/ollama/issues/8287
- *
- * @param {string} output - The output string to validate.
- * @returns {Promise<string | null>} - A promise that resolves to a string indicating a tool call in the text output, or null if no tool call is found.
- * @throws {Error} - If an error occurs during XML parsing.
- */
-var validateNoToolCall = trycatch(function (output) { return __awaiter(void 0, void 0, void 0, function () {
-    var DISALLOWED_SYMBOLS_1, DISALLOWED_SYMBOLS_1_1, symbol, result, TOOL_CALL_ENTRIES_1, TOOL_CALL_ENTRIES_1_1, tag;
-    var e_1, _a, e_2, _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
-            case 0:
-                try {
-                    for (DISALLOWED_SYMBOLS_1 = __values(DISALLOWED_SYMBOLS), DISALLOWED_SYMBOLS_1_1 = DISALLOWED_SYMBOLS_1.next(); !DISALLOWED_SYMBOLS_1_1.done; DISALLOWED_SYMBOLS_1_1 = DISALLOWED_SYMBOLS_1.next()) {
-                        symbol = DISALLOWED_SYMBOLS_1_1.value;
-                        if (output.includes(symbol)) {
-                            return [2 /*return*/, "Tool call in text output"];
-                        }
-                    }
-                }
-                catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                finally {
-                    try {
-                        if (DISALLOWED_SYMBOLS_1_1 && !DISALLOWED_SYMBOLS_1_1.done && (_a = DISALLOWED_SYMBOLS_1.return)) _a.call(DISALLOWED_SYMBOLS_1);
-                    }
-                    finally { if (e_1) throw e_1.error; }
-                }
-                return [4 /*yield*/, toolParser.parseStringPromise(output)];
-            case 1:
-                result = _c.sent();
-                try {
-                    for (TOOL_CALL_ENTRIES_1 = __values(TOOL_CALL_ENTRIES), TOOL_CALL_ENTRIES_1_1 = TOOL_CALL_ENTRIES_1.next(); !TOOL_CALL_ENTRIES_1_1.done; TOOL_CALL_ENTRIES_1_1 = TOOL_CALL_ENTRIES_1.next()) {
-                        tag = TOOL_CALL_ENTRIES_1_1.value;
-                        if (result[tag]) {
-                            return [2 /*return*/, "Tool call in text output"];
-                        }
-                    }
-                }
-                catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                finally {
-                    try {
-                        if (TOOL_CALL_ENTRIES_1_1 && !TOOL_CALL_ENTRIES_1_1.done && (_b = TOOL_CALL_ENTRIES_1.return)) _b.call(TOOL_CALL_ENTRIES_1);
-                    }
-                    finally { if (e_2) throw e_2.error; }
-                }
-                return [2 /*return*/, null];
-        }
-    });
-}); }, {
-    defaultValue: null,
-});
-
-/**
- * Validates the given output string using a series of validation functions.
- *
- * @param {string} output - The output string to validate.
- * @returns {Promise<string | null>} - A promise that resolves to a validation error message if any validation fails, or null if all validations pass.
- */
-var validateDefault = function (output) { return __awaiter(void 0, void 0, void 0, function () {
-    var validation;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                validation = null;
-                return [4 /*yield*/, validateNoEmptyResult(output)];
-            case 1:
-                if (validation = _a.sent()) {
-                    return [2 /*return*/, validation];
-                }
-                return [4 /*yield*/, validateNoToolCall(output)];
-            case 2:
-                if (validation = _a.sent()) {
-                    return [2 /*return*/, validation];
-                }
-                return [2 /*return*/, null];
-        }
-    });
-}); };
-
 /**
  * Service for managing agent connections.
  * @implements {IAgent}

package/package.json

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

package/types.d.ts

@@ -1806,7 +1806,10 @@ declare const GLOBAL_CONFIG: {
     CC_GET_AGENT_HISTORY: (clientId: string, agentName: AgentName) => IPubsubArray<IModelMessage>;
     CC_SWARM_AGENT_CHANGED: (clientId: string, agentName: AgentName, swarmName: SwarmName) => Promise<void>;
     CC_SWARM_DEFAULT_AGENT: (clientId: string, swarmName: SwarmName, defaultAgent: AgentName) => Promise<AgentName>;
+    CC_AGENT_DEFAULT_VALIDATION: (output: string) => Promise<string | null>;
+    CC_AGENT_DISALLOWED_TAGS: string[];
+    CC_AGENT_DISALLOWED_SYMBOLS: string[];
 };
-declare const setConfig: (config: typeof GLOBAL_CONFIG) => void;
+declare const setConfig: (config: Partial<typeof GLOBAL_CONFIG>) => void;
 
-export { ContextService, type IAgentSchema, type IAgentTool, type ICompletionSchema, type IIncomingMessage, type IMakeConnectionConfig, type IMakeDisposeParams, type IModelMessage, type IOutgoingMessage, type ISessionConfig, type ISwarmSchema, type ITool, type IToolCall, type ReceiveMessageFn, type SendMessageFn$1 as SendMessageFn, addAgent, addCompletion, addSwarm, addTool, changeAgent, commitSystemMessage, commitToolOutput, commitUserMessage, complete, disposeConnection, emit, execute, getAgentHistory, getAgentName, getAssistantHistory, getLastAssistantMessage, getLastSystemMessage, getLastUserMessage, getRawHistory, getUserHistory, makeAutoDispose, makeConnection, session, setConfig, swarm };
+export { ContextService, type IAgentSchema, type IAgentTool, type ICompletionArgs, type ICompletionSchema, type IIncomingMessage, type IMakeConnectionConfig, type IMakeDisposeParams, type IModelMessage, type IOutgoingMessage, type ISessionConfig, type ISwarmSchema, type ITool, type IToolCall, type ReceiveMessageFn, type SendMessageFn$1 as SendMessageFn, addAgent, addCompletion, addSwarm, addTool, changeAgent, commitSystemMessage, commitToolOutput, commitUserMessage, complete, disposeConnection, emit, execute, getAgentHistory, getAgentName, getAssistantHistory, getLastAssistantMessage, getLastSystemMessage, getLastUserMessage, getRawHistory, getUserHistory, makeAutoDispose, makeConnection, session, setConfig, swarm };