@dxos/assistant 0.8.0 → 0.8.1-main.303c73a

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

@@ -10,8 +10,25 @@ import {
   parseCypherQuery
 } from "./chunk-GOVFOBIB.mjs";
 
-// packages/experimental/assistant/src/ai-service/client.ts
-import { Schema as S } from "@effect/schema";
+// packages/experimental/assistant/src/ai-service/defs.ts
+var DEFAULT_LLM_MODEL = "@anthropic/claude-3-5-sonnet-20241022";
+var DEFAULT_LLM_MODELS = [
+  // AI Gateway.
+  // https://developers.cloudflare.com/ai-gateway
+  "@anthropic/claude-3-5-haiku-20241022",
+  "@anthropic/claude-3-5-sonnet-20241022",
+  "@anthropic/claude-3-7-sonnet-20250219",
+  // Workers AI.
+  // https://developers.cloudflare.com/workers-ai/models
+  "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+  "@hf/nousresearch/hermes-2-pro-mistral-7b",
+  "@ollama/llama-3-1-nemotron-70b-instruct",
+  "@ollama/llama-3-1-nemotron-mini-4b-instruct",
+  "@ollama/llama-3-2-3b"
+];
+
+// packages/experimental/assistant/src/ai-service/edge-client.ts
+import { Schema as S } from "effect";
 import { Message } from "@dxos/artifact";
 import { invariant } from "@dxos/invariant";
 import { log as log2 } from "@dxos/log";
@@ -271,7 +288,7 @@ var createGenerationStream = (response, controller = new AbortController()) => {
             raw: sse.raw
           }, {
             F: __dxlog_file,
-            L: 21,
+            L: 22,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -287,7 +304,7 @@ var createGenerationStream = (response, controller = new AbortController()) => {
             raw: sse.raw
           }, {
             F: __dxlog_file,
-            L: 37,
+            L: 38,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -302,9 +319,9 @@ var createGenerationStream = (response, controller = new AbortController()) => {
       }
     }
   };
-  return new GenerationStream(controller, iterator);
+  return new GenerationStreamImpl(controller, iterator);
 };
