@zimtsui/brainswitch 0.0.56 → 0.0.59

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

@@ -1,59 +1,61 @@
-import * as Compatible from '#@/compatible/session.ts';
-import { Function } from '#@/function.ts';
-import { Tool } from '#@/native-engines.d/openai-responses/tool.ts';
-import type { GenericSession } from '#@/session.ts';
+import { RoleMessage as CompatibleRoleMessage } from '../../compatible-engine/session.ts';
+import { Function } from '../../function.ts';
+import { Tool } from './tool.ts';
+import type { Engine } from '../../engine.ts';
+import type { Verbatim } from '../../verbatim.ts';
 import OpenAI from 'openai';
-export interface Session<in out fdm extends Function.Declaration.Map> extends GenericSession<RoleMessage.User<fdm>, RoleMessage.Ai<fdm>, RoleMessage.Developer> {
+declare const NOMINAL: unique symbol;
+export interface Session<in out fdu extends Function.Decl.Proto, in out vdu extends Verbatim.Decl.Proto> extends Engine.Session<RoleMessage.User<fdu>, RoleMessage.Ai<fdu, vdu>, RoleMessage.Developer> {
 }
 export declare namespace Session {
-    type ChatMessage<fdm extends Function.Declaration.Map> = GenericSession.ChatMessage<RoleMessage.User<fdm>, RoleMessage.Ai<fdm>>;
+    type From<fdm extends Function.Decl.Map.Proto, vdm extends Verbatim.Decl.Map.Proto> = Session<Function.Decl.From<fdm>, Verbatim.Decl.From<vdm>>;
+    type ChatMessage<fdu extends Function.Decl.Proto, vdu extends Verbatim.Decl.Proto> = Engine.Session.ChatMessage<RoleMessage.User<fdu>, RoleMessage.Ai<fdu, vdu>>;
+    namespace ChatMessage {
+        type From<fdm extends Function.Decl.Map.Proto, vdm extends Verbatim.Decl.Map.Proto> = Session.ChatMessage<Function.Decl.From<fdm>, Verbatim.Decl.From<vdm>>;
+    }
 }
-export type RoleMessage = RoleMessage.Instance;
 export declare namespace RoleMessage {
-    const NOMINAL: unique symbol;
-    abstract class Instance {
-        private readonly [NOMINAL];
-        abstract getText(): string;
-        abstract getOnlyText(): string;
-    }
     namespace Part {
-        export import Text = Compatible.RoleMessage.Part.Text;
+        export import Text = CompatibleRoleMessage.Part.Text;
+    }
+    class Ai<in out fdu extends Function.Decl.Proto, in out vdu extends Verbatim.Decl.Proto> {
+        protected parts: RoleMessage.Ai.Part<fdu, vdu>[];
+        protected raw: OpenAI.Responses.ResponseOutputItem[];
+        protected [NOMINAL]: never;
+        constructor(parts: RoleMessage.Ai.Part<fdu, vdu>[], raw: OpenAI.Responses.ResponseOutputItem[]);
+        getParts(): RoleMessage.Ai.Part<fdu, vdu>[];
+        getRaw(): OpenAI.Responses.ResponseOutputItem[];
+        allTextPart(): boolean;
+        getTextParts(): RoleMessage.Part.Text<vdu>[];
+        getText(): string;
+        getToolCalls(): Tool.Call.Of<fdu>[];
+        getFunctionCalls(): Function.Call.Of<fdu>[];
+        getVerbatimRequests(): Verbatim.Request.Of<vdu>[];
+        getOnlyFunctionCall(): Function.Call.Of<fdu>;
+        getOnlyToolCall(): Tool.Call.Of<fdu>;
+        getOnlyVerbatimRequest(): Verbatim.Request.Of<vdu>;
     }
-    type Ai<fdm extends Function.Declaration.Map> = Ai.Instance<fdm>;
     namespace Ai {
-        function create<fdm extends Function.Declaration.Map>(parts: RoleMessage.Ai.Part<fdm>[], raw: OpenAI.Responses.ResponseOutputItem[]): RoleMessage.Ai<fdm>;
-        const NOMINAL: unique symbol;
-        class Instance<in out fdm extends Function.Declaration.Map> extends RoleMessage.Instance {
-            protected parts: RoleMessage.Ai.Part<fdm>[];
-            protected raw: OpenAI.Responses.ResponseOutputItem[];
-            readonly [NOMINAL]: void;
-            constructor(parts: RoleMessage.Ai.Part<fdm>[], raw: OpenAI.Responses.ResponseOutputItem[]);
-            getParts(): RoleMessage.Ai.Part<fdm>[];
-            getRaw(): OpenAI.Responses.ResponseOutputItem[];
-            getText(): string;
-            getOnlyText(): string;
-            getOnlyFunctionCall(): Function.Call.From<fdm>;
-            getOnlyApplyPatchCall(): Tool.ApplyPatch.Call;
-            getToolCalls(): Tool.Call<fdm>[];
-            getFunctionCalls(): Function.Call.From<fdm>[];
-            getOnlyFunctionCalls(): Function.Call.From<fdm>[];
+        type From<fdm extends Function.Decl.Map.Proto, vdm extends Verbatim.Decl.Map.Proto> = RoleMessage.Ai<Function.Decl.From<fdm>, Verbatim.Decl.From<vdm>>;
+        type Part<fdu extends Function.Decl.Proto, vdu extends Verbatim.Decl.Proto> = RoleMessage.Part.Text<vdu> | Tool.Call.Of<fdu>;
+        namespace Part {
+            type From<fdm extends Function.Decl.Map.Proto, vdm extends Verbatim.Decl.Map.Proto> = RoleMessage.Ai.Part<Function.Decl.From<fdm>, Verbatim.Decl.From<vdm>>;
         }
-        type Part<fdm extends Function.Declaration.Map> = RoleMessage.Part.Text | Tool.Call<fdm>;
     }
-    type User<fdm extends Function.Declaration.Map> = User.Instance<fdm>;
+    class User<in out fdu extends Function.Decl.Proto> {
+        protected parts: RoleMessage.User.Part<fdu>[];
+        protected [NOMINAL]: never;
+        constructor(parts: RoleMessage.User.Part<fdu>[]);
+        getParts(): RoleMessage.User.Part<fdu>[];
+        getToolResponses(): Tool.Response.Of<fdu>[];
+    }
     namespace User {
-        function create<fdm extends Function.Declaration.Map>(parts: User.Part<fdm>[]): User<fdm>;
-        const NOMINAL: unique symbol;
-        class Instance<in out fdm extends Function.Declaration.Map> extends RoleMessage.Instance {
-            protected parts: RoleMessage.User.Part<fdm>[];
-            private readonly [NOMINAL];
-            constructor(parts: RoleMessage.User.Part<fdm>[]);
-            getParts(): RoleMessage.User.Part<fdm>[];
-            getText(): string;
-            getOnlyText(): string;
-            getToolResponses(): Tool.Response<fdm>[];
+        type From<fdm extends Function.Decl.Map.Proto> = RoleMessage.User<Function.Decl.From<fdm>>;
+        type Part<fdu extends Function.Decl.Proto> = RoleMessage.Part.Text<never> | Tool.Response.Of<fdu>;
+        namespace Part {
+            type From<fdm extends Function.Decl.Map.Proto> = RoleMessage.User.Part<Function.Decl.From<fdm>>;
         }
-        type Part<fdm extends Function.Declaration.Map> = RoleMessage.Part.Text | Tool.Response<fdm>;
     }
-    export import Developer = Compatible.RoleMessage.Developer;
+    export import Developer = CompatibleRoleMessage.Developer;
 }
+export {};

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

@@ -1,116 +1,86 @@
-import * as Compatible from '#@/compatible/session.ts';
-import { Function } from '#@/function.ts';
-import { Tool } from '#@/native-engines.d/openai-responses/tool.ts';
-import OpenAI from 'openai';
+import { RoleMessage as CompatibleRoleMessage } from "../../compatible-engine/session.js";
+import { Function } from "../../function.js";
+import { Tool } from "./tool.js";
+const NOMINAL = Symbol();
 export var RoleMessage;
 (function (RoleMessage) {
-    RoleMessage.NOMINAL = Symbol();
-    class Instance {
-    }
-    RoleMessage.Instance = Instance;
     let Part;
     (function (Part) {
-        Part.Text = Compatible.RoleMessage.Part.Text;
+        Part.Text = CompatibleRoleMessage.Part.Text;
     })(Part = RoleMessage.Part || (RoleMessage.Part = {}));
-    let Ai;
-    (function (Ai) {
-        function create(parts, raw) {
-            return new Instance(parts, raw);
+    class Ai {
+        parts;
+        raw;
+        constructor(parts, raw) {
+            this.parts = parts;
+            this.raw = raw;
+        }
+        getParts() {
+            return this.parts;
+        }
+        getRaw() {
+            return this.raw;
+        }
+        allTextPart() {
+            return this.parts.every(part => part instanceof RoleMessage.Part.Text);
+        }
+        getTextParts() {
+            return this.parts.filter(part => part instanceof RoleMessage.Part.Text);
+        }
+        getText() {
+            return this.getTextParts().map(part => part.text).join('');
+        }
+        getToolCalls() {
+            return this.parts.filter(part => part instanceof Function.Call || part instanceof Tool.ApplyPatch.Call);
         }
-        Ai.create = create;
-        Ai.NOMINAL = Symbol();
-        class Instance extends RoleMessage.Instance {
-            parts;
-            raw;
-            constructor(parts, raw) {
-                super();
-                this.parts = parts;
-                this.raw = raw;
-            }
-            getParts() {
-                return this.parts;
-            }
-            getRaw() {
-                return this.raw;
-            }
-            getText() {
-                return this.parts.filter(part => part instanceof RoleMessage.Part.Text.Instance).map(part => part.text).join('');
-            }
-            getOnlyText() {
-                if (this.parts.every(part => part instanceof RoleMessage.Part.Text.Instance)) { }
-                else
-                    throw new Error();
-                return this.getText();
-            }
-            getOnlyFunctionCall() {
-                const tcs = this.getToolCalls();
-                if (tcs.length === 1) { }
-                else
-                    throw new Error();
-                const tc = tcs[0];
-                if (tc instanceof Function.Call) { }
-                else
-                    throw new Error();
-                return tc;
-            }
-            getOnlyApplyPatchCall() {
-                const tcs = this.getToolCalls();
-                if (tcs.length === 1) { }
-                else
-                    throw new Error();
-                const tc = tcs[0];
-                if (tc instanceof Tool.ApplyPatch.Call) { }
-                else
-                    throw new Error();
-                return tc;
-            }
-            getToolCalls() {
-                return this.parts.filter(part => part instanceof Function.Call || part instanceof Tool.ApplyPatch.Call);
-            }
-            getFunctionCalls() {
-                return this.parts.filter(part => part instanceof Function.Call);
-            }
-            getOnlyFunctionCalls() {
-                const tcs = this.getToolCalls();
-                if (tcs.every(tc => tc instanceof Function.Call)) { }
-                else
-                    throw new Error();
-                return tcs;
-            }
+        getFunctionCalls() {
+            return this.parts.filter(part => part instanceof Function.Call);
         }
-        Ai.Instance = Instance;
-    })(Ai = RoleMessage.Ai || (RoleMessage.Ai = {}));
-    let User;
-    (function (User) {
-        function create(parts) {
-            return new Instance(parts);
+        getVerbatimRequests() {
+            return this.parts
+                .filter(part => part instanceof RoleMessage.Part.Text)
+                .flatMap(part => part.vrs);
         }
-        User.create = create;
-        User.NOMINAL = Symbol();
-        class Instance extends RoleMessage.Instance {
-            parts;
-            constructor(parts) {
-                super();
-                this.parts = parts;
-            }
-            getParts() {
-                return this.parts;
-            }
-            getText() {
-                return this.parts.filter(part => part instanceof RoleMessage.Part.Text.Instance).map(part => part.text).join('');
-            }
-            getOnlyText() {
-                if (this.parts.every(part => part instanceof RoleMessage.Part.Text.Instance)) { }
-                else
-                    throw new Error();
-                return this.getText();
-            }
-            getToolResponses() {
-                return this.parts.filter(part => part instanceof Function.Response || part instanceof Tool.ApplyPatch.Response);
-            }
+        getOnlyFunctionCall() {
+            const tcs = this.getToolCalls();
+            if (tcs.length === 1) { }
+            else
+                throw new Error();
+            const tc = tcs[0];
+            if (tc instanceof Function.Call) { }
+            else
+                throw new Error();
+            return tc;
         }
-        User.Instance = Instance;
-    })(User = RoleMessage.User || (RoleMessage.User = {}));
-    RoleMessage.Developer = Compatible.RoleMessage.Developer;
+        getOnlyToolCall() {
+            const tcs = this.getToolCalls();
+            if (tcs.length === 1) { }
+            else
+                throw new Error();
+            return tcs[0];
+        }
+        getOnlyVerbatimRequest() {
+            const vrs = this.getVerbatimRequests();
+            if (vrs.length === 1) { }
+            else
+                throw new Error();
+            return vrs[0];
+        }
+    }
+    RoleMessage.Ai = Ai;
+    class User {
+        parts;
+        constructor(parts) {
+            this.parts = parts;
+        }
+        getParts() {
+            return this.parts;
+        }
+        getToolResponses() {
+            return this.parts.filter(part => part instanceof Function.Response || part instanceof Tool.ApplyPatch.Response);
+        }
+    }
+    RoleMessage.User = User;
+    RoleMessage.Developer = CompatibleRoleMessage.Developer;
 })(RoleMessage || (RoleMessage = {}));
 //# sourceMappingURL=session.js.map

package/build/native-engines.d/openai-responses/session.js.map

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

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

@@ -0,0 +1,19 @@
+import { Structuring as CompatibleStructuring } from '../../compatible-engine/structuring.ts';
+import type { Function } from '../../function.ts';
+import type { Verbatim } from '../../verbatim.ts';
+export declare namespace Structuring {
+    type Choice<fdu extends Function.Decl.Proto, vdu extends Verbatim.Decl.Proto> = Structuring.Choice.TCall.FCall.Of<fdu> | typeof Structuring.Choice.TCall.REQUIRED | typeof Structuring.Choice.TCall.ANYONE | Structuring.Choice.VRequest.Of<vdu> | typeof Structuring.Choice.VRequest.REQUIRED | typeof Structuring.Choice.VRequest.ANYONE | typeof Structuring.Choice.NONE | typeof Structuring.Choice.AUTO | typeof Structuring.Choice.REQUIRED | typeof Structuring.Choice.ANYONE;
+    namespace Choice {
+        type From<fdm extends Function.Decl.Map.Proto, vdm extends Verbatim.Decl.Map.Proto> = Structuring.Choice<Function.Decl.From<fdm>, Verbatim.Decl.From<vdm>>;
+        export import REQUIRED = CompatibleStructuring.Choice.REQUIRED;
+        export import ANYONE = CompatibleStructuring.Choice.ANYONE;
+        namespace TCall {
+            const REQUIRED: unique symbol;
+            const ANYONE: unique symbol;
+            export import FCall = CompatibleStructuring.Choice.FCall;
+        }
+        export import VRequest = CompatibleStructuring.Choice.VRequest;
+        export import NONE = CompatibleStructuring.Choice.NONE;
+        export import AUTO = CompatibleStructuring.Choice.AUTO;
+    }
+}

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

@@ -0,0 +1,19 @@
+import { Structuring as CompatibleStructuring } from "../../compatible-engine/structuring.js";
+export var Structuring;
+(function (Structuring) {
+    let Choice;
+    (function (Choice) {
+        Choice.REQUIRED = CompatibleStructuring.Choice.REQUIRED;
+        Choice.ANYONE = CompatibleStructuring.Choice.ANYONE;
+        let TCall;
+        (function (TCall) {
+            TCall.REQUIRED = Symbol();
+            TCall.ANYONE = Symbol();
+            TCall.FCall = CompatibleStructuring.Choice.FCall;
+        })(TCall = Choice.TCall || (Choice.TCall = {}));
+        Choice.VRequest = CompatibleStructuring.Choice.VRequest;
+        Choice.NONE = CompatibleStructuring.Choice.NONE;
+        Choice.AUTO = CompatibleStructuring.Choice.AUTO;
+    })(Choice = Structuring.Choice || (Structuring.Choice = {}));
+})(Structuring || (Structuring = {}));
+//# sourceMappingURL=structuring.js.map

package/build/native-engines.d/openai-responses/structuring.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"structuring.js","sourceRoot":"","sources":["../../../src/native-engines.d/openai-responses/structuring.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,IAAI,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAK9F,MAAM,KAAW,WAAW,CAuC3B;AAvCD,WAAiB,WAAW;IAmBxB,IAAiB,MAAM,CAmBtB;IAnBD,WAAiB,MAAM;QAML,eAAQ,GAAG,qBAAqB,CAAC,MAAM,CAAC,QAAQ,CAAC;QACjD,aAAM,GAAG,qBAAqB,CAAC,MAAM,CAAC,MAAM,CAAC;QAE3D,IAAiB,KAAK,CAKrB;QALD,WAAiB,KAAK;YACL,cAAQ,GAAG,MAAM,EAAE,CAAC;YACpB,YAAM,GAAG,MAAM,EAAE,CAAC;YAEjB,WAAK,GAAG,qBAAqB,CAAC,MAAM,CAAC,KAAK,CAAC;QAC7D,CAAC,EALgB,KAAK,GAAL,YAAK,KAAL,YAAK,QAKrB;QAEa,eAAQ,GAAG,qBAAqB,CAAC,MAAM,CAAC,QAAQ,CAAC;QACjD,WAAI,GAAG,qBAAqB,CAAC,MAAM,CAAC,IAAI,CAAC;QACzC,WAAI,GAAG,qBAAqB,CAAC,MAAM,CAAC,IAAI,CAAC;IAC3D,CAAC,EAnBgB,MAAM,GAAN,kBAAM,KAAN,kBAAM,QAmBtB;AACL,CAAC,EAvCgB,WAAW,KAAX,WAAW,QAuC3B"}

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

@@ -1,21 +1,26 @@
-import { Function } from '#@/function.ts';
+import { Function } from '../../function.ts';
 import OpenAI from 'openai';
 export declare namespace Tool {
-    type Name<fdm extends Function.Declaration.Map> = Function.Declaration.Map.NameOf<fdm> | typeof Tool.Choice.APPLY_PATCH;
-    type Map<fdm extends Function.Declaration.Map> = {
-        [name in Name<fdm>]: name extends Function.Declaration.Map.NameOf<fdm> ? Function<Function.Declaration.From<fdm, name>> : name extends typeof Tool.Choice.APPLY_PATCH ? Tool.ApplyPatch : never;
+    const APPLY_PATCH: unique symbol;
+    namespace Name {
+        type From<fdm extends Function.Decl.Map.Proto> = Function.Name.From<fdm> | typeof Tool.APPLY_PATCH;
+    }
+    type Map<fdm extends Function.Decl.Map.Proto> = {
+        [name in Tool.Name.From<fdm>]: name extends typeof Tool.APPLY_PATCH ? Tool.ApplyPatch : name extends Function.Name.From<fdm> ? Function.Extract<fdm, name> : never;
     };
-    type Choice<fdm extends Function.Declaration.Map> = typeof Function.ToolChoice.NONE | typeof Function.ToolChoice.REQUIRED | typeof Function.ToolChoice.AUTO | Tool.Name<fdm>[];
-    namespace Choice {
-        const APPLY_PATCH: unique symbol;
+    namespace Call {
+        type Of<fdu extends Function.Decl.Proto> = Function.Call.Of<fdu> | ApplyPatch.Call;
+        type From<fdm extends Function.Decl.Map.Proto> = Call.Of<Function.Decl.From<fdm>>;
+    }
+    namespace Response {
+        type Of<fdu extends Function.Decl.Proto> = Function.Response.Of<fdu> | ApplyPatch.Response;
+        type From<fdm extends Function.Decl.Map.Proto> = Response.Of<Function.Decl.From<fdm>>;
     }
-    type Call<fdm extends Function.Declaration.Map> = Function.Call.From<fdm> | ApplyPatch.Call;
-    type Response<fdm extends Function.Declaration.Map> = Function.Response.Distributive<fdm> | ApplyPatch.Response;
     interface ApplyPatch {
         /**
          * @returns empty string on success
          */
-        (operation: ApplyPatch.Operation): string;
+        (operation: ApplyPatch.Operation): Promise<string>;
     }
     namespace ApplyPatch {
         type Operation = Operation.UpdateFile | Operation.CreateFile | Operation.DeleteFile;
@@ -39,13 +44,11 @@ export declare namespace Tool {
     namespace ApplyPatch {
         class Call {
             raw: OpenAI.Responses.ResponseApplyPatchToolCall;
-            static create(raw: OpenAI.Responses.ResponseApplyPatchToolCall): ApplyPatch.Call;
             constructor(raw: OpenAI.Responses.ResponseApplyPatchToolCall);
         }
         class Response {
             id: string;
             failure: string;
-            static create(apr: Omit<ApplyPatch.Response, never>): ApplyPatch.Response;
             constructor(apr: Omit<ApplyPatch.Response, never>);
         }
     }

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

@@ -1,18 +1,10 @@
-import { Function } from '#@/function.ts';
-import OpenAI from 'openai';
 export var Tool;
 (function (Tool) {
-    let Choice;
-    (function (Choice) {
-        Choice.APPLY_PATCH = Symbol();
-    })(Choice = Tool.Choice || (Tool.Choice = {}));
+    Tool.APPLY_PATCH = Symbol();
     let ApplyPatch;
     (function (ApplyPatch) {
         class Call {
             raw;
-            static create(raw) {
-                return new ApplyPatch.Call(raw);
-            }
             constructor(raw) {
                 this.raw = raw;
             }
@@ -21,9 +13,6 @@ export var Tool;
         class Response {
             id;
             failure;
-            static create(apr) {
-                return new ApplyPatch.Response(apr);
-            }
             constructor(apr) {
                 this.id = apr.id;
                 this.failure = apr.failure;

package/build/native-engines.d/openai-responses/tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool.js","sourceRoot":"","sources":["../../../src/native-engines.d/openai-responses/tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,MAAM,MAAM,QAAQ,CAAC;AAG5B,MAAM,KAAW,IAAI,CAmFpB;AAnFD,WAAiB,IAAI;IAoBjB,IAAiB,MAAM,CAEtB;IAFD,WAAiB,MAAM;QACN,kBAAW,GAAG,MAAM,EAAE,CAAC;IACxC,CAAC,EAFgB,MAAM,GAAN,WAAM,KAAN,WAAM,QAEtB;IAqCD,IAAiB,UAAU,CAqB1B;IArBD,WAAiB,UAAU;QAEvB,MAAa,IAAI;YAIa;YAHnB,MAAM,CAAC,MAAM,CAAC,GAAgD;gBACjE,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACpC,CAAC;YACD,YAA0B,GAAgD;gBAAhD,QAAG,GAAH,GAAG,CAA6C;YAAG,CAAC;SACjF;QALY,eAAI,OAKhB,CAAA;QAED,MAAa,QAAQ;YACV,EAAE,CAAS;YACX,OAAO,CAAS;YAChB,MAAM,CAAC,MAAM,CAAC,GAAqC;gBACtD,OAAO,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YACxC,CAAC;YACD,YAAmB,GAAqC;gBACpD,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC;gBACjB,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;YAC/B,CAAC;SACJ;QAVY,mBAAQ,WAUpB,CAAA;IAEL,CAAC,EArBgB,UAAU,GAAV,eAAU,KAAV,eAAU,QAqB1B;AAGL,CAAC,EAnFgB,IAAI,KAAJ,IAAI,QAmFpB"}
+{"version":3,"file":"tool.js","sourceRoot":"","sources":["../../../src/native-engines.d/openai-responses/tool.ts"],"names":[],"mappings":"AAIA,MAAM,KAAW,IAAI,CAkFpB;AAlFD,WAAiB,IAAI;IACJ,gBAAW,GAAG,MAAM,EAAE,CAAC;IA+DpC,IAAiB,UAAU,CAe1B;IAfD,WAAiB,UAAU;QAEvB,MAAa,IAAI;YACa;YAA1B,YAA0B,GAAgD;gBAAhD,QAAG,GAAH,GAAG,CAA6C;YAAG,CAAC;SACjF;QAFY,eAAI,OAEhB,CAAA;QAED,MAAa,QAAQ;YACV,EAAE,CAAS;YACX,OAAO,CAAS;YACvB,YAAmB,GAAqC;gBACpD,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC;gBACjB,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;YAC/B,CAAC;SACJ;QAPY,mBAAQ,WAOpB,CAAA;IAEL,CAAC,EAfgB,UAAU,GAAV,eAAU,KAAV,eAAU,QAe1B;AAGL,CAAC,EAlFgB,IAAI,KAAJ,IAAI,QAkFpB"}

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

@@ -1,36 +1,35 @@
-import { type InferenceParams, type ProviderSpec } from '#@/engine.ts';
-import { RoleMessage, type Session } from '#@/native-engines.d/openai-responses/session.ts';
-import { Function } from '#@/function.ts';
-import { Tool } from '#@/native-engines.d/openai-responses/tool.ts';
-import OpenAI from 'openai';
-import { type InferenceContext } from '#@/inference-context.ts';
-import { Throttle } from '#@/throttle.ts';
-import type { OpenAIResponsesNativeMessageCodec } from '#@/native-engines.d/openai-responses/message-codec.ts';
-import type { OpenAIResponsesToolCodec } from '#@/api-types/openai-responses/tool-codec.ts';
-import type { OpenAIResponsesBilling } from '#@/api-types/openai-responses/billing.ts';
-import type { OpenAIResponsesNativeToolCallValidator } from '#@/native-engines.d/openai-responses/tool-call-validator.ts';
-export declare class OpenAIResponsesNativeTransport<fdm extends Function.Declaration.Map> {
-    protected ctx: OpenAIResponsesNativeTransport.Context<fdm>;
+import { type InferenceParams, type ProviderSpec } from '../../engine.ts';
+import { RoleMessage, type Session } from './session.ts';
+import { Function } from '../../function.ts';
+import type OpenAI from 'openai';
+import { type InferenceContext } from '../../inference-context.ts';
+import { Throttle } from '../../throttle.ts';
+import type { MessageCodec } from './message-codec.ts';
+import type { ToolCodec } from '../../api-types/openai-responses/tool-codec.ts';
+import type { Billing } from '../../api-types/openai-responses/billing.ts';
+import type { Validator } from './validation.ts';
+import type { Verbatim } from '../../verbatim.ts';
+import { Structuring } from './structuring.ts';
+export declare class Transport<fdm extends Function.Decl.Map.Proto, vdm extends Verbatim.Decl.Map.Proto> {
+    protected ctx: Transport.Context<fdm, vdm>;
     protected apiURL: URL;
-    constructor(ctx: OpenAIResponsesNativeTransport.Context<fdm>);
-    protected makeParams(session: Session<fdm>): OpenAI.Responses.ResponseCreateParamsNonStreaming;
-    protected convertFromToolChoice(toolChoice: Tool.Choice<fdm>): OpenAI.Responses.ToolChoiceOptions | OpenAI.Responses.ToolChoiceAllowed;
+    constructor(ctx: Transport.Context<fdm, vdm>);
+    protected makeParams(session: Session.From<fdm, vdm>): OpenAI.Responses.ResponseCreateParamsNonStreaming;
     protected logAiMessage(output: OpenAI.Responses.ResponseOutputItem[]): void;
-    protected fetchRaw(wfctx: InferenceContext, session: Session<fdm>, signal?: AbortSignal): Promise<RoleMessage.Ai<fdm>>;
-    fetch(wfctx: InferenceContext, session: Session<fdm>, signal?: AbortSignal): Promise<RoleMessage.Ai<fdm>>;
+    fetch(wfctx: InferenceContext, session: Session.From<fdm, vdm>, signal?: AbortSignal): Promise<RoleMessage.Ai.From<fdm, vdm>>;
 }
-export declare namespace OpenAIResponsesNativeTransport {
-    interface Context<fdm extends Function.Declaration.Map> {
+export declare namespace Transport {
+    interface Context<in out fdm extends Function.Decl.Map.Proto, in out vdm extends Verbatim.Decl.Map.Proto> {
         inferenceParams: InferenceParams;
         providerSpec: ProviderSpec;
         fdm: fdm;
         throttle: Throttle;
-        toolChoice: Tool.Choice<fdm>;
+        choice: Structuring.Choice.From<fdm, vdm>;
         parallelToolCall: boolean;
         applyPatch: boolean;
-        messageCodec: OpenAIResponsesNativeMessageCodec<fdm>;
-        toolCodec: OpenAIResponsesToolCodec<fdm>;
-        billing: OpenAIResponsesBilling;
-        toolCallValidator: OpenAIResponsesNativeToolCallValidator<fdm>;
+        messageCodec: MessageCodec<fdm, vdm>;
+        toolCodec: ToolCodec<fdm>;
+        billing: Billing;
+        validator: Validator.From<fdm, vdm>;
     }
 }

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

@@ -1,13 +1,8 @@
-import { ResponseInvalid } from '#@/engine.ts';
-import { RoleMessage } from '#@/native-engines.d/openai-responses/session.ts';
-import { Function } from '#@/function.ts';
-import { Tool } from '#@/native-engines.d/openai-responses/tool.ts';
-import OpenAI from 'openai';
+import { NetworkError, ResponseInvalid } from "../../engine.js";
 import * as Undici from 'undici';
-import {} from '#@/inference-context.ts';
-import { Throttle } from '#@/throttle.ts';
-import { logger } from '#@/telemetry.ts';
-export class OpenAIResponsesNativeTransport {
+import { logger } from "../../telemetry.js";
+import * as ChoiceCodec from "./choice-codec.js";
+export class Transport {
     ctx;
     apiURL;
     constructor(ctx) {
@@ -15,41 +10,22 @@ export class OpenAIResponsesNativeTransport {
         this.apiURL = new URL(`${this.ctx.providerSpec.baseUrl}/responses`);
     }
     makeParams(session) {
-        const tools = this.ctx.toolCodec.convertFromFunctionDeclarationMap(this.ctx.fdm);
+        const tools = this.ctx.toolCodec.encodeFunctionDeclarationMap(this.ctx.fdm);
         if (this.ctx.applyPatch)
             tools.push({ type: 'apply_patch' });
         return {
             model: this.ctx.inferenceParams.model,
             include: ['reasoning.encrypted_content'],
             store: false,
-            input: session.chatMessages.flatMap(chatMessage => this.ctx.messageCodec.convertFromChatMessage(chatMessage)),
-            instructions: session.developerMessage && this.ctx.messageCodec.convertFromDeveloperMessage(session.developerMessage),
+            input: session.chatMessages.flatMap(chatMessage => this.ctx.messageCodec.encodeChatMessage(chatMessage)),
+            instructions: session.developerMessage && this.ctx.messageCodec.encodeDeveloperMessage(session.developerMessage),
             tools: tools.length ? tools : undefined,
-            tool_choice: tools.length ? this.convertFromToolChoice(this.ctx.toolChoice) : undefined,
+            tool_choice: tools.length ? ChoiceCodec.encode(this.ctx.choice) : undefined,
             parallel_tool_calls: tools.length ? this.ctx.parallelToolCall : undefined,
             max_output_tokens: this.ctx.inferenceParams.maxTokens,
             ...this.ctx.inferenceParams.additionalOptions,
         };
     }
-    convertFromToolChoice(toolChoice) {
-        if (toolChoice === Function.ToolChoice.NONE)
-            return 'none';
-        else if (toolChoice === Function.ToolChoice.REQUIRED)
-            return 'required';
-        else if (toolChoice === Function.ToolChoice.AUTO)
-            return 'auto';
-        else
-            return {
-                type: 'allowed_tools',
-                mode: 'required',
-                tools: toolChoice.map(name => {
-                    if (name === Tool.Choice.APPLY_PATCH)
-                        return { type: 'apply_patch' };
-                    else
-                        return { type: 'function', name };
-                }),
-            };
-    }
     logAiMessage(output) {
         for (const item of output)
             if (item.type === 'message') {
@@ -63,10 +39,12 @@ export class OpenAIResponsesNativeTransport {
             else if (item.type === 'apply_patch_call')
                 logger.message.debug(item);
     }
-    async fetchRaw(wfctx, session, signal) {
+    async fetch(wfctx, session, signal) {
+        await this.ctx.throttle.requests(wfctx);
+        // Prepare request
         const params = this.makeParams(session);
         logger.message.trace(params);
-        await this.ctx.throttle.requests(wfctx);
+        // Send request
         const res = await Undici.fetch(this.apiURL, {
             method: 'POST',
             headers: new Headers({
@@ -76,29 +54,31 @@ export class OpenAIResponsesNativeTransport {
             body: JSON.stringify(params),
             dispatcher: this.ctx.providerSpec.proxyAgent,
             signal,
+        }).catch(e => {
+            if (e instanceof TypeError)
+                throw new NetworkError(undefined, { cause: e });
+            else
+                throw e;
         });
+        // Get response
         if (res.ok) { }
         else
             throw new Error(undefined, { cause: res });
         const response = await res.json();
         logger.message.trace(response);
+        // Validate response
         if (response.status === 'incomplete' && response.incomplete_details?.reason === 'max_output_tokens')
             throw new ResponseInvalid('Token limit exceeded.', { cause: response });
         if (response.status === 'completed') { }
         else
             throw new ResponseInvalid('Abnormal response status', { cause: response });
-        this.logAiMessage(response.output);
         if (response.usage) { }
         else
             throw new Error();
+        this.logAiMessage(response.output);
         wfctx.cost?.(this.ctx.billing.charge(response.usage));
         logger.message.debug(response.usage);
-        const aiMessage = this.ctx.messageCodec.convertToAiMessage(response.output);
-        this.ctx.toolCallValidator.validate(aiMessage.getToolCalls());
-        return aiMessage;
-    }
-    async fetch(wfctx, session, signal) {
-        return await this.fetchRaw(wfctx, session, signal).catch(e => Promise.reject(e instanceof OpenAI.APIError ? new ResponseInvalid(undefined, { cause: e }) : e));
+        return this.ctx.messageCodec.decodeAiMessage(response.output);
     }
 }
 //# sourceMappingURL=transport.js.map