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

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../../../../src/functions/services.ts"],"names":[],"mappings":"AAKA,OAAO,EAAmB,KAAK,EAAoC,MAAM,QAAQ,CAAC;AAElF,OAAO,EAAuB,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE1F,OAAO,EAAuC,KAAK,kBAAkB,EAAiB,MAAM,iBAAiB,CAAC;AAG9G,eAAO,MAAM,6BAA6B,GACxC,WAAW,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,KACxC,KAAK,CAAC,KAAK,CAAC,mBAAmB,CAWjC,CAAC;AAEF,eAAO,MAAM,qCAAqC,GAChD,WAAW,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,KACxC,KAAK,CAAC,KAAK,CAAC,oBAAoB,CAkBlC,CAAC"}
+{"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../../../../src/functions/services.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,KAAK,OAAO,MAAM,oBAAoB,CAAC;AAGnD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAItC,OAAO,EAAuB,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAG1F,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,yBAAyB,EAAgB,MAAM,iBAAiB,CAAC;AAG/G;;;;;;;;;;GAUG;AACH,eAAO,MAAM,6BAA6B,GACxC,WAAW,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EACzC,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,KAC5B,KAAK,CAAC,KAAK,CAAC,mBAAmB,EAAE,KAAK,EAAE,eAAe,CA8BzD,CAAC;AAEF,eAAO,MAAM,qCAAqC,GAChD,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAC7B,eAAe,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAC1D,KAAK,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,EAAE,yBAAyB,CAmCpE,CAAC"}

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

@@ -1,8 +1,8 @@
-export * from './context';
 export * from './conversation';
-export * from './extraction';
+export * from './diff';
+export * from './errors';
+export * from './execution-graph';
 export * from './functions';
-export * from './research';
 export * from './session';
 export * from './templates';
 export * from './types';

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

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

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

@@ -0,0 +1,27 @@
+import * as Context from 'effect/Context';
+import { type ObjectId } from '@dxos/echo/internal';
+import { type ObjectVersion } from '@dxos/echo-db';
+declare const ArtifactDiffResolver_base: Context.TagClass<ArtifactDiffResolver, "@dxos/assistant/ArtifactDiffResolver", ArtifactDiffResolver.Service>;
+/**
+ * Resolves artifact ids to their versions.
+ * Used to give the model a sense of the changes to the artifacts made by users during the conversation.
+ * The artifacts versions are pinned in the history, and whenever the artifact changes in-between assistant's steps,
+ * a diff is inserted into the conversation.
+ *
+ * Can be optionally provided to the session run call.
+ */
+export declare class ArtifactDiffResolver extends ArtifactDiffResolver_base {
+}
+export declare namespace ArtifactDiffResolver {
+    type Service = {
+        resolve: (artifacts: {
+            id: ObjectId;
+            lastVersion: ObjectVersion;
+        }[]) => Promise<Map<ObjectId, {
+            version: ObjectVersion;
+            diff?: string;
+        }>>;
+    };
+}
+export {};
+//# sourceMappingURL=artifact-diff.d.ts.map

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

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

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

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

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

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

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

