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

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

@@ -1 +1 @@
-{"version":3,"file":"extraction.d.ts","sourceRoot":"","sources":["../../../../src/extraction/extraction.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,KAAK,kBAAkB,EAAE,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAIjF,eAAO,MAAM,eAAe;;;;;;;;;;;;wBA+Dk1iB,CAAC;+BAAqD,CAAC;0BAAgD,CAAC;yBAAkG,CAAC;2BAAiD,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAtDzmjB,CAAC;AACH,MAAM,WAAW,eAAgB,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,eAAe,CAAC;CAAG;AAEtF,eAAO,MAAM,gBAAgB;;;;;;;;;;;;wBAmDi1iB,CAAC;+BAAqD,CAAC;0BAAgD,CAAC;yBAAkG,CAAC;2BAAiD,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAhDzmjB,CAAC;AACH,MAAM,WAAW,gBAAiB,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC;CAAG;AAExF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,KAAK,EAAE,eAAe,CAAC;IACvB,QAAQ,EAAE,kBAAkB,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;IAChE,QAAQ,EAAE,gBAAgB,CAAC;IAE3B,OAAO,CAAC,EAAE;QACR;;WAEG;QACH,OAAO,CAAC,EAAE,MAAM,CAAC;QAEjB;;;;WAIG;QACH,aAAa,CAAC,EAAE,OAAO,CAAC;KACzB,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;AAEvF;;GAEG;AAEH,eAAO,MAAM,wBAAwB,GAAU,QAAQ,8BAA8B,KAAG,OAAO,CAAC,gBAAgB,CAkB/G,CAAC"}
+{"version":3,"file":"extraction.d.ts","sourceRoot":"","sources":["../../../../src/extraction/extraction.ts"],"names":[],"mappings":"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"}

package/dist/types/src/extraction/quotes.d.ts

@@ -1,5 +1,5 @@
-import { Schema } from 'effect';
-import { type EchoDatabase } from '@dxos/echo-db';
+import * as Schema from 'effect/Schema';
+import { type Database } from '@dxos/echo';
 export declare const ReferencedQuotes: Schema.Struct<{
     references: Schema.mutable<Schema.Array$<Schema.Struct<{
         id: typeof Schema.String;
@@ -7,7 +7,7 @@ export declare const ReferencedQuotes: Schema.Struct<{
     }>>>;
 }>;
 export type ReferencedQuotes = Schema.Schema.Type<typeof ReferencedQuotes>;
-export declare const findQuotes: (quotes: string[], db: EchoDatabase) => Promise<ReferencedQuotes>;
+export declare const findQuotes: (quotes: string[], db: Database.Database) => Promise<ReferencedQuotes>;
 /**
  * Finds and replaces all quotes with DXNs references.
  */

package/dist/types/src/extraction/quotes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quotes.d.ts","sourceRoot":"","sources":["../../../../src/extraction/quotes.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAKlD,eAAO,MAAM,gBAAgB;;;;;EAe3B,CAAC;AACH,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE3E,eAAO,MAAM,UAAU,GAAU,QAAQ,MAAM,EAAE,EAAE,IAAI,YAAY,KAAG,OAAO,CAAC,gBAAgB,CAS7F,CAAC;AAEF;;GAEG;AAEH,eAAO,MAAM,gBAAgB,GAAI,MAAM,MAAM,EAAE,QAAQ,gBAAgB,WAYtE,CAAC"}
+{"version":3,"file":"quotes.d.ts","sourceRoot":"","sources":["../../../../src/extraction/quotes.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,KAAK,QAAQ,EAAiB,MAAM,YAAY,CAAC;AAK1D,eAAO,MAAM,gBAAgB;;;;;EAe3B,CAAC;AACH,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE3E,eAAO,MAAM,UAAU,GAAU,QAAQ,MAAM,EAAE,EAAE,IAAI,QAAQ,CAAC,QAAQ,KAAG,OAAO,CAAC,gBAAgB,CASlG,CAAC;AAEF;;GAEG;AAEH,eAAO,MAAM,gBAAgB,GAAI,MAAM,MAAM,EAAE,QAAQ,gBAAgB,WAYtE,CAAC"}

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

@@ -1,6 +1,20 @@
-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 { Database } from '@dxos/echo';
+import { 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 `Database.Service` in the environment.
+ */
+export declare const makeToolResolverFromFunctions: (functions: FunctionDefinition.Any[], toolkit: Toolkit.Toolkit<any>) => Layer.Layer<ToolResolverService, never, Database.Service>;
+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;AAKtC,OAAO,EAAuB,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAG1F,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAY,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAK1F;;;;;;;;;;GAUG;AACH,eAAO,MAAM,6BAA6B,GACxC,WAAW,kBAAkB,CAAC,GAAG,EAAE,EACnC,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,KAC5B,KAAK,CAAC,KAAK,CAAC,mBAAmB,EAAE,KAAK,EAAE,QAAQ,CAAC,OAAO,CA8B1D,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,CAqCpE,CAAC"}

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

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

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

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

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/GenericToolkit.d.ts

@@ -0,0 +1,85 @@
+import type * as Tool from '@effect/ai/Tool';
+import * as Toolkit from '@effect/ai/Toolkit';
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
+import * as Pipeable from 'effect/Pipeable';
+import type * as Schema from 'effect/Schema';
+import type * as SchemaAST from 'effect/SchemaAST';
+/**
+ * Unique identifier for generic toolkit instances.
+ */
+export declare const TypeId = "~@dxos/assistant/GenericToolkit";
+/**
+ * Type-level representation of the generic toolkit identifier.
+ */
+export type TypeId = typeof TypeId;
+/**
+ * Type-safe way to define toolkits where we don't know specific types of tools,
+ * and we want to bundle definition and handlers together.
+ *
+ * Usefull for plugin-based systems, where tools are dynamically added.
+ *
+ * @param TR requirements type to the tool invocation.
+ * @param E failure type to the handlers layer.
+ * @param R requirements type to the handlers layer.
+ */
+export interface GenericToolkit<TR = never, E = never, R = never> extends Pipeable.Pipeable {
+    readonly [TypeId]: TypeId;
+    /**
+     * Toolkit definition.
+     */
+    readonly toolkit: Toolkit.Toolkit<GenericTools<TR>>;
+    /**
+     * Handlers layer.
+     */
+    readonly layer: Layer.Layer<unknown, E, R>;
+    /**
+     * Handlers effect.
+     */
+    readonly handlers: Effect.Effect<Toolkit.WithHandler<GenericTools<TR>>, E, R>;
+}
+/**
+ * Generic constraint.
+ *
+ * NOTE: Only use in place of `T extends PortableToolkit.Any`. Not suitable for standalone use.
+ */
+export interface Any {
+    readonly [TypeId]: TypeId;
+    readonly toolkit: Toolkit.Toolkit<any>;
+    readonly layer: Layer.Layer<unknown, any, any>;
+}
+export type InvocationRequirements<T extends Any> = T extends GenericToolkit<infer TR, infer _E, infer _R> ? TR : never;
+export type Failure<T extends Any> = T extends GenericToolkit<infer _TR, infer E, infer _R> ? E : never;
+export type Requirements<T extends Any> = T extends GenericToolkit<infer _TR, infer _E, infer R> ? R : never;
+/**
+ * Creates a portable toolkit from toolkit definition and handlers layer.
+ */
+export declare const make: <Tools extends Record<string, Tool.Any>, E, R>(toolkit: Toolkit.Toolkit<Tools>, layer: Layer.Layer<Tool.HandlersFor<Tools>, E, R>) => GenericToolkit<E, R>;
+/**
+ * Merges multiple portable toolkits into a single portable toolkit.
+ */
+export declare const merge: <const Toolkits extends ReadonlyArray<Any>>(
+/**
+ * The toolkits to merge together.
+ */
+...toolkits: Toolkits) => GenericToolkit<InvocationRequirements<Toolkits[number]>, Failure<Toolkits[number]>, Requirements<Toolkits[number]>>;
+/**
+ * Generic tools type where we cannot statically enumerate individual tools.
+ */
+export type GenericTools<R = never> = Record<string, Tool.Tool<string, {
+    readonly parameters: AnyStructSchemaNoContext;
+    readonly success: Schema.Schema.AnyNoContext;
+    readonly failure: typeof Schema.Never;
+    readonly failureMode: Tool.FailureMode;
+}, R>>;
+export interface AnyStructSchemaNoContext extends Pipeable.Pipeable {
+    readonly [Schema.TypeId]: any;
+    readonly make: any;
+    readonly Type: any;
+    readonly Encoded: any;
+    readonly Context: never;
+    readonly ast: SchemaAST.AST;
+    readonly fields: Schema.Struct.Fields;
+    readonly annotations: any;
+}
+//# sourceMappingURL=GenericToolkit.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"GenericToolkit.d.ts","sourceRoot":"","sources":["../../../../src/session/GenericToolkit.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,KAAK,SAAS,MAAM,kBAAkB,CAAC;AAEnD;;GAEG;AACH,eAAO,MAAM,MAAM,oCAAoC,CAAC;AAExD;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC;AAEnC;;;;;;;;;GASG;AACH,MAAM,WAAW,cAAc,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK,CAAE,SAAQ,QAAQ,CAAC,QAAQ;IACzF,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC;IAEpD;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAE3C;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;CAC/E;AAED;;;;GAIG;AACH,MAAM,WAAW,GAAG;IAClB,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACvC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;CAChD;AAED,MAAM,MAAM,sBAAsB,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,cAAc,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;AACxH,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,cAAc,CAAC,MAAM,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AACxG,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,cAAc,CAAC,MAAM,GAAG,EAAE,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAE7G;;GAEG;AACH,eAAO,MAAM,IAAI,GAAI,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAC/D,SAAS,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAC/B,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAChD,cAAc,CAAC,CAAC,EAAE,CAAC,CAWrB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,KAAK,GAAI,KAAK,CAAC,QAAQ,SAAS,aAAa,CAAC,GAAG,CAAC;AAC7D;;GAEG;AACH,GAAG,UAAU,QAAQ,KACpB,cAAc,CACf,sBAAsB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EACxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EACzB,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAM/B,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,YAAY,CAAC,CAAC,GAAG,KAAK,IAAI,MAAM,CAC1C,MAAM,EACN,IAAI,CAAC,IAAI,CACP,MAAM,EACN;IACE,QAAQ,CAAC,UAAU,EAAE,wBAAwB,CAAC;IAC9C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;IAC7C,QAAQ,CAAC,OAAO,EAAE,OAAO,MAAM,CAAC,KAAK,CAAC;IACtC,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC;CACxC,EACD,CAAC,CACF,CACF,CAAC;AAEF,MAAM,WAAW,wBAAyB,SAAQ,QAAQ,CAAC,QAAQ;IACjE,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC;IACnB,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC;IACnB,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC;IACxB,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;IACtC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC;CAC3B"}

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

@@ -0,0 +1,27 @@
+import * as Context from 'effect/Context';
+import { type ObjectVersion } from '@dxos/echo-db';
+import { type ObjectId } from '@dxos/keys';
+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,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;;AAE3C;;;;;;;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,12 @@
+import * as Effect from 'effect/Effect';
+import { Message } from '@dxos/types';
+import { type AiSessionRunError, type AiSessionRunProps } from './session';
+/**
+ * Formats the system prompt.
+ */
+export declare const formatSystemPrompt: ({ system, blueprints, objects, }: Pick<AiSessionRunProps<any>, "system" | "blueprints" | "objects">) => Effect.Effect<string, import("@dxos/echo/Err").ObjectNotFoundError | import("@dxos/functions").FunctionNotFoundError, import("@dxos/functions").FunctionInvocationService | import("@dxos/functions").TracingService>;
+/**
+ * Formats the user prompt.
+ */
+export declare const formatUserPrompt: ({ prompt, history, }: Pick<AiSessionRunProps<any>, "prompt" | "history">) => Effect.Effect<Message.Message, AiSessionRunError>;
+//# 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":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AASxC,OAAO,EAAqB,OAAO,EAAE,MAAM,aAAa,CAAC;AAMzD,OAAO,EAAE,KAAK,iBAAiB,EAAE,KAAK,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE3E;;GAEG;AAEH,eAAO,MAAM,kBAAkB,GAAI,kCAIhC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,QAAQ,GAAG,YAAY,GAAG,SAAS,CAAC,0NAsChE,CAAC;AAEL;;GAEG;AAGH,eAAO,MAAM,gBAAgB,GAAI,sBAG9B,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,iBAAiB,CAoCpG,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,7 @@
+export * from './artifact-diff';
+export * from './observer';
 export * from './session';
+export * from './toolkit';
 export * from './version-pin';
+export * as GenericToolkit from './GenericToolkit';
 //# sourceMappingURL=index.d.ts.map

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

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

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

@@ -0,0 +1,23 @@
+import type * as Tool from '@effect/ai/Tool';
+import * as Effect from 'effect/Effect';
+import { type AiParser, type ConsolePrinter } from '@dxos/ai';
+import { type Message } from '@dxos/types';
+/**
+ * Live observer of the generation process.
+ */
+export interface GenerationObserver<Tools extends Record<string, Tool.Any> = any> extends AiParser.ParseResponseCallbacks<Tools> {
+    /**
+     * 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: Message.Message) => Effect.Effect<void>;
+}
+export declare const GenerationObserver: Readonly<{
+    make: ({ onBegin, onPart, onBlock, onEnd, onMessage, }?: Partial<GenerationObserver>) => GenerationObserver;
+    noop: () => GenerationObserver<any>;
+    /**
+     * Debug printer to be used in unit-tests and browser devtools.
+     */
+    fromPrinter: (printer: ConsolePrinter) => GenerationObserver<any>;
+}>;
+//# 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,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,cAAc,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,kBAAkB,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAC9E,SAAQ,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC;IAC9C;;;OAGG;IACH,SAAS,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;CAC9D;AAED,eAAO,MAAM,kBAAkB;6DAO1B,OAAO,CAAC,kBAAkB,CAAC,KAAQ,kBAAkB;;IAUxD;;OAEG;2BACoB,cAAc;EAiBrC,CAAC"}

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

@@ -1,19 +1,27 @@
-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 { DataType } from '@dxos/schema';
-import { AiAssistantError } from '../errors';
+import { Obj } from '@dxos/echo';
+import { type FunctionInvocationService, TracingService } from '@dxos/functions';
+import { Message } from '@dxos/types';
+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 | FunctionInvocationService;
 export type AiSessionOptions = {};
-export type SessionRunOptions<Tools extends AiTool.Any> = {
+export type AiSessionRunProps<Tools extends Record<string, Tool.Any>> = {
     prompt: string;
-    history: DataType.Message[];
-    systemPrompt?: string;
-    toolkit?: AiToolkit.AiToolkit<Tools>;
-    blueprints?: Blueprint.Blueprint[];
+    system?: string;
+    history?: Message.Message[];
+    objects?: Obj.Unknown[];
+    blueprints?: readonly Blueprint.Blueprint[];
+    toolkit?: Toolkit.WithHandler<Tools>;
+    observer?: GenerationObserver<Tools>;
 };
 /**
  * Contains message history, tools, current context.
@@ -27,234 +35,22 @@ 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;
+    private _started;
+    private _ended;
+    private _toolCalls;
     constructor(_options?: AiSessionOptions);
+    get duration(): number;
+    get toolCalls(): number;
+    run: <Tools extends Record<string, Tool.Any>>({ prompt, system: systemTemplate, history, objects, blueprints, toolkit, observer, }: AiSessionRunProps<Tools>) => Effect.Effect<Message.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: AiSessionRunProps<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":"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"}
+{"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,KAAK,yBAAyB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjF,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAGlD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhD,MAAM,MAAM,iBAAiB,GAAG,OAAO,CAAC,OAAO,GAAG,wBAAwB,GAAG,mBAAmB,GAAG,gBAAgB,CAAC;AAEpH,MAAM,MAAM,wBAAwB,GAChC,aAAa,CAAC,aAAa,GAC3B,oBAAoB,GACpB,mBAAmB,GACnB,cAAc,GACd,yBAAyB,CAAC;AAE9B,MAAM,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAElC,MAAM,MAAM,iBAAiB,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI;IACtE,MAAM,EAAE,MAAM,CAAC;IAEf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC;IAC5B,OAAO,CAAC,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC;IACxB,UAAU,CAAC,EAAE,SAAS,SAAS,CAAC,SAAS,EAAE,CAAC;IAC5C,OAAO,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACrC,QAAQ,CAAC,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC;CACtC,CAAC;AAEF;;;;;;;;;GASG;AACH,qBAAa,SAAS;IAeR,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAdrC,gDAAgD;IAChD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA2C;IAEtE,kCAAkC;IAElC,OAAO,CAAC,QAAQ,CAAyB;IAEzC,oEAAoE;IACpE,OAAO,CAAC,QAAQ,CAAyB;IAEzC,OAAO,CAAC,QAAQ,CAAK;IACrB,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,UAAU,CAAK;gBAEM,QAAQ,GAAE,gBAAqB;IAE5D,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,GAAG,GAAI,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,sFAQ5C,iBAAiB,CAAC,KAAK,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,iBAAiB,EAAE,wBAAwB,CAAC,CAuG/B;IAE5E;;OAEG;IAEG,aAAa,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,YAAY,EACtD,OAAO,EAAE,CAAC,EACV,QAAQ,EAAE,iBAAiB,CAAC,GAAG,CAAC,GAC/B,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CASlC"}

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

@@ -0,0 +1,14 @@
+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, ToolResolverService } from '@dxos/ai';
+import { type Blueprint } from '@dxos/blueprints';
+export type CreateToolkitProps = {
+    toolkit?: Toolkit.Any;
+    blueprints?: readonly Blueprint.Blueprint[];
+};
+/**
+ * Build a combined toolkit from the blueprint tools and the provided toolkit.
+ */
+export declare const createToolkit: ({ toolkit: toolkitProp, blueprints, }: CreateToolkitProps) => Effect.Effect<Toolkit.WithHandler<any>, AiToolNotFoundError, ToolResolverService | ToolExecutionService | Tool.HandlersFor<any>>;
+//# 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;AAC9C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,KAAK,mBAAmB,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAC/F,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGlD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC;IACtB,UAAU,CAAC,EAAE,SAAS,SAAS,CAAC,SAAS,EAAE,CAAC;CAC7C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,GAAI,uCAG3B,kBAAkB,KAAG,MAAM,CAAC,MAAM,CACnC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,EACxB,mBAAmB,EACnB,mBAAmB,GAAG,oBAAoB,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAYhE,CAAC"}