agent-swarm-kit 1.1.115 → 1.1.117

package/build/index.cjs

@@ -3829,7 +3829,12 @@ const RUN_FN = async (incoming, self) => {
         mode: "user",
         tools: [],
     };
-    const rawMessage = await self.params.completion.getCompletion(args);
+    const completionMessage = await self.params.completion.getCompletion(args);
+    const rawMessage = {
+        agentName: self.params.agentName,
+        mode: "tool",
+        ...completionMessage,
+    };
     self.params.completion.callbacks?.onComplete &&
         self.params.completion.callbacks?.onComplete(args, rawMessage);
     const message = await self.params.map(rawMessage, self.params.clientId, self.params.agentName);
@@ -4376,7 +4381,12 @@ class ClientAgent {
             mode,
             tools: await resolveTools(this.params.clientId, this.params.agentName, tools),
         };
-        const output = await this.params.completion.getCompletion(args);
+        const rawMessage = await this.params.completion.getCompletion(args);
+        const output = {
+            agentName: this.params.agentName,
+            mode: "tool",
+            ...rawMessage,
+        };
         if (GLOBAL_CONFIG.CC_RESQUE_STRATEGY === "flush") {
             this.params.completion.callbacks?.onComplete &&
                 this.params.completion.callbacks?.onComplete(args, output);
@@ -4423,7 +4433,12 @@ class ClientAgent {
                 mode,
                 tools: await resolveTools(this.params.clientId, this.params.agentName, tools),
             };
-            const output = await this.params.completion.getCompletion(args);
+            const rawMessage = await this.params.completion.getCompletion(args);
+            const output = {
+                agentName: this.params.agentName,
+                mode: "tool",
+                ...rawMessage,
+            };
             this.params.completion.callbacks?.onComplete &&
                 this.params.completion.callbacks?.onComplete(args, output);
             return {
@@ -9737,6 +9752,15 @@ class AgentValidationService {
          * @readonly
          */
         this.loggerService = inject(TYPES.loggerService);
+        /**
+         * Completion schema service instance for managing completion schemas.
+         * Injected via DI, used in validate method to check agent completions.
+         * Provides a registry of completion schemas for the swarm.
+         * @type {CompletionSchemaService}
+         * @private
+         * @readonly
+         */
+        this.completionSchemaService = inject(TYPES.completionSchemaService);
         /**
          * Tool validation service instance for validating tools associated with agents.
          * Injected via DI, used in validate method to check agent tools.
@@ -9984,6 +10008,10 @@ class AgentValidationService {
             if (!agent) {
                 throw new Error(`agent-swarm agent ${agentName} not found source=${source}`);
             }
+            const completionSchema = this.completionSchemaService.get(agent.completion);
+            if (completionSchema.json) {
+                throw new Error(`agent-swarm agent ${agentName} completion schema is JSON source=${source}`);
+            }
             if (!agent.operator) {
                 this.completionValidationService.validate(agent.completion, source);
             }
@@ -13448,6 +13476,10 @@ class DocService {
                 }
                 result.push("");
             }
+            if (outlineSchema.completion) {
+                result.push(`**Completion:** \`${sanitizeMarkdown(outlineSchema.completion)}\``);
+                result.push("");
+            }
             const getPrompt = async () => {
                 try {
                     if (typeof outlineSchema.prompt === "string") {
@@ -18227,7 +18259,7 @@ class OutlineSchemaService {
         this._registry = new functoolsKit.ToolRegistry("outlineSchemaService");
         /**
          * Validates an outline schema for required properties and correct types.
-         * Ensures `outlineName` is a string, `getStructuredOutput` is a function, and `validations` (if present) is an array of valid validation functions or objects.
+         * Ensures `outlineName` is a string, `getOutlineHistory` is a function, and `validations` (if present) is an array of valid validation functions or objects.
          * Logs validation attempts if `CC_LOGGER_ENABLE_INFO` is enabled.
          * @private
          * @param {IOutlineSchema} outlineSchema - The outline schema to validate.
@@ -18241,13 +18273,18 @@ class OutlineSchemaService {
             if (typeof outlineSchema.outlineName !== "string") {
                 throw new Error(`agent-swarm outline schema validation failed: missing outlineName`);
             }
-            if (typeof outlineSchema.getStructuredOutput !== "function") {
-                throw new Error(`agent-swarm outline schema validation failed: missing getStructuredOutput for outlineName=${outlineSchema.outlineName}`);
+            if (typeof outlineSchema.completion !== "string") {
+                throw new Error(`agent-swarm outline schema validation failed: missing completion for outlineName=${outlineSchema.outlineName}`);
+            }
+            if (typeof outlineSchema.getOutlineHistory !== "function") {
+                throw new Error(`agent-swarm outline schema validation failed: missing getOutlineHistory for outlineName=${outlineSchema.outlineName}`);
             }
-            if (outlineSchema.validations && !Array.isArray(outlineSchema.validations)) {
+            if (outlineSchema.validations &&
+                !Array.isArray(outlineSchema.validations)) {
                 throw new Error(`agent-swarm outline schema validation failed: validations is not an array for outlineName=${outlineSchema.outlineName}`);
             }
-            if (outlineSchema.validations && !outlineSchema.validations?.some((validation) => typeof validation !== "function" && !functoolsKit.isObject(validation))) {
+            if (outlineSchema.validations &&
+                outlineSchema.validations?.some((validation) => typeof validation !== "function" && !functoolsKit.isObject(validation))) {
                 throw new Error(`agent-swarm outline schema validation failed: invalid validations for outlineName=${outlineSchema.outlineName}`);
             }
         };
@@ -18330,6 +18367,22 @@ class OutlineValidationService {
          * @type {LoggerService}
          */
         this.loggerService = inject(TYPES.loggerService);
+        /**
+         * Completion schema service instance for managing completion schemas.
+         * Injected via DI, used in validate method to check outline completions.
+         * Provides a registry of completion schemas for the swarm.
+         * @type {CompletionSchemaService}
+         * @private
+         */
+        this.completionSchemaService = inject(TYPES.completionSchemaService);
+        /**
+         * Completion validation service instance for validating completion configurations of outlines.
+         * Injected via DI, used in validate method to check outline completion.
+         * @type {CompletionValidationService}
+         * @private
+         * @readonly
+         */
+        this.completionValidationService = inject(TYPES.completionValidationService);
         /**
          * A map storing outline schemas, keyed by their unique outline names.
          * Used to manage registered outlines and retrieve them for validation.
@@ -18383,6 +18436,11 @@ class OutlineValidationService {
             if (!outline) {
                 throw new Error(`agent-swarm outline ${outlineName} not found source=${source}`);
             }
+            const completionSchema = this.completionSchemaService.get(outline.completion);
+            if (!completionSchema.json) {
+                throw new Error(`agent-swarm outline ${outlineName} completion schema is not JSON source=${source}`);
+            }
+            this.completionValidationService.validate(outline.completion, source);
             return true;
         });
     }
@@ -21133,10 +21191,11 @@ class OutlineHistory {
     constructor(prompt) {
         /** @private */
         this.messages = [];
-        prompt && this.messages.push({
-            role: "system",
-            content: prompt
-        });
+        prompt &&
+            this.messages.push({
+                role: "system",
+                content: prompt,
+            });
     }
     /**
      * Appends one or more messages to the history.
@@ -21179,7 +21238,9 @@ const jsonInternal = beginContext(async (outlineName, param) => {
         swarm$1.loggerService.log(METHOD_NAME$D, {});
     swarm$1.outlineValidationService.validate(outlineName, METHOD_NAME$D);
     const resultId = functoolsKit.randomString();
-    const { getStructuredOutput, validations = [], maxAttempts = MAX_ATTEMPTS, format, prompt, callbacks, } = swarm$1.outlineSchemaService.get(outlineName);
+    const { getOutlineHistory, completion, validations = [], maxAttempts = MAX_ATTEMPTS, format, prompt, callbacks: outlineCallbacks, } = swarm$1.outlineSchemaService.get(outlineName);
+    swarm$1.completionValidationService.validate(completion, METHOD_NAME$D);
+    const { getCompletion, callbacks: completionCallbacks } = swarm$1.completionSchemaService.get(completion);
     let errorMessage = "";
     let history;
     const systemPrompt = functoolsKit.str.newline(typeof prompt === "function" ? await prompt(outlineName) : prompt);
@@ -21191,41 +21252,60 @@ const jsonInternal = beginContext(async (outlineName, param) => {
             param,
             history,
         };
-        if (callbacks?.onAttempt) {
-            callbacks.onAttempt(inputArgs);
+        if (outlineCallbacks?.onAttempt) {
+            outlineCallbacks.onAttempt(inputArgs);
         }
-        const data = await getStructuredOutput(inputArgs);
-        const validationArgs = {
-            ...inputArgs,
-            data,
-        };
-        let isValid = true;
-        for (const validation of validations) {
-            const validate = typeof validation === "object" ? validation.validate : validation;
-            try {
-                await validate(validationArgs);
+        await getOutlineHistory(inputArgs);
+        const messages = await history.list();
+        try {
+            const output = await getCompletion({
+                messages: await history.list(),
+                mode: "tool",
+                outlineName,
+            });
+            if (completionCallbacks?.onComplete) {
+                completionCallbacks.onComplete({
+                    messages,
+                    mode: "tool",
+                    outlineName,
+                }, output);
             }
-            catch (error) {
-                isValid = false;
-                errorMessage = functoolsKit.getErrorMessage(error);
-                break;
+            const data = JSON.parse(output.content);
+            const validationArgs = {
+                ...inputArgs,
+                data,
+            };
+            let isValid = true;
+            for (const validation of validations) {
+                const validate = typeof validation === "object" ? validation.validate : validation;
+                try {
+                    await validate(validationArgs);
+                }
+                catch (error) {
+                    isValid = false;
+                    errorMessage = functoolsKit.getErrorMessage(error);
+                    break;
+                }
             }
+            if (!isValid) {
+                continue;
+            }
+            const result = {
+                isValid: true,
+                attempt,
+                param,
+                history: await history.list(),
+                data,
+                resultId,
+            };
+            if (outlineCallbacks?.onValidDocument) {
+                outlineCallbacks.onValidDocument(result);
+            }
+            return result;
         }
-        if (!isValid) {
-            continue;
-        }
-        const result = {
-            isValid: true,
-            attempt,
-            param,
-            history: await history.list(),
-            data,
-            resultId,
-        };
-        if (callbacks?.onValidDocument) {
-            callbacks.onValidDocument(result);
+        catch (error) {
+            errorMessage = functoolsKit.getErrorMessage(error);
         }
-        return result;
     }
     const result = {
         isValid: false,
@@ -21236,8 +21316,8 @@ const jsonInternal = beginContext(async (outlineName, param) => {
         data: null,
         resultId,
     };
-    if (callbacks?.onInvalidDocument) {
-        callbacks.onInvalidDocument(result);
+    if (outlineCallbacks?.onInvalidDocument) {
+        outlineCallbacks.onInvalidDocument(result);
     }
     return result;
 });

package/build/index.mjs

@@ -3827,7 +3827,12 @@ const RUN_FN = async (incoming, self) => {
         mode: "user",
         tools: [],
     };
-    const rawMessage = await self.params.completion.getCompletion(args);
+    const completionMessage = await self.params.completion.getCompletion(args);
+    const rawMessage = {
+        agentName: self.params.agentName,
+        mode: "tool",
+        ...completionMessage,
+    };
     self.params.completion.callbacks?.onComplete &&
         self.params.completion.callbacks?.onComplete(args, rawMessage);
     const message = await self.params.map(rawMessage, self.params.clientId, self.params.agentName);
@@ -4374,7 +4379,12 @@ class ClientAgent {
             mode,
             tools: await resolveTools(this.params.clientId, this.params.agentName, tools),
         };
-        const output = await this.params.completion.getCompletion(args);
+        const rawMessage = await this.params.completion.getCompletion(args);
+        const output = {
+            agentName: this.params.agentName,
+            mode: "tool",
+            ...rawMessage,
+        };
         if (GLOBAL_CONFIG.CC_RESQUE_STRATEGY === "flush") {
             this.params.completion.callbacks?.onComplete &&
                 this.params.completion.callbacks?.onComplete(args, output);
@@ -4421,7 +4431,12 @@ class ClientAgent {
                 mode,
                 tools: await resolveTools(this.params.clientId, this.params.agentName, tools),
             };
-            const output = await this.params.completion.getCompletion(args);
+            const rawMessage = await this.params.completion.getCompletion(args);
+            const output = {
+                agentName: this.params.agentName,
+                mode: "tool",
+                ...rawMessage,
+            };
             this.params.completion.callbacks?.onComplete &&
                 this.params.completion.callbacks?.onComplete(args, output);
             return {
@@ -9735,6 +9750,15 @@ class AgentValidationService {
          * @readonly
          */
         this.loggerService = inject(TYPES.loggerService);
+        /**
+         * Completion schema service instance for managing completion schemas.
+         * Injected via DI, used in validate method to check agent completions.
+         * Provides a registry of completion schemas for the swarm.
+         * @type {CompletionSchemaService}
+         * @private
+         * @readonly
+         */
+        this.completionSchemaService = inject(TYPES.completionSchemaService);
         /**
          * Tool validation service instance for validating tools associated with agents.
          * Injected via DI, used in validate method to check agent tools.
@@ -9982,6 +10006,10 @@ class AgentValidationService {
             if (!agent) {
                 throw new Error(`agent-swarm agent ${agentName} not found source=${source}`);
             }
+            const completionSchema = this.completionSchemaService.get(agent.completion);
+            if (completionSchema.json) {
+                throw new Error(`agent-swarm agent ${agentName} completion schema is JSON source=${source}`);
+            }
             if (!agent.operator) {
                 this.completionValidationService.validate(agent.completion, source);
             }
@@ -13446,6 +13474,10 @@ class DocService {
                 }
                 result.push("");
             }
+            if (outlineSchema.completion) {
+                result.push(`**Completion:** \`${sanitizeMarkdown(outlineSchema.completion)}\``);
+                result.push("");
+            }
             const getPrompt = async () => {
                 try {
                     if (typeof outlineSchema.prompt === "string") {
@@ -18225,7 +18257,7 @@ class OutlineSchemaService {
         this._registry = new ToolRegistry("outlineSchemaService");
         /**
          * Validates an outline schema for required properties and correct types.
-         * Ensures `outlineName` is a string, `getStructuredOutput` is a function, and `validations` (if present) is an array of valid validation functions or objects.
+         * Ensures `outlineName` is a string, `getOutlineHistory` is a function, and `validations` (if present) is an array of valid validation functions or objects.
          * Logs validation attempts if `CC_LOGGER_ENABLE_INFO` is enabled.
          * @private
          * @param {IOutlineSchema} outlineSchema - The outline schema to validate.
@@ -18239,13 +18271,18 @@ class OutlineSchemaService {
             if (typeof outlineSchema.outlineName !== "string") {
                 throw new Error(`agent-swarm outline schema validation failed: missing outlineName`);
             }
-            if (typeof outlineSchema.getStructuredOutput !== "function") {
-                throw new Error(`agent-swarm outline schema validation failed: missing getStructuredOutput for outlineName=${outlineSchema.outlineName}`);
+            if (typeof outlineSchema.completion !== "string") {
+                throw new Error(`agent-swarm outline schema validation failed: missing completion for outlineName=${outlineSchema.outlineName}`);
+            }
+            if (typeof outlineSchema.getOutlineHistory !== "function") {
+                throw new Error(`agent-swarm outline schema validation failed: missing getOutlineHistory for outlineName=${outlineSchema.outlineName}`);
             }
-            if (outlineSchema.validations && !Array.isArray(outlineSchema.validations)) {
+            if (outlineSchema.validations &&
+                !Array.isArray(outlineSchema.validations)) {
                 throw new Error(`agent-swarm outline schema validation failed: validations is not an array for outlineName=${outlineSchema.outlineName}`);
             }
-            if (outlineSchema.validations && !outlineSchema.validations?.some((validation) => typeof validation !== "function" && !isObject$1(validation))) {
+            if (outlineSchema.validations &&
+                outlineSchema.validations?.some((validation) => typeof validation !== "function" && !isObject$1(validation))) {
                 throw new Error(`agent-swarm outline schema validation failed: invalid validations for outlineName=${outlineSchema.outlineName}`);
             }
         };
@@ -18328,6 +18365,22 @@ class OutlineValidationService {
          * @type {LoggerService}
          */
         this.loggerService = inject(TYPES.loggerService);
+        /**
+         * Completion schema service instance for managing completion schemas.
+         * Injected via DI, used in validate method to check outline completions.
+         * Provides a registry of completion schemas for the swarm.
+         * @type {CompletionSchemaService}
+         * @private
+         */
+        this.completionSchemaService = inject(TYPES.completionSchemaService);
+        /**
+         * Completion validation service instance for validating completion configurations of outlines.
+         * Injected via DI, used in validate method to check outline completion.
+         * @type {CompletionValidationService}
+         * @private
+         * @readonly
+         */
+        this.completionValidationService = inject(TYPES.completionValidationService);
         /**
          * A map storing outline schemas, keyed by their unique outline names.
          * Used to manage registered outlines and retrieve them for validation.
@@ -18381,6 +18434,11 @@ class OutlineValidationService {
             if (!outline) {
                 throw new Error(`agent-swarm outline ${outlineName} not found source=${source}`);
             }
+            const completionSchema = this.completionSchemaService.get(outline.completion);
+            if (!completionSchema.json) {
+                throw new Error(`agent-swarm outline ${outlineName} completion schema is not JSON source=${source}`);
+            }
+            this.completionValidationService.validate(outline.completion, source);
             return true;
         });
     }
@@ -21131,10 +21189,11 @@ class OutlineHistory {
     constructor(prompt) {
         /** @private */
         this.messages = [];
-        prompt && this.messages.push({
-            role: "system",
-            content: prompt
-        });
+        prompt &&
+            this.messages.push({
+                role: "system",
+                content: prompt,
+            });
     }
     /**
      * Appends one or more messages to the history.
@@ -21177,7 +21236,9 @@ const jsonInternal = beginContext(async (outlineName, param) => {
         swarm$1.loggerService.log(METHOD_NAME$D, {});
     swarm$1.outlineValidationService.validate(outlineName, METHOD_NAME$D);
     const resultId = randomString();
-    const { getStructuredOutput, validations = [], maxAttempts = MAX_ATTEMPTS, format, prompt, callbacks, } = swarm$1.outlineSchemaService.get(outlineName);
+    const { getOutlineHistory, completion, validations = [], maxAttempts = MAX_ATTEMPTS, format, prompt, callbacks: outlineCallbacks, } = swarm$1.outlineSchemaService.get(outlineName);
+    swarm$1.completionValidationService.validate(completion, METHOD_NAME$D);
+    const { getCompletion, callbacks: completionCallbacks } = swarm$1.completionSchemaService.get(completion);
     let errorMessage = "";
     let history;
     const systemPrompt = str.newline(typeof prompt === "function" ? await prompt(outlineName) : prompt);
@@ -21189,41 +21250,60 @@ const jsonInternal = beginContext(async (outlineName, param) => {
             param,
             history,
         };
-        if (callbacks?.onAttempt) {
-            callbacks.onAttempt(inputArgs);
+        if (outlineCallbacks?.onAttempt) {
+            outlineCallbacks.onAttempt(inputArgs);
         }
-        const data = await getStructuredOutput(inputArgs);
-        const validationArgs = {
-            ...inputArgs,
-            data,
-        };
-        let isValid = true;
-        for (const validation of validations) {
-            const validate = typeof validation === "object" ? validation.validate : validation;
-            try {
-                await validate(validationArgs);
+        await getOutlineHistory(inputArgs);
+        const messages = await history.list();
+        try {
+            const output = await getCompletion({
+                messages: await history.list(),
+                mode: "tool",
+                outlineName,
+            });
+            if (completionCallbacks?.onComplete) {
+                completionCallbacks.onComplete({
+                    messages,
+                    mode: "tool",
+                    outlineName,
+                }, output);
             }
-            catch (error) {
-                isValid = false;
-                errorMessage = getErrorMessage(error);
-                break;
+            const data = JSON.parse(output.content);
+            const validationArgs = {
+                ...inputArgs,
+                data,
+            };
+            let isValid = true;
+            for (const validation of validations) {
+                const validate = typeof validation === "object" ? validation.validate : validation;
+                try {
+                    await validate(validationArgs);
+                }
+                catch (error) {
+                    isValid = false;
+                    errorMessage = getErrorMessage(error);
+                    break;
+                }
             }
+            if (!isValid) {
+                continue;
+            }
+            const result = {
+                isValid: true,
+                attempt,
+                param,
+                history: await history.list(),
+                data,
+                resultId,
+            };
+            if (outlineCallbacks?.onValidDocument) {
+                outlineCallbacks.onValidDocument(result);
+            }
+            return result;
         }
-        if (!isValid) {
-            continue;
-        }
-        const result = {
-            isValid: true,
-            attempt,
-            param,
-            history: await history.list(),
-            data,
-            resultId,
-        };
-        if (callbacks?.onValidDocument) {
-            callbacks.onValidDocument(result);
+        catch (error) {
+            errorMessage = getErrorMessage(error);
         }
-        return result;
     }
     const result = {
         isValid: false,
@@ -21234,8 +21314,8 @@ const jsonInternal = beginContext(async (outlineName, param) => {
         data: null,
         resultId,
     };
-    if (callbacks?.onInvalidDocument) {
-        callbacks.onInvalidDocument(result);
+    if (outlineCallbacks?.onInvalidDocument) {
+        outlineCallbacks.onInvalidDocument(result);
     }
     return result;
 });

package/package.json

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