@dxos/assistant 0.7.4-df37807 → 0.7.5-feature-compute.4d9d99a

package/dist/lib/node-esm/{chunk-WUPUPEFB.mjs → chunk-ZLBTRSUY.mjs}

@@ -1,133 +1,11 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
 
-// packages/experimental/assistant/src/ai-service/schema.ts
-import { Schema as S } from "@effect/schema";
-import { ulid } from "ulidx";
-import { JsonSchemaType } from "@dxos/echo-schema";
-import { SpaceId } from "@dxos/keys";
-var SpaceIdSchema = S.String.pipe(S.filter(SpaceId.isValid));
-var ObjectIdBrand = Symbol("@dxos/echo/ObjectId");
-var ObjectIdSchema = S.ULID.pipe(S.brand(ObjectIdBrand));
-var ObjectId = class extends ObjectIdSchema {
-  static random() {
-    return ulid();
-  }
-};
-var Space = S.Struct({
-  id: SpaceIdSchema
-});
-var Thread = S.Struct({
-  id: ObjectId,
-  spaceId: SpaceIdSchema
-});
-var MessageRole = S.String.pipe(S.filter((role) => role === "user" || role === "assistant"));
-var MessageTextContentBlock = S.Struct({
-  type: S.Literal("text"),
-  text: S.String
-}).pipe(S.mutable);
-var ImageSource = S.Struct({
-  type: S.Literal("base64"),
-  media_type: S.Literal("image/jpeg", "image/png", "image/gif", "image/webp"),
-  data: S.String
-}).pipe(S.mutable);
-var MessageImageContentBlock = S.Struct({
-  type: S.Literal("image"),
-  id: S.optional(S.String),
-  source: S.optional(ImageSource)
-}).pipe(S.mutable);
-var MessageToolUseContentBlock = S.Struct({
-  type: S.Literal("tool_use"),
-  /**
-  * Opaque service-defined ID of the tool invocation.
-  * Used to match the tool result block.
-  */
-  id: S.String,
-  /**
-  * Tool name.
-  */
-  name: S.String,
-  input: S.Unknown,
-  /**
-  * Used to accumulate the partial tool input JSON in streaming mode.
-  */
-  inputJson: S.optional(S.String)
-}).pipe(S.mutable);
-var MessageToolResultContentBlock = S.Struct({
-  type: S.Literal("tool_result"),
-  toolUseId: S.String,
-  content: S.String,
-  isError: S.optional(S.Boolean)
-});
-var MessageContentBlock = S.Union(MessageTextContentBlock, MessageImageContentBlock, MessageToolUseContentBlock, MessageToolResultContentBlock);
-var Message = S.Struct({
-  id: ObjectId,
-  threadId: S.optional(ObjectId),
-  spaceId: S.optional(SpaceIdSchema),
-  role: MessageRole,
-  content: S.Array(MessageContentBlock).pipe(S.mutable),
-  /**
-  * ID of the message from the foreign provider.
-  */
-  // TODO(dmaretskyi): Should be in meta/keys.
-  foreignId: S.optional(S.String)
-});
-var MessageFromDb = S.Struct({
-  ...Message.fields,
-  content: S.propertySignature(Message.fields.content.pipe((schema) => S.parseJson(schema))).pipe(S.fromKey("contentJson"))
-});
-var LLMModel = S.Literal("@hf/nousresearch/hermes-2-pro-mistral-7b", "@anthropic/claude-3-5-sonnet-20241022", "@anthropic/claude-3-5-haiku-20241022", "@ollama/llama-3-2-3b", "@ollama/llama-3-1-nemotron-70b-instruct", "@ollama/llama-3-1-nemotron-mini-4b-instruct");
-var ToolTypes = Object.freeze({
-  // TODO(dmaretskyi): Not implemented yet.
-  // DatabaseQuery: 'database_query',
-  TextToImage: "text_to_image"
-});
-var LLMTool = S.Struct({
-  name: S.String,
-  /**
-  * If the tool is implemented by the service a type should be provided.
-  * For user-implemented tools, this field should be omitted.
-  * See {@link ToolTypes} for the list of supported types.
-  */
-  type: S.optional(S.String),
-  /**
-  * Required for user-implemented tools.
-  */
-  description: S.optional(S.String),
-  /**
-  * Input schema for the tool in the JSON Schema format.
-  * Required for user-implemented tools.
-  */
-  parameters: S.optional(JsonSchemaType),
-  /**
-  * Tool-specific options.
-  */
-  options: S.optional(S.Any),
-  /**
-  * Javascript function to execute the tool.
-  */
-  execute: S.optional(S.Any)
-});
-var GenerateRequest = S.Struct({
-  model: LLMModel,
-  spaceId: SpaceIdSchema,
-  threadId: ObjectId,
-  /**
-  * System instructions to the LLM.
-  */
-  // TODO(dmaretskyi): Should this be part of the thread?.
-  systemPrompt: S.optional(S.String),
-  /**
-  * Tools available for the LLM.
-  */
-  tools: S.Array(LLMTool).pipe(S.mutable)
-});
-
-// packages/experimental/assistant/src/ai-service/client.ts
-import { Schema as S2 } from "@effect/schema";
+// packages/experimental/assistant/src/ai-service/stream.ts
 import { Trigger } from "@dxos/async";
 import { invariant } from "@dxos/invariant";
