@dxos/assistant 0.8.4-main.5ea62a8 → 0.8.4-main.72ec0f3

package/dist/types/src/extraction/extraction-ner-function/extraction-ner-function.d.ts

@@ -1,32 +1,30 @@
-export declare const extractionNerFn: import("@dxos/functions").FunctionDefinition<{
-    readonly objects?: readonly import("@dxos/echo-schema").Expando[] | undefined;
+/**
+ * Named Entity Recognition model
+ */
+export declare const extractionNerFunction: import("@dxos/functions").FunctionDefinition<{
     readonly options?: {
         readonly timeout?: number | undefined;
         readonly fallbackToRaw?: boolean | undefined;
     } | undefined;
-    readonly message: import("@dxos/echo/Type").OfKind<import("@dxos/echo-schema").EntityKind.Object> & {
+    readonly message: import("@dxos/echo/Type").OfKind<import("@dxos/echo/internal").EntityKind.Object> & {
         id: string;
         parentMessage?: string | undefined;
         created: string;
         sender: {
             name?: string | undefined;
-            contact?: import("@dxos/echo-schema").Ref<import("@dxos/echo/Type").OfKind<import("@dxos/echo-schema").EntityKind.Object> & {
-                fields?: {
-                    readonly value: string;
-                    readonly category?: string | undefined;
-                    readonly label: string;
-                }[] | undefined;
+            contact?: import("@dxos/echo/internal").Ref<import("@dxos/echo/Type").OfKind<import("@dxos/echo/internal").EntityKind.Object> & {
                 image?: string | undefined;
                 fullName?: string | undefined;
                 preferredName?: string | undefined;
                 nickname?: string | undefined;
-                organization?: import("@dxos/echo-schema").Ref<import("@dxos/echo/Type").OfKind<import("@dxos/echo-schema").EntityKind.Object> & {
+                organization?: import("@dxos/echo/internal").Ref<import("@dxos/echo/Type").OfKind<import("@dxos/echo/internal").EntityKind.Object> & {
+                    description?: string | undefined;
                     id: string;
                     name?: string | undefined;
-                    description?: string | undefined;
                     status?: "prospect" | "qualified" | "active" | "commit" | "reject" | undefined;
                     image?: string | undefined;
                     website?: string | undefined;
+                    location?: readonly [number, number, (number | undefined)?] | undefined;
                 }> | undefined;
                 jobTitle?: string | undefined;
                 department?: string | undefined;
@@ -60,11 +58,17 @@ export declare const extractionNerFn: import("@dxos/functions").FunctionDefiniti
                     readonly label?: string | undefined;
                 }[] | undefined;
                 birthday?: string | undefined;
+                fields?: {
+                    readonly value: string;
+                    readonly label: string;
+                    readonly category?: string | undefined;
+                }[] | undefined;
+                location?: readonly [number, number, (number | undefined)?] | undefined;
             }> | undefined;
             identityDid?: string | undefined;
             identityKey?: string | undefined;
             email?: string | undefined;
-            role?: "user" | "assistant" | undefined;
+            role?: "user" | "assistant" | "tool" | undefined;
         };
         blocks: ({
             version: unknown;
@@ -72,23 +76,23 @@ export declare const extractionNerFn: import("@dxos/functions").FunctionDefiniti
             pending?: boolean | undefined;
             objectId: string;
         } | {
-            name?: string | undefined;
             _tag: "file";
-            url: string;
             pending?: boolean | undefined;
+            url: string;
+            name?: string | undefined;
             mediaType?: string | undefined;
         } | {
             id?: string | undefined;
+            _tag: "image";
+            pending?: boolean | undefined;
             source?: {
-                type: "base64";
                 mediaType: string;
+                type: "base64";
                 data: string;
             } | {
-                type: "http";
                 url: string;
+                type: "http";
             } | undefined;
-            _tag: "image";
-            pending?: boolean | undefined;
         } | {
             _tag: "json";
             pending?: boolean | undefined;
@@ -100,13 +104,13 @@ export declare const extractionNerFn: import("@dxos/functions").FunctionDefiniti
             pending?: boolean | undefined;
         } | {
             _tag: "reasoning";
+            pending?: boolean | undefined;
             reasoningText?: string | undefined;
-            signature?: string | undefined;
             redactedText?: string | undefined;
-            pending?: boolean | undefined;
+            signature?: string | undefined;
         } | {
+            reference: import("@dxos/echo/internal").Ref<import("@dxos/echo/Type").Expando>;
             _tag: "reference";
-            reference: import("@dxos/echo-schema").Ref<import("@dxos/echo/Type").Expando>;
             pending?: boolean | undefined;
         } | {
             _tag: "select";
@@ -122,15 +126,15 @@ export declare const extractionNerFn: import("@dxos/functions").FunctionDefiniti
             pending?: boolean | undefined;
         } | {
             _tag: "summary";
+            pending?: boolean | undefined;
+            mimeType?: string | undefined;
+            message?: string | undefined;
             model?: string | undefined;
             usage?: {
                 readonly inputTokens?: number | undefined;
                 readonly outputTokens?: number | undefined;
                 readonly totalTokens?: number | undefined;
             } | undefined;
-            pending?: boolean | undefined;
-            mimeType?: string | undefined;
-            message?: string | undefined;
             toolCalls?: number | undefined;
             errors?: number | undefined;
             duration?: number | undefined;
@@ -144,18 +148,20 @@ export declare const extractionNerFn: import("@dxos/functions").FunctionDefiniti
             _tag: "toolkit";
             pending?: boolean | undefined;
         } | {
-            name: string;
             _tag: "toolCall";
             pending?: boolean | undefined;
+            name: string;
             toolCallId: string;
             input: string;
+            providerExecuted: boolean;
         } | {
-            name: string;
             _tag: "toolResult";
-            error?: string | undefined;
             pending?: boolean | undefined;
+            name: string;
             toolCallId: string;
+            providerExecuted: boolean;
             result?: string | undefined;
+            error?: string | undefined;
         } | {
             text: string;
             _tag: "transcript";
@@ -166,30 +172,27 @@ export declare const extractionNerFn: import("@dxos/functions").FunctionDefiniti
             [x: string]: any;
         } | undefined;
     };
+    readonly objects?: readonly import("@dxos/echo/internal").Expando[] | undefined;
 }, {
-    readonly message: import("@dxos/echo/Type").OfKind<import("@dxos/echo-schema").EntityKind.Object> & {
+    readonly message: import("@dxos/echo/Type").OfKind<import("@dxos/echo/internal").EntityKind.Object> & {
         id: string;
         parentMessage?: string | undefined;
         created: string;
         sender: {
             name?: string | undefined;
-            contact?: import("@dxos/echo-schema").Ref<import("@dxos/echo/Type").OfKind<import("@dxos/echo-schema").EntityKind.Object> & {
-                fields?: {
-                    readonly value: string;
-                    readonly category?: string | undefined;
-                    readonly label: string;
-                }[] | undefined;
+            contact?: import("@dxos/echo/internal").Ref<import("@dxos/echo/Type").OfKind<import("@dxos/echo/internal").EntityKind.Object> & {
                 image?: string | undefined;
                 fullName?: string | undefined;
                 preferredName?: string | undefined;
                 nickname?: string | undefined;
-                organization?: import("@dxos/echo-schema").Ref<import("@dxos/echo/Type").OfKind<import("@dxos/echo-schema").EntityKind.Object> & {
+                organization?: import("@dxos/echo/internal").Ref<import("@dxos/echo/Type").OfKind<import("@dxos/echo/internal").EntityKind.Object> & {
+                    description?: string | undefined;
                     id: string;
                     name?: string | undefined;
-                    description?: string | undefined;
                     status?: "prospect" | "qualified" | "active" | "commit" | "reject" | undefined;
                     image?: string | undefined;
                     website?: string | undefined;
+                    location?: readonly [number, number, (number | undefined)?] | undefined;
                 }> | undefined;
                 jobTitle?: string | undefined;
                 department?: string | undefined;
@@ -223,11 +226,17 @@ export declare const extractionNerFn: import("@dxos/functions").FunctionDefiniti
                     readonly label?: string | undefined;
                 }[] | undefined;
                 birthday?: string | undefined;
+                fields?: {
+                    readonly value: string;
+                    readonly label: string;
+                    readonly category?: string | undefined;
+                }[] | undefined;
+                location?: readonly [number, number, (number | undefined)?] | undefined;
             }> | undefined;
             identityDid?: string | undefined;
             identityKey?: string | undefined;
             email?: string | undefined;
-            role?: "user" | "assistant" | undefined;
+            role?: "user" | "assistant" | "tool" | undefined;
         };
         blocks: ({
             version: unknown;
@@ -235,23 +244,23 @@ export declare const extractionNerFn: import("@dxos/functions").FunctionDefiniti
             pending?: boolean | undefined;
             objectId: string;
         } | {
-            name?: string | undefined;
             _tag: "file";
-            url: string;
             pending?: boolean | undefined;
+            url: string;
+            name?: string | undefined;
             mediaType?: string | undefined;
         } | {
             id?: string | undefined;
+            _tag: "image";
+            pending?: boolean | undefined;
             source?: {
-                type: "base64";
                 mediaType: string;
+                type: "base64";
                 data: string;
             } | {
-                type: "http";
                 url: string;
+                type: "http";
             } | undefined;
-            _tag: "image";
-            pending?: boolean | undefined;
         } | {
             _tag: "json";
             pending?: boolean | undefined;
@@ -263,13 +272,13 @@ export declare const extractionNerFn: import("@dxos/functions").FunctionDefiniti
             pending?: boolean | undefined;
         } | {
             _tag: "reasoning";
+            pending?: boolean | undefined;
             reasoningText?: string | undefined;
-            signature?: string | undefined;
             redactedText?: string | undefined;
-            pending?: boolean | undefined;
+            signature?: string | undefined;
         } | {
+            reference: import("@dxos/echo/internal").Ref<import("@dxos/echo/Type").Expando>;
             _tag: "reference";
-            reference: import("@dxos/echo-schema").Ref<import("@dxos/echo/Type").Expando>;
             pending?: boolean | undefined;
         } | {
             _tag: "select";
@@ -285,15 +294,15 @@ export declare const extractionNerFn: import("@dxos/functions").FunctionDefiniti
             pending?: boolean | undefined;
         } | {
             _tag: "summary";
+            pending?: boolean | undefined;
+            mimeType?: string | undefined;
+            message?: string | undefined;
             model?: string | undefined;
             usage?: {
                 readonly inputTokens?: number | undefined;
                 readonly outputTokens?: number | undefined;
                 readonly totalTokens?: number | undefined;
             } | undefined;
-            pending?: boolean | undefined;
-            mimeType?: string | undefined;
-            message?: string | undefined;
             toolCalls?: number | undefined;
             errors?: number | undefined;
             duration?: number | undefined;
@@ -307,18 +316,20 @@ export declare const extractionNerFn: import("@dxos/functions").FunctionDefiniti
             _tag: "toolkit";
             pending?: boolean | undefined;
         } | {
-            name: string;
             _tag: "toolCall";
             pending?: boolean | undefined;
+            name: string;
             toolCallId: string;
             input: string;
+            providerExecuted: boolean;
         } | {
-            name: string;
             _tag: "toolResult";
-            error?: string | undefined;
             pending?: boolean | undefined;
+            name: string;
             toolCallId: string;
+            providerExecuted: boolean;
             result?: string | undefined;
+            error?: string | undefined;
         } | {
             text: string;
             _tag: "transcript";
@@ -330,5 +341,5 @@ export declare const extractionNerFn: import("@dxos/functions").FunctionDefiniti
         } | undefined;
     };
     readonly timeElapsed: number;
-}>;
+}, import("@dxos/functions").FunctionServices>;
 //# sourceMappingURL=extraction-ner-function.d.ts.map

package/dist/types/src/extraction/extraction-ner-function/extraction-ner-function.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extraction-ner-function.d.ts","sourceRoot":"","sources":["../../../../../src/extraction/extraction-ner-function/extraction-ner-function.ts"],"names":[],"mappings":"AAkBA,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAsC1B,CAAC"}
+{"version":3,"file":"extraction-ner-function.d.ts","sourceRoot":"","sources":["../../../../../src/extraction/extraction-ner-function/extraction-ner-function.ts"],"names":[],"mappings":"AAQA;;GAEG;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8CA2ChC,CAAC"}

package/dist/types/src/extraction/extraction-ner-function/named-entity-recognition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"named-entity-recognition.d.ts","sourceRoot":"","sources":["../../../../../src/extraction/extraction-ner-function/named-entity-recognition.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,KAAK,+BAA+B,EACpC,KAAK,yBAAyB,EAE/B,MAAM,sBAAsB,CAAC;AAK9B;;;;GAIG;AACH,eAAO,MAAM,MAAM,gDAQlB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAAU,MAAM,MAAM,KAAG,OAAO,CAAC,yBAAyB,EAAE,CAM3F,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,QAAQ,yBAAyB,EAAE,KAAG,yBAAyB,EAAE,EAmClG,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,OAAO,yBAAyB,EAAE,KAAG,yBAmBrE,CAAC"}
+{"version":3,"file":"named-entity-recognition.d.ts","sourceRoot":"","sources":["../../../../../src/extraction/extraction-ner-function/named-entity-recognition.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,KAAK,+BAA+B,EACpC,KAAK,yBAAyB,EAE/B,MAAM,sBAAsB,CAAC;AAM9B;;;;GAIG;AACH,eAAO,MAAM,MAAM,gDASlB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAAU,MAAM,MAAM,KAAG,OAAO,CAAC,yBAAyB,EAAE,CAM3F,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,QAAQ,yBAAyB,EAAE,KAAG,yBAAyB,EAAE,EAmClG,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,OAAO,yBAAyB,EAAE,KAAG,yBAmBrE,CAAC"}

package/dist/types/src/extraction/extraction.d.ts

@@ -1,24 +1,26 @@
-import { Schema } from 'effect';
-import { Expando } from '@dxos/echo-schema';
-import { type FunctionDefinition, type FunctionExecutor } from '@dxos/functions';
+import * as Schema from 'effect/Schema';
+import { Expando } from '@dxos/echo/internal';
+import { type FunctionDefinition } from '@dxos/functions';
+import { type FunctionExecutor } from '@dxos/functions-runtime';
 export declare const ExtractionInput: Schema.Struct<{
     message: import("@dxos/echo/Type").obj<Schema.Struct<{
         id: import("@dxos/keys").ObjectIdClass;
         parentMessage: Schema.optional<import("@dxos/keys").ObjectIdClass>;
         created: Schema.SchemaClass<string, string, never>;
         sender: Schema.mutable<Schema.Struct<{
-            contact: Schema.optional<import("@dxos/echo/Type").ref<import("@dxos/echo/Type").obj<Schema.Struct<{
+            contact: Schema.optional<import("@dxos/echo/Type").ref<import("@dxos/echo/Type").obj<Schema.extend<Schema.Struct<{
                 fullName: Schema.optional<Schema.SchemaClass<string, string, never>>;
                 preferredName: Schema.optional<Schema.SchemaClass<string, string, never>>;
                 nickname: Schema.optional<Schema.SchemaClass<string, string, never>>;
                 image: Schema.optional<Schema.SchemaClass<string, string, never>>;
-                organization: Schema.optional<Schema.Schema<import("@dxos/echo-schema").Ref<import("@dxos/echo/Type").OfKind<import("@dxos/echo-schema").EntityKind.Object> & {
+                organization: Schema.optional<Schema.Schema<import("@dxos/echo/internal").Ref<import("@dxos/echo/Type").OfKind<import("@dxos/echo/internal").EntityKind.Object> & {
+                    description?: string | undefined;
                     id: string;
                     name?: string | undefined;
-                    description?: string | undefined;
                     status?: "prospect" | "qualified" | "active" | "commit" | "reject" | undefined;
                     image?: string | undefined;
                     website?: string | undefined;
+                    location?: readonly [number, number, (number | undefined)?] | undefined;
                 }>, import("@dxos/echo-protocol").EncodedReference, never>>;
                 jobTitle: Schema.optional<Schema.SchemaClass<string, string, never>>;
                 department: Schema.optional<Schema.SchemaClass<string, string, never>>;
@@ -57,12 +59,14 @@ export declare const ExtractionInput: Schema.Struct<{
                     label: typeof Schema.String;
                     value: typeof Schema.String;
                 }>>>>;
-            }>>>>;
+            }>, Schema.Struct<{
+                location: Schema.optional<Schema.Tuple<[Schema.filter<Schema.transform<Schema.SchemaClass<number, number, never>, Schema.filter<Schema.SchemaClass<number, number, never>>>>, Schema.filter<Schema.transform<Schema.SchemaClass<number, number, never>, Schema.filter<Schema.SchemaClass<number, number, never>>>>, Schema.Element<typeof Schema.Number, "?">]>>;
+            }>>>>>;
             identityDid: Schema.optional<typeof Schema.String>;
             identityKey: Schema.optional<typeof Schema.String>;
             email: Schema.optional<typeof Schema.String>;
             name: Schema.optional<typeof Schema.String>;
-            role: Schema.optional<Schema.Literal<["user", "assistant"]>>;
+            role: Schema.optional<Schema.Literal<["user", "assistant", "tool"]>>;
         }>>;
         blocks: Schema.mutable<Schema.Array$<Schema.Union<[Schema.mutable<Schema.TaggedStruct<"anchor", {
             pending: Schema.optional<typeof Schema.Boolean>;
@@ -136,12 +140,14 @@ export declare const ExtractionInput: Schema.Struct<{
             toolCallId: typeof Schema.String;
             name: typeof Schema.String;
             input: typeof Schema.String;
+            providerExecuted: typeof Schema.Boolean;
         }>>, Schema.mutable<Schema.TaggedStruct<"toolResult", {
             pending: Schema.optional<typeof Schema.Boolean>;
             toolCallId: typeof Schema.String;
             name: typeof Schema.String;
             result: Schema.optional<typeof Schema.String>;
             error: Schema.optional<typeof Schema.String>;
+            providerExecuted: typeof Schema.Boolean;
         }>>, Schema.mutable<Schema.TaggedStruct<"transcript", {
             pending: Schema.optional<typeof Schema.Boolean>;
             started: typeof Schema.String;
@@ -163,18 +169,19 @@ export declare const ExtractionOutput: Schema.Struct<{
         parentMessage: Schema.optional<import("@dxos/keys").ObjectIdClass>;
         created: Schema.SchemaClass<string, string, never>;
         sender: Schema.mutable<Schema.Struct<{
-            contact: Schema.optional<import("@dxos/echo/Type").ref<import("@dxos/echo/Type").obj<Schema.Struct<{
+            contact: Schema.optional<import("@dxos/echo/Type").ref<import("@dxos/echo/Type").obj<Schema.extend<Schema.Struct<{
                 fullName: Schema.optional<Schema.SchemaClass<string, string, never>>;
                 preferredName: Schema.optional<Schema.SchemaClass<string, string, never>>;
                 nickname: Schema.optional<Schema.SchemaClass<string, string, never>>;
                 image: Schema.optional<Schema.SchemaClass<string, string, never>>;
-                organization: Schema.optional<Schema.Schema<import("@dxos/echo-schema").Ref<import("@dxos/echo/Type").OfKind<import("@dxos/echo-schema").EntityKind.Object> & {
+                organization: Schema.optional<Schema.Schema<import("@dxos/echo/internal").Ref<import("@dxos/echo/Type").OfKind<import("@dxos/echo/internal").EntityKind.Object> & {
+                    description?: string | undefined;
                     id: string;
                     name?: string | undefined;
-                    description?: string | undefined;
                     status?: "prospect" | "qualified" | "active" | "commit" | "reject" | undefined;
                     image?: string | undefined;
                     website?: string | undefined;
+                    location?: readonly [number, number, (number | undefined)?] | undefined;
                 }>, import("@dxos/echo-protocol").EncodedReference, never>>;
                 jobTitle: Schema.optional<Schema.SchemaClass<string, string, never>>;
                 department: Schema.optional<Schema.SchemaClass<string, string, never>>;
@@ -213,12 +220,14 @@ export declare const ExtractionOutput: Schema.Struct<{
                     label: typeof Schema.String;
                     value: typeof Schema.String;
                 }>>>>;
-            }>>>>;
+            }>, Schema.Struct<{
+                location: Schema.optional<Schema.Tuple<[Schema.filter<Schema.transform<Schema.SchemaClass<number, number, never>, Schema.filter<Schema.SchemaClass<number, number, never>>>>, Schema.filter<Schema.transform<Schema.SchemaClass<number, number, never>, Schema.filter<Schema.SchemaClass<number, number, never>>>>, Schema.Element<typeof Schema.Number, "?">]>>;
+            }>>>>>;
             identityDid: Schema.optional<typeof Schema.String>;
             identityKey: Schema.optional<typeof Schema.String>;
             email: Schema.optional<typeof Schema.String>;
             name: Schema.optional<typeof Schema.String>;
-            role: Schema.optional<Schema.Literal<["user", "assistant"]>>;
+            role: Schema.optional<Schema.Literal<["user", "assistant", "tool"]>>;
         }>>;
         blocks: Schema.mutable<Schema.Array$<Schema.Union<[Schema.mutable<Schema.TaggedStruct<"anchor", {
             pending: Schema.optional<typeof Schema.Boolean>;
@@ -292,12 +301,14 @@ export declare const ExtractionOutput: Schema.Struct<{
             toolCallId: typeof Schema.String;
             name: typeof Schema.String;
             input: typeof Schema.String;
+            providerExecuted: typeof Schema.Boolean;
         }>>, Schema.mutable<Schema.TaggedStruct<"toolResult", {
             pending: Schema.optional<typeof Schema.Boolean>;
             toolCallId: typeof Schema.String;
             name: typeof Schema.String;
             result: Schema.optional<typeof Schema.String>;
             error: Schema.optional<typeof Schema.String>;
+            providerExecuted: typeof Schema.Boolean;
         }>>, Schema.mutable<Schema.TaggedStruct<"transcript", {
             pending: Schema.optional<typeof Schema.Boolean>;
             started: typeof Schema.String;

package/dist/types/src/extraction/extraction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extraction.d.ts","sourceRoot":"","sources":["../../../../src/extraction/extraction.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,KAAK,kBAAkB,EAAE,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAIjF,eAAO,MAAM,eAAe;;;;;;;;;;;;;wBA+D+jb,CAAC;+BAAiD,CAAC;0BAA4C,CAAC;yBAA8F,CAAC;2BAA6C,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAtDt0b,CAAC;AACH,MAAM,WAAW,eAAgB,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,eAAe,CAAC;CAAG;AAEtF,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;wBAmD8jb,CAAC;+BAAiD,CAAC;0BAA4C,CAAC;yBAA8F,CAAC;2BAA6C,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAhDt0b,CAAC;AACH,MAAM,WAAW,gBAAiB,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC;CAAG;AAExF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,KAAK,EAAE,eAAe,CAAC;IACvB,QAAQ,EAAE,kBAAkB,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;IAChE,QAAQ,EAAE,gBAAgB,CAAC;IAE3B,OAAO,CAAC,EAAE;QACR;;WAEG;QACH,OAAO,CAAC,EAAE,MAAM,CAAC;QAEjB;;;;WAIG;QACH,aAAa,CAAC,EAAE,OAAO,CAAC;KACzB,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;AAEvF;;GAEG;AAEH,eAAO,MAAM,wBAAwB,GAAU,QAAQ,8BAA8B,KAAG,OAAO,CAAC,gBAAgB,CAkB/G,CAAC"}
+{"version":3,"file":"extraction.d.ts","sourceRoot":"","sources":["../../../../src/extraction/extraction.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAIhE,eAAO,MAAM,eAAe;;;;;;;;;;;;+BAoBJ,CAAC;;wBACG,CAAC;0BAIT,CAAC;yBAKc,CAAA;2BACd,CAAA;4BACL,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAvBf,CAAC;AACH,MAAM,WAAW,eAAgB,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,eAAe,CAAC;CAAG;AAEtF,eAAO,MAAM,gBAAgB;;;;;;;;;;;;+BAQL,CAAC;;wBACG,CAAC;0BAIT,CAAC;yBAKc,CAAA;2BACd,CAAA;4BACL,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAjBf,CAAC;AACH,MAAM,WAAW,gBAAiB,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC;CAAG;AAExF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,KAAK,EAAE,eAAe,CAAC;IACvB,QAAQ,EAAE,kBAAkB,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;IAChE,QAAQ,EAAE,gBAAgB,CAAC;IAE3B,OAAO,CAAC,EAAE;QACR;;WAEG;QACH,OAAO,CAAC,EAAE,MAAM,CAAC;QAEjB;;;;WAIG;QACH,aAAa,CAAC,EAAE,OAAO,CAAC;KACzB,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;AAEvF;;GAEG;AAEH,eAAO,MAAM,wBAAwB,GAAU,QAAQ,8BAA8B,KAAG,OAAO,CAAC,gBAAgB,CAkB/G,CAAC"}

package/dist/types/src/extraction/quotes.d.ts

@@ -1,4 +1,4 @@
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import { type EchoDatabase } from '@dxos/echo-db';
 export declare const ReferencedQuotes: Schema.Struct<{
     references: Schema.mutable<Schema.Array$<Schema.Struct<{

package/dist/types/src/extraction/quotes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quotes.d.ts","sourceRoot":"","sources":["../../../../src/extraction/quotes.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAKlD,eAAO,MAAM,gBAAgB;;;;;EAe3B,CAAC;AACH,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE3E,eAAO,MAAM,UAAU,GAAU,QAAQ,MAAM,EAAE,EAAE,IAAI,YAAY,KAAG,OAAO,CAAC,gBAAgB,CAS7F,CAAC;AAEF;;GAEG;AAEH,eAAO,MAAM,gBAAgB,GAAI,MAAM,MAAM,EAAE,QAAQ,gBAAgB,WAYtE,CAAC"}
+{"version":3,"file":"quotes.d.ts","sourceRoot":"","sources":["../../../../src/extraction/quotes.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAIlD,eAAO,MAAM,gBAAgB;;;;;EAe3B,CAAC;AACH,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE3E,eAAO,MAAM,UAAU,GAAU,QAAQ,MAAM,EAAE,EAAE,IAAI,YAAY,KAAG,OAAO,CAAC,gBAAgB,CAS7F,CAAC;AAEF;;GAEG;AAEH,eAAO,MAAM,gBAAgB,GAAI,MAAM,MAAM,EAAE,QAAQ,gBAAgB,WAYtE,CAAC"}

package/dist/types/src/functions/services.d.ts

@@ -1,7 +1,20 @@
-import { AiTool, type AiToolkit } from '@effect/ai';
-import { Layer } from 'effect';
+import * as Tool from '@effect/ai/Tool';
+import type * as Toolkit from '@effect/ai/Toolkit';
+import * as Layer from 'effect/Layer';
 import { ToolExecutionService, ToolResolverService } from '@dxos/ai';
-import { type FunctionDefinition, LocalFunctionExecutionService } from '@dxos/functions';
-export declare const makeToolResolverFromFunctions: (functions: FunctionDefinition<any, any>[], toolkit: AiToolkit.Any) => Layer.Layer<ToolResolverService>;
-export declare const makeToolExecutionServiceFromFunctions: (functions: FunctionDefinition<any, any>[], toolkit: AiToolkit.AiToolkit<AiTool.Any>, handlersLayer: Layer.Layer<AiTool.ToHandler<AiTool.AiTool<any>>, never, never>) => Layer.Layer<ToolExecutionService, never, LocalFunctionExecutionService>;
+import { DatabaseService } from '@dxos/echo-db';
+import { FunctionDefinition, FunctionInvocationService } from '@dxos/functions';
+/**
+ * Constructs a `ToolResolverService` whose `resolve(id)` looks up tools in the following order:
+ *  1. Toolkit: return an existing tool from the provided `toolkit` if one is present under `id`.
+ *  2. Functions in DB: query `FunctionType` by `key=id`; if found, deserialize and project to a tool
+ *     (propagating any `deployedFunctionId` discovered in the object's metadata).
+ *  3. Functions passed in: fall back to a matching `FunctionDefinition` from the `functions` array.
+ *
+ * If none of the above yield a match, the effect fails with `AiToolNotFoundError`.
+ *
+ * Requires `DatabaseService` in the environment.
+ */
+export declare const makeToolResolverFromFunctions: (functions: FunctionDefinition.Any[], toolkit: Toolkit.Toolkit<any>) => Layer.Layer<ToolResolverService, never, DatabaseService>;
+export declare const makeToolExecutionServiceFromFunctions: (toolkit: Toolkit.Toolkit<any>, handlersLayer: Layer.Layer<Tool.Handler<any>, never, never>) => Layer.Layer<ToolExecutionService, never, FunctionInvocationService>;
 //# sourceMappingURL=services.d.ts.map

package/dist/types/src/functions/services.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../../../../src/functions/services.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,EAAmB,KAAK,EAAkB,MAAM,QAAQ,CAAC;AAEhE,OAAO,EAAuB,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE1F,OAAO,EAAE,KAAK,kBAAkB,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AAGzF,eAAO,MAAM,6BAA6B,GACxC,WAAW,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EACzC,SAAS,SAAS,CAAC,GAAG,KACrB,KAAK,CAAC,KAAK,CAAC,mBAAmB,CAgBjC,CAAC;AAEF,eAAO,MAAM,qCAAqC,GAChD,WAAW,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EACzC,SAAS,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,EACxC,eAAe,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAC7E,KAAK,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,EAAE,6BAA6B,CAiCxE,CAAC"}
+{"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../../../../src/functions/services.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,KAAK,OAAO,MAAM,oBAAoB,CAAC;AAGnD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAItC,OAAO,EAAuB,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAG1F,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAY,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAG1F;;;;;;;;;;GAUG;AACH,eAAO,MAAM,6BAA6B,GACxC,WAAW,kBAAkB,CAAC,GAAG,EAAE,EACnC,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,KAC5B,KAAK,CAAC,KAAK,CAAC,mBAAmB,EAAE,KAAK,EAAE,eAAe,CA8BzD,CAAC;AAEF,eAAO,MAAM,qCAAqC,GAChD,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAC7B,eAAe,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAC1D,KAAK,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,EAAE,yBAAyB,CAoCpE,CAAC"}

package/dist/types/src/index.d.ts

@@ -1,8 +1,9 @@
 export * from './conversation';
 export * from './diff';
+export * from './errors';
+export * from './execution-graph';
 export * from './functions';
 export * from './session';
 export * from './templates';
 export * from './types';
-export * from './errors';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,QAAQ,CAAC;AACvB,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC"}

package/dist/types/src/session/GenericToolkit.d.ts

@@ -0,0 +1,84 @@
+import type * as Tool from '@effect/ai/Tool';
+import * as Toolkit from '@effect/ai/Toolkit';
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
+import * as Pipeable from 'effect/Pipeable';
+import type * as Schema from 'effect/Schema';
+import type * as SchemaAST from 'effect/SchemaAST';
+/**
+ * Unique identifier for generic toolkit instances.
+ */
+export declare const TypeId = "~@dxos/assistant/GenericToolkit";
+/**
+ * Type-level representation of the generic toolkit identifier.
+ */
+export type TypeId = typeof TypeId;
+/**
+ * Type-safe way to define toolkits where we don't know specific types of tools,
+ * and we want to bundle definition and handlers together.
+ *
+ * Usefull for plugin-based systems, where tools are dynamically added.
+ *
+ * @param TR requirements type to the tool invocation.
+ * @param E failure type to the handlers layer.
+ * @param R requirements type to the handlers layer.
+ */
+export interface GenericToolkit<TR = never, E = never, R = never> extends Pipeable.Pipeable {
+    readonly [TypeId]: TypeId;
+    /**
+     * Toolkit definition.
+     */
+    readonly toolkit: Toolkit.Toolkit<GenericTools<TR>>;
+    /**
+     * Handlers layer.
+     */
+    readonly layer: Layer.Layer<unknown, E, R>;
+    /**
+     * Handlers effect.
+     */
+    readonly handlers: Effect.Effect<Toolkit.WithHandler<GenericTools<TR>>, E, R>;
+}
+/**
+ * Generic constraint.
+ *
+ * NOTE: Only use in place of `T extends PortableToolkit.Any`. Not suitable for standalone use.
+ */
+export interface Any {
+    readonly [TypeId]: TypeId;
+    readonly toolkit: Toolkit.Toolkit<any>;
+    readonly layer: Layer.Layer<unknown, any, any>;
+}
+export type InvocationRequirements<T extends Any> = T extends GenericToolkit<infer TR, infer _E, infer _R> ? TR : never;
+export type Failure<T extends Any> = T extends GenericToolkit<infer _TR, infer E, infer _R> ? E : never;
+export type Requirements<T extends Any> = T extends GenericToolkit<infer _TR, infer _E, infer R> ? R : never;
+/**
+ * Creates a portable toolkit from toolkit definition and handlers layer.
+ */
+export declare const make: <Tools extends Record<string, Tool.Any>, E, R>(toolkit: Toolkit.Toolkit<Tools>, layer: Layer.Layer<Tool.HandlersFor<Tools>, E, R>) => GenericToolkit<E, R>;
+/**
+ * Merges multiple portable toolkits into a single portable toolkit.
+ */
+export declare const merge: <const Toolkits extends ReadonlyArray<Any>>(
+/**
+ * The toolkits to merge together.
+ */
+...toolkits: Toolkits) => GenericToolkit<InvocationRequirements<Toolkits[number]>, Failure<Toolkits[number]>, Requirements<Toolkits[number]>>;
+/**
+ * Generic tools type where we cannot statically enumerate individual tools.
+ */
+export type GenericTools<R = never> = Record<string, Tool.Tool<string, {
+    readonly parameters: AnyStructSchemaNoContext;
+    readonly success: Schema.Schema.AnyNoContext;
+    readonly failure: typeof Schema.Never;
+}, R>>;
+export interface AnyStructSchemaNoContext extends Pipeable.Pipeable {
+    readonly [Schema.TypeId]: any;
+    readonly make: any;
+    readonly Type: any;
+    readonly Encoded: any;
+    readonly Context: never;
+    readonly ast: SchemaAST.AST;
+    readonly fields: Schema.Struct.Fields;
+    readonly annotations: any;
+}
+//# sourceMappingURL=GenericToolkit.d.ts.map

package/dist/types/src/session/GenericToolkit.d.ts.map

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

package/dist/types/src/session/artifact-diff.d.ts

@@ -1,6 +1,6 @@
-import { Context } from 'effect';
+import * as Context from 'effect/Context';
+import { type ObjectId } from '@dxos/echo/internal';
 import { type ObjectVersion } from '@dxos/echo-db';
-import { type ObjectId } from '@dxos/echo-schema';
 declare const ArtifactDiffResolver_base: Context.TagClass<ArtifactDiffResolver, "@dxos/assistant/ArtifactDiffResolver", ArtifactDiffResolver.Service>;
 /**
  * Resolves artifact ids to their versions.

package/dist/types/src/session/artifact-diff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"artifact-diff.d.ts","sourceRoot":"","sources":["../../../../src/session/artifact-diff.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEjC,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;;AAElD;;;;;;;GAOG;AAEH,qBAAa,oBAAqB,SAAQ,yBAGvC;CAAG;AAEN,yBAAiB,oBAAoB,CAAC;IACpC,KAAY,OAAO,GAAG;QACpB,OAAO,EAAE,CACP,SAAS,EAAE;YACT,EAAE,EAAE,QAAQ,CAAC;YACb,WAAW,EAAE,aAAa,CAAC;SAC5B,EAAE,KACA,OAAO,CACV,GAAG,CACD,QAAQ,EACR;YACE,OAAO,EAAE,aAAa,CAAC;YACvB,IAAI,CAAC,EAAE,MAAM,CAAC;SACf,CACF,CACF,CAAC;KACH,CAAC;CACH"}
+{"version":3,"file":"artifact-diff.d.ts","sourceRoot":"","sources":["../../../../src/session/artifact-diff.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;;AAEnD;;;;;;;GAOG;AAEH,qBAAa,oBAAqB,SAAQ,yBAGvC;CAAG;AAEN,yBAAiB,oBAAoB,CAAC;IACpC,KAAY,OAAO,GAAG;QACpB,OAAO,EAAE,CACP,SAAS,EAAE;YACT,EAAE,EAAE,QAAQ,CAAC;YACb,WAAW,EAAE,aAAa,CAAC;SAC5B,EAAE,KACA,OAAO,CACV,GAAG,CACD,QAAQ,EACR;YACE,OAAO,EAAE,aAAa,CAAC;YACvB,IAAI,CAAC,EAAE,MAAM,CAAC;SACf,CACF,CACF,CAAC;KACH,CAAC;CACH"}

package/dist/types/src/session/error-handling.d.ts

@@ -1,4 +1,4 @@
-import { AiError } from '@effect/ai';
-import { Effect } from 'effect';
+import * as AiError from '@effect/ai/AiError';
+import * as Effect from 'effect/Effect';
 export declare const mapAiError: (err: AiError.AiError) => Effect.Effect<AiError.AiError>;
 //# sourceMappingURL=error-handling.d.ts.map

package/dist/types/src/session/error-handling.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error-handling.d.ts","sourceRoot":"","sources":["../../../../src/session/error-handling.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,OAAO,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAYxC,eAAO,MAAM,UAAU,GAAI,KAAK,OAAO,CAAC,OAAO,KAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAiB1B,CAAC"}
+{"version":3,"file":"error-handling.d.ts","sourceRoot":"","sources":["../../../../src/session/error-handling.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAC;AAE9C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAcxC,eAAO,MAAM,UAAU,GAAI,KAAK,OAAO,CAAC,OAAO,KAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAoB1B,CAAC"}