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

package/dist/types/src/session/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../../src/session/session.ts"],"names":[],"mappings":"AAIA,OAAO,EAAU,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAC;AAE7C,OAAO,EAEL,OAAO,EAEP,KAAK,kBAAkB,EAEvB,KAAK,IAAI,EACV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,EAAgB,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAU,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAK1D,OAAO,EAAqB,KAAK,eAAe,EAAE,KAAK,eAAe,EAAyB,MAAM,eAAe,CAAC;AAGrH;;;;;;;;;GASG;AAEH;;;;;GAKG;AACH,MAAM,MAAM,oBAAoB,GAAG,CAAC,SAAS,EAAE;IAAE,EAAE,EAAE,QAAQ,CAAC;IAAC,WAAW,EAAE,aAAa,CAAA;CAAE,EAAE,KAAK,OAAO,CACvG,GAAG,CACD,QAAQ,EACR;IACE,OAAO,EAAE,aAAa,CAAC;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CACF,CACF,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,eAAe,CAAC;IAExB,SAAS,EAAE,kBAAkB,EAAE,CAAC;IAEhC;;OAEG;IACH,KAAK,EAAE,IAAI,EAAE,CAAC;IAEd,OAAO,EAAE,OAAO,EAAE,CAAC;IAEnB,MAAM,EAAE,MAAM,CAAC;IAEf,iBAAiB,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IAEnD,UAAU,CAAC,EAAE,qBAAqB,CAAC;IAEnC,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAE/B;;OAEG;IACH,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;CAC7C,CAAC;AAEF,KAAK,cAAc,GAAG,UAAU,GAAG,WAAW,GAAG,YAAY,CAAC;AAE9D,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;;;;;OAMG;IACH,cAAc,EAAE,cAAc,CAAC;CAChC,CAAC;AAEF,qBAAa,SAAS;IAmCR,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAlCrC,yBAAyB;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2B;IAEnD,yDAAyD;IACzD,OAAO,CAAC,QAAQ,CAAiB;IAEjC,kCAAkC;IAClC,OAAO,CAAC,OAAO,CAA+B;IAE9C,gCAAgC;IAChC,OAAO,CAAC,QAAQ,CAAiB;IAEjC;;OAEG;IACH,SAAgB,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAAwB;IAE/C;;OAEG;IACH,SAAgB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAAsB;IAE3C;;OAEG;IACH,SAAgB,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAAuB;IAE7C,SAAgB,WAAW,4CAA4B;IAEvD;;OAEG;IACH,SAAgB,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAAwB;gBAEtB,QAAQ,EAAE,gBAAgB;IAQjD,GAAG,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;YA6G3C,iBAAiB;IAsC/B,OAAO,CAAC,yBAAyB;IAiBjC,OAAO,CAAC,kBAAkB;IA+B1B,OAAO,CAAC,mBAAmB;IAoF3B,KAAK;CAGN;;;;AAuDD,qBAAa,wBAAyB,SAAQ,6BAG7C;CAAG"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../../src/session/session.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,EAAc,OAAO,EAAc,KAAK,kBAAkB,EAAE,KAAK,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACrG,OAAO,EAAE,KAAK,EAAgB,MAAM,aAAa,CAAC;AAKlD,OAAO,EAAqB,KAAK,eAAe,EAAE,KAAK,eAAe,EAAyB,MAAM,eAAe,CAAC;AAErH;;;;;;;;;GASG;AAEH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,eAAe,CAAC;IAExB,SAAS,EAAE,kBAAkB,EAAE,CAAC;IAEhC;;OAEG;IACH,KAAK,EAAE,IAAI,EAAE,CAAC;IAEd,OAAO,EAAE,OAAO,EAAE,CAAC;IAEnB,MAAM,EAAE,MAAM,CAAC;IAEf,iBAAiB,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IAEnD,UAAU,CAAC,EAAE,qBAAqB,CAAC;IAEnC,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC,CAAC;AAEF,KAAK,cAAc,GAAG,UAAU,GAAG,WAAW,CAAC;AAE/C,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;;;OAIG;IACH,cAAc,EAAE,cAAc,CAAC;CAChC,CAAC;AAEF,qBAAa,SAAS;IAmCR,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAlCrC,yBAAyB;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2B;IAEnD,yDAAyD;IACzD,OAAO,CAAC,QAAQ,CAAiB;IAEjC,kCAAkC;IAClC,OAAO,CAAC,OAAO,CAA+B;IAE9C,gCAAgC;IAChC,OAAO,CAAC,QAAQ,CAAiB;IAEjC;;OAEG;IACH,SAAgB,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAAwB;IAE/C;;OAEG;IACH,SAAgB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAAsB;IAE3C;;OAEG;IACH,SAAgB,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAAuB;IAE7C,SAAgB,WAAW,4CAA4B;IAEvD;;OAEG;IACH,SAAgB,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAAwB;gBAEtB,QAAQ,EAAE,gBAAgB;IAQjD,GAAG,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAkOzD,KAAK;CAGN;;;;AAqCD,qBAAa,wBAAyB,SAAQ,6BAG7C;CAAG"}

