@dxos/assistant 0.8.1 → 0.8.2-main.2f9c567

package/dist/types/src/session/version-pin.d.ts

@@ -0,0 +1,17 @@
+import { Schema } from 'effect';
+import type { MessageContentBlock } from '@dxos/artifact';
+import type { ObjectVersion } from '@dxos/echo-db';
+import { type BaseEchoObject } from '@dxos/echo-schema';
+declare const VersionPinSchema: Schema.Struct<{
+    objectId: import("@dxos/echo-schema").ObjectIdClass;
+    version: Schema.Schema<ObjectVersion, ObjectVersion, never>;
+}>;
+export interface VersionPin extends Schema.Schema.Type<typeof VersionPinSchema> {
+}
+export declare const VersionPin: typeof VersionPinSchema & {
+    DISPOSITION: 'version-pin';
+    fromObject: (object: BaseEchoObject) => VersionPin;
+    createBlock: (pin: VersionPin) => MessageContentBlock;
+};
+export {};
+//# sourceMappingURL=version-pin.d.ts.map

package/dist/types/src/session/version-pin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"version-pin.d.ts","sourceRoot":"","sources":["../../../../src/session/version-pin.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,EAAY,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAKlE,QAAA,MAAM,gBAAgB;;;EAKpB,CAAC;AACH,MAAM,WAAW,UAAW,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC;CAAG;AAElF,eAAO,MAAM,UAAU,EAAE,OAAO,gBAAgB,GAAG;IACjD,WAAW,EAAE,aAAa,CAAC;IAC3B,UAAU,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,UAAU,CAAC;IACnD,WAAW,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,mBAAmB,CAAC;CAiBvD,CAAC"}

package/dist/types/src/session/version-pin.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=version-pin.test.d.ts.map

package/dist/types/src/session/version-pin.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"version-pin.test.d.ts","sourceRoot":"","sources":["../../../../src/session/version-pin.test.ts"],"names":[],"mappings":""}

package/dist/types/src/testing/query-promts.d.ts

@@ -1,5 +1,5 @@
-import { Schema as S } from 'effect';
+import { Schema } from 'effect';
 import { type DataSource } from '../cypher';
-export declare const createCypherTool: (dataSource: DataSource, schemaTypes?: S.Schema.Any[]) => import("@dxos/artifact").Tool;
-export declare const createSystemPrompt: (schemaTypes: S.Schema.Any[]) => string;
+export declare const createCypherTool: (dataSource: DataSource, schemaTypes?: Schema.Schema.Any[]) => import("@dxos/artifact").Tool;
+export declare const createSystemPrompt: (schemaTypes: Schema.Schema.Any[]) => string;
 //# sourceMappingURL=query-promts.d.ts.map

