@dxos/assistant 0.8.3 → 0.8.4-main.f9ba587

package/dist/lib/node-esm/index.mjs

@@ -1,77 +1,193 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
 
-// packages/core/assistant/src/extraction/extraction.ts
+// src/blueprint/blueprint.ts
 import { Schema } from "effect";
-import { asyncTimeout } from "@dxos/async";
-import { Expando } from "@dxos/echo-schema";
-import { log } from "@dxos/log";
-import { DataType } from "@dxos/schema";
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/assistant/src/extraction/extraction.ts";
-var ExtractionInput = Schema.Struct({
-  message: DataType.Message,
-  objects: Schema.optional(Schema.Array(Expando)),
-  options: Schema.optional(Schema.Struct({
-    timeout: Schema.optional(Schema.Number),
-    fallbackToRaw: Schema.optional(Schema.Boolean)
-  }))
-});
-var ExtractionOutput = Schema.Struct({
-  message: DataType.Message,
-  timeElapsed: Schema.Number
-});
-var processTranscriptMessage = async (params) => {
-  try {
-    if (params.options?.timeout && params.options.timeout > 0) {
-      return await asyncTimeout(params.executor.invoke(params.function, params.input), params.options.timeout);
-    } else {
-      return await params.executor.invoke(params.function, params.input);
+import { ToolId } from "@dxos/ai";
+import { Type } from "@dxos/echo";
+import { LabelAnnotation } from "@dxos/echo-schema";
+var Blueprint = Schema.Struct({
+  /**
+  * Global registry ID.
+  * NOTE: Once a blueprint has been cloned from the registry, its stored definition may converge,
+  * but the `key` property refers to the original registry entry.
+  */
+  // TODO(burdon): Create Format type.
+  key: Schema.String.annotations({
+    description: "Unique registration key for the blueprint"
+  }),
+  /**
+  * Human-readable name of the blueprint.
+  */
+  name: Schema.String.annotations({
+    description: "Human-readable name of the blueprint"
+  }),
+  /**
+  * Description of the blueprint's purpose and functionality.
+  */
+  description: Schema.optional(Schema.String).annotations({
+    description: "Description of the blueprint's purpose and functionality"
+  }),
+  /**
+  * Instructions that guide the AI assistant's behavior and responses.
+  * These are system prompts or guidelines that the AI should follow.
+  */
+  instructions: Schema.String.annotations({
+    description: "Instructions that guide the AI assistant's behavior and responses"
+  }),
+  /**
+  * Array of tools that the AI assistant can use when this blueprint is active.
+  */
+  tools: Schema.Array(ToolId).annotations({
+    description: "Array of tools that the AI assistant can use when this blueprint is active"
+  }),
+  /**
+  * Array of artifacts that the AI assistant can create or modify.
+  */
+  artifacts: Schema.Array(Schema.String).annotations({
+    description: "Ids of artifact definitions that should be pulled into the blueprint"
+  })
+}).pipe(
+  Type.Obj({
+    // TODO(burdon): Is this a DXN? Need to create a Format type for these IDs.
+    typename: "dxos.org/type/Blueprint",
+    version: "0.1.0"
+  }),
+  // TODO(burdon): Move to main API.
+  LabelAnnotation.set([
+    "name"
+  ])
+);
+
+// src/blueprint/registry.ts
+var BlueprintRegistry = class {
+  constructor(_blueprints) {
+    this._blueprints = _blueprints;
+    this._blueprints.sort(({ name: a }, { name: b }) => a.localeCompare(b));
+  }
+  query() {
+    return this._blueprints;
+  }
+};
+
+// src/context/binder.ts
+import { computed } from "@preact/signals-core";
+import { Array as Array2, pipe } from "effect";
+import { Obj } from "@dxos/echo";
+import { ComplexSet } from "@dxos/util";
+
+// src/context/binding.ts
+import { Schema as Schema2 } from "effect";
+import { Type as Type2 } from "@dxos/echo";
+var ContextBinding = Schema2.Struct({
+  blueprints: Schema2.Struct({
+    added: Schema2.Array(Type2.Ref(Blueprint)),
+    removed: Schema2.Array(Type2.Ref(Blueprint))
+  }),
+  // TODO(burdon): Type.Expando => Type.Obj (or Obj.Any?)
+  objects: Schema2.Struct({
+    added: Schema2.Array(Type2.Ref(Type2.Expando)),
+    removed: Schema2.Array(Type2.Ref(Type2.Expando))
+  })
+}).pipe(Type2.Obj({
+  typename: "dxos.org/type/ContextBinding",
+  version: "0.1.0"
+}));
+
+// src/context/binder.ts
+var ContextBinder = class {
+  constructor(_queue) {
+    this._queue = _queue;
+    this.bindings = computed(() => this._reduce(this._queue.objects));
+    this.blueprints = computed(() => [
+      ...this.bindings.value.blueprints
+    ]);
+    this.objects = computed(() => [
+      ...this.bindings.value.objects
+    ]);
+  }
+  /**
+  * Asynchronous query of all bindings.
+  */
+  async query() {
+    const queueItems = await this._queue.queryObjects();
+    return this._reduce(queueItems);
+  }
+  // TODO(burdon): Pass in Blueprint obj (from registry?) and create reference.
+  async bind(props) {
+    if (!props.blueprints?.length && !props.objects?.length) {
+      return;
     }
-  } catch (error) {
-    if (params.options?.fallbackToRaw) {
-      log.warn("failed to process message, falling back to raw text", {
-        error
-      }, {
-        F: __dxlog_file,
-        L: 66,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-      return {
-        message: params.input.message,
-        timeElapsed: 0
-      };
-    } else {
-      throw error;
+    await this._queue.append([
+      Obj.make(ContextBinding, {
+        blueprints: {
+          added: props.blueprints ?? [],
+          removed: []
+        },
+        objects: {
+          added: props.objects ?? [],
+          removed: []
+        }
+      })
+    ]);
+  }
+  async unbind(props) {
+    if (!props.blueprints?.length && !props.objects?.length) {
+      return;
     }
+    await this._queue.append([
+      Obj.make(ContextBinding, {
+        blueprints: {
+          added: [],
+          removed: props.blueprints ?? []
+        },
+        objects: {
+          added: [],
+          removed: props.objects ?? []
+        }
+      })
+    ]);
+  }
+  _reduce(items) {
+    return pipe(items, Array2.filter(Obj.instanceOf(ContextBinding)), Array2.reduce(new Bindings(), (context, item) => {
+      item.blueprints.removed.forEach((item2) => context.blueprints.delete(item2));
+      item.blueprints.added.forEach((item2) => context.blueprints.add(item2));
+      item.objects.removed.forEach((item2) => context.objects.delete(item2));
+      item.objects.added.forEach((item2) => context.objects.add(item2));
+      return context;
+    }));
+  }
+};
+var Bindings = class {
+  constructor() {
+    this.blueprints = new ComplexSet((ref) => ref.dxn.toString());
+    this.objects = new ComplexSet((ref) => ref.dxn.toString());
   }
 };
 
-// packages/core/assistant/src/extraction/extraction-llm-function/extraction-llm-function.ts
+// src/conversation/conversation.ts
 import { Message as Message2 } from "@dxos/ai";
-import { Obj as Obj2 } from "@dxos/echo";
-import { create as create2 } from "@dxos/echo-schema";
-import { AiService, defineFunction } from "@dxos/functions";
-import { DataType as DataType2 } from "@dxos/schema";
-
-// raw-loader:./instructions.tpl?raw
-var instructions_default = 'You are an AI assistant specialized in processing and enhancing transcripts with contextual information.\nYour task is to analyze a given transcript and extract references to the context objects.\n\nThe context and transcript are provided in the user message in `context` and `transcript` XML tags.\n\nHere are your instructions:\n\n1. Read the transcript and context information provided above.\n\n2. Process each segment of the transcript separately.\n\n3. For each segment:\n   a. Analyze the content and identify relevant information from the context.\n   b. Extract a number of references to the context objects that are mentioned in the segment.\n   c. Output the references in the format `{ "quote": "earnings report", "id": "01JT0JP9AX0XKGZX4MV4B69VT6" }`.\n   d. If there are no references, just output an empty array.\n\n4. Maintain the exact order and structure of the original transcript segments.\n\nOutput Format:\nYou have been provided with a tool that specifies output format\n\nRemember:\n- Only quote the text that is in the transcript.\n- Analyze each segment carefully before processing it.\n- Only reference objects that appear in the context and exactly by their id, If the object is not in the context, do not insert a reference. \n\nNow, process the transcript and context provided below according to these instructions.';
+import { Event as Event2 } from "@dxos/async";
+import { Obj as Obj3, Ref } from "@dxos/echo";
+import { AiService, ToolResolverService } from "@dxos/functions";
+import { log as log2 } from "@dxos/log";
+import { isNonNullable } from "@dxos/util";
 
-// packages/core/assistant/src/session/session.ts
-import { Option, Schema as Schema3 } from "effect";
+// src/session/session.ts
+import { Array as Array3, Option, pipe as pipe2, Schema as Schema4 } from "effect";
 import { AgentStatusReport, isToolUse, runTools, structuredOutputParser, Message, MixedStreamParser, ToolResult, createTool } from "@dxos/ai";
 import { Event, synchronized } from "@dxos/async";
-import { Obj } from "@dxos/echo";
+import { Obj as Obj2 } from "@dxos/echo";
 import { ObjectVersion } from "@dxos/echo-db";
 import { create } from "@dxos/echo-schema";
 import { invariant } from "@dxos/invariant";
-import { log as log2 } from "@dxos/log";
+import { log } from "@dxos/log";
 
-// packages/core/assistant/src/session/version-pin.ts
-import { Schema as Schema2 } from "effect";
+// src/session/version-pin.ts
+import { Schema as Schema3 } from "effect";
 import { getVersion } from "@dxos/echo-db";
 import { ObjectId } from "@dxos/echo-schema";
-var ObjectVersionSchema = Schema2.Unknown;
-var VersionPinSchema = Schema2.Struct({
+var ObjectVersionSchema = Schema3.Unknown;
+var VersionPinSchema = Schema3.Struct({
   // TODO(dmaretskyi): Use Ref when those support encoding.
   objectId: ObjectId,
   // TODO(dmaretskyi): Could be opaque
@@ -96,14 +212,14 @@ var VersionPin = class extends VersionPinSchema {
   }
 };
 
-// packages/core/assistant/src/session/session.ts
+// src/session/session.ts
 function _ts_decorate(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/assistant/src/session/session.ts";
+var __dxlog_file = "/__w/dxos/dxos/packages/core/assistant/src/session/session.ts";
 var AISession = class _AISession {
   constructor(_options) {
     this._options = _options;
@@ -116,6 +232,7 @@ var AISession = class _AISession {
     this.streamEvent = this._parser.streamEvent;
     this.userMessage = new Event();
     this.statusReport = new Event();
+    this.done = new Event();
     this.toolStatusReport = new Event();
     this._parser.message.on((message) => {
       this._pending.push(message);
@@ -128,6 +245,11 @@ var AISession = class _AISession {
       }
     });
   }
+  /**
+  * 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.
+  */
   async run(options) {
     const systemTools = [];
     switch (this._options.operationModel) {
@@ -159,18 +281,19 @@ var AISession = class _AISession {
     try {
       let more = false;
       do {
-        const tools = [
+        const tools = pipe2([
           ...systemTools,
-          ...options.tools,
+          ...await Promise.all(options.tools.map((toolId) => options.toolResolver.resolve(toolId))),
+          ...options.executableTools ?? [],
           ...options.artifacts.filter((artifact) => requiredArtifactIds.has(artifact.id)).flatMap((artifact) => artifact.tools)
-        ];
-        log2("request", {
+        ], Array3.dedupeWith((a, b) => a.id === b.id));
+        log("request", {
           pending: this._pending.length,
           history: this._history.length,
           tools: tools.map((tool) => tool.name)
         }, {
-          F: __dxlog_file2,
-          L: 201,
+          F: __dxlog_file,
+          L: 231,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -183,25 +306,27 @@ var AISession = class _AISession {
           ],
           tools,
           systemPrompt: options.systemPrompt ?? createBaseInstructions({
-            availableArtifacts: Array.from(requiredArtifactIds),
+            availableArtifacts: [
+              ...requiredArtifactIds
+            ],
             operationModel: this._options.operationModel
           })
         });
         await this._parser.parse(this._stream);
         await this._stream.complete();
-        log2("response", {
+        log("response", {
           pending: this._pending
         }, {
-          F: __dxlog_file2,
-          L: 226,
+          F: __dxlog_file,
+          L: 256,
           S: this,
           C: (f, a) => f(...a)
         });
         more = false;
         const message = this._pending.at(-1);
         invariant(message, void 0, {
-          F: __dxlog_file2,
-          L: 231,
+          F: __dxlog_file,
+          L: 261,
           S: this,
           A: [
             "message",
@@ -209,9 +334,9 @@ var AISession = class _AISession {
           ]
         });
         if (isToolUse(message)) {
-          log2("tool request...", void 0, {
-            F: __dxlog_file2,
-            L: 233,
+          log("tool request...", void 0, {
+            F: __dxlog_file,
+            L: 263,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -221,11 +346,11 @@ var AISession = class _AISession {
             extensions: options.extensions ?? {},
             reportStatus: (status) => this._onToolStatusReport(message, status)
           });
-          log2("tool response", {
+          log("tool response", {
             response
           }, {
-            F: __dxlog_file2,
-            L: 241,
+            F: __dxlog_file,
+            L: 271,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -243,9 +368,9 @@ var AISession = class _AISession {
         }
       } while (more);
     } catch (err) {
-      log2.catch(err, void 0, {
-        F: __dxlog_file2,
-        L: 253,
+      log.catch(err, void 0, {
+        F: __dxlog_file,
+        L: 283,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -260,6 +385,7 @@ var AISession = class _AISession {
       }
     } finally {
       this._stream = void 0;
+      this.done.emit();
     }
     if (error) {
       throw error;
@@ -270,8 +396,8 @@ var AISession = class _AISession {
     const parser = structuredOutputParser(schema);
     const result = await this.run({
       ...options,
-      tools: [
-        ...options.tools,
+      executableTools: [
+        ...options.executableTools ?? [],
         parser.tool
       ]
     });
@@ -281,16 +407,18 @@ var AISession = class _AISession {
     const prelude = [];
     if (artifactDiffResolver) {
       const versions = gatherObjectVersions(history);
-      const artifactDiff = await artifactDiffResolver(Array.from(versions.entries()).map(([id, version]) => ({
+      const artifactDiff = await artifactDiffResolver([
+        ...versions.entries()
+      ].map(([id, version]) => ({
         id,
         lastVersion: version
       })));
-      log2.info("vision", {
+      log.info("vision", {
         artifactDiff,
         versions
       }, {
-        F: __dxlog_file2,
-        L: 296,
+        F: __dxlog_file,
+        L: 327,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -310,7 +438,7 @@ var AISession = class _AISession {
         prelude.push(createArtifactUpdateBlock(artifactDiff));
       }
     }
-    return Obj.make(Message, {
+    return Obj2.make(Message, {
       role: "user",
       content: [
         ...prelude,
@@ -325,7 +453,7 @@ var AISession = class _AISession {
     return createTool("system", {
       name: "query_artifact_definitions",
       description: "Query the available artifact definitions",
-      schema: Schema3.Struct({}),
+      schema: Schema4.Struct({}),
       execute: async () => {
         return ToolResult.Success({
           artifactDefinitions: artifacts.map((artifact) => ({
@@ -341,8 +469,8 @@ var AISession = class _AISession {
     return createTool("system", {
       name: "require_artifact_definitions",
       description: "Require the use of specific artifact definitions. This will allow the model to interact with artifact definitions and use their tools.",
-      schema: Schema3.Struct({
-        artifactDefinitionIds: Schema3.Array(Schema3.String).annotations({
+      schema: Schema4.Struct({
+        artifactDefinitionIds: Schema4.Array(Schema4.String).annotations({
           description: "The ids of the artifact definitions to require",
           examples: [
             [
@@ -365,21 +493,21 @@ var AISession = class _AISession {
     return createTool("system", {
       name: "create_plan",
       description: "Create a plan. Make sure that each step is independent and can be executed solely on the data returned by the previous step. The steps only share the data that is specified in the plan.",
-      schema: Schema3.Struct({
-        goal: Schema3.String.annotations({
+      schema: Schema4.Struct({
+        goal: Schema4.String.annotations({
           description: "The goal that the plan will achieve."
         }),
-        steps: Schema3.Array(Schema3.Struct({
-          action: Schema3.String.annotations({
+        steps: Schema4.Array(Schema4.Struct({
+          action: Schema4.String.annotations({
             description: "Complete, detailed action to perform."
           }),
-          input: Schema3.String.annotations({
+          input: Schema4.String.annotations({
             description: "The required input data for this step. First step must not require any data."
           }),
-          output: Schema3.String.annotations({
+          output: Schema4.String.annotations({
             description: "The output data from this step. This is passed to the next step as input."
           }),
-          requiredArtifactIds: Schema3.Array(Schema3.String).annotations({
+          requiredArtifactIds: Schema4.Array(Schema4.String).annotations({
             description: "The ids of the artifacts required to perform this step.",
             examples: [
               [
@@ -398,11 +526,11 @@ var AISession = class _AISession {
         }
         const stepResults = [];
         for (const step of steps) {
-          log2("executing step", {
+          log("executing step", {
             action: step.action
           }, {
-            F: __dxlog_file2,
-            L: 403,
+            F: __dxlog_file,
+            L: 434,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -415,14 +543,11 @@ var AISession = class _AISession {
           session.streamEvent.on((ev) => this.streamEvent.emit(ev));
           session.userMessage.on((ev) => this.userMessage.emit(ev));
           const messages = await session.run({
-            client: options.client,
             artifacts: options.artifacts,
             tools: options.tools,
             history: options.history,
             extensions: options.extensions,
-            generationOptions: options.generationOptions,
             requiredArtifactIds: step.requiredArtifactIds.slice(),
-            artifactDiffResolver: options.artifactDiffResolver,
             prompt: `
               You are an agent that executes the subtask in a plan.
               
@@ -440,7 +565,11 @@ var AISession = class _AISession {
               
               Previous step results:
               ${JSON.stringify(stepResults.at(-1))}.
-            `
+            `,
+            generationOptions: options.generationOptions,
+            client: options.client,
+            toolResolver: options.toolResolver,
+            artifactDiffResolver: options.artifactDiffResolver
           });
           const result = messages.at(-1);
           stepResults.push(result);
@@ -497,14 +626,14 @@ var createBaseInstructions = ({ availableArtifacts, operationModel }) => `
 
   ${availableArtifacts.length > 0 ? `Artifacts already in context: ${availableArtifacts.join("\n")}` : ""}
 `;
-var AIServiecOverloadedError = class extends Schema3.TaggedError()("AIServiecOverloadedError", {}) {
+var AIServiecOverloadedError = class extends Schema4.TaggedError()("AIServiecOverloadedError", {}) {
 };
 var gatherObjectVersions = (messages) => {
   const artifactIds = /* @__PURE__ */ new Map();
   for (const message of messages) {
     for (const block of message.content) {
       if (block.type === "json" && block.disposition === VersionPin.DISPOSITION) {
-        const pin = VersionPin.pipe(Schema3.decodeOption)(JSON.parse(block.json)).pipe(Option.getOrUndefined);
+        const pin = VersionPin.pipe(Schema4.decodeOption)(JSON.parse(block.json)).pipe(Option.getOrUndefined);
         if (!pin) {
           continue;
         }
@@ -520,24 +649,139 @@ var createArtifactUpdateBlock = (artifactDiff) => {
     disposition: "artifact-update",
     text: `
       The following artifacts have been updated since the last message:
-      ${Array.from(artifactDiff.entries()).map(([id, { diff }]) => `<changed-artifact id="${id}">${diff ? `
+      ${[
+      ...artifactDiff.entries()
+    ].map(([id, { diff }]) => `<changed-artifact id="${id}">${diff ? `
 ${diff}` : ""}</changed-artifact>`).join("\n")}
     `
   };
 };
 
-// packages/core/assistant/src/extraction/quotes.ts
-import { Schema as Schema4 } from "effect";
+// src/conversation/conversation.ts
+var __dxlog_file2 = "/__w/dxos/dxos/packages/core/assistant/src/conversation/conversation.ts";
+var Conversation = class {
+  constructor(options) {
+    /**
+    * Fired when the execution loop begins.
+    * This is called before the first message is sent.
+    */
+    this.onBegin = new Event2();
+    this._serviceContainer = options.serviceContainer;
+    this._queue = options.queue;
+    this.context = new ContextBinder(this._queue);
+  }
+  async run(options) {
+    const session = new AISession({
+      operationModel: "configured"
+    });
+    this.onBegin.emit(session);
+    const history = await this.getHistory();
+    const context = await this.context.query();
+    const blueprints = (await Ref.Array.loadAll([
+      ...context.blueprints
+    ])).filter(isNonNullable);
+    if (blueprints.length > 1) {
+      log2.warn("multiple blueprints are not yet supported", void 0, {
+        F: __dxlog_file2,
+        L: 72,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+    const messages = await session.run({
+      history,
+      prompt: options.prompt,
+      systemPrompt: (options.systemPrompt ?? "") + (blueprints.at(0)?.instructions ?? ""),
+      // TODO(dmaretskyi): Artifacts come from the blueprint?
+      artifacts: options.artifacts ?? [],
+      tools: blueprints.at(0)?.tools ?? [],
+      executableTools: options.tools,
+      requiredArtifactIds: options.requiredArtifactIds,
+      client: this._serviceContainer.getService(AiService).client,
+      toolResolver: this._serviceContainer.getService(ToolResolverService).toolResolver,
+      extensions: {
+        serviceContainer: this._serviceContainer,
+        ...options.extensions
+      },
+      generationOptions: options.generationOptions
+    });
+    await this._queue.append(messages);
+    return messages;
+  }
+  async getHistory() {
+    const queueItems = await this._queue.queryObjects();
+    return queueItems.filter(Obj3.instanceOf(Message2));
+  }
+};
+
+// src/extraction/extraction.ts
+import { Schema as Schema5 } from "effect";
+import { asyncTimeout } from "@dxos/async";
+import { Expando } from "@dxos/echo-schema";
+import { log as log3 } from "@dxos/log";
+import { DataType } from "@dxos/schema";
+var __dxlog_file3 = "/__w/dxos/dxos/packages/core/assistant/src/extraction/extraction.ts";
+var ExtractionInput = Schema5.Struct({
+  message: DataType.Message,
+  objects: Schema5.optional(Schema5.Array(Expando)),
+  options: Schema5.optional(Schema5.Struct({
+    timeout: Schema5.optional(Schema5.Number),
+    fallbackToRaw: Schema5.optional(Schema5.Boolean)
+  }))
+});
+var ExtractionOutput = Schema5.Struct({
+  message: DataType.Message,
+  timeElapsed: Schema5.Number
+});
+var processTranscriptMessage = async (params) => {
+  try {
+    if (params.options?.timeout && params.options.timeout > 0) {
+      return await asyncTimeout(params.executor.invoke(params.function, params.input), params.options.timeout);
+    } else {
+      return await params.executor.invoke(params.function, params.input);
+    }
+  } catch (error) {
+    if (params.options?.fallbackToRaw) {
+      log3.warn("failed to process message, falling back to raw text", {
+        error
+      }, {
+        F: __dxlog_file3,
+        L: 66,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+      return {
+        message: params.input.message,
+        timeElapsed: 0
+      };
+    } else {
+      throw error;
+    }
+  }
+};
+
+// src/extraction/extraction-llm-function/extraction-llm-function.ts
+import { Message as Message3, ToolRegistry } from "@dxos/ai";
+import { Obj as Obj4 } from "@dxos/echo";
+import { create as create2 } from "@dxos/echo-schema";
+import { AiService as AiService2, defineFunction } from "@dxos/functions";
+import { DataType as DataType2 } from "@dxos/schema";
+
+// raw-loader:./instructions.tpl?raw
+var instructions_default = 'You are an AI assistant specialized in processing and enhancing transcripts with contextual information.\nYour task is to analyze a given transcript and extract references to the context objects.\n\nThe context and transcript are provided in the user message in `context` and `transcript` XML tags.\n\nHere are your instructions:\n\n1. Read the transcript and context information provided above.\n\n2. Process each segment of the transcript separately.\n\n3. For each segment:\n   a. Analyze the content and identify relevant information from the context.\n   b. Extract a number of references to the context objects that are mentioned in the segment.\n   c. Output the references in the format `{ "quote": "earnings report", "id": "01JT0JP9AX0XKGZX4MV4B69VT6" }`.\n   d. If there are no references, just output an empty array.\n\n4. Maintain the exact order and structure of the original transcript segments.\n\nOutput Format:\nYou have been provided with a tool that specifies output format\n\nRemember:\n- Only quote the text that is in the transcript.\n- Analyze each segment carefully before processing it.\n- Only reference objects that appear in the context and exactly by their id, If the object is not in the context, do not insert a reference. \n\nNow, process the transcript and context provided below according to these instructions.';
+
+// src/extraction/quotes.ts
+import { Schema as Schema6 } from "effect";
 import { Query, Filter } from "@dxos/echo";
 import { ObjectId as ObjectId2 } from "@dxos/echo-schema";
 import { DXN } from "@dxos/keys";
-import { log as log3 } from "@dxos/log";
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/assistant/src/extraction/quotes.ts";
-var ReferencedQuotes = Schema4.Struct({
-  references: Schema4.Array(Schema4.Struct({
-    id: Schema4.String,
-    quote: Schema4.String
-  })).pipe(Schema4.mutable).annotations({
+import { log as log4 } from "@dxos/log";
+var __dxlog_file4 = "/__w/dxos/dxos/packages/core/assistant/src/extraction/quotes.ts";
+var ReferencedQuotes = Schema6.Struct({
+  references: Schema6.Array(Schema6.Struct({
+    id: Schema6.String,
+    quote: Schema6.String
+  })).pipe(Schema6.mutable).annotations({
     // TODO(burdon): Does this description make sense?
     description: `
       The references to the context objects that are mentioned in the transcript. 
@@ -550,11 +794,11 @@ var findQuotes = async (quotes, db) => {
     const { objects } = await db.query(Query.select(Filter.text(quote, {
       type: "vector"
     }))).run();
-    log3.info("found quotes in vector index", {
+    log4.info("found quotes in vector index", {
       objects,
       quote
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file4,
       L: 35,
       S: void 0,
       C: (f, a) => f(...a)
@@ -581,14 +825,14 @@ var insertReferences = (text, quotes) => {
   return text;
 };
 
-// packages/core/assistant/src/extraction/extraction-llm-function/extraction-llm-function.ts
+// src/extraction/extraction-llm-function/extraction-llm-function.ts
 var extractionAnthropicFn = defineFunction({
   description: "Extract entities from the transcript message and add them to the message.",
   inputSchema: ExtractionInput,
   outputSchema: ExtractionOutput,
   handler: async ({ data: { message, objects }, context }) => {
     const startTime = performance.now();
-    const ai = context.getService(AiService);
+    const ai = context.getService(AiService2);
     const session = new AISession({
       operationModel: "configured"
     });
@@ -599,7 +843,7 @@ var extractionAnthropicFn = defineFunction({
       client: ai.client,
       systemPrompt: instructions_default,
       history: [
-        Obj2.make(Message2, {
+        Obj4.make(Message3, {
           role: "user",
           content: [
             {
@@ -615,7 +859,8 @@ var extractionAnthropicFn = defineFunction({
       ],
       artifacts: [],
       prompt: "",
-      tools: []
+      tools: [],
+      toolResolver: new ToolRegistry([])
     });
     return {
       message: create2(DataType2.Message, {
@@ -630,24 +875,24 @@ var extractionAnthropicFn = defineFunction({
   }
 });
 
-// packages/core/assistant/src/extraction/extraction-ner-function/extraction-ner-function.ts
+// src/extraction/extraction-ner-function/extraction-ner-function.ts
 import { asyncTimeout as asyncTimeout2 } from "@dxos/async";
 import { create as create3 } from "@dxos/echo-schema";
 import { DatabaseService, defineFunction as defineFunction2 } from "@dxos/functions";
 import { invariant as invariant2 } from "@dxos/invariant";
-import { log as log5 } from "@dxos/log";
+import { log as log6 } from "@dxos/log";
 import { DataType as DataType3 } from "@dxos/schema";
 
-// packages/core/assistant/src/extraction/extraction-ner-function/named-entity-recognition.ts
+// src/extraction/extraction-ner-function/named-entity-recognition.ts
 import { pipeline } from "@xenova/transformers";
-import { log as log4 } from "@dxos/log";
-var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/assistant/src/extraction/extraction-ner-function/named-entity-recognition.ts";
+import { log as log5 } from "@dxos/log";
+var __dxlog_file5 = "/__w/dxos/dxos/packages/core/assistant/src/extraction/extraction-ner-function/named-entity-recognition.ts";
 var _ner;
 var getNer = () => {
   if (!_ner) {
     _ner = pipeline("ner", "Xenova/bert-base-NER").then((ner) => {
-      log4.info("NER model is ready", void 0, {
-        F: __dxlog_file4,
+      log5.info("NER model is ready", void 0, {
+        F: __dxlog_file5,
         L: 23,
         S: void 0,
         C: (f, a) => f(...a)
@@ -720,18 +965,18 @@ var combineNerTokens = (group) => {
   return combinedToken;
 };
 
-// packages/core/assistant/src/extraction/extraction-ner-function/extraction-ner-function.ts
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/assistant/src/extraction/extraction-ner-function/extraction-ner-function.ts";
+// src/extraction/extraction-ner-function/extraction-ner-function.ts
+var __dxlog_file6 = "/__w/dxos/dxos/packages/core/assistant/src/extraction/extraction-ner-function/extraction-ner-function.ts";
 var extractionNerFn = defineFunction2({
   description: "Extracts named entities from a text",
   inputSchema: ExtractionInput,
   outputSchema: ExtractionOutput,
   handler: async ({ data: { message, options }, context }) => {
-    log5.info("input", {
+    log6.info("input", {
       message,
       options
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 22,
       S: void 0,
       C: (f, a) => f(...a)
@@ -740,7 +985,7 @@ var extractionNerFn = defineFunction2({
     const { db } = context.getService(DatabaseService);
     const entitiesPromise = Promise.all(message.blocks.map(async (block) => {
       invariant2(block.type === "transcription" || block.type === "text", "Block must have text", {
-        F: __dxlog_file5,
+        F: __dxlog_file6,
         L: 28,
         S: void 0,
         A: [
@@ -751,10 +996,10 @@ var extractionNerFn = defineFunction2({
       return extractFullEntities(block.text);
     })).then((entities2) => entities2.flat());
     const entities = options?.timeout ? await asyncTimeout2(entitiesPromise, options.timeout) : await entitiesPromise;
-    log5.info("entities", {
+    log6.info("entities", {
       entities
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 33,
       S: void 0,
       C: (f, a) => f(...a)
@@ -762,7 +1007,7 @@ var extractionNerFn = defineFunction2({
     const quoteReferences = await findQuotes(entities.map((entity) => entity.word), db);
     const blocksWithReferences = message.blocks.map((block, i) => {
       invariant2(block.type === "transcription" || block.type === "text", "Block must have text", {
-        F: __dxlog_file5,
+        F: __dxlog_file6,
         L: 39,
         S: void 0,
         A: [
@@ -779,10 +1024,10 @@ var extractionNerFn = defineFunction2({
       ...message,
       blocks: blocksWithReferences
     });
-    log5.info("output", {
+    log6.info("output", {
       messageWithReferences
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 47,
       S: void 0,
       C: (f, a) => f(...a)
@@ -794,13 +1039,13 @@ var extractionNerFn = defineFunction2({
   }
 });
 
-// packages/core/assistant/src/research/exa.ts
-import { Schema as Schema5 } from "effect";
+// src/research/exa.ts
+import { Schema as Schema7 } from "effect";
 import Exa from "exa-js";
 import { createTool as createTool2, ToolResult as ToolResult2 } from "@dxos/ai";
-import { log as log6 } from "@dxos/log";
+import { log as log7 } from "@dxos/log";
 
-// packages/core/assistant/src/testing/exa-search-1748337321991.ts
+// src/testing/exa-search-1748337321991.ts
 var exa_search_1748337321991_default = {
   requestId: "324936368a74f4db978982172bc18a6c",
   autopromptString: "AI personal knowledge management tools projects 2024",
@@ -956,7 +1201,7 @@ var exa_search_1748337321991_default = {
   }
 };
 
-// packages/core/assistant/src/testing/exa-search-1748337331526.ts
+// src/testing/exa-search-1748337331526.ts
 var exa_search_1748337331526_default = {
   requestId: "0dc12e344fa649884456960ca1a54954",
   autopromptString: "PKM software artificial intelligence integration open source projects",
@@ -1179,7 +1424,7 @@ npm run tauri dev
   }
 };
 
-// packages/core/assistant/src/testing/exa-search-1748337344119.ts
+// src/testing/exa-search-1748337344119.ts
 var exa_search_1748337344119_default = {
   requestId: "32df0c541f9883180b35e04caece4374",
   autopromptString: "open source AI knowledge management projects features comparison 2024",
@@ -1302,22 +1547,22 @@ var exa_search_1748337344119_default = {
   }
 };
 
-// packages/core/assistant/src/testing/index.ts
+// src/testing/index.ts
 var SEARCH_RESULTS = [
   exa_search_1748337321991_default,
   exa_search_1748337331526_default,
   exa_search_1748337344119_default
 ];
 
-// packages/core/assistant/src/research/exa.ts
-var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/core/assistant/src/research/exa.ts";
+// src/research/exa.ts
+var __dxlog_file7 = "/__w/dxos/dxos/packages/core/assistant/src/research/exa.ts";
 var createExaTool = ({ apiKey }) => {
   const exa = new Exa(apiKey);
   return createTool2("search", {
     name: "web_search",
     description: "Search the web for information",
-    schema: Schema5.Struct({
-      query: Schema5.String.annotations({
+    schema: Schema7.Struct({
+      query: Schema7.String.annotations({
         description: "The query to search for"
       })
     }),
@@ -1329,11 +1574,11 @@ var createExaTool = ({ apiKey }) => {
         },
         livecrawl: "always"
       });
-      log6.info("exa search", {
+      log7.info("exa search", {
         query,
         costDollars: context.costDollars
       }, {
-        F: __dxlog_file6,
+        F: __dxlog_file7,
         L: 35,
         S: void 0,
         C: (f, a) => f(...a)
@@ -1346,8 +1591,8 @@ var createMockExaTool = () => {
   return createTool2("search", {
     name: "web_search",
     description: "Search the web for information",
-    schema: Schema5.Struct({
-      query: Schema5.String.annotations({
+    schema: Schema7.Struct({
+      query: Schema7.String.annotations({
         description: "The query to search for"
       })
     }),
@@ -1387,28 +1632,28 @@ var levenshteinDistance = (str1, str2) => {
   return dp[m][n];
 };
 
-// packages/core/assistant/src/research/research.ts
-import { Schema as Schema7 } from "effect";
-import { AgentStatusReport as AgentStatusReport2, ConsolePrinter } from "@dxos/ai";
+// src/research/research.ts
+import { Schema as Schema9 } from "effect";
+import { AgentStatusReport as AgentStatusReport2, ConsolePrinter, ToolRegistry as ToolRegistry2 } from "@dxos/ai";
 import { create as create5 } from "@dxos/echo-schema";
-import { AiService as AiService2, CredentialsService, DatabaseService as DatabaseService2, defineFunction as defineFunction3, TracingService } from "@dxos/functions";
-import { log as log8 } from "@dxos/log";
+import { AiService as AiService3, CredentialsService, DatabaseService as DatabaseService2, defineFunction as defineFunction3, TracingService } from "@dxos/functions";
+import { log as log9 } from "@dxos/log";
 import { DataTypes } from "@dxos/schema";
 
-// packages/core/assistant/src/research/graph.ts
-import { Schema as Schema6, identity, Option as Option2, SchemaAST } from "effect";
+// src/research/graph.ts
+import { Schema as Schema8, identity, Option as Option2, SchemaAST } from "effect";
 import { createTool as createTool3, ToolResult as ToolResult3 } from "@dxos/ai";
 import { Query as Query2, Filter as Filter2 } from "@dxos/echo";
 import { isEncodedReference } from "@dxos/echo-protocol";
 import { EntityKind, getSchemaTypename, getTypeAnnotation, getTypeIdentifierAnnotation, create as create4, getEntityKind, getSchemaDXN, ObjectId as ObjectId3, ReferenceAnnotationId, RelationSourceDXNId, RelationTargetDXNId, RelationSourceId, RelationTargetId } from "@dxos/echo-schema";
 import { mapAst } from "@dxos/effect";
 import { DXN as DXN2 } from "@dxos/keys";
-import { log as log7 } from "@dxos/log";
-import { deepMapValues, isNonNullable } from "@dxos/util";
-var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/core/assistant/src/research/graph.ts";
-var Subgraph = Schema6.Struct({
+import { log as log8 } from "@dxos/log";
+import { deepMapValues, isNonNullable as isNonNullable2 } from "@dxos/util";
+var __dxlog_file8 = "/__w/dxos/dxos/packages/core/assistant/src/research/graph.ts";
+var Subgraph = Schema8.Struct({
   /** Objects and relations. */
-  objects: Schema6.Array(Schema6.Any)
+  objects: Schema8.Array(Schema8.Any)
 });
 var findRelatedSchema = async (db, anchor) => {
   const allSchemas = [
@@ -1438,8 +1683,8 @@ var createLocalSearchTool = (db, queue) => {
   return createTool3("search", {
     name: "local_search",
     description: "Search the local database for information using a vector index",
-    schema: Schema6.Struct({
-      query: Schema6.String.annotations({
+    schema: Schema8.Struct({
+      query: Schema8.String.annotations({
         description: "The query to search for. Could be a question or a topic or a set of keywords."
       })
     }),
@@ -1463,10 +1708,10 @@ var createLocalSearchTool = (db, queue) => {
   });
 };
 var createExtractionSchema = (types) => {
-  return Schema6.Struct({
+  return Schema8.Struct({
     ...Object.fromEntries(types.map(preprocessSchema).map((schema, index) => [
       `objects_${getSanitizedSchemaName(types[index])}`,
-      Schema6.optional(Schema6.Array(schema)).annotations({
+      Schema8.optional(Schema8.Array(schema)).annotations({
         description: `The objects of type: ${getSchemaDXN(types[index])?.asTypeDXN().type}. ${SchemaAST.getDescriptionAnnotation(types[index].ast).pipe(Option2.getOrElse(() => ""))}`
       })
     ]))
@@ -1521,10 +1766,10 @@ var sanitizeObjects = async (types, data, db, queue) => {
     if (getEntityKind(entry.schema) === "relation") {
       const sourceDxn = resolveId(data2.source);
       if (!sourceDxn) {
-        log7.warn("source not found", {
+        log8.warn("source not found", {
           source: data2.source
         }, {
-          F: __dxlog_file7,
+          F: __dxlog_file8,
           L: 214,
           S: void 0,
           C: (f, a) => f(...a)
@@ -1532,10 +1777,10 @@ var sanitizeObjects = async (types, data, db, queue) => {
       }
       const targetDxn = resolveId(data2.target);
       if (!targetDxn) {
-        log7.warn("target not found", {
+        log8.warn("target not found", {
           target: data2.target
         }, {
-          F: __dxlog_file7,
+          F: __dxlog_file8,
           L: 218,
           S: void 0,
           C: (f, a) => f(...a)
@@ -1558,13 +1803,13 @@ var sanitizeObjects = async (types, data, db, queue) => {
   const objects = [
     ...dbObjects,
     ...queueObjects
-  ].filter(isNonNullable);
-  log7.info("objects", {
+  ].filter(isNonNullable2);
+  log8.info("objects", {
     dbObjects,
     queueObjects,
     existingIds
   }, {
-    F: __dxlog_file7,
+    F: __dxlog_file8,
     L: 239,
     S: void 0,
     C: (f, a) => f(...a)
@@ -1605,8 +1850,8 @@ var sanitizeObjects = async (types, data, db, queue) => {
     return [];
   });
 };
-var SoftRef = Schema6.Struct({
-  "/": Schema6.String
+var SoftRef = Schema8.Struct({
+  "/": Schema8.String
 }).annotations({
   description: "Reference to another object."
 });
@@ -1618,15 +1863,15 @@ var preprocessSchema = (schema) => {
     }
     return mapAst(ast, go);
   };
-  return Schema6.make(mapAst(schema.ast, go)).pipe(Schema6.omit("id"), Schema6.extend(Schema6.Struct({
-    id: Schema6.String.annotations({
+  return Schema8.make(mapAst(schema.ast, go)).pipe(Schema8.omit("id"), Schema8.extend(Schema8.Struct({
+    id: Schema8.String.annotations({
       description: "The id of this object. Come up with a unique id based on your judgement."
     })
-  })), isRelationSchema ? Schema6.extend(Schema6.Struct({
-    source: Schema6.String.annotations({
+  })), isRelationSchema ? Schema8.extend(Schema8.Struct({
+    source: Schema8.String.annotations({
       description: "The id of the source object for this relation."
     }),
-    target: Schema6.String.annotations({
+    target: Schema8.String.annotations({
       description: "The id of the target object for this relation."
     })
   })) : identity);
@@ -1646,26 +1891,26 @@ var createGraphWriterTool = ({ db, queue, schema, onDone = async (x) => x }) =>
 // raw-loader:./instructions-research.tpl?raw
 var instructions_research_default = "You are the Research Agent.\n\nThe Research Agent is an expert assistant that conducts in-depth research using real-time web search.\nThe Research Agent outputs results in a structured format matching the schema provided.\n\nThe Research Agent is equipped with the ability to:\n\n- Generate precise and effective search queries \n- Request web pages by query (through a `web_search` tool)\n- Read the full content of retrieved pages\n- Synthesize accurate, clear, and structured answers using reliable information from the retrieved content\n- Search the local database for information using a vector index (through a `local_search` tool)\n\nThe Research Agent always follows these principles:\n\n- Relevance First: The Research Agent only returns facts supported by content in retrieved web pages. The Research Agent never fabricates or guesses information.\n- Summarize, Don't Copy: The Research Agent synthesizes and rephrases content in its own words. The Research Agent quotes only when necessary.\n- Multiple Sources: The Research Agent cross-references at least 2 sources before drawing conclusions, unless the information is directly stated and non-controversial.\n- Transparency: The Research Agent mentions which sources were used and explains how it arrived at conclusions.\n- Accuracy Over Brevity: The Research Agent prefers detailed, technically accurate explanations over shallow summaries.\n- The Research Agent admits uncertainty rather than misleading.\n- The Research Agent picks the most concrete schema types for extracted information.\n- The Research Agent fills schema fields completely with information it is confident about, and omits fields it is not confident about.\n- When outputting results, the Research Agent adds extra data that fits the schema even if not directly related to the user's question.\n- The Research Agent creates relations and references between new objects found and what's already in the database.\n- The Research Agent does not create objects that are already in the database.\n- The Research Agent re-uses existing object IDs as references when enriching existing objects.\n\nThe Research Agent may be asked for:\n\n- Technical explanations\n- Literature reviews  \n- Comparisons\n- Emerging trends\n- Implementation strategies\n\nThe Research Agent begins by interpreting the user's request, then:\n\nThe Research Agent breaks it into sub-questions (if applicable).\n\nFor each sub-question, the Research Agent generates a clear, concise web search query.\n\nThe Research Agent uses `web_search`(query) to retrieve information.\n\nThe Research Agent extracts and synthesizes relevant answers.\n\nThe Research Agent's output includes:\n\n- A clear, structured answer to the user's question\n- A citation list or link list of sources used\n\nOptionally, the Research Agent provides follow-up suggestions or questions for deeper inquiry.\n\nHere's how the Research Agent operates:\n\n1. The Research Agent analyzes the user's request and identifies key topics to search for (3 or more), printing them out.\n2. The Research Agent performs a web search for each topic.\n3. The Research Agent reads and analyzes results, cross references information from multiple sources, and represents conflicting information as ranges of possible values.\n\n4. The Research Agent searches the local database for information using a vector index that might link to the user's question.\n6. The Research Agent creates relations and references between new objects and existing database objects when related, using existing object IDs as references.\n7. The Research Agent selects the most concrete schema types for extracted information, using multiple types as needed, and prints its decision and reasoning.\n5. The Research Agent creates a clear, structured answer to the user's question.\n8. The Research Agent submits results using the specific schema.\n\nIMPORTANT:\n\n- The Research Agent always runs the `local_search` tool to search the local database at least once before submitting results.\n- The Research Agent does not create objects that already exist in the database.\n- Ids that are not in the database are human-readable strings like `ivan_zhao_1`.\n\nStatus reporting:\n\nThe Research Agent reports its status frequently using the `<status>` tags: <status>Searching for Google Founders</status>\nThe Research Agent reports its status in-between each tool call and before submitting results.\n\n<example>\n\nBased on my research, I can now provide information about Google and it's founders.\n\nThe following objects are already in the database, I will not submit them again, but I'll re-use their IDs as references:\n\n- 01JWRDEHPB5TT2JQQQC15038BT Google\n- 01JWRDEHPA14CYW2NW9FAH6DJJ Larry Page\n- 01JWRDEHPBN0BBJP57B9S108W6 Sergey Brin\n\nI will use the following schema to construct new objects:\n\n- type:dxos.org/type/Organization for Alphabet Inc.\n- type:dxos.org/type/Person for Ivan Zhao\n- type:dxos.org/type/Person for Simon Last\n- dxn:type:dxos.org/relation/Employer for Ivan's employer\n- dxn:type:dxos.org/relation/Employer for Simon's employer\n\n<status>Formatting results</status>\n\n</example>";
 
-// packages/core/assistant/src/research/research.ts
-var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/core/assistant/src/research/research.ts";
+// src/research/research.ts
+var __dxlog_file9 = "/__w/dxos/dxos/packages/core/assistant/src/research/research.ts";
 var researchFn = defineFunction3({
   description: "Research the web for information",
-  inputSchema: Schema7.Struct({
-    query: Schema7.String.annotations({
+  inputSchema: Schema9.Struct({
+    query: Schema9.String.annotations({
       description: "The query to search for."
     }),
     // TOOD(burdon): Move to context.
-    mockSearch: Schema7.optional(Schema7.Boolean).annotations({
+    mockSearch: Schema9.optional(Schema9.Boolean).annotations({
       description: "Whether to use the mock search tool.",
       default: false
     })
   }),
-  outputSchema: Schema7.Struct({
+  outputSchema: Schema9.Struct({
     // result: Schema.String,
-    result: Schema7.Any
+    result: Schema9.Any
   }),
   handler: async ({ data: { query, mockSearch }, context }) => {
-    const ai = context.getService(AiService2);
+    const ai = context.getService(AiService3);
     const credentials = context.getService(CredentialsService);
     const { db } = context.getService(DatabaseService2);
     const tracing = context.getService(TracingService);
@@ -1686,20 +1931,20 @@ var researchFn = defineFunction3({
     session.userMessage.on((message) => printer.printMessage(message));
     session.block.on((block) => printer.printContentBlock(block));
     session.statusReport.on((status) => {
-      log8.info("[agent] status", {
+      log9.info("[agent] status", {
         status
       }, {
-        F: __dxlog_file8,
+        F: __dxlog_file9,
         L: 58,
         S: void 0,
         C: (f, a) => f(...a)
       });
       tracing.write(status);
     });
-    session.streamEvent.on((event) => log8("stream", {
+    session.streamEvent.on((event) => log9("stream", {
       event
     }, {
-      F: __dxlog_file8,
+      F: __dxlog_file9,
       L: 61,
       S: void 0,
       C: (f, a) => f(...a)
@@ -1708,10 +1953,10 @@ var researchFn = defineFunction3({
       db,
       schema: DataTypes
     });
-    log8.info("graphWriteTool", {
+    log9.info("graphWriteTool", {
       schema: graphWriteTool.parameters
     }, {
-      F: __dxlog_file8,
+      F: __dxlog_file9,
       L: 64,
       S: void 0,
       C: (f, a) => f(...a)
@@ -1721,11 +1966,15 @@ var researchFn = defineFunction3({
       systemPrompt: instructions_research_default,
       artifacts: [],
       tools: [
-        searchTool,
-        graphWriteTool
+        searchTool.id,
+        graphWriteTool.id
       ],
       history: [],
-      prompt: query
+      prompt: query,
+      toolResolver: new ToolRegistry2([
+        searchTool,
+        graphWriteTool
+      ])
     });
     return {
       result
@@ -1733,403 +1982,17 @@ var researchFn = defineFunction3({
   }
 });
 
-// packages/core/assistant/src/types.ts
+// src/types.ts
 var createArtifactElement = (id) => `<artifact id=${id} />`;
-
-// packages/core/assistant/src/blueprint/blueprint.ts
-import { Schema as Schema8 } from "effect";
-import { Key, Obj as Obj3, Type } from "@dxos/echo";
-var BlueprintStep = Schema8.Struct({
-  id: Key.ObjectId,
-  instructions: Schema8.String,
-  tools: Schema8.optional(Schema8.Array(Schema8.String))
-});
-var BlueprintDefinition = Schema8.Struct({
-  steps: Schema8.Array(BlueprintStep.pipe(Schema8.omit("id")))
-});
-var Blueprint = Schema8.Struct({
-  name: Schema8.optional(Schema8.String),
-  steps: Schema8.Array(BlueprintStep)
-}).pipe(Type.Obj({
-  typename: "dxos.org/type/Blueprint",
-  version: "0.1.0"
-}));
-(function(BlueprintBuilder2) {
-  BlueprintBuilder2.create = () => new Builder();
-  class Builder {
-    constructor() {
-      this._steps = [];
-    }
-    step(instructions, options) {
-      this._steps.push({
-        id: Key.ObjectId.random(),
-        instructions,
-        tools: options?.tools ?? []
-      });
-      return this;
-    }
-    build() {
-      return Obj3.make(Blueprint, {
-        steps: this._steps
-      });
-    }
-  }
-})(BlueprintBuilder || (BlueprintBuilder = {}));
-(function(BlueprintParser2) {
-  BlueprintParser2.create = () => new Parser();
-  class Parser {
-    parse({ steps }) {
-      const builder = BlueprintBuilder.create();
-      for (const step of steps) {
-        builder.step(step.instructions, {
-          tools: step.tools ?? []
-        });
-      }
-      return builder.build();
-    }
-  }
-})(BlueprintParser || (BlueprintParser = {}));
-var BlueprintBuilder;
-var BlueprintParser;
-
-// packages/core/assistant/src/blueprint/machine.ts
-import { Match, Schema as Schema9 } from "effect";
-import { createTool as createTool4, Message as Message3, ToolResult as ToolResult4 } from "@dxos/ai";
-import { Event as Event2 } from "@dxos/async";
-import { Key as Key2, Obj as Obj4 } from "@dxos/echo";
-import { log as log9 } from "@dxos/log";
-import { isNonNullable as isNonNullable2 } from "@dxos/util";
-var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/core/assistant/src/blueprint/machine.ts";
-var SYSTEM_PROMPT = `
-You are a smart Rule-Following Agent.
-Rule-Following Agent executes the command that the user sent in the last message.
-After doing the work, the Rule-Following Agent calls report tool.
-If the Rule-Following agent believes that no action is needed, it calls the report tool with "skipped" status.
-If the Rule-Following Agent is unable to perform the task, it calls the report tool with "bail" status.
-Rule-Following Agent explains the reason it is unable to perform the task before bailing.
-The Rule-Following Agent can express creativity and imagination in the way it performs the task.
-The Rule-Following Agent precisely follows the instructions.
-`;
-var INITIAL_STATE = {
-  state: "working",
-  history: [],
-  trace: []
-};
-var BlueprintMachine = class {
-  constructor(registry, blueprint) {
-    this.registry = registry;
-    this.blueprint = blueprint;
-    this.begin = new Event2();
-    this.end = new Event2();
-    this.stepStart = new Event2();
-    this.stepComplete = new Event2();
-    this.message = new Event2();
-    this.block = new Event2();
-    this._state = structuredClone(INITIAL_STATE);
-  }
-  get state() {
-    return this._state;
-  }
-  setLogger(logger) {
-    this.logger = logger;
-    return this;
-  }
-  async runToCompletion(options) {
-    const invocationId = Key2.ObjectId.random();
-    log9.info("runToCompletion", {
-      invocationId,
-      options
-    }, {
-      F: __dxlog_file9,
-      L: 107,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    this.begin.emit();
-    this.logger?.log({
-      type: "begin",
-      invocationId
-    });
-    let firstStep = true;
-    while (this._state.state !== "done") {
-      const input = firstStep ? options.input : void 0;
-      firstStep = false;
-      this._state = await this._execStep(invocationId, this._state, {
-        input,
-        aiClient: options.aiClient
-      });
-      const step = this.blueprint.steps.find((step2) => step2.id === this._state.trace.at(-1)?.stepId);
-      this.stepComplete.emit(step);
-      this.logger?.log({
-        type: "step-complete",
-        invocationId,
-        step
-      });
-      if (this._state.state === "bail") {
-        throw new Error("Agent unable to follow the blueprint");
-      }
-    }
-    this.end.emit();
-    this.logger?.log({
-      type: "end",
-      invocationId
-    });
-  }
-  async _execStep(invocationId, state, options) {
-    const prevStep = this.blueprint.steps.findIndex((step) => step.id === this._state.trace.at(-1)?.stepId);
-    if (prevStep === this.blueprint.steps.length - 1) {
-      throw new Error("Done execution blueprint");
-    }
-    const nextStep = this.blueprint.steps[prevStep + 1];
-    const onLastStep = prevStep === this.blueprint.steps.length - 2;
-    this.stepStart.emit(nextStep);
-    this.logger?.log({
-      type: "step-start",
-      invocationId,
-      step: nextStep
-    });
-    const ReportSchema = Schema9.Struct({
-      status: Schema9.Literal("done", "bailed", "skipped").annotations({
-        description: "The status of the task completion"
-      }),
-      comment: Schema9.String.annotations({
-        description: "A comment about the task completion. If you bailed, you must explain why in detail (min couple of sentences)."
-      })
-    });
-    const report = createTool4("system", {
-      name: "report",
-      description: "This tool reports that the agent has completed the task or is unable to do so.",
-      schema: ReportSchema,
-      execute: async (input) => ToolResult4.Break(input)
-    });
-    const session = new AISession({
-      operationModel: "configured"
-    });
-    session.userMessage.pipeInto(this.message);
-    session.message.pipeInto(this.message);
-    session.block.pipeInto(this.block);
-    const inputMessages = options.input ? [
-      Obj4.make(Message3, {
-        role: "user",
-        content: [
-          taggedDataBlock("input", options.input)
-        ]
-      })
-    ] : [];
-    inputMessages.forEach((message) => {
-      this.message.emit(message);
-      this.logger?.log({
-        type: "message",
-        invocationId,
-        message
-      });
-    });
-    const tools = nextStep.tools?.map((tool) => this.registry.get(tool)).filter(isNonNullable2) ?? [];
-    const messages = await session.run({
-      systemPrompt: SYSTEM_PROMPT,
-      history: [
-        ...state.history,
-        ...inputMessages
-      ],
-      tools: [
-        ...tools,
-        report
-      ],
-      artifacts: [],
-      client: options.aiClient,
-      prompt: nextStep.instructions
-    });
-    const { messages: trimmedHistory, call: lastBlock } = popLastToolCall(messages);
-    if (!lastBlock) {
-      throw new Error("Agent did not call the report tool");
-    }
-    const { status, comment } = ReportSchema.pipe(Schema9.decodeUnknownSync)(lastBlock.input);
-    return {
-      history: [
-        ...state.history,
-        ...inputMessages,
-        ...trimmedHistory
-      ],
-      trace: [
-        ...state.trace,
-        {
-          stepId: nextStep.id,
-          status,
-          comment
-        }
-      ],
-      state: Match.value(status).pipe(Match.withReturnType(), Match.when("done", () => onLastStep ? "done" : "working"), Match.when("skipped", () => onLastStep ? "done" : "working"), Match.when("bailed", () => "bail"), Match.exhaustive)
-    };
-  }
-};
-var taggedDataBlock = (tag, data) => {
-  return {
-    type: "text",
-    text: `<${tag}>
-${JSON.stringify(data, null, 2)}
-</${tag}>`
-  };
-};
-var popLastToolCall = (messages) => {
-  const lastBlock = messages.at(-1)?.content.at(-1);
-  if (lastBlock?.type !== "tool_use") {
-    return {
-      messages
-    };
-  }
-  const trimmedHistory = [
-    ...messages.slice(0, -1),
-    {
-      ...messages.at(-1),
-      content: [
-        ...messages.at(-1).content.slice(0, -1)
-      ]
-    }
-  ];
-  return {
-    messages: trimmedHistory,
-    call: lastBlock
-  };
-};
-
-// packages/core/assistant/src/blueprint/logger.ts
-import { signal } from "@preact/signals-core";
-import chalk from "chalk";
-import { ConsolePrinter as ConsolePrinter2 } from "@dxos/ai";
-import { combine } from "@dxos/async";
-import { log as log10 } from "@dxos/log";
-chalk.level = 2;
-var DEFAULT_LOGGER = {
-  log: log10.info
-};
-var BufferedLogger = class {
-  constructor() {
-    this._messages = signal([]);
-  }
-  get messages() {
-    return this._messages;
-  }
-  clear() {
-    this._messages.value = [];
-  }
-  log(message) {
-    this._messages.value = [
-      ...this._messages.value,
-      message
-    ];
-  }
-};
-var BlueprintLoggerAdapter = class {
-  constructor(logger = DEFAULT_LOGGER) {
-    this.logger = logger;
-  }
-  log(event) {
-    switch (event.type) {
-      case "begin":
-        this.logger.log("begin", {
-          invocationId: event.invocationId
-        });
-        break;
-      case "end":
-        this.logger.log("end", {
-          invocationId: event.invocationId
-        });
-        break;
-      case "step-start":
-        this.logger.log("step-start", {
-          invocationId: event.invocationId,
-          step: event.step
-        });
-        break;
-      case "step-complete":
-        this.logger.log("step-complete", {
-          invocationId: event.invocationId,
-          step: event.step
-        });
-        break;
-      case "message":
-        this.logger.log("message", {
-          invocationId: event.invocationId,
-          message: event.message
-        });
-        break;
-      case "block":
-        this.logger.log("block", {
-          invocationId: event.invocationId,
-          block: event.block
-        });
-        break;
-    }
-  }
-};
-var setLogger = (machine, logger) => {
-  return combine(machine.begin.on(() => {
-    logger.log("Starting...");
-  }), machine.stepStart.on((step) => {
-    const index = machine.blueprint.steps.indexOf(step);
-    logger.log(`Step ${index + 1} of ${machine.blueprint.steps.length}`);
-    logger.log(`Instructions: ${step.instructions}`);
-  }), machine.stepComplete.on((step) => {
-    const trace = machine.state.trace.find((t) => t.stepId === step.id);
-    logger.log(`Complete: ${trace?.comment}`);
-  }), machine.end.on(() => {
-    logger.log("OK");
-  }));
-};
-var setConsolePrinter = (machine, verbose = false) => {
-  const printer = new ConsolePrinter2();
-  return combine(machine.begin.on(() => printTrace(machine.blueprint, machine.state)), machine.stepStart.on((step) => console.log(`
-${chalk.magenta(`${chalk.bold(`STEP ${machine.blueprint.steps.indexOf(step) + 1} of ${machine.blueprint.steps.length}:`)} ${step.instructions}`)}
-`)), machine.stepComplete.on(() => printTrace(machine.blueprint, machine.state)), machine.end.on(() => console.log("DONE")), verbose ? [
-    machine.message.on((msg) => printer.printMessage(msg)),
-    machine.block.on((block) => printer.printContentBlock(block))
-  ] : []);
-};
-var BREAK_LINE = `
-${"_".repeat(80)}
-`;
-var printTrace = (blueprint, state) => {
-  console.group(chalk.bold("\nBlueprint"));
-  blueprint.steps.forEach((step) => {
-    const traceStep = state.trace.find((t) => t.stepId === step.id);
-    let color = chalk.gray;
-    let bullet = "\u25CB";
-    if (traceStep) {
-      switch (traceStep.status) {
-        case "done":
-          color = chalk.green;
-          bullet = "\u2713";
-          break;
-        case "skipped":
-          color = chalk.blue;
-          bullet = "\u2193";
-          break;
-        case "bailed":
-          color = chalk.red;
-          bullet = "\u2717";
-          break;
-      }
-    }
-    console.log(color(`
-${bullet} ${step.instructions}`));
-    if (traceStep?.comment) {
-      console.log(chalk.white(`  \u21B3 ${traceStep.comment}`));
-    }
-  });
-  console.groupEnd();
-  console.log(BREAK_LINE);
-};
 export {
   AIServiecOverloadedError,
   AISession,
+  Bindings,
   Blueprint,
-  BlueprintBuilder,
-  BlueprintDefinition,
-  BlueprintLoggerAdapter,
-  BlueprintMachine,
-  BlueprintParser,
-  BlueprintStep,
-  BufferedLogger,
+  BlueprintRegistry,
+  ContextBinder,
+  ContextBinding,
+  Conversation,
   ExtractionInput,
   ExtractionOutput,
   ReferencedQuotes,
@@ -2153,8 +2016,6 @@ export {
   insertReferences,
   processTranscriptMessage,
   researchFn,
-  sanitizeObjects,
-  setConsolePrinter,
-  setLogger
+  sanitizeObjects
 };
 //# sourceMappingURL=index.mjs.map