-var GenerationStream = class {
+var GenerationStreamImpl = class {
   constructor(_controller, _getIterator) {
     this._controller = _controller;
     this._getIterator = _getIterator;
@@ -343,6 +360,7 @@ var GenerationStream = class {
           this._done.wake();
         } catch (err) {
           this._done.throw(err);
+          throw err;
         }
       };
       return generator.call(this);
@@ -350,13 +368,13 @@ var GenerationStream = class {
   }
 };
 
-// packages/experimental/assistant/src/ai-service/client.ts
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/ai-service/client.ts";
-var AIServiceClientImpl = class {
+// packages/experimental/assistant/src/ai-service/edge-client.ts
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/ai-service/edge-client.ts";
+var AIServiceEdgeClient = class {
   constructor({ endpoint }) {
     invariant(endpoint, "endpoint is required", {
       F: __dxlog_file2,
-      L: 34,
+      L: 23,
       S: this,
       A: [
         "endpoint",
@@ -365,6 +383,10 @@ var AIServiceClientImpl = class {
     });
     this._endpoint = endpoint;
   }
+  /**
+  * @deprecated
+  */
+  // TODO(burdon): Remove.
   async appendMessages(messages) {
     const url = `${this._endpoint}/message`;
     const res = await fetch(url, {
@@ -384,15 +406,11 @@ var AIServiceClientImpl = class {
   * Process request and open message stream.
   */
   async exec(request) {
-    request = {
-      tools: request.tools ?? [],
-      ...request
-    };
     log2.info("requesting", {
       endpoint: this._endpoint
     }, {
       F: __dxlog_file2,
-      L: 63,
+      L: 50,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -403,11 +421,15 @@ var AIServiceClientImpl = class {
       headers: {
         "Content-Type": "application/json"
       },
-      body: JSON.stringify(request)
+      body: JSON.stringify({
+        // TODO(dmaretskyi): Errors if tools are not provided.
+        tools: request.tools ?? [],
+        ...request
+      })
     });
     invariant(response.body instanceof ReadableStream, void 0, {
       F: __dxlog_file2,
-      L: 72,
+      L: 63,
       S: this,
       A: [
         "response.body instanceof ReadableStream",
@@ -418,495 +440,81 @@ var AIServiceClientImpl = class {
   }
 };
 
-// packages/experimental/assistant/src/ai-service/defs.ts
-var DEFAULT_LLM_MODEL = "@anthropic/claude-3-5-sonnet-20241022";
-var DEFAULT_LLM_MODELS = [
-  // AI Gateway.
-  // https://developers.cloudflare.com/ai-gateway
-  "@anthropic/claude-3-5-haiku-20241022",
-  "@anthropic/claude-3-5-sonnet-20241022",
-  "@anthropic/claude-3-7-sonnet-20250219",
-  // Workers AI.
-  // https://developers.cloudflare.com/workers-ai/models
-  "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
-  "@hf/nousresearch/hermes-2-pro-mistral-7b",
-  "@ollama/llama-3-1-nemotron-70b-instruct",
-  "@ollama/llama-3-1-nemotron-mini-4b-instruct",
-  "@ollama/llama-3-2-3b"
-];
-
-// packages/experimental/assistant/src/ai-service/parser.ts
-import { Message as Message2 } from "@dxos/artifact";
-import { Event } from "@dxos/async";
-import { createStatic } from "@dxos/echo-schema";
-import { invariant as invariant2 } from "@dxos/invariant";
-import { log as log3 } 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) => ({
-  type: "text",
-  content
-}));
-var attribute = P.seq(P.regexp(/[a-zA-Z_][a-zA-Z0-9_-]*/), P.string("=").trim(P.optWhitespace), P.alt(P.regexp(/"[^"]*"/).map((s) => s.slice(1, -1)), P.regexp(/'[^']*'/).map((s) => s.slice(1, -1)))).map(([name, _, value]) => [
-  name,
-  value
-]);
-var tagName = P.regexp(/[a-zA-Z_][a-zA-Z0-9_-]*/);
-var selfClosingTag = P.seqMap(
-  //
-  P.string("<"),
-  tagName,
-  P.optWhitespace.then(attribute).many(),
-  P.optWhitespace.then(P.string("/>")),
-  P.optWhitespace,
-  (_, tag, attributes, __) => ({
-    type: "tag",
-    tag,
-    attributes: Object.fromEntries(attributes),
-    content: [],
-    selfClosing: true
-  })
-);
-var openTag = P.seqMap(
-  //
-  P.string("<"),
-  tagName,
-  P.optWhitespace.then(attribute).many(),
-  P.string(">"),
-  P.regexp(/[^<]*/),
-  (_, tag, attributes, __, content) => ({
-    type: "tag",
-    tag,
-    attributes: Object.fromEntries(attributes),
-    content: content.length ? [
-      {
-        type: "text",
-        content
-      }
-    ] : []
-  })
-);
-var closeTag = P.seqMap(
-  //
-  P.string("</"),
-  tagName,
-  P.string(">"),
-  P.optWhitespace,
-  (_, tag) => ({
-    type: "tag",
-    tag,
-    content: [],
-    closing: true
-  })
-);
-var mixedChunk = P.alt(selfClosingTag, openTag, closeTag, textChunk);
-var StreamTransform = class {
-  constructor() {
-    this._buffer = "";
-  }
-  transform(chunk) {
-    this._buffer += chunk;
-    const results = [];
-    const parser = mixedChunk.many().skip(P.optWhitespace);
-    const result = parser.parse(this._buffer);
-    if (result.status) {
-      for (const chunk2 of result.value) {
-        results.push(chunk2);
-      }
-      this._buffer = "";
-    }
-    return results;
-  }
-  // TODO(burdon): Process remaining buffer?
-  flush() {
-    const remaining = this._buffer;
-    this._buffer = "";
-    return remaining.length > 0 ? [
-      {
-        type: "text",
-        content: remaining
-      }
-    ] : [];
-  }
-};
-
-// packages/experimental/assistant/src/ai-service/parser.ts
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/ai-service/parser.ts";
-var MixedStreamParser = class {
+// packages/experimental/assistant/src/ai-service/message-collector.ts
+var MessageCollector = class {
   constructor() {
-    /**
-    * New message.
-    */
-    this.message = new Event();
-    /**
-    * Complete block added to Message.
-    */
-    this.block = new Event();
-    /**
-    * Update partial block (while streaming).
-    */
-    this.update = new Event();
+    this._messages = [];
+    this._pendingMessage = void 0;
   }
-  _emitBlock(contentBlock, streamBlock) {
-    const messageBlock = streamBlock ? mergeMessageBlock(contentBlock, streamBlock) : contentBlock;
-    if (messageBlock) {
-      if (messageBlock.type === "text" && messageBlock.text.length === 0) {
-        return;
-      }
-      invariant2(this._message, void 0, {
-        F: __dxlog_file3,
-        L: 46,
-        S: this,
-        A: [
-          "this._message",
-          ""
-        ]
-      });
-      this._message.content.push(messageBlock);
-      this.block.emit(messageBlock);
-    }
+  get messages() {
+    return this._messages;
   }
-  _emitUpdate(contentBlock, streamBlock) {
-    const messageBlock = mergeMessageBlock(contentBlock, streamBlock);
-    if (messageBlock) {
-      messageBlock.pending = true;
-      this.update.emit(messageBlock);
-    }
+  get pendingMessage() {
+    return this._pendingMessage;
   }
-  /**
-  * Parse stream until end.
-  */
-  async parse(stream) {
-    const transformer = new StreamTransform();
-    let contentBlock;
-    let streamBlock;
-    const stack = [];
-    const messagesCollected = [];
-    for await (const event of stream) {
-      switch (event.type) {
-        //
-        // Messages.
-        //
-        case "message_start": {
-          if (this._message) {
-            log3.warn("unexpected message_start", void 0, {
-              F: __dxlog_file3,
-              L: 88,
-              S: this,
-              C: (f, a) => f(...a)
-            });
-          }
-          this._message = createStatic(Message2, {
-            role: "assistant",
-            content: []
-          });
-          this.message.emit(this._message);
-          break;
+  push(event) {
+    switch (event.type) {
+      case "message_start":
+        this._pendingMessage = event.message;
+        break;
+      case "message_stop":
+        if (this._pendingMessage) {
+          this._messages.push(this._pendingMessage);
+          this._pendingMessage = void 0;
         }
-        case "message_delta": {
-          if (!this._message) {
-            log3.warn("unexpected message_delta", void 0, {
-              F: __dxlog_file3,
-              L: 98,
-              S: this,
-              C: (f, a) => f(...a)
-            });
-          }
-          break;
+        break;
+      case "content_block_start":
+        if (this._pendingMessage) {
+          this._pendingMessage.content = this._pendingMessage.content || [];
+          this._pendingMessage.content[event.index] = event.content;
         }
-        case "message_stop": {
-          if (!this._message) {
-            log3.warn("unexpected message_stop", void 0, {
-              F: __dxlog_file3,
-              L: 106,
-              S: this,
-              C: (f, a) => f(...a)
-            });
-          } else {
-            messagesCollected.push(this._message);
-            this._message = void 0;
+        break;
+      case "content_block_delta":
+        if (this._pendingMessage && this._pendingMessage.content) {
+          const block = this._pendingMessage.content[event.index];
+          if (block && event.delta.type === "text_delta" && block.type === "text") {
+            block.text = (block.text || "") + event.delta.text;
           }
-          break;
         }
-        //
-        // Content blocks.
-        //
-        case "content_block_start": {
-          if (contentBlock) {
-            log3.warn("unexpected content_block_start", {
-              content: contentBlock
-            }, {
-              F: __dxlog_file3,
-              L: 120,
-              S: this,
-              C: (f, a) => f(...a)
-            });
+        break;
+      case "content_block_stop":
+        if (this._pendingMessage && this._pendingMessage.content) {
+          const block = this._pendingMessage.content[event.index];
+          if (block) {
+            block.pending = false;
           }
-          contentBlock = event.content;
-          break;
         }
-        case "content_block_delta": {
-          if (!contentBlock) {
-            log3.warn("unexpected content_block_delta", void 0, {
-              F: __dxlog_file3,
-              L: 130,
-              S: this,
-              C: (f, a) => f(...a)
-            });
-            break;
-          }
-          switch (event.delta.type) {
-            //
-            // Text
-            //
-            case "text_delta": {
-              const chunks = transformer.transform(event.delta.text);
-              for (const chunk of chunks) {
-                switch (streamBlock?.type) {
-                  //
-                  // XML Fragment.
-                  //
-                  case "tag": {
-                    if (chunk.type === "tag") {
-                      if (chunk.selfClosing) {
-                        streamBlock.content.push(chunk);
-                      } else if (chunk.closing) {
-                        if (stack.length > 0) {
-                          const top = stack.pop();
-                          invariant2(top && top.type === "tag", void 0, {
-                            F: __dxlog_file3,
-                            L: 154,
-                            S: this,
-                            A: [
-                              "top && top.type === 'tag'",
-                              ""
-                            ]
-                          });
-                          top.content.push(streamBlock);
-                          streamBlock = top;
-                        } else {
-                          this._emitBlock(contentBlock, streamBlock);
-                          streamBlock = void 0;
-                        }
-                      } else {
-                        stack.push(streamBlock);
-                        streamBlock = chunk;
-                      }
-                    } else {
-                      if (streamBlock.content.length === 0) {
-                        streamBlock.content.push(chunk);
-                      } else {
-                        const last = streamBlock.content.at(-1);
-                        invariant2(last, void 0, {
-                          F: __dxlog_file3,
-                          L: 171,
-                          S: this,
-                          A: [
-                            "last",
-                            ""
-                          ]
-                        });
-                        if (last.type === "text") {
-                          last.content += chunk.content;
-                        } else {
-                          streamBlock.content.push(chunk);
-                        }
-                      }
-                    }
-                    break;
-                  }
-                  //
-                  // Text Fragment.
-                  //
-                  case "text": {
-                    if (chunk.type === "tag") {
-                      this._emitBlock(contentBlock, streamBlock);
-                      if (chunk.selfClosing) {
-                        this._emitBlock(contentBlock, chunk);
-                        streamBlock = void 0;
-                      } else {
-                        streamBlock = chunk;
-                      }
-                    } else {
-                      streamBlock.content += chunk.content;
-                    }
-                    break;
-                  }
-                  //
-                  // No current chunk.
-                  //
-                  default: {
-                    if (chunk.type === "tag" && chunk.selfClosing) {
-                      this._emitBlock(contentBlock, chunk);
-                    } else {
-                      streamBlock = chunk;
-                    }
-                  }
-                }
-              }
-              break;
-            }
-            //
-            // JSON
-            //
-            case "input_json_delta": {
-              if (!contentBlock) {
-                log3.warn("unexpected input_json_delta", {
-                  contentBlock
-                }, {
-                  F: __dxlog_file3,
-                  L: 221,
-                  S: this,
-                  C: (f, a) => f(...a)
-                });
-                break;
-              }
-              if (streamBlock?.type === "json") {
-                streamBlock.content += event.delta.partial_json;
-              } else {
-                streamBlock = {
-                  type: "json",
-                  content: event.delta.partial_json
-                };
-              }
-              break;
-            }
-          }
-          break;
-        }
-        case "content_block_stop": {
-          if (!contentBlock) {
-            log3.warn("unexpected content_block_stop", void 0, {
-              F: __dxlog_file3,
-              L: 238,
-              S: this,
-              C: (f, a) => f(...a)
-            });
-            break;
-          }
-          this._emitBlock(contentBlock, streamBlock);
-          contentBlock = void 0;
-          streamBlock = void 0;
-          break;
+        break;
+      case "message_delta":
+        if (this._pendingMessage && event.delta) {
+          Object.assign(this._pendingMessage, event.delta);
         }
-      }
-      if (contentBlock && streamBlock) {
-        this._emitUpdate(contentBlock, streamBlock);
-      }
+        break;
     }
-    return messagesCollected;
   }
-};
-var mergeMessageBlock = (contentBlock, streamBlock) => {
-  log3("mergeMessageBlock", {
-    contentBlock,
-    streamBlock
-  }, {
-    F: __dxlog_file3,
-    L: 265,
-    S: void 0,
-    C: (f, a) => f(...a)
-  });
-  switch (streamBlock.type) {
-    //
-    // Text
-    //
-    case "text": {
-      return {
-        ...contentBlock,
-        type: "text",
-        text: streamBlock.content
-      };
-    }
-    //
-    // XML
-    //
-    case "tag": {
-      switch (streamBlock.tag) {
-        case "cot": {
-          const content = streamBlock.content.map((block) => {
-            switch (block.type) {
-              case "text":
-                return block.content;
-              default:
-                return null;
-            }
-          }).filter(isNotFalsy).join("\n");
-          return {
-            ...contentBlock,
-            type: "text",
-            disposition: "cot",
-            text: content
-          };
-        }
-        case "artifact": {
-          const { attributes } = streamBlock;
-          return {
-            type: "json",
-            disposition: "artifact",
-            json: JSON.stringify(attributes)
-          };
-        }
-        case "suggest": {
-          if (streamBlock.content.length === 1 && streamBlock.content[0].type === "text") {
-            return {
-              type: "json",
-              disposition: "suggest",
-              json: JSON.stringify({
-                text: streamBlock.content[0].content
-              })
-            };
-          }
-          break;
-        }
-        case "select": {
-          return {
-            type: "json",
-            disposition: "select",
-            json: JSON.stringify({
-              options: streamBlock.content.flatMap((content) => content.type === "tag" && content.content.length === 1 && content.content[0].type === "text" ? [
-                content.content[0].content
-              ] : [])
-            })
-          };
-        }
-        case "tool-list": {
-          return {
-            type: "json",
-            disposition: "tool_list",
-            json: JSON.stringify({})
-          };
-        }
-      }
-      break;
-    }
-    //
-    // JSON
-    //
-    case "json": {
-      switch (contentBlock.type) {
-        case "tool_use": {
-          return {
-            ...contentBlock,
-            input: safeParseJson(streamBlock.content) ?? {}
-          };
-        }
-      }
-      return {
-        ...contentBlock,
-        type: "json",
-        disposition: "artifact",
-        json: streamBlock.content
-      };
-    }
+  pushMessage(message) {
+    this._messages.push(message);
   }
 };
+function* emitMessageAsEvents(message) {
+  yield {
+    type: "message_start",
+    message
+  };
+  yield {
+    type: "message_stop"
+  };
+}
+
+// packages/experimental/assistant/src/ai-service/ollama-client.ts
+import { defineTool, ToolResult as ToolResult2 } from "@dxos/artifact";
+import { ObjectId as ObjectId3, S as S3 } from "@dxos/echo-schema";
+import { invariant as invariant3 } from "@dxos/invariant";
+import { log as log4 } from "@dxos/log";
 
 // packages/experimental/assistant/src/ai-service/types.ts
-import { Schema as S2 } from "@effect/schema";
-import { Tool, Message as Message3, SpaceIdSchema } 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 = S2.Literal(...DEFAULT_LLM_MODELS);
@@ -934,27 +542,27 @@ var GenerateRequest = S2.Struct({
   * History of messages to include in the context window.
   */
   // TODO(burdon): Rename messages.
-  history: S2.optional(S2.Array(Message3)),
+  history: S2.optional(S2.Array(Message2)),
   /**
   * Current request.
   */
-  prompt: S2.optional(Message3)
+  prompt: S2.optional(Message2)
 });
 
 // packages/experimental/assistant/src/conversation/conversation.ts
-import { ToolResult, Message as Message4 } from "@dxos/artifact";
-import { createStatic as createStatic2, ObjectId as ObjectId2 } 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/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/conversation/conversation.ts";
 var runLLM = async (params) => {
   let conversationResult = null;
   const history = params.history ?? [];
   const generate = async () => {
-    log4("llm generate", {
+    log3("llm generate", {
       tools: params.tools
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 44,
       S: void 0,
       C: (f, a) => f(...a)
@@ -974,8 +582,8 @@ var runLLM = async (params) => {
     await stream.complete();
     const messages = [];
     const message = messages.at(-1);
-    invariant3(message, void 0, {
-      F: __dxlog_file4,
+    invariant2(message, void 0, {
+      F: __dxlog_file3,
       L: 63,
       S: void 0,
       A: [
@@ -983,17 +591,17 @@ var runLLM = async (params) => {
         ""
       ]
     });
-    log4("llm result", {
+    log3("llm result", {
       time: Date.now() - beginTs,
       message
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 65,
       S: void 0,
       C: (f, a) => f(...a)
     });
-    invariant3(message, void 0, {
-      F: __dxlog_file4,
+    invariant2(message, void 0, {
+      F: __dxlog_file3,
       L: 66,
       S: void 0,
       A: [
@@ -1012,8 +620,8 @@ var runLLM = async (params) => {
     const isToolUse2 = message.content.at(-1)?.type === "tool_use";
     if (isToolUse2) {
       const toolCalls = message.content.filter((block) => block.type === "tool_use");
-      invariant3(toolCalls.length === 1, void 0, {
-        F: __dxlog_file4,
+      invariant2(toolCalls.length === 1, void 0, {
+        F: __dxlog_file3,
         L: 77,
         S: void 0,
         A: [
@@ -1026,8 +634,8 @@ var runLLM = async (params) => {
       if (!tool) {
         throw new Error(`Tool not found: ${toolCall.name}`);
       }
-      invariant3(tool.execute, void 0, {
-        F: __dxlog_file4,
+      invariant2(tool.execute, void 0, {
+        F: __dxlog_file3,
         L: 84,
         S: void 0,
         A: [
@@ -1038,10 +646,10 @@ var runLLM = async (params) => {
       const toolResult = await tool.execute(toolCall.input);
       switch (toolResult.kind) {
         case "error": {
-          log4.warn("tool error", {
+          log3.warn("tool error", {
             message: toolResult.message
           }, {
-            F: __dxlog_file4,
+            F: __dxlog_file3,
             L: 88,
             S: void 0,
             C: (f, a) => f(...a)
@@ -1068,10 +676,10 @@ var runLLM = async (params) => {
           return true;
         }
         case "success": {
-          log4("tool success", {
+          log3("tool success", {
             result: toolResult.result
           }, {
-            F: __dxlog_file4,
+            F: __dxlog_file3,
             L: 110,
             S: void 0,
             C: (f, a) => f(...a)
@@ -1097,10 +705,10 @@ var runLLM = async (params) => {
           return true;
         }
         case "break": {
-          log4("tool break", {
+          log3("tool break", {
             result: toolResult.result
           }, {
-            F: __dxlog_file4,
+            F: __dxlog_file3,
             L: 131,
             S: void 0,
             C: (f, a) => f(...a)
@@ -1119,10 +727,10 @@ var runLLM = async (params) => {
     history
   };
 };
-var isToolUse = (message) => {
+var isToolUse = (message, { onlyToolNames } = {}) => {
   const block = message.content.at(-1);
-  invariant3(block, void 0, {
-    F: __dxlog_file4,
+  invariant2(block, void 0, {
+    F: __dxlog_file3,
     L: 152,
     S: void 0,
     A: [
@@ -1130,12 +738,12 @@ var isToolUse = (message) => {
       ""
     ]
   });
-  return block.type === "tool_use";
+  return block.type === "tool_use" && (!onlyToolNames || onlyToolNames.includes(block.name));
 };
 var runTools = async ({ message, tools, extensions }) => {
   const toolCalls = message.content.filter((block) => block.type === "tool_use");
-  invariant3(toolCalls.length === 1, void 0, {
-    F: __dxlog_file4,
+  invariant2(toolCalls.length === 1, void 0, {
+    F: __dxlog_file3,
     L: 174,
     S: void 0,
     A: [
@@ -1150,8 +758,8 @@ var runTools = async ({ message, tools, extensions }) => {
   }
   let toolResult;
   try {
-    invariant3(tool.execute, void 0, {
-      F: __dxlog_file4,
+    invariant2(tool.execute, void 0, {
+      F: __dxlog_file3,
       L: 183,
       S: void 0,
       A: [
@@ -1163,10 +771,10 @@ var runTools = async ({ message, tools, extensions }) => {
       extensions
     });
   } catch (error) {
-    log4("tool error", {
+    log3("tool error", {
       error
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 186,
       S: void 0,
       C: (f, a) => f(...a)
@@ -1175,15 +783,15 @@ var runTools = async ({ message, tools, extensions }) => {
   }
   switch (toolResult.kind) {
     case "error": {
-      log4("tool error", {
+      log3("tool error", {
         message: toolResult.message
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file3,
         L: 192,
         S: void 0,
         C: (f, a) => f(...a)
       });
-      const resultMessage = createStatic2(Message4, {
+      const resultMessage = createStatic(Message3, {
         role: "user",
         content: [
           {
@@ -1200,22 +808,23 @@ var runTools = async ({ message, tools, extensions }) => {
       };
     }
     case "success": {
-      log4("tool success", {
+      log3("tool success", {
         result: toolResult.result
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file3,
         L: 213,
         S: void 0,
         C: (f, a) => f(...a)
       });
-      const resultMessage = createStatic2(Message4, {
+      const resultMessage = createStatic(Message3, {
         role: "user",
         content: [
           {
             type: "tool_result",
             toolUseId: toolCall.id,
             content: typeof toolResult.result === "string" ? toolResult.result : JSON.stringify(toolResult.result) ?? ""
-          }
+          },
+          ...toolResult.extractContentBlocks ?? []
         ]
       });
       return {
@@ -1224,11 +833,11 @@ var runTools = async ({ message, tools, extensions }) => {
       };
     }
     case "break": {
-      log4("tool break", {
+      log3("tool break", {
         result: toolResult.result
       }, {
-        F: __dxlog_file4,
-        L: 233,
+        F: __dxlog_file3,
+        L: 234,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -1239,19 +848,850 @@ var runTools = async ({ message, tools, extensions }) => {
     }
   }
 };
+
+// packages/experimental/assistant/src/ai-service/ollama-client.ts
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/ai-service/ollama-client.ts";
+var DEFAULT_OLLAMA_URL = "http://localhost:11434";
+var DEFAULT_OLLAMA_MODEL = "llama3.2:1b";
+var OllamaClient = class _OllamaClient {
+  /**
+  * Create a test client with small local model and no temperature for predictable results.
+  */
+  static createClient(options) {
+    return new _OllamaClient({
+      tools: options?.tools,
+      overrides: {
+        model: DEFAULT_OLLAMA_MODEL,
+        temperature: 0
+      }
+    });
+  }
+  /**
+  * Check if Ollama server is running and accessible.
+  * @returns Promise that resolves to true if Ollama is running, false otherwise.
+  */
+  static async isRunning() {
+    try {
+      const response = await fetch(`${DEFAULT_OLLAMA_URL}/api/version`, {
+        method: "GET",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        signal: AbortSignal.timeout(100)
+      });
+      return response.ok;
+    } catch (error) {
+      return false;
+    }
+  }
+  constructor({ endpoint, tools, overrides, maxToolInvocations }) {
+    this._endpoint = endpoint ?? DEFAULT_OLLAMA_URL;
+    this._tools = tools ?? [];
+    this._modelOverride = overrides?.model;
+    this._temperatureOverride = overrides?.temperature;
+    this._maxToolInvocations = maxToolInvocations ?? 3;
+  }
+  _getEmbededTools(clientTools) {
+    return [
+      ...this._tools,
+      ...clientTools.filter((tool) => tool.type !== void 0 && WELL_KNOWN_TOOLS[tool.type]).map((tool) => WELL_KNOWN_TOOLS[tool.type])
+    ];
+  }
+  async *_generateStream(request, signal) {
+    invariant3(request.prompt === void 0, "Prompt must be in history", {
+      F: __dxlog_file4,
+      L: 99,
+      S: this,
+      A: [
+        "request.prompt === undefined",
+        "'Prompt must be in history'"
+      ]
+    });
+    const ollamaRequest = {
+      model: this._modelOverride ?? request.model ?? "llama3",
+      messages: [],
+      stream: true,
+      options: {
+        temperature: this._temperatureOverride ?? 0.7
+      }
+    };
+    if (request.systemPrompt) {
+      ollamaRequest.messages.push({
+        role: "system",
+        content: request.systemPrompt
+      });
+    }
+    if (request.history?.length) {
+      for (const message of request.history) {
+        const role = message.role === "assistant" ? "assistant" : "user";
+        if (message.content.length === 0) {
+          continue;
+        }
+        for (const content of message.content) {
+          switch (content.type) {
+            case "text": {
+              ollamaRequest.messages.push({
+                role,
+                content: content.text
+              });
+              break;
+            }
+            case "tool_use": {
+              ollamaRequest.messages.push({
+                role: "assistant",
+                content: "",
+                tool_calls: [
+                  {
+                    function: {
+                      name: content.name,
+                      arguments: content.input
+                    }
+                  }
+                ]
+              });
+              break;
+            }
+            case "tool_result": {
+              ollamaRequest.messages.push({
+                role: "tool",
+                content: JSON.stringify({
+                  type: "tool_result",
+                  toolUseId: content.toolUseId,
+                  content: content.content
+                })
+              });
+              break;
+            }
+          }
+        }
+      }
+    }
+    if (request.tools?.length || this._tools.length) {
+      const allTools = [
+        ...request.tools ?? [],
+        ...this._tools
+      ];
+      const withWellKnownTools = allTools.map((tool) => tool.type !== void 0 && WELL_KNOWN_TOOLS[tool.type] ? WELL_KNOWN_TOOLS[tool.type] : tool);
+      if (withWellKnownTools.length > 0) {
+        ollamaRequest.tools = withWellKnownTools.map((tool) => ({
+          type: "function",
+          function: {
+            name: tool.name,
+            description: tool.description,
+            parameters: {
+              type: "object",
+              properties: tool.parameters?.properties,
+              required: tool.parameters?.required
+            }
+          }
+        }));
+      }
+    }
+    log4.info("generate request", {
+      history: request.history,
+      prompt: request.prompt,
+      ollamaRequest
+    }, {
+      F: __dxlog_file4,
+      L: 193,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    const response = await fetch(`${this._endpoint}/api/chat`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify(ollamaRequest),
+      signal
+    });
+    if (!response.ok) {
+      throw new Error(`Ollama API error: ${response.status} ${response.statusText}`);
+    }
+    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 = ObjectId3.random();
+      yield {
+        type: "message_start",
+        message: {
+          id: messageId,
+          role: "assistant",
+          content: []
+        }
+      };
+      const textBlock = {
+        type: "text",
+        text: ""
+      };
+      let currentBlockIndex = 0;
+      yield {
+        type: "content_block_start",
+        index: currentBlockIndex,
+        content: textBlock
+      };
+      while (true) {
+        const { done, value: data } = await reader.read();
+        if (done) {
+          break;
+        }
+        log4.info("ollama data", {
+          data
+        }, {
+          F: __dxlog_file4,
+          L: 256,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        if (data.message?.content) {
+          yield {
+            type: "content_block_delta",
+            index: 0,
+            delta: {
+              type: "text_delta",
+              text: data.message.content
+            }
+          };
+        }
+        if (data.message?.tool_calls && data.message?.tool_calls?.length > 0) {
+          if (data.message.tool_calls.length > 1) {
+            log4.warn("Ollama returned multiple tool calls. Only the first one will be used.", void 0, {
+              F: __dxlog_file4,
+              L: 273,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+          }
+          yield {
+            type: "content_block_stop",
+            index: currentBlockIndex++
+          };
+          yield {
+            type: "content_block_start",
+            index: currentBlockIndex,
+            content: {
+              type: "tool_use",
+              id: ObjectId3.random(),
+              name: data.message.tool_calls[0].function.name,
+              input: sanitizeToolArguments(data.message.tool_calls[0].function.arguments)
+            }
+          };
+          yield {
+            type: "message_delta",
+            delta: {
+              stopReason: "tool_use"
+            }
+          };
+        }
+      }
+      yield {
+        type: "content_block_stop",
+        index: currentBlockIndex
+      };
+      yield {
+        type: "message_stop"
+      };
+    } finally {
+      reader.releaseLock();
+    }
+  }
+  async exec(request) {
+    const controller = new AbortController();
+    try {
+      return new GenerationStreamImpl(controller, async function* () {
+        const collector = new MessageCollector();
+        let toolInvocations = 0;
+        while (true) {
+          for await (const event of this._generateStream({
+            ...request,
+            history: [
+              ...request.history ?? [],
+              ...request.prompt ? [
+                request.prompt
+              ] : [],
+              ...collector.messages
+            ],
+            prompt: void 0
+          }, controller.signal)) {
+            collector.push(event);
+            yield event;
+          }
+          if (collector.messages.length > 0 && !isToolUse(collector.messages.at(-1), {
+            onlyToolNames: this._getEmbededTools(request.tools ?? []).map((tool) => tool.name)
+          })) {
+            break;
+          }
+          if (++toolInvocations > this._maxToolInvocations) {
+            throw new Error("Maximum number of tool invocations reached");
+          }
+          const result = await runTools({
+            message: collector.messages.at(-1),
+            tools: this._getEmbededTools(request.tools ?? [])
+          });
+          switch (result.type) {
+            case "continue": {
+              collector.pushMessage(result.message);
+              yield* emitMessageAsEvents(result.message);
+              break;
+            }
+            case "break": {
+              throw new Error("Tool use breaks not allowed");
+            }
+          }
+        }
+      }.bind(this));
+    } catch (error) {
+      controller.abort();
+      throw error;
+    }
+  }
+};
+var sanitizeToolArguments = (args) => {
+  if (args.type === "object" && typeof args.properties === "object" && Array.isArray(args.required)) {
+    return args.properties;
+  }
+  return args;
+};
+var SAMPLE_IMAGE_URL = "https://images.nightcafe.studio/jobs/BNmcRhHCM1JRKoUtqSei/BNmcRhHCM1JRKoUtqSei--1--5b9rv.jpg";
+var WELL_KNOWN_TOOLS = {
+  [ToolTypes.TextToImage]: defineTool("system", {
+    name: "text-to-image",
+    description: "Generate an image from a text prompt",
+    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 = ObjectId3.random();
+      return ToolResult2.Success(`The generation was successful. Image ID: ${id} Prompt: ${prompt}`, [
+        {
+          type: "image",
+          id,
+          source: {
+            type: "base64",
+            mediaType: "image/jpeg",
+            data: imageBase64
+          }
+        }
+      ]);
+    }
+  })
+};
+var OllamaDecoderStream = class extends TransformStream {
+  constructor() {
+    super({
+      transform: (chunk, controller) => {
+        this._buffer += chunk;
+        const lines = this._buffer.split("\n");
+        this._buffer = lines.pop() || "";
+        for (const line of lines) {
+          controller.enqueue(JSON.parse(line.trim()));
+        }
+      },
+      flush: (controller) => {
+        this._buffer = this._buffer.trim();
+        if (this._buffer.length > 0) {
+          controller.enqueue(JSON.parse(this._buffer));
+        }
+      }
+    });
+    this._buffer = "";
+  }
+};
+
+// 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";
+
+// packages/experimental/assistant/src/ai-service/transform.ts
+import * as P from "parsimmon";
+var textChunk = P.regexp(/[^<]+/).map((content) => ({
+  type: "text",
+  content
+}));
+var attribute = P.seq(P.regexp(/[a-zA-Z_][a-zA-Z0-9_-]*/), P.string("=").trim(P.optWhitespace), P.alt(P.regexp(/"[^"]*"/).map((s) => s.slice(1, -1)), P.regexp(/'[^']*'/).map((s) => s.slice(1, -1)))).map(([name, _, value]) => [
+  name,
+  value
+]);
+var tagName = P.regexp(/[a-zA-Z_][a-zA-Z0-9_-]*/);
+var selfClosingTag = P.seqMap(
+  //
+  P.string("<"),
+  tagName,
+  P.optWhitespace.then(attribute).many(),
+  P.optWhitespace.then(P.string("/>")),
+  P.optWhitespace,
+  (_, tag, attributes, __) => ({
+    type: "tag",
+    tag,
+    attributes: Object.fromEntries(attributes),
+    content: [],
+    selfClosing: true
+  })
+);
+var openTag = P.seqMap(
+  //
+  P.string("<"),
+  tagName,
+  P.optWhitespace.then(attribute).many(),
+  P.string(">"),
+  P.regexp(/[^<]*/),
+  (_, tag, attributes, __, content) => ({
+    type: "tag",
+    tag,
+    attributes: Object.fromEntries(attributes),
+    content: content.length ? [
+      {
+        type: "text",
+        content
+      }
+    ] : []
+  })
+);
+var closeTag = P.seqMap(
+  //
+  P.string("</"),
+  tagName,
+  P.string(">"),
+  P.optWhitespace,
+  (_, tag) => ({
+    type: "tag",
+    tag,
+    content: [],
+    closing: true
+  })
+);
+var mixedChunk = P.alt(selfClosingTag, openTag, closeTag, textChunk);
+var StreamTransform = class {
+  constructor() {
+    this._buffer = "";
+  }
+  transform(chunk) {
+    this._buffer += chunk;
+    const results = [];
+    const parser = mixedChunk.many().skip(P.optWhitespace);
+    const result = parser.parse(this._buffer);
+    if (result.status) {
+      for (const chunk2 of result.value) {
+        results.push(chunk2);
+      }
+      this._buffer = "";
+    }
+    return results;
+  }
+  // TODO(burdon): Process remaining buffer?
+  flush() {
+    const remaining = this._buffer;
+    this._buffer = "";
+    return remaining.length > 0 ? [
+      {
+        type: "text",
+        content: remaining
+      }
+    ] : [];
+  }
+};
+
+// packages/experimental/assistant/src/ai-service/parser.ts
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/ai-service/parser.ts";
+var MixedStreamParser = class {
+  constructor() {
+    /**
+    * New message.
+    */
+    this.message = new Event();
+    /**
+    * Complete block added to Message.
+    */
+    this.block = new Event();
+    /**
+    * Update partial block (while streaming).
+    */
+    this.update = new Event();
+    this.streamEvent = new Event();
+  }
+  _emitBlock(contentBlock, streamBlock) {
+    const messageBlock = streamBlock ? mergeMessageBlock(contentBlock, streamBlock) : contentBlock;
+    if (messageBlock) {
+      if (messageBlock.type === "text" && messageBlock.text.length === 0) {
+        return;
+      }
+      invariant4(this._message, void 0, {
+        F: __dxlog_file5,
+        L: 49,
+        S: this,
+        A: [
+          "this._message",
+          ""
+        ]
+      });
+      this._message.content.push(messageBlock);
+      this.block.emit(messageBlock);
+    }
+  }
+  _emitUpdate(contentBlock, streamBlock) {
+    const messageBlock = mergeMessageBlock(contentBlock, streamBlock);
+    if (messageBlock) {
+      messageBlock.pending = true;
+      this.update.emit(messageBlock);
+    }
+  }
+  /**
+  * Parse stream until end.
+  */
+  async parse(stream) {
+    const transformer = new StreamTransform();
+    let contentBlock;
+    let streamBlock;
+    const stack = [];
+    const messagesCollected = [];
+    for await (const event of stream) {
+      this.streamEvent.emit(event);
+      switch (event.type) {
+        //
+        // Messages.
+        //
+        case "message_start": {
+          if (this._message) {
+            log5.warn("unexpected message_start", void 0, {
+              F: __dxlog_file5,
+              L: 93,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+          }
+          this._message = createStatic2(Message4, {
+            role: event.message.role,
+            content: [
+              ...event.message.content
+            ]
+          });
+          this.message.emit(this._message);
+          break;
+        }
+        case "message_delta": {
+          if (!this._message) {
+            log5.warn("unexpected message_delta", void 0, {
+              F: __dxlog_file5,
+              L: 103,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+          }
+          break;
+        }
+        case "message_stop": {
+          if (!this._message) {
+            log5.warn("unexpected message_stop", void 0, {
+              F: __dxlog_file5,
+              L: 111,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+          } else {
+            messagesCollected.push(this._message);
+            this._message = void 0;
+          }
+          break;
+        }
+        //
+        // Content blocks.
+        //
+        case "content_block_start": {
+          if (contentBlock) {
+            log5.warn("unexpected content_block_start", {
+              content: contentBlock
+            }, {
+              F: __dxlog_file5,
+              L: 125,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+          }
+          contentBlock = event.content;
+          break;
+        }
+        case "content_block_delta": {
+          if (!contentBlock) {
+            log5.warn("unexpected content_block_delta", void 0, {
+              F: __dxlog_file5,
+              L: 135,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+            break;
+          }
+          switch (event.delta.type) {
+            //
+            // Text
+            //
+            case "text_delta": {
+              const chunks = transformer.transform(event.delta.text);
+              for (const chunk of chunks) {
+                switch (streamBlock?.type) {
+                  //
+                  // XML Fragment.
+                  //
+                  case "tag": {
+                    if (chunk.type === "tag") {
+                      if (chunk.selfClosing) {
+                        streamBlock.content.push(chunk);
+                      } else if (chunk.closing) {
+                        if (stack.length > 0) {
+                          const top = stack.pop();
+                          invariant4(top && top.type === "tag", void 0, {
+                            F: __dxlog_file5,
+                            L: 159,
+                            S: this,
+                            A: [
+                              "top && top.type === 'tag'",
+                              ""
+                            ]
+                          });
+                          top.content.push(streamBlock);
+                          streamBlock = top;
+                        } else {
+                          this._emitBlock(contentBlock, streamBlock);
+                          streamBlock = void 0;
+                        }
+                      } else {
+                        stack.push(streamBlock);
+                        streamBlock = chunk;
+                      }
+                    } else {
+                      if (streamBlock.content.length === 0) {
+                        streamBlock.content.push(chunk);
+                      } else {
+                        const last = streamBlock.content.at(-1);
+                        invariant4(last, void 0, {
+                          F: __dxlog_file5,
+                          L: 176,
+                          S: this,
+                          A: [
+                            "last",
+                            ""
+                          ]
+                        });
+                        if (last.type === "text") {
+                          last.content += chunk.content;
+                        } else {
+                          streamBlock.content.push(chunk);
+                        }
+                      }
+                    }
+                    break;
+                  }
+                  //
+                  // Text Fragment.
+                  //
+                  case "text": {
+                    if (chunk.type === "tag") {
+                      this._emitBlock(contentBlock, streamBlock);
+                      if (chunk.selfClosing) {
+                        this._emitBlock(contentBlock, chunk);
+                        streamBlock = void 0;
+                      } else {
+                        streamBlock = chunk;
+                      }
+                    } else {
+                      streamBlock.content += chunk.content;
+                    }
+                    break;
+                  }
+                  //
+                  // No current chunk.
+                  //
+                  default: {
+                    if (chunk.type === "tag" && chunk.selfClosing) {
+                      this._emitBlock(contentBlock, chunk);
+                    } else {
+                      streamBlock = chunk;
+                    }
+                  }
+                }
+              }
+              break;
+            }
+            //
+            // JSON
+            //
+            case "input_json_delta": {
+              if (!contentBlock) {
+                log5.warn("unexpected input_json_delta", {
+                  contentBlock
+                }, {
+                  F: __dxlog_file5,
+                  L: 226,
+                  S: this,
+                  C: (f, a) => f(...a)
+                });
+                break;
+              }
+              if (streamBlock?.type === "json") {
+                streamBlock.content += event.delta.partial_json;
+              } else {
+                streamBlock = {
+                  type: "json",
+                  content: event.delta.partial_json
+                };
+              }
+              break;
+            }
+          }
+          break;
+        }
+        case "content_block_stop": {
+          if (!contentBlock) {
+            log5.warn("unexpected content_block_stop", void 0, {
+              F: __dxlog_file5,
+              L: 243,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+            break;
+          }
+          this._emitBlock(contentBlock, streamBlock);
+          contentBlock = void 0;
+          streamBlock = void 0;
+          break;
+        }
+      }
+      if (contentBlock && streamBlock) {
+        this._emitUpdate(contentBlock, streamBlock);
+      }
+    }
+    return messagesCollected;
+  }
+};
+var mergeMessageBlock = (contentBlock, streamBlock) => {
+  log5("mergeMessageBlock", {
+    contentBlock,
+    streamBlock
+  }, {
+    F: __dxlog_file5,
+    L: 270,
+    S: void 0,
+    C: (f, a) => f(...a)
+  });
+  switch (streamBlock.type) {
+    //
+    // Text
+    //
+    case "text": {
+      return {
+        ...contentBlock,
+        type: "text",
+        text: streamBlock.content
+      };
+    }
+    //
+    // XML
+    //
+    case "tag": {
+      switch (streamBlock.tag) {
+        case "cot": {
+          const content = streamBlock.content.map((block) => {
+            switch (block.type) {
+              case "text":
+                return block.content;
+              default:
+                return null;
+            }
+          }).filter(isNotFalsy).join("\n");
+          return {
+            ...contentBlock,
+            type: "text",
+            disposition: "cot",
+            text: content
+          };
+        }
+        case "artifact": {
+          const { attributes } = streamBlock;
+          return {
+            type: "json",
+            disposition: "artifact",
+            json: JSON.stringify(attributes)
+          };
+        }
+        case "suggest": {
+          if (streamBlock.content.length === 1 && streamBlock.content[0].type === "text") {
+            return {
+              type: "json",
+              disposition: "suggest",
+              json: JSON.stringify({
+                text: streamBlock.content[0].content
+              })
+            };
+          }
+          break;
+        }
+        case "select": {
+          return {
+            type: "json",
+            disposition: "select",
+            json: JSON.stringify({
+              options: streamBlock.content.flatMap((content) => content.type === "tag" && content.content.length === 1 && content.content[0].type === "text" ? [
+                content.content[0].content
+              ] : [])
+            })
+          };
+        }
+        case "tool-list": {
+          return {
+            type: "json",
+            disposition: "tool_list",
+            json: JSON.stringify({})
+          };
+        }
+      }
+      break;
+    }
+    //
+    // JSON
+    //
+    case "json": {
+      switch (contentBlock.type) {
+        case "tool_use": {
+          return {
+            ...contentBlock,
+            input: safeParseJson(streamBlock.content) ?? {}
+          };
+        }
+      }
+      return {
+        ...contentBlock,
+        type: "json",
+        disposition: "artifact",
+        json: streamBlock.content
+      };
+    }
+  }
+};
 export {
-  AIServiceClientImpl,
+  AIServiceEdgeClient,
   DEFAULT_LLM_MODEL,
   DEFAULT_LLM_MODELS,
   EchoDataSource,
   GenerateRequest,
-  GenerationStream,
+  GenerationStreamImpl,
   LLMModel,
+  MessageCollector,
   MixedStreamParser,
+  OllamaClient,
   StreamTransform,
   ToolTypes,
   createArtifactElement,
   createGenerationStream,
+  emitMessageAsEvents,
   executeQuery,
   executeQueryPlan,
   formatInferredRelationshipLabel,