+import { log } from "@dxos/log";
 
-// packages/experimental/assistant/src/ai-service/sse.ts
+// packages/experimental/assistant/src/ai-service/util/sse.ts
 async function* iterSSEMessages(response, controller) {
   if (!response.body) {
     controller.abort();
@@ -364,84 +242,45 @@ var LineDecoder = class _LineDecoder {
   }
 };
 
-// packages/experimental/assistant/src/ai-service/client.ts
-var __dxlog_file = "/Users/yarolegovich/Documents/Workspace/dxos/packages/experimental/assistant/src/ai-service/client.ts";
-var AIServiceClientImpl = class {
-  constructor({ endpoint }) {
-    this._endpoint = endpoint;
-  }
-  async getSpace(spaceId) {
-    throw new Error("Not implemented");
-  }
-  async getThread(spaceId, threadId) {
-    throw new Error("Not implemented");
-  }
-  async getMessagesInThread(spaceId, threadId) {
-    const res = await fetch(`${this._endpoint}/space/${spaceId}/thread/${threadId}/message`);
-    return S2.decodePromise(S2.Array(Message).pipe(S2.mutable))((await res.json()).data.results);
-  }
-  async insertMessages(messages) {
-    const res = await fetch(`${this._endpoint}/message`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify({
-        messages: await S2.encodePromise(S2.Array(Message))(messages)
-      })
-    });
-    if (!res.ok) {
-      throw new Error(await res.text());
-    }
-  }
-  // TODO(dmaretskyi): Accept partial message schema.
-  async updateMessage(spaceId, threadId, messageId, message) {
-    throw new Error("Not implemented");
-  }
-  async generate(request) {
-    const response = await fetch(`${this._endpoint}/generate`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify(request)
-    });
-    invariant(response.body instanceof ReadableStream, void 0, {
-      F: __dxlog_file,
-      L: 81,
-      S: this,
-      A: [
-        "response.body instanceof ReadableStream",
-        ""
-      ]
-    });
-    return GenerationStream.fromSSEResponse({
-      spaceId: request.spaceId,
-      threadId: request.threadId
-    }, response);
-  }
-};
+// packages/experimental/assistant/src/ai-service/stream.ts
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/ai-service/stream.ts";
 var GenerationStream = class _GenerationStream {
-  static fromSSEResponse(params, response) {
-    const controller = new AbortController();
+  /**
+  * Creates a stream from an SSE response.
+  */
+  static fromSSEResponse(params, response, controller = new AbortController()) {
     const iterator = async function* () {
       for await (const sse of iterSSEMessages(response, controller)) {
         if (sse.event === "completion") {
           try {
             yield JSON.parse(sse.data);
-          } catch (e) {
-            console.error("Could not parse message into JSON:", sse.data);
-            console.error("From chunk:", sse.raw);
-            throw e;
+          } catch (err) {
+            log.error("could not parse message into JSON:", {
+              data: sse.data,
+              raw: sse.raw
+            }, {
+              F: __dxlog_file,
+              L: 30,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+            throw err;
           }
         }
         if (sse.event === "message_start" || sse.event === "message_delta" || sse.event === "message_stop" || sse.event === "content_block_start" || sse.event === "content_block_delta" || sse.event === "content_block_stop") {
           try {
             yield JSON.parse(sse.data);
-          } catch (e) {
-            console.error("Could not parse message into JSON:", sse.data);
-            console.error("From chunk:", sse.raw);
-            throw e;
+          } catch (err) {
+            log.error("could not parse message into JSON:", {
+              data: sse.data,
+              raw: sse.raw
+            }, {
+              F: __dxlog_file,
+              L: 46,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+            throw err;
           }
         }
         if (sse.event === "ping") {
@@ -452,22 +291,20 @@ var GenerationStream = class _GenerationStream {
         }
       }
     };
-    return new _GenerationStream(params, iterator);
+    return new _GenerationStream(controller, iterator, params);
   }
-  constructor(_params, _getIterator) {
-    this._params = _params;
+  constructor(_controller, _getIterator, _params) {
+    this._controller = _controller;
     this._getIterator = _getIterator;
+    this._params = _params;
+    this._done = new Trigger();
     this._previousMessages = [];
     this._accumulatedMessage = void 0;
-    this._done = new Trigger();
     this._iterator = void 0;
   }
   [Symbol.asyncIterator]() {
     return this._createIterator();
   }
-  cancel() {
-    throw new Error("Not implemented");
-  }
   get accumulatedMessages() {
     return [
       ...this._previousMessages,
@@ -477,6 +314,12 @@ var GenerationStream = class _GenerationStream {
     ];
   }
   /**
+  * Aborts the stream.
+  */
+  abort() {
+    this._controller.abort();
+  }
+  /**
   * Returns the complete message list generated by the AI service.
   */
   async complete() {
@@ -485,12 +328,20 @@ var GenerationStream = class _GenerationStream {
   }
   _createIterator() {
     const self = this;
-    return this._iterator ??= async function* () {
-      for await (const event of self._getIterator()) {
-        self._processEvent(event);
-        yield event;
-      }
-    }();
+    return this._iterator ??= (() => {
+      const generator = async function* () {
+        try {
+          for await (const event of self._getIterator()) {
+            self._processEvent(event);
+            yield event;
+          }
+          this._done.wake();
+        } catch (err) {
+          this._done.throw(err);
+        }
+      };
+      return generator.call(this);
+    })();
   }
   _processEvent(event) {
     switch (event.type) {
@@ -521,7 +372,7 @@ var GenerationStream = class _GenerationStream {
       case "content_block_start": {
         invariant(this._accumulatedMessage, void 0, {
           F: __dxlog_file,
-          L: 212,
+          L: 148,
           S: this,
           A: [
             "this._accumulatedMessage",
@@ -534,7 +385,7 @@ var GenerationStream = class _GenerationStream {
       case "content_block_delta": {
         invariant(this._accumulatedMessage, void 0, {
           F: __dxlog_file,
-          L: 217,
+          L: 154,
           S: this,
           A: [
             "this._accumulatedMessage",
@@ -553,7 +404,7 @@ var GenerationStream = class _GenerationStream {
       case "content_block_stop": {
         invariant(this._accumulatedMessage, void 0, {
           F: __dxlog_file,
-          L: 233,
+          L: 171,
           S: this,
           A: [
             "this._accumulatedMessage",
@@ -562,12 +413,207 @@ var GenerationStream = class _GenerationStream {
         });
         const lastBlock = this._accumulatedMessage.content.at(-1);
         if (lastBlock?.type === "tool_use") {
-          lastBlock.input = JSON.parse(lastBlock.inputJson ?? "");
+          lastBlock.input = lastBlock.inputJson == null || lastBlock.inputJson === "" ? {} : JSON.parse(lastBlock.inputJson ?? "");
         }
         break;
       }
     }
-    this._done.wake();
+  }
+};
+
+// packages/experimental/assistant/src/ai-service/types/message.ts
+import { Schema as S } from "@effect/schema";
+import { EchoObject, ObjectId } from "@dxos/echo-schema";
+import { SpaceId } from "@dxos/keys";
+var SpaceIdSchema = S.String.pipe(S.filter(SpaceId.isValid));
+var Space = S.Struct({
+  id: SpaceIdSchema
+});
+var Thread = S.Struct({
+  id: ObjectId,
+  spaceId: SpaceIdSchema
+});
+var MessageRole = S.String.pipe(S.filter((role) => role === "user" || role === "assistant"));
+var TagContentBlock = S.Struct({
+  type: S.Literal("tag"),
+  tag: S.String,
+  text: S.String
+}).pipe(S.mutable);
+var TextContentBlock = S.Struct({
+  type: S.Literal("text"),
+  text: S.String
+}).pipe(S.mutable);
+var ImageSource = S.Struct({
+  type: S.Literal("base64"),
+  media_type: S.Literal("image/jpeg", "image/png", "image/gif", "image/webp"),
+  data: S.String
+}).pipe(S.mutable);
+var ImageContentBlock = S.Struct({
+  type: S.Literal("image"),
+  id: S.optional(S.String),
+  source: S.optional(ImageSource)
+}).pipe(S.mutable);
+var ToolUseContentBlock = S.Struct({
+  type: S.Literal("tool_use"),
+  /**
+  * Opaque service-defined ID of the tool invocation.
+  * Used to match the tool result block.
+  */
+  id: S.String,
+  /**
+  * Tool name.
+  */
+  name: S.String,
+  input: S.Unknown,
+  /**
+  * Used to accumulate the partial tool input JSON in streaming mode.
+  */
+  // TODO(burdon): Remove?
+  inputJson: S.optional(S.String)
+}).pipe(S.mutable);
+var ToolResultContentBlock = S.Struct({
+  type: S.Literal("tool_result"),
+  toolUseId: S.String,
+  content: S.String,
+  isError: S.optional(S.Boolean)
+});
+var MessageContentBlock = S.Union(TagContentBlock, TextContentBlock, ImageContentBlock, ToolUseContentBlock, ToolResultContentBlock);
+var MessageSchema = S.Struct({
+  id: ObjectId,
+  threadId: S.optional(ObjectId),
+  spaceId: S.optional(SpaceIdSchema),
+  /**
+  * ID of the message from the foreign provider.
+  */
+  // TODO(dmaretskyi): Should be in meta/keys.
+  foreignId: S.optional(S.String),
+  // TODO(dmaretskyi): Figure out how to deal with those.
+  // created: S.optional(S.DateFromString),
+  // updated: S.optional(S.DateFromString),
+  role: MessageRole,
+  // TODO(burdon): Rename blocks?
+  content: S.Array(MessageContentBlock).pipe(S.mutable)
+});
+var Message = MessageSchema.pipe(EchoObject("dxos.org/type/Message", "0.1.0"));
+
+// packages/experimental/assistant/src/ai-service/types/schema.ts
+import { Schema as S2 } from "@effect/schema";
+import { JsonSchemaType, ObjectId as ObjectId2 } from "@dxos/echo-schema";
+var LLMModel = S2.Literal("@hf/nousresearch/hermes-2-pro-mistral-7b", "@anthropic/claude-3-5-sonnet-20241022", "@anthropic/claude-3-5-haiku-20241022", "@ollama/llama-3-2-3b", "@ollama/llama-3-1-nemotron-70b-instruct", "@ollama/llama-3-1-nemotron-mini-4b-instruct", "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b");
+var ToolTypes = Object.freeze({
+  // TODO(dmaretskyi): Not implemented yet.
+  // DatabaseQuery: 'database_query',
+  TextToImage: "text_to_image"
+});
+var LLMTool = S2.Struct({
+  name: S2.String,
+  /**
+  * If the tool is implemented by the service a type should be provided.
+  * For user-implemented tools, this field should be omitted.
+  * See {@link ToolTypes} for the list of supported types.
+  */
+  type: S2.optional(S2.String),
+  /**
+  * Required for user-implemented tools.
+  */
+  description: S2.optional(S2.String),
+  /**
+  * Input schema for the tool in the JSON Schema format.
+  * Required for user-implemented tools.
+  */
+  parameters: S2.optional(JsonSchemaType),
+  /**
+  * Tool-specific options.
+  */
+  options: S2.optional(S2.Any),
+  /**
+  * Javascript function to execute the tool.
+  */
+  execute: S2.optional(S2.Any)
+});
+var GenerateRequest = S2.Struct({
+  model: LLMModel,
+  spaceId: S2.optional(SpaceIdSchema),
+  threadId: S2.optional(ObjectId2),
+  /**
+  * History of messages to include in the context window.
+  */
+  history: S2.optional(S2.Array(Message)),
+  /**
+  * System instructions to the LLM.
+  */
+  // TODO(dmaretskyi): Should this be part of the thread?.
+  systemPrompt: S2.optional(S2.String),
+  /**
+  * Tools available for the LLM.
+  */
+  tools: S2.optional(S2.Array(LLMTool).pipe(S2.mutable))
+});
+
+// packages/experimental/assistant/src/ai-service/client.ts
+import { Schema as S3 } from "@effect/schema";
+import { invariant as invariant2 } from "@dxos/invariant";
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/ai-service/client.ts";
+var AIServiceClientImpl = class {
+  constructor({ endpoint }) {
+    this._endpoint = endpoint;
+  }
+  async getSpace(spaceId) {
+    throw new Error("Not implemented");
+  }
+  async getThread(spaceId, threadId) {
+    throw new Error("Not implemented");
+  }
+  async getMessages(spaceId, threadId) {
+    const res = await fetch(`${this._endpoint}/space/${spaceId}/thread/${threadId}/message`);
+    return S3.decodePromise(S3.Array(Message).pipe(S3.mutable))((await res.json()).data.results);
+  }
+  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 S3.encodePromise(S3.Array(Message))(messages)
+      })
+    });
+    if (!res.ok) {
+      throw new Error(`${await res.text()} [${url}]`);
+    }
+  }
+  // TODO(dmaretskyi): Accept partial message schema.
+  async updateMessage(spaceId, threadId, messageId, message) {
+    throw new Error("Not implemented");
+  }
+  /**
+  * Open message stream.
+  */
+  async generate(request) {
+    const controller = new AbortController();
+    const signal = controller.signal;
+    const response = await fetch(`${this._endpoint}/generate`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify(request),
+      signal
+    });
+    invariant2(response.body instanceof ReadableStream, void 0, {
+      F: __dxlog_file2,
+      L: 85,
+      S: this,
+      A: [
+        "response.body instanceof ReadableStream",
+        ""
+      ]
+    });
+    return GenerationStream.fromSSEResponse({
+      spaceId: request.spaceId,
+      threadId: request.threadId
+    }, response, controller);
   }
 };
 
@@ -661,13 +707,13 @@ var parseCypherQuery = (query) => {
 };
 
 // packages/experimental/assistant/src/cypher/query-executor.ts
-import { log as log2 } from "@dxos/log";
+import { log as log3 } from "@dxos/log";
 import { mapValues } from "@dxos/util";
 
 // packages/experimental/assistant/src/cypher/execution-plan.ts
-import { invariant as invariant2 } from "@dxos/invariant";
-import { log } from "@dxos/log";
-var __dxlog_file2 = "/Users/yarolegovich/Documents/Workspace/dxos/packages/experimental/assistant/src/cypher/execution-plan.ts";
+import { invariant as invariant3 } from "@dxos/invariant";
+import { log as log2 } from "@dxos/log";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/cypher/execution-plan.ts";
 var createExecutionPlan = (query) => {
   return new ExecutionPlanBuilder().build(query);
 };
@@ -679,10 +725,10 @@ var ExecutionPlanBuilder = class {
     return `anon_${this.counter++}`;
   }
   build(query) {
-    log("Creating execution plan for query", {
+    log2("Creating execution plan for query", {
       query
     }, {
-      F: __dxlog_file2,
+      F: __dxlog_file3,
       L: 76,
       S: this,
       C: (f, a) => f(...a)
@@ -699,8 +745,8 @@ var ExecutionPlanBuilder = class {
     };
   }
   createStepsForMatchClause(match) {
-    invariant2(match.pattern.segments.length > 0, void 0, {
-      F: __dxlog_file2,
+    invariant3(match.pattern.segments.length > 0, void 0, {
+      F: __dxlog_file3,
       L: 90,
       S: this,
       A: [
@@ -709,8 +755,8 @@ var ExecutionPlanBuilder = class {
       ]
     });
     const firstSegment = match.pattern.segments[0];
-    invariant2(firstSegment.astKind === "NodePattern", void 0, {
-      F: __dxlog_file2,
+    invariant3(firstSegment.astKind === "NodePattern", void 0, {
+      F: __dxlog_file3,
       L: 92,
       S: this,
       A: [
@@ -737,8 +783,8 @@ var ExecutionPlanBuilder = class {
     }
     for (let i = 1; i < match.pattern.segments.length; i++) {
       const relationshipSegment = match.pattern.segments[i++];
-      invariant2(relationshipSegment.astKind === "RelationshipPattern", void 0, {
-        F: __dxlog_file2,
+      invariant3(relationshipSegment.astKind === "RelationshipPattern", void 0, {
+        F: __dxlog_file3,
         L: 115,
         S: this,
         A: [
@@ -747,8 +793,8 @@ var ExecutionPlanBuilder = class {
         ]
       });
       const nodeSegment = match.pattern.segments[i];
-      invariant2(nodeSegment.astKind === "NodePattern", void 0, {
-        F: __dxlog_file2,
+      invariant3(nodeSegment.astKind === "NodePattern", void 0, {
+        F: __dxlog_file3,
         L: 117,
         S: this,
         A: [
@@ -831,15 +877,15 @@ var getDirection = (left, right) => {
 };
 
 // packages/experimental/assistant/src/cypher/query-executor.ts
-var __dxlog_file3 = "/Users/yarolegovich/Documents/Workspace/dxos/packages/experimental/assistant/src/cypher/query-executor.ts";
+var __dxlog_file4 = "/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) {
-    log2("begin step", {
+    log3("begin step", {
       step
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file4,
       L: 41,
       S: void 0,
       C: (f, a) => f(...a)
@@ -925,11 +971,11 @@ var executeQueryPlan = async (dataSource, plan) => {
         break;
       }
     }
-    log2("finish step", {
+    log3("finish step", {
       buffer: buffer.map((tuple) => mapValues(tuple, (x) => x.id)),
       results
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file4,
       L: 118,
       S: void 0,
       C: (f, a) => f(...a)
@@ -1027,14 +1073,14 @@ import { raise as raise2 } from "@dxos/debug";
 import { Filter } from "@dxos/echo-db";
 import { getSchemaTypename, StoredSchema, toJsonSchema } from "@dxos/echo-schema";
 import { getSchema } from "@dxos/live-object";
-import { log as log3 } from "@dxos/log";
+import { log as log4 } 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_file4 = "/Users/yarolegovich/Documents/Workspace/dxos/packages/experimental/assistant/src/cypher/echo-data-source.ts";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/cypher/echo-data-source.ts";
 var EchoDataSource = class {
   constructor(_db) {
     this._db = _db;
@@ -1108,62 +1154,143 @@ var EchoDataSource = class {
   }
 };
 _ts_decorate([
-  log3.method(void 0, void 0, {
-    F: __dxlog_file4,
+  log4.method(void 0, void 0, {
+    F: __dxlog_file5,
     L: 17,
     S: void 0,
     C: (f, a) => f(...a)
   })
 ], EchoDataSource.prototype, "getNodes", null);
 _ts_decorate([
-  log3.method(void 0, void 0, {
-    F: __dxlog_file4,
+  log4.method(void 0, void 0, {
+    F: __dxlog_file5,
     L: 34,
     S: void 0,
     C: (f, a) => f(...a)
   })
 ], EchoDataSource.prototype, "getRelationships", null);
 
+// packages/experimental/assistant/src/conversation/types.ts
+import { Schema as S4 } from "@effect/schema";
+import { toJsonSchema as toJsonSchema2, JsonSchemaType as JsonSchemaType2, ObjectId as ObjectId3 } from "@dxos/echo-schema";
+import { log as log5 } from "@dxos/log";
+var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/conversation/types.ts";
+var createUserMessage = (spaceId, threadId, text) => ({
+  id: ObjectId3.random(),
+  spaceId,
+  threadId,
+  role: "user",
+  content: [
+    {
+      type: "text",
+      text
+    }
+  ]
+});
+var LLMToolDefinition = S4.Struct({
+  name: S4.String,
+  description: S4.String,
+  parameters: JsonSchemaType2,
+  execute: S4.Any
+});
+var LLMToolResult = Object.freeze({
+  /**
+  * The tool execution was successful.
+  * Gives the result back to the LLM.
+  */
+  Success: (result, extractContentBlocks) => ({
+    kind: "success",
+    result,
+    extractContentBlocks
+  }),
+  Error: (message) => ({
+    kind: "error",
+    message
+  }),
+  /**
+  * Stop the conversation and return the result.
+  */
+  Break: (result) => ({
+    kind: "break",
+    result
+  })
+});
+var defineTool = ({ name, description, schema, execute }) => {
+  return {
+    name,
+    description,
+    parameters: toFunctionParameterSchema(schema),
+    execute: (params, context) => {
+      const sanitized = S4.decodeSync(schema)(params);
+      return execute(sanitized, context);
+    }
+  };
+};
+var toFunctionParameterSchema = (schema) => {
+  const jsonSchema = toJsonSchema2(schema);
+  log5("tool schema", {
+    jsonSchema
+  }, {
+    F: __dxlog_file6,
+    L: 120,
+    S: void 0,
+    C: (f, a) => f(...a)
+  });
+  delete jsonSchema.anyOf;
+  delete jsonSchema.$id;
+  jsonSchema.type = "object";
+  jsonSchema.properties ??= {};
+  for (const key in jsonSchema.properties) {
+    if (typeof jsonSchema.properties[key].description !== "string") {
+      throw new Error(`Property missing description: ${key}`);
+    }
+  }
+  return jsonSchema;
+};
+
 // packages/experimental/assistant/src/conversation/conversation.ts
-import { invariant as invariant3 } from "@dxos/invariant";
-import { log as log4 } from "@dxos/log";
-var __dxlog_file5 = "/Users/yarolegovich/Documents/Workspace/dxos/packages/experimental/assistant/src/conversation/conversation.ts";
+import { createStatic, ObjectId as ObjectId4 } from "@dxos/echo-schema";
+import { invariant as invariant4 } from "@dxos/invariant";
+import { log as log6 } from "@dxos/log";
+var __dxlog_file7 = "/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 () => {
-    log4("llm generate", {
+    log6("llm generate", {
       tools: params.tools
     }, {
-      F: __dxlog_file5,
-      L: 42,
+      F: __dxlog_file7,
+      L: 45,
       S: void 0,
       C: (f, a) => f(...a)
     });
     const beginTs = Date.now();
-    const result = await params.client.generate({
+    const stream = await params.client.generate({
       model: params.model,
       spaceId: params.spaceId,
       threadId: params.threadId,
+      history,
       systemPrompt: params.system,
       tools: params.tools
     });
-    for await (const event of result) {
+    for await (const event of stream) {
       params.logger?.(event);
     }
-    const messages = await result.complete();
+    const messages = await stream.complete();
     const message = messages.at(-1);
-    log4("llm result", {
+    log6("llm result", {
       time: Date.now() - beginTs,
       message
     }, {
-      F: __dxlog_file5,
-      L: 58,
+      F: __dxlog_file7,
+      L: 62,
       S: void 0,
       C: (f, a) => f(...a)
     });
-    invariant3(message, void 0, {
-      F: __dxlog_file5,
-      L: 59,
+    invariant4(message, void 0, {
+      F: __dxlog_file7,
+      L: 63,
       S: void 0,
       A: [
         "message",
@@ -1174,16 +1301,16 @@ var runLLM = async (params) => {
       type: "message",
       message
     });
-    await params.client.insertMessages(messages.map((msg) => ({
-      ...msg,
-      content: msg.content.filter((c) => c.type !== "image")
+    history.push(...messages.map((message2) => ({
+      ...message2,
+      content: message2.content.filter((block) => block.type !== "image")
     })));
-    const isToolUse = message.content.at(-1)?.type === "tool_use";
-    if (isToolUse) {
+    const isToolUse2 = message.content.at(-1)?.type === "tool_use";
+    if (isToolUse2) {
       const toolCalls = message.content.filter((c) => c.type === "tool_use");
-      invariant3(toolCalls.length === 1, void 0, {
-        F: __dxlog_file5,
-        L: 68,
+      invariant4(toolCalls.length === 1, void 0, {
+        F: __dxlog_file7,
+        L: 74,
         S: void 0,
         A: [
           "toolCalls.length === 1",
@@ -1191,23 +1318,23 @@ var runLLM = async (params) => {
         ]
       });
       const toolCall = toolCalls[0];
-      const tool = params.tools.find((t) => t.name === toolCall.name);
+      const tool = params.tools.find((tool2) => tool2.name === toolCall.name);
       if (!tool) {
         throw new Error(`Tool not found: ${toolCall.name}`);
       }
       const toolResult = await tool.execute(toolCall.input, {});
       switch (toolResult.kind) {
         case "error": {
-          log4("tool error", {
+          log6.warn("tool error", {
             message: toolResult.message
           }, {
-            F: __dxlog_file5,
-            L: 78,
+            F: __dxlog_file7,
+            L: 84,
             S: void 0,
             C: (f, a) => f(...a)
           });
           const resultMessage = {
-            id: ObjectId.random(),
+            id: ObjectId4.random(),
             spaceId: params.spaceId,
             threadId: params.threadId,
             role: "user",
@@ -1224,22 +1351,20 @@ var runLLM = async (params) => {
             type: "message",
             message: resultMessage
           });
-          await params.client.insertMessages([
-            resultMessage
-          ]);
+          history.push(resultMessage);
           return true;
         }
         case "success": {
-          log4("tool success", {
+          log6("tool success", {
             result: toolResult.result
           }, {
-            F: __dxlog_file5,
-            L: 99,
+            F: __dxlog_file7,
+            L: 106,
             S: void 0,
             C: (f, a) => f(...a)
           });
           const resultMessage = {
-            id: ObjectId.random(),
+            id: ObjectId4.random(),
             spaceId: params.spaceId,
             threadId: params.threadId,
             role: "user",
@@ -1255,17 +1380,15 @@ var runLLM = async (params) => {
             type: "message",
             message: resultMessage
           });
-          await params.client.insertMessages([
-            resultMessage
-          ]);
+          history.push(resultMessage);
           return true;
         }
         case "break": {
-          log4("tool break", {
+          log6("tool break", {
             result: toolResult.result
           }, {
-            F: __dxlog_file5,
-            L: 119,
+            F: __dxlog_file7,
+            L: 127,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -1279,105 +1402,129 @@ var runLLM = async (params) => {
   while (await generate()) {
   }
   return {
-    result: conversationResult
+    result: conversationResult,
+    history
   };
 };
-
-// packages/experimental/assistant/src/conversation/types.ts
-import { Schema as S3 } from "@effect/schema";
-import { toJsonSchema as toJsonSchema2 } from "@dxos/echo-schema";
-import { JsonSchemaType as JsonSchemaType2 } from "@dxos/echo-schema";
-import { log as log5 } from "@dxos/log";
-var __dxlog_file6 = "/Users/yarolegovich/Documents/Workspace/dxos/packages/experimental/assistant/src/conversation/types.ts";
-var createUserMessage = (spaceId, threadId, text) => ({
-  id: ObjectId.random(),
-  spaceId,
-  threadId,
-  role: "user",
-  content: [
-    {
-      type: "text",
-      text
-    }
-  ]
-});
-var LLMToolDefinition = S3.Struct({
-  name: S3.String,
-  description: S3.String,
-  parameters: JsonSchemaType2,
-  execute: S3.Any
-});
-var LLMToolResult = Object.freeze({
-  /**
-  * The tool execution was successful.
-  * Gives the result back to the LLM.
-  */
-  Success: (result) => ({
-    kind: "success",
-    result
-  }),
-  Error: (message) => ({
-    kind: "error",
-    message
-  }),
-  /**
-  * Stop the conversation and return the result.
-  */
-  Break: (result) => ({
-    kind: "break",
-    result
-  })
-});
-var defineTool = ({ name, description, schema, execute }) => {
-  return {
-    name,
-    description,
-    parameters: toFunctionParameterSchema(schema),
-    execute: (params, context) => {
-      const sanitized = S3.decodeSync(schema)(params);
-      return execute(sanitized, context);
-    }
-  };
-};
-var toFunctionParameterSchema = (schema) => {
-  const jsonSchema = toJsonSchema2(schema);
-  log5("tool schema", {
-    jsonSchema
-  }, {
-    F: __dxlog_file6,
-    L: 83,
+var isToolUse = (message) => message.content.at(-1)?.type === "tool_use";
+var runTools = async ({ message, tools, extensions }) => {
+  const toolCalls = message.content.filter((block) => block.type === "tool_use");
+  invariant4(toolCalls.length === 1, void 0, {
+    F: __dxlog_file7,
+    L: 165,
     S: void 0,
-    C: (f, a) => f(...a)
+    A: [
+      "toolCalls.length === 1",
+      ""
+    ]
   });
-  for (const key in jsonSchema.properties) {
-    if (typeof jsonSchema.properties[key].description !== "string") {
-      throw new Error(`Property missing description: ${key}`);
+  const toolCall = toolCalls[0];
+  const tool = tools.find((tool2) => tool2.name === toolCall.name);
+  if (!tool) {
+    throw new Error(`Tool not found: ${toolCall.name}`);
+  }
+  let toolResult;
+  try {
+    toolResult = await tool.execute(toolCall.input, {
+      extensions
+    });
+  } catch (error) {
+    log6("tool error", {
+      error
+    }, {
+      F: __dxlog_file7,
+      L: 176,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+    toolResult = LLMToolResult.Error(error.message);
+  }
+  switch (toolResult.kind) {
+    case "error": {
+      log6("tool error", {
+        message: toolResult.message
+      }, {
+        F: __dxlog_file7,
+        L: 182,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+      const resultMessage = createStatic(Message, {
+        role: "user",
+        content: [
+          {
+            type: "tool_result",
+            toolUseId: toolCall.id,
+            content: toolResult.message,
+            isError: true
+          }
+        ]
+      });
+      return {
+        type: "continue",
+        message: resultMessage
+      };
+    }
+    case "success": {
+      log6("tool success", {
+        result: toolResult.result
+      }, {
+        F: __dxlog_file7,
+        L: 203,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+      const resultMessage = createStatic(Message, {
+        role: "user",
+        content: [
+          {
+            type: "tool_result",
+            toolUseId: toolCall.id,
+            content: typeof toolResult.result === "string" ? toolResult.result : JSON.stringify(toolResult.result)
+          }
+        ]
+      });
+      return {
+        type: "continue",
+        message: resultMessage
+      };
+    }
+    case "break": {
+      log6("tool break", {
+        result: toolResult.result
+      }, {
+        F: __dxlog_file7,
+        L: 222,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+      return {
+        type: "break",
+        result: toolResult.result
+      };
     }
   }
-  return jsonSchema;
 };
 
 export {
+  GenerationStream,
   SpaceIdSchema,
-  ObjectIdBrand,
-  ObjectId,
   Space,
   Thread,
   MessageRole,
-  MessageTextContentBlock,
+  TagContentBlock,
+  TextContentBlock,
   ImageSource,
-  MessageImageContentBlock,
-  MessageToolUseContentBlock,
-  MessageToolResultContentBlock,
+  ImageContentBlock,
+  ToolUseContentBlock,
+  ToolResultContentBlock,
   MessageContentBlock,
   Message,
-  MessageFromDb,
   LLMModel,
   ToolTypes,
   LLMTool,
   GenerateRequest,
   AIServiceClientImpl,
-  GenerationStream,
   parseCypherQuery,
   executeQueryPlan,
   executeQuery,
@@ -1387,10 +1534,12 @@ export {
   formatInferredRelationshipLabel,
   isReference,
   EchoDataSource,
-  runLLM,
   createUserMessage,
   LLMToolDefinition,
   LLMToolResult,
-  defineTool
+  defineTool,
+  runLLM,
+  isToolUse,
+  runTools
 };
-//# sourceMappingURL=chunk-WUPUPEFB.mjs.map
+//# sourceMappingURL=chunk-ZLBTRSUY.mjs.map