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

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

@@ -1,5 +1,6 @@
-import { Effect } from 'effect';
-import { type AiSessionRunParams } from './session';
+import * as Effect from 'effect/Effect';
+import { Message } from '@dxos/types';
+import { type AiSessionRunError, type AiSessionRunParams } from './session';
 /**
  * Formats the system prompt.
  */
@@ -7,176 +8,5 @@ export declare const formatSystemPrompt: ({ system, blueprints, objects, }: Pick
 /**
  * Formats the user prompt.
  */
-export declare const formatUserPrompt: ({ prompt, history }: Pick<AiSessionRunParams<any>, "prompt" | "history">) => Effect.Effect<import("@dxos/live-object").Live<import("@dxos/echo/Type").OfKind<import("@dxos/echo-schema").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;
-            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> & {
-                id: string;
-                name?: string | undefined;
-                description?: string | undefined;
-                status?: "prospect" | "qualified" | "active" | "commit" | "reject" | undefined;
-                image?: string | undefined;
-                website?: string | undefined;
-            }> | undefined;
-            jobTitle?: string | undefined;
-            department?: string | undefined;
-            notes?: string | undefined;
-            emails?: {
-                readonly value: string;
-                readonly label?: string | undefined;
-            }[] | undefined;
-            identities?: {
-                readonly value: string;
-                readonly label?: string | undefined;
-            }[] | undefined;
-            phoneNumbers?: {
-                readonly value: string;
-                readonly label?: string | undefined;
-            }[] | undefined;
-            addresses?: {
-                readonly value: {
-                    readonly street?: string | undefined;
-                    readonly extended?: string | undefined;
-                    readonly locality?: string | undefined;
-                    readonly region?: string | undefined;
-                    readonly postalCode?: string | undefined;
-                    readonly postOfficeBoxNumber?: string | undefined;
-                    readonly country?: string | undefined;
-                };
-                readonly label?: string | undefined;
-            }[] | undefined;
-            urls?: {
-                readonly value: string;
-                readonly label?: string | undefined;
-            }[] | undefined;
-            birthday?: string | undefined;
-        }> | undefined;
-        identityDid?: string | undefined;
-        identityKey?: string | undefined;
-        email?: string | undefined;
-        role?: "user" | "assistant" | undefined;
-    };
-    blocks: ({
-        version: unknown;
-        _tag: "anchor";
-        pending?: boolean | undefined;
-        objectId: string;
-    } | {
-        name?: string | undefined;
-        _tag: "file";
-        url: string;
-        pending?: boolean | undefined;
-        mediaType?: string | undefined;
-    } | {
-        id?: string | undefined;
-        source?: {
-            type: "base64";
-            mediaType: string;
-            data: string;
-        } | {
-            type: "http";
-            url: string;
-        } | undefined;
-        _tag: "image";
-        pending?: boolean | undefined;
-    } | {
-        _tag: "json";
-        pending?: boolean | undefined;
-        data: string;
-        disposition?: string | undefined;
-    } | {
-        text: string;
-        _tag: "proposal";
-        pending?: boolean | undefined;
-    } | {
-        _tag: "reasoning";
-        reasoningText?: string | undefined;
-        signature?: string | undefined;
-        redactedText?: string | undefined;
-        pending?: boolean | undefined;
-    } | {
-        _tag: "reference";
-        reference: import("@dxos/echo-schema").Ref<import("@dxos/echo/Type").Expando>;
-        pending?: boolean | undefined;
-    } | {
-        _tag: "select";
-        pending?: boolean | undefined;
-        options: readonly string[];
-    } | {
-        _tag: "status";
-        pending?: boolean | undefined;
-        statusText: string;
-    } | {
-        text: string;
-        _tag: "suggestion";
-        pending?: boolean | undefined;
-    } | {
-        _tag: "summary";
-        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;
-    } | {
-        text: string;
-        _tag: "text";
-        pending?: boolean | undefined;
-        disposition?: string | undefined;
-        mimeType?: string | undefined;
-    } | {
-        _tag: "toolkit";
-        pending?: boolean | undefined;
-    } | {
-        name: string;
-        _tag: "toolCall";
-        pending?: boolean | undefined;
-        toolCallId: string;
-        input: string;
-    } | {
-        name: string;
-        _tag: "toolResult";
-        error?: string | undefined;
-        pending?: boolean | undefined;
-        toolCallId: string;
-        result?: string | undefined;
-    } | {
-        text: string;
-        _tag: "transcript";
-        pending?: boolean | undefined;
-        started: string;
-    })[];
-    properties?: {
-        [x: string]: any;
-    } | undefined;
-}>, {
-    #code: "AI_ASSISTANT_ERROR";
-    #context: Record<string, unknown>;
-    readonly name: "AI_ASSISTANT_ERROR";
-    readonly code: "AI_ASSISTANT_ERROR";
-    readonly _tag: "AI_ASSISTANT_ERROR";
-    readonly context: Record<string, unknown>;
-    message: string;
-    stack?: string;
-    cause?: unknown;
-}, never>;
+export declare const formatUserPrompt: ({ prompt, history, }: Pick<AiSessionRunParams<any>, "prompt" | "history">) => Effect.Effect<Message.Message, AiSessionRunError>;
 //# sourceMappingURL=format.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../../../src/session/format.ts"],"names":[],"mappings":"AAIA,OAAO,EAAS,MAAM,EAAgB,MAAM,QAAQ,CAAC;AAcrD,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAEpD;;GAEG;AAEH,eAAO,MAAM,kBAAkB,GAAI,kCAIhC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,QAAQ,GAAG,YAAY,GAAG,SAAS,CAAC,wCAsCjE,CAAC;AAEL;;GAEG;AAGH,eAAO,MAAM,gBAAgB,GAAI,qBAA0B,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAoC1G,CAAC"}