@@ -0,0 +1,184 @@
+import * as Effect from 'effect/Effect';
+import { type AiSessionRunParams } from './session';
+/**
+ * Formats the system prompt.
+ */
+export declare const formatSystemPrompt: ({ system, blueprints, objects, }: Pick<AiSessionRunParams<any>, "system" | "blueprints" | "objects">) => Effect.Effect<string, never, never>;
+/**
+ * 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/internal").EntityKind.Object> & {
+    id: string;
+    parentMessage?: string | undefined;
+    created: string;
+    sender: {
+        contact?: import("@dxos/echo/internal").Ref<import("@dxos/echo/Type").OfKind<import("@dxos/echo/internal").EntityKind.Object> & {
+            fullName?: string | undefined;
+            preferredName?: string | undefined;
+            nickname?: string | undefined;
+            image?: string | undefined;
+            organization?: import("@dxos/echo/internal").Ref<import("@dxos/echo/Type").OfKind<import("@dxos/echo/internal").EntityKind.Object> & {
+                id: string;
+                description?: string | undefined;
+                name?: 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 label?: string | undefined;
+                readonly value: string;
+            }[] | undefined;
+            identities?: {
+                readonly label?: string | undefined;
+                readonly value: string;
+            }[] | undefined;
+            phoneNumbers?: {
+                readonly label?: string | undefined;
+                readonly value: string;
+            }[] | undefined;
+            addresses?: {
+                readonly label?: string | undefined;
+                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;
+                };
+            }[] | undefined;
+            urls?: {
+                readonly label?: string | undefined;
+                readonly value: string;
+            }[] | undefined;
+            birthday?: string | undefined;
+            fields?: {
+                readonly label: string;
+                readonly value: string;
+                readonly category?: string | undefined;
+            }[] | undefined;
+        }> | undefined;
+        identityDid?: string | undefined;
+        identityKey?: string | undefined;
+        email?: string | undefined;
+        name?: string | undefined;
+        role?: "user" | "assistant" | "tool" | undefined;
+    };
+    blocks: ({
+        version: unknown;
+        _tag: "anchor";
+        pending?: boolean | undefined;
+        objectId: string;
+    } | {
+        name?: string | undefined;
+        _tag: "file";
+        pending?: boolean | undefined;
+        url: string;
+        mediaType?: string | undefined;
+    } | {
+        id?: string | undefined;
+        _tag: "image";
+        pending?: boolean | undefined;
+        source?: {
+            mediaType: string;
+            type: "base64";
+            data: string;
+        } | {
+            url: string;
+            type: "http";
+        } | undefined;
+    } | {
+        _tag: "json";
+        pending?: boolean | undefined;
+        data: string;
+        disposition?: string | undefined;
+    } | {
+        text: string;
+        _tag: "proposal";
+        pending?: boolean | undefined;
+    } | {
+        _tag: "reasoning";
+        pending?: boolean | undefined;
+        reasoningText?: string | undefined;
+        redactedText?: string | undefined;
+        signature?: string | undefined;
+    } | {
+        reference: import("@dxos/echo/internal").Ref<import("@dxos/echo/Type").Expando>;
+        _tag: "reference";
+        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";
+        pending?: boolean | undefined;
+        mimeType?: string | undefined;
+        message?: string | undefined;
+        model?: string | undefined;
+        usage?: {
+            readonly inputTokens?: number | undefined;
+            readonly outputTokens?: number | undefined;
+            readonly totalTokens?: number | undefined;
+        } | undefined;
+        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;
+        providerExecuted: boolean;
+    } | {
+        name: string;
+        _tag: "toolResult";
+        pending?: boolean | undefined;
+        toolCallId: string;
+        providerExecuted: boolean;
+        result?: string | undefined;
+        error?: string | undefined;
+    } | {
+        text: string;
+        _tag: "transcript";
+        pending?: boolean | undefined;
+        started: string;
+    })[];
+    properties?: {
+        [x: string]: any;
+    } | undefined;
+}>, {
+    "__#private@#code": "AI_ASSISTANT_ERROR";
+    "__#private@#context": Record<string, unknown>;
+    readonly name: "AI_ASSISTANT_ERROR";
+    readonly message: string;
+    readonly code: "AI_ASSISTANT_ERROR";
+    readonly _tag: "AI_ASSISTANT_ERROR";
+    readonly context: Record<string, unknown>;
+    stack?: string;
+    cause?: unknown;
+}, never>;
+//# sourceMappingURL=format.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../../../src/session/format.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAgBxC,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"}

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

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

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

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

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

@@ -1,3 +1,6 @@
+export * from './artifact-diff';
+export * from './observer';
 export * from './session';
+export * from './toolkit';
 export * from './version-pin';
 //# 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,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"}

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

@@ -0,0 +1,22 @@
+import * as Effect from 'effect/Effect';
+import { type AiParser, type ConsolePrinter } from '@dxos/ai';
+import { type DataType } from '@dxos/schema';
+/**
+ * Live observer of the generation process.
+ */
+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>;
+}
+export declare const GenerationObserver: Readonly<{
+    make: ({ onBegin, onPart, onBlock, onEnd, onMessage, }?: Partial<GenerationObserver>) => GenerationObserver;
+    noop: () => GenerationObserver;
+    /**
+     * Debug printer to be used in unit-tests and browser devtools.
+     */
+    fromPrinter: (printer: ConsolePrinter) => GenerationObserver;
+}>;
+//# sourceMappingURL=observer.d.ts.map

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

