@dxos/assistant 0.7.5-labs.ff2ff30 → 0.7.5-main.b19bfc8

package/dist/lib/browser/index.mjs

@@ -13,6 +13,7 @@ import {
 import { Schema as S } from "@effect/schema";
 import { Message } from "@dxos/artifact";
 import { invariant } from "@dxos/invariant";
+import { log as log2 } from "@dxos/log";
 
 // packages/experimental/assistant/src/ai-service/stream.ts
 import { Trigger } from "@dxos/async";
@@ -354,7 +355,7 @@ var AIServiceClientImpl = class {
   constructor({ endpoint }) {
     invariant(endpoint, "endpoint is required", {
       F: __dxlog_file2,
-      L: 36,
+      L: 37,
       S: this,
       A: [
         "endpoint",
@@ -396,6 +397,18 @@ var AIServiceClientImpl = class {
   * Open message stream.
   */
   async generate(request) {
+    request = {
+      tools: request.tools ?? [],
+      ...request
+    };
+    log2.info("requesting", {
+      endpoint: this._endpoint
+    }, {
+      F: __dxlog_file2,
+      L: 84,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     const controller = new AbortController();
     const response = await fetch(`${this._endpoint}/generate`, {
       signal: controller.signal,
@@ -407,7 +420,7 @@ var AIServiceClientImpl = class {
     });
     invariant(response.body instanceof ReadableStream, void 0, {
       F: __dxlog_file2,
-      L: 85,
+      L: 93,
       S: this,
       A: [
         "response.body instanceof ReadableStream",
@@ -418,12 +431,29 @@ 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 log2 } from "@dxos/log";
+import { log as log3 } from "@dxos/log";
 import { isNotFalsy, safeParseJson } from "@dxos/util";
 
 // packages/experimental/assistant/src/ai-service/transform.ts
@@ -566,6 +596,7 @@ var MixedStreamParser = class {
     let contentBlock;
     let streamBlock;
     const stack = [];
+    const messagesCollected = [];
     for await (const event of stream) {
       switch (event.type) {
         //
@@ -573,9 +604,9 @@ var MixedStreamParser = class {
         //
         case "message_start": {
           if (this._message) {
-            log2.warn("unexpected message_start", void 0, {
+            log3.warn("unexpected message_start", void 0, {
               F: __dxlog_file3,
-              L: 86,
+              L: 88,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -589,9 +620,9 @@ var MixedStreamParser = class {
         }
         case "message_delta": {
           if (!this._message) {
-            log2.warn("unexpected message_delta", void 0, {
+            log3.warn("unexpected message_delta", void 0, {
               F: __dxlog_file3,
-              L: 96,
+              L: 98,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -600,13 +631,14 @@ var MixedStreamParser = class {
         }
         case "message_stop": {
           if (!this._message) {
-            log2.warn("unexpected message_stop", void 0, {
+            log3.warn("unexpected message_stop", void 0, {
               F: __dxlog_file3,
-              L: 104,
+              L: 106,
               S: this,
               C: (f, a) => f(...a)
             });
           } else {
+            messagesCollected.push(this._message);
             this._message = void 0;
           }
           break;
@@ -616,11 +648,11 @@ var MixedStreamParser = class {
         //
         case "content_block_start": {
           if (contentBlock) {
-            log2.warn("unexpected content_block_start", {
+            log3.warn("unexpected content_block_start", {
               content: contentBlock
             }, {
               F: __dxlog_file3,
-              L: 117,
+              L: 120,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -630,9 +662,9 @@ var MixedStreamParser = class {
         }
         case "content_block_delta": {
           if (!contentBlock) {
-            log2.warn("unexpected content_block_delta", void 0, {
+            log3.warn("unexpected content_block_delta", void 0, {
               F: __dxlog_file3,
-              L: 127,
+              L: 130,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -658,7 +690,7 @@ var MixedStreamParser = class {
                           const top = stack.pop();
                           invariant2(top && top.type === "tag", void 0, {
                             F: __dxlog_file3,
-                            L: 151,
+                            L: 154,
                             S: this,
                             A: [
                               "top && top.type === 'tag'",
@@ -682,7 +714,7 @@ var MixedStreamParser = class {
                         const last = streamBlock.content.at(-1);
                         invariant2(last, void 0, {
                           F: __dxlog_file3,
-                          L: 168,
+                          L: 171,
                           S: this,
                           A: [
                             "last",
@@ -734,11 +766,11 @@ var MixedStreamParser = class {
             //
             case "input_json_delta": {
               if (!contentBlock) {
-                log2.warn("unexpected input_json_delta", {
+                log3.warn("unexpected input_json_delta", {
                   contentBlock
                 }, {
                   F: __dxlog_file3,
-                  L: 218,
+                  L: 221,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -759,9 +791,9 @@ var MixedStreamParser = class {
         }
         case "content_block_stop": {
           if (!contentBlock) {
-            log2.warn("unexpected content_block_stop", void 0, {
+            log3.warn("unexpected content_block_stop", void 0, {
               F: __dxlog_file3,
-              L: 235,
+              L: 238,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -777,15 +809,16 @@ var MixedStreamParser = class {
         this._emitUpdate(contentBlock, streamBlock);
       }
     }
+    return messagesCollected;
   }
 };
 var mergeMessageBlock = (contentBlock, streamBlock) => {
-  log2("mergeMessageBlock", {
+  log3("mergeMessageBlock", {
     contentBlock,
     streamBlock
   }, {
     F: __dxlog_file3,
-    L: 260,
+    L: 265,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -852,6 +885,13 @@ var mergeMessageBlock = (contentBlock, streamBlock) => {
             })
           };
         }
+        case "tool-list": {
+          return {
+            type: "json",
+            disposition: "tool_list",
+            json: JSON.stringify({})
+          };
+        }
       }
       break;
     }
@@ -882,7 +922,7 @@ import { Schema as S2 } from "@effect/schema";
 import { Tool, Message as Message3, SpaceIdSchema } from "@dxos/artifact";
 import { ObjectId } from "@dxos/echo-schema";
 var createArtifactElement = (id) => `<artifact id=${id} />`;
-var LLMModel = S2.Literal("@anthropic/claude-3-5-haiku-20241022", "@anthropic/claude-3-5-sonnet-20241022", "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b", "@hf/nousresearch/hermes-2-pro-mistral-7b", "@ollama/llama-3-2-3b", "@ollama/llama-3-1-nemotron-70b-instruct", "@ollama/llama-3-1-nemotron-mini-4b-instruct");
+var LLMModel = S2.Literal(...DEFAULT_LLM_MODELS);
 var ToolTypes = Object.freeze({
   // TODO(dmaretskyi): Not implemented yet.
   // DatabaseQuery: 'database_query',
@@ -891,18 +931,20 @@ var ToolTypes = Object.freeze({
 var GenerateRequest = S2.Struct({
   spaceId: S2.optional(SpaceIdSchema),
   threadId: S2.optional(ObjectId),
-  // TODO(burdon): Make optional with default.
-  model: LLMModel,
   /**
-  * Current request.
+  * Preferred model or system default.
   */
-  // TODO(burdon): Remove from history.
-  // prompt: Message,
+  model: S2.optional(LLMModel),
   /**
   * System instructions to the LLM.
   */
   systemPrompt: S2.optional(S2.String),
   /**
+  * Current request.
+  */
+  // TODO(burdon): Remove from history.
+  // prompt: Message,
+  /**
   * History of messages to include in the context window.
   */
   history: S2.optional(S2.Array(Message3)),
@@ -916,13 +958,13 @@ var GenerateRequest = S2.Struct({
 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 log3 } from "@dxos/log";
+import { log as log4 } from "@dxos/log";
 var __dxlog_file4 = "/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", {
+    log4("llm generate", {
       tools: params.tools
     }, {
       F: __dxlog_file4,
@@ -954,7 +996,7 @@ var runLLM = async (params) => {
         ""
       ]
     });
-    log3("llm result", {
+    log4("llm result", {
       time: Date.now() - beginTs,
       message
     }, {
@@ -1009,7 +1051,7 @@ var runLLM = async (params) => {
       const toolResult = await tool.execute(toolCall.input);
       switch (toolResult.kind) {
         case "error": {
-          log3.warn("tool error", {
+          log4.warn("tool error", {
             message: toolResult.message
           }, {
             F: __dxlog_file4,
@@ -1039,7 +1081,7 @@ var runLLM = async (params) => {
           return true;
         }
         case "success": {
-          log3("tool success", {
+          log4("tool success", {
             result: toolResult.result
           }, {
             F: __dxlog_file4,
@@ -1068,7 +1110,7 @@ var runLLM = async (params) => {
           return true;
         }
         case "break": {
-          log3("tool break", {
+          log4("tool break", {
             result: toolResult.result
           }, {
             F: __dxlog_file4,
@@ -1134,7 +1176,7 @@ var runTools = async ({ message, tools, extensions }) => {
       extensions
     });
   } catch (error) {
-    log3("tool error", {
+    log4("tool error", {
       error
     }, {
       F: __dxlog_file4,
@@ -1146,7 +1188,7 @@ var runTools = async ({ message, tools, extensions }) => {
   }
   switch (toolResult.kind) {
     case "error": {
-      log3("tool error", {
+      log4("tool error", {
         message: toolResult.message
       }, {
         F: __dxlog_file4,
@@ -1171,7 +1213,7 @@ var runTools = async ({ message, tools, extensions }) => {
       };
     }
     case "success": {
-      log3("tool success", {
+      log4("tool success", {
         result: toolResult.result
       }, {
         F: __dxlog_file4,
@@ -1195,7 +1237,7 @@ var runTools = async ({ message, tools, extensions }) => {
       };
     }
     case "break": {
-      log3("tool break", {
+      log4("tool break", {
         result: toolResult.result
       }, {
         F: __dxlog_file4,
@@ -1212,6 +1254,8 @@ var runTools = async ({ message, tools, extensions }) => {
 };
 export {
   AIServiceClientImpl,
+  DEFAULT_LLM_MODEL,
+  DEFAULT_LLM_MODELS,
   EchoDataSource,
   GenerateRequest,
   GenerationStream,