+{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../../../src/session/format.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AASxC,OAAO,EAAqB,OAAO,EAAE,MAAM,aAAa,CAAC;AAMzD,OAAO,EAAE,KAAK,iBAAiB,EAAE,KAAK,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAE5E;;GAEG;AAEH,eAAO,MAAM,kBAAkB,GAAI,kCAIhC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,QAAQ,GAAG,YAAY,GAAG,SAAS,CAAC,wCAsCjE,CAAC;AAEL;;GAEG;AAGH,eAAO,MAAM,gBAAgB,GAAI,sBAG9B,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,iBAAiB,CAoCrG,CAAC"}

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

@@ -3,4 +3,5 @@ export * from './observer';
 export * from './session';
 export * from './toolkit';
 export * from './version-pin';
+export * as GenericToolkit from './GenericToolkit';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/session/index.ts"],"names":[],"mappings":"AAIA,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/session/index.ts"],"names":[],"mappings":"AAIA,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAE9B,OAAO,KAAK,cAAc,MAAM,kBAAkB,CAAC"}

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

@@ -1,6 +1,6 @@
-import { Effect } from 'effect';
+import * as Effect from 'effect/Effect';
 import { type AiParser, type ConsolePrinter } from '@dxos/ai';
-import { type DataType } from '@dxos/schema';
+import { type Message } from '@dxos/types';
 /**
  * Live observer of the generation process.
  */
@@ -9,7 +9,7 @@ export interface GenerationObserver extends AiParser.ParseResponseCallbacks {
      * Complete messages fired during the session, both from the model and from the user.
      * This message will contain all message blocks emitted through the `onBlock` callback.
      */
-    onMessage: (message: DataType.Message) => Effect.Effect<void>;
+    onMessage: (message: Message.Message) => Effect.Effect<void>;
 }
 export declare const GenerationObserver: Readonly<{
     make: ({ onBegin, onPart, onBlock, onEnd, onMessage, }?: Partial<GenerationObserver>) => GenerationObserver;

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

@@ -1 +1 @@
-{"version":3,"file":"observer.d.ts","sourceRoot":"","sources":["../../../../src/session/observer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAY,MAAM,QAAQ,CAAC;AAE1C,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,cAAc,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE7C;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,QAAQ,CAAC,sBAAsB;IACzE;;;OAGG;IACH,SAAS,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;CAC/D;AAED,eAAO,MAAM,kBAAkB;6DAO1B,OAAO,CAAC,kBAAkB,CAAC,KAAQ,kBAAkB;;IAUxD;;OAEG;2BACoB,cAAc;EAiBrC,CAAC"}
+{"version":3,"file":"observer.d.ts","sourceRoot":"","sources":["../../../../src/session/observer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,cAAc,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,QAAQ,CAAC,sBAAsB;IACzE;;;OAGG;IACH,SAAS,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;CAC9D;AAED,eAAO,MAAM,kBAAkB;6DAO1B,OAAO,CAAC,kBAAkB,CAAC,KAAQ,kBAAkB;;IAUxD;;OAEG;2BACoB,cAAc;EAiBrC,CAAC"}

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

@@ -1,21 +1,25 @@
-import { type AiError, AiLanguageModel, type AiTool, type AiToolkit } from '@effect/ai';
-import { Effect, type Schema } from 'effect';
-import { type AiInputPreprocessingError, type AiToolNotFoundError, type ToolExecutionService, type ToolResolverService } from '@dxos/ai';
+import type * as AiError from '@effect/ai/AiError';
+import * as LanguageModel from '@effect/ai/LanguageModel';
+import type * as Tool from '@effect/ai/Tool';
+import type * as Toolkit from '@effect/ai/Toolkit';
+import * as Effect from 'effect/Effect';
+import type * as Schema from 'effect/Schema';
+import { type AiToolNotFoundError, type PromptPreprocessingError, type ToolExecutionService, type ToolResolverService } from '@dxos/ai';
 import { type Blueprint } from '@dxos/blueprints';
 import { Obj } from '@dxos/echo';
 import { TracingService } from '@dxos/functions';
-import { DataType } from '@dxos/schema';
+import { Message } from '@dxos/types';
 import { type AiAssistantError } from '../errors';
 import { GenerationObserver } from './observer';
-export type AiSessionRunError = AiError.AiError | AiInputPreprocessingError | AiToolNotFoundError | AiAssistantError;
-export type AiSessionRunRequirements = AiLanguageModel.AiLanguageModel | ToolExecutionService | ToolResolverService | TracingService;
-export type AiSessionRunParams<Tools extends AiTool.Any> = {
+export type AiSessionRunError = AiError.AiError | PromptPreprocessingError | AiToolNotFoundError | AiAssistantError;
+export type AiSessionRunRequirements = LanguageModel.LanguageModel | ToolExecutionService | ToolResolverService | TracingService;
+export type AiSessionRunParams<Tools extends Record<string, Tool.Any>> = {
     prompt: string;
     system?: string;
-    history?: DataType.Message[];
+    history?: Message.Message[];
     objects?: Obj.Any[];
     blueprints?: Blueprint.Blueprint[];
-    toolkit?: AiToolkit.ToHandler<Tools>;
+    toolkit?: Toolkit.WithHandler<Tools>;
     observer?: GenerationObserver;
 };
 export type AiSessionOptions = {};
@@ -38,10 +42,10 @@ export declare class AiSession {
     /** Pending messages for this session (incl. the current prompt). */
     private _pending;
     constructor(_options?: AiSessionOptions);
-    run: <Tools extends AiTool.Any>({ prompt, system: systemTemplate, history, objects, blueprints, toolkit, observer, }: AiSessionRunParams<Tools>) => Effect.Effect<DataType.Message[], AiSessionRunError, AiSessionRunRequirements>;
+    run: <Tools extends Record<string, Tool.Any>>({ prompt, system: systemTemplate, history, objects, blueprints, toolkit, observer, }: AiSessionRunParams<Tools>) => Effect.Effect<Message.Message[], AiSessionRunError, AiSessionRunRequirements>;
     /**
      * @deprecated
      */
-    runStructured<S extends Schema.Schema.AnyNoContext>(_schema: S, _options: AiSessionRunParams<AiTool.Any>): Promise<Schema.Schema.Type<S>>;
+    runStructured<S extends Schema.Schema.AnyNoContext>(_schema: S, _options: AiSessionRunParams<any>): Promise<Schema.Schema.Type<S>>;
 }
 //# sourceMappingURL=session.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../../src/session/session.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,OAAO,EAAE,eAAe,EAAE,KAAK,MAAM,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AACxF,OAAO,EAAS,MAAM,EAAE,KAAK,MAAM,EAAU,MAAM,QAAQ,CAAC;AAE5D,OAAO,EACL,KAAK,yBAAyB,EAG9B,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EAGzB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAIlD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhD,MAAM,MAAM,iBAAiB,GAAG,OAAO,CAAC,OAAO,GAAG,yBAAyB,GAAG,mBAAmB,GAAG,gBAAgB,CAAC;AAErH,MAAM,MAAM,wBAAwB,GAChC,eAAe,CAAC,eAAe,GAC/B,oBAAoB,GACpB,mBAAmB,GACnB,cAAc,CAAC;AAEnB,MAAM,MAAM,kBAAkB,CAAC,KAAK,SAAS,MAAM,CAAC,GAAG,IAAI;IACzD,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC;IAC7B,OAAO,CAAC,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC;IACpB,UAAU,CAAC,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC;IACnC,OAAO,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACrC,QAAQ,CAAC,EAAE,kBAAkB,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAElC;;;;;;;;;GASG;AACH,qBAAa,SAAS;IAWR,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAVrC,gDAAgD;IAChD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA2C;IAEtE,kCAAkC;IAElC,OAAO,CAAC,QAAQ,CAA0B;IAE1C,oEAAoE;IACpE,OAAO,CAAC,QAAQ,CAA0B;gBAEb,QAAQ,GAAE,gBAAqB;IAE5D,GAAG,GAAI,KAAK,SAAS,MAAM,CAAC,GAAG,EAAE,sFAQ9B,kBAAkB,CAAC,KAAK,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,iBAAiB,EAAE,wBAAwB,CAAC,CAkGjC;IAE5E;;OAEG;IAEG,aAAa,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,YAAY,EACtD,OAAO,EAAE,CAAC,EACV,QAAQ,EAAE,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,GACvC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CASlC"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../../src/session/session.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,OAAO,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,aAAa,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,KAAK,OAAO,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAG7C,OAAO,EAGL,KAAK,mBAAmB,EACxB,KAAK,wBAAwB,EAC7B,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EAGzB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAGlD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhD,MAAM,MAAM,iBAAiB,GAAG,OAAO,CAAC,OAAO,GAAG,wBAAwB,GAAG,mBAAmB,GAAG,gBAAgB,CAAC;AAEpH,MAAM,MAAM,wBAAwB,GAChC,aAAa,CAAC,aAAa,GAC3B,oBAAoB,GACpB,mBAAmB,GACnB,cAAc,CAAC;AAEnB,MAAM,MAAM,kBAAkB,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI;IACvE,MAAM,EAAE,MAAM,CAAC;IAEf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC;IAC5B,OAAO,CAAC,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC;IACpB,UAAU,CAAC,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC;IACnC,OAAO,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACrC,QAAQ,CAAC,EAAE,kBAAkB,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAElC;;;;;;;;;GASG;AACH,qBAAa,SAAS;IAWR,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAVrC,gDAAgD;IAChD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA2C;IAEtE,kCAAkC;IAElC,OAAO,CAAC,QAAQ,CAAyB;IAEzC,oEAAoE;IACpE,OAAO,CAAC,QAAQ,CAAyB;gBAEZ,QAAQ,GAAE,gBAAqB;IAE5D,GAAG,GAAI,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,sFAQ5C,kBAAkB,CAAC,KAAK,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,iBAAiB,EAAE,wBAAwB,CAAC,CA+FhC;IAE5E;;OAEG;IAEG,aAAa,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,YAAY,EACtD,OAAO,EAAE,CAAC,EACV,QAAQ,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAChC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CASlC"}

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

@@ -1,14 +1,15 @@
-import { type AiTool, AiToolkit } from '@effect/ai';
-import { Effect } from 'effect';
-import { ToolExecutionService, type ToolId, ToolResolverService } from '@dxos/ai';
+import type * as Tool from '@effect/ai/Tool';
+import * as Toolkit from '@effect/ai/Toolkit';
+import * as Effect from 'effect/Effect';
+import { type AiToolNotFoundError, ToolExecutionService, type ToolId, ToolResolverService } from '@dxos/ai';
 import { type Blueprint } from '@dxos/blueprints';
-export type ToolkitParams<Tools extends AiTool.Any> = {
-    toolkit?: AiToolkit.AiToolkit<Tools>;
+export type ToolkitParams<Tools extends Record<string, Tool.Any>> = {
+    toolkit?: Toolkit.Toolkit<Tools>;
     toolIds?: ToolId[];
     blueprints?: Blueprint.Blueprint[];
 };
 /**
  * Build a combined toolkit from the blueprint tools and the provided toolkit.
  */
-export declare const createToolkit: <Tools extends AiTool.Any>({ toolkit: toolkitParam, toolIds, blueprints, }: ToolkitParams<Tools>) => Effect.Effect<AiToolkit.ToHandler<any>, import("@dxos/ai").AiToolNotFoundError, ToolExecutionService | ToolResolverService | AiTool.ToHandler<Tools>>;
+export declare const createToolkit: <Tools extends Record<string, Tool.Any> = {}>({ toolkit: toolkitParam, toolIds, blueprints, }: ToolkitParams<Tools>) => Effect.Effect<Toolkit.WithHandler<any>, AiToolNotFoundError, ToolResolverService | ToolExecutionService | Tool.HandlersFor<Tools>>;
 //# sourceMappingURL=toolkit.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"toolkit.d.ts","sourceRoot":"","sources":["../../../../src/session/toolkit.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,EAAgB,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,oBAAoB,EAAE,KAAK,MAAM,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAClF,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGlD,MAAM,MAAM,aAAa,CAAC,KAAK,SAAS,MAAM,CAAC,GAAG,IAAI;IACpD,OAAO,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACrC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,CAAC,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC;CACpC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,GAAI,KAAK,SAAS,MAAM,CAAC,GAAG,EAAE,iDAIrD,aAAa,CAAC,KAAK,CAAC,0JAiBnB,CAAC"}
+{"version":3,"file":"toolkit.d.ts","sourceRoot":"","sources":["../../../../src/session/toolkit.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAC;AAE9C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,KAAK,mBAAmB,EAAE,oBAAoB,EAAE,KAAK,MAAM,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAC5G,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGlD,MAAM,MAAM,aAAa,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI;IAClE,OAAO,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,CAAC,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC;CACpC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,GAAI,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,iDAIxE,aAAa,CAAC,KAAK,CAAC,KAAG,MAAM,CAAC,MAAM,CACrC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,EACxB,mBAAmB,EACnB,mBAAmB,GAAG,oBAAoB,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAkBlE,CAAC"}

package/dist/types/src/session/version-pin.d.ts

@@ -1,7 +1,7 @@
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
+import { type AnyEchoObject } from '@dxos/echo/internal';
 import { type ObjectVersion } from '@dxos/echo-db';
-import { type AnyEchoObject } from '@dxos/echo-schema';
-import { type ContentBlock } from '@dxos/schema';
+import { type ContentBlock } from '@dxos/types';
 declare const VersionPinSchema: Schema.Struct<{
     objectId: import("@dxos/keys").ObjectIdClass;
     version: Schema.Schema<ObjectVersion, ObjectVersion, never>;

package/dist/types/src/session/version-pin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version-pin.d.ts","sourceRoot":"","sources":["../../../../src/session/version-pin.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,EAAE,KAAK,aAAa,EAAY,MAAM,mBAAmB,CAAC;AACjE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAKjD,QAAA,MAAM,gBAAgB;;;EAKpB,CAAC;AAEH;;;GAGG;AACH,MAAM,WAAW,UAAW,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC;CAAG;AAElF,eAAO,MAAM,UAAU,EAAE,OAAO,gBAAgB,GAAG;IACjD,WAAW,EAAE,aAAa,CAAC;IAC3B,UAAU,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,UAAU,CAAC;IAClD,WAAW,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,YAAY,CAAC,GAAG,CAAC;CAiBpD,CAAC"}
+{"version":3,"file":"version-pin.d.ts","sourceRoot":"","sources":["../../../../src/session/version-pin.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,KAAK,aAAa,EAAY,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,KAAK,aAAa,EAAc,MAAM,eAAe,CAAC;AAC/D,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAKhD,QAAA,MAAM,gBAAgB;;;EAKpB,CAAC;AAEH;;;GAGG;AACH,MAAM,WAAW,UAAW,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC;CAAG;AAElF,eAAO,MAAM,UAAU,EAAE,OAAO,gBAAgB,GAAG;IACjD,WAAW,EAAE,aAAa,CAAC;IAC3B,UAAU,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,UAAU,CAAC;IAClD,WAAW,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,YAAY,CAAC,GAAG,CAAC;CAiBpD,CAAC"}

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

@@ -0,0 +1,20 @@
+import type * as Effect from 'effect/Effect';
+import * as Schema from 'effect/Schema';
+import { type ObjectNotFoundError, type Type } from '@dxos/echo';
+import { type ObjectId } from '@dxos/echo/internal';
+import { DatabaseService } from '@dxos/echo-db';
+import { DXN, type SpaceId } from '@dxos/keys';
+/**
+ * @deprecated
+ */
+export declare const createArtifactElement: (id: ObjectId) => string;
+/**
+ * A model-friendly way to reference an object.
+ * Supports vairous formats that will be normalized to a DXN.
+ */
+export declare const ArtifactId: Schema.Schema<string> & {
+    toDXN: (reference: ArtifactId, owningSpaceId?: SpaceId) => DXN;
+    resolve: <S extends Type.Obj.Any | Type.Relation.Any>(schema: S, ref: ArtifactId) => Effect.Effect<Schema.Schema.Type<S>, ObjectNotFoundError, DatabaseService>;
+};
+export type ArtifactId = Schema.Schema.Type<typeof ArtifactId>;
+//# sourceMappingURL=artifact.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"artifact.d.ts","sourceRoot":"","sources":["../../../../src/types/artifact.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,GAAG,EAAmB,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAGhE;;GAEG;AACH,eAAO,MAAM,qBAAqB,GAAI,IAAI,QAAQ,WAA4B,CAAC;AAE/E;;;GAGG;AAEH,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG;IAC/C,KAAK,EAAE,CAAC,SAAS,EAAE,UAAU,EAAE,aAAa,CAAC,EAAE,OAAO,KAAK,GAAG,CAAC;IAC/D,OAAO,EAAE,CAAC,CAAC,SAAS,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,EAClD,MAAM,EAAE,CAAC,EACT,GAAG,EAAE,UAAU,KACZ,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,eAAe,CAAC,CAAC;CAwCjF,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,UAAU,CAAC,CAAC"}

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

@@ -0,0 +1,2 @@
+export * from './artifact';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/types/index.ts"],"names":[],"mappings":"AAIA,cAAc,YAAY,CAAC"}