@dxos/assistant 0.8.2-main.12df754 → 0.8.2-main.2f9c567

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.2-main.12df754",
+  "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.2-main.12df754",
-    "@dxos/async": "0.8.2-main.12df754",
-    "@dxos/debug": "0.8.2-main.12df754",
-    "@dxos/context": "0.8.2-main.12df754",
-    "@dxos/echo-db": "0.8.2-main.12df754",
-    "@dxos/echo-schema": "0.8.2-main.12df754",
-    "@dxos/invariant": "0.8.2-main.12df754",
-    "@dxos/keys": "0.8.2-main.12df754",
-    "@dxos/live-object": "0.8.2-main.12df754",
-    "@dxos/log": "0.8.2-main.12df754",
-    "@dxos/node-std": "0.8.2-main.12df754",
-    "@dxos/util": "0.8.2-main.12df754"
+    "@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,7 +2,7 @@
 // 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';
@@ -58,8 +58,8 @@ 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"' }),
         }),
       ),
     };
@@ -194,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('')),
         }),

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';
@@ -388,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()));
@@ -467,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/types.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema as S } from 'effect';
+import { Schema } from 'effect';
 
 import { Tool, Message, type MessageContentBlock } from '@dxos/artifact';
 import { type ObjectId } from '@dxos/echo-schema';
@@ -11,9 +11,9 @@ import { DEFAULT_EDGE_MODELS, DEFAULT_OLLAMA_MODELS } from './defs';
 
 export const createArtifactElement = (id: ObjectId) => `<artifact id=${id} />`;
 
-export const LLMModel = S.Literal(...DEFAULT_EDGE_MODELS, ...DEFAULT_OLLAMA_MODELS);
+export const LLMModel = Schema.Literal(...DEFAULT_EDGE_MODELS, ...DEFAULT_OLLAMA_MODELS);
 
