@dxos/assistant 0.8.4-main.5acf9ea → 0.8.4-main.67995b8

package/dist/lib/browser/index.mjs

@@ -1,3 +1,9 @@
+import {
+  AiSession,
+  ArtifactDiffResolver,
+  VersionPin
+} from "./chunk-SIXTNSGV.mjs";
+
 // src/context/binder.ts
 import { computed } from "@preact/signals-core";
 import { Array as Array2, pipe } from "effect";
@@ -95,272 +101,26 @@ var Bindings = class {
 };
 
 // src/conversation/conversation.ts
-import { Effect as Effect2 } from "effect";
-import { Event as Event2 } from "@dxos/async";
-import { Obj as Obj3 } from "@dxos/echo";
-import { DatabaseService as DatabaseService2 } from "@dxos/functions";
-import { DataType as DataType2 } from "@dxos/schema";
-
-// src/session/session.ts
-import { AiLanguageModel, AiToolkit } from "@effect/ai";
-import { Chunk, Context, Effect, Option, pipe as pipe2, Stream } from "effect";
-import { Array as Array3, String } from "effect";
-import { AiParser, AiPreprocessor, getToolCalls, runTool, ToolExecutionService, ToolResolverService } from "@dxos/ai";
+import { Effect } from "effect";
 import { Event } from "@dxos/async";
-import { todo } from "@dxos/debug";
 import { Obj as Obj2 } from "@dxos/echo";
-import { ObjectVersion } from "@dxos/echo-db";
 import { DatabaseService } from "@dxos/functions";
-import { log } from "@dxos/log";
 import { DataType } from "@dxos/schema";