package/dist/types/src/testing/test-schema.d.ts

@@ -31,7 +31,7 @@ export declare const Task: S.mutable<S.Struct<{
 }>>;
 export interface Task extends S.Schema.Type<typeof Task> {
 }
-export declare const Organization: S.mutable<S.Struct<{
+export declare const Org: S.mutable<S.Struct<{
     id: S.SchemaClass<string, string, never>;
     name: S.SchemaClass<string, string, never>;
     projects: S.Array$<import("@dxos/echo-schema").Ref$<{
@@ -45,6 +45,6 @@ export declare const Organization: S.mutable<S.Struct<{
         email?: string | undefined;
     }>>;
 }>>;
-export interface Organization extends S.Schema.Type<typeof Organization> {
+export interface Org extends S.Schema.Type<typeof Org> {
 }
 //# sourceMappingURL=test-schema.d.ts.map

package/dist/types/src/testing/test-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-schema.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-schema.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAC;AAQrC,eAAO,MAAM,QAAQ,sCAAyE,CAAC;AAE/F,eAAO,MAAM,OAAO;;;;GAahB,CAAC;AACL,MAAM,WAAW,OAAQ,SAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC;CAAG;AAEjE,eAAO,MAAM,OAAO;;;;GAahB,CAAC;AACL,MAAM,WAAW,OAAQ,SAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC;CAAG;AAEjE,eAAO,MAAM,IAAI;;;;;;;;;;;;;;GAeb,CAAC;AACL,MAAM,WAAW,IAAK,SAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC;CAAG;AAE3D,eAAO,MAAM,YAAY;;;;;;;;;;;;;GAcrB,CAAC;AACL,MAAM,WAAW,YAAa,SAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,YAAY,CAAC;CAAG"}
+{"version":3,"file":"test-schema.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-schema.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAC;AAQrC,eAAO,MAAM,QAAQ,sCAAyE,CAAC;AAE/F,eAAO,MAAM,OAAO;;;;GAahB,CAAC;AACL,MAAM,WAAW,OAAQ,SAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC;CAAG;AAEjE,eAAO,MAAM,OAAO;;;;GAahB,CAAC;AACL,MAAM,WAAW,OAAQ,SAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC;CAAG;AAEjE,eAAO,MAAM,IAAI;;;;;;;;;;;;;;GAeb,CAAC;AACL,MAAM,WAAW,IAAK,SAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC;CAAG;AAE3D,eAAO,MAAM,GAAG;;;;;;;;;;;;;GAcZ,CAAC;AACL,MAAM,WAAW,GAAI,SAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC;CAAG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/assistant",
-  "version": "0.8.2-main.f11618f",
+  "version": "0.8.2-staging.7ac8446",
   "description": "Natural language interface to DXOS",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -40,18 +40,18 @@
     "parjs": "^1.3.9",
     "parsimmon": "^1.18.1",
     "ulidx": "^2.3.0",
-    "@dxos/artifact": "0.8.2-main.f11618f",
-    "@dxos/context": "0.8.2-main.f11618f",
-    "@dxos/async": "0.8.2-main.f11618f",
-    "@dxos/echo-db": "0.8.2-main.f11618f",
-    "@dxos/echo-schema": "0.8.2-main.f11618f",
-    "@dxos/debug": "0.8.2-main.f11618f",
-    "@dxos/invariant": "0.8.2-main.f11618f",
-    "@dxos/log": "0.8.2-main.f11618f",
-    "@dxos/live-object": "0.8.2-main.f11618f",
-    "@dxos/keys": "0.8.2-main.f11618f",
-    "@dxos/node-std": "0.8.2-main.f11618f",
-    "@dxos/util": "0.8.2-main.f11618f"
+    "@dxos/artifact": "0.8.2-staging.7ac8446",
+    "@dxos/async": "0.8.2-staging.7ac8446",
+    "@dxos/context": "0.8.2-staging.7ac8446",
+    "@dxos/debug": "0.8.2-staging.7ac8446",
+    "@dxos/echo-db": "0.8.2-staging.7ac8446",
+    "@dxos/echo-schema": "0.8.2-staging.7ac8446",
+    "@dxos/keys": "0.8.2-staging.7ac8446",
+    "@dxos/invariant": "0.8.2-staging.7ac8446",
+    "@dxos/live-object": "0.8.2-staging.7ac8446",
+    "@dxos/log": "0.8.2-staging.7ac8446",
+    "@dxos/node-std": "0.8.2-staging.7ac8446",
+    "@dxos/util": "0.8.2-staging.7ac8446"
   },
   "devDependencies": {
     "@types/parsimmon": "^1.10.9",

package/src/ai-service/client.test.ts

@@ -6,8 +6,9 @@ import { Schema as S } from 'effect';
 import { test, describe } from 'vitest';
 
 import { defineTool, Message, ToolResult, type Tool } from '@dxos/artifact';
-import { toJsonSchema, create } from '@dxos/echo-schema';
+import { toJsonSchema, ObjectId, createStatic } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
+import { SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
 
 import { DEFAULT_EDGE_MODEL } from './defs';
@@ -25,18 +26,23 @@ describe.skip('AI Service Client', () => {
       endpoint: AI_SERVICE_ENDPOINT.LOCAL,
     });
 
-    // await client.appendMessages([
-    //   {
-    //     id: ObjectId.random(),
-    //     spaceId,
-    //     threadId,
-    //     role: 'user',
-    //     content: [{ type: 'text', text: 'Hello' }],
-    //   },
-    //     ]);
-
-    const stream = await client.execStream({
+    const spaceId = SpaceId.random();
+    const threadId = ObjectId.random();
+
+    await client.appendMessages([
+      {
+        id: ObjectId.random(),
+        spaceId,
+        threadId,
+        role: 'user',
+        content: [{ type: 'text', text: 'Hello' }],
+      },
+    ]);
+
+    const stream = await client.exec({
       model: DEFAULT_EDGE_MODEL,
+      spaceId,
+      threadId,
       systemPrompt: 'You are a poet',
       tools: [],
     });
@@ -64,19 +70,24 @@ describe.skip('AI Service Client', () => {
       ),
     };
 
-    // await client.appendMessages([
-    //   {
-    //     id: ObjectId.random(),
-    //     spaceId,
-    //     threadId,
-    //     role: 'user',
-    //     content: [{ type: 'text', text: 'What is the password? Ask the custodian' }],
-    //   },
-    // ]);
+    const spaceId = SpaceId.random();
+    const threadId = ObjectId.random();
+
+    await client.appendMessages([
+      {
+        id: ObjectId.random(),
+        spaceId,
+        threadId,
+        role: 'user',
+        content: [{ type: 'text', text: 'What is the password? Ask the custodian' }],
+      },
+    ]);
 
     {
-      const stream1 = await client.execStream({
+      const stream1 = await client.exec({
         model: DEFAULT_EDGE_MODEL,
+        spaceId,
+        threadId,
         systemPrompt: 'You are a helpful assistant.',
         tools: [custodian],
       });
@@ -91,24 +102,26 @@ describe.skip('AI Service Client', () => {
 
       const [message1] = messages;
       log('full message', { message: message1 });
-      // await client.appendMessages([message1]);
+      await client.appendMessages([message1]);
 
       const toolUse = message1.content.find(({ type }) => type === 'tool_use')!;
       invariant(toolUse.type === 'tool_use');
-      // await client.appendMessages([
-      //   {
-      //     id: ObjectId.random(),
-      //     spaceId,
-      //     threadId,
-      //     role: 'user',
-      //     content: [{ type: 'tool_result', toolUseId: toolUse.id, content: 'password="The sky is blue"' }],
-      //   },
-      // ]);
+      await client.appendMessages([
+        {
+          id: ObjectId.random(),
+          spaceId,
+          threadId,
+          role: 'user',
+          content: [{ type: 'tool_result', toolUseId: toolUse.id, content: 'password="The sky is blue"' }],
+        },
+      ]);
     }
 
     {
-      const stream2 = await client.execStream({
+      const stream2 = await client.exec({
         model: DEFAULT_EDGE_MODEL,
+        spaceId,
+        threadId,
         systemPrompt: 'You are a helpful assistant.',
         tools: [custodian],
       });
@@ -130,18 +143,23 @@ describe.skip('AI Service Client', () => {
       endpoint: AI_SERVICE_ENDPOINT.LOCAL,
     });
 
-    // await client.appendMessages([
-    //   {
-    //     id: ObjectId.random(),
-    //     spaceId,
-    //     threadId,
-    //     role: 'user',
-    //     content: [{ type: 'text', text: 'Generate an image of a cat' }],
-    //   },
-    // ]);
-
-    const stream = await client.execStream({
+    const spaceId = SpaceId.random();
+    const threadId = ObjectId.random();
+
+    await client.appendMessages([
+      {
+        id: ObjectId.random(),
+        spaceId,
+        threadId,
+        role: 'user',
+        content: [{ type: 'text', text: 'Generate an image of a cat' }],
+      },
+    ]);
+
+    const stream = await client.exec({
       model: DEFAULT_EDGE_MODEL,
+      spaceId,
+      threadId,
       tools: [
         {
           name: 'text-to-image',
@@ -172,8 +190,8 @@ describe.skip('Ollama Client', () => {
     const parser = new MixedStreamParser();
 
     const messages = await parser.parse(
-      await client.execStream({
-        prompt: create(Message, {
+      await client.exec({
+        prompt: createStatic(Message, {
           role: 'user',
           content: [{ type: 'text', text: 'Hello, world!' }],
         }),
@@ -207,8 +225,8 @@ describe.skip('Ollama Client', () => {
     });
 
     const messages = await parser.parse(
-      await client.execStream({
-        prompt: create(Message, {
+      await client.exec({
+        prompt: createStatic(Message, {
           role: 'user',
           content: [{ type: 'text', text: 'What is the encrypted message for "Hello, world!"' }],
         }),
@@ -228,8 +246,8 @@ describe.skip('Ollama Client', () => {
     const parser = new MixedStreamParser();
 
     const messages = await parser.parse(
-      await client.execStream({
-        prompt: create(Message, {
+      await client.exec({
+        prompt: createStatic(Message, {
           role: 'user',
           content: [{ type: 'text', text: 'Generate an image of a cat' }],
         }),

package/src/ai-service/edge-client.ts

@@ -2,12 +2,15 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Schema as S } from 'effect';
+
+import { Message } from '@dxos/artifact';
 import { assertArgument, invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 
 import type { AIServiceClient, GenerationStream } from './service';
 import { createGenerationStream } from './stream';
-import { type GenerateRequest, type GenerateResponse } from './types';
+import { type GenerateRequest } from './types';
 
 export type AIServiceEdgeClientOptions = {
   endpoint: string;
@@ -22,16 +25,28 @@ export class AIServiceEdgeClient implements AIServiceClient {
   }
 
   /**
-   * Generate non-streaming response.
+   * @deprecated
    */
-  async exec(request: GenerateRequest): Promise<GenerateResponse> {
-    throw new Error('Not implemented');
+  // TODO(burdon): Remove.
+  async appendMessages(messages: Message[]): Promise<void> {
+    const url = `${this._endpoint}/message`;
+    const res = await fetch(url, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        messages: await S.encodePromise(S.Array(Message))(messages),
+      }),
+    });
+
+    if (!res.ok) {
+      throw new Error(`${await res.text()} [${url}]`);
+    }
   }
 
   /**
    * Process request and open message stream.
    */
-  async execStream(request: GenerateRequest): Promise<GenerationStream> {
+  async exec(request: GenerateRequest): Promise<GenerationStream> {
     assertArgument(typeof request.model === 'string', 'model is required');
     log('requesting', { endpoint: this._endpoint });
     const controller = new AbortController();
@@ -46,15 +61,7 @@ export class AIServiceEdgeClient implements AIServiceClient {
       }),
     });
 
-    if (!response.ok) {
-      throw await parseErrorResponse(response);
-    }
-
     invariant(response.body instanceof ReadableStream);
     return createGenerationStream(response, controller);
   }
 }
-
-const parseErrorResponse = async (response: Response): Promise<Error> => {
-  throw new Error(`AI Service error: ${response.status} ${response.statusText} ${await response.text()}`);
-};

package/src/ai-service/ollama-client.ts

@@ -13,7 +13,7 @@ import { DEFAULT_OLLAMA_ENDPOINT } from './defs';
 import { MessageCollector, emitMessageAsEvents } from './message-collector';
 import { type AIServiceClient, type GenerationStream } from './service';
 import { GenerationStreamImpl } from './stream';
-import { ToolTypes, type GenerateRequest, type GenerateResponse, type GenerationStreamEvent } from './types';
+import { ToolTypes, type GenerateRequest, type GenerationStreamEvent } from './types';
 import { isToolUse, runTools } from '../conversation';
 
 export type OllamaClientParams = {
@@ -300,14 +300,7 @@ export class OllamaClient implements AIServiceClient {
     }
   }
 
-  /**
-   * Generate non-streaming response.
-   */
-  async exec(request: GenerateRequest): Promise<GenerateResponse> {
-    throw new Error('Not implemented');
-  }
-
-  async execStream(request: GenerateRequest): Promise<GenerationStream> {
+  async exec(request: GenerateRequest): Promise<GenerationStream> {
     const controller = new AbortController();
 
     try {

package/src/ai-service/parser.ts

@@ -4,7 +4,7 @@
 
 import { Message, type MessageContentBlock } from '@dxos/artifact';
 import { Event } from '@dxos/async';
-import { create } from '@dxos/echo-schema';
+import { createStatic } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { isNotFalsy, safeParseJson } from '@dxos/util';
@@ -94,7 +94,7 @@ export class MixedStreamParser {
             log.warn('unexpected message_start');
           }
 
-          this._message = create(Message, { role: event.message.role, content: [...event.message.content] });
+          this._message = createStatic(Message, { role: event.message.role, content: [...event.message.content] });
           this.message.emit(this._message);
           break;
         }
@@ -316,17 +316,6 @@ export const mergeMessageBlock = (
           break;
         }
 
-        case 'proposal': {
-          if (streamBlock.content.length === 1 && streamBlock.content[0].type === 'text') {
-            return {
-              type: 'json',
-              disposition: 'proposal',
-              json: JSON.stringify({ text: streamBlock.content[0].content }),
-            };
-          }
-          break;
-        }
-
         case 'select': {
           return {
             type: 'json',

package/src/ai-service/service.ts

@@ -2,29 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type GenerateRequest, type GenerationStreamEvent, type GenerateResponse } from './types';
+import { type GenerateRequest, type GenerationStreamEvent } from './types';
 
-/**
- * Interface for AI service.
- * Generates chat completions, supports, history and tools.
- */
+// TODO(burdon): Create wrapper for edge/ollama. Create session?
 export interface AIServiceClient {
-  /**
-   * Generate chat completions, supports, history and tools.
-   * Generate non-streaming response.
-   */
-  exec(request: GenerateRequest): Promise<GenerateResponse>;
-
-  /**
-   * Generate chat completions, supports, history and tools.
-   * Process request and open message stream.
-   */
-  execStream(request: GenerateRequest): Promise<GenerationStream>;
+  exec(request: GenerateRequest): Promise<GenerationStream>;
 }
 
-/**
- * Streaming chat completion stream.
- */
 export interface GenerationStream extends AsyncIterable<GenerationStreamEvent> {
   abort(): void;
   complete(): Promise<void>;

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

@@ -7,7 +7,6 @@ import {
   type AIServiceClient,
   type GenerateRequest,
   createGenerationStream,
-  type GenerateResponse,
 } from '@dxos/assistant';
 
 import { createTestSSEStream } from './test-stream';
@@ -15,16 +14,9 @@ import { createTestSSEStream } from './test-stream';
 export class MockAIService implements AIServiceClient {
   constructor(private readonly _responses: string[]) {}
 
-  /**
-   * Generate non-streaming response.
-   */
-  async exec(request: GenerateRequest): Promise<GenerateResponse> {
-    throw new Error('Not implemented');
-  }
-
   // TODO(burdon): Match response to request.
   // TODO(burdon): See MockGpt (from conductor).
-  async execStream(request: GenerateRequest): Promise<GenerationStream> {
+  async exec(request: GenerateRequest): Promise<GenerationStream> {
     return createGenerationStream(new Response(createTestSSEStream(this._responses)));
   }
 }

package/src/ai-service/types.ts

@@ -4,8 +4,8 @@
 
 import { Schema as S } from 'effect';
 
-import { Tool, Message, type MessageContentBlock } from '@dxos/artifact';
-import { type ObjectId } from '@dxos/echo-schema';
+import { Tool, Message, type MessageContentBlock, SpaceIdSchema } from '@dxos/artifact';
+import { ObjectId } from '@dxos/echo-schema';
 
 import { DEFAULT_EDGE_MODELS, DEFAULT_OLLAMA_MODELS } from './defs';
 
@@ -25,6 +25,9 @@ export const ToolTypes = Object.freeze({
  * Client GPT request.
  */
 export const GenerateRequest = S.Struct({
+  spaceId: S.optional(SpaceIdSchema),
+  threadId: S.optional(ObjectId),
+
   /**
    * Preferred model or system default.
    */
@@ -51,20 +54,8 @@ export const GenerateRequest = S.Struct({
    */
   prompt: S.optional(Message),
 });
-export type GenerateRequest = S.Schema.Type<typeof GenerateRequest>;
-
-/**
- * Non-streaming response.
- */
-export const GenerateResponse = S.Struct({
-  messages: S.Array(Message),
 
-  /**
-   * Number of tokens used in the response.
-   */
-  tokenCount: S.optional(S.Number),
-});
-export type GenerateResponse = S.Schema.Type<typeof GenerateResponse>;
+export type GenerateRequest = S.Schema.Type<typeof GenerateRequest>;
 
 /**
  * Server-Sent Events (SSE) stream from the AI service.

package/src/bin/chat.ts

@@ -19,7 +19,7 @@ import {
   createSystemPrompt,
   createTestData,
   Contact,
-  Organization,
+  Org,
   Project,
   Task,
 } from '../testing';
@@ -33,7 +33,7 @@ const dataSource = createTestData();
 
 const cypherTool = createCypherTool(dataSource);
 
-const schemaTypes = [Organization, Project, Task, Contact];
+const schemaTypes = [Org, Project, Task, Contact];
 
 const spaceId = SpaceId.random();
 const threadId = ObjectId.random();
@@ -46,6 +46,7 @@ while (true) {
       message: 'Enter a message:',
     },
   ]);
+  await client.appendMessages([createUserMessage(spaceId, threadId, prompt.message)]);
 
   await runLLM({
     model: DEFAULT_EDGE_MODEL,
@@ -60,7 +61,6 @@ while (true) {
       },
     ],
     client,
-    history: [createUserMessage(spaceId, threadId, prompt.message)],
     logger: createLogger({
       stream: true,
       filter: (e) => {

package/src/conversation/conversation.ts

@@ -3,7 +3,7 @@
 //
 
 import { type Tool, ToolResult, Message } from '@dxos/artifact';
-import { create, ObjectId } from '@dxos/echo-schema';
+import { createStatic, ObjectId } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { type SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
@@ -43,8 +43,10 @@ export const runLLM = async (params: CreateLLMConversationParams) => {
   const generate = async () => {
     log('llm generate', { tools: params.tools });
     const beginTs = Date.now();
-    const stream = await params.client.execStream({
+    const stream = await params.client.exec({
       model: params.model,
+      spaceId: params.spaceId,
+      threadId: params.threadId,
       history,
       systemPrompt: params.system,
       tools: params.tools as any,
@@ -86,6 +88,8 @@ export const runLLM = async (params: CreateLLMConversationParams) => {
           log.warn('tool error', { message: toolResult.message });
           const resultMessage: Message = {
             id: ObjectId.random(),
+            spaceId: params.spaceId,
+            threadId: params.threadId,
             role: 'user',
             content: [
               {
@@ -106,6 +110,8 @@ export const runLLM = async (params: CreateLLMConversationParams) => {
           log('tool success', { result: toolResult.result });
           const resultMessage: Message = {
             id: ObjectId.random(),
+            spaceId: params.spaceId,
+            threadId: params.threadId,
             role: 'user',
             content: [
               {
@@ -169,7 +175,7 @@ export const runTools = async ({ message, tools, extensions }: RunToolsOptions):
   const toolCall = toolCalls[0];
   const tool = tools.find((tool) => tool.name === toolCall.name);
   if (!tool) {
-    const resultMessage = create(Message, {
+    const resultMessage = createStatic(Message, {
       role: 'user',
       content: [
         {
@@ -200,7 +206,7 @@ export const runTools = async ({ message, tools, extensions }: RunToolsOptions):
   switch (toolResult.kind) {
     case 'error': {
       log('tool error', { message: toolResult.message });
-      const resultMessage = create(Message, {
+      const resultMessage = createStatic(Message, {
         role: 'user',
         content: [
           {
@@ -221,7 +227,7 @@ export const runTools = async ({ message, tools, extensions }: RunToolsOptions):
 
     case 'success': {
       log('tool success', { result: toolResult.result });
-      const resultMessage = create(Message, {
+      const resultMessage = createStatic(Message, {
         role: 'user',
         content: [
           {

package/src/conversation/types.ts

@@ -6,10 +6,13 @@ import { Schema as S } from 'effect';
 
 import { type Message, type MessageContentBlock } from '@dxos/artifact';
 import { toJsonSchema, JsonSchemaType, ObjectId } from '@dxos/echo-schema';
+import type { SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
 
-export const createUserMessage = (text: string): Message => ({
+export const createUserMessage = (spaceId: SpaceId, threadId: ObjectId, text: string): Message => ({
   id: ObjectId.random(),
+  spaceId,
+  threadId,
   role: 'user',
   content: [{ type: 'text', text }],
 });

package/src/cypher/combinators.test.ts

@@ -77,7 +77,7 @@ describe('Cypher Combinators', () => {
   test('match clause', ({ expect }) => {
     testParser(matchClause, 'MATCH (n:Person)');
     testParser(matchClause, 'MATCH (n:Person)-[r:KNOWS]->(m:Person)');
-    testParser(matchClause, 'MATCH (o:Organization)-[:HAS_EMPLOYEE]->(e:Employee)');
+    testParser(matchClause, 'MATCH (o:Org)-[:HAS_EMPLOYEE]->(e:Employee)');
   });
 
   test('where clause', ({ expect }) => {
@@ -116,15 +116,15 @@ describe('Cypher Combinators', () => {
     );
     testParser(
       cypherQuery,
-      'MATCH (o:Organization)-[:HAS_EMPLOYEE]->(e:Employee)-[:WORKS_ON]->(p:Project) WHERE o.name = "DXOS" AND p.name = "Composer" RETURN e.name, e.id, p.name, p.id',
+      'MATCH (o:Org)-[:HAS_EMPLOYEE]->(e:Employee)-[:WORKS_ON]->(p:Project) WHERE o.name = "DXOS" AND p.name = "Composer" RETURN e.name, e.id, p.name, p.id',
     );
     testParser(
       cypherQuery,
-      'MATCH (n:Organization {name: "DXOS"})-[:HAS_EMPLOYEE]->(m:Employee)<-[:WORKS_ON]-(p:Project {name: "Composer"}) RETURN m.name AS employee',
+      'MATCH (n:Org {name: "DXOS"})-[:HAS_EMPLOYEE]->(m:Employee)<-[:WORKS_ON]-(p:Project {name: "Composer"}) RETURN m.name AS employee',
     );
     testParser(
       cypherQuery,
-      "MATCH (org:Organization {name: 'DXOS'})-[:ORG_EMPLOYEES]->(c:Contact)<-[:TASK_ASSIGNEE]-(t:Task)-[:TASK_PROJECT]->(p:Project {name: 'Composer'}) RETURN c.name",
+      "MATCH (org:Org {name: 'DXOS'})-[:ORG_EMPLOYEES]->(c:Contact)<-[:TASK_ASSIGNEE]-(t:Task)-[:TASK_PROJECT]->(p:Project {name: 'Composer'}) RETURN c.name",
     );
   });
 });

package/src/cypher/echo-data-source.ts

@@ -4,7 +4,8 @@
 
 import { raise } from '@dxos/debug';
 import { type EchoDatabase, Filter, type ReactiveEchoObject } from '@dxos/echo-db';
-import { getSchema, getSchemaTypename, type S, StoredSchema, toJsonSchema } from '@dxos/echo-schema';
+import { type S, getSchemaTypename, StoredSchema, toJsonSchema } from '@dxos/echo-schema';
+import { getSchema } from '@dxos/live-object';
 import { log } from '@dxos/log';
 
 import type { DataSource, Node, Relationship } from './query-executor';

package/src/cypher/execution-plan.test.ts

@@ -21,7 +21,7 @@ describe('Execution Plan', () => {
   test('complex query', ({ expect }) => {
     const plan = createExecutionPlan(
       parseCypherQuery(
-        "MATCH (org:Organization {name: 'DXOS'})-[:ORG_EMPLOYEES]->(c:Contact)<-[:TASK_ASSIGNEE]-(:Task)-[:TASK_PROJECT]->(p:Project {name: 'Composer'}) RETURN c.name",
+        "MATCH (org:Org {name: 'DXOS'})-[:ORG_EMPLOYEES]->(c:Contact)<-[:TASK_ASSIGNEE]-(:Task)-[:TASK_PROJECT]->(p:Project {name: 'Composer'}) RETURN c.name",
       ),
     );
     log('', { plan });