@dxos/assistant 0.8.4-main.c4373fc → 0.8.4-main.c85a9c8dae

package/dist/types/src/conversation/context.d.ts

@@ -1,97 +1,146 @@
-import { type ReadonlySignal } from '@preact/signals-core';
+import { Atom, Registry } from '@effect-atom/atom-react';
 import * as Context from 'effect/Context';
+import * as Effect from 'effect/Effect';
 import * as Schema from 'effect/Schema';
 import { Blueprint } from '@dxos/blueprints';
-import { DXN, type Ref, Type } from '@dxos/echo';
+import { Resource } from '@dxos/context';
+import { DXN, Obj, Ref, Type } from '@dxos/echo';
 import { type Queue } from '@dxos/echo-db';
 import { ComplexSet } from '@dxos/util';
 /**
  * Thread message that binds or unbinds contextual objects to a conversation.
  */
-export declare const ContextBinding: Type.obj<Schema.Struct<{
-    blueprints: Schema.Struct<{
-        added: Schema.Array$<Type.ref<Type.obj<Schema.Struct<{
-            key: Schema.SchemaClass<string, string, never>;
-            name: Schema.SchemaClass<string, string, never>;
-            description: Schema.optional<typeof Schema.String>;
-            instructions: Schema.mutable<Schema.Struct<{
-                source: Schema.SchemaClass<import("@dxos/echo/internal").Ref<Type.OfKind<import("@dxos/echo/internal").EntityKind.Object> & {
-                    content: string;
-                }>, import("@dxos/echo-protocol").EncodedReference, never>;
-                inputs: Schema.optional<Schema.mutable<Schema.Array$<Schema.mutable<Schema.Struct<{
-                    name: typeof Schema.String;
-                    kind: Schema.optional<Schema.Literal<["value", "pass-through", "retriever", "function", "query", "resolver", "context", "schema"]>>;
-                    default: Schema.optional<typeof Schema.Any>;
-                }>>>>>;
-            }>>;
-            tools: Schema.Array$<Schema.brand<typeof Schema.String, "ToolId">>;
-        }>>>>;
-        removed: Schema.Array$<Type.ref<Type.obj<Schema.Struct<{
-            key: Schema.SchemaClass<string, string, never>;
-            name: Schema.SchemaClass<string, string, never>;
-            description: Schema.optional<typeof Schema.String>;
-            instructions: Schema.mutable<Schema.Struct<{
-                source: Schema.SchemaClass<import("@dxos/echo/internal").Ref<Type.OfKind<import("@dxos/echo/internal").EntityKind.Object> & {
-                    content: string;
-                }>, import("@dxos/echo-protocol").EncodedReference, never>;
-                inputs: Schema.optional<Schema.mutable<Schema.Array$<Schema.mutable<Schema.Struct<{
-                    name: typeof Schema.String;
-                    kind: Schema.optional<Schema.Literal<["value", "pass-through", "retriever", "function", "query", "resolver", "context", "schema"]>>;
-                    default: Schema.optional<typeof Schema.Any>;
-                }>>>>>;
-            }>>;
-            tools: Schema.Array$<Schema.brand<typeof Schema.String, "ToolId">>;
-        }>>>>;
-    }>;
-    objects: Schema.Struct<{
-        added: Schema.Array$<Type.ref<Schema.Schema<Type.Expando, {
-            [x: string]: any;
-            id: string;
-        }, never>>>;
-        removed: Schema.Array$<Type.ref<Schema.Schema<Type.Expando, {
-            [x: string]: any;
-            id: string;
-        }, never>>>;
-    }>;
-}>>;
+export declare const ContextBinding: Type.Obj<{
+    readonly blueprints: {
+        readonly added: readonly import("@dxos/echo/internal").Ref<import("@dxos/echo/Entity").OfKind<import("@dxos/echo/internal").EntityKind.Object> & {
+            readonly description?: string | undefined;
+            readonly name: string;
+            readonly key: string;
+            readonly instructions: {
+                readonly source: import("@dxos/echo/internal").Ref<import("@dxos/echo/Entity").OfKind<import("@dxos/echo/internal").EntityKind.Object> & {
+                    readonly content: string;
+                }>;
+                readonly inputs?: readonly {
+                    readonly function?: string | undefined;
+                    readonly name: string;
+                    readonly kind?: "function" | "value" | "pass-through" | "retriever" | "query" | "resolver" | "context" | "schema" | undefined;
+                    readonly default?: any;
+                }[] | undefined;
+            };
+            readonly tools: readonly (string & import("effect/Brand").Brand<"ToolId">)[];
+            readonly mcpServers?: readonly {
+                readonly url: string;
+                readonly protocol: "sse" | "http";
+            }[] | undefined;
+        }>[];
+        readonly removed: readonly import("@dxos/echo/internal").Ref<import("@dxos/echo/Entity").OfKind<import("@dxos/echo/internal").EntityKind.Object> & {
+            readonly description?: string | undefined;
+            readonly name: string;
+            readonly key: string;
+            readonly instructions: {
+                readonly source: import("@dxos/echo/internal").Ref<import("@dxos/echo/Entity").OfKind<import("@dxos/echo/internal").EntityKind.Object> & {
+                    readonly content: string;
+                }>;
+                readonly inputs?: readonly {
+                    readonly function?: string | undefined;
+                    readonly name: string;
+                    readonly kind?: "function" | "value" | "pass-through" | "retriever" | "query" | "resolver" | "context" | "schema" | undefined;
+                    readonly default?: any;
+                }[] | undefined;
+            };
+            readonly tools: readonly (string & import("effect/Brand").Brand<"ToolId">)[];
+            readonly mcpServers?: readonly {
+                readonly url: string;
+                readonly protocol: "sse" | "http";
+            }[] | undefined;
+        }>[];
+    };
+    readonly objects: {
+        readonly added: readonly import("@dxos/echo/internal").Ref<import("@dxos/echo/Entity").OfKind<import("@dxos/echo/internal").EntityKind.Object> & Obj.Unknown>[];
+        readonly removed: readonly import("@dxos/echo/internal").Ref<import("@dxos/echo/Entity").OfKind<import("@dxos/echo/internal").EntityKind.Object> & Obj.Unknown>[];
+    };
+}, Schema.Struct.Fields>;
 export interface ContextBinding extends Schema.Schema.Type<typeof ContextBinding> {
 }
 export type BindingProps = Partial<{
     blueprints: Ref.Ref<Blueprint.Blueprint>[];
-    objects: Ref.Ref<Type.Expando>[];
+    objects: Ref.Ref<Obj.Unknown>[];
 }>;
 export declare class Bindings {
     readonly blueprints: ComplexSet<Ref.Ref<Blueprint.Blueprint>>;
-    readonly objects: ComplexSet<Ref.Ref<Type.Expando>>;
+    readonly objects: ComplexSet<Ref.Ref<Obj.Unknown>>;
     toJSON(): {
         blueprints: DXN.String[];
         objects: DXN.String[];
     };
 }