@@ -0,0 +1 @@
+{"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,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"}

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

@@ -1,20 +1,28 @@
-import { AiLanguageModel, AiToolkit, type AiError, type AiResponse, type AiTool } from '@effect/ai';
-import { Context, Effect, type Schema } from 'effect';
-import { ToolExecutionService, ToolResolverService, type AgentStatus, type AiInputPreprocessingError, type AiToolNotFoundError } from '@dxos/ai';
-import { Event } from '@dxos/async';
+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 { ObjectVersion } from '@dxos/echo-db';
-import { type ObjectId } from '@dxos/echo-schema';
+import { Obj } from '@dxos/echo';
+import { TracingService } from '@dxos/functions';
 import { DataType } from '@dxos/schema';
-import { AiAssistantError } from '../errors';
-export type AiSessionOptions = {};
-export type SessionRunOptions<Tools extends AiTool.Any> = {
+import { type AiAssistantError } from '../errors';
+import { GenerationObserver } from './observer';
+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;
-    history: DataType.Message[];
-    systemPrompt?: string;
-    toolkit?: AiToolkit.AiToolkit<Tools>;
+    system?: string;
+    history?: DataType.Message[];
+    objects?: Obj.Any[];
     blueprints?: Blueprint.Blueprint[];
+    toolkit?: Toolkit.WithHandler<Tools>;
+    observer?: GenerationObserver;
 };