-export type LLMModel = S.Schema.Type<typeof LLMModel>;
+export type LLMModel = Schema.Schema.Type<typeof LLMModel>;
 
 export const ToolTypes = Object.freeze({
   // TODO(dmaretskyi): Not implemented yet.
@@ -24,47 +24,47 @@ export const ToolTypes = Object.freeze({
 /**
  * Client GPT request.
  */
-export const GenerateRequest = S.Struct({
+export const GenerateRequest = Schema.Struct({
   /**
    * Preferred model or system default.
    */
-  model: S.optional(LLMModel),
+  model: Schema.optional(LLMModel),
 
   /**
    * Tools available for the LLM.
    */
-  tools: S.optional(S.Array(Tool).pipe(S.mutable)),
+  tools: Schema.optional(Schema.Array(Tool).pipe(Schema.mutable)),
 
   /**
    * System instructions to the LLM.
    */
-  systemPrompt: S.optional(S.String),
+  systemPrompt: Schema.optional(Schema.String),
 
   /**
    * History of messages to include in the context window.
    */
   // TODO(burdon): Rename messages.
-  history: S.optional(S.Array(Message)),
+  history: Schema.optional(Schema.Array(Message)),
 
   /**
    * Current request.
    */
-  prompt: S.optional(Message),
+  prompt: Schema.optional(Message),
 });
-export type GenerateRequest = S.Schema.Type<typeof GenerateRequest>;
+export type GenerateRequest = Schema.Schema.Type<typeof GenerateRequest>;
 
 /**
  * Non-streaming response.
  */
-export const GenerateResponse = S.Struct({
-  messages: S.Array(Message),
+export const GenerateResponse = Schema.Struct({
+  messages: Schema.Array(Message),
 
   /**
    * Number of tokens used in the response.
    */
-  tokenCount: S.optional(S.Number),
+  tokenCount: Schema.optional(Schema.Number),
 });
-export type GenerateResponse = S.Schema.Type<typeof GenerateResponse>;
+export type GenerateResponse = Schema.Schema.Type<typeof GenerateResponse>;
 
 /**
  * Server-Sent Events (SSE) stream from the AI service.

package/src/bin/chat.ts

@@ -19,7 +19,7 @@ import {
   createSystemPrompt,
   createTestData,
   Contact,
-  Org,
+  Organization,
   Project,
   Task,
 } from '../testing';
@@ -33,7 +33,7 @@ const dataSource = createTestData();
 
 const cypherTool = createCypherTool(dataSource);
 
-const schemaTypes = [Org, Project, Task, Contact];
+const schemaTypes = [Organization, Project, Task, Contact];
 
 const spaceId = SpaceId.random();
 const threadId = ObjectId.random();

package/src/conversation/conversation.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema as S } from 'effect';
+import { Schema } from 'effect';
 import { describe, test } from 'vitest';
 
 import { createUserMessage, defineTool, ToolResult } from '@dxos/artifact';
@@ -40,8 +40,8 @@ describe.skip('Conversation tests', () => {
     const custodian = defineTool('testing', {
       name: 'custodian',
       description: 'Custodian can tell you the password if you say the magic word',
-      schema: S.Struct({
-        magicWord: S.String.annotations({ description: 'The magic word. Should be exactly "pretty please"' }),
+      schema: Schema.Struct({
+        magicWord: Schema.String.annotations({ description: 'The magic word. Should be exactly "pretty please"' }),
       }),
       execute: async ({ magicWord }) => {
         if (magicWord === 'pretty please') {

package/src/conversation/types.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema as S } from 'effect';
+import { Schema } from 'effect';
 
 import { type Message, type MessageContentBlock } from '@dxos/artifact';
 import { toJsonSchema, JsonSchemaType, ObjectId } from '@dxos/echo-schema';
@@ -17,11 +17,11 @@ export const createUserMessage = (text: string): Message => ({
 /**
  * @deprecated Use {@link LLMTool} instead.
  */
-export const ToolDefinition = S.Struct({
-  name: S.String,
-  description: S.String,
+export const ToolDefinition = Schema.Struct({
+  name: Schema.String,
+  description: Schema.String,
   parameters: JsonSchemaType,
-  execute: S.Any,
+  execute: Schema.Any,
 });
 
 /**
@@ -83,14 +83,14 @@ export const ToolResult = Object.freeze({
   Break: (result: unknown): ToolResult => ({ kind: 'break', result }),
 });
 
-export type DefineToolParams<Params extends S.Schema.AnyNoContext> = {
+export type DefineToolParams<Params extends Schema.Schema.AnyNoContext> = {
   name: string;
   description: string;
   schema: Params;
-  execute: (params: S.Schema.Type<Params>, context: ToolExecutionContext) => Promise<ToolResult>;
+  execute: (params: Schema.Schema.Type<Params>, context: ToolExecutionContext) => Promise<ToolResult>;
 };
 
-export const defineTool = <Params extends S.Schema.AnyNoContext>({
+export const defineTool = <Params extends Schema.Schema.AnyNoContext>({
   name,
   description,
   schema,
@@ -101,7 +101,7 @@ export const defineTool = <Params extends S.Schema.AnyNoContext>({
     description,
     parameters: toFunctionParameterSchema(schema),
     execute: (params, context) => {
-      const sanitized = S.decodeSync(schema)(params);
+      const sanitized = Schema.decodeSync(schema)(params);
       return execute(sanitized, context);
     },
   };
@@ -110,7 +110,7 @@ export const defineTool = <Params extends S.Schema.AnyNoContext>({
 /**
  * Adapts schems to be able to pass to AI providers.
  */
-const toFunctionParameterSchema = (schema: S.Schema.All) => {
+const toFunctionParameterSchema = (schema: Schema.Schema.All) => {
   const jsonSchema = toJsonSchema(schema);
   log('tool schema', { jsonSchema });
   delete jsonSchema.anyOf;

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

@@ -2,9 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
+import { type Schema } from 'effect';
+
 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 EchoDatabase, Filter, type AnyLiveObject } from '@dxos/echo-db';
+import { getSchema, getSchemaTypename, StoredSchema, toJsonSchema } from '@dxos/echo-schema';
 import { log } from '@dxos/log';
 
 import type { DataSource, Node, Relationship } from './query-executor';
@@ -62,7 +64,7 @@ export class EchoDataSource implements DataSource {
     ).flat();
   }
 
-  private async _getAllSchema(): Promise<S.Schema.AnyNoContext[]> {
+  private async _getAllSchema(): Promise<Schema.Schema.AnyNoContext[]> {
     return [
       ...(await this._db.schemaRegistry.query().run()),
       // TODO(dmaretskyi): Remove once we can serialize recursive schema.
@@ -70,7 +72,7 @@ export class EchoDataSource implements DataSource {
     ].filter((schema) => getSchemaTypename(schema) !== StoredSchema.typename);
   }
 
-  private _objectToNode(object: ReactiveEchoObject<any>): Node {
+  private _objectToNode(object: AnyLiveObject<any>): Node {
     const { id, ...properties } = object;
     return {
       id,
@@ -80,7 +82,7 @@ export class EchoDataSource implements DataSource {
     };
   }
 
-  private async _projectRefRelationship(object: ReactiveEchoObject<any>, prop: string): Promise<Relationship[]> {
+  private async _projectRefRelationship(object: AnyLiveObject<any>, prop: string): Promise<Relationship[]> {
     if (!object[prop]) {
       return [];
     }

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

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

package/src/cypher/query-executor.test.ts

@@ -25,7 +25,7 @@ test.skip('run', async ({ expect }) => {
   const result = await executeQuery(
     dataSource,
     `
-      MATCH (org:Org {name: 'DXOS'})-[:ORG_EMPLOYEES]->(c:Contact)<-[:TASK_ASSIGNEE]-(t:Task)-[:TASK_PROJECT]->(p:Project {name: 'Composer'})
+      MATCH (org:Organization {name: 'DXOS'})-[:ORG_EMPLOYEES]->(c:Contact)<-[:TASK_ASSIGNEE]-(t:Task)-[:TASK_PROJECT]->(p:Project {name: 'Composer'})
       RETURN c.name, t.name
     `,
   );

package/src/cypher/schema.test.ts

@@ -7,10 +7,10 @@ import { test } from 'vitest';
 import { toJsonSchema } from '@dxos/echo-schema';
 
 import { formatJsonSchemaForLLM } from './schema';
-import { Contact, Org, Project, Task } from '../testing';
+import { Contact, Organization, Project, Task } from '../testing';
 
-test('Org-Project-Task-Contact schema', async ({ expect }) => {
-  const jsonSchema = [Org, Project, Task, Contact].map((schema) => toJsonSchema(schema));
+test('Organization-Project-Task-Contact schema', async ({ expect }) => {
+  const jsonSchema = [Organization, Project, Task, Contact].map((schema) => toJsonSchema(schema));
   const result = formatJsonSchemaForLLM(jsonSchema);
   // log('result', { result });
   expect(result).toHaveLength(8);

package/src/session/index.ts

@@ -3,3 +3,4 @@
 //
 
 export * from './session';
+export * from './version-pin';

package/src/session/session.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema as S } from 'effect';
+import { Schema } from 'effect';
 import { inspect } from 'node:util';
 import { describe, test } from 'vitest';
 
@@ -15,7 +15,8 @@ import {
   type MessageContentBlock,
 } from '@dxos/artifact';
 import { AIServiceEdgeClient } from '@dxos/assistant';
-import { create, EchoObject, ObjectId } from '@dxos/echo-schema';
+import { Type } from '@dxos/echo';
+import { create, ObjectId } from '@dxos/echo-schema';
 import { DXN } from '@dxos/keys';
 import { log } from '@dxos/log';
 
@@ -23,14 +24,19 @@ import { AISession } from './session';
 import { AI_SERVICE_ENDPOINT } from '../testing';
 
 // Define a calendar event artifact schema.
-const CalendarEventSchema = S.Struct({
-  title: S.String,
-  startTime: S.String,
-  endTime: S.String,
-  description: S.String,
-}).pipe(EchoObject({ typename: 'example.com/type/CalendarEvent', version: '0.1.0' }));
+const CalendarEventSchema = Schema.Struct({
+  title: Schema.String,
+  startTime: Schema.String,
+  endTime: Schema.String,
+  description: Schema.String,
+}).pipe(
+  Type.def({
+    typename: 'example.com/type/CalendarEvent',
+    version: '0.1.0',
+  }),
+);
 
-type CalendarEvent = S.Schema.Type<typeof CalendarEventSchema>;
+type CalendarEvent = Schema.Schema.Type<typeof CalendarEventSchema>;
 
 // TODO(burdon): Flaky.
 describe.skip('AISession with Ollama', () => {
@@ -39,7 +45,7 @@ describe.skip('AISession with Ollama', () => {
     // const aiClient = new OllamaClient({
     //   overrides: { model: 'llama3.1:8b' },
     // });
-    const session = new AISession({ operationModel: 'immediate' });
+    const session = new AISession({ operationModel: 'configured' });
 
     const objects = new Set<string>();
 
@@ -53,7 +59,7 @@ describe.skip('AISession with Ollama', () => {
         defineTool('calendar', {
           name: 'query',
           description: 'Query the calendar for events',
-          schema: S.Struct({}),
+          schema: Schema.Struct({}),
           execute: async () => {
             return ToolResult.Success(CALENDAR_EVENTS);
           },
@@ -65,13 +71,13 @@ describe.skip('AISession with Ollama', () => {
       id: 'artifact:dxos.org/plugin/table',
       name: 'Table',
       instructions: 'Use this to create and manage tables. Each table has a unique id.',
-      schema: S.Struct({}),
+      schema: Schema.Struct({}),
       tools: [
         defineTool('table', {
           name: 'create',
           description: 'Create a table',
-          schema: S.Struct({
-            data: S.Array(S.Any).annotations({ description: 'Array of data payloads to add as rows' }),
+          schema: Schema.Struct({
+            data: Schema.Array(Schema.Any).annotations({ description: 'Array of data payloads to add as rows' }),
           }),
           execute: async ({ data }) => {
             log('create table', { data });
@@ -89,12 +95,12 @@ describe.skip('AISession with Ollama', () => {
       name: 'Map',
       instructions:
         'Use this to create and manage maps. Maps source data from tables. Table id is required to create a map.',
-      schema: S.Struct({}),
+      schema: Schema.Struct({}),
       tools: [
         defineTool('map', {
           name: 'create',
           description: 'Create a map',
-          schema: S.Struct({
+          schema: Schema.Struct({
             source: ArtifactId.annotations({
               description: 'The table that will be used as the source of the map',
             }),
@@ -119,7 +125,7 @@ describe.skip('AISession with Ollama', () => {
       id: 'artifact:dxos.org/plugin/script',
       name: 'Script',
       instructions: 'Use this to create and manage scripts',
-      schema: S.Struct({}),
+      schema: Schema.Struct({}),
       tools: [],
     });
 
@@ -140,6 +146,7 @@ describe.skip('AISession with Ollama', () => {
       client: aiClient,
       tools: [],
       artifacts: [calendarArtifact, tableArtifact, mapArtifact, scriptArtifact],
+      requiredArtifactIds: [calendarArtifact.id, tableArtifact.id, mapArtifact.id, scriptArtifact.id],
       history: [],
       generationOptions: {
         model: '@anthropic/claude-3-5-haiku-20241022',