@dxos/assistant 0.8.4-main.69d29f4 → 0.8.4-main.6fa680abb7

package/dist/lib/{node-esm → neutral}/index.mjs

@@ -1,44 +1,37 @@
-import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
 import {
-  AiAssistantError,
-  AiModelError,
-  AiSession,
-  ArtifactDiffResolver,
   ArtifactId,
-  GenerationObserver,
-  GenericToolkit_exports,
   RefFromLLM,
-  VersionPin,
+  ToolExecutionServices,
   createArtifactElement,
-  createToolkit,
   makeToolExecutionServiceFromFunctions,
   makeToolResolverFromFunctions
-} from "./chunk-CC7ER6Q3.mjs";
-import "./chunk-HSLMI22Q.mjs";
+} from "./chunk-BE6SRJ4N.mjs";
 
 // src/conversation/context.ts
 import { Atom, Registry } from "@effect-atom/atom-react";
 import * as EArray from "effect/Array";
 import * as Context from "effect/Context";
+import * as Effect from "effect/Effect";
 import * as Function from "effect/Function";
 import * as Schema from "effect/Schema";
 import { Blueprint } from "@dxos/blueprints";
 import { Resource } from "@dxos/context";
-import { DXN, Obj, Query, Type } from "@dxos/echo";
+import { DXN, Obj, Query, Ref, Type } from "@dxos/echo";
+import { assertArgument } from "@dxos/invariant";
 import { log } from "@dxos/log";
 import { ComplexSet, isTruthy } from "@dxos/util";
 var __dxlog_file = "/__w/dxos/dxos/packages/core/assistant/src/conversation/context.ts";
 var ContextBinding = Schema.Struct({
   blueprints: Schema.Struct({
-    added: Schema.Array(Type.Ref(Blueprint.Blueprint)),
-    removed: Schema.Array(Type.Ref(Blueprint.Blueprint))
+    added: Schema.Array(Ref.Ref(Blueprint.Blueprint)),
+    removed: Schema.Array(Ref.Ref(Blueprint.Blueprint))
   }),
   objects: Schema.Struct({
-    added: Schema.Array(Type.Ref(Type.Obj)),
-    removed: Schema.Array(Type.Ref(Type.Obj))
+    added: Schema.Array(Ref.Ref(Obj.Unknown)),
+    removed: Schema.Array(Ref.Ref(Obj.Unknown))
   })
 }).pipe(Type.object({
-  typename: "dxos.org/type/ContextBinding",
+  typename: "org.dxos.type.context-binding",
   version: "0.1.0"
 }));
 var Bindings = class {
@@ -59,6 +52,7 @@ var AiContextBinder = class extends Resource {
   _queue;
   constructor(options) {
     super();
+    assertArgument(options.queue, "options.queue", "Queue is required");
     this._queue = options.queue;
     this._registry = options.registry ?? Registry.make();
   }
@@ -122,7 +116,7 @@ var AiContextBinder = class extends Resource {
       objects: newObjects.length
     }, {
       F: __dxlog_file,
-      L: 156,
+      L: 159,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -146,7 +140,7 @@ var AiContextBinder = class extends Resource {
       objects: addedObjects.length
     }, {
       F: __dxlog_file,
-      L: 182,
+      L: 185,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -172,7 +166,7 @@ var AiContextBinder = class extends Resource {
       objects: objects?.length
     }, {
       F: __dxlog_file,
-      L: 202,
+      L: 205,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -247,7 +241,7 @@ var AiContextBinder = class extends Resource {
     const refArray = [
       ...refs
     ];
-    await Promise.all(refArray.map((ref) => ref.load()));
+    await Promise.all(refArray.map((ref) => ref.tryLoad()));
     return refArray.map((ref) => {
       let target;
       if (ref.isAvailable) {
@@ -257,17 +251,421 @@ var AiContextBinder = class extends Resource {
     }).filter(isTruthy);
   }
 };
-var AiContextService = class extends Context.Tag("@dxos/assistant/AiContextService")() {
+var AiContextService = class _AiContextService extends Context.Tag("@dxos/assistant/AiContextService")() {
+  static bindContext = ({ blueprints, objects }) => Effect.gen(function* () {
+    const { binder } = yield* _AiContextService;
+    yield* Effect.promise(() => binder.bind({
+      blueprints,
+      objects
+    }));
+  });
+  static findObjects = (type) => {
+    return Effect.gen(function* () {
+      const { binder } = yield* _AiContextService;
+      return binder.getObjects().filter(Obj.instanceOf(type));
+    });
+  };
+  /**
+  * Glorified type cast until we figure out function service typing.
+  * For context, the AiContextService is provided to functions called from tool calls, but it's not implemented in types yet.
+  * @deprecated
+  */
+  static fixFunctionHandlerType = (eff) => eff;
 };
 
 // src/conversation/conversation.ts
-import * as Effect from "effect/Effect";
+import * as Array3 from "effect/Array";
+import * as Context3 from "effect/Context";
+import * as Effect6 from "effect/Effect";
+import * as Either from "effect/Either";
+import { pipe as pipe3 } from "effect/Function";
+import * as Layer from "effect/Layer";
 import { Resource as Resource2 } from "@dxos/context";
-import { Obj as Obj2 } from "@dxos/echo";
+import { Obj as Obj4 } from "@dxos/echo";
+import { acquireReleaseResource } from "@dxos/effect";
+import { QueueService } from "@dxos/functions";
 import { invariant } from "@dxos/invariant";
+import { log as log4 } from "@dxos/log";
+import { McpToolkit } from "@dxos/mcp-client";
+import { Message as Message3 } from "@dxos/types";
+
+// src/session/artifact-diff.ts
+import * as Context2 from "effect/Context";
+var ArtifactDiffResolver = class extends Context2.Tag("@dxos/assistant/ArtifactDiffResolver")() {
+};
+
+// src/session/observer.ts
+import * as Effect2 from "effect/Effect";
+import * as Function2 from "effect/Function";
+var GenerationObserver = Object.freeze({
+  make: ({ onBegin = Function2.constant(Effect2.void), onPart = Function2.constant(Effect2.void), onBlock = Function2.constant(Effect2.void), onEnd = Function2.constant(Effect2.void), onMessage = Function2.constant(Effect2.void) } = {}) => ({
+    onBegin,
+    onPart,
+    onBlock,
+    onEnd,
+    onMessage
+  }),
+  noop: () => GenerationObserver.make(),
+  /**
+  * Debug printer to be used in unit-tests and browser devtools.
+  */
+  fromPrinter: (printer) => GenerationObserver.make({
+    onBlock: (block) => Effect2.sync(() => {
+      if (block.pending) {
+        return;
+      }
+      printer.printContentBlock(block);
+    }),
+    onMessage: (message) => Effect2.sync(() => {
+      if (message.sender.role === "assistant") {
+        return;
+      }
+      printer.printMessage(message);
+    })
+  })
+});
+
+// src/session/session.ts
+import * as LanguageModel from "@effect/ai/LanguageModel";
+import * as Chunk from "effect/Chunk";
+import * as Effect4 from "effect/Effect";
+import * as Stream from "effect/Stream";
+import { AiParser, AiPreprocessor, AiSummarizer, callTool, withoutToolCallParising } from "@dxos/ai";
+import { Obj as Obj3 } from "@dxos/echo";
+import { TracingService } from "@dxos/functions";
+import { log as log3 } from "@dxos/log";
+import { Message as Message2 } from "@dxos/types";
+
+// src/session/format.ts
+import * as Effect3 from "effect/Effect";
+import * as Function3 from "effect/Function";
+import * as Option from "effect/Option";
+import { Template } from "@dxos/blueprints";
+import { Obj as Obj2 } from "@dxos/echo";
+import { ObjectVersion } from "@dxos/echo-db";
 import { log as log2 } from "@dxos/log";
 import { Message } from "@dxos/types";
-var __dxlog_file2 = "/__w/dxos/dxos/packages/core/assistant/src/conversation/conversation.ts";
+import { trim } from "@dxos/util";
+
+// src/errors.ts
+import { BaseError } from "@dxos/errors";
+var AiModelError = class extends BaseError.extend("AiModelError", "AI model error") {
+};
+var AiAssistantError = class extends BaseError.extend("AiAssistantError", "AI assistant error") {
+};
+
+// src/session/format.ts
+var __dxlog_file2 = "/__w/dxos/dxos/packages/core/assistant/src/session/format.ts";
+var formatSystemPrompt = ({ system, blueprints = [], objects = [] }) => Effect3.gen(function* () {
+  const blueprintDefs = yield* Function3.pipe(blueprints, Effect3.forEach((blueprint) => Effect3.succeed(blueprint.instructions)), Effect3.flatMap(Effect3.forEach((template) => Effect3.gen(function* () {
+    return trim`
+            <blueprint>
+              ${yield* Template.processTemplate(template)}
+            </blueprint>
+          `;
+  }))), Effect3.map((blueprints2) => blueprints2.length > 0 ? [
+    "## Blueprints Definitions",
+    ...blueprints2
+  ].join("\n\n") : void 0));
+  const objectDefs = yield* Function3.pipe(objects, Effect3.forEach((object) => Effect3.succeed(trim`
+          <object>
+            <dxn>${Obj2.getDXN(object)}</dxn>
+            <typename>${Obj2.getTypename(object)}</typename>
+          </object>
+        `)), Effect3.map((objects2) => objects2.length > 0 ? [
+    "## Context Objects",
+    ...objects2
+  ].join("\n\n") : void 0));
+  return yield* Function3.pipe(Effect3.succeed([
+    system,
+    blueprintDefs,
+    objectDefs
+  ].filter((def) => def !== void 0)), Effect3.map((parts) => parts.join("\n\n")));
+});
+var formatUserPrompt = ({ prompt, history = [] }) => Effect3.gen(function* () {
+  const blocks = [];
+  const artifactDiffResolver = yield* Effect3.serviceOption(ArtifactDiffResolver);
+  if (Option.isSome(artifactDiffResolver)) {
+    const versions = gatherObjectVersions(history);
+    const artifactDiff = yield* Effect3.tryPromise({
+      try: () => artifactDiffResolver.value.resolve([
+        ...versions.entries()
+      ].map(([id, version]) => ({
+        id,
+        lastVersion: version
+      }))),
+      catch: AiAssistantError.wrap({
+        message: "Artifact diff resolution error"
+      })
+    });
+    log2("version", {
+      artifactDiff,
+      versions
+    }, {
+      F: __dxlog_file2,
+      L: 94,
+      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;
+      }
+      blocks.push({
+        _tag: "anchor",
+        objectId: id,
+        version
+      });
+    }
+    if (artifactDiff.size > 0) {
+      blocks.push(createArtifactUpdateBlock(artifactDiff));
+    }
+  }
+  return Obj2.make(Message.Message, {
+    created: (/* @__PURE__ */ new Date()).toISOString(),
+    sender: {
+      role: "user"
+    },
+    blocks: [
+      ...blocks,
+      {
+        _tag: "text",
+        text: prompt
+      }
+    ]
+  });
+});
+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: trim`
+      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")}
+    `
+  };
+};
+
+// src/session/session.ts
+var __dxlog_file3 = "/__w/dxos/dxos/packages/core/assistant/src/session/session.ts";
+var AiSession = class {
+  _options;
+  /** Prevents concurrent execution of session. */
+  _semaphore = Effect4.runSync(Effect4.makeSemaphore(1));
+  /** Message history from queue. */
+  // TODO(burdon): Evolve into supporting a git-like graph of messages.
+  _history = [];
+  /** Pending messages for this session (incl. the current prompt). */
+  _pending = [];
+  _started = 0;
+  _ended = 0;
+  _toolCalls = 0;
+  constructor(_options = {}) {
+    this._options = _options;
+  }
+  get duration() {
+    return this._ended - this._started;
+  }
+  get toolCalls() {
+    return this._toolCalls;
+  }
+  run = ({ prompt, system: systemTemplate, history = [], objects = [], blueprints = [], toolkit, observer = GenerationObserver.noop(), onOutput = () => Effect4.void }) => Effect4.gen(this, function* () {
+    this._started = Date.now();
+    this._history = [
+      ...history
+    ];
+    this._pending = [];
+    const submitMessage = (message) => Effect4.gen(this, function* () {
+      this._pending.push(message);
+      yield* observer.onMessage(message);
+      yield* TracingService.emitConverationMessage(message);
+      yield* onOutput(message);
+      return message;
+    });
+    const system = yield* formatSystemPrompt({
+      system: systemTemplate,
+      blueprints,
+      objects
+    }).pipe(Effect4.orDie);
+    if (this._options.summarizationThreshold !== void 0) {
+      const tokenCount = yield* AiPreprocessor.estimateTokens(yield* AiPreprocessor.preprocessPrompt([
+        ...this._history
+      ], {
+        system
+      }));
+      if (tokenCount > this._options.summarizationThreshold) {
+        const summary = yield* AiSummarizer.summarize([
+          ...this._history
+        ]);
+        yield* submitMessage(summary);
+      }
+    }
+    const promptMessage = yield* submitMessage(yield* formatUserPrompt({
+      prompt,
+      history
+    }));
+    do {
+      log3("request", {
+        prompt: promptMessage,
+        system: {
+          snippet: createSnippet(system),
+          length: system.length
+        },
+        pending: this._pending.length,
+        history: this._history.length,
+        objects: objects?.length ?? 0
+      }, {
+        F: __dxlog_file3,
+        L: 149,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      const prompt2 = yield* AiPreprocessor.preprocessPrompt([
+        ...this._history,
+        ...this._pending
+      ], {
+        system,
+        cacheControl: "ephemeral"
+      });
+      const messages = yield* LanguageModel.streamText({
+        prompt: prompt2,
+        toolkit,
+        disableToolCallResolution: true
+      }).pipe(
+        // Disable tool call parsing so that we can handle parameter schema errors on a per-tool call basis.
+        withoutToolCallParising,
+        // TOOD(dmaretskyi): Error mapping.
+        AiParser.parseResponse({
+          onBegin: () => observer.onBegin(),
+          onBlock: (block) => observer.onBlock(block),
+          onPart: (part) => observer.onPart(part),
+          onEnd: (summary) => observer.onEnd(summary)
+        }),
+        Stream.mapEffect((block) => Effect4.gen(function* () {
+          return yield* submitMessage(Obj3.make(Message2.Message, {
+            created: (/* @__PURE__ */ new Date()).toISOString(),
+            sender: {
+              role: "assistant"
+            },
+            blocks: [
+              block
+            ]
+          }));
+        })),
+        Stream.runCollect,
+        Effect4.map(Chunk.toArray)
+      );
+      const toolCalls = messages.flatMap((message) => message.blocks.filter((block) => block._tag === "toolCall" && block.providerExecuted === false).map((block) => ({
+        block,
+        message
+      })));
+      if (toolCalls.length === 0) {
+        break;
+      } else if (!toolkit) {
+        throw new Error("No toolkit provided");
+      }
+      const toolResults = yield* Effect4.forEach(toolCalls, ({ block, message }) => {
+        return callTool(toolkit, block).pipe(Effect4.provide(TracingService.layerSubframe((context) => ({
+          ...context,
+          parentMessage: message.id,
+          toolCallId: block.toolCallId
+        }))));
+      });
+      yield* submitMessage(Obj3.make(Message2.Message, {
+        created: (/* @__PURE__ */ new Date()).toISOString(),
+        sender: {
+          role: "tool"
+        },
+        blocks: toolResults
+      }));
+      this._toolCalls++;
+    } while (true);
+    this._ended = Date.now();
+    log3("done", {
+      pending: this._pending.length,
+      duration: this.duration,
+      tools: this._toolCalls
+    }, {
+      F: __dxlog_file3,
+      L: 236,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    return this._pending;
+  }).pipe(this._semaphore.withPermits(1), Effect4.withSpan("AiSession.run"));
+};
+var createSnippet = (text, len = 32) => text.length <= len * 2 ? text : [
+  text.slice(0, len),
+  "...",
+  text.slice(-len)
+].join("");
+
+// src/session/toolkit.ts
+import * as Toolkit from "@effect/ai/Toolkit";
+import * as Effect5 from "effect/Effect";
+import { GenericToolkit, ToolExecutionService, ToolResolverService } from "@dxos/ai";
+import { isTruthy as isTruthy2 } from "@dxos/util";
+var createToolkit = ({ toolkit: toolkitProp, blueprints = [], genericToolkits = [] }) => Effect5.gen(function* () {
+  const blueprintToolkit = yield* ToolResolverService.resolveToolkit(blueprints.flatMap(({ tools }) => tools));
+  const blueprintToolHandler = yield* blueprintToolkit.toContext(ToolExecutionService.handlersFor(blueprintToolkit));
+  const genericToolkit = GenericToolkit.merge(...genericToolkits);
+  const toolkit = Toolkit.merge(...[
+    toolkitProp,
+    blueprintToolkit,
+    genericToolkit.toolkit
+  ].filter(isTruthy2));
+  return yield* toolkit.pipe(Effect5.provide(blueprintToolHandler), Effect5.provide(genericToolkit.layer));
+});
+
+// src/session/version-pin.ts
+import * as Schema2 from "effect/Schema";
+import { getVersion } from "@dxos/echo-db";
+import { ObjectId } from "@dxos/keys";
+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 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 __dxlog_file4 = "/__w/dxos/dxos/packages/core/assistant/src/conversation/conversation.ts";
+var SUMMARY_THRESHOLD = 8e4;
 var AiConversation = class extends Resource2 {
   /**
   * Blueprints and objects bound to the conversation.
@@ -280,8 +678,8 @@ var AiConversation = class extends Resource2 {
     this._queue = options.queue;
     this._toolkit = options.toolkit;
     invariant(this._queue, void 0, {
-      F: __dxlog_file2,
-      L: 54,
+      F: __dxlog_file4,
+      L: 72,
       S: this,
       A: [
         "this._queue",
@@ -307,64 +705,134 @@ var AiConversation = class extends Resource2 {
   }
   async getHistory() {
     const queueItems = await this._queue.queryObjects();
-    return queueItems.filter(Obj2.instanceOf(Message.Message));
+    return queueItems.filter(Obj4.instanceOf(Message3.Message));
+  }
+  getTools() {
+    return Effect6.gen(this, function* () {
+      const blueprints = this.context.getBlueprints();
+      const tookit = yield* createToolkit({
+        toolkit: this._toolkit,
+        blueprints
+      });
+      return tookit.tools;
+    }).pipe(Effect6.orDie);
   }
   /**
   * Creates a new cancelable request effect.
   */
   createRequest(params) {
-    const self = this;
-    return Effect.gen(function* () {
-      const history = yield* Effect.promise(() => self.getHistory());
-      const blueprints = self.context.getBlueprints();
+    return Effect6.gen(this, function* () {
+      const history = yield* Effect6.promise(() => this.getHistory());
+      const blueprints = this.context.getBlueprints();
+      const mcps = yield* connectMcpServers(blueprints);
       const toolkit = yield* createToolkit({
-        toolkit: self._toolkit,
-        blueprints
+        toolkit: this._toolkit,
+        blueprints,
+        genericToolkits: mcps
       });
-      const objects = self.context.getObjects();
-      log2("run", {
+      const objects = this.context.getObjects();
+      log4("run", {
         history: history.length,
         blueprints: blueprints.length,
         tools: Object.keys(toolkit.tools).length,
         objects: objects.length
       }, {
-        F: __dxlog_file2,
-        L: 99,
+        F: __dxlog_file4,
+        L: 128,
         S: this,
         C: (f, a) => f(...a)
       });
-      const session = new AiSession();
+      const session = new AiSession({
+        summarizationThreshold: SUMMARY_THRESHOLD
+      });
       const messages = yield* session.run({
         history,
         blueprints,
         toolkit,
         objects,
-        ...params
-      }).pipe(Effect.provideService(AiContextService, {
-        binder: self.context
-      }));
-      log2("result", {
+        ...params,
+        onOutput: (message) => Effect6.promise(() => this._queue.append([
+          message
+        ]))
+      }).pipe(Effect6.provide(Layer.mergeAll(Layer.succeed(AiContextService, {
+        binder: this.context
+      }), Layer.succeed(AiConversationService, this))));
+      log4("result", {
         messages: messages.length,
         duration: session.duration,
         toolCalls: session.toolCalls
       }, {
-        F: __dxlog_file2,
-        L: 114,
+        F: __dxlog_file4,
+        L: 159,
         S: this,
         C: (f, a) => f(...a)
       });
-      yield* Effect.promise(() => self._queue.append(messages));
       return messages;
     });
   }
 };
+var AiConversationService = class _AiConversationService extends Context3.Tag("@dxos/assistant/AiConversationService")() {
+  /**
+  * Create a new conversation layer from options.
+  */
+  static layer = (options) => aiContextFromConversation.pipe(Layer.provideMerge(Layer.scoped(_AiConversationService, Effect6.gen(function* () {
+    const conversation = yield* acquireReleaseResource(() => new AiConversation(options));
+    return conversation;
+  }))));
+  /**
+  * Create a new conversation with a new queue.
+  */
+  static layerNewQueue = (options) => Layer.unwrapScoped(Effect6.gen(function* () {
+    return _AiConversationService.layer({
+      ...options,
+      queue: yield* QueueService.createQueue()
+    });
+  }));
+  /**
+  * Run a prompt in the current conversation.
+  */
+  static run = (params) => Effect6.gen(function* () {
+    const conversation = yield* _AiConversationService;
+    return yield* conversation.createRequest(params);
+  });
+};
+var aiContextFromConversation = Layer.effect(AiContextService, Effect6.gen(function* () {
+  const conversation = yield* AiConversationService;
+  return {
+    binder: conversation.context
+  };
+}));
+var connectMcpServers = (blueprints) => pipe3(blueprints, Array3.flatMap((_) => _.mcpServers ?? []), Effect6.forEach(({ url, protocol }) => McpToolkit.make({
+  url,
+  kind: protocol
+}).pipe(
+  // NOTE: Type-inference fails here without explicit void return.
+  Effect6.tap((toolkit) => log4.info("Connected to MCP server", {
+    url,
+    tools: Object.keys(toolkit.toolkit.tools).length
+  }, {
+    F: __dxlog_file4,
+    L: 240,
+    S: void 0,
+    C: (f, a) => f(...a)
+  })),
+  Effect6.tapDefect((error) => Effect6.sync(() => log4.warn("Failed to connect to MCP server", {
+    error
+  }, {
+    F: __dxlog_file4,
+    L: 242,
+    S: void 0,
+    C: (f, a) => f(...a)
+  }))),
+  Effect6.either
+)), Effect6.map(Array3.filterMap((_) => Either.getRight(_))));
 
 // src/diff.ts
 import { next as A } from "@automerge/automerge";
 import { DocAccessor, toCursorRange } from "@dxos/echo-db";
-import { log as log3 } from "@dxos/log";
+import { log as log5 } from "@dxos/log";
 import { isNonNullable } from "@dxos/util";
-var __dxlog_file3 = "/__w/dxos/dxos/packages/core/assistant/src/diff.ts";
+var __dxlog_file5 = "/__w/dxos/dxos/packages/core/assistant/src/diff.ts";
 var reduceDiffs = (diffs) => {
   return diffs.reduce((acc, diff) => {
     const current = acc[acc.length - 1];
@@ -392,8 +860,10 @@ var reduceDiffs = (diffs) => {
         }
         return acc;
       }
+      default: {
+        throw new Error(`Invalid diff format: each line must start with "- " or "+ ", got: ${JSON.stringify(diff)}`);
+      }
     }
-    return acc;
   }, []);
 };
 var computeDiffsWithCursors = (accessor, diffs) => {
@@ -408,7 +878,7 @@ var computeDiffsWithCursors = (accessor, diffs) => {
     }
   }).filter(isNonNullable);
 };
-var applyDiffs = (accessor, diffs) => {
+var applyDiffs = (accessor, diffs, { errorOnNotFound = false } = {}) => {
   for (const diff of reduceDiffs(diffs)) {
     accessor.handle.change((doc) => {
       const text = DocAccessor.getValue(accessor);
@@ -416,12 +886,16 @@ var applyDiffs = (accessor, diffs) => {
       if (idx !== -1) {
         A.splice(doc, accessor.path, idx, diff.match.length, diff.replace);
       } else {
-        log3.warn("diff not found", diff, {
-          F: __dxlog_file3,
-          L: 78,
-          S: void 0,
-          C: (f, a) => f(...a)
-        });
+        if (errorOnNotFound) {
+          throw new Error(`Diff not found: ${diff.match}`);
+        } else {
+          log5.warn("diff not found", diff, {
+            F: __dxlog_file5,
+            L: 86,
+            S: void 0,
+            C: (f, a) => f(...a)
+          });
+        }
       }
     });
   }
@@ -430,10 +904,10 @@ var applyDiffs = (accessor, diffs) => {
 
 // src/execution-graph.ts
 import { AgentStatus } from "@dxos/ai";
-import { Obj as Obj3 } from "@dxos/echo";
+import { Obj as Obj5 } from "@dxos/echo";
 import { MESSAGE_PROPERTY_TOOL_CALL_ID } from "@dxos/functions";
 import { LogLevel } from "@dxos/log";
-import { ContentBlock, Message as Message2 } from "@dxos/types";
+import { ContentBlock, Message as Message4 } from "@dxos/types";
 import { isNonNullable as isNonNullable2 } from "@dxos/util";
 var SKIP_BLOCKS = [
   "text"
@@ -457,9 +931,9 @@ var ExecutionGraph = class {
   addEvents(events) {
     const sortedEvents = this.sortObjectsByCreated(events);
     for (const event of sortedEvents) {
-      if (Obj3.instanceOf(Message2.Message, event)) {
+      if (Obj5.instanceOf(Message4.Message, event)) {
         this._processMessage(event);
-      } else if (Obj3.instanceOf(AgentStatus, event)) {
+      } else if (Obj5.instanceOf(AgentStatus, event)) {
         this._processAgentStatus(event);
       }
     }
@@ -717,7 +1191,7 @@ var createBlockCommit = (block, message, branch, parents, idx) => {
         level: block.error ? LogLevel.ERROR : LogLevel.INFO,
         message: block.error ? "Tool error: " + block.error : "Tool call succeeded"
       };
-    case "summary":
+    case "stats":
       return {
         id: getGenericBlockId(message.id, idx),
         branch,
@@ -725,7 +1199,7 @@ var createBlockCommit = (block, message, branch, parents, idx) => {
         timestamp,
         icon: "ph--rocket--regular",
         level: LogLevel.INFO,
-        message: ContentBlock.createSummaryMessage(block)
+        message: ContentBlock.createStatsMessage(block)
       };
     case "status":
       return {
@@ -795,26 +1269,26 @@ var stringifyRef = (ref) => {
   return ref.dxn.asEchoDXN()?.echoId ?? ref.dxn.asQueueDXN()?.objectId ?? "";
 };
 var stringifyObject = (obj) => {
-  return Obj3.getLabel(obj) ?? Obj3.getTypename(obj) ?? obj.id;
+  return Obj5.getLabel(obj) ?? Obj5.getTypename(obj) ?? obj.id;
 };
 
 // src/templates/system.ts
 import defaultsDeep from "lodash.defaultsdeep";
-import { Template } from "@dxos/blueprints";
+import { Template as Template2 } from "@dxos/blueprints";
 
 // raw-loader:/__w/dxos/dxos/packages/core/assistant/src/templates/instructions/format.tpl?raw
-var format_default = "{{! System Core }}\n\n## Input Formats\n\n### Blueprints\n\nYou may be provided with Blueprint definitions that include specific instructions and tools for a given set of tasks.\nBlue print instructions will be enclosed in a <blueprint> tag.\n\n### Context objects\n\nYou may be provided with references to objects that are relevant to the current prompt.\nObjects will be in the form of a <object> tag with a <dxn> element that is the unique key of the object required by many tools.\nThe <typename> element is the type of the object.\n\n<object>\n  <dxn>object-id</dxn>\n  <typename>example.com/type/TypeName</typename>\n</object>\n\n## Response Formats\n\nIt is very important to respond in the correct format.\nYou response must be valid Markdown.\nIn some cases you should respond with well-formed XML tags along with the content.\nCode snippets should use 2-space indents.\n\n{{#if cot}}\nBefore responding, explain your reasoning and include your detailed chain-of-thought enclosed in a <cot> tag.\nThe <cot> tag should be the first thing in your response.\n{{/if}}\n\n## Block references\n\nYou can reply with a block reference for objects if you have the DXN. For example:\n\n<object>\n  <dxn>dxn:queue:data:B6INSIBY3CBEF4M5VZRYBCMAHQMPYK5AJ:01K24XMVHSZHS97SG1VTVQDM5Z:01K24XPK464FSCKVQJAB2H662M</dxn>\n</object>\n<object>\n  <dxn>dxn:echo:@:01K24XPK464FSCKVQJAB2H662M</dxn>\n</object>\n\n### Suggestions\n\nEach suggestion must in the form of a proposed action enclosed in a <suggestion> tag.\nExample: <suggestion>Show on a map</suggestion>\nDo not use bullets when listing suggestions.\n\n### Multiple choice questions\n\nYou may ask multiple choice questions by wrapping consise options inside <option> tags inside a well formed <select> tag.\nExample: <select><option>Yes</option><option>No</option></select>\n\n## Toolkit\n\nIf the user asks for a list of tools, then just emit a single self-closing <toolkit/> tag instead of listing the tools.\n\n## Context\n\nThe current date and time is {{DATETIME}}.\n";
+var format_default = "{{! System Core }}\n\n## Input Formats\n\n### Blueprints\n\nYou may be provided with Blueprint definitions that include specific instructions and tools for a given set of tasks.\nBlue print instructions will be enclosed in a <blueprint> tag.\n\n### Context objects\n\nYou may be provided with references to objects that are relevant to the current prompt.\nObjects will be in the form of a <object> tag with a <dxn> element that is the unique key of the object required by many tools.\nThe <typename> element is the type of the object.\n\n<object>\n  <dxn>object-id</dxn>\n  <typename>example.com/type/TypeName</typename>\n</object>\n\n## Response Formats\n\nIt is very important to respond in the correct format.\nYou response must be valid Markdown.\nIn some cases you should respond with well-formed XML tags along with the content.\nCode snippets should use 2-space indents.\n\n{{#if cot}}\nBefore responding, explain your reasoning and include your detailed chain-of-thought enclosed in a <cot> tag.\nThe <cot> tag should be the first thing in your response.\n{{/if}}\n\n## Block references\n\nYou can reply with a block reference for objects if you have the DXN. For example:\n\n<object>\n  <dxn>dxn:queue:data:B6INSIBY3CBEF4M5VZRYBCMAHQMPYK5AJ:01K24XMVHSZHS97SG1VTVQDM5Z:01K24XPK464FSCKVQJAB2H662M</dxn>\n</object>\n<object>\n  <dxn>dxn:echo:@:01K24XPK464FSCKVQJAB2H662M</dxn>\n</object>\n\n### Suggestions\n\nEach suggestion must in the form of a proposed action enclosed in a <suggestion> tag.\nExample: <suggestion>Show on a map</suggestion>\nDo not use bullets when listing suggestions.\n\n### Multiple choice questions\n\nYou may ask multiple choice questions by wrapping consise options inside <option> tags inside a well formed <select> tag.\nExample: <select><option>Yes</option><option>No</option></select>\n\n## Context\n\nThe current date and time is {{DATETIME}}.\n";
 
 // raw-loader:/__w/dxos/dxos/packages/core/assistant/src/templates/instructions/system.tpl?raw
 var system_default = "{{! System Prompt }}\n\n- You are a helpful assistant called Kai. \n- Your name is Kai and you are powered by different language models.\n- You were created by DXOS and operate inside of Composer and on the DXOS EDGE network.\n- In your initial greeting state your name and make some suggestions based on the current context objects.\n- You are an advanced AI assistant capable of creating and managing artifacts from provided data and tools.\n- Your task is to process user commands and questions and decide how best to respond.\n- In general be concise and direct.\n- Follow all instructions carefully.\n\n## Planning\n\n- Analyze the structure and type of the content in the user's message.\n- Determine if you complete the task using the available blueprint definitions?\n- If you can't complete the task using the available blueprint definitions, query the list of available blueprint definitions using the appropriate tool.\n- Identify which blueprint definitions are relevant to the user's request.\n- Evaluate the potential benefits of creating an artifact vs. normal processing for each identified element.\n- Make a final decision on whether to create an artifact and explain your reasoning.\n- Are the required blueprint definitions already available?\n- If not, select which blueprint definition(s) will be the most relevant and require them using the require_artifact_definitions tool.\n- The require'd artifact tools will be available for use after require.\n- If creating an artifact, outline how you will structure it within the response.\n- Decide if the artifact needs to be shown to the user.\n- Call the show tool to show the artifact to the user.\n- Your reasoning must include: whether to use artifacts or not, to create one or query, whether to show the artifact to the user, and how to structure the response.\n\n## Blueprints and Artifacts\n\n- Determine if the interaction involves an artifact. Prefer artifacts for tables, lists, spreadsheets, kanbans, games, images, and other structured data.\n- Determine if the user is explicitly talking about creating a new artifact, or wants to use an existing artifact.\n- If it is ambiguous, query for existing artifacts first and then decide.\n- If you decide to create an artifact, call the associated tool to create the artifact.\n- Artifacts are stored in the database. Tools are used to create and query artifacts.\n- If you are unsure about creating an artifact ask the user for clarification.\n- Artifacts are mutable objects that can change over the course of the conversation.\n- Always re-query the artifact using the tool (like query or inspect) to get the latest state of the artifact before answering the user.\n- You must never generate the id of the artifact; only recall the ids that are already in the history.\n- Artifacts are created by requiring the specific artifact using the require_artifact tool and creating it by calling the associated tool.\n- You can add suggested actions at the end of your response.\n- Suggested actions should be very concise and start with a verb and be phrased as a command to an agent -- not a question to the user.\n- Suggested actions must be in the form of a user instruction that you can follow.\n- Suggested actions could include actions that create artifacts.\n- After creating an artifact use a tool to add it to the chat context.\n\n## Context\n\nToday is {{DATETIME}}.\n";
 
 // src/templates/system.ts
-var createSystemPrompt = (options = {}) => Template.process(format_default, defaultsDeep(options, {
+var createSystemPrompt = (options = {}) => Template2.process(format_default, defaultsDeep(options, {
   DATETIME: (/* @__PURE__ */ new Date()).toISOString()
 }));
 var templates = {
   /** Editable system prompt.*/
-  system: Template.make({
+  system: Template2.make({
     /**
     * NOTE: We are forbidden from accessing randomness at model level in cloudflare, so we have to have pre-generated ids.
     */
@@ -827,6 +1301,7 @@ export {
   AiContextBinder,
   AiContextService,
   AiConversation,
+  AiConversationService,
   AiModelError,
   AiSession,
   ArtifactDiffResolver,
@@ -835,14 +1310,16 @@ export {
   ContextBinding,
   ExecutionGraph,
   GenerationObserver,
-  GenericToolkit_exports as GenericToolkit,
   RefFromLLM,
+  ToolExecutionServices,
   VersionPin,
   applyDiffs,
   computeDiffsWithCursors,
   createArtifactElement,
   createSystemPrompt,
   createToolkit,
+  formatSystemPrompt,
+  formatUserPrompt,
   makeToolExecutionServiceFromFunctions,
   makeToolResolverFromFunctions,
   reduceDiffs,