+export type AiContextBinderOptions = {
+    queue: Queue;
+    registry?: Registry.Registry;
+};
 /**
  * Manages bindings of blueprints and objects to a conversation.
  */
-export declare class AiContextBinder {
+export declare class AiContextBinder extends Resource {
+    private readonly _blueprints;
+    private readonly _objects;
+    private readonly _registry;
     private readonly _queue;
+    constructor(options: AiContextBinderOptions);
+    /**
+     * Returns the blueprints atom for subscription.
+     */
+    get blueprints(): Atom.Atom<Blueprint.Blueprint[]>;
+    /**
+     * Returns the objects atom for subscription.
+     */
+    get objects(): Atom.Atom<Obj.Unknown[]>;
+    /**
+     * Gets the current blueprints value.
+     */
+    getBlueprints(): Blueprint.Blueprint[];
+    /**
+     * Gets the current objects value.
+     */
+    getObjects(): Obj.Unknown[];
+    /**
+     * Subscribe to changes in blueprints.
+     */
+    subscribeBlueprints(cb: (blueprints: Blueprint.Blueprint[]) => void): () => void;
+    /**
+     * Subscribe to changes in objects.
+     */
+    subscribeObjects(cb: (objects: Obj.Unknown[]) => void): () => void;
+    protected _open(): Promise<void>;
+    private _updateBindings;
+    protected _close(): Promise<void>;
+    bind({ blueprints, objects }: BindingProps): Promise<void>;
+    unbind({ blueprints, objects }: BindingProps): Promise<void>;
     /**
-     * Reactive query of all bindings.
+     * Process bindings to filter duplicates and determine next state.
      */
-    readonly bindings: ReadonlySignal<Bindings>;
-    readonly blueprints: ReadonlySignal<Ref.Ref<Blueprint.Blueprint>[]>;
-    readonly objects: ReadonlySignal<Ref.Ref<Type.Expando>[]>;
-    constructor(_queue: Queue);
+    private _processBindings;
     /**
-     * Asynchronous query of all bindings.
+     * Reduce results into sets of blueprints and objects.
      */
-    query(): Promise<Bindings>;
-    bind(props: BindingProps): Promise<void>;
-    unbind(props: BindingProps): Promise<void>;
     private _reduce;
+    /**
+     * Resolve references to objects, loading them first if needed and falling back to existing objects.
+     */
+    private _resolve;
 }
 declare const AiContextService_base: Context.TagClass<AiContextService, "@dxos/assistant/AiContextService", {
     binder: AiContextBinder;
 }>;
 export declare class AiContextService extends AiContextService_base {
+    static bindContext: ({ blueprints, objects }: BindingProps) => Effect.Effect<void, never, AiContextService>;
+    static findObjects: <T extends Type.AnyEntity>(type: T) => Effect.Effect<Schema.Schema.Type<T>[], never, AiContextService>;
+    /**
+     * Glorified type cast until we figure out function service typing.
+     * For context, the AiContextService is provided to functions called from tool calls, but it's not implemented in types yet.
+     * @deprecated
+     */
+    static fixFunctionHandlerType: <A, E, R>(eff: Effect.Effect<A, E, R>) => Effect.Effect<A, E, Exclude<R, AiContextService>>;
 }
 export {};
 //# sourceMappingURL=context.d.ts.map

package/dist/types/src/conversation/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../src/conversation/context.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,cAAc,EAAY,MAAM,sBAAsB,CAAC;AAErE,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAE1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAO,KAAK,GAAG,EAAiB,IAAI,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC;;GAEG;AAEH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgB1B,CAAC;AAEF,MAAM,WAAW,cAAe,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,cAAc,CAAC;CAAG;AAEpF,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC;IACjC,UAAU,EAAE,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;IAC3C,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;CAClC,CAAC,CAAC;AAEH,qBAAa,QAAQ;IACnB,QAAQ,CAAC,UAAU,2CAA6E;IAEhG,QAAQ,CAAC,OAAO,oCAA+E;IAE/F,MAAM;;;;CAMP;AAED;;GAEG;AAEH,qBAAa,eAAe;IAad,OAAO,CAAC,QAAQ,CAAC,MAAM;IAZnC;;OAEG;IAEH,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAqD;IAEhG,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC,CAEhE;IAEH,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAoD;gBAEhF,MAAM,EAAE,KAAK;IAE1C;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,QAAQ,CAAC;IAM1B,IAAI,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBxC,MAAM,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBhD,OAAO,CAAC,OAAO;CAmBhB;;YAKW,eAAe;;AAH3B,qBAAa,gBAAiB,SAAQ,qBAKnC;CAAG"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../src/conversation/context.ts"],"names":[],"mappings":"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"}

