@dxos/assistant 0.8.2-main.fbd8ed0 → 0.8.2-staging.7ac8446

package/dist/lib/node-esm/{chunk-SAWYU3V5.mjs → chunk-DCQJOLSR.mjs}

@@ -361,6 +361,8 @@ var GenerationStreamImpl = class {
 };
 
 // packages/experimental/assistant/src/ai-service/edge-client.ts
+import { Schema as S } from "effect";
+import { Message } from "@dxos/artifact";
 import { assertArgument, invariant } from "@dxos/invariant";
 import { log as log2 } from "@dxos/log";
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/ai-service/edge-client.ts";
@@ -368,7 +370,7 @@ var AIServiceEdgeClient = class {
   constructor({ endpoint }) {
     invariant(endpoint, "endpoint is required", {
       F: __dxlog_file2,
-      L: 20,
+      L: 23,
       S: this,
       A: [
         "endpoint",
@@ -378,21 +380,34 @@ var AIServiceEdgeClient = class {
     this._endpoint = endpoint;
   }
   /**
-  * Generate non-streaming response.
+  * @deprecated
   */
-  async exec(request) {
-    throw new Error("Not implemented");
+  // TODO(burdon): Remove.
+  async appendMessages(messages) {
+    const url = `${this._endpoint}/message`;
+    const res = await fetch(url, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({
+        messages: await S.encodePromise(S.Array(Message))(messages)
+      })
+    });
+    if (!res.ok) {
+      throw new Error(`${await res.text()} [${url}]`);
+    }
   }
   /**
   * Process request and open message stream.
   */
-  async execStream(request) {
+  async exec(request) {
     assertArgument(typeof request.model === "string", "model is required");
     log2("requesting", {
       endpoint: this._endpoint
     }, {
       F: __dxlog_file2,
-      L: 36,
+      L: 51,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -409,12 +424,9 @@ var AIServiceEdgeClient = class {
         ...request
       })
     });
-    if (!response.ok) {
-      throw await parseErrorResponse(response);
-    }
     invariant(response.body instanceof ReadableStream, void 0, {
       F: __dxlog_file2,
-      L: 53,
+      L: 64,
       S: this,
       A: [
         "response.body instanceof ReadableStream",
@@ -424,9 +436,6 @@ var AIServiceEdgeClient = class {
     return createGenerationStream(response, controller);
   }
 };
-var parseErrorResponse = async (response) => {
-  throw new Error(`AI Service error: ${response.status} ${response.statusText} ${await response.text()}`);
-};
 
 // packages/experimental/assistant/src/ai-service/message-collector.ts
 var MessageCollector = class {
@@ -495,57 +504,225 @@ function* emitMessageAsEvents(message) {
 }
 
 // packages/experimental/assistant/src/ai-service/types.ts
-import { Schema } from "effect";
-import { Tool, Message } from "@dxos/artifact";
+import { Schema as S2 } from "effect";
+import { Tool, Message as Message2, SpaceIdSchema } from "@dxos/artifact";
+import { ObjectId } from "@dxos/echo-schema";
 var createArtifactElement = (id) => `<artifact id=${id} />`;
-var LLMModel = Schema.Literal(...DEFAULT_EDGE_MODELS, ...DEFAULT_OLLAMA_MODELS);
+var LLMModel = S2.Literal(...DEFAULT_EDGE_MODELS, ...DEFAULT_OLLAMA_MODELS);
 var ToolTypes = Object.freeze({
   // TODO(dmaretskyi): Not implemented yet.
   // DatabaseQuery: 'database_query',
   TextToImage: "text_to_image"
 });
-var GenerateRequest = Schema.Struct({
+var GenerateRequest = S2.Struct({
+  spaceId: S2.optional(SpaceIdSchema),
+  threadId: S2.optional(ObjectId),
   /**
   * Preferred model or system default.
   */
-  model: Schema.optional(LLMModel),
+  model: S2.optional(LLMModel),
   /**
   * Tools available for the LLM.
   */
-  tools: Schema.optional(Schema.Array(Tool).pipe(Schema.mutable)),
+  tools: S2.optional(S2.Array(Tool).pipe(S2.mutable)),
   /**
   * System instructions to the LLM.
   */
-  systemPrompt: Schema.optional(Schema.String),
+  systemPrompt: S2.optional(S2.String),
   /**
   * History of messages to include in the context window.
   */
   // TODO(burdon): Rename messages.
-  history: Schema.optional(Schema.Array(Message)),
+  history: S2.optional(S2.Array(Message2)),
   /**
   * Current request.
   */
-  prompt: Schema.optional(Message)
-});
-var GenerateResponse = Schema.Struct({
-  messages: Schema.Array(Message),
-  /**
-  * Number of tokens used in the response.
-  */
-  tokenCount: Schema.optional(Schema.Number)
+  prompt: S2.optional(Message2)
 });
 
-// packages/experimental/assistant/src/session/tools.ts
-import { Message as Message2, ToolResult } from "@dxos/artifact";
-import { create } from "@dxos/echo-schema";
+// packages/experimental/assistant/src/conversation/conversation.ts
+import { ToolResult, Message as Message3 } from "@dxos/artifact";
+import { createStatic, ObjectId as ObjectId2 } from "@dxos/echo-schema";
 import { invariant as invariant2 } from "@dxos/invariant";
 import { log as log3 } from "@dxos/log";
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/session/tools.ts";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/conversation/conversation.ts";
+var runLLM = async (params) => {
+  let conversationResult = null;
+  const history = params.history ?? [];
+  const generate = async () => {
+    log3("llm generate", {
+      tools: params.tools
+    }, {
+      F: __dxlog_file3,
+      L: 44,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+    const beginTs = Date.now();
+    const stream = await params.client.exec({
+      model: params.model,
+      spaceId: params.spaceId,
+      threadId: params.threadId,
+      history,
+      systemPrompt: params.system,
+      tools: params.tools
+    });
+    for await (const event of stream) {
+      params.logger?.(event);
+    }
+    await stream.complete();
+    const messages = [];
+    const message = messages.at(-1);
+    invariant2(message, void 0, {
+      F: __dxlog_file3,
+      L: 63,
+      S: void 0,
+      A: [
+        "message",
+        ""
+      ]
+    });
+    log3("llm result", {
+      time: Date.now() - beginTs,
+      message
+    }, {
+      F: __dxlog_file3,
+      L: 65,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+    invariant2(message, void 0, {
+      F: __dxlog_file3,
+      L: 66,
+      S: void 0,
+      A: [
+        "message",
+        ""
+      ]
+    });
+    params.logger?.({
+      type: "message",
+      message
+    });
+    history.push(...messages.map((message2) => ({
+      ...message2,
+      content: message2.content.filter((block) => block.type !== "image")
+    })));
+    const isToolUse2 = message.content.at(-1)?.type === "tool_use";
+    if (isToolUse2) {
+      const toolCalls = message.content.filter((block) => block.type === "tool_use");
+      invariant2(toolCalls.length === 1, void 0, {
+        F: __dxlog_file3,
+        L: 77,
+        S: void 0,
+        A: [
+          "toolCalls.length === 1",
+          ""
+        ]
+      });
+      const toolCall = toolCalls[0];
+      const tool = params.tools.find((tool2) => tool2.name === toolCall.name);
+      if (!tool) {
+        throw new Error(`Tool not found: ${toolCall.name}`);
+      }
+      invariant2(tool.execute, void 0, {
+        F: __dxlog_file3,
+        L: 84,
+        S: void 0,
+        A: [
+          "tool.execute",
+          ""
+        ]
+      });
+      const toolResult = await tool.execute(toolCall.input);
+      switch (toolResult.kind) {
+        case "error": {
+          log3.warn("tool error", {
+            message: toolResult.message
+          }, {
+            F: __dxlog_file3,
+            L: 88,
+            S: void 0,
+            C: (f, a) => f(...a)
+          });
+          const resultMessage = {
+            id: ObjectId2.random(),
+            spaceId: params.spaceId,
+            threadId: params.threadId,
+            role: "user",
+            content: [
+              {
+                type: "tool_result",
+                toolUseId: toolCall.id,
+                content: toolResult.message,
+                isError: true
+              }
+            ]
+          };
+          params.logger?.({
+            type: "message",
+            message: resultMessage
+          });
+          history.push(resultMessage);
+          return true;
+        }
+        case "success": {
+          log3("tool success", {
+            result: toolResult.result
+          }, {
+            F: __dxlog_file3,
+            L: 110,
+            S: void 0,
+            C: (f, a) => f(...a)
+          });
+          const resultMessage = {
+            id: ObjectId2.random(),
+            spaceId: params.spaceId,
+            threadId: params.threadId,
+            role: "user",
+            content: [
+              {
+                type: "tool_result",
+                toolUseId: toolCall.id,
+                content: JSON.stringify(toolResult.result)
+              }
+            ]
+          };
+          params.logger?.({
+            type: "message",
+            message: resultMessage
+          });
+          history.push(resultMessage);
+          return true;
+        }
+        case "break": {
+          log3("tool break", {
+            result: toolResult.result
+          }, {
+            F: __dxlog_file3,
+            L: 131,
+            S: void 0,
+            C: (f, a) => f(...a)
+          });
+          conversationResult = toolResult.result;
+          return false;
+        }
+      }
+    }
+    return false;
+  };
+  while (await generate()) {
+  }
+  return {
+    result: conversationResult,
+    history
+  };
+};
 var isToolUse = (message, { onlyToolNames } = {}) => {
   const block = message.content.at(-1);
   invariant2(block, void 0, {
     F: __dxlog_file3,
-    L: 12,
+    L: 152,
     S: void 0,
     A: [
       "block",
@@ -558,7 +735,7 @@ var runTools = async ({ message, tools, extensions }) => {
   const toolCalls = message.content.filter((block) => block.type === "tool_use");
   invariant2(toolCalls.length === 1, void 0, {
     F: __dxlog_file3,
-    L: 34,
+    L: 174,
     S: void 0,
     A: [
       "toolCalls.length === 1",
@@ -568,7 +745,7 @@ var runTools = async ({ message, tools, extensions }) => {
   const toolCall = toolCalls[0];
   const tool = tools.find((tool2) => tool2.name === toolCall.name);
   if (!tool) {
-    const resultMessage = create(Message2, {
+    const resultMessage = createStatic(Message3, {
       role: "user",
       content: [
         {
@@ -588,7 +765,7 @@ var runTools = async ({ message, tools, extensions }) => {
   try {
     invariant2(tool.execute, void 0, {
       F: __dxlog_file3,
-      L: 59,
+      L: 199,
       S: void 0,
       A: [
         "tool.execute",
@@ -603,7 +780,7 @@ var runTools = async ({ message, tools, extensions }) => {
       error
     }, {
       F: __dxlog_file3,
-      L: 62,
+      L: 202,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -615,11 +792,11 @@ var runTools = async ({ message, tools, extensions }) => {
         message: toolResult.message
       }, {
         F: __dxlog_file3,
-        L: 68,
+        L: 208,
         S: void 0,
         C: (f, a) => f(...a)
       });
-      const resultMessage = create(Message2, {
+      const resultMessage = createStatic(Message3, {
         role: "user",
         content: [
           {
@@ -640,11 +817,11 @@ var runTools = async ({ message, tools, extensions }) => {
         result: toolResult.result
       }, {
         F: __dxlog_file3,
-        L: 89,
+        L: 229,
         S: void 0,
         C: (f, a) => f(...a)
       });
-      const resultMessage = create(Message2, {
+      const resultMessage = createStatic(Message3, {
         role: "user",
         content: [
           {
@@ -665,7 +842,7 @@ var runTools = async ({ message, tools, extensions }) => {
         result: toolResult.result
       }, {
         F: __dxlog_file3,
-        L: 110,
+        L: 250,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -677,49 +854,10 @@ var runTools = async ({ message, tools, extensions }) => {
   }
 };
 
-// packages/experimental/assistant/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 {
-      type: "json",
-      disposition: VersionPin.DISPOSITION,
-      json: JSON.stringify(pin)
-    };
-  }
-};
-
-// packages/experimental/assistant/src/session/session.ts
-import { Option, Schema as Schema4 } from "effect";
-import { defineTool as defineTool2, Message as Message4, structuredOutputParser, ToolResult as ToolResult3 } from "@dxos/artifact";
-import { Event as Event2, synchronized } from "@dxos/async";
-import { ObjectVersion } from "@dxos/echo-db";
-import { create as create3 } from "@dxos/echo-schema";
-import { invariant as invariant5 } from "@dxos/invariant";
-import { log as log6 } from "@dxos/log";
-
 // packages/experimental/assistant/src/ai-service/ollama-client.ts
-import { Schema as Schema3 } from "effect";
+import { Schema as S3 } from "effect";
 import { defineTool, ToolResult as ToolResult2 } from "@dxos/artifact";
-import { ObjectId as ObjectId2 } from "@dxos/echo-schema";
+import { ObjectId as ObjectId3 } from "@dxos/echo-schema";
 import { invariant as invariant3 } from "@dxos/invariant";
 import { log as log4 } from "@dxos/log";
 var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/ai-service/ollama-client.ts";
@@ -864,14 +1002,14 @@ var OllamaClient = class {
       signal
     });
     if (!response.ok) {
-      throw await parseErrorResponse2(response);
+      throw await parseErrorResponse(response);
     }
     if (!response.body) {
       throw new Error("Ollama API returned no response body");
     }
     const reader = response.body.pipeThrough(new TextDecoderStream()).pipeThrough(new OllamaDecoderStream()).getReader();
     try {
-      const messageId = ObjectId2.random();
+      const messageId = ObjectId3.random();
       yield {
         type: "message_start",
         message: {
@@ -931,7 +1069,7 @@ var OllamaClient = class {
             index: currentBlockIndex,
             content: {
               type: "tool_use",
-              id: ObjectId2.random(),
+              id: ObjectId3.random(),
               name: data.message.tool_calls[0].function.name,
               input: sanitizeToolArguments(data.message.tool_calls[0].function.arguments)
             }
@@ -955,13 +1093,7 @@ var OllamaClient = class {
       reader.releaseLock();
     }
   }
-  /**
-  * Generate non-streaming response.
-  */
   async exec(request) {
-    throw new Error("Not implemented");
-  }
-  async execStream(request) {
     const controller = new AbortController();
     try {
       return new GenerationStreamImpl(controller, async function* () {
@@ -1023,15 +1155,15 @@ var WELL_KNOWN_TOOLS = {
   [ToolTypes.TextToImage]: defineTool("system", {
     name: "text-to-image",
     description: "Generate an image from a text prompt",
-    schema: Schema3.Struct({
-      prompt: Schema3.String.annotations({
+    schema: S3.Struct({
+      prompt: S3.String.annotations({
         description: "The text prompt describing the image to generate"
       })
     }),
     execute: async ({ prompt }) => {
       const image = await fetch(SAMPLE_IMAGE_URL).then(async (res) => Buffer.from(await res.arrayBuffer()));
       const imageBase64 = image.toString("base64");
-      const id = ObjectId2.random();
+      const id = ObjectId3.random();
       return ToolResult2.Success(`The generation was successful. Image ID: ${id} Prompt: ${prompt}`, [
         {
           type: "image",
@@ -1067,12 +1199,12 @@ var OllamaDecoderStream = class extends TransformStream {
     this._buffer = "";
   }
 };
-var ModelDoesNotSupportToolsError = class extends Schema3.TaggedError()("ModelDoesNotSupportToolsError", {
-  model: Schema3.String
+var ModelDoesNotSupportToolsError = class extends S3.TaggedError()("ModelDoesNotSupportToolsError", {
+  model: S3.String
 }) {
 };
-var ModelNotFoundError = class extends Schema3.TaggedError()("ModelNotFoundError", {
-  model: Schema3.String
+var ModelNotFoundError = class extends S3.TaggedError()("ModelNotFoundError", {
+  model: S3.String
 }) {
 };
 var parseOllamaError = (error) => {
@@ -1094,7 +1226,7 @@ var parseOllamaError = (error) => {
   }
   throw new Error(`Ollama API error: ${error}`);
 };
-var parseErrorResponse2 = async (response) => {
+var parseErrorResponse = async (response) => {
   if (response.headers.get("content-type")?.includes("application/json")) {
     const body = await response.json();
     return parseOllamaError(body.error);
@@ -1102,14 +1234,6 @@ var parseErrorResponse2 = async (response) => {
   throw new Error(`Ollama API error: ${response.status} ${response.statusText} ${await response.text()}`);
 };
 
-// packages/experimental/assistant/src/ai-service/parser.ts
-import { Message as Message3 } from "@dxos/artifact";
-import { Event } from "@dxos/async";
-import { create as create2 } from "@dxos/echo-schema";
-import { invariant as invariant4 } from "@dxos/invariant";
-import { log as log5 } from "@dxos/log";
-import { isNotFalsy, safeParseJson } from "@dxos/util";
-
 // packages/experimental/assistant/src/ai-service/transform.ts
 import * as P from "parsimmon";
 var textChunk = P.regexp(/[^<]+/).map((content) => ({
@@ -1200,6 +1324,12 @@ var StreamTransform = class {
 };
 
 // packages/experimental/assistant/src/ai-service/parser.ts
+import { Message as Message4 } from "@dxos/artifact";
+import { Event } from "@dxos/async";
+import { createStatic as createStatic2 } from "@dxos/echo-schema";
+import { invariant as invariant4 } from "@dxos/invariant";
+import { log as log5 } from "@dxos/log";
+import { isNotFalsy, safeParseJson } from "@dxos/util";
 var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/ai-service/parser.ts";
 var MixedStreamParser = class {
   constructor() {
@@ -1275,7 +1405,7 @@ var MixedStreamParser = class {
               C: (f, a) => f(...a)
             });
           }
-          this._message = create2(Message3, {
+          this._message = createStatic2(Message4, {
             role: event.message.role,
             content: [
               ...event.message.content
@@ -1556,18 +1686,6 @@ var mergeMessageBlock = (contentBlock, streamBlock) => {
           }
           break;
         }
-        case "proposal": {
-          if (streamBlock.content.length === 1 && streamBlock.content[0].type === "text") {
-            return {
-              type: "json",
-              disposition: "proposal",
-              json: JSON.stringify({
-                text: streamBlock.content[0].content
-              })
-            };
-          }
-          break;
-        }
         case "select": {
           return {
             type: "json",
@@ -1611,596 +1729,10 @@ var mergeMessageBlock = (contentBlock, streamBlock) => {
   }
 };
 
-// packages/experimental/assistant/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_file6 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/session/session.ts";
-var AISession = class _AISession {
-  constructor(_options) {
-    this._options = _options;
-    this._parser = new MixedStreamParser();
-    this._pending = [];
-    this._history = [];
-    this.message = this._parser.message;
-    this.block = this._parser.block;
-    this.update = this._parser.update;
-    this.streamEvent = this._parser.streamEvent;
-    this.userMessage = new Event2();
-    this._parser.message.on((message) => {
-      this._pending.push(message);
-    });
-  }
-  async run(options) {
-    const systemTools = [];
-    switch (this._options.operationModel) {
-      case "planning":
-        systemTools.push(this._createQueryArtifactsTool(options.artifacts), this._createPlanningTool(options));
-        break;
-      case "importing":
-        systemTools.push(this._createQueryArtifactsTool(options.artifacts), this._createRequireTool(options.artifacts, (artifactDefinitionIds) => {
-          for (const artifactDefinitionId of artifactDefinitionIds) {
-            requiredArtifactIds.add(artifactDefinitionId);
-          }
-        }));
-        break;
-      case "configured":
-        break;
-      default:
-        throw new TypeError(`Invalid operation model: ${this._options.operationModel}`);
-    }
-    this._history = [
-      ...options.history
-    ];
-    this._pending = [
-      await this._formatUserPrompt(options.artifactDiffResolver, options.prompt, options.history)
-    ];
-    this.userMessage.emit(this._pending.at(-1));
-    this._stream = void 0;
-    let error;
-    const requiredArtifactIds = new Set(options.requiredArtifactIds ?? []);
-    try {
-      let more = false;
-      do {
-        const tools = [
-          ...systemTools,
-          ...options.tools,
-          ...options.artifacts.filter((artifact) => requiredArtifactIds.has(artifact.id)).flatMap((artifact) => artifact.tools)
-        ];
-        log6("request", {
-          pending: this._pending.length,
-          history: this._history.length,
-          tools: tools.map((tool) => tool.name)
-        }, {
-          F: __dxlog_file6,
-          L: 181,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        this._stream = await options.client.execStream({
-          ...options.generationOptions ?? {},
-          // TODO(burdon): Rename messages or separate history/message.
-          history: [
-            ...this._history,
-            ...this._pending
-          ],
-          tools,
-          systemPrompt: options.systemPrompt ?? createBaseInstructions({
-            availableArtifacts: Array.from(requiredArtifactIds),
-            operationModel: this._options.operationModel
-          })
-        });
-        await this._parser.parse(this._stream);
-        await this._stream.complete();
-        log6("response", {
-          pending: this._pending
-        }, {
-          F: __dxlog_file6,
-          L: 206,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        more = false;
-        const message = this._pending.at(-1);
-        invariant5(message, void 0, {
-          F: __dxlog_file6,
-          L: 211,
-          S: this,
-          A: [
-            "message",
-            ""
-          ]
-        });
-        if (isToolUse(message)) {
-          log6("tool request...", void 0, {
-            F: __dxlog_file6,
-            L: 213,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-          const response = await runTools({
-            message: this._pending.at(-1),
-            tools,
-            extensions: options.extensions ?? {}
-          });
-          log6("tool response", {
-            response
-          }, {
-            F: __dxlog_file6,
-            L: 220,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-          switch (response.type) {
-            case "continue": {
-              this._pending = [
-                ...this._pending,
-                response.message
-              ];
-              this.userMessage.emit(response.message);
-              more = true;
-              break;
-            }
-          }
-        }
-      } while (more);
-    } catch (err) {
-      log6.catch(err, void 0, {
-        F: __dxlog_file6,
-        L: 232,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      if (err instanceof Error && err.message.includes("Overloaded")) {
-        error = new AIServiecOverloadedError("AI service overloaded", {
-          cause: err
-        });
-      } else {
-        error = new Error("AI service error", {
-          cause: err
-        });
-      }
-    } finally {
-      this._stream = void 0;
-    }
-    if (error) {
-      throw error;
-    }
-    return this._pending;
-  }
-  async runStructured(schema, options) {
-    const parser = structuredOutputParser(schema);
-    const result = await this.run({
-      ...options,
-      tools: [
-        ...options.tools,
-        parser.tool
-      ]
-    });
-    return parser.getResult(result);
-  }
-  async _formatUserPrompt(artifactDiffResolver, prompt, history) {
-    const prelude = [];
-    if (artifactDiffResolver) {
-      const versions = gatherObjectVersions(history);
-      const artifactDiff = await artifactDiffResolver(Array.from(versions.entries()).map(([id, version]) => ({
-        id,
-        lastVersion: version
-      })));
-      log6.info("vision", {
-        artifactDiff,
-        versions
-      }, {
-        F: __dxlog_file6,
-        L: 272,
-        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(VersionPin.createBlock(VersionPin.make({
-          objectId: id,
-          version
-        })));
-      }
-      if (artifactDiff.size > 0) {
-        prelude.push(createArtifactUpdateBlock(artifactDiff));
-      }
-    }
-    return create3(Message4, {
-      role: "user",
-      content: [
-        ...prelude,
-        {
-          type: "text",
-          text: prompt
-        }
-      ]
-    });
-  }
-  _createQueryArtifactsTool(artifacts) {
-    return defineTool2("system", {
-      name: "query_artifact_definitions",
-      description: "Query the available artifact definitions",
-      schema: Schema4.Struct({}),
-      execute: async () => {
-        return ToolResult3.Success({
-          artifactDefinitions: artifacts.map((artifact) => ({
-            id: artifact.id,
-            name: artifact.name,
-            description: artifact.description
-          }))
-        });
-      }
-    });
-  }
-  _createRequireTool(artifacts, onRequire) {
-    return defineTool2("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: Schema4.Struct({
-        artifactDefinitionIds: Schema4.Array(Schema4.String).annotations({
-          description: "The ids of the artifact definitions to require",
-          examples: [
-            [
-              "artifact:dxos.org/example/Test"
-            ]
-          ]
-        })
-      }),
-      execute: async ({ artifactDefinitionIds }) => {
-        const missingArtifactDefinitionIds = artifactDefinitionIds.filter((artifactId) => !artifacts.some((artifact) => artifact.id === artifactId));
-        if (missingArtifactDefinitionIds.length > 0) {
-          return ToolResult3.Error(`One or more artifact definition ids are invalid: ${missingArtifactDefinitionIds.join(", ")}`);
-        }
-        onRequire(artifactDefinitionIds);
-        return ToolResult3.Success({});
-      }
-    });
-  }
-  _createPlanningTool(options) {
-    return defineTool2("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: Schema4.Struct({
-        goal: Schema4.String.annotations({
-          description: "The goal that the plan will achieve."
-        }),
-        steps: Schema4.Array(Schema4.Struct({
-          action: Schema4.String.annotations({
-            description: "Complete, detailed action to perform."
-          }),
-          input: Schema4.String.annotations({
-            description: "The required input data for this step. First step must not require any data."
-          }),
-          output: Schema4.String.annotations({
-            description: "The output data from this step. This is passed to the next step as input."
-          }),
-          requiredArtifactIds: Schema4.Array(Schema4.String).annotations({
-            description: "The ids of the artifacts required to perform this step.",
-            examples: [
-              [
-                "artifact:dxos.org/example/Test"
-              ]
-            ]
-          })
-        })).annotations({
-          description: "Steps"
-        })
-      }),
-      execute: async ({ goal, steps }) => {
-        const missingArtifactIds = steps.flatMap((step) => step.requiredArtifactIds).filter((artifactId) => !options.artifacts.some((artifact) => artifact.id === artifactId));
-        if (missingArtifactIds.length > 0) {
-          return ToolResult3.Error(`One or more artifact ids are invalid: ${missingArtifactIds.join(", ")}`);
-        }
-        const stepResults = [];
-        for (const step of steps) {
-          log6("executing step", {
-            action: step.action
-          }, {
-            F: __dxlog_file6,
-            L: 379,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-          const session = new _AISession({
-            operationModel: "importing"
-          });
-          session.message.on((ev) => this.message.emit(ev));
-          session.block.on((ev) => this.block.emit(ev));
-          session.update.on((ev) => this.update.emit(ev));
-          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.
-              
-              While you know the plan's goal only focus on your subtask
-              Use the data from the previous step to complete your task.
-              Return all of the data from "output" in your last message.
-              
-              Current step (that you need to complete):
-              ${JSON.stringify({
-              goal,
-              input: step.input,
-              output: step.output,
-              yourTask: step.action
-            }, null, 2)}
-              
-              Previous step results:
-              ${JSON.stringify(stepResults.at(-1))}.
-            `
-          });
-          const result = messages.at(-1);
-          stepResults.push(result);
-        }
-        return ToolResult3.Success({
-          stepResults
-        });
-      }
-    });
-  }
-  abort() {
-    this._stream?.abort();
-  }
-};
-_ts_decorate([
-  synchronized
-], AISession.prototype, "run", null);
-var createBaseInstructions = ({ availableArtifacts, operationModel }) => `
-  You are a friendly, advanced AI assistant capable of creating and managing artifacts from available data and tools. 
-  Your task is to process user commands and questions and decide how best to respond.
-  In some cases, you will need to create or reference data objects called artifacts.
-
-  Follow these guidelines carefully:
-
-  Decision-making:
-
-  - Analyze the structure and type of the content in the user's message.
-  
-  
-  ${operationModel === "planning" ? `
-      - Can you complete the task using the available artifacts?
-      - If you can't complete the task using the available artifacts, query the list of available artifacts using the appropriate tool.
-      - Identify which artifacts are relevant to the user's request.
-        - Break down the user's request into a step-by-step plan that you will use to execute the user's request, the plan items should include artifacts which will be used to perform the actions.
-      ` : ""}
-  ${operationModel === "importing" ? `
-      - Can you complete the task using the available artifacts?
-      - If you can't complete the task using the available artifacts, query the list of available artifacts using the appropriate tool.
-      - Identify which artifacts are relevant to the user's request.
-    - Are the required artifacts already available?
-    - If not, select which artifact(s) will be the most relevant and require them using the require_artifacts tool.
-    - The require'd artifact tools will be available for use after require.
-  ` : ""}
-  ${operationModel === "configured" ? `
-    - Select the most relevant artifact(s) to complete the task.
-    - Call the appropriate tool to use the artifact(s).
-  ` : ""}
-
-  ${availableArtifacts.length > 0 ? `Artifacts already in context: ${availableArtifacts.join("\n")}` : ""}
-`;
-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(Schema4.decodeOption)(JSON.parse(block.json)).pipe(Option.getOrUndefined);
-        if (!pin) {
-          continue;
-        }
-        artifactIds.set(pin.objectId, pin.version);
-      }
-    }
-  }
-  return artifactIds;
-};
-var createArtifactUpdateBlock = (artifactDiff) => {
-  return {
-    type: "text",
-    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 ? `
-${diff}` : ""}</changed-artifact>`).join("\n")}
-    `
-  };
-};
-
-// packages/experimental/assistant/src/experimental/conversation/conversation.ts
-import { ObjectId as ObjectId3 } from "@dxos/echo-schema";
-import { invariant as invariant6 } from "@dxos/invariant";
-import { log as log7 } from "@dxos/log";
-var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/experimental/conversation/conversation.ts";
-var runLLM = async (params) => {
-  let conversationResult = null;
-  const history = params.history ?? [];
-  const generate = async () => {
-    log7("llm generate", {
-      tools: params.tools
-    }, {
-      F: __dxlog_file7,
-      L: 44,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
-    const beginTs = Date.now();
-    const stream = await params.client.execStream({
-      model: params.model,
-      history,
-      systemPrompt: params.system,
-      tools: params.tools
-    });
-    for await (const event of stream) {
-      params.logger?.(event);
-    }
-    await stream.complete();
-    const messages = [];
-    const message = messages.at(-1);
-    invariant6(message, void 0, {
-      F: __dxlog_file7,
-      L: 61,
-      S: void 0,
-      A: [
-        "message",
-        ""
-      ]
-    });
-    log7("llm result", {
-      time: Date.now() - beginTs,
-      message
-    }, {
-      F: __dxlog_file7,
-      L: 63,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
-    invariant6(message, void 0, {
-      F: __dxlog_file7,
-      L: 64,
-      S: void 0,
-      A: [
-        "message",
-        ""
-      ]
-    });
-    params.logger?.({
-      type: "message",
-      message
-    });
-    history.push(...messages.map((message2) => ({
-      ...message2,
-      content: message2.content.filter((block) => block.type !== "image")
-    })));
-    const isToolUse2 = message.content.at(-1)?.type === "tool_use";
-    if (isToolUse2) {
-      const toolCalls = message.content.filter((block) => block.type === "tool_use");
-      invariant6(toolCalls.length === 1, void 0, {
-        F: __dxlog_file7,
-        L: 75,
-        S: void 0,
-        A: [
-          "toolCalls.length === 1",
-          ""
-        ]
-      });
-      const toolCall = toolCalls[0];
-      const tool = params.tools.find((tool2) => tool2.name === toolCall.name);
-      if (!tool) {
-        throw new Error(`Tool not found: ${toolCall.name}`);
-      }
-      invariant6(tool.execute, void 0, {
-        F: __dxlog_file7,
-        L: 82,
-        S: void 0,
-        A: [
-          "tool.execute",
-          ""
-        ]
-      });
-      const toolResult = await tool.execute(toolCall.input);
-      switch (toolResult.kind) {
-        case "error": {
-          log7.warn("tool error", {
-            message: toolResult.message
-          }, {
-            F: __dxlog_file7,
-            L: 86,
-            S: void 0,
-            C: (f, a) => f(...a)
-          });
-          const resultMessage = {
-            id: ObjectId3.random(),
-            role: "user",
-            content: [
-              {
-                type: "tool_result",
-                toolUseId: toolCall.id,
-                content: toolResult.message,
-                isError: true
-              }
-            ]
-          };
-          params.logger?.({
-            type: "message",
-            message: resultMessage
-          });
-          history.push(resultMessage);
-          return true;
-        }
-        case "success": {
-          log7("tool success", {
-            result: toolResult.result
-          }, {
-            F: __dxlog_file7,
-            L: 106,
-            S: void 0,
-            C: (f, a) => f(...a)
-          });
-          const resultMessage = {
-            id: ObjectId3.random(),
-            role: "user",
-            content: [
-              {
-                type: "tool_result",
-                toolUseId: toolCall.id,
-                content: JSON.stringify(toolResult.result)
-              }
-            ]
-          };
-          params.logger?.({
-            type: "message",
-            message: resultMessage
-          });
-          history.push(resultMessage);
-          return true;
-        }
-        case "break": {
-          log7("tool break", {
-            result: toolResult.result
-          }, {
-            F: __dxlog_file7,
-            L: 125,
-            S: void 0,
-            C: (f, a) => f(...a)
-          });
-          conversationResult = toolResult.result;
-          return false;
-        }
-      }
-    }
-    return false;
-  };
-  while (await generate()) {
-  }
-  return {
-    result: conversationResult,
-    history
-  };
-};
-
-// packages/experimental/assistant/src/experimental/cypher/parjs.ts
+// packages/experimental/assistant/src/cypher/parjs.ts
 import { parjsCombinators, parjs } from "#parjs";
 
-// packages/experimental/assistant/src/experimental/cypher/combinators.ts
+// packages/experimental/assistant/src/cypher/combinators.ts
 var ws = parjs.whitespace();
 var nothing = parjs.string("").pipe(parjsCombinators.map(() => null));
 var optional = (parser) => parser.pipe(parjsCombinators.recover(() => ({
@@ -2274,7 +1806,7 @@ var cypherQuery = ws.pipe(parjsCombinators.then(matchClause, ws, optional(whereC
   returnClause: returnClause2
 })));
 
-// packages/experimental/assistant/src/experimental/cypher/parser.ts
+// packages/experimental/assistant/src/cypher/parser.ts
 var parseCypherQuery = (query) => {
   const parseResult = cypherQuery.parse(query);
   if (parseResult.isOk) {
@@ -2286,14 +1818,14 @@ var parseCypherQuery = (query) => {
   }
 };
 
-// packages/experimental/assistant/src/experimental/cypher/query-executor.ts
-import { log as log9 } from "@dxos/log";
+// packages/experimental/assistant/src/cypher/query-executor.ts
+import { log as log7 } from "@dxos/log";
 import { mapValues } from "@dxos/util";
 
-// packages/experimental/assistant/src/experimental/cypher/execution-plan.ts
-import { invariant as invariant7 } from "@dxos/invariant";
-import { log as log8 } from "@dxos/log";
-var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/experimental/cypher/execution-plan.ts";
+// packages/experimental/assistant/src/cypher/execution-plan.ts
+import { invariant as invariant5 } from "@dxos/invariant";
+import { log as log6 } from "@dxos/log";
+var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/cypher/execution-plan.ts";
 var createExecutionPlan = (query) => {
   return new ExecutionPlanBuilder().build(query);
 };
@@ -2305,10 +1837,10 @@ var ExecutionPlanBuilder = class {
     return `anon_${this.counter++}`;
   }
   build(query) {
-    log8("Creating execution plan for query", {
+    log6("Creating execution plan for query", {
       query
     }, {
-      F: __dxlog_file8,
+      F: __dxlog_file6,
       L: 76,
       S: this,
       C: (f, a) => f(...a)
@@ -2325,8 +1857,8 @@ var ExecutionPlanBuilder = class {
     };
   }
   createStepsForMatchClause(match) {
-    invariant7(match.pattern.segments.length > 0, void 0, {
-      F: __dxlog_file8,
+    invariant5(match.pattern.segments.length > 0, void 0, {
+      F: __dxlog_file6,
       L: 90,
       S: this,
       A: [
@@ -2335,8 +1867,8 @@ var ExecutionPlanBuilder = class {
       ]
     });
     const firstSegment = match.pattern.segments[0];
-    invariant7(firstSegment.astKind === "NodePattern", void 0, {
-      F: __dxlog_file8,
+    invariant5(firstSegment.astKind === "NodePattern", void 0, {
+      F: __dxlog_file6,
       L: 92,
       S: this,
       A: [
@@ -2363,8 +1895,8 @@ var ExecutionPlanBuilder = class {
     }
     for (let i = 1; i < match.pattern.segments.length; i++) {
       const relationshipSegment = match.pattern.segments[i++];
-      invariant7(relationshipSegment.astKind === "RelationshipPattern", void 0, {
-        F: __dxlog_file8,
+      invariant5(relationshipSegment.astKind === "RelationshipPattern", void 0, {
+        F: __dxlog_file6,
         L: 115,
         S: this,
         A: [
@@ -2373,8 +1905,8 @@ var ExecutionPlanBuilder = class {
         ]
       });
       const nodeSegment = match.pattern.segments[i];
-      invariant7(nodeSegment.astKind === "NodePattern", void 0, {
-        F: __dxlog_file8,
+      invariant5(nodeSegment.astKind === "NodePattern", void 0, {
+        F: __dxlog_file6,
         L: 117,
         S: this,
         A: [
@@ -2456,16 +1988,16 @@ var getDirection = (left, right) => {
   throw new Error(`Invalid direction: ()${left}[]${right}()`);
 };
 
-// packages/experimental/assistant/src/experimental/cypher/query-executor.ts
-var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/experimental/cypher/query-executor.ts";
+// packages/experimental/assistant/src/cypher/query-executor.ts
+var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/cypher/query-executor.ts";
 var executeQueryPlan = async (dataSource, plan) => {
   let buffer = [];
   const results = [];
   for (const step of plan.steps) {
-    log9("begin step", {
+    log7("begin step", {
       step
     }, {
-      F: __dxlog_file9,
+      F: __dxlog_file7,
       L: 41,
       S: void 0,
       C: (f, a) => f(...a)
@@ -2551,11 +2083,11 @@ var executeQueryPlan = async (dataSource, plan) => {
         break;
       }
     }
-    log9("finish step", {
+    log7("finish step", {
       buffer: buffer.map((tuple) => mapValues(tuple, (x) => x.id)),
       results
     }, {
-      F: __dxlog_file9,
+      F: __dxlog_file7,
       L: 118,
       S: void 0,
       C: (f, a) => f(...a)
@@ -2582,7 +2114,7 @@ var jsonPathGet = (obj, path) => {
   return result;
 };
 
-// packages/experimental/assistant/src/experimental/cypher/schema.ts
+// packages/experimental/assistant/src/cypher/schema.ts
 import { raise } from "@dxos/debug";
 import { JSON_SCHEMA_ECHO_REF_ID } from "@dxos/echo-schema";
 
@@ -2594,7 +2126,7 @@ var trim = (strings, ...values) => {
   return combined.replace("/^\n/", "").replace(/\n$/, "");
 };
 
-// packages/experimental/assistant/src/experimental/cypher/schema.ts
+// packages/experimental/assistant/src/cypher/schema.ts
 var formatJsonSchemaForLLM = (schemaTypes) => {
   return schemaTypes.flatMap((schema) => [
     formatNodeSchema(schema),
@@ -2648,18 +2180,19 @@ var formatInferredRelationshipLabel = (typename, property2) => {
 };
 var isReference = (schema) => schema.$id === JSON_SCHEMA_ECHO_REF_ID || schema.type === "array" && !Array.isArray(schema.items) && typeof schema.items === "object" && "$id" in schema.items && schema.items.$id === JSON_SCHEMA_ECHO_REF_ID;
 
-// packages/experimental/assistant/src/experimental/cypher/echo-data-source.ts
+// packages/experimental/assistant/src/cypher/echo-data-source.ts
 import { raise as raise2 } from "@dxos/debug";
 import { Filter } from "@dxos/echo-db";
-import { getSchema, getSchemaTypename, StoredSchema, toJsonSchema } from "@dxos/echo-schema";
-import { log as log10 } from "@dxos/log";
-function _ts_decorate2(decorators, target, key, desc) {
+import { getSchemaTypename, StoredSchema, toJsonSchema } from "@dxos/echo-schema";
+import { getSchema } from "@dxos/live-object";
+import { log as log8 } from "@dxos/log";
+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_file10 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/experimental/cypher/echo-data-source.ts";
+var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/cypher/echo-data-source.ts";
 var EchoDataSource = class {
   constructor(_db) {
     this._db = _db;
@@ -2669,11 +2202,11 @@ var EchoDataSource = class {
       const { objects: objects2 } = await this._db.query().run();
       return objects2.map(this._objectToNode);
     }
-    const schema = (await this._getAllSchema()).find((schema2) => getSchemaTypename(schema2)?.endsWith(label2));
+    const schema = (await this._getAllSchema()).find((s) => getSchemaTypename(s)?.endsWith(label2));
     if (!schema) {
       return [];
     }
-    const { objects } = await this._db.query(Filter.type(schema)).run();
+    const { objects } = await this._db.query(Filter.schema(schema)).run();
     return objects.map(this._objectToNode);
   }
   async getRelationships({ label: label2 }) {
@@ -2693,14 +2226,14 @@ var EchoDataSource = class {
     if (!relationship) {
       return [];
     }
-    const { objects } = await this._db.query(Filter.type(relationship.schema)).run();
+    const { objects } = await this._db.query(Filter.schema(relationship.schema)).run();
     return (await Promise.all(objects.map((object) => this._projectRefRelationship(object, relationship.property)))).flat();
   }
   async _getAllSchema() {
     return [
       ...await this._db.schemaRegistry.query().run(),
       // TODO(dmaretskyi): Remove once we can serialize recursive schema.
-      ...this._db.graph.schemaRegistry.schemas.filter((schema) => getSchemaTypename(schema)?.startsWith("example.org"))
+      ...this._db.graph.schemaRegistry.schemas.filter((s) => getSchemaTypename(s)?.startsWith("example.org"))
     ].filter((schema) => getSchemaTypename(schema) !== StoredSchema.typename);
   }
   _objectToNode(object) {
@@ -2732,17 +2265,17 @@ var EchoDataSource = class {
     }));
   }
 };
-_ts_decorate2([
-  log10.method(void 0, void 0, {
-    F: __dxlog_file10,
-    L: 18,
+_ts_decorate([
+  log8.method(void 0, void 0, {
+    F: __dxlog_file8,
+    L: 17,
     S: void 0,
     C: (f, a) => f(...a)
   })
 ], EchoDataSource.prototype, "getNodes", null);
-_ts_decorate2([
-  log10.method(void 0, void 0, {
-    F: __dxlog_file10,
+_ts_decorate([
+  log8.method(void 0, void 0, {
+    F: __dxlog_file8,
     L: 34,
     S: void 0,
     C: (f, a) => f(...a)
@@ -2764,17 +2297,13 @@ export {
   LLMModel,
   ToolTypes,
   GenerateRequest,
-  GenerateResponse,
+  runLLM,
   isToolUse,
   runTools,
-  VersionPin,
-  AISession,
-  AIServiecOverloadedError,
   OllamaClient,
   StreamTransform,
   MixedStreamParser,
   mergeMessageBlock,
-  runLLM,
   parseCypherQuery,
   executeQueryPlan,
   executeQuery,
@@ -2785,4 +2314,4 @@ export {
   isReference,
   EchoDataSource
 };
-//# sourceMappingURL=chunk-SAWYU3V5.mjs.map
+//# sourceMappingURL=chunk-DCQJOLSR.mjs.map