package/dist/types/src/testing/query-promts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-promts.d.ts","sourceRoot":"","sources":["../../../../src/testing/query-promts.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAC;AAMrC,OAAO,EAAwC,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AAGlF,eAAO,MAAM,gBAAgB,eAAgB,UAAU,gBAAe,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,kCA0ChF,CAAC;AAEL,eAAO,MAAM,kBAAkB,gBAAiB,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,WAiB7D,CAAC"}
+{"version":3,"file":"query-promts.d.ts","sourceRoot":"","sources":["../../../../src/testing/query-promts.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAMhC,OAAO,EAAwC,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AAGlF,eAAO,MAAM,gBAAgB,eAAgB,UAAU,gBAAe,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,kCA0CrF,CAAC;AAEL,eAAO,MAAM,kBAAkB,gBAAiB,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,WAiBlE,CAAC"}

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

@@ -1,4 +1,4 @@
-import { type Schema as S } from 'effect';
+import { type Schema } from 'effect';
 import type { EchoDatabase } from '@dxos/echo-db';
 import { type JsonSchemaType } from '@dxos/echo-schema';
 import { type DataSource, type Node, type Relationship } from '../cypher';
@@ -6,14 +6,14 @@ export declare const seedTestData: (db: EchoDatabase) => void;
 export declare const createTestData: () => MockDataSource;
 export declare class MockDataSource implements DataSource {
     objects: Record<string, {
-        schema: S.Schema.All;
+        schema: Schema.Schema.All;
         typeDxn: string;
         id: string;
         data: unknown;
     }>;
     schema: Record<string, {
         json: JsonSchemaType;
-        instance: S.Schema.All;
+        instance: Schema.Schema.All;
     }>;
     nodes: Node[];
     relationships: Relationship[];
@@ -23,7 +23,7 @@ export declare class MockDataSource implements DataSource {
     getRelationships({ label }: {
         label?: string;
     }): Promise<Relationship[]>;
-    add<S extends S.Schema.All>(schema: S, data: S.Schema.Type<S>): S.Schema.Type<S>;
+    add<S extends Schema.Schema.All>(schema: S, data: Schema.Schema.Type<S>): Schema.Schema.Type<S>;
     computeGraph(): void;
 }
 //# sourceMappingURL=test-data.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"test-data.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-data.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAC;AAG1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAmD,KAAK,cAAc,EAAY,MAAM,mBAAmB,CAAC;AAInH,OAAO,EACL,KAAK,UAAU,EACf,KAAK,IAAI,EACT,KAAK,YAAY,EAGlB,MAAM,WAAW,CAAC;AAGnB,eAAO,MAAM,YAAY,OAAQ,YAAY,SAoH5C,CAAC;AAGF,eAAO,MAAM,cAAc,QAAO,cAuGjC,CAAC;AAEF,qBAAa,cAAe,YAAW,UAAU;IAC/C,OAAO,EAAE,MAAM,CACb,MAAM,EACN;QACE,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;QACrB,OAAO,EAAE,MAAM,CAAC;QAChB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,OAAO,CAAC;KACf,CACF,CAAM;IAEP,MAAM,EAAE,MAAM,CACZ,MAAM,EACN;QACE,IAAI,EAAE,cAAc,CAAC;QACrB,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;KACxB,CACF,CAAM;IAEP,KAAK,EAAE,IAAI,EAAE,CAAM;IACnB,aAAa,EAAE,YAAY,EAAE,CAAM;IAE7B,QAAQ,CAAC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE;IAItC,gBAAgB,CAAC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE;IAIpD,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAsB7D,YAAY;CA0Eb"}
+{"version":3,"file":"test-data.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-data.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGrC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAIL,KAAK,cAAc,EAGpB,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EACL,KAAK,UAAU,EACf,KAAK,IAAI,EACT,KAAK,YAAY,EAGlB,MAAM,WAAW,CAAC;AAGnB,eAAO,MAAM,YAAY,OAAQ,YAAY,SAoH5C,CAAC;AAGF,eAAO,MAAM,cAAc,QAAO,cAuGjC,CAAC;AAEF,qBAAa,cAAe,YAAW,UAAU;IAC/C,OAAO,EAAE,MAAM,CACb,MAAM,EACN;QACE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC;QAC1B,OAAO,EAAE,MAAM,CAAC;QAChB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,OAAO,CAAC;KACf,CACF,CAAM;IAEP,MAAM,EAAE,MAAM,CACZ,MAAM,EACN;QACE,IAAI,EAAE,cAAc,CAAC;QACrB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC;KAC7B,CACF,CAAM;IAEP,KAAK,EAAE,IAAI,EAAE,CAAM;IACnB,aAAa,EAAE,YAAY,EAAE,CAAM;IAE7B,QAAQ,CAAC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE;IAItC,gBAAgB,CAAC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE;IAIpD,GAAG,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAsBvE,YAAY;CA0Eb"}

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

@@ -1,23 +1,24 @@
-import { Schema as S } from 'effect';
-export declare const ObjectId: S.SchemaClass<string, string, never>;
-export declare const Contact: S.mutable<S.Struct<{
-    id: S.SchemaClass<string, string, never>;
-    name: S.SchemaClass<string, string, never>;
-    email: S.optional<typeof S.String>;
+import { Schema } from 'effect';
+/** @deprecated */
+export declare const Contact: Schema.mutable<Schema.Struct<{
+    id: import("@dxos/echo-schema").ObjectIdClass;
+    name: Schema.SchemaClass<string, string, never>;
+    email: Schema.optional<typeof Schema.String>;
 }>>;
-export interface Contact extends S.Schema.Type<typeof Contact> {
+export interface Contact extends Schema.Schema.Type<typeof Contact> {
 }
-export declare const Project: S.mutable<S.Struct<{
-    id: S.SchemaClass<string, string, never>;
-    name: S.SchemaClass<string, string, never>;
-    description: S.optional<typeof S.String>;
+/** @deprecated */
+export declare const Project: Schema.mutable<Schema.Struct<{
+    id: import("@dxos/echo-schema").ObjectIdClass;
+    name: Schema.SchemaClass<string, string, never>;
+    description: Schema.optional<typeof Schema.String>;
 }>>;
-export interface Project extends S.Schema.Type<typeof Project> {
+export interface Project extends Schema.Schema.Type<typeof Project> {
 }
-export declare const Task: S.mutable<S.Struct<{
-    id: S.SchemaClass<string, string, never>;
-    name: S.SchemaClass<string, string, never>;
-    description: S.optional<typeof S.String>;
+export declare const Task: Schema.mutable<Schema.Struct<{
+    id: import("@dxos/echo-schema").ObjectIdClass;
+    name: Schema.SchemaClass<string, string, never>;
+    description: Schema.optional<typeof Schema.String>;
     project: import("@dxos/echo-schema").Ref$<{
         name: string;
         description?: string | undefined;
@@ -29,22 +30,23 @@ export declare const Task: S.mutable<S.Struct<{
         email?: string | undefined;
     }>;
 }>>;
-export interface Task extends S.Schema.Type<typeof Task> {
+export interface Task extends Schema.Schema.Type<typeof Task> {
 }
-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$<{
+/** @deprecated */
+export declare const Organization: Schema.mutable<Schema.Struct<{
+    id: import("@dxos/echo-schema").ObjectIdClass;
+    name: Schema.SchemaClass<string, string, never>;
+    projects: Schema.Array$<import("@dxos/echo-schema").Ref$<{
         name: string;
         description?: string | undefined;
         id: string;
     }>>;
-    employees: S.Array$<import("@dxos/echo-schema").Ref$<{
+    employees: Schema.Array$<import("@dxos/echo-schema").Ref$<{
         name: string;
         id: string;
         email?: string | undefined;
     }>>;
 }>>;
-export interface Org extends S.Schema.Type<typeof Org> {
+export interface Organization extends Schema.Schema.Type<typeof Organization> {
 }
 //# 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,GAAG;;;;;;;;;;;;;GAcZ,CAAC;AACL,MAAM,WAAW,GAAI,SAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC;CAAG"}
+{"version":3,"file":"test-schema.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-schema.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAMhC,kBAAkB;AAClB,eAAO,MAAM,OAAO;;;;GAahB,CAAC;AACL,MAAM,WAAW,OAAQ,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC;CAAG;AAEtE,kBAAkB;AAClB,eAAO,MAAM,OAAO;;;;GAahB,CAAC;AACL,MAAM,WAAW,OAAQ,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC;CAAG;AAEtE,eAAO,MAAM,IAAI;;;;;;;;;;;;;;GAeb,CAAC;AACL,MAAM,WAAW,IAAK,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC;CAAG;AAEhE,kBAAkB;AAClB,eAAO,MAAM,YAAY;;;;;;;;;;;;;GAcrB,CAAC;AACL,MAAM,WAAW,YAAa,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,YAAY,CAAC;CAAG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/assistant",
-  "version": "0.8.1",
+  "version": "0.8.2-main.2f9c567",
   "description": "Natural language interface to DXOS",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -40,22 +40,23 @@
     "parjs": "^1.3.9",
     "parsimmon": "^1.18.1",
     "ulidx": "^2.3.0",
-    "@dxos/artifact": "0.8.1",
-    "@dxos/async": "0.8.1",
-    "@dxos/context": "0.8.1",
-    "@dxos/echo-db": "0.8.1",
-    "@dxos/echo-schema": "0.8.1",
-    "@dxos/debug": "0.8.1",
-    "@dxos/invariant": "0.8.1",
-    "@dxos/keys": "0.8.1",
-    "@dxos/live-object": "0.8.1",
-    "@dxos/node-std": "0.8.1",
-    "@dxos/util": "0.8.1",
-    "@dxos/log": "0.8.1"
+    "@dxos/artifact": "0.8.2-main.2f9c567",
+    "@dxos/context": "0.8.2-main.2f9c567",
+    "@dxos/async": "0.8.2-main.2f9c567",
+    "@dxos/debug": "0.8.2-main.2f9c567",
+    "@dxos/echo": "0.8.2-main.2f9c567",
+    "@dxos/echo-db": "0.8.2-main.2f9c567",
+    "@dxos/echo-schema": "0.8.2-main.2f9c567",
+    "@dxos/invariant": "0.8.2-main.2f9c567",
+    "@dxos/keys": "0.8.2-main.2f9c567",
+    "@dxos/log": "0.8.2-main.2f9c567",
+    "@dxos/node-std": "0.8.2-main.2f9c567",
+    "@dxos/live-object": "0.8.2-main.2f9c567",
+    "@dxos/util": "0.8.2-main.2f9c567"
   },
   "devDependencies": {
     "@types/parsimmon": "^1.10.9",
-    "effect": "3.13.3",
+    "effect": "3.14.21",
     "inquirer": "^12.0.0"
   },
   "peerDependencies": {

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

@@ -2,13 +2,12 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema as S } from 'effect';
+import { Schema } from 'effect';
 import { test, describe } from 'vitest';
 
 import { defineTool, Message, ToolResult, type Tool } from '@dxos/artifact';
-import { toJsonSchema, ObjectId, createStatic } from '@dxos/echo-schema';
+import { toJsonSchema, create } 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';
@@ -26,23 +25,18 @@ describe.skip('AI Service Client', () => {
       endpoint: AI_SERVICE_ENDPOINT.LOCAL,
     });
 
-    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({
+    // await client.appendMessages([
+    //   {
+    //     id: ObjectId.random(),
+    //     spaceId,
+    //     threadId,
+    //     role: 'user',
+    //     content: [{ type: 'text', text: 'Hello' }],
+    //   },
+    //     ]);
+
+    const stream = await client.execStream({
       model: DEFAULT_EDGE_MODEL,
-      spaceId,
-      threadId,
       systemPrompt: 'You are a poet',
       tools: [],
     });
@@ -64,30 +58,25 @@ describe.skip('AI Service Client', () => {
       name: 'custodian',
       description: 'Custodian can tell you the password if you say the magic word',
       parameters: toJsonSchema(
-        S.Struct({
-          magicWord: S.String.annotations({ description: 'The magic word. Should be exactly "pretty please"' }),
+        Schema.Struct({
+          magicWord: Schema.String.annotations({ description: 'The magic word. Should be exactly "pretty please"' }),
         }),
       ),
     };
 
-    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' }],
-      },
-    ]);
+    // 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.exec({
+      const stream1 = await client.execStream({
         model: DEFAULT_EDGE_MODEL,
-        spaceId,
-        threadId,
         systemPrompt: 'You are a helpful assistant.',
         tools: [custodian],
       });
@@ -102,26 +91,24 @@ 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.exec({
+      const stream2 = await client.execStream({
         model: DEFAULT_EDGE_MODEL,
-        spaceId,
-        threadId,
         systemPrompt: 'You are a helpful assistant.',
         tools: [custodian],
       });
@@ -143,23 +130,18 @@ describe.skip('AI Service Client', () => {
       endpoint: AI_SERVICE_ENDPOINT.LOCAL,
     });
 
-    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({
+    // 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({
       model: DEFAULT_EDGE_MODEL,
-      spaceId,
-      threadId,
       tools: [
         {
           name: 'text-to-image',
@@ -190,8 +172,8 @@ describe.skip('Ollama Client', () => {
     const parser = new MixedStreamParser();
 
     const messages = await parser.parse(
-      await client.exec({
-        prompt: createStatic(Message, {
+      await client.execStream({
+        prompt: create(Message, {
           role: 'user',
           content: [{ type: 'text', text: 'Hello, world!' }],
         }),
@@ -212,8 +194,8 @@ describe.skip('Ollama Client', () => {
         defineTool('test', {
           name: 'encrypt',
           description: 'Encrypt a message',
-          schema: S.Struct({
-            message: S.String.annotations({ description: 'The message to encrypt' }),
+          schema: Schema.Struct({
+            message: Schema.String.annotations({ description: 'The message to encrypt' }),
           }),
           execute: async ({ message }) => ToolResult.Success(message.split('').reverse().join('')),
         }),
@@ -225,8 +207,8 @@ describe.skip('Ollama Client', () => {
     });
 
     const messages = await parser.parse(
-      await client.exec({
-        prompt: createStatic(Message, {
+      await client.execStream({
+        prompt: create(Message, {
           role: 'user',
           content: [{ type: 'text', text: 'What is the encrypted message for "Hello, world!"' }],
         }),
@@ -246,8 +228,8 @@ describe.skip('Ollama Client', () => {
     const parser = new MixedStreamParser();
 
     const messages = await parser.parse(
-      await client.exec({
-        prompt: createStatic(Message, {
+      await client.execStream({
+        prompt: create(Message, {
           role: 'user',
           content: [{ type: 'text', text: 'Generate an image of a cat' }],
         }),

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

@@ -2,15 +2,12 @@
 // 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 } from './types';
+import { type GenerateRequest, type GenerateResponse } from './types';
 
 export type AIServiceEdgeClientOptions = {
   endpoint: string;
@@ -25,28 +22,16 @@ export class AIServiceEdgeClient implements AIServiceClient {
   }
 
   /**
-   * @deprecated
+   * Generate non-streaming response.
    */
-  // 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}]`);
-    }
+  async exec(request: GenerateRequest): Promise<GenerateResponse> {
+    throw new Error('Not implemented');
   }
 
   /**
    * Process request and open message stream.
    */
-  async exec(request: GenerateRequest): Promise<GenerationStream> {
+  async execStream(request: GenerateRequest): Promise<GenerationStream> {
     assertArgument(typeof request.model === 'string', 'model is required');
     log('requesting', { endpoint: this._endpoint });
     const controller = new AbortController();
@@ -61,7 +46,15 @@ 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

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema as S } from 'effect';
+import { Schema } from 'effect';
 
 import { type MessageContentBlock, defineTool, type Tool, ToolResult } from '@dxos/artifact';
 import { ObjectId } from '@dxos/echo-schema';
@@ -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 GenerationStreamEvent } from './types';
+import { ToolTypes, type GenerateRequest, type GenerateResponse, type GenerationStreamEvent } from './types';
 import { isToolUse, runTools } from '../conversation';
 
 export type OllamaClientParams = {
@@ -300,7 +300,14 @@ export class OllamaClient implements AIServiceClient {
     }
   }
 
-  async exec(request: GenerateRequest): Promise<GenerationStream> {
+  /**
+   * Generate non-streaming response.
+   */
+  async exec(request: GenerateRequest): Promise<GenerateResponse> {
+    throw new Error('Not implemented');
+  }
+
+  async execStream(request: GenerateRequest): Promise<GenerationStream> {
     const controller = new AbortController();
 
     try {
@@ -381,8 +388,8 @@ const WELL_KNOWN_TOOLS: Record<string, Tool> = {
   [ToolTypes.TextToImage]: defineTool('system', {
     name: 'text-to-image',
     description: 'Generate an image from a text prompt',
-    schema: S.Struct({
-      prompt: S.String.annotations({ description: 'The text prompt describing the image to generate' }),
+    schema: Schema.Struct({
+      prompt: Schema.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()));
@@ -460,15 +467,15 @@ class OllamaDecoderStream extends TransformStream<string, OllamaResponseData> {
   }
 }
 
-class ModelDoesNotSupportToolsError extends S.TaggedError<ModelDoesNotSupportToolsError>()(
+class ModelDoesNotSupportToolsError extends Schema.TaggedError<ModelDoesNotSupportToolsError>()(
   'ModelDoesNotSupportToolsError',
   {
-    model: S.String,
+    model: Schema.String,
   },
 ) {}
 
-class ModelNotFoundError extends S.TaggedError<ModelNotFoundError>()('ModelNotFoundError', {
-  model: S.String,
+class ModelNotFoundError extends Schema.TaggedError<ModelNotFoundError>()('ModelNotFoundError', {
+  model: Schema.String,
 }) {}
 
 const parseOllamaError = (error: string): Error => {

package/src/ai-service/parser.ts

@@ -4,7 +4,7 @@
 
 import { Message, type MessageContentBlock } from '@dxos/artifact';
 import { Event } from '@dxos/async';
-import { createStatic } from '@dxos/echo-schema';
+import { create } 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 = createStatic(Message, { role: event.message.role, content: [...event.message.content] });
+          this._message = create(Message, { role: event.message.role, content: [...event.message.content] });
           this.message.emit(this._message);
           break;
         }
@@ -316,6 +316,17 @@ 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,13 +2,29 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type GenerateRequest, type GenerationStreamEvent } from './types';
+import { type GenerateRequest, type GenerationStreamEvent, type GenerateResponse } from './types';
 
-// TODO(burdon): Create wrapper for edge/ollama. Create session?
+/**
+ * Interface for AI service.
+ * Generates chat completions, supports, history and tools.
+ */
 export interface AIServiceClient {
-  exec(request: GenerateRequest): Promise<GenerationStream>;
+  /**
+   * 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>;
 }
 
+/**
+ * Streaming chat completion stream.
+ */
 export interface GenerationStream extends AsyncIterable<GenerationStreamEvent> {
   abort(): void;
   complete(): Promise<void>;

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

@@ -7,6 +7,7 @@ import {
   type AIServiceClient,
   type GenerateRequest,
   createGenerationStream,
+  type GenerateResponse,
 } from '@dxos/assistant';
 
 import { createTestSSEStream } from './test-stream';
@@ -14,9 +15,16 @@ 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 exec(request: GenerateRequest): Promise<GenerationStream> {
+  async execStream(request: GenerateRequest): Promise<GenerationStream> {
     return createGenerationStream(new Response(createTestSSEStream(this._responses)));
   }
 }