@zimtsui/typechat 0.0.89 → 0.0.91

package/assets/verbatim/declarations.handlebars

@@ -1,9 +1,11 @@
 {{#each declarations}}
-<verbatim:declaration name="{{this.name}}">
-    <verbatim:description>{{this.description}}</verbatim:description>
+<verbatim:declaration name="{{AssertXmlAttr this.name}}">
+    <verbatim:description mime-type="text/markdown"><![CDATA[{{{this.description}}}]]></verbatim:description>
     {{#each this.parameters}}
-    <verbatim:parameter name="{{this.name}}" mime-type="{{XmlAttr this.mimeType}}" required="{{#if this.required}}true{{else}}false{{/if}}">
-        <verbatim:description>{{this.description}}</verbatim:description>
+    <verbatim:parameter name="{{AssertXmlAttr this.name}}">
+        <verbatim:description mime-type="text/markdown"><![CDATA[{{{this.description}}}]]></verbatim:description>
+        <verbatim:mime-type>{{XmlBody this.mimeType}}</verbatim:mime-type>
+        <verbatim:required>{{#if this.required}}true{{else}}false{{/if}}</verbatim:required>
     </verbatim:parameter>
     {{/each}}
 </verbatim:declaration>

package/assets/verbatim/instruction.md

@@ -8,15 +8,19 @@ XML Verbatim Channel is designed to avoid escaping in structured output of large
 
 ## Declaration
 
-The system or the user is expected to declare all available XML Verbatim Channels in the form of
+The LLM system/user message is expected to declare all available XML Verbatim Channels in the form of
 
 <verbatim:declaration name="NAME_OF_CHANNEL">
     <verbatim:description>DESCRIPTION_OF_CHANNEL</verbatim:description>
-    <verbatim:parameter name="NAME_OF_PARAMETER_1" mime-type="MIME_TYPE_OF_PARAMETER" required="WHETHER_PARAMETER_IS_REQUIRED">
+    <verbatim:parameter name="NAME_OF_PARAMETER_1">
         <verbatim:description>DESCRIPTION_OF_PARAMETER</verbatim:description>
+        <verbatim:mime-type>MIME_TYPE_OF_PARAMETER</verbatim:mime-type>
+        <verbatim:required>WHETHER_PARAMETER_IS_REQUIRED</verbatim:required>
     </verbatim:parameter>
-    <verbatim:parameter name="NAME_OF_PARAMETER_2" mime-type="MIME_TYPE_OF_PARAMETER" required="WHETHER_PARAMETER_IS_REQUIRED">
+    <verbatim:parameter name="NAME_OF_PARAMETER_2">
         <verbatim:description>DESCRIPTION_OF_PARAMETER</verbatim:description>
+        <verbatim:mime-type>MIME_TYPE_OF_PARAMETER</verbatim:mime-type>
+        <verbatim:required>WHETHER_PARAMETER_IS_REQUIRED</verbatim:required>
     </verbatim:parameter>
 </verbatim:declaration>
 
@@ -29,19 +33,26 @@ You can make a request through a channel in the form of
     <verbatim:parameter name="NAME_OF_PARAMETER_2"><![CDATA[ARGUMENT_OF_PARAMETER]]></verbatim:parameter>
 </verbatim:request>
 
+-   The only attribute of <verbatim:request> is `name`. Additional attributes will be ignored.
+-   The only attribute of <verbatim:parameter> is `name`. Additional attributes will be ignored.
 -   All arguments must be wrapped in CDATA.
--   Additional XML attributes are not allowed.
 
 ## Response
 
-The user message may contain the response of your request in the form of
+The LLM system/user message may contain the responses of your request in the form of
 
-<verbatim:response name="NAME_OF_CHANNEL" mime-type="MIME_TYPE_OF_RESPONSE"><![CDATA[RESPONSE]]></verbatim:response>
+<verbatim:response name="NAME_OF_CHANNEL"><![CDATA[RESPONSE]]></verbatim:response>
 
 Not all requests have a response.
 
 ## Quotation
 
-The user message may contain verbatim quotation in the form of
+The LLM system/user message may contain verbatim quotations in the form of
 
-<verbatim:quotation mime-type="MIME_TYPE_OF_TEXT"><![CDATA[QUOTATION]]></verbatim:quotation>
+<verbatim:quotation><![CDATA[QUOTATION]]></verbatim:quotation>
+
+## Meta Message
+
+The LLM system/user message may contain meta messages from the agent loop infrastructure in the form of
+
+<verbatim:meta></verbatim:meta>

package/assets/verbatim/meta.handlebars

@@ -0,0 +1 @@
+<verbatim:meta>{{this.text}}</verbatim:meta>

package/build/assets.d.ts

@@ -4,6 +4,7 @@ declare const _default: {
         readonly declarations: string;
         readonly quotation: string;
         readonly response: string;
+        readonly meta: string;
     };
 };
 export default _default;

package/build/assets.js

@@ -5,6 +5,7 @@ export default {
         declarations: loadtext(import.meta.resolve('../assets/verbatim/declarations.handlebars')),
         quotation: loadtext(import.meta.resolve('../assets/verbatim/quotation.handlebars')),
         response: loadtext(import.meta.resolve('../assets/verbatim/response.handlebars')),
+        meta: loadtext(import.meta.resolve('../assets/verbatim/meta.handlebars')),
     },
 };
 //# sourceMappingURL=assets.js.map

package/build/assets.js.map

@@ -1 +1 @@
-{"version":3,"file":"assets.js","sourceRoot":"","sources":["../src/assets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAGjD,eAAe;IACX,QAAQ,EAAE;QACN,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,mCAAmC,CAAC,CAAC;QAC/E,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,4CAA4C,CAAC,CAAC;QACzF,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,yCAAyC,CAAC,CAAC;QACnF,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,wCAAwC,CAAC,CAAC;KACpF;CACK,CAAC"}
+{"version":3,"file":"assets.js","sourceRoot":"","sources":["../src/assets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAGjD,eAAe;IACX,QAAQ,EAAE;QACN,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,mCAAmC,CAAC,CAAC;QAC/E,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,4CAA4C,CAAC,CAAC;QACzF,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,yCAAyC,CAAC,CAAC;QACnF,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,wCAAwC,CAAC,CAAC;QACjF,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,oCAAoC,CAAC,CAAC;KAC5E;CACK,CAAC"}

package/build/compatible-engine/validation.d.ts

@@ -3,12 +3,12 @@ import { Function } from '../function.ts';
 import { Verbatim } from '../verbatim.ts';
 import { RoleMessage } from './session.ts';
 import type { Engine } from '../engine.ts';
-export declare class Validator<in out fdu extends Function.Decl.Proto, in out vdu extends Verbatim.Decl.Proto> implements Engine.Validator<fdu, vdu, RoleMessage.Ai<fdu, vdu>> {
+export declare class Validator<in out fdu extends Function.Decl.Proto, in out vdu extends Verbatim.Decl.Proto> implements Engine.Validator<RoleMessage.User<fdu>, RoleMessage.Ai<fdu, vdu>> {
     protected ctx: Validator.Context<fdu, vdu>;
     constructor(ctx: Validator.Context<fdu, vdu>);
-    validateChoice(message: RoleMessage.Ai<fdu, vdu>): void;
-    validateStructuring(fcs: Function.Call.Of<fdu>[], vrs: Verbatim.Request.Of<vdu>[]): void;
-    validateParts(message: RoleMessage.Ai<fdu, vdu>): void;
+    validateMessageStructuring(aiMessage: RoleMessage.Ai<fdu, vdu>): RoleMessage.User<fdu> | void;
+    validateStructuring(fcs: Function.Call.Of<fdu>[], vrs: Verbatim.Request.Of<vdu>[]): RoleMessage.User<fdu> | void;
+    validateMessageParts(message: RoleMessage.Ai<fdu, vdu>): void;
 }
 export declare namespace Validator {
     type From<fdm extends Function.Decl.Map.Proto, vdm extends Verbatim.Decl.Map.Proto> = Validator<Function.Decl.From<fdm>, Verbatim.Decl.From<vdm>>;

package/build/compatible-engine/validation.js

@@ -1,78 +1,92 @@
 import { Structuring } from "./structuring.js";
+import { RoleMessage } from "./session.js";
 import { ResponseInvalid } from "../engine.js";
+import * as VerbatimCodec from "../verbatim/codec.js";
 export class Validator {
     ctx;
     constructor(ctx) {
         this.ctx = ctx;
     }
-    validateChoice(message) {
-        const fcs = message.getFunctionCalls();
-        const vrs = message.getVerbatimRequests();
-        this.validateStructuring(fcs, vrs);
+    validateMessageStructuring(aiMessage) {
+        const fcs = aiMessage.getFunctionCalls();
+        const vrs = aiMessage.getVerbatimRequests();
+        return this.validateStructuring(fcs, vrs);
     }
     validateStructuring(fcs, vrs) {
         if (this.ctx.choice === Structuring.Choice.FCall.REQUIRED) {
-            if (fcs.length) { }
-            else
+            if (!fcs.length)
                 throw new ResponseInvalid('Function call required.');
         }
         else if (this.ctx.choice === Structuring.Choice.FCall.ANYONE) {
-            if (fcs.length) { }
-            else
+            if (!fcs.length)
                 throw new ResponseInvalid('Function call required.');
             if (fcs.length > 1)
                 throw new ResponseInvalid('Only one function call allowed.');
         }
         else if (this.ctx.choice instanceof Structuring.Choice.FCall) {
-            if (fcs.length) { }
-            else
+            if (!fcs.length)
                 throw new ResponseInvalid(`Function call of ${this.ctx.choice.name} required.`);
             if (fcs.length > 1)
                 throw new ResponseInvalid('Only one function call allowed.');
-            if (fcs[0].name === this.ctx.choice.name) { }
-            else
+            if (fcs[0].name !== this.ctx.choice.name)
                 throw new ResponseInvalid(`Only function call of ${this.ctx.choice.name} allowed.`);
         }
         else if (this.ctx.choice === Structuring.Choice.VRequest.REQUIRED) {
-            if (vrs.length) { }
-            else
-                throw new ResponseInvalid('Verbatim message required.');
+            if (!vrs.length)
+                return new RoleMessage.User([
+                    RoleMessage.Part.Text.paragraph(VerbatimCodec.Meta.encode(`No valid verbatim request found.`)),
+                ]);
         }
         else if (this.ctx.choice === Structuring.Choice.VRequest.ANYONE) {
-            if (vrs.length) { }
-            else
-                throw new ResponseInvalid('Verbatim message required.');
+            if (!vrs.length)
+                return new RoleMessage.User([
+                    RoleMessage.Part.Text.paragraph(VerbatimCodec.Meta.encode(`No valid verbatim request found.`)),
+                ]);
             if (vrs.length > 1)
-                throw new ResponseInvalid('Only one verbatim message allowed.');
+                return new RoleMessage.User([
+                    RoleMessage.Part.Text.paragraph(VerbatimCodec.Meta.encode(`Only 1 verbatim request allowed, but multiple found.`)),
+                ]);
         }
         else if (this.ctx.choice instanceof Structuring.Choice.VRequest) {
-            if (vrs.length) { }
-            else
-                throw new ResponseInvalid(`Verbatim message through channel ${this.ctx.choice.name} required.`);
+            if (!vrs.length)
+                return new RoleMessage.User([
+                    RoleMessage.Part.Text.paragraph(VerbatimCodec.Meta.encode(`No valid verbatim request through channel \`${this.ctx.choice.name}\` found.`)),
+                ]);
             if (vrs.length > 1)
-                throw new ResponseInvalid('Only one verbatim message allowed.');
-            if (vrs[0].name === this.ctx.choice.name) { }
-            else
-                throw new ResponseInvalid(`Only verbatim message through channel ${this.ctx.choice.name} allowed.`);
+                return new RoleMessage.User([
+                    RoleMessage.Part.Text.paragraph(VerbatimCodec.Meta.encode(`Only 1 verbatim request through channel \`${this.ctx.choice.name}\` allowed.`)),
+                ]);
+            if (vrs[0].name !== this.ctx.choice.name)
+                return new RoleMessage.User([
+                    RoleMessage.Part.Text.paragraph(VerbatimCodec.Meta.encode(`Only verbatim request through channel \`${this.ctx.choice.name}\` allowed.`)),
+                ]);
         }
         else if (this.ctx.choice === Structuring.Choice.REQUIRED) {
             if (fcs.length + vrs.length) { }
             else
-                throw new ResponseInvalid('Either function call or verbatim message required.');
+                return new RoleMessage.User([
+                    RoleMessage.Part.Text.paragraph(VerbatimCodec.Meta.encode(`No function call or valid verbatim request found.`)),
+                ]);
         }
         else if (this.ctx.choice === Structuring.Choice.ANYONE) {
             if (fcs.length + vrs.length) { }
             else
-                throw new ResponseInvalid('Either function call or verbatim message required.');
+                return new RoleMessage.User([
+                    RoleMessage.Part.Text.paragraph(VerbatimCodec.Meta.encode(`No function call or valid verbatim request found.`)),
+                ]);
             if (fcs.length + vrs.length > 1)
-                throw new ResponseInvalid('Only one function call or verbatim message allowed.');
+                return new RoleMessage.User([
+                    RoleMessage.Part.Text.paragraph(VerbatimCodec.Meta.encode(`Only 1 function call or verbatim request allowed, but multiple found.`)),
+                ]);
         }
         else if (this.ctx.choice === Structuring.Choice.NONE) {
             if (fcs.length + vrs.length)
-                throw new ResponseInvalid('Neither function call nor verbatim message allowed.');
+                return new RoleMessage.User([
+                    RoleMessage.Part.Text.paragraph(VerbatimCodec.Meta.encode(`Neither function call nor verbatim request allowed.`)),
+                ]);
         }
     }
-    validateParts(message) {
+    validateMessageParts(message) {
         const parts = message.getParts();
         if (parts.length) { }
         else

package/build/compatible-engine/validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/compatible-engine/validation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/compatible-engine/validation.ts"],"names":[],"mappings":"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"}

package/build/engine/validation.d.ts

@@ -1,9 +1,7 @@
-import type { Function } from '../function.ts';
-import type { Verbatim } from '../verbatim.ts';
-export interface Validator<fdu extends Function.Decl.Proto, vdu extends Verbatim.Decl.Proto, aim> {
-    validateChoice(message: aim): void;
-    validateParts(message: aim): void;
+export interface Validator<out userm, in aim> {
+    validateMessageStructuring(aiMessage: aim): userm | void;
+    validateMessageParts(aiMessage: aim): void;
 }
 export declare namespace Validator {
-    type From<fdm extends Function.Decl.Map.Proto, vdm extends Verbatim.Decl.Map.Proto, aim> = Validator<Function.Decl.From<fdm>, Verbatim.Decl.From<vdm>, aim>;
+    type From<userm, aim> = Validator<userm, aim>;
 }

package/build/engine.d.ts

@@ -4,7 +4,7 @@ import { Throttle } from './throttle.ts';
 import { ProxyAgent } from 'undici';
 import { type InferenceContext } from './inference-context.ts';
 import * as SessionModule from './engine/session.ts';
-import type { Verbatim } from './verbatim.ts';
+import { Verbatim } from "./verbatim.js";
 import * as ValidationModule from './engine/validation.ts';
 import * as TransportModule from './engine/transport.ts';
 export interface Pricing {
@@ -35,7 +35,7 @@ export declare namespace Engine {
         protected throttle: Throttle;
         protected abstract parallelToolCall: boolean;
         protected retry: number;
-        protected abstract validator: Engine.Validator.From<fdm, vdm, aim>;
+        protected abstract validator: Engine.Validator.From<userm, aim>;
         protected abstract transport: Engine.Transport<userm, aim, devm, session>;
         constructor(options: Engine.Options<fdm, vdm>);
         protected infer(wfctx: InferenceContext, session: session, signal?: AbortSignal): Promise<aim>;
@@ -67,14 +67,18 @@ export declare namespace Engine {
     export import Validator = ValidationModule.Validator;
     export import Transport = TransportModule.Transport;
 }
-export declare class ResponseInvalid extends Error {
-}
 export declare class InferenceTimeout extends Error {
 }
 export declare class NetworkError extends Error {
 }
 export declare class CustomRetry extends Error {
 }
+export declare class ResponseInvalid extends Error {
+}
+export declare namespace ResponseInvalid {
+    class Recoverable extends ResponseInvalid {
+    }
+}
 declare global {
     export namespace NodeJS {
         interface ProcessEnv {

package/build/engine.js

@@ -39,8 +39,7 @@ export var Engine;
         }
         async infer(wfctx, session, signal) {
             const aiMessage = await this.transport.fetch(wfctx, session, signal);
-            this.validator.validateParts(aiMessage);
-            this.validator.validateChoice(aiMessage);
+            this.validator.validateMessageParts(aiMessage);
             return aiMessage;
         }
         /**
@@ -58,10 +57,13 @@ export var Engine;
                 ]) : wfctx.signal || signalTimeout;
                 try {
                     const response = await this.infer(wfctx, session, signal);
-                    if (await validate(response))
-                        return response;
+                    const rejection = this.validator.validateMessageStructuring(response);
+                    if (rejection)
+                        throw new ResponseInvalid.Recoverable();
+                    if (await validate(response)) { }
                     else
                         throw new CustomRetry(undefined, { cause: response });
+                    return response;
                 }
                 catch (e) {
                     if (signalTimeout?.aborted)
@@ -71,7 +73,6 @@ export var Engine;
                     else if (e instanceof CustomRetry) { } // 自定义重试
                     else
                         throw e;
-                    wfctx.cost?.(0); //  心跳
                     if (retry < this.retry)
                         loggers.message.warn(e);
                     else
@@ -82,20 +83,55 @@ export var Engine;
         /**
         * @param session mutable
         */
-        async stateful(wfctx, session, validate) {
-            const response = await this.stateless(wfctx, session, validate);
-            session.chatMessages.push(response);
-            return response;
+        async stateful(wfctx, session, validate = () => Promise.resolve(true)) {
+            for (let retry = 0;; retry++) {
+                const signalTimeout = this.inferenceParams.timeout ? AbortSignal.timeout(this.inferenceParams.timeout) : undefined;
+                const signal = wfctx.signal && signalTimeout ? AbortSignal.any([
+                    wfctx.signal,
+                    signalTimeout,
+                ]) : wfctx.signal || signalTimeout;
+                try {
+                    const response = await this.infer(wfctx, session, signal);
+                    const rejection = this.validator.validateMessageStructuring(response);
+                    if (rejection) {
+                        session.chatMessages.push(response, rejection);
+                        throw new ResponseInvalid.Recoverable();
+                    }
+                    if (await validate(response)) { }
+                    else
+                        throw new CustomRetry(undefined, { cause: response });
+                    session.chatMessages.push(response);
+                    return response;
+                }
+                catch (e) {
+                    if (signalTimeout?.aborted)
+                        e = new InferenceTimeout(undefined, { cause: e }); // 推理超时
+                    else if (e instanceof ResponseInvalid) { } // 模型抽风
+                    else if (e instanceof NetworkError) { } // 网络故障
+                    else if (e instanceof CustomRetry) { } // 自定义重试
+                    else
+                        throw e;
+                    if (retry < this.retry) { }
+                    else
+                        throw e;
+                    loggers.message.warn(e);
+                }
+            }
         }
     }
     Engine.Instance = Instance;
 })(Engine || (Engine = {}));
-export class ResponseInvalid extends Error {
-}
 export class InferenceTimeout extends Error {
 }
 export class NetworkError extends Error {
 }
 export class CustomRetry extends Error {
 }
+export class ResponseInvalid extends Error {
+}
+(function (ResponseInvalid) {
+    class Recoverable extends ResponseInvalid {
+    }
+    ResponseInvalid.Recoverable = Recoverable;
+})(ResponseInvalid || (ResponseInvalid = {}));
 //# sourceMappingURL=engine.js.map

package/build/engine.js.map

@@ -1 +1 @@
-{"version":3,"file":"engine.js","sourceRoot":"","sources":["../src/engine.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"engine.js","sourceRoot":"","sources":["../src/engine.ts"],"names":[],"mappings":"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"}

package/build/native-engines.d/google/validation.d.ts

@@ -4,12 +4,13 @@ import { Verbatim } from '../../verbatim.ts';
 import { RoleMessage } from './session.ts';
 import { Validator as CompatibleValidator } from '../../compatible-engine/validation.ts';
 import { Engine } from '../../engine.ts';
-export declare class Validator<in out fdu extends Function.Decl.Proto, in out vdu extends Verbatim.Decl.Proto> implements Engine.Validator<fdu, vdu, RoleMessage.Ai<fdu, vdu>> {
+export declare class Validator<in out fdu extends Function.Decl.Proto, in out vdu extends Verbatim.Decl.Proto> implements Engine.Validator<RoleMessage.User<fdu>, RoleMessage.Ai<fdu, vdu>> {
     protected ctx: Validator.Context<fdu, vdu>;
     protected compatibleValidator: CompatibleValidator<fdu, vdu>;
     constructor(ctx: Validator.Context<fdu, vdu>);
-    validateParts(message: RoleMessage.Ai<fdu, vdu>): void;
-    validateChoice(message: RoleMessage.Ai<fdu, vdu>): void;
+    validateMessageParts(message: RoleMessage.Ai<fdu, vdu>): void;
+    validateStructuring(fcs: Function.Call.Of<fdu>[], vrs: Verbatim.Request.Of<vdu>[]): void | RoleMessage.User<fdu>;
+    validateMessageStructuring(message: RoleMessage.Ai<fdu, vdu>): void | RoleMessage.User<fdu>;
 }
 export declare namespace Validator {
     type From<fdm extends Function.Decl.Map.Proto, vdm extends Verbatim.Decl.Map.Proto> = Validator<Function.Decl.From<fdm>, Verbatim.Decl.From<vdm>>;

package/build/native-engines.d/google/validation.js

@@ -7,14 +7,19 @@ export class Validator {
         this.ctx = ctx;
         this.compatibleValidator = new CompatibleValidator({ choice: ctx.choice });
     }
-    validateParts(message) {
+    validateMessageParts(message) {
         const parts = message.getParts();
         if (parts.length) { }
         else
             throw new ResponseInvalid('Empty message.');
     }
-    validateChoice(message) {
-        this.compatibleValidator.validateStructuring(message.getFunctionCalls(), message.getVerbatimRequests());
+    validateStructuring(fcs, vrs) {
+        return this.compatibleValidator.validateStructuring(fcs, vrs);
+    }
+    validateMessageStructuring(message) {
+        const fcs = message.getFunctionCalls();
+        const vrs = message.getVerbatimRequests();
+        return this.validateStructuring(fcs, vrs);
     }
 }
 //# sourceMappingURL=validation.js.map

package/build/native-engines.d/google/validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/native-engines.d/google/validation.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,IAAI,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACzF,OAAO,EAAE,eAAe,EAAU,MAAM,iBAAiB,CAAC;AAI1D,MAAM,OAAO,SAAS;IAKW;IADnB,mBAAmB,CAAgC;IAC7D,YAA6B,GAAgC;QAAhC,QAAG,GAAH,GAAG,CAA6B;QACzD,IAAI,CAAC,mBAAmB,GAAG,IAAI,mBAAmB,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;IAC/E,CAAC;IAEM,aAAa,CAChB,OAAiC;QAEjC,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;QACjC,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA,CAAC;;YAAM,MAAM,IAAI,eAAe,CAAC,gBAAgB,CAAC,CAAC;IAC1E,CAAC;IAEM,cAAc,CACjB,OAAiC;QAEjC,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAAC;IAC5G,CAAC;CACJ"}
+{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/native-engines.d/google/validation.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,IAAI,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACzF,OAAO,EAAE,eAAe,EAAU,MAAM,iBAAiB,CAAC;AAI1D,MAAM,OAAO,SAAS;IAKW;IADnB,mBAAmB,CAAgC;IAC7D,YAA6B,GAAgC;QAAhC,QAAG,GAAH,GAAG,CAA6B;QACzD,IAAI,CAAC,mBAAmB,GAAG,IAAI,mBAAmB,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;IAC/E,CAAC;IAEM,oBAAoB,CACvB,OAAiC;QAEjC,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;QACjC,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA,CAAC;;YAAM,MAAM,IAAI,eAAe,CAAC,gBAAgB,CAAC,CAAC;IAC1E,CAAC;IAEM,mBAAmB,CACtB,GAA4B,EAC5B,GAA+B;QAE/B,OAAO,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAClE,CAAC;IAEM,0BAA0B,CAC7B,OAAiC;QAEjC,MAAM,GAAG,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;QACvC,MAAM,GAAG,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;QAC1C,OAAO,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC9C,CAAC;CACJ"}

package/build/native-engines.d/openai-responses/validation.d.ts

@@ -3,11 +3,11 @@ import { Function } from '../../function.ts';
 import { Verbatim } from '../../verbatim.ts';
 import { RoleMessage } from './session.ts';
 import type { Engine } from '../../engine.ts';
-export declare class Validator<in out fdu extends Function.Decl.Proto, in out vdu extends Verbatim.Decl.Proto> implements Engine.Validator<fdu, vdu, RoleMessage.Ai<fdu, vdu>> {
+export declare class Validator<in out fdu extends Function.Decl.Proto, in out vdu extends Verbatim.Decl.Proto> implements Engine.Validator<RoleMessage.User<fdu>, RoleMessage.Ai<fdu, vdu>> {
     protected ctx: Validator.Context<fdu, vdu>;
     constructor(ctx: Validator.Context<fdu, vdu>);
-    validateChoice(message: RoleMessage.Ai<fdu, vdu>): void;
-    validateParts(message: RoleMessage.Ai<fdu, vdu>): void;
+    validateMessageStructuring(message: RoleMessage.Ai<fdu, vdu>): RoleMessage.User<fdu> | undefined;
+    validateMessageParts(message: RoleMessage.Ai<fdu, vdu>): void;
 }
 export declare namespace Validator {
     type From<fdm extends Function.Decl.Map.Proto, vdm extends Verbatim.Decl.Map.Proto> = Validator<Function.Decl.From<fdm>, Verbatim.Decl.From<vdm>>;

package/build/native-engines.d/openai-responses/validation.js

@@ -1,29 +1,28 @@
 import { Structuring } from "./structuring.js";
 import { Function } from "../../function.js";
+import { RoleMessage } from "./session.js";
 import { ResponseInvalid } from "../../engine.js";
+import * as VerbatimCodec from "../../verbatim/codec.js";
 export class Validator {
     ctx;
     constructor(ctx) {
         this.ctx = ctx;
     }
-    validateChoice(message) {
+    validateMessageStructuring(message) {
         const tcs = message.getToolCalls();
         const vrs = message.getVerbatimRequests();
         if (this.ctx.choice === Structuring.Choice.TCall.REQUIRED) {
-            if (tcs.length) { }
-            else
+            if (!tcs.length)
                 throw new ResponseInvalid('Tool call required.');
         }
         else if (this.ctx.choice === Structuring.Choice.TCall.ANYONE) {
-            if (tcs.length) { }
-            else
+            if (!tcs.length)
                 throw new ResponseInvalid('Tool call required.');
             if (tcs.length > 1)
                 throw new ResponseInvalid('Only one tool call allowed.');
         }
         else if (this.ctx.choice instanceof Structuring.Choice.TCall.FCall) {
-            if (tcs.length) { }
-            else
+            if (!tcs.length)
                 throw new ResponseInvalid(`Function call of ${this.ctx.choice.name} required.`);
             if (tcs.length > 1)
                 throw new ResponseInvalid('Only one function call allowed.');
@@ -32,45 +31,61 @@ export class Validator {
                 throw new ResponseInvalid(`Only function call of ${this.ctx.choice.name} allowed.`);
         }
         else if (this.ctx.choice === Structuring.Choice.VRequest.REQUIRED) {
-            if (vrs.length) { }
-            else
-                throw new ResponseInvalid('Verbatim message required.');
+            if (!vrs.length)
+                return new RoleMessage.User([
+                    RoleMessage.Part.Text.paragraph(VerbatimCodec.Meta.encode(`No valid verbatim request found.`)),
+                ]);
         }
         else if (this.ctx.choice === Structuring.Choice.VRequest.ANYONE) {
-            if (vrs.length) { }
-            else
-                throw new ResponseInvalid('Verbatim message required.');
+            if (!vrs.length)
+                return new RoleMessage.User([
+                    RoleMessage.Part.Text.paragraph(VerbatimCodec.Meta.encode(`No valid verbatim request found.`)),
+                ]);
             if (vrs.length > 1)
-                throw new ResponseInvalid('Only one verbatim message allowed.');
+                return new RoleMessage.User([
+                    RoleMessage.Part.Text.paragraph(VerbatimCodec.Meta.encode(`Only 1 verbatim request allowed, but multiple found.`)),
+                ]);
         }
         else if (this.ctx.choice instanceof Structuring.Choice.VRequest) {
-            if (vrs.length) { }
-            else
-                throw new ResponseInvalid(`Verbatim message through channel ${this.ctx.choice.name} required.`);
+            if (!vrs.length)
+                return new RoleMessage.User([
+                    RoleMessage.Part.Text.paragraph(VerbatimCodec.Meta.encode(`No valid verbatim request through channel \`${this.ctx.choice.name}\` found.`)),
+                ]);
             if (vrs.length > 1)
-                throw new ResponseInvalid('Only one verbatim message allowed.');
-            if (vrs[0].name === this.ctx.choice.name) { }
-            else
-                throw new ResponseInvalid(`Only verbatim message through channel ${this.ctx.choice.name} allowed.`);
+                return new RoleMessage.User([
+                    RoleMessage.Part.Text.paragraph(VerbatimCodec.Meta.encode(`Only 1 verbatim request through channel \`${this.ctx.choice.name}\` allowed.`)),
+                ]);
+            if (vrs[0].name !== this.ctx.choice.name)
+                return new RoleMessage.User([
+                    RoleMessage.Part.Text.paragraph(VerbatimCodec.Meta.encode(`Only verbatim request through channel \`${this.ctx.choice.name}\` allowed.`)),
+                ]);
         }
         else if (this.ctx.choice === Structuring.Choice.REQUIRED) {
             if (tcs.length + vrs.length) { }
             else
-                throw new ResponseInvalid('Either tool call or verbatim message required.');
+                return new RoleMessage.User([
+                    RoleMessage.Part.Text.paragraph(VerbatimCodec.Meta.encode(`No function call or valid verbatim request found.`)),
+                ]);
         }
         else if (this.ctx.choice === Structuring.Choice.ANYONE) {
             if (tcs.length + vrs.length) { }
             else
-                throw new ResponseInvalid('Either tool call or verbatim message required.');
+                return new RoleMessage.User([
+                    RoleMessage.Part.Text.paragraph(VerbatimCodec.Meta.encode(`No function call or valid verbatim request found.`)),
+                ]);
             if (tcs.length + vrs.length > 1)
-                throw new ResponseInvalid('Only one tool call or verbatim message allowed.');
+                return new RoleMessage.User([
+                    RoleMessage.Part.Text.paragraph(VerbatimCodec.Meta.encode(`Only 1 function call or verbatim request allowed, but multiple found.`)),
+                ]);
         }
         else if (this.ctx.choice === Structuring.Choice.NONE) {
             if (tcs.length + vrs.length)
-                throw new ResponseInvalid('Neither tool call nor verbatim message allowed.');
+                return new RoleMessage.User([
+                    RoleMessage.Part.Text.paragraph(VerbatimCodec.Meta.encode(`Neither function call nor verbatim request allowed.`)),
+                ]);
         }
     }
-    validateParts(message) {
+    validateMessageParts(message) {
         const parts = message.getParts();
         if (parts.length) { }
         else