@dxos/assistant 0.8.4-main.5ea62a8 → 0.8.4-main.66e292d

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

@@ -1,7 +1,9 @@
 import { type ReadonlySignal } from '@preact/signals-core';
-import { Context, Schema } from 'effect';
+import * as Context from 'effect/Context';
+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, type Entity, Obj, type Ref, Type } from '@dxos/echo';
 import { type Queue } from '@dxos/echo-db';
 import { ComplexSet } from '@dxos/util';
 /**
@@ -9,59 +11,53 @@ import { ComplexSet } from '@dxos/util';
  */
 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-schema").Ref<Type.OfKind<import("@dxos/echo-schema").EntityKind.Object> & {
+        added: Schema.Array$<import("@dxos/echo/internal").RefSchema<Entity.OfKind<import("@dxos/echo/internal").EntityKind.Object> & {
+            key: string;
+            name: string;
+            description?: string | undefined;
+            instructions: {
+                source: import("@dxos/echo/internal").Ref<Entity.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-schema").Ref<Type.OfKind<import("@dxos/echo-schema").EntityKind.Object> & {
+                }>;
+                inputs?: {
+                    name: string;
+                    kind?: "function" | "value" | "pass-through" | "retriever" | "query" | "resolver" | "context" | "schema" | undefined;
+                    default?: any;
+                }[] | undefined;
+            };
+            tools: (string & import("effect/Brand").Brand<"ToolId">)[];
+        }>>;
+        removed: Schema.Array$<import("@dxos/echo/internal").RefSchema<Entity.OfKind<import("@dxos/echo/internal").EntityKind.Object> & {
+            key: string;
+            name: string;
+            description?: string | undefined;
+            instructions: {
+                source: import("@dxos/echo/internal").Ref<Entity.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">>;
-        }>>>>;
+                }>;
+                inputs?: {
+                    name: string;
+                    kind?: "function" | "value" | "pass-through" | "retriever" | "query" | "resolver" | "context" | "schema" | undefined;
+                    default?: any;
+                }[] | undefined;
+            };
+            tools: (string & import("effect/Brand").Brand<"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>>>;
+        added: Schema.Array$<import("@dxos/echo/internal").RefSchema<Entity.OfKind<import("@dxos/echo/internal").EntityKind.Object> & {}>>;
+        removed: Schema.Array$<import("@dxos/echo/internal").RefSchema<Entity.OfKind<import("@dxos/echo/internal").EntityKind.Object> & {}>>;
     }>;
 }>>;
 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.Any>[];
 }>;
 export declare class Bindings {
     readonly blueprints: ComplexSet<Ref.Ref<Blueprint.Blueprint>>;
-    readonly objects: ComplexSet<Ref.Ref<Type.Expando>>;
+    readonly objects: ComplexSet<Ref.Ref<Obj.Any>>;
     toJSON(): {
         blueprints: DXN.String[];
         objects: DXN.String[];
@@ -70,15 +66,20 @@ export declare class Bindings {
 /**
  * Manages bindings of blueprints and objects to a conversation.
  */
-export declare class AiContextBinder {
+export declare class AiContextBinder extends Resource {
     private readonly _queue;
     /**
      * Reactive query of all bindings.
      */
-    readonly bindings: ReadonlySignal<Bindings>;
-    readonly blueprints: ReadonlySignal<Ref.Ref<Blueprint.Blueprint>[]>;
-    readonly objects: ReadonlySignal<Ref.Ref<Type.Expando>[]>;
+    private _bindings?;
+    private _blueprints?;
+    private _objects?;
     constructor(_queue: Queue);
+    get bindings(): ReadonlySignal<Bindings>;
+    get blueprints(): ReadonlySignal<Ref.Ref<Blueprint.Blueprint>[]>;
+    get objects(): ReadonlySignal<Ref.Ref<Obj.Any>[]>;
+    protected _open(): Promise<void>;
+    protected _close(): Promise<void>;
     /**
      * Asynchronous query of all bindings.
      */

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;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGzC,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":"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,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,GAAG,EAAE,KAAK,MAAM,EAAU,GAAG,EAAS,KAAK,GAAG,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAClF,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC;;GAEG;AAEH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAe1B,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,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;CAC7B,CAAC,CAAC;AAEH,qBAAa,QAAQ;IACnB,QAAQ,CAAC,UAAU,2CAA6E;IAEhG,QAAQ,CAAC,OAAO,+BAA0E;IAE1F,MAAM;;;;CAMP;AAED;;GAEG;AAEH,qBAAa,eAAgB,SAAQ,QAAQ;IAS/B,OAAO,CAAC,QAAQ,CAAC,MAAM;IARnC;;OAEG;IAEH,OAAO,CAAC,SAAS,CAAC,CAA2B;IAC7C,OAAO,CAAC,WAAW,CAAC,CAAiD;IACrE,OAAO,CAAC,QAAQ,CAAC,CAAqC;gBAEzB,MAAM,EAAE,KAAK;IAI1C,IAAI,QAAQ,6BAGX;IAED,IAAI,UAAU,mDAGb;IAED,IAAI,OAAO,uCAGV;cAGwB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;cAQtB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAMhD;;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"}

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

@@ -1,23 +1,20 @@
-import { type AiTool, type AiToolkit } from '@effect/ai';
-import { Effect } from 'effect';
+import type * as Toolkit from '@effect/ai/Toolkit';
+import * as Effect from 'effect/Effect';
+import { Resource } from '@dxos/context';
 import { type Queue } from '@dxos/echo-db';
-import { DataType } from '@dxos/schema';
+import { Message } from '@dxos/types';
 import { type AiSessionRunError, type AiSessionRunRequirements, type GenerationObserver } from '../session';
 import { AiContextBinder, type ContextBinding } from './context';
-export type AiConversationRunRequirements<Tools extends AiTool.Any> = AiSessionRunRequirements | AiTool.ToHandler<Tools>;
 export interface AiConversationRunParams {
     prompt: string;
     system?: string;
     observer?: GenerationObserver;
 }
-export type AiConversationOptions = {
-    queue: Queue<DataType.Message | ContextBinding>;
-};
 /**
  * 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.
      */
@@ -30,13 +27,15 @@ export declare class AiConversation {
      * Toolkit from the current session request.
      */
     private _toolkit;
-    constructor(options: AiConversationOptions);
+    constructor(queue: Queue<Message.Message | ContextBinding>);
+    protected _open(): Promise<void>;
+    protected _close(): Promise<void>;
     get context(): AiContextBinder;
-    get toolkit(): AiToolkit.ToHandler<AiTool.Any> | undefined;
-    getHistory(): Promise<DataType.Message[]>;
+    get toolkit(): Toolkit.WithHandler<any> | undefined;
+    getHistory(): Promise<Message.Message[]>;
     /**
      * Creates a new cancelable request effect.
      */
-    createRequest<Tools extends AiTool.Any>(params: AiConversationRunParams): Effect.Effect<DataType.Message[], AiSessionRunError, AiConversationRunRequirements<Tools>>;
+    createRequest(params: AiConversationRunParams): Effect.Effect<Message.Message[], AiSessionRunError, AiSessionRunRequirements>;
 }
 //# 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,EAAE,KAAK,MAAM,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAS,MAAM,EAAU,MAAM,QAAQ,CAAC;AAG/C,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,MAAM,6BAA6B,CAAC,KAAK,SAAS,MAAM,CAAC,GAAG,IAC9D,wBAAwB,GACxB,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AAE5B,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,CAA8C;gBAE3C,OAAO,EAAE,qBAAqB;IAKjD,IAAW,OAAO,oBAEjB;IAED,IAAW,OAAO,gDAEjB;IAEY,UAAU,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;IAKtD;;OAEG;IACH,aAAa,CAAC,KAAK,SAAS,MAAM,CAAC,GAAG,EACpC,MAAM,EAAE,uBAAuB,GAC9B,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,iBAAiB,EAAE,6BAA6B,CAAC,KAAK,CAAC,CAAC;CA0C9F"}
+{"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;AAGxC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,eAAe,CAAC;AAG3C,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,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;;;GAGG;AACH,qBAAa,cAAe,SAAQ,QAAQ;IAC1C;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0C;IAEjE;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkB;IAE3C;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAuC;gBAEpC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO,GAAG,cAAc,CAAC;cAMxC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;cAKtB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIhD,IAAW,OAAO,oBAEjB;IAED,IAAW,OAAO,yCAEjB;IAEY,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IAKrD;;OAEG;IACH,aAAa,CACX,MAAM,EAAE,uBAAuB,GAC9B,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,iBAAiB,EAAE,wBAAwB,CAAC;CA0CjF"}

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;AAO3D,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,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"}

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

@@ -1,75 +1,71 @@
 import { BaseError } from '@dxos/errors';
-declare const AiAssistantError_base: {
-    new (message: string, options?: import("@dxos/errors").BaseErrorOptions): {
-        #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;
+declare const AiModelError_base: {
+    new (options?: import("@dxos/errors").BaseErrorOptions): {
+        code: "AI_MODEL_ERROR";
+        context: Record<string, unknown>;
+        readonly name: "AI_MODEL_ERROR";
+        readonly message: string;
+        readonly _tag: "AI_MODEL_ERROR";
         stack?: string;
         cause?: unknown;
     };
-    code: "AI_ASSISTANT_ERROR";
+    code: "AI_MODEL_ERROR";
     is(error: unknown): error is BaseError;
-    wrap(message: string, options?: Omit<import("@dxos/errors").BaseErrorOptions, "cause">): (error: unknown) => {
-        #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;
+    wrap(options?: Omit<import("@dxos/errors").BaseErrorOptions, "cause"> & {
+        ifTypeDiffers?: boolean;
+    }): (error: unknown) => {
+        code: "AI_MODEL_ERROR";
+        context: Record<string, unknown>;
+        readonly name: "AI_MODEL_ERROR";
+        readonly message: string;
+        readonly _tag: "AI_MODEL_ERROR";
         stack?: string;
         cause?: unknown;
     };
-    extend<Code extends string>(code: Code): any;
+    extend<Code extends string = string>(code: Code, message?: string): any;
     isError(error: unknown): error is Error;
     captureStackTrace(targetObject: object, constructorOpt?: Function): void;
     prepareStackTrace?: ((err: Error, stackTraces: NodeJS.CallSite[]) => any) | undefined;
     stackTraceLimit: number;
 };
 /**
- * Generic error for AI agent execution.
+ * Generic error from AI model.
  */
-export declare class AiAssistantError extends AiAssistantError_base {
+export declare class AiModelError extends AiModelError_base {
 }
-declare const AnthropicError_base: {
-    new (message: string, options?: import("@dxos/errors").BaseErrorOptions): {
-        #code: "ANTHROPIC_ERROR";
-        #context: Record<string, unknown>;
-        readonly name: "ANTHROPIC_ERROR";
-        readonly code: "ANTHROPIC_ERROR";
-        readonly _tag: "ANTHROPIC_ERROR";
-        readonly context: Record<string, unknown>;
-        message: string;
+declare const AiAssistantError_base: {
+    new (options?: import("@dxos/errors").BaseErrorOptions): {
+        code: "AI_ASSISTANT_ERROR";
+        context: Record<string, unknown>;
+        readonly name: "AI_ASSISTANT_ERROR";
+        readonly message: string;
+        readonly _tag: "AI_ASSISTANT_ERROR";
         stack?: string;
         cause?: unknown;
     };
-    code: "ANTHROPIC_ERROR";
+    code: "AI_ASSISTANT_ERROR";
     is(error: unknown): error is BaseError;
-    wrap(message: string, options?: Omit<import("@dxos/errors").BaseErrorOptions, "cause">): (error: unknown) => {
-        #code: "ANTHROPIC_ERROR";
-        #context: Record<string, unknown>;
-        readonly name: "ANTHROPIC_ERROR";
-        readonly code: "ANTHROPIC_ERROR";
-        readonly _tag: "ANTHROPIC_ERROR";
-        readonly context: Record<string, unknown>;
-        message: string;
+    wrap(options?: Omit<import("@dxos/errors").BaseErrorOptions, "cause"> & {
+        ifTypeDiffers?: boolean;
+    }): (error: unknown) => {
+        code: "AI_ASSISTANT_ERROR";
+        context: Record<string, unknown>;
+        readonly name: "AI_ASSISTANT_ERROR";
+        readonly message: string;
+        readonly _tag: "AI_ASSISTANT_ERROR";
         stack?: string;
         cause?: unknown;
     };
-    extend<Code extends string>(code: Code): any;
+    extend<Code extends string = string>(code: Code, message?: string): any;
     isError(error: unknown): error is Error;
     captureStackTrace(targetObject: object, constructorOpt?: Function): void;
     prepareStackTrace?: ((err: Error, stackTraces: NodeJS.CallSite[]) => any) | undefined;
     stackTraceLimit: number;
 };
 /**
- * Parsed error from the anthropic API.
+ * Generic error for AI agent execution.
  */
-export declare class AnthropicError extends AnthropicError_base {
+export declare class AiAssistantError extends AiAssistantError_base {
 }
 export {};
 //# sourceMappingURL=errors.d.ts.map

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,gBAAiB,SAAQ,qBAAsC;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE/E;;GAEG;AACH,qBAAa,cAAe,SAAQ,mBAAmC;CAAG"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../src/errors.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;;;;;;;;;;;;;;qBAWivB,CAAC;;;;;;;;;;;;;;;;AAT3xB;;GAEG;AACH,qBAAa,YAAa,SAAQ,iBAAoD;CAAG;;;;;;;;;;;;;;qBAMisB,CAAC;;;;;;;;;;;;;;;;AAJ3xB;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,qBAA4D;CAAG"}

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

@@ -0,0 +1,85 @@
+import { type Entity } from '@dxos/echo';
+import { LogLevel } from '@dxos/log';
+import { ContentBlock } from '@dxos/types';
+/**
+ * Mercurial-style Commit.
+ */
+export type Commit = {
+    id: string;
+    parents: string[];
+    branch: string;
+    icon?: string;
+    level?: LogLevel;
+    message: string;
+    timestamp?: Date;
+    tags?: string[];
+};
+/**
+ * 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: Entity.Unknown[]): void;
+    /**
+     * Processes a message event and creates commits for its blocks.
+     */
+    private _processMessage;
+    /**
+     * Processes an AgentStatus event.
+     */
+    private _processAgentStatus;
+    /**
+     * Stable sort: objects with 'created' field are sorted by it, others remain in place.
+     */
+    private sortObjectsByCreated;
+    /**
+     * Returns the current state of the graph.
+     */
+    getGraph(lastRequest?: boolean): {
+        branches: string[];
+        commits: Commit[];
+    };
+    /**
+     * Tracks tool calls and handles pending tool result updates.
+     */
+    private _trackToolCalls;
+    /**
+     * Updates pending tool results to point to an AgentStatus event.
+     */
+    private _updatePendingToolResults;
+    /**
+     * Handles late updates when AgentStatus is processed before tool result.
+     */
+    private _handleLateToolResultUpdate;
+    /**
+     * Gets the branch name for a tool call.
+     */
+    private _getToolCallBranch;
+    /**
+     * Gets the parents for an AgentStatus commit.
+     */
+    private _getAgentStatusParents;
+    /**
+     * Checks if a commit is a tool call commit.
+     */
+    private _isToolCallCommit;
+    /**
+     * Checks if a commit is a tool result commit.
+     */
+    private _isToolResultCommit;
+    /**
+     * Extracts tool call ID from a commit ID.
+     */
+    private _extractToolCallId;
+}
+//# sourceMappingURL=execution-graph.d.ts.map

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

@@ -0,0 +1 @@
+{"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/execution-graph.test.d.ts

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

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

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

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

@@ -1,4 +1,4 @@
 import { type FunctionDefinition } from '@dxos/functions';
 import { ExtractionInput, ExtractionOutput } from '../extraction';
-export declare const extractionAnthropicFn: FunctionDefinition<ExtractionInput, ExtractionOutput>;
+export declare const extractionAnthropicFunction: FunctionDefinition<ExtractionInput, ExtractionOutput>;
 //# sourceMappingURL=extraction-llm-function.d.ts.map

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,qBAAqB,EAAE,kBAAkB,CAAC,eAAe,EAAE,gBAAgB,CAkDtF,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"}