package/dist/types/src/conversation/context.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=context.test.d.ts.map

package/dist/types/src/conversation/context.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"context.test.d.ts","sourceRoot":"","sources":["../../../../src/conversation/context.test.ts"],"names":[],"mappings":""}

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

@@ -1,41 +1,66 @@
+import type * as Tool from '@effect/ai/Tool';
 import type * as Toolkit from '@effect/ai/Toolkit';
+import type { Registry } from '@effect-atom/atom-react';
+import * as Context from 'effect/Context';
 import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
+import { type ToolExecutionService, type ToolResolverService } from '@dxos/ai';
+import { Resource } from '@dxos/context';
 import { type Queue } from '@dxos/echo-db';
-import { DataType } from '@dxos/schema';
+import { QueueService } from '@dxos/functions';
+import { Message } from '@dxos/types';
 import { type AiSessionRunError, type AiSessionRunRequirements, type GenerationObserver } from '../session';
-import { AiContextBinder, type ContextBinding } from './context';
-export interface AiConversationRunParams {
+import { AiContextBinder, AiContextService, type ContextBinding } from './context';
+export interface AiConversationRunProps {
     prompt: string;
     system?: string;
     observer?: GenerationObserver;
 }
 export type AiConversationOptions = {
-    queue: Queue<DataType.Message | ContextBinding>;
+    queue: Queue<Message.Message | ContextBinding>;
+    toolkit?: Toolkit.Any;
+    registry?: Registry.Registry;
 };
 /**
  * Durable conversation state (initiated by users and agents) backed by a Queue.
  * Executes tools based on AI responses and supports cancellation of in-progress requests.
  */
-export declare class AiConversation {
+export declare class AiConversation extends Resource {
     /**
-     * Message and binding queue.
+     * Blueprints and objects bound to the conversation.
      */
+    private readonly _binder;
     private readonly _queue;
+    private readonly _toolkit?;
+    constructor(options: AiConversationOptions);
+    protected _open(): Promise<void>;
+    get queue(): Queue<Message.Message | ContextBinding>;
+    get context(): AiContextBinder;
+    get toolkit(): Toolkit.Any | undefined;
+    getHistory(): Promise<Message.Message[]>;
+    getTools(): Effect.Effect<Record<string, Tool.Any>, never, ToolExecutionService | ToolResolverService>;
     /**
-     * Blueprints bound to the conversation.
+     * Creates a new cancelable request effect.
      */
-    private readonly _context;
+    createRequest(params: AiConversationRunProps): Effect.Effect<Message.Message[], AiSessionRunError, AiSessionRunRequirements>;
+}
+declare const AiConversationService_base: Context.TagClass<AiConversationService, "@dxos/assistant/AiConversationService", AiConversation>;
+/**
+ * Gives access to the ai conversation.
+ */
+export declare class AiConversationService extends AiConversationService_base {
     /**
-     * Toolkit from the current session request.
+     * Create a new conversation layer from options.
      */
-    private _toolkit;
-    constructor(options: AiConversationOptions);
-    get context(): AiContextBinder;
-    get toolkit(): Toolkit.WithHandler<any> | undefined;
-    getHistory(): Promise<DataType.Message[]>;
+    static layer: (options: AiConversationOptions) => Layer.Layer<AiConversationService | AiContextService>;
     /**
-     * Creates a new cancelable request effect.
+     * Create a new conversation with a new queue.
+     */
+    static layerNewQueue: (options?: Omit<AiConversationOptions, "queue">) => Layer.Layer<AiConversationService | AiContextService, never, QueueService>;
+    /**
+     * Run a prompt in the current conversation.
      */
-    createRequest(params: AiConversationRunParams): Effect.Effect<DataType.Message[], AiSessionRunError, AiSessionRunRequirements>;
+    static run: (params: AiConversationRunProps) => Effect.Effect<Message.Message[], AiSessionRunError, AiSessionRunRequirements | AiConversationService>;
 }
+export {};
 //# sourceMappingURL=conversation.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"conversation.d.ts","sourceRoot":"","sources":["../../../../src/conversation/conversation.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,OAAO,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,eAAe,CAAC;AAG3C,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EAExB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,eAAe,EAAoB,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AAEnF,MAAM,WAAW,uBAAuB;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,kBAAkB,CAAC;CAC/B;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,OAAO,GAAG,cAAc,CAAC,CAAC;CACjD,CAAC;AAEF;;;GAGG;AACH,qBAAa,cAAc;IACzB;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA2C;IAElE;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkB;IAE3C;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAuC;gBAEpC,OAAO,EAAE,qBAAqB;IAKjD,IAAW,OAAO,oBAEjB;IAED,IAAW,OAAO,yCAEjB;IAEY,UAAU,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;IAKtD;;OAEG;IACH,aAAa,CACX,MAAM,EAAE,uBAAuB,GAC9B,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,iBAAiB,EAAE,wBAAwB,CAAC;CA0ClF"}
+{"version":3,"file":"conversation.d.ts","sourceRoot":"","sources":["../../../../src/conversation/conversation.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,KAAK,OAAO,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,KAAK,oBAAoB,EAAE,KAAK,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAG/E,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAI/C,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EAExB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AAEnF,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,kBAAkB,CAAC;CAC/B;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO,GAAG,cAAc,CAAC,CAAC;IAC/C,OAAO,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC;IACtB,QAAQ,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC;CAC9B,CAAC;AAQF;;;GAGG;AACH,qBAAa,cAAe,SAAQ,QAAQ;IAC1C;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkB;IAC1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0C;IACjE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAc;gBAErB,OAAO,EAAE,qBAAqB;cAQxB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/C,IAAW,KAAK,4CAEf;IAED,IAAW,OAAO,oBAEjB;IAED,IAAW,OAAO,4BAEjB;IAEY,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IAKrD,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,oBAAoB,GAAG,mBAAmB,CAAC;IAQtG;;OAEG;IACI,aAAa,CAClB,MAAM,EAAE,sBAAsB,GAC7B,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,iBAAiB,EAAE,wBAAwB,CAAC;CA0DjF;;AAED;;GAEG;AACH,qBAAa,qBAAsB,SAAQ,0BAGxC;IACD;;OAEG;IACH,MAAM,CAAC,KAAK,GAAI,SAAS,qBAAqB,KAAG,KAAK,CAAC,KAAK,CAAC,qBAAqB,GAAG,gBAAgB,CAAC,CAWlG;IAEJ;;OAEG;IACH,MAAM,CAAC,aAAa,GAClB,UAAU,IAAI,CAAC,qBAAqB,EAAE,OAAO,CAAC,KAC7C,KAAK,CAAC,KAAK,CAAC,qBAAqB,GAAG,gBAAgB,EAAE,KAAK,EAAE,YAAY,CAAC,CAQzE;IAEJ;;OAEG;IACH,MAAM,CAAC,GAAG,GACR,QAAQ,sBAAsB,KAC7B,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,iBAAiB,EAAE,wBAAwB,GAAG,qBAAqB,CAAC,CAInG;CACN"}

package/dist/types/src/conversation/conversation.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=conversation.test.d.ts.map

package/dist/types/src/conversation/conversation.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conversation.test.d.ts","sourceRoot":"","sources":["../../../../src/conversation/conversation.test.ts"],"names":[],"mappings":""}

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

@@ -11,5 +11,7 @@ export declare const computeDiffsWithCursors: <T>(accessor: DocAccessor<T>, diff
     cursor: string;
     text: string;
 }[];
-export declare const applyDiffs: <T>(accessor: DocAccessor<T>, diffs: readonly string[]) => string;
+export declare const applyDiffs: <T>(accessor: DocAccessor<T>, diffs: readonly string[], { errorOnNotFound }?: {
+    errorOnNotFound?: boolean;
+}) => string;
 //# sourceMappingURL=diff.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../../src/diff.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAiB,MAAM,eAAe,CAAC;AAS3D,MAAM,MAAM,IAAI,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,WAAW,GAAI,OAAO,SAAS,MAAM,EAAE,KAAG,IAAI,EAyB1D,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,CAAC,EAAE,UAAU,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,SAAS,MAAM,EAAE;;;GAU5F,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,CAAC,EAAE,UAAU,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,SAAS,MAAM,EAAE,KAAG,MAgBlF,CAAC"}
+{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../../src/diff.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAiB,MAAM,eAAe,CAAC;AAc3D,MAAM,MAAM,IAAI,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,WAAW,GAAI,OAAO,SAAS,MAAM,EAAE,KAAG,IAAI,EA0B1D,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,CAAC,EAAE,UAAU,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,SAAS,MAAM,EAAE;;;GAU5F,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,CAAC,EAC1B,UAAU,WAAW,CAAC,CAAC,CAAC,EACxB,OAAO,SAAS,MAAM,EAAE,EACxB,sBAA6B;IAAE,eAAe,CAAC,EAAE,OAAO,CAAA;CAAO,KAC9D,MAoBF,CAAC"}

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

@@ -1,30 +1,26 @@
 import { BaseError } from '@dxos/errors';
 declare const AiModelError_base: {
     new (options?: import("@dxos/errors").BaseErrorOptions): {
-        "__#private@#code": "AI_MODEL_ERROR";
-        "__#private@#context": Record<string, unknown>;
-        readonly name: "AI_MODEL_ERROR";
+        name: "AiModelError";
+        context: Record<string, unknown>;
         readonly message: string;
-        readonly code: "AI_MODEL_ERROR";
-        readonly _tag: "AI_MODEL_ERROR";
-        readonly context: Record<string, unknown>;
+        readonly _tag: "AiModelError";
         stack?: string;
         cause?: unknown;
     };
-    code: "AI_MODEL_ERROR";
+    name: "AiModelError";
     is(error: unknown): error is BaseError;
-    wrap(options?: Omit<import("@dxos/errors").BaseErrorOptions, "cause">): (error: unknown) => {
-        "__#private@#code": "AI_MODEL_ERROR";
-        "__#private@#context": Record<string, unknown>;
-        readonly name: "AI_MODEL_ERROR";
+    wrap(options?: Omit<import("@dxos/errors").BaseErrorOptions, "cause"> & {
+        ifTypeDiffers?: boolean;
+    }): (error: unknown) => {
+        name: "AiModelError";
+        context: Record<string, unknown>;
         readonly message: string;
-        readonly code: "AI_MODEL_ERROR";
-        readonly _tag: "AI_MODEL_ERROR";
-        readonly context: Record<string, unknown>;
+        readonly _tag: "AiModelError";
         stack?: string;
         cause?: unknown;
     };
-    extend<Code extends string = string>(code: Code, message?: string): any;
+    extend<Name extends string = string>(name: Name, message?: string): any;
     isError(error: unknown): error is Error;
     captureStackTrace(targetObject: object, constructorOpt?: Function): void;
     prepareStackTrace?: ((err: Error, stackTraces: NodeJS.CallSite[]) => any) | undefined;
@@ -37,30 +33,26 @@ export declare class AiModelError extends AiModelError_base {
 }
 declare const AiAssistantError_base: {
     new (options?: import("@dxos/errors").BaseErrorOptions): {
-        "__#private@#code": "AI_ASSISTANT_ERROR";
-        "__#private@#context": Record<string, unknown>;
-        readonly name: "AI_ASSISTANT_ERROR";
+        name: "AiAssistantError";
+        context: Record<string, unknown>;
         readonly message: string;
-        readonly code: "AI_ASSISTANT_ERROR";
-        readonly _tag: "AI_ASSISTANT_ERROR";
-        readonly context: Record<string, unknown>;
+        readonly _tag: "AiAssistantError";
         stack?: string;
         cause?: unknown;
     };
-    code: "AI_ASSISTANT_ERROR";
+    name: "AiAssistantError";
     is(error: unknown): error is BaseError;
-    wrap(options?: Omit<import("@dxos/errors").BaseErrorOptions, "cause">): (error: unknown) => {
-        "__#private@#code": "AI_ASSISTANT_ERROR";
-        "__#private@#context": Record<string, unknown>;
-        readonly name: "AI_ASSISTANT_ERROR";
+    wrap(options?: Omit<import("@dxos/errors").BaseErrorOptions, "cause"> & {
+        ifTypeDiffers?: boolean;
+    }): (error: unknown) => {
+        name: "AiAssistantError";
+        context: Record<string, unknown>;
         readonly message: string;
-        readonly code: "AI_ASSISTANT_ERROR";
-        readonly _tag: "AI_ASSISTANT_ERROR";
-        readonly context: Record<string, unknown>;
+        readonly _tag: "AiAssistantError";
         stack?: string;
         cause?: unknown;
     };
-    extend<Code extends string = string>(code: Code, message?: string): any;
+    extend<Name extends string = string>(name: Name, message?: string): any;
     isError(error: unknown): error is Error;
     captureStackTrace(targetObject: object, constructorOpt?: Function): void;
     prepareStackTrace?: ((err: Error, stackTraces: NodeJS.CallSite[]) => any) | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../src/errors.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEzC;;GAEG;AACH,qBAAa,YAAa,SAAQ,iBAAoD;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEzF;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,qBAA4D;CAAG"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../src/errors.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;;;;;;;;;;;;;qBAWutB,CAAC;;;;;;;;;;;;;;;AATjwB;;GAEG;AACH,qBAAa,YAAa,SAAQ,iBAAkD;CAAG;;;;;;;;;;;;;qBAMyqB,CAAC;;;;;;;;;;;;;;;AAJjwB;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,qBAA0D;CAAG"}

package/dist/types/src/execution-graph.d.ts

@@ -1,5 +1,6 @@
-import { Obj } from '@dxos/echo';
+import { type Entity } from '@dxos/echo';
 import { LogLevel } from '@dxos/log';
+import { ContentBlock } from '@dxos/types';
 /**
  * Mercurial-style Commit.
  */
@@ -17,16 +18,18 @@ export type Commit = {
  * Models the execution graph based on a stream of events.
  */
 export declare class ExecutionGraph {
+    private readonly _skipBlocks;
     private _commits;
     private _branchNames;
     private _lastBlockId;
     private _toolCallCommitIds;
     private _lastCommitByBranch;
     private _pendingToolResults;
+    constructor(_skipBlocks?: ContentBlock.Any['_tag'][]);
     /**
      * Adds events to the graph.
      */
-    addEvents(events: Obj.Any[]): void;
+    addEvents(events: Entity.Unknown[]): void;
     /**
      * Processes a message event and creates commits for its blocks.
      */

package/dist/types/src/execution-graph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execution-graph.d.ts","sourceRoot":"","sources":["../../../src/execution-graph.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,GAAG,EAAY,MAAM,YAAY,CAAC;AAG3C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAIrC;;GAEG;AAEH,MAAM,MAAM,MAAM,GAAG;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,QAAQ,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAqBF;;GAEG;AACH,qBAAa,cAAc;IAEzB,OAAO,CAAC,QAAQ,CAAgB;IAChC,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,YAAY,CAAqB;IAGzC,OAAO,CAAC,kBAAkB,CAA6B;IACvD,OAAO,CAAC,mBAAmB,CAA6B;IACxD,OAAO,CAAC,mBAAmB,CAA6B;IAExD;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE;IAW3B;;OAEG;IACH,OAAO,CAAC,eAAe;IAqBvB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAyB3B;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAyB5B;;OAEG;IACH,QAAQ,CAAC,WAAW,UAAQ,GAAG;QAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE;IAUxE;;OAEG;IACH,OAAO,CAAC,eAAe;IAqBvB;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAmBjC;;OAEG;IACH,OAAO,CAAC,2BAA2B;IAoBnC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAO1B;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAO9B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAI3B;;OAEG;IACH,OAAO,CAAC,kBAAkB;CAK3B"}
+{"version":3,"file":"execution-graph.d.ts","sourceRoot":"","sources":["../../../src/execution-graph.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,YAAY,CAAC;AAGxD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,YAAY,EAAW,MAAM,aAAa,CAAC;AAKpD;;GAEG;AAEH,MAAM,MAAM,MAAM,GAAG;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,QAAQ,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAqBF;;GAEG;AACH,qBAAa,cAAc;IAWb,OAAO,CAAC,QAAQ,CAAC,WAAW;IATxC,OAAO,CAAC,QAAQ,CAAgB;IAChC,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,YAAY,CAAqB;IAGzC,OAAO,CAAC,kBAAkB,CAA6B;IACvD,OAAO,CAAC,mBAAmB,CAA6B;IACxD,OAAO,CAAC,mBAAmB,CAA6B;gBAE3B,WAAW,GAAE,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAgB;IAElF;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE;IAWlC;;OAEG;IACH,OAAO,CAAC,eAAe;IAsBvB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAyB3B;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAyB5B;;OAEG;IACH,QAAQ,CAAC,WAAW,UAAQ,GAAG;QAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE;IAUxE;;OAEG;IACH,OAAO,CAAC,eAAe;IAqBvB;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAmBjC;;OAEG;IACH,OAAO,CAAC,2BAA2B;IAoBnC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAO1B;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAO9B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAI3B;;OAEG;IACH,OAAO,CAAC,kBAAkB;CAK3B"}

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

@@ -1 +1 @@
-{"version":3,"file":"extraction-llm-function.d.ts","sourceRoot":"","sources":["../../../../../src/extraction/extraction-llm-function/extraction-llm-function.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,kBAAkB,EAAkB,MAAM,iBAAiB,CAAC;AAI1E,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAKlE,eAAO,MAAM,2BAA2B,EAAE,kBAAkB,CAAC,eAAe,EAAE,gBAAgB,CAoD5F,CAAC"}
+{"version":3,"file":"extraction-llm-function.d.ts","sourceRoot":"","sources":["../../../../../src/extraction/extraction-llm-function/extraction-llm-function.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,kBAAkB,EAAkB,MAAM,iBAAiB,CAAC;AAE1E,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAElE,eAAO,MAAM,2BAA2B,EAAE,kBAAkB,CAAC,eAAe,EAAE,gBAAgB,CAqD5F,CAAC"}