@dxos/assistant 0.8.4-main.dedc0f3 → 0.8.4-main.dfabb4ec29

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

@@ -1,96 +1,156 @@
-import { type ReadonlySignal } from '@preact/signals-core';
-import { Context, Schema } from 'effect';
-import { Blueprint } from '@dxos/blueprints';
-import { DXN, type Ref, Type } from '@dxos/echo';
-import { type Queue } from '@dxos/echo-db';
+import { Atom, Registry } from '@effect-atom/atom-react';
+import * as Context from 'effect/Context';
+import * as Effect from 'effect/Effect';
+import * as Runtime from 'effect/Runtime';
+import * as Schema from 'effect/Schema';
+import { Blueprint } from '@dxos/compute';
+import { Resource } from '@dxos/context';
+import { DXN, Feed, Obj, Ref, Type } from '@dxos/echo';
 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-schema").Ref<Type.OfKind<import("@dxos/echo-schema").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> & {
-                    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 key: string;
+            readonly name: string;
+            readonly description?: string | undefined;
+            readonly instructions: {
+                readonly source: import("@dxos/echo/internal").Ref<import("@dxos/echo/Entity").OfKind<import("@dxos/echo/internal").EntityKind.Object> & {
+                    readonly name?: string | undefined;
+                    readonly content: string;
+                }>;
+                readonly inputs?: readonly {
+                    readonly name: string;
+                    readonly kind: "operation" | "value";
+                    readonly default?: any;
+                    readonly operation?: string | undefined;
+                }[] | undefined;
+            };
+            readonly tools: readonly (string & import("effect/Brand").Brand<"ToolId">)[];
+            readonly agentCanEnable?: boolean | undefined;
+            readonly mcpServers?: readonly {
+                readonly name?: string | undefined;
+                readonly url: string;
+                readonly protocol: "http" | "sse";
+                readonly apiKey?: string | undefined;
+            }[] | undefined;
+        }>[];
+        readonly removed: readonly import("@dxos/echo/internal").Ref<import("@dxos/echo/Entity").OfKind<import("@dxos/echo/internal").EntityKind.Object> & {
+            readonly key: string;
+            readonly name: string;
+            readonly description?: string | undefined;
+            readonly instructions: {
+                readonly source: import("@dxos/echo/internal").Ref<import("@dxos/echo/Entity").OfKind<import("@dxos/echo/internal").EntityKind.Object> & {
+                    readonly name?: string | undefined;
+                    readonly content: string;
+                }>;
+                readonly inputs?: readonly {
+                    readonly name: string;
+                    readonly kind: "operation" | "value";
+                    readonly default?: any;
+                    readonly operation?: string | undefined;
+                }[] | undefined;
+            };
+            readonly tools: readonly (string & import("effect/Brand").Brand<"ToolId">)[];
+            readonly agentCanEnable?: boolean | undefined;
+            readonly mcpServers?: readonly {
+                readonly name?: string | undefined;
+                readonly url: string;
+                readonly protocol: "http" | "sse";
+                readonly apiKey?: string | undefined;
+            }[] | 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 = {
+    feed: Feed.Feed;
+    runtime: Runtime.Runtime<Feed.FeedService>;
+    registry?: Registry.Registry;
+};
 /**
  * Manages bindings of blueprints and objects to a conversation.
  */
-export declare class AiContextBinder {
-    private readonly _queue;
+export declare class AiContextBinder extends Resource {
+    #private;
+    private readonly _blueprints;
+    private readonly _objects;
+    private readonly _registry;
+    private readonly _feed;
+    private readonly _runtime;
+    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>;
     /**
-     * Reactive query of all bindings.
+     * Re-reads bindings from the feed to pick up changes made by other processes.
      */
-    readonly bindings: ReadonlySignal<Bindings>;
-    readonly blueprints: ReadonlySignal<Ref.Ref<Blueprint.Blueprint>[]>;
-    readonly objects: ReadonlySignal<Ref.Ref<Type.Expando>[]>;
-    constructor(_queue: Queue);
+    sync(): Promise<void>;
+    private _updateBindings;
+    protected _close(): Promise<void>;
+    bind({ blueprints, objects }: BindingProps): Promise<void>;
+    unbind({ blueprints, objects }: BindingProps): Promise<void>;
     /**
-     * Asynchronous query of all bindings.
+     * Process bindings to filter duplicates and determine next state.
+     */
+    private _processBindings;
+    /**
+     * Reduce results into sets of blueprints and objects.
      */
-    query(): Promise<Bindings>;
-    bind(props: BindingProps): Promise<void>;
-    unbind(props: BindingProps): Promise<void>;
     private _reduce;
+    /**
+     * Merge resolved items into the current set, adding only items not already present (by DXN).
+     */
+    private _mergeInto;
+    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>;
 }
 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;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":"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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/index.d.ts

@@ -1,3 +1,3 @@
 export * from './context';
-export * from './conversation';
+export * from './session';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/conversation/index.ts"],"names":[],"mappings":"AAIA,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/conversation/index.ts"],"names":[],"mappings":"AAIA,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC"}

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

@@ -0,0 +1,73 @@
+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 * as Runtime from 'effect/Runtime';
+import { type OpaqueToolkit, type ToolExecutionService, type ToolResolverService } from '@dxos/ai';
+import { type OperationRegistry, McpServer, Operation } from '@dxos/compute';
+import { Resource } from '@dxos/context';
+import { Database, Feed } from '@dxos/echo';
+import { Message, type ContentBlock } from '@dxos/types';
+import { type AiRequestRunError, type AiRequestRunRequirements, type GenerationObserver } from '../session';
+import { AiContextBinder, AiContextService } from './context';
+export interface AiSessionRunProps<R = never> {
+    prompt: string | ContentBlock.Any[];
+    system?: string;
+    observer?: GenerationObserver;
+    toolkit?: OpaqueToolkit.OpaqueToolkit<R>;
+    /**
+     * Space-level MCP servers to connect alongside blueprint-defined ones.
+     */
+    mcpServers?: readonly McpServer.McpServer[];
+}
+export type AiSessionOptions = {
+    feed: Feed.Feed;
+    runtime: Runtime.Runtime<Feed.FeedService>;
+    registry?: Registry.Registry;
+};
+/**
+ * Durable conversation state (initiated by users and agents) backed by a Feed.
+ * Executes tools based on AI responses and supports cancellation of in-progress requests.
+ */
+export declare class AiSession extends Resource {
+    /**
+     * Blueprints and objects bound to the session.
+     */
+    private readonly _binder;
+    private readonly _feed;
+    private readonly _runtime;
+    constructor(options: AiSessionOptions);
+    protected _open(): Promise<void>;
+    get feed(): Feed.Feed;
+    get context(): AiContextBinder;
+    getHistory(): Promise<Message.Message[]>;
+    getTools(): Effect.Effect<Record<string, import('@effect/ai/Tool').Any>, never, ToolExecutionService | ToolResolverService>;
+    /**
+     * Not provided by default, since users might want to override them.
+     */
+    makeToolExecutionServices(): Layer.Layer<ToolExecutionService | ToolResolverService, never, OpaqueToolkit.OpaqueToolkitProvider | Operation.Service | OperationRegistry.Service>;
+    /**
+     * Creates a new cancelable request effect.
+     */
+    createRequest<R = never>(params: AiSessionRunProps<R>): Effect.Effect<Message.Message[], AiRequestRunError, AiRequestRunRequirements | R>;
+}
+declare const AiSessionService_base: Context.TagClass<AiSessionService, "@dxos/assistant/AiSessionService", AiSession>;
+/**
+ * Gives access to the ai session.
+ */
+export declare class AiSessionService extends AiSessionService_base {
+    /**
+     * Create a new session layer from options.
+     */
+    static layer: (options: AiSessionOptions) => Layer.Layer<AiSessionService | AiContextService>;
+    /**
+     * Create a new session with a new feed.
+     */
+    static layerNewFeed: (options?: Omit<AiSessionOptions, 'feed' | 'runtime'>) => Layer.Layer<AiSessionService | AiContextService, never, Database.Service | Feed.FeedService>;
+    /**
+     * Run a prompt in the current session.
+     */
+    static run: <R = never>(params: AiSessionRunProps<R>) => Effect.Effect<Message.Message[], AiRequestRunError, AiRequestRunRequirements | AiSessionService | R>;
+}
+export {};
+//# sourceMappingURL=session.d.ts.map

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

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

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,UAAW,SAAS,MAAM,EAAE,KAAG,IAAI,EA0B1D,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,CAAC,YAAY,WAAW,CAAC,CAAC,CAAC,SAAS,SAAS,MAAM,EAAE;;;GAU5F,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,CAAC,YAChB,WAAW,CAAC,CAAC,CAAC,SACjB,SAAS,MAAM,EAAE,wBACK;IAAE,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,KACzD,MAoBF,CAAC"}

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

@@ -1,75 +1,67 @@
 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;
-        stack?: string;
+declare const AiModelError_base: {
+    new (options?: import("@dxos/errors").BaseErrorOptions): {
         cause?: unknown;
+        stack?: string;
+        name: "AiModelError";
+        context: Record<string, unknown>;
+        readonly message: string;
+        readonly _tag: "AiModelError";
     };
-    code: "AI_ASSISTANT_ERROR";
+    isError(error: unknown): error is Error;
+    name: "AiModelError";
     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;
-        stack?: string;
+    wrap(options?: Omit<import("@dxos/errors").BaseErrorOptions, 'cause'> & {
+        ifTypeDiffers?: boolean;
+    }): (error: unknown) => {
         cause?: unknown;
+        stack?: string;
+        name: "AiModelError";
+        context: Record<string, unknown>;
+        readonly message: string;
+        readonly _tag: "AiModelError";
     };
-    extend<Code extends string>(code: Code): any;
-    isError(error: unknown): error is Error;
+    extend<Name extends string = string>(name: Name, message?: string): any;
     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;
-        stack?: string;
+declare const AiAssistantError_base: {
+    new (options?: import("@dxos/errors").BaseErrorOptions): {
         cause?: unknown;
+        stack?: string;
+        name: "AiAssistantError";
+        context: Record<string, unknown>;
+        readonly message: string;
+        readonly _tag: "AiAssistantError";
     };
-    code: "ANTHROPIC_ERROR";
+    isError(error: unknown): error is Error;
+    name: "AiAssistantError";
     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;
-        stack?: string;
+    wrap(options?: Omit<import("@dxos/errors").BaseErrorOptions, 'cause'> & {
+        ifTypeDiffers?: boolean;
+    }): (error: unknown) => {
         cause?: unknown;
+        stack?: string;
+        name: "AiAssistantError";
+        context: Record<string, unknown>;
+        readonly message: string;
+        readonly _tag: "AiAssistantError";
     };
-    extend<Code extends string>(code: Code): any;
-    isError(error: unknown): error is Error;
+    extend<Name extends string = string>(name: Name, message?: string): any;
     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;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEzC;;GAEG;AACH,qBAAa,YAAa,SAAQ,iBAAkD;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEvF;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,qBAA0D;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;IAExD,YAA6B,WAAW,GAAE,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAgB,EAAI;IAEtF;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,QASjC;IAED;;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,CAQvE;IAED;;OAEG;IACH,OAAO,CAAC,eAAe;IAqBvB;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAyBjC;;OAEG;IACH,OAAO,CAAC,2BAA2B;IAsBnC;;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-ner-function/index.d.ts

@@ -1,3 +1,2 @@
-export * from './extraction-ner-function';
 export * from './named-entity-recognition';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/extraction/extraction-ner-function/index.ts"],"names":[],"mappings":"AAIA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/extraction/extraction-ner-function/index.ts"],"names":[],"mappings":"AAIA,cAAc,4BAA4B,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;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"}
+{"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,SAAgB,MAAM,KAAG,OAAO,CAAC,yBAAyB,EAAE,CAM3F,CAAC;AAEF,eAAO,MAAM,iBAAiB,WAAY,yBAAyB,EAAE,KAAG,yBAAyB,EAAE,EAmClG,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAW,yBAAyB,EAAE,KAAG,yBAmBrE,CAAC"}