@dxos/assistant 0.7.5-labs.ff2ff30 → 0.7.5-main.5ae2ba8

package/src/ai-service/client.ts

@@ -4,21 +4,19 @@
 
 import { Schema as S } from '@effect/schema';
 
-import { Message, type Space, type Thread } from '@dxos/artifact';
+import { Message } from '@dxos/artifact';
 import { invariant } from '@dxos/invariant';
-import { type SpaceId } from '@dxos/keys';
+import { log } from '@dxos/log';
 
 import { createGenerationStream, type GenerationStream } from './stream';
 import { type GenerateRequest } from './types';
 
-// TODO(burdon): Rename.
-export interface AIServiceClient {
-  getSpace(spaceId: SpaceId): Promise<Space>;
-  getThread(spaceId: SpaceId, threadId: string): Promise<Thread>;
-  getMessages(spaceId: SpaceId, threadId: string): Promise<Message[]>;
+export interface AIService {
+  exec(request: GenerateRequest): Promise<GenerationStream>;
+}
+
+export interface AIServiceClient extends AIService {
   appendMessages(messages: Message[]): Promise<void>;
-  updateMessage(spaceId: SpaceId, threadId: string, messageId: string, message: Message): Promise<void>;
-  generate(request: GenerateRequest): Promise<GenerationStream>;
 }
 
 export type AIServiceClientParams = {
@@ -37,19 +35,6 @@ export class AIServiceClientImpl implements AIServiceClient {
     this._endpoint = endpoint;
   }
 
-  async getSpace(spaceId: SpaceId): Promise<Space> {
-    throw new Error('Not implemented');
-  }
-
-  async getThread(spaceId: SpaceId, threadId: string): Promise<Thread> {
-    throw new Error('Not implemented');
-  }
-
-  async getMessages(spaceId: SpaceId, threadId: string): Promise<Message[]> {
-    const res = await fetch(`${this._endpoint}/space/${spaceId}/thread/${threadId}/message`);
-    return S.decodePromise(S.Array(Message).pipe(S.mutable))((await res.json()).data.results);
-  }
-
   async appendMessages(messages: Message[]): Promise<void> {
     const url = `${this._endpoint}/message`;
     const res = await fetch(url, {
@@ -65,15 +50,17 @@ export class AIServiceClientImpl implements AIServiceClient {
     }
   }
 
-  // TODO(dmaretskyi): Accept partial message schema.
-  async updateMessage(spaceId: SpaceId, threadId: string, messageId: string, message: Message): Promise<void> {
-    throw new Error('Not implemented');
-  }
-
   /**
-   * Open message stream.
+   * Process request and open message stream.
    */
-  async generate(request: GenerateRequest): Promise<GenerationStream> {
+  async exec(request: GenerateRequest): Promise<GenerationStream> {
+    // TODO(dmaretskyi): Errors if tools are not provided.
+    request = {
+      tools: request.tools ?? [],
+      ...request,
+    };
+
+    log.info('requesting', { endpoint: this._endpoint });
     const controller = new AbortController();
     const response = await fetch(`${this._endpoint}/generate`, {
       signal: controller.signal,

package/src/ai-service/defs.ts

@@ -0,0 +1,24 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+// TODO(burdon): Share with Edge.
+// TODO(burdon): Move to service config retrieved by HTTP?
+
+export const DEFAULT_LLM_MODEL = '@anthropic/claude-3-5-sonnet-20241022';
+
+export const 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',
+];

package/src/ai-service/index.ts

@@ -3,6 +3,7 @@
 //
 
 export * from './client';
+export * from './defs';
 export * from './parser';
 export * from './stream';
 export * from './transform';

package/src/ai-service/parser.ts

@@ -60,7 +60,7 @@ export class MixedStreamParser {
   /**
    * Parse stream until end.
    */
-  async parse(stream: GenerationStream) {
+  async parse(stream: GenerationStream): Promise<Message[]> {
     const transformer = new StreamTransform();
 
     /**
@@ -74,6 +74,8 @@ export class MixedStreamParser {
     let streamBlock: StreamBlock | undefined;
     const stack: StreamBlock[] = [];
 
+    const messagesCollected: Message[] = [];
+
     for await (const event of stream) {
       // log.info('event', { type: event.type, event });
       switch (event.type) {
@@ -103,6 +105,7 @@ export class MixedStreamParser {
           if (!this._message) {
             log.warn('unexpected message_stop');
           } else {
+            messagesCollected.push(this._message);
             this._message = undefined;
           }
           break;
@@ -247,6 +250,8 @@ export class MixedStreamParser {
         this._emitUpdate(contentBlock, streamBlock);
       }
     } // for.
+
+    return messagesCollected;
   }
 }
 
@@ -317,6 +322,14 @@ export const mergeMessageBlock = (
             }),
           };
         }
+
+        case 'tool-list': {
+          return {
+            type: 'json',
+            disposition: 'tool_list',
+            json: JSON.stringify({}),
+          };
+        }
       }
 
       break;

package/src/ai-service/stream.ts

@@ -11,7 +11,7 @@ import { iterSSEMessages } from './util';
 /**
  * Creates a stream from an SSE response.
  */
-export const createGenerationStream = (response: Response, controller = new AbortController()) => {
+export const createGenerationStream = (response: Response, controller = new AbortController()): GenerationStream => {
   const iterator = async function* () {
     for await (const sse of iterSSEMessages(response, controller)) {
       if (sse.event === 'completion') {

package/src/ai-service/testing/index.ts

@@ -0,0 +1,6 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export * from './mock';
+export * from './test-stream';

package/src/ai-service/testing/mock.ts

@@ -0,0 +1,17 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type GenerationStream, type AIService, type GenerateRequest, createGenerationStream } from '@dxos/assistant';
+
+import { createTestSSEStream } from './test-stream';
+
+export class MockAIService implements AIService {
+  constructor(private readonly _responses: string[]) {}
+
+  // TODO(burdon): Match response to request.
+  // TODO(burdon): See MockGpt (from conductor).
+  async exec(request: GenerateRequest): Promise<GenerationStream> {
+    return createGenerationStream(new Response(createTestSSEStream(this._responses)));
+  }
+}

package/src/ai-service/{testing.ts → testing/test-stream.ts}

@@ -4,7 +4,7 @@
 
 import { ObjectId } from '@dxos/echo-schema';
 
-import { type GenerationStreamEvent } from './types';
+import { type GenerationStreamEvent } from '../types';
 
 /**
  * Mock server-side events (SSE) stream.

package/src/ai-service/types.ts

@@ -7,17 +7,11 @@ import { Schema as S } from '@effect/schema';
 import { Tool, Message, type MessageContentBlock, SpaceIdSchema } from '@dxos/artifact';
 import { ObjectId } from '@dxos/echo-schema';
 
+import { DEFAULT_LLM_MODELS } from './defs';
+
 export const createArtifactElement = (id: ObjectId) => `<artifact id=${id} />`;
 
-export const LLMModel = S.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',
-);
+export const LLMModel = S.Literal(...DEFAULT_LLM_MODELS);
 
 export type LLMModel = S.Schema.Type<typeof LLMModel>;
 
@@ -34,14 +28,15 @@ export const GenerateRequest = S.Struct({
   spaceId: S.optional(SpaceIdSchema),
   threadId: S.optional(ObjectId),
 
-  // TODO(burdon): Make optional with default.
-  model: LLMModel,
+  /**
+   * Preferred model or system default.
+   */
+  model: S.optional(LLMModel),
 
   /**
-   * Current request.
+   * Tools available for the LLM.
    */
-  // TODO(burdon): Remove from history.
-  // prompt: Message,
+  tools: S.optional(S.Array(Tool).pipe(S.mutable)),
 
   /**
    * System instructions to the LLM.
@@ -51,12 +46,13 @@ export const GenerateRequest = S.Struct({
   /**
    * History of messages to include in the context window.
    */
+  // TODO(burdon): Rename messages.
   history: S.optional(S.Array(Message)),
 
   /**
-   * Tools available for the LLM.
+   * Current request.
    */
-  tools: S.optional(S.Array(Tool).pipe(S.mutable)),
+  prompt: S.optional(Message),
 });
 
 export type GenerateRequest = S.Schema.Type<typeof GenerateRequest>;

package/src/bin/chat.ts

@@ -2,15 +2,15 @@
 // Copyright 2024 DXOS.org
 //
 
-import { writeFileSync } from 'fs';
 import inquirer from 'inquirer';
+import { writeFileSync } from 'node:fs';
 
 import { createUserMessage } from '@dxos/artifact';
 import { ObjectId } from '@dxos/echo-schema';
 import { SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
 
-import { AIServiceClientImpl, ToolTypes } from '../ai-service';
+import { AIServiceClientImpl, ToolTypes, DEFAULT_LLM_MODEL } from '../ai-service';
 import { runLLM } from '../conversation';
 import {
   AI_SERVICE_ENDPOINT,
@@ -24,6 +24,7 @@ import {
   Task,
 } from '../testing';
 
+// TOOD(burdon): Get from config.
 const client = new AIServiceClientImpl({
   endpoint: AI_SERVICE_ENDPOINT.LOCAL,
 });
@@ -48,7 +49,7 @@ while (true) {
   await client.appendMessages([createUserMessage(spaceId, threadId, prompt.message)]);
 
   await runLLM({
-    model: '@anthropic/claude-3-5-sonnet-20241022',
+    model: DEFAULT_LLM_MODEL,
     spaceId,
     threadId,
     system: createSystemPrompt(schemaTypes),

package/src/conversation/conversation.test.ts

@@ -11,7 +11,7 @@ import { SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
 
 import { runLLM, type ConversationEvent } from './conversation';
-import { AIServiceClientImpl } from '../ai-service';
+import { AIServiceClientImpl, DEFAULT_LLM_MODEL } from '../ai-service';
 import { AI_SERVICE_ENDPOINT } from '../testing';
 
 // TODO(burdon): Local live LLM test.
@@ -25,7 +25,7 @@ describe.skip('Conversation tests', () => {
     const threadId = ObjectId.random();
 
     const result = await runLLM({
-      model: '@anthropic/claude-3-5-sonnet-20241022',
+      model: DEFAULT_LLM_MODEL,
       history: [createUserMessage(spaceId, threadId, 'Hello, how are you?')],
       tools: [],
       client,
@@ -37,7 +37,7 @@ describe.skip('Conversation tests', () => {
   });
 
   test('tool call', async ({ expect }) => {
-    const custodian = defineTool({
+    const custodian = defineTool('testing', {
       name: 'custodian',
       description: 'Custodian can tell you the password if you say the magic word',
       schema: S.Struct({
@@ -56,7 +56,7 @@ describe.skip('Conversation tests', () => {
     const threadId = ObjectId.random();
 
     const result = await runLLM({
-      model: '@anthropic/claude-3-5-sonnet-20241022',
+      model: DEFAULT_LLM_MODEL,
       history: [createUserMessage(spaceId, threadId, 'What is the password? Ask the custodian.')],
       tools: [custodian],
       client,

package/src/conversation/conversation.ts

@@ -43,7 +43,7 @@ export const runLLM = async (params: CreateLLMConversationParams) => {
   const generate = async () => {
     log('llm generate', { tools: params.tools });
     const beginTs = Date.now();
-    const stream = await params.client.generate({
+    const stream = await params.client.exec({
       model: params.model,
       spaceId: params.spaceId,
       threadId: params.threadId,

package/src/testing/artifacts.test.ts

@@ -41,16 +41,16 @@ const list: ArtifactDef = {
   description: 'Ordered set of text items.',
   schema: ListSchema,
   actions: [
-    defineTool({
-      name: 'list.query',
+    defineTool('list', {
+      name: 'query',
       description: 'Query all lists',
       schema: S.Struct({}),
       execute: async ({}, context) => {
         return ToolResult.Success(LISTS[id]);
       },
     }),
-    defineTool({
-      name: 'list.inspect',
+    defineTool('list', {
+      name: 'inspect',
       description: 'Get contents of the list',
       schema: S.Struct({
         id: ObjectId.annotations({ description: 'The list to inspect' }),
@@ -59,8 +59,8 @@ const list: ArtifactDef = {
         return ToolResult.Success(LISTS[id]);
       },
     }),
-    defineTool({
-      name: 'list.add',
+    defineTool('list', {
+      name: 'create',
       description: 'Add one or more items to an existing list',
       schema: S.Struct({
         id: ObjectId.annotations({ description: 'The list to add items to' }),
@@ -78,7 +78,7 @@ const LISTS: Record<ObjectId, ListSchema> = {};
 
 const artifacts = [list];
 
-const getArtifactDefinitions = defineTool({
+const getArtifactDefinitions = defineTool('system', {
   name: 'getArtifactDefinitions',
   description: 'Queries the definitions and metadata of artifacts defined in the system',
   schema: S.Any,
@@ -136,7 +136,7 @@ describe('Artifacts', () => {
     ]);
 
     const stream = await client.generate({
-      model: '@anthropic/claude-3-5-haiku-20241022',
+      model: DEFAULT_LLM_MODEL,
       spaceId,
       threadId,
       systemPrompt: 'You are a helpful assistant.',
@@ -164,7 +164,7 @@ describe('Artifacts', () => {
     ]);
 
     const stream2 = await client.generate({
-      model: '@anthropic/claude-3-5-haiku-20241022',
+      model: DEFAULT_LLM_MODEL,
       spaceId,
       threadId,
       systemPrompt: 'You are a helpful assistant.',

package/src/testing/defs.ts

@@ -2,6 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
+// TODO(burdon): Remove/Reconcile with @dxos/assistant-testing.
 export const AI_SERVICE_ENDPOINT = {
   LOCAL: 'http://localhost:8788',
   REMOTE: 'https://ai-service.dxos.workers.dev',

package/src/testing/object-extraction.test.ts

@@ -8,7 +8,7 @@
 
 // test('extract objects from the DXOS explainer', async () => {
 //   const result = await runLLM({
-//     model: '@anthropic/claude-3-5-haiku-20241022',
+//     model: DEFAULT_LLM_MODEL,
 //     messages: [
 //       createUserMessage(`
 // # README

package/src/testing/query-promts.ts

@@ -12,34 +12,34 @@ import { executeQuery, formatJsonSchemaForLLM, type DataSource } from '../cypher
 import { trim } from '../util';
 
 export const createCypherTool = (dataSource: DataSource, schemaTypes: S.Schema.Any[] = []) =>
-  defineTool({
-    name: 'graphQuery',
+  defineTool('dxos.org/echo', {
+    name: 'query',
     description:
       'Query the ECHO graph database in cypher query language. Returns data from the database.' +
       (schemaTypes.length > 0 ? `\n\n${createSystemPrompt(schemaTypes)}` : ''),
     schema: S.Struct({
       query: S.String.annotations({
         description: `
-      A valid cypher query string to execute.
-      Query must have one MATCH clause.
-      Match clause can have multiple patterns but they must all be connected via a relationship chain.
-      Query might have zero or one WHERE clauses.
-      Query must have one RETURN clause.
-      RETURN clause can have multiple expressions separated by commas.
-      DISTINCT keyword is not allowed.
+          A valid cypher query string to execute.
+          Query must have one MATCH clause.
+          Match clause can have multiple patterns but they must all be connected via a relationship chain.
+          Query might have zero or one WHERE clauses.
+          Query must have one RETURN clause.
+          RETURN clause can have multiple expressions separated by commas.
+          DISTINCT keyword is not allowed.
 
-      <example>
-      MATCH (n:Person) RETURN n.name
-      </example>
+          <example>
+          MATCH (n:Person) RETURN n.name
+          </example>
 
-      <example>
-      MATCH (s:Studio)-[:PRODUCED]->(m:Movie)-[:PRODUCED_IN]->(c:City {name: "Las Vegas"}) RETURN s
-      </example>
-      
-      <example>
-      MATCH (a:Actor)-[:STARRED_IN]->(m:Movie)<-[:PRODUCED]-(s:Studio {name: "Cinema Pictures"}) WHERE m.name = "Once upon a time" RETURN m.name, a.name
-      </example>
-      `,
+          <example>
+          MATCH (s:Studio)-[:PRODUCED]->(m:Movie)-[:PRODUCED_IN]->(c:City {name: "Las Vegas"}) RETURN s
+          </example>
+          
+          <example>
+          MATCH (a:Actor)-[:STARRED_IN]->(m:Movie)<-[:PRODUCED]-(s:Studio {name: "Cinema Pictures"}) WHERE m.name = "Once upon a time" RETURN m.name, a.name
+          </example>
+        `,
       }),
     }),
     execute: async ({ query }) => {

package/src/testing/query.test.ts

@@ -15,7 +15,7 @@ import { createLogger } from './logger';
 import { createCypherTool, createSystemPrompt } from './query-promts';
 import { createTestData, seedTestData } from './test-data';
 import { Contact, Org, Project, Task } from './test-schema';
-import { AIServiceClientImpl } from '../ai-service';
+import { AIServiceClientImpl, DEFAULT_LLM_MODEL } from '../ai-service';
 import { runLLM } from '../conversation';
 import { EchoDataSource } from '../cypher';
 
@@ -41,7 +41,7 @@ test.skip('cypher query', async () => {
   ]);
 
   const result = await runLLM({
-    model: '@anthropic/claude-3-5-sonnet-20241022',
+    model: DEFAULT_LLM_MODEL,
     tools: [cypherTool],
     spaceId,
     threadId,
@@ -78,7 +78,7 @@ test.skip('query ECHO', async () => {
   ]);
 
   const result = await runLLM({
-    model: '@anthropic/claude-3-5-sonnet-20241022',
+    model: DEFAULT_LLM_MODEL,
     tools: [cypherTool],
     spaceId,
     threadId,

package/dist/types/src/ai-service/testing.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../../../src/ai-service/testing.ts"],"names":[],"mappings":"AAQA;;GAEG;AACH,eAAO,MAAM,mBAAmB,SACxB,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,gBACH;IAAE,OAAO,CAAC,EAAE,MAAM,GAAG,WAAW,CAAA;CAAE,KACvD,cA8EF,CAAC"}