+export type AiSessionOptions = {};
 /**
  * Contains message history, tools, current context.
  * Current context means the state of the app, time of day, and other contextual information.
@@ -27,234 +35,17 @@ export type SessionRunOptions<Tools extends AiTool.Any> = {
  */
 export declare class AiSession {
     private readonly _options;
+    /** Prevents concurrent execution of session. */
     private readonly _semaphore;
-    /** Pending messages (incl. the current user request). */
-    private _pending;
-    /** Current streaming response. */
-    private _stream;
-    /** Prior history from queue. */
+    /** Message history from queue. */
     private _history;
-    /**
-     * New message.
-     */
-    readonly message: Event<import("@dxos/schema").Message>;
-    /**
-     * Complete block added to Message.
-     */
-    readonly block: Event<{
-        version: unknown;
-        _tag: "anchor";
-        pending?: boolean | undefined;
-        objectId: string;
-    } | {
-        name?: string | undefined;
-        _tag: "file";
-        pending?: boolean | undefined;
-        url: string;
-        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";
-        pending?: boolean | undefined;
-        reasoningText?: string | undefined;
-        redactedText?: string | undefined;
-        signature?: string | undefined;
-    } | {
-        reference: import("@dxos/echo-schema").Ref<import("@dxos/echo/Type").Expando>;
-        _tag: "reference";
-        pending?: boolean | undefined;
-    } | {
-        _tag: "select";
-        pending?: boolean | undefined;
-        options: readonly string[];
-    } | {
-        _tag: "status";
-        pending?: boolean | undefined;
-        statusText: string;
-    } | {
-        text: string;
-        _tag: "suggest";
-        pending?: boolean | undefined;
-    } | {
-        text: string;
-        _tag: "text";
-        pending?: boolean | undefined;
-        disposition?: string | undefined;
-        mimeType?: string | undefined;
-    } | {
-        name: string;
-        input: unknown;
-        _tag: "toolCall";
-        pending?: boolean | undefined;
-        toolCallId: string;
-    } | {
-        _tag: "toolList";
-        pending?: boolean | undefined;
-    } | {
-        name: string;
-        _tag: "toolResult";
-        pending?: boolean | undefined;
-        toolCallId: string;
-        result: unknown;
-    } | {
-        text: string;
-        _tag: "transcript";
-        pending?: boolean | undefined;
-        started: string;
-    }>;
-    /**
-     * Update partial block (while streaming).
-     */
-    readonly update: Event<{
-        version: unknown;
-        _tag: "anchor";
-        pending?: boolean | undefined;
-        objectId: string;
-    } | {
-        name?: string | undefined;
-        _tag: "file";
-        pending?: boolean | undefined;
-        url: string;
-        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";
-        pending?: boolean | undefined;
-        reasoningText?: string | undefined;
-        redactedText?: string | undefined;
-        signature?: string | undefined;
-    } | {
-        reference: import("@dxos/echo-schema").Ref<import("@dxos/echo/Type").Expando>;
-        _tag: "reference";
-        pending?: boolean | undefined;
-    } | {
-        _tag: "select";
-        pending?: boolean | undefined;
-        options: readonly string[];
-    } | {
-        _tag: "status";
-        pending?: boolean | undefined;
-        statusText: string;
-    } | {
-        text: string;
-        _tag: "suggest";
-        pending?: boolean | undefined;
-    } | {
-        text: string;
-        _tag: "text";
-        pending?: boolean | undefined;
-        disposition?: string | undefined;
-        mimeType?: string | undefined;
-    } | {
-        name: string;
-        input: unknown;
-        _tag: "toolCall";
-        pending?: boolean | undefined;
-        toolCallId: string;
-    } | {
-        _tag: "toolList";
-        pending?: boolean | undefined;
-    } | {
-        name: string;
-        _tag: "toolResult";
-        pending?: boolean | undefined;
-        toolCallId: string;
-        result: unknown;
-    } | {
-        text: string;
-        _tag: "transcript";
-        pending?: boolean | undefined;
-        started: string;
-    }>;
-    /**
-     * Unparsed events from the underlying generation stream.
-     */
-    readonly streamEvent: Event<AiResponse.TextPart | AiResponse.ReasoningPart | AiResponse.RedactedReasoningPart | AiResponse.ToolCallPart | AiResponse.MetadataPart | AiResponse.FinishPart>;
-    /**
-     * User prompt or tool result.
-     */
-    readonly userMessage: Event<import("@dxos/schema").Message>;
-    /**
-     * Agent self-reporting its status.
-     * Triggered by the model.
-     */
-    readonly statusReport: Event<AgentStatus>;
-    /**
-     * Emits when the session is done.
-     */
-    readonly done: Event<void>;
+    /** Pending messages for this session (incl. the current prompt). */
+    private _pending;
     constructor(_options?: AiSessionOptions);
+    run: <Tools extends Record<string, Tool.Any>>({ prompt, system: systemTemplate, history, objects, blueprints, toolkit, observer, }: AiSessionRunParams<Tools>) => Effect.Effect<DataType.Message[], AiSessionRunError, AiSessionRunRequirements>;
     /**
-     * Runs the AI model loop interacting with tools and artifacts.
-     * @param options - The session options.
-     * @returns The messages generated by the session, including the user's prompt.
+     * @deprecated
      */
-    run: <Tools extends AiTool.Any>(options: SessionRunOptions<Tools>) => Effect.Effect<DataType.Message[], AiAssistantError | AiInputPreprocessingError | AiToolNotFoundError | AiError.AiError, AiLanguageModel.AiLanguageModel | ToolResolverService | ToolExecutionService | AiTool.ToHandler<Tools>>;
-    runStructured<S extends Schema.Schema.AnyNoContext>(schema: S, options: SessionRunOptions<AiTool.Any>): Promise<Schema.Schema.Type<S>>;
-    private _formatUserPrompt;
-    abort(): void;
-}
-declare const ArtifactDiffResolver_base: Context.TagClass<ArtifactDiffResolver, "ArtifactDiffResolver", ArtifactDiffResolver.Service>;
-/**
- * Resolves artifact ids to their versions.
- * Used to give the model a sense of the changes to the artifacts made by users during the conversation.
- * The artifacts versions are pinned in the history, and whenever the artifact changes in-between assistant's steps,
- * a diff is inserted into the conversation.
- *
- * Can be optionally provided to the session run call.
- */
-export declare class ArtifactDiffResolver extends ArtifactDiffResolver_base {
-}
-export declare namespace ArtifactDiffResolver {
-    type Service = {
-        resolve: (artifacts: {
-            id: ObjectId;
-            lastVersion: ObjectVersion;
-        }[]) => Promise<Map<ObjectId, {
-            version: ObjectVersion;
-            diff?: string;
-        }>>;
-    };
+    runStructured<S extends Schema.Schema.AnyNoContext>(_schema: S, _options: AiSessionRunParams<any>): Promise<Schema.Schema.Type<S>>;
 }
-export {};
 //# 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,eAAe,EAAE,SAAS,EAAE,KAAK,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,MAAM,EAAE,MAAM,YAAY,CAAC;AACpG,OAAO,EAAS,OAAO,EAAE,MAAM,EAAwB,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGnF,OAAO,EAKL,oBAAoB,EACpB,mBAAmB,EACnB,KAAK,WAAW,EAChB,KAAK,yBAAyB,EAC9B,KAAK,mBAAmB,EAEzB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAGlD,OAAO,EAAE,QAAQ,EAAqB,MAAM,cAAc,CAAC;AAE3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,MAAM,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAElC,MAAM,MAAM,iBAAiB,CAAC,KAAK,SAAS,MAAM,CAAC,GAAG,IAAI;IACxD,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACrC,UAAU,CAAC,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC;CACpC,CAAC;AAEF;;;;;;;;;GASG;AACH,qBAAa,SAAS;IAiDR,OAAO,CAAC,QAAQ,CAAC,QAAQ;IA/CrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA2C;IAEtE,yDAAyD;IACzD,OAAO,CAAC,QAAQ,CAA0B;IAE1C,kCAAkC;IAClC,OAAO,CAAC,OAAO,CAA+B;IAE9C,gCAAgC;IAChC,OAAO,CAAC,QAAQ,CAA0B;IAE1C;;OAEG;IACH,SAAgB,OAAO,wCAAiC;IAExD;;OAEG;IACH,SAAgB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAAiC;IAEtD;;OAEG;IACH,SAAgB,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAAiC;IAEvD;;OAEG;IACH,SAAgB,WAAW,uKAAgC;IAE3D;;OAEG;IACH,SAAgB,WAAW,wCAAiC;IAE5D;;;OAGG;IACH,SAAgB,YAAY,qBAA4B;IAExD;;OAEG;IACH,SAAgB,IAAI,cAAqB;gBAEZ,QAAQ,GAAE,gBAAqB;IAE5D;;;;OAIG;IAEH,GAAG,GAAI,KAAK,SAAS,MAAM,CAAC,GAAG,EAC7B,SAAS,iBAAiB,CAAC,KAAK,CAAC,KAChC,MAAM,CAAC,MAAM,CACd,QAAQ,CAAC,OAAO,EAAE,EAClB,gBAAgB,GAAG,yBAAyB,GAAG,mBAAmB,GAAG,OAAO,CAAC,OAAO,EACpF,eAAe,CAAC,eAAe,GAAG,mBAAmB,GAAG,oBAAoB,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CACvG,CA4F2E;IAEtE,aAAa,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,YAAY,EACtD,MAAM,EAAE,CAAC,EACT,OAAO,EAAE,iBAAiB,CAAC,MAAM,CAAC,GAAG,CAAC,GACrC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAUjC,OAAO,CAAC,iBAAiB,CAwCpB;IAEL,KAAK,IAAI,IAAI;CAGd;;AA+BD;;;;;;;GAOG;AAEH,qBAAa,oBAAqB,SAAQ,yBAGvC;CAAG;AAEN,yBAAiB,oBAAoB,CAAC;IACpC,KAAY,OAAO,GAAG;QACpB,OAAO,EAAE,CAAC,SAAS,EAAE;YAAE,EAAE,EAAE,QAAQ,CAAC;YAAC,WAAW,EAAE,aAAa,CAAA;SAAE,EAAE,KAAK,OAAO,CAC7E,GAAG,CACD,QAAQ,EACR;YACE,OAAO,EAAE,aAAa,CAAC;YACvB,IAAI,CAAC,EAAE,MAAM,CAAC;SACf,CACF,CACF,CAAC;KACH,CAAC;CACH"}
+{"version":3,"file":"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,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,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;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,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,CAA0B;IAE1C,oEAAoE;IACpE,OAAO,CAAC,QAAQ,CAA0B;gBAEb,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,QAAQ,CAAC,OAAO,EAAE,EAAE,iBAAiB,EAAE,wBAAwB,CAAC,CA+FjC;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

@@ -0,0 +1,15 @@
+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 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 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

@@ -0,0 +1 @@
+{"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"}