-
-// src/errors.ts
-import { BaseError } from "@dxos/errors";
-var AiAssistantError = class extends BaseError.extend("AI_ASSISTANT_ERROR") {
-};
-
-// src/session/session.ts
-var __dxlog_file = "/__w/dxos/dxos/packages/core/assistant/src/session/session.ts";
-var AiSession = class {
-  constructor(_options = {}) {
-    this._options = _options;
-    this._semaphore = Effect.runSync(Effect.makeSemaphore(1));
-    this._pending = [];
-    this._history = [];
-    this.message = new Event();
-    this.block = new Event();
-    this.update = new Event();
-    this.streamEvent = new Event();
-    this.userMessage = new Event();
-    this.statusReport = new Event();
-    this.done = new Event();
-    this.run = (options) => Effect.gen(this, function* () {
-      this._history = [
-        ...options.history
-      ];
-      const promptMessages = yield* this._formatUserPrompt(options.prompt, options.history);
-      this._pending = [
-        promptMessages
-      ];
-      this.userMessage.emit(promptMessages);
-      do {
-        log("request", {
-          pending: this._pending.length,
-          history: this._history.length,
-          tools: Object.values(options.toolkit?.tools ?? {}).map((tool) => tool.name)
-        }, {
-          F: __dxlog_file,
-          L: 126,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        const prompt = yield* AiPreprocessor.preprocessAiInput([
-          ...this._history,
-          ...this._pending
-        ]);
-        const blueprints = options.blueprints ?? [];
-        const systemPrompt = yield* pipe2(blueprints, Effect.forEach((blueprint) => Effect.succeed(blueprint.instructions)), Effect.flatMap(Effect.forEach((template) => DatabaseService.loadRef(template.source))), Effect.map(Array3.map((template) => `
-
-<blueprint>${template.content}</blueprint>`)), Effect.map(Array3.reduce(options.systemPrompt ?? "", String.concat)));
-        const blueprintToolkit = yield* ToolResolverService.resolveToolkit(blueprints.flatMap((bp) => bp.tools));
-        const blueprintToolkitHandler = yield* blueprintToolkit.toContext(yield* ToolExecutionService.handlersFor(blueprintToolkit));
-        const toolkit = options.toolkit != null ? AiToolkit.merge(options.toolkit, blueprintToolkit) : blueprintToolkit;
-        const toolkitWithBlueprintHandlers = yield* toolkit.pipe(Effect.provide(blueprintToolkitHandler));
-        log.info("run", {
-          systemPrompt: [
-            systemPrompt.slice(0, 32),
-            "...",
-            systemPrompt.slice(-32),
-            systemPrompt.length
-          ].join(" "),
-          tools: Object.keys(blueprintToolkit.tools)
-        }, {
-          F: __dxlog_file,
-          L: 155,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        const blocks = yield* AiLanguageModel.streamText({
-          prompt,
-          system: systemPrompt,
-          toolkit: toolkitWithBlueprintHandlers,
-          disableToolCallResolution: true
-        }).pipe(AiParser.parseGptStream({
-          onBlock: (block) => Effect.gen(this, function* () {
-            if (block.pending) {
-              this.update.emit(block);
-            } else {
-              this.block.emit(block);
-            }
-          }),
-          onPart: (part) => Effect.gen(this, function* () {
-            this.streamEvent.emit(part);
-          })
-        }), Stream.runCollect, Effect.map(Chunk.toArray));
-        const response = Obj2.make(DataType.Message, {
-          created: (/* @__PURE__ */ new Date()).toISOString(),
-          sender: {
-            role: "assistant"
-          },
-          blocks
-        });
-        this._pending.push(response);
-        this.message.emit(response);
-        const toolCalls = getToolCalls(response);
-        if (toolCalls.length === 0) {
-          break;
-        }
-        const toolResults = yield* runTools(toolCalls, toolkitWithBlueprintHandlers);
-        this._pending.push(Obj2.make(DataType.Message, {
-          created: (/* @__PURE__ */ new Date()).toISOString(),
-          sender: {
-            role: "user"
-          },
-          blocks: toolResults
-        }));
-      } while (true);
-      return this._pending;
-    }).pipe(this._semaphore.withPermits(1), Effect.withSpan("AiSession.run"));
-    this._formatUserPrompt = (prompt, history) => Effect.gen(function* () {
-      const prelude = [];
-      const artifactDiffResolver = yield* Effect.serviceOption(ArtifactDiffResolver);
-      if (Option.isSome(artifactDiffResolver)) {
-        const versions = gatherObjectVersions(history);
-        const artifactDiff = yield* Effect.tryPromise({
-          try: () => artifactDiffResolver.value.resolve([
-            ...versions.entries()
-          ].map(([id, version]) => ({
-            id,
-            lastVersion: version
-          }))),
-          catch: AiAssistantError.wrap("Artifact diff resolution error")
-        });
-        log.info("vision", {
-          artifactDiff,
-          versions
-        }, {
-          F: __dxlog_file,
-          L: 240,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        for (const [id, { version }] of [
-          ...artifactDiff.entries()
-        ]) {
-          if (ObjectVersion.equals(version, versions.get(id))) {
-            artifactDiff.delete(id);
-            continue;
-          }
-          prelude.push({
-            _tag: "anchor",
-            objectId: id,
-            version
-          });
-        }
-        if (artifactDiff.size > 0) {
-          prelude.push(createArtifactUpdateBlock(artifactDiff));
-        }
-      }
-      return Obj2.make(DataType.Message, {
-        created: (/* @__PURE__ */ new Date()).toISOString(),
-        sender: {
-          role: "user"
-        },
-        blocks: [
-          ...prelude,
-          {
-            _tag: "text",
-            text: prompt
-          }
-        ]
-      });
-    });
-  }
-  async runStructured(schema, options) {
-    return todo();
-  }
-  abort() {
-    this._stream?.abort();
-  }
-};
-var gatherObjectVersions = (messages) => {
-  const artifactIds = /* @__PURE__ */ new Map();
-  for (const message of messages) {
-    for (const block of message.blocks) {
-      if (block._tag === "anchor") {
-        artifactIds.set(block.objectId, block.version);
-      }
-    }
-  }
-  return artifactIds;
-};
-var createArtifactUpdateBlock = (artifactDiff) => {
-  return {
-    _tag: "text",
-    // TODO(dmaretskyi): Does this need to be a special content-block?
-    disposition: "artifact-update",
-    text: `
-      The following artifacts have been updated since the last message:
-      ${[
-      ...artifactDiff.entries()
-    ].map(([id, { diff }]) => `<changed-artifact id="${id}">${diff ? `
-${diff}` : ""}</changed-artifact>`).join("\n")}
-    `
-  };
-};
-var ArtifactDiffResolver = class extends Context.Tag("@dxos/assistant/ArtifactDiffResolver")() {
-};
-var runTools = Effect.fn("runTools")(function* (toolCalls, toolkit) {
-  const toolkitWithHandlers = Effect.isEffect(toolkit) ? yield* toolkit : toolkit;
-  return yield* Effect.forEach(toolCalls, (toolCall) => runTool(toolkitWithHandlers, toolCall));
-});
-
-// src/session/version-pin.ts
-import { Schema as Schema2 } from "effect";
-import { getVersion } from "@dxos/echo-db";
-import { ObjectId } from "@dxos/echo-schema";
-var ObjectVersionSchema = Schema2.Unknown;
-var VersionPinSchema = Schema2.Struct({
-  // TODO(dmaretskyi): Use Ref when those support encoding.
-  objectId: ObjectId,
-  // TODO(dmaretskyi): Could be opaque
-  version: ObjectVersionSchema
-});
-var VersionPin = class extends VersionPinSchema {
-  static {
-    this.DISPOSITION = "version-pin";
-  }
-  static fromObject(object) {
-    return VersionPin.make({
-      objectId: object.id,
-      version: getVersion(object)
-    });
-  }
-  static createBlock(pin) {
-    return {
-      _tag: "json",
-      disposition: VersionPin.DISPOSITION,
-      data: JSON.stringify(pin)
-    };
-  }
-};
-
-// 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.run = (options) => Effect2.gen(this, function* () {
+    this.onBegin = new Event();
+    this.run = (options) => Effect.gen(this, function* () {
       const session = new AiSession();
       this.onBegin.emit(session);
-      const history = yield* Effect2.promise(() => this.getHistory());
-      const context = yield* Effect2.promise(() => this.context.query());
-      const blueprints = yield* Effect2.forEach(context.blueprints.values(), DatabaseService2.loadRef);
-      const contextObjects = yield* Effect2.forEach(context.objects.values(), DatabaseService2.loadRef);
-      const systemPrompt = (options.systemPrompt ?? "") + "\n\n" + contextObjects.map((obj) => `<object>${Obj3.getDXN(obj)}</object>`).join("\n");
+      const history = yield* Effect.promise(() => this.getHistory());
+      const context = yield* Effect.promise(() => this.context.query());
+      const blueprints = yield* Effect.forEach(context.blueprints.values(), DatabaseService.loadRef);
+      const contextObjects = yield* Effect.forEach(context.objects.values(), DatabaseService.loadRef);
+      const systemPrompt = (options.systemPrompt ?? "") + "\n\n" + contextObjects.map((obj) => `<object>${Obj2.getDXN(obj)}</object>`).join("\n");
       const messages = yield* session.run({
         prompt: options.prompt,
         history,
@@ -368,377 +128,49 @@ var Conversation = class {
         toolkit: options.toolkit,
         blueprints
       });
-      yield* Effect2.promise(() => this._queue.append(messages));
+      yield* Effect.promise(() => this._queue.append(messages));
       return messages;
-    }).pipe(Effect2.withSpan("Conversation.run"));
+    }).pipe(Effect.withSpan("Conversation.run"));
     this._queue = options.queue;
     this.context = new ContextBinder(this._queue);
   }
   async getHistory() {
     const queueItems = await this._queue.queryObjects();
-    return queueItems.filter(Obj3.instanceOf(DataType2.Message));
-  }
-};
-
-// src/extraction/extraction.ts
-import { Schema as Schema3 } from "effect";
-import { asyncTimeout } from "@dxos/async";
-import { Expando } from "@dxos/echo-schema";
-import { log as log2 } from "@dxos/log";
-import { DataType as DataType3 } from "@dxos/schema";
-var __dxlog_file2 = "/__w/dxos/dxos/packages/core/assistant/src/extraction/extraction.ts";
-var ExtractionInput = Schema3.Struct({
-  message: DataType3.Message,
-  objects: Schema3.optional(Schema3.Array(Expando)),
-  options: Schema3.optional(Schema3.Struct({
-    timeout: Schema3.optional(Schema3.Number),
-    fallbackToRaw: Schema3.optional(Schema3.Boolean)
-  }))
-});
-var ExtractionOutput = Schema3.Struct({
-  message: DataType3.Message,
-  timeElapsed: Schema3.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) {
-      log2.warn("failed to process message, falling back to raw text", {
-        error
-      }, {
-        F: __dxlog_file2,
-        L: 66,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-      return {
-        message: params.input.message,
-        timeElapsed: 0
-      };
-    } else {
-      throw error;
-    }
+    return queueItems.filter(Obj2.instanceOf(DataType.Message));
   }
 };
 
-// src/extraction/extraction-llm-function/extraction-llm-function.ts
-import { ToolRegistry, AiService } from "@dxos/ai";
-import { Obj as Obj4 } from "@dxos/echo";
-import { create } from "@dxos/echo-schema";
-import { defineFunction } from "@dxos/functions";
-import { DataType as DataType4 } 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 Schema4 } 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 = "/__w/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({
-    // TODO(burdon): Does this description make sense?
-    description: `
-      The references to the context objects that are mentioned in the transcript. 
-      Quote should match the original transcript text exactly, while id is the id of the context object.
-    `
-  })
-});
-var findQuotes = async (quotes, db) => {
-  const references = await Promise.all(quotes.map(async (quote) => {
-    const { objects } = await db.query(Query.select(Filter.text(quote, {
-      type: "vector"
-    }))).run();
-    log3.info("found quotes in vector index", {
-      objects,
-      quote
-    }, {
-      F: __dxlog_file3,
-      L: 35,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
-    return objects.length > 0 ? [
-      {
-        id: objects[0].id.toString(),
-        quote
-      }
-    ] : [];
-  }));
-  return {
-    references: references.flat()
-  };
-};
-var insertReferences = (text, quotes) => {
-  for (const quote of quotes.references) {
-    if (!ObjectId2.isValid(quote.id)) {
-      continue;
-    }
-    const regex = new RegExp(quote.quote.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), "gi");
-    text = text.replace(regex, `[${quote.quote}][${DXN.fromLocalObjectId(quote.id).toString()}]`);
-  }
-  return text;
-};
-
-// 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 session = new AiSession({
-      operationModel: "configured"
-    });
-    const result = await session.runStructured(ReferencedQuotes, {
-      generationOptions: {
-        model: "@anthropic/claude-3-5-haiku-20241022"
-      },
-      client: ai.client,
-      systemPrompt: instructions_default,
-      history: [
-        Obj4.make(DataType4.Message, {
-          created: (/* @__PURE__ */ new Date()).toISOString(),
-          sender: {
-            role: "user"
-          },
-          blocks: [
-            {
-              _tag: "text",
-              text: `<context>${JSON.stringify(objects)}</context>`
-            },
-            {
-              _tag: "text",
-              text: `<transcript>${JSON.stringify(message.blocks)}</transcript>`
-            }
-          ]
-        })
-      ],
-      artifacts: [],
-      prompt: "",
-      tools: [],
-      toolResolver: new ToolRegistry([])
-    });
-    return {
-      message: create(DataType4.Message, {
-        ...message,
-        blocks: message.blocks.map((block, i) => block._tag !== "transcript" ? block : {
-          ...block,
-          text: insertReferences(block.text, result)
-        })
-      }),
-      timeElapsed: performance.now() - startTime
-    };
-  }
-});
-
-// src/extraction/extraction-ner-function/extraction-ner-function.ts
-import { asyncTimeout as asyncTimeout2 } from "@dxos/async";
-import { create as create2 } from "@dxos/echo-schema";
-import { DatabaseService as DatabaseService3, defineFunction as defineFunction2 } from "@dxos/functions";
-import { invariant } from "@dxos/invariant";
-import { log as log5 } from "@dxos/log";
-import { DataType as DataType5 } from "@dxos/schema";
-
-// src/extraction/extraction-ner-function/named-entity-recognition.ts
-import { pipeline } from "@xenova/transformers";
-import { log as log4 } from "@dxos/log";
-var __dxlog_file4 = "/__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,
-        L: 23,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-      return ner;
-    });
-  }
-  return _ner;
-};
-var extractFullEntities = async (text) => {
-  const ner = await getNer();
-  const entities = await ner(text);
-  const tokenGroups = createTokenGroups(entities);
-  const combinedEntities = tokenGroups.map(combineNerTokens);
-  return combinedEntities;
-};
-var createTokenGroups = (tokens) => {
-  const tokenGroups = [];
-  const canBeCombined = (prevToken, currentToken) => {
-    const [currentState, currentEntity] = currentToken.entity.split("-");
-    const [prevState, prevEntity] = prevToken.entity.split("-");
-    if (prevEntity !== currentEntity) {
-      return false;
-    }
-    if (prevState === "O") {
-      return false;
-    }
-    if (currentState === "I") {
-      return true;
-    }
-    if ((prevState === "B" || prevState === "I") && currentState === "B") {
-      return currentToken.word.startsWith("#");
-    }
-    return false;
-  };
-  for (const token of tokens) {
-    if (tokenGroups.length === 0) {
-      tokenGroups.push([
-        token
-      ]);
-      continue;
-    }
-    const lastTokenGroup = tokenGroups.at(-1);
-    if (canBeCombined(lastTokenGroup.at(-1), token)) {
-      lastTokenGroup.push(token);
-      continue;
-    }
-    tokenGroups.push([
-      token
-    ]);
-  }
-  return tokenGroups;
-};
-var combineNerTokens = (group) => {
-  const combinedToken = {
-    entity: group.at(0).entity.split("-")[1],
-    score: group.reduce((acc, token) => acc + token.score, 0) / group.length,
-    index: group.at(0).index,
-    word: group.at(0).word,
-    start: group.at(0).start,
-    end: group.at(-1).end
-  };
-  for (const token of group.slice(1)) {
-    if (token.word.startsWith("#")) {
-      combinedToken.word += token.word.replace(/^#+/, "");
-    } else {
-      combinedToken.word += " " + token.word;
-    }
-  }
-  return combinedToken;
-};
-
-// src/extraction/extraction-ner-function/extraction-ner-function.ts
-var __dxlog_file5 = "/__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", {
-      message,
-      options
-    }, {
-      F: __dxlog_file5,
-      L: 25,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
-    const startTime = performance.now();
-    const { db } = context.getService(DatabaseService3);
-    const entitiesPromise = Promise.all(message.blocks.map(async (block) => {
-      invariant(block._tag === "transcript" || block._tag === "text", "Block must have text", {
-        F: __dxlog_file5,
-        L: 31,
-        S: void 0,
-        A: [
-          "block._tag === 'transcript' || block._tag === 'text'",
-          "'Block must have text'"
-        ]
-      });
-      return extractFullEntities(block.text);
-    })).then((entities2) => entities2.flat());
-    const entities = options?.timeout ? await asyncTimeout2(entitiesPromise, options.timeout) : await entitiesPromise;
-    log5.info("entities", {
-      entities
-    }, {
-      F: __dxlog_file5,
-      L: 36,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
-    const quoteReferences = await findQuotes(entities.map((entity) => entity.word), db);
-    const blocksWithReferences = message.blocks.map((block, i) => {
-      invariant(block._tag === "transcript" || block._tag === "text", "Block must have text", {
-        F: __dxlog_file5,
-        L: 42,
-        S: void 0,
-        A: [
-          "block._tag === 'transcript' || block._tag === 'text'",
-          "'Block must have text'"
-        ]
-      });
-      return {
-        ...block,
-        text: insertReferences(block._tag, quoteReferences)
-      };
-    });
-    const messageWithReferences = create2(DataType5.Message, {
-      ...message,
-      blocks: blocksWithReferences
-    });
-    log5.info("output", {
-      messageWithReferences
-    }, {
-      F: __dxlog_file5,
-      L: 50,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
-    return {
-      message: messageWithReferences,
-      timeElapsed: performance.now() - startTime
-    };
-  }
-});
-
 // src/functions/services.ts
 import { AiTool } from "@effect/ai";
-import { Context as Context2, Effect as Effect3, Layer, Match, Predicate, Record, Schema as Schema5 } from "effect";
-import { AiToolNotFoundError, ToolExecutionService as ToolExecutionService2, ToolResolverService as ToolResolverService2 } from "@dxos/ai";
+import { Context, Effect as Effect2, Layer, Match, Predicate, Record, Schema as Schema2 } from "effect";
+import { AiToolNotFoundError, ToolExecutionService, ToolResolverService } from "@dxos/ai";
 import { LocalFunctionExecutionService } from "@dxos/functions";
-import { invariant as invariant2 } from "@dxos/invariant";
-var __dxlog_file6 = "/__w/dxos/dxos/packages/core/assistant/src/functions/services.ts";
+import { invariant } from "@dxos/invariant";
+var __dxlog_file = "/__w/dxos/dxos/packages/core/assistant/src/functions/services.ts";
 var makeToolResolverFromFunctions = (functions) => {
-  return Layer.succeed(ToolResolverService2, {
-    resolve: Effect3.fn("resolveTool")(function* (id) {
+  return Layer.succeed(ToolResolverService, {
+    resolve: Effect2.fn("resolveTool")(function* (id) {
       const fn = functions.find((f) => f.name === id);
       if (!fn) {
-        return yield* Effect3.fail(new AiToolNotFoundError(id));
+        return yield* Effect2.fail(new AiToolNotFoundError(id));
       }
       return projectFunctionToTool(fn);
     })
   });
 };
 var makeToolExecutionServiceFromFunctions = (functions) => {
-  return Layer.effect(ToolExecutionService2, Effect3.gen(function* () {
+  return Layer.effect(ToolExecutionService, Effect2.gen(function* () {
     const localFunctionExecutionService = yield* LocalFunctionExecutionService;
     return {
       handlersFor: (toolkit) => {
         const makeHandler = (tool) => {
-          return Effect3.fn("toolFunctionHandler")(function* (input) {
-            const { functionName } = Context2.get(FunctionToolAnnotation)(tool.annotations);
+          return Effect2.fn("toolFunctionHandler")(function* (input) {
+            const { functionName } = Context.get(FunctionToolAnnotation)(tool.annotations);
             const fnDef = functions.find((f) => f.name === functionName);
             if (!fnDef) {
-              return yield* Effect3.fail(new AiToolNotFoundError(tool.name));
+              return yield* Effect2.fail(new AiToolNotFoundError(tool.name));
             }
-            return yield* localFunctionExecutionService.invokeFunction(fnDef, input).pipe(Effect3.catchAllDefect((defect) => Effect3.fail(defect)));
+            return yield* localFunctionExecutionService.invokeFunction(fnDef, input).pipe(Effect2.catchAllDefect((defect) => Effect2.fail(defect)));
           });
         };
         return toolkit.of(Record.map(toolkit.tools, (tool, name) => makeHandler(tool)));
@@ -746,7 +178,7 @@ var makeToolExecutionServiceFromFunctions = (functions) => {
     };
   }));
 };
-var FunctionToolAnnotation = class extends Context2.Tag("@dxos/assisatnt/FunctionToolAnnotation")() {
+var FunctionToolAnnotation = class extends Context.Tag("@dxos/assisatnt/FunctionToolAnnotation")() {
 };
 var toolCache = /* @__PURE__ */ new WeakMap();
 var projectFunctionToTool = (fn) => {
@@ -757,7 +189,7 @@ var projectFunctionToTool = (fn) => {
     description: fn.description,
     parameters: createStructFieldsFromSchema(fn.inputSchema),
     // TODO(dmaretskyi): Include output schema.
-    failure: Schema5.Any
+    failure: Schema2.Any
   }).annotate(FunctionToolAnnotation, {
     functionName: fn.name
   });
@@ -766,8 +198,8 @@ var projectFunctionToTool = (fn) => {
 };
 var makeToolName = (name) => {
   const toolName = name.replace(/[^a-zA-Z0-9]/g, "");
-  invariant2(toolName.match(/^[a-zA-Z_][a-zA-Z0-9-_]*$/), void 0, {
-    F: __dxlog_file6,
+  invariant(toolName.match(/^[a-zA-Z_][a-zA-Z0-9-_]*$/), void 0, {
+    F: __dxlog_file,
     L: 87,
     S: void 0,
     A: [
@@ -781,17 +213,17 @@ var createStructFieldsFromSchema = (schema) => {
   return Match.value(schema.ast).pipe(Match.when(Predicate.isTagged("TypeLiteral"), (ast) => {
     return Object.fromEntries(ast.propertySignatures.map((prop) => [
       prop.name,
-      Schema5.make(prop.type)
+      Schema2.make(prop.type)
     ]));
   }), Match.orElseAbsurd);
 };
 
 // src/research/exa.ts
-import { AiTool as AiTool2, AiToolkit as AiToolkit2 } from "@effect/ai";
-import { Effect as Effect4, Schema as Schema6 } from "effect";
+import { AiTool as AiTool2, AiToolkit } from "@effect/ai";
+import { Effect as Effect3, Schema as Schema3 } from "effect";
 import Exa from "exa-js";
 import { CredentialsService } from "@dxos/functions";
-import { log as log6 } from "@dxos/log";
+import { log } from "@dxos/log";
 
 // src/testing/exa-search-1748337321991.ts
 var exa_search_1748337321991_default = {
@@ -1303,36 +735,36 @@ var SEARCH_RESULTS = [
 ];
 
 // src/research/exa.ts
-var __dxlog_file7 = "/__w/dxos/dxos/packages/core/assistant/src/research/exa.ts";
-var ExaToolkit = class extends AiToolkit2.make(AiTool2.make("exa_search", {
+var __dxlog_file2 = "/__w/dxos/dxos/packages/core/assistant/src/research/exa.ts";
+var ExaToolkit = class extends AiToolkit.make(AiTool2.make("exa_search", {
   description: "Search the web for information",
   parameters: {
-    query: Schema6.String.annotations({
+    query: Schema3.String.annotations({
       description: "The query to search for"
     })
   },
-  success: Schema6.Unknown,
-  failure: Schema6.Never
+  success: Schema3.Unknown,
+  failure: Schema3.Never
 }).addRequirement()) {
 };
 var LiveExaHandler = ExaToolkit.toLayer({
-  exa_search: Effect4.fn(function* ({ query }) {
+  exa_search: Effect3.fn(function* ({ query }) {
     const credential = yield* CredentialsService.getCredential({
       service: "exa.ai"
     });
     const exa = new Exa(credential.apiKey);
-    const context = yield* Effect4.promise(async () => exa.searchAndContents(query, {
+    const context = yield* Effect3.promise(async () => exa.searchAndContents(query, {
       type: "auto",
       text: {
         maxCharacters: 3e3
       },
       livecrawl: "always"
     }));
-    log6.info("exa search", {
+    log.info("exa search", {
       query,
       costDollars: context.costDollars
     }, {
-      F: __dxlog_file7,
+      F: __dxlog_file2,
       L: 40,
       S: this,
       C: (f, a) => f(...a)
@@ -1341,7 +773,7 @@ var LiveExaHandler = ExaToolkit.toLayer({
   })
 });
 var MockExaHandler = ExaToolkit.toLayer({
-  exa_search: Effect4.fn(function* ({ query }) {
+  exa_search: Effect3.fn(function* ({ query }) {
     const result = SEARCH_RESULTS.reduce((closest, current) => {
       if (!current.autopromptString) {
         return closest;
@@ -1377,28 +809,28 @@ var levenshteinDistance = (str1, str2) => {
 };
 
 // src/research/research.ts
-import { AiToolkit as AiToolkit4 } from "@effect/ai";
-import { Effect as Effect6, Layer as Layer2, Schema as Schema8 } from "effect";
-import { AiService as AiService2, ConsolePrinter } from "@dxos/ai";
-import { defineFunction as defineFunction3, TracingService } from "@dxos/functions";
-import { log as log8 } from "@dxos/log";
+import { AiToolkit as AiToolkit3 } from "@effect/ai";
+import { Effect as Effect5, Layer as Layer2, Schema as Schema5 } from "effect";
+import { AiService, ConsolePrinter } from "@dxos/ai";
+import { defineFunction, TracingService } from "@dxos/functions";
+import { log as log3 } from "@dxos/log";
 import { DataTypes } from "@dxos/schema";
 
 // src/research/graph.ts
-import { AiTool as AiTool3, AiToolkit as AiToolkit3 } from "@effect/ai";
-import { Context as Context3, Effect as Effect5, identity, Option as Option2, Schema as Schema7, SchemaAST } from "effect";
-import { Filter as Filter2, Query as Query2 } from "@dxos/echo";
+import { AiTool as AiTool3, AiToolkit as AiToolkit2 } from "@effect/ai";
+import { Context as Context2, Effect as Effect4, identity, Option, Schema as Schema4, SchemaAST } from "effect";
+import { Filter, Query } from "@dxos/echo";
 import { isEncodedReference } from "@dxos/echo-protocol";
-import { create as create3, EntityKind, getEntityKind, getSchemaDXN, getSchemaTypename, getTypeAnnotation, getTypeIdentifierAnnotation, ObjectId as ObjectId3, ReferenceAnnotationId, RelationSourceDXNId, RelationSourceId, RelationTargetDXNId, RelationTargetId } from "@dxos/echo-schema";
+import { create, EntityKind, getEntityKind, getSchemaDXN, getSchemaTypename, getTypeAnnotation, getTypeIdentifierAnnotation, ObjectId, ReferenceAnnotationId, RelationSourceDXNId, RelationSourceId, RelationTargetDXNId, RelationTargetId } from "@dxos/echo-schema";
 import { mapAst } from "@dxos/effect";
-import { ContextQueueService, DatabaseService as DatabaseService4 } from "@dxos/functions";
-import { DXN as DXN2 } from "@dxos/keys";
-import { log as log7 } from "@dxos/log";
+import { ContextQueueService, DatabaseService as DatabaseService2 } from "@dxos/functions";
+import { DXN } from "@dxos/keys";
+import { log as log2 } from "@dxos/log";
 import { deepMapValues, isNonNullable } from "@dxos/util";
-var __dxlog_file8 = "/__w/dxos/dxos/packages/core/assistant/src/research/graph.ts";
-var Subgraph = Schema7.Struct({
+var __dxlog_file3 = "/__w/dxos/dxos/packages/core/assistant/src/research/graph.ts";
+var Subgraph = Schema4.Struct({
   /** Objects and relations. */
-  objects: Schema7.Array(Schema7.Any)
+  objects: Schema4.Array(Schema4.Any)
 });
 var findRelatedSchema = async (db, anchor) => {
   const allSchemas = [
@@ -1408,7 +840,7 @@ var findRelatedSchema = async (db, anchor) => {
     if (getTypeAnnotation(schema)?.kind !== EntityKind.Relation) {
       return false;
     }
-    return isSchemaAddressableByDxn(anchor, DXN2.parse(getTypeAnnotation(schema).sourceSchema)) || isSchemaAddressableByDxn(anchor, DXN2.parse(getTypeAnnotation(schema).targetSchema));
+    return isSchemaAddressableByDxn(anchor, DXN.parse(getTypeAnnotation(schema).sourceSchema)) || isSchemaAddressableByDxn(anchor, DXN.parse(getTypeAnnotation(schema).targetSchema));
   }).map((schema) => ({
     schema,
     kind: "relation"
@@ -1424,28 +856,28 @@ var isSchemaAddressableByDxn = (schema, dxn) => {
   }
   return false;
 };
-var LocalSearchToolkit = class extends AiToolkit3.make(AiTool3.make("search_local_search", {
+var LocalSearchToolkit = class extends AiToolkit2.make(AiTool3.make("search_local_search", {
   description: "Search the local database for information using a vector index",
   parameters: {
-    query: Schema7.String.annotations({
+    query: Schema4.String.annotations({
       description: "The query to search for. Could be a question or a topic or a set of keywords."
     })
   },
-  success: Schema7.Unknown,
-  failure: Schema7.Never
+  success: Schema4.Unknown,
+  failure: Schema4.Never
 }).addRequirement()) {
 };
 var LocalSearchHandler = LocalSearchToolkit.toLayer({
-  search_local_search: Effect5.fn(function* ({ query }) {
-    const { objects } = yield* DatabaseService4.runQuery(Query2.select(Filter2.text(query, {
+  search_local_search: Effect4.fn(function* ({ query }) {
+    const { objects } = yield* DatabaseService2.runQuery(Query.select(Filter.text(query, {
       type: "vector"
     })));
     const results = [
       ...objects
     ];
-    const contextQueue = yield* Effect5.serviceOption(ContextQueueService);
-    if (Option2.isSome(contextQueue)) {
-      const queueObjects = yield* Effect5.promise(() => contextQueue.value.contextQueue.queryObjects());
+    const contextQueue = yield* Effect4.serviceOption(ContextQueueService);
+    if (Option.isSome(contextQueue)) {
+      const queueObjects = yield* Effect4.promise(() => contextQueue.value.contextQueue.queryObjects());
       results.push(...queueObjects);
     }
     return `
@@ -1455,35 +887,35 @@ var LocalSearchHandler = LocalSearchToolkit.toLayer({
       `;
   })
 });
-var GraphWriterSchema = class extends Context3.Tag("@dxos/assistant/GraphWriterSchema")() {
+var GraphWriterSchema = class extends Context2.Tag("@dxos/assistant/GraphWriterSchema")() {
 };
 var makeGraphWriterToolkit = ({ schema }) => {
-  return AiToolkit3.make(AiTool3.make("graph_writer", {
+  return AiToolkit2.make(AiTool3.make("graph_writer", {
     description: "Write to the local graph database",
     parameters: createExtractionSchema(schema).fields,
-    success: Schema7.Unknown,
-    failure: Schema7.Never
-  }).addRequirement().annotateContext(Context3.make(GraphWriterSchema, {
+    success: Schema4.Unknown,
+    failure: Schema4.Never
+  }).addRequirement().annotateContext(Context2.make(GraphWriterSchema, {
     schema
   })));
 };
 var makeGraphWriterHandler = (toolkit) => {
-  const { schema } = Context3.get(toolkit.tools.graph_writer.annotations, GraphWriterSchema);
+  const { schema } = Context2.get(toolkit.tools.graph_writer.annotations, GraphWriterSchema);
   return toolkit.toLayer({
-    graph_writer: Effect5.fn(function* (input) {
-      const { db } = yield* DatabaseService4;
-      const contextQueue = yield* Effect5.serviceOption(ContextQueueService);
-      const data = yield* Effect5.promise(() => sanitizeObjects(schema, input, db, contextQueue.pipe(Option2.getOrUndefined)?.contextQueue));
+    graph_writer: Effect4.fn(function* (input) {
+      const { db } = yield* DatabaseService2;
+      const contextQueue = yield* Effect4.serviceOption(ContextQueueService);
+      const data = yield* Effect4.promise(() => sanitizeObjects(schema, input, db, contextQueue.pipe(Option.getOrUndefined)?.contextQueue));
       return data;
     })
   });
 };
 var createExtractionSchema = (types) => {
-  return Schema7.Struct({
+  return Schema4.Struct({
     ...Object.fromEntries(types.map(preprocessSchema).map((schema, index) => [
       `objects_${getSanitizedSchemaName(types[index])}`,
-      Schema7.optional(Schema7.Array(schema)).annotations({
-        description: `The objects of type: ${getSchemaDXN(types[index])?.asTypeDXN().type}. ${SchemaAST.getDescriptionAnnotation(types[index].ast).pipe(Option2.getOrElse(() => ""))}`
+      Schema4.optional(Schema4.Array(schema)).annotations({
+        description: `The objects of type: ${getSchemaDXN(types[index])?.asTypeDXN().type}. ${SchemaAST.getDescriptionAnnotation(types[index].ast).pipe(Option.getOrElse(() => ""))}`
       })
     ]))
   });
@@ -1500,21 +932,21 @@ var sanitizeObjects = async (types, data, db, queue) => {
   const existingIds = /* @__PURE__ */ new Set();
   const enitties = /* @__PURE__ */ new Map();
   const resolveId = (id) => {
-    if (ObjectId3.isValid(id)) {
+    if (ObjectId.isValid(id)) {
       existingIds.add(id);
-      return DXN2.fromLocalObjectId(id);
+      return DXN.fromLocalObjectId(id);
     }
     const mappedId = idMap.get(id);
     if (mappedId) {
-      return DXN2.fromLocalObjectId(mappedId);
+      return DXN.fromLocalObjectId(mappedId);
     }
     return void 0;
   };
   const res = entries.map((entry) => {
-    if (ObjectId3.isValid(entry.data.id)) {
+    if (ObjectId.isValid(entry.data.id)) {
       return entry;
     }
-    idMap.set(entry.data.id, ObjectId3.random());
+    idMap.set(entry.data.id, ObjectId.random());
     entry.data.id = idMap.get(entry.data.id);
     return entry;
   }).map((entry) => {
@@ -1537,10 +969,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", {
+        log2.warn("source not found", {
           source: data2.source
         }, {
-          F: __dxlog_file8,
+          F: __dxlog_file3,
           L: 262,
           S: void 0,
           C: (f, a) => f(...a)
@@ -1548,10 +980,10 @@ var sanitizeObjects = async (types, data, db, queue) => {
       }
       const targetDxn = resolveId(data2.target);
       if (!targetDxn) {
-        log7.warn("target not found", {
+        log2.warn("target not found", {
           target: data2.target
         }, {
-          F: __dxlog_file8,
+          F: __dxlog_file3,
           L: 266,
           S: void 0,
           C: (f, a) => f(...a)
@@ -1567,7 +999,7 @@ var sanitizeObjects = async (types, data, db, queue) => {
       schema: entry.schema
     };
   }).filter((object) => !existingIds.has(object.data.id));
-  const { objects: dbObjects } = await db.query(Query2.select(Filter2.ids(...existingIds))).run();
+  const { objects: dbObjects } = await db.query(Query.select(Filter.ids(...existingIds))).run();
   const queueObjects = await queue?.getObjectsById([
     ...existingIds
   ]) ?? [];
@@ -1575,12 +1007,12 @@ var sanitizeObjects = async (types, data, db, queue) => {
     ...dbObjects,
     ...queueObjects
   ].filter(isNonNullable);
-  log7.info("objects", {
+  log2.info("objects", {
     dbObjects,
     queueObjects,
     existingIds
   }, {
-    F: __dxlog_file8,
+    F: __dxlog_file3,
     L: 287,
     S: void 0,
     C: (f, a) => f(...a)
@@ -1612,7 +1044,7 @@ var sanitizeObjects = async (types, data, db, queue) => {
       }
     }
     if (!skip) {
-      const obj = create3(schema, data2);
+      const obj = create(schema, data2);
       enitties.set(obj.id, obj);
       return [
         obj
@@ -1621,8 +1053,8 @@ var sanitizeObjects = async (types, data, db, queue) => {
     return [];
   });
 };
-var SoftRef = Schema7.Struct({
-  "/": Schema7.String
+var SoftRef = Schema4.Struct({
+  "/": Schema4.String
 }).annotations({
   description: "Reference to another object."
 });
@@ -1633,20 +1065,20 @@ var preprocessSchema = (schema) => {
       return ast;
     }
     visited.add(ast);
-    if (SchemaAST.getAnnotation(ast, ReferenceAnnotationId).pipe(Option2.isSome)) {
+    if (SchemaAST.getAnnotation(ast, ReferenceAnnotationId).pipe(Option.isSome)) {
       return SoftRef.ast;
     }
     return mapAst(ast, (child) => go(child, visited));
   };
-  return Schema7.make(mapAst(schema.ast, (ast) => go(ast))).pipe(Schema7.omit("id"), Schema7.extend(Schema7.Struct({
-    id: Schema7.String.annotations({
+  return Schema4.make(mapAst(schema.ast, (ast) => go(ast))).pipe(Schema4.omit("id"), Schema4.extend(Schema4.Struct({
+    id: Schema4.String.annotations({
       description: "The id of this object. Come up with a unique id based on your judgement."
     })
-  })), isRelationSchema ? Schema7.extend(Schema7.Struct({
-    source: Schema7.String.annotations({
+  })), isRelationSchema ? Schema4.extend(Schema4.Struct({
+    source: Schema4.String.annotations({
       description: "The id of the source object for this relation."
     }),
-    target: Schema7.String.annotations({
+    target: Schema4.String.annotations({
       description: "The id of the target object for this relation."
     })
   })) : identity);
@@ -1656,39 +1088,39 @@ var preprocessSchema = (schema) => {
 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- The Research Agent ALWAYS calls the `graph_writer` at the end to save the data. This conversation will be delted, so only the data written to the graph will be preserved.\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>";
 
 // src/research/research.ts
-var __dxlog_file9 = "/__w/dxos/dxos/packages/core/assistant/src/research/research.ts";
-var researchFn = defineFunction3({
+var __dxlog_file4 = "/__w/dxos/dxos/packages/core/assistant/src/research/research.ts";
+var researchFn = defineFunction({
   description: "Research the web for information",
-  inputSchema: Schema8.Struct({
-    query: Schema8.String.annotations({
+  inputSchema: Schema5.Struct({
+    query: Schema5.String.annotations({
       description: "The query to search for."
     }),
     // TOOD(burdon): Move to context.
-    mockSearch: Schema8.optional(Schema8.Boolean).annotations({
+    mockSearch: Schema5.optional(Schema5.Boolean).annotations({
       description: "Whether to use the mock search tool.",
       default: false
     })
   }),
-  outputSchema: Schema8.Struct({
-    result: Schema8.Unknown
+  outputSchema: Schema5.Struct({
+    result: Schema5.Unknown
   }),
-  handler: Effect6.fnUntraced(function* ({ data: { query, mockSearch } }) {
+  handler: Effect5.fnUntraced(function* ({ data: { query, mockSearch } }) {
     yield* TracingService.emitStatus({
       message: "Researching..."
     });
     const graphWriteToolkit = makeGraphWriterToolkit({
       schema: DataTypes
     });
-    const toolkit = yield* AiToolkit4.merge(ExaToolkit, LocalSearchToolkit, graphWriteToolkit).pipe(Effect6.provide(Layer2.mergeAll(mockSearch ? MockExaHandler : LiveExaHandler, LocalSearchHandler, makeGraphWriterHandler(graphWriteToolkit))));
+    const toolkit = yield* AiToolkit3.merge(ExaToolkit, LocalSearchToolkit, graphWriteToolkit).pipe(Effect5.provide(Layer2.mergeAll(mockSearch ? MockExaHandler : LiveExaHandler, LocalSearchHandler, makeGraphWriterHandler(graphWriteToolkit))));
     const printer = new ConsolePrinter();
     const session = new AiSession();
     session.message.on((message) => printer.printMessage(message));
     session.userMessage.on((message) => printer.printMessage(message));
     session.block.on((block) => printer.printContentBlock(block));
-    session.streamEvent.on((event) => log8("stream", {
+    session.streamEvent.on((event) => log3("stream", {
       event
     }, {
-      F: __dxlog_file9,
+      F: __dxlog_file4,
       L: 62,
       S: this,
       C: (f, a) => f(...a)
@@ -1702,7 +1134,7 @@ var researchFn = defineFunction3({
     return {
       result
     };
-  }, Effect6.provide(AiService2.model("@anthropic/claude-3-5-sonnet-20241022")))
+  }, Effect5.provide(AiService.model("@anthropic/claude-3-5-sonnet-20241022")))
 });
 
 // src/templates/prompt.ts
@@ -1717,10 +1149,10 @@ var createSystemPrompt = (options) => {
 };
 
 // src/types.ts
-import { Schema as Schema9 } from "effect";
-import { DXN as DXN3, LOCAL_SPACE_TAG } from "@dxos/keys";
+import { Schema as Schema6 } from "effect";
+import { DXN as DXN2, LOCAL_SPACE_TAG } from "@dxos/keys";
 var createArtifactElement = (id) => `<artifact id=${id} />`;
-var ArtifactId = class extends Schema9.String.annotations({
+var ArtifactId = class extends Schema6.String.annotations({
   description: `
   The ID of the referenced object. Formats accepted:
   - DXN (dxn:echo:@:XXXXX). DXNs can be prepended with an @ symbol for compatibility with in-text references.
@@ -1736,17 +1168,17 @@ var ArtifactId = class extends Schema9.String.annotations({
 }) {
   static toDXN(reference, owningSpaceId) {
     if (reference.startsWith("@dxn:")) {
-      return DXN3.parse(reference.slice(1));
+      return DXN2.parse(reference.slice(1));
     } else if (reference.startsWith("dxn:")) {
-      return DXN3.parse(reference);
+      return DXN2.parse(reference);
     } else if (/^[A-Z0-9]+:[A-Z0-9]+$/.test(reference)) {
       const [spaceId, objectId] = reference.split(":");
-      return new DXN3(DXN3.kind.ECHO, [
+      return new DXN2(DXN2.kind.ECHO, [
         spaceId === owningSpaceId ? LOCAL_SPACE_TAG : spaceId,
         objectId
       ]);
     } else if (/^[A-Z0-9]+$/.test(reference)) {
-      return DXN3.fromLocalObjectId(reference);
+      return DXN2.fromLocalObjectId(reference);
     } else {
       throw new Error(`Unable to parse object reference: ${reference}`);
     }
@@ -1761,33 +1193,21 @@ export {
   ContextBinding,
   Conversation,
   ExaToolkit,
-  ExtractionInput,
-  ExtractionOutput,
   LiveExaHandler,
   LocalSearchHandler,
   LocalSearchToolkit,
   MockExaHandler,
-  ReferencedQuotes,
   Subgraph,
   VersionPin,
-  combineNerTokens,
   createArtifactElement,
   createExtractionSchema,
   createSystemPrompt,
-  createTokenGroups,
-  extractFullEntities,
-  extractionAnthropicFn,
-  extractionNerFn,
-  findQuotes,
   findRelatedSchema,
-  getNer,
   getSanitizedSchemaName,
-  insertReferences,
   makeGraphWriterHandler,
   makeGraphWriterToolkit,
   makeToolExecutionServiceFromFunctions,
   makeToolResolverFromFunctions,
-  processTranscriptMessage,
   researchFn,
   sanitizeObjects
 };