@dxos/plugin-assistant 0.8.3-main.672df60 → 0.8.3-staging.0fa589b

package/src/stories/Query.stories.tsx

@@ -8,18 +8,16 @@ import { type Meta, type StoryObj } from '@storybook/react';
 import { Match, Schema } from 'effect';
 import React, { useCallback, useEffect, useMemo, useRef, useState, type FC } from 'react';
 
-import { AIServiceEdgeClient, type AIServiceEdgeClientOptions } from '@dxos/ai';
-import { SpyAIService } from '@dxos/ai/testing';
+import { EdgeAiServiceClient, type AiServiceEdgeClientOptions } from '@dxos/ai';
+import { SpyAiService } from '@dxos/ai/testing';
 import { Events } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { localServiceEndpoints, remoteServiceEndpoints } from '@dxos/artifact-testing';
-import { BlueprintMachine, BlueprintParser, Logger, setConsolePrinter, setLogger } from '@dxos/assistant';
+import { BlueprintMachine, BlueprintParser, BufferedLogger, setConsolePrinter, setLogger } from '@dxos/assistant';
 import { combine } from '@dxos/async';
-import { Filter, Queue, type Space } from '@dxos/client/echo';
-import { type Obj, Type } from '@dxos/echo';
-import { Ref, create, getLabelForObject, getTypename, type AnyEchoObject } from '@dxos/echo-schema';
+import { Queue, type Space } from '@dxos/client/echo';
+import { DXN, Filter, Obj, Ref, Type } from '@dxos/echo';
 import { SelectionModel } from '@dxos/graph';
-import { DXN } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { D3ForceGraph, type D3ForceGraphProps } from '@dxos/plugin-explorer';
 import { faker } from '@dxos/random';
@@ -28,8 +26,8 @@ import { useQueue } from '@dxos/react-client/echo';
 import { Dialog, IconButton, Toolbar, useAsyncState, useTranslation } from '@dxos/react-ui';
 import {
   matchCompletion,
-  staticCompletion,
   typeahead,
+  staticCompletion,
   type TypeaheadContext,
   type TypeaheadOptions,
 } from '@dxos/react-ui-editor';
@@ -45,7 +43,7 @@ import { testPlugins } from './testing';
 import { AmbientDialog, PromptBar, type PromptBarProps, type PromptController } from '../components';
 import { ASSISTANT_PLUGIN } from '../meta';
 import { QueryParser, createFilter, type Expression } from '../parser';
-import { RESEARCH_BLUEPRINT, createRegistry } from '../testing';
+import { createToolRegistry, RESEARCH_BLUEPRINT } from '../testing';
 import translations from '../translations';
 
 faker.seed(1);
@@ -57,7 +55,7 @@ const LOCAL = false;
 const endpoints = LOCAL ? localServiceEndpoints : remoteServiceEndpoints;
 
 // TODO(burdon) Move to story args.
-const aiConfig: AIServiceEdgeClientOptions = {
+const aiConfig: AiServiceEdgeClientOptions = {
   endpoint: endpoints.ai,
   defaultGenerationOptions: {
     model: '@anthropic/claude-3-5-sonnet-20241022',
@@ -69,7 +67,7 @@ const aiConfig: AIServiceEdgeClientOptions = {
  * Container for a set of ephemeral research results.
  */
 const ResearchGraph = Schema.Struct({
-  queue: Ref(Queue),
+  queue: Type.Ref(Queue),
 }).pipe(
   Type.Obj({
     typename: 'dxos.org/type/ResearchGraph',
@@ -130,8 +128,7 @@ const DefaultStory = ({ mode, spec, ...props }: StoryProps) => {
     } else {
       const queue = space.queues.create();
       return space.db.add(
-        create(ResearchGraph, {
-          // TODO(dmaretskyi): Ref.make(queue)
+        Obj.make(ResearchGraph, {
           queue: Ref.fromDXN(queue.dxn),
         }),
       );
@@ -159,21 +156,21 @@ const DefaultStory = ({ mode, spec, ...props }: StoryProps) => {
     model?.nodes
       .filter((node) => {
         try {
-          getTypename(node.data.object as AnyEchoObject);
+          Obj.getTypename(node.data.object as Obj.Any);
           return true;
         } catch {
           return false;
         }
       })
-      .map((node) => node.data.object as AnyEchoObject) ?? [];
+      .map((node) => node.data.object as Obj.Any) ?? [];
 
   //
   // AI
   //
 
-  const aiClient = useMemo(() => new SpyAIService(new AIServiceEdgeClient(aiConfig)), []);
-  const registry = useMemo(
-    () => space && researchGraph && createRegistry(space, researchGraph.queue.dxn),
+  const aiClient = useMemo(() => new SpyAiService(new EdgeAiServiceClient(aiConfig)), []);
+  const tools = useMemo(
+    () => space && researchGraph && createToolRegistry(space, researchGraph.queue.dxn),
     [space, researchGraph?.queue.dxn],
   );
 
@@ -181,7 +178,7 @@ const DefaultStory = ({ mode, spec, ...props }: StoryProps) => {
 
   const researchBlueprint = useMemo(() => BlueprintParser.create().parse(RESEARCH_BLUEPRINT), []);
 
-  const logger = useMemo(() => new Logger(), []);
+  const logger = useMemo(() => new BufferedLogger(), []);
 
   //
   // Handlers
@@ -192,27 +189,27 @@ const DefaultStory = ({ mode, spec, ...props }: StoryProps) => {
   }, [model]);
 
   const handleResearch = useCallback(async () => {
-    if (!space || !registry || !researchBlueprint) {
+    if (!space || !tools || !researchBlueprint) {
       return;
     }
 
-    const selected = selection.selected.value;
-    log.info('starting research...', { selected });
     const resolver = space.db.graph.createRefResolver({
       context: {
         space: space.db.spaceId,
         queue: researchGraph?.queue.dxn,
       },
     });
+
+    const selected = selection.selected.value;
     const objects = await Promise.all(selected.map((id) => resolver.resolve(DXN.fromLocalObjectId(id))));
-    const machine = new BlueprintMachine(registry, researchBlueprint);
+    const machine = new BlueprintMachine(tools, researchBlueprint);
     const cleanup = combine(setConsolePrinter(machine, true), setLogger(machine, logger));
 
     log.info('starting research...', { selected });
-    await machine.runToCompletion({ aiService: aiClient, input: objects });
+    await machine.runToCompletion({ aiClient, input: objects });
 
     cleanup();
-  }, [space, aiClient, registry, researchBlueprint, selection]);
+  }, [space, aiClient, tools, researchBlueprint, selection]);
 
   const handleGenerate = useCallback(async () => {
     if (!space) {
@@ -392,10 +389,12 @@ const ItemList = <T extends Obj.Any>({ items = [] }: { items?: T[] }) => {
               classNames='grid grid-cols-[4rem_16rem_1fr] min-h-[32px] items-center'
             >
               <div className='text-xs font-mono font-thin px-1 text-subdued'>{item.id.slice(-6)}</div>
-              <div className={mx('text-xs font-mono font-thin truncate px-1', getHashColor(getTypename(item))?.text)}>
-                {getTypename(item)}
+              <div
+                className={mx('text-xs font-mono font-thin truncate px-1', getHashColor(Obj.getTypename(item))?.text)}
+              >
+                {Obj.getTypename(item)}
               </div>
-              <List.ItemTitle>{getLabelForObject(item)}</List.ItemTitle>
+              <List.ItemTitle>{Obj.getLabel(item)}</List.ItemTitle>
             </List.Item>
           ))}
         </div>
@@ -432,7 +431,7 @@ const useFlush = (space?: Space) => {
   return { state, handleFlush };
 };
 
-const Log: FC<{ logger: Logger }> = ({ logger }) => {
+const Log: FC<{ logger: BufferedLogger }> = ({ logger }) => {
   return (
     <div className='grow flex flex-col p-1 overflow-y-auto text-sm'>
       {logger.messages.value.map((message, index) => (

package/src/stories/Research.stories.tsx

@@ -9,45 +9,31 @@ import { type Meta, type StoryObj } from '@storybook/react';
 import { Option, SchemaAST } from 'effect';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
-import { AgentStatusReport, AIServiceEdgeClient, createTool, type ExecutableTool, Message, ToolResult } from '@dxos/ai';
-import { EXA_API_KEY, SpyAIService } from '@dxos/ai/testing';
+import { AgentStatusReport, EdgeAiServiceClient, createTool, type ExecutableTool, Message, ToolResult } from '@dxos/ai';
+import { EXA_API_KEY, SpyAiService } from '@dxos/ai/testing';
 import { Capabilities, contributes, createSurface, Events, Surface, useIntentDispatcher } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { localServiceEndpoints, remoteServiceEndpoints } from '@dxos/artifact-testing';
 import { findRelatedSchema, researchFn, type RelatedSchema } from '@dxos/assistant';
 import { raise } from '@dxos/debug';
-import { Type, type Obj } from '@dxos/echo';
-import {
-  ATTR_RELATION_SOURCE,
-  ATTR_RELATION_TARGET,
-  create,
-  createQueueDxn,
-  getSchema,
-  getSchemaDXN,
-  getTypename,
-  isInstanceOf,
-  toJsonSchema,
-  type BaseObject,
-  Filter,
-  RelationSourceId,
-  RelationTargetId,
-} from '@dxos/echo-schema';
+import { Type, Filter, Obj, Relation } from '@dxos/echo';
+import { ATTR_RELATION_SOURCE, ATTR_RELATION_TARGET } from '@dxos/echo-schema';
 import { ConfiguredCredentialsService, FunctionExecutor, ServiceContainer, TracingService } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { ForceGraph, useGraphModel } from '@dxos/plugin-explorer';
 import { useClient } from '@dxos/react-client';
-import { getSpace, live, useQuery, useQueue, type EchoDatabase, type Live } from '@dxos/react-client/echo';
+import { getSpace, useQuery, useQueue, type EchoDatabase, type Live } from '@dxos/react-client/echo';
 import { IconButton, Input, Toolbar, useAsyncState } from '@dxos/react-ui';
 import {
   createMenuAction,
   createMenuItemGroup,
-  MenuProvider,
-  ToolbarMenu,
+  rxFromSignal,
   useMenuActions,
   type ActionGraphProps,
+  MenuProvider,
+  ToolbarMenu,
   type ToolbarMenuActionGroupProperties,
-  rxFromSignal,
 } from '@dxos/react-ui-menu';
 import { SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
 import { mx } from '@dxos/react-ui-theme';
@@ -73,11 +59,10 @@ const DefaultStory = ({ items: _items, prompts = [], ...props }: RenderProps) =>
   const [, forceUpdate] = useState({});
 
   const client = useClient();
-  // TODO(burdon): Hook.
-  const [aiClient] = useState(
+  const aiClient = useMemo(
     () =>
-      new SpyAIService(
-        new AIServiceEdgeClient({
+      new SpyAiService(
+        new EdgeAiServiceClient({
           endpoint: endpoints.ai,
           defaultGenerationOptions: {
             // model: '@anthropic/claude-sonnet-4-20250514',
@@ -85,6 +70,7 @@ const DefaultStory = ({ items: _items, prompts = [], ...props }: RenderProps) =>
           },
         }),
       ),
+    [],
   );
 
   const space = client.spaces.default;
@@ -94,7 +80,7 @@ const DefaultStory = ({ items: _items, prompts = [], ...props }: RenderProps) =>
   const menuProps = useMenuActions(actionCreator);
 
   // Queue.
-  const [queueDxn, setQueueDxn] = useState<string>(() => createQueueDxn(space.id).toString());
+  const [queueDxn, setQueueDxn] = useState<string>(() => space.queues.create().dxn.toString());
   const queue = useQueue<Message>(Type.DXN.tryParse(queueDxn));
 
   // Function executor.
@@ -147,8 +133,8 @@ const DefaultStory = ({ items: _items, prompts = [], ...props }: RenderProps) =>
 
   useEffect(() => {
     if (queue?.objects.length === 0 && !queue.isLoading && prompts.length > 0) {
-      queue.append([
-        create(Message, {
+      void queue.append([
+        Obj.make(Message, {
           role: 'assistant',
           content: prompts.map(
             (prompt) =>
@@ -166,7 +152,7 @@ const DefaultStory = ({ items: _items, prompts = [], ...props }: RenderProps) =>
   // State.
   const objects = useQuery(space, Filter.or(...DataTypes.map((type) => Filter.type(type))));
   const messages = [
-    ...(queue?.objects.filter((item) => isInstanceOf(Message, item)) ?? []),
+    ...(queue?.objects.filter((item) => Obj.instanceOf(Message, item)) ?? []),
     ...(processor?.messages.value ?? []),
   ];
 
@@ -185,7 +171,7 @@ const DefaultStory = ({ items: _items, prompts = [], ...props }: RenderProps) =>
           await processor.request(message, {
             history: queue.objects,
             onComplete: (messages) => {
-              queue.append(messages);
+              void queue.append(messages);
             },
           });
         });
@@ -210,20 +196,20 @@ const DefaultStory = ({ items: _items, prompts = [], ...props }: RenderProps) =>
   );
 
   // TODO(dmaretskyi): Pull in relations automatically.
-  const handleAddToGraph = useCallback(async (object: BaseObject) => {
+  const handleAddToGraph = useCallback(async (object: Obj.Any) => {
     space.db.add(instantiate(space.db, object));
     await space.db.flush({ indexes: true });
     forceUpdate({});
   }, []);
 
-  const handleResearchMore = useCallback((object: BaseObject, relatedSchema: RelatedSchema) => {
+  const handleResearchMore = useCallback((object: Obj.Any | Relation.Any, relatedSchema: RelatedSchema) => {
     const prompt = `
       Research more about objects related to the object in terms of the by the specific relation schema:
       <object>${JSON.stringify(object, null, 2)}</object>
       <schema>
         <description>${SchemaAST.getDescriptionAnnotation(relatedSchema.schema.ast).pipe(Option.getOrElse(() => ''))}</description>
         <json>
-          ${JSON.stringify(toJsonSchema(relatedSchema.schema), null, 2)}
+          ${JSON.stringify(Type.toJsonSchema(relatedSchema.schema), null, 2)}
         </json>
       </schema>
     `;
@@ -254,7 +240,7 @@ const DefaultStory = ({ items: _items, prompts = [], ...props }: RenderProps) =>
               iconOnly
               label='Clear history'
               icon='ph--trash--regular'
-              onClick={() => setQueueDxn(createQueueDxn().toString())}
+              onClick={() => setQueueDxn(space.queues.create().dxn.toString())}
             />
             <IconButton iconOnly label='Stop' icon='ph--stop--regular' onClick={() => processor?.cancel()} />
           </Input.Root>
@@ -308,20 +294,20 @@ const DefaultStory = ({ items: _items, prompts = [], ...props }: RenderProps) =>
 };
 
 type ResearchPromptsProps = {
-  object: BaseObject;
-  onResearch: (object: BaseObject, relatedSchema: RelatedSchema) => void;
+  object: Obj.Any | Relation.Any;
+  onResearch: (object: Obj.Any | Relation.Any, relatedSchema: RelatedSchema) => void;
 };
 
 const ResearchPrompts = ({ object, onResearch }: ResearchPromptsProps) => {
   const [relatedSchemas = []] = useAsyncState(
-    async () => findRelatedSchema(getSpace(object)!.db, getSchema(object)!),
+    async () => findRelatedSchema(getSpace(object)!.db, Obj.getSchema(object)!),
     [object],
   );
   return (
     <div>
       {relatedSchemas.map((schema) => (
         <button
-          key={getSchemaDXN(schema.schema)?.toString()}
+          key={Type.getDXN(schema.schema)?.toString()}
           onClick={() => onResearch(object, schema)}
           className='border border-separator rounded px-2 py-1 m-1'
         >
@@ -342,7 +328,7 @@ const createResearchTool = (serviceContainer: ServiceContainer, name: string, fn
         serviceContainer.clone().setServices({
           tracing: {
             write: (event) => {
-              if (isInstanceOf(AgentStatusReport, event)) {
+              if (Obj.instanceOf(AgentStatusReport, event)) {
                 log.info('[too] report status', { status: event });
                 reportStatus?.(event);
               }
@@ -352,7 +338,7 @@ const createResearchTool = (serviceContainer: ServiceContainer, name: string, fn
       );
 
       reportStatus?.(
-        create(AgentStatusReport, {
+        Obj.make(AgentStatusReport, {
           message: 'Researching...',
         }),
       );
@@ -382,7 +368,7 @@ const createResearchTool = (serviceContainer: ServiceContainer, name: string, fn
 // TODO(dmaretskyi): Move into core.
 const instantiate = (db: EchoDatabase, object: unknown): Live<any> => {
   const schema =
-    db.graph.schemaRegistry.getSchemaByDXN(Type.DXN.parse(getTypename(object as any)!)) ??
+    db.graph.schemaRegistry.getSchemaByDXN(Type.DXN.parse(Obj.getTypename(object as any)!)) ??
     raise(new Error('Schema not found'));
 
   let { id, [ATTR_RELATION_SOURCE]: source, [ATTR_RELATION_TARGET]: target, ...props } = object as any;
@@ -393,15 +379,15 @@ const instantiate = (db: EchoDatabase, object: unknown): Live<any> => {
     target = db.getObjectById(Type.DXN.parse(target).asEchoDXN()!.echoId) ?? raise(new Error('Target not found'));
   }
 
-  return live(schema, {
+  return Relation.make(schema, {
     id,
+    [Relation.Source]: source,
+    [Relation.Target]: target,
     ...props,
-    [RelationSourceId]: source,
-    [RelationTargetId]: target,
   });
 };
 
-const createToolbar = (aiClient: SpyAIService) =>
+const createToolbar = (aiClient: SpyAiService) =>
   Rx.make((get) => {
     const result: ActionGraphProps = { nodes: [], edges: [] };
     const save = createMenuAction('save', () => aiClient.saveEvents(), {

package/src/stories/test-data.ts

@@ -3,11 +3,11 @@
 //
 
 import { type Live, type Space } from '@dxos/client/echo';
-import { create, getSchemaTypename, RelationSourceId, RelationTargetId } from '@dxos/echo-schema';
+import { Obj, Type, Relation } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
 import { DataType } from '@dxos/schema';
 
-const organizations: DataType.Organization[] = [
+const organizations: (Type.Properties<DataType.Organization> & { id: string })[] = [
   { id: 'dxos', name: 'DXOS', website: 'https://dxos.org' },
   { id: 'socket_supply', name: 'Socket Supply', website: 'https://socketsupply.com' },
   { id: 'ink_and_switch', name: 'Ink & Switch', website: 'https://inkandswitch.com' },
@@ -24,7 +24,7 @@ const organizations: DataType.Organization[] = [
   { id: 'deshaw', name: 'D. E. Shaw & Co.', website: 'https://deshaw.com' },
 ];
 
-const people: DataType.Person[] = [
+const people: (Type.Properties<DataType.Person> & { id: string })[] = [
   { id: 'rich_burdon', fullName: 'Rich Burdon' },
   { id: 'josiah_witt', fullName: 'Josiah Witt' },
   { id: 'dima_dmaretskyi', fullName: 'Dima Maretskyi' },
@@ -41,8 +41,8 @@ const people: DataType.Person[] = [
 ];
 
 const testObjects: Record<string, any[]> = {
-  [getSchemaTypename(DataType.Organization)!]: organizations,
-  [getSchemaTypename(DataType.Person)!]: people,
+  [Type.getTypename(DataType.Organization)!]: organizations,
+  [Type.getTypename(DataType.Person)!]: people,
 };
 
 const testRelationships: Record<
@@ -52,7 +52,7 @@ const testRelationships: Record<
     target: string;
   } & Record<string, any>)[]
 > = {
-  [getSchemaTypename(DataType.Employer)!]: [
+  [Type.getTypename(DataType.Employer)!]: [
     // @eslint-disable-next-line
     { source: 'rich_burdon', target: 'dxos' },
     { source: 'rich_burdon', target: 'google', active: false }, // TODO(burdon): Should not contribute to force.
@@ -75,7 +75,7 @@ const testRelationships: Record<
   ],
 
   // TODO(burdon): Limit graph view to selected relationship types.
-  [getSchemaTypename(DataType.HasConnection)!]: [
+  [Type.getTypename(DataType.HasConnection)!]: [
     //
     { kind: 'partner', source: 'dxos', target: 'ink_and_switch' },
     { kind: 'partner', source: 'dxos', target: 'effectful' },
@@ -100,7 +100,7 @@ export const addTestData = async (space: Space): Promise<void> => {
     const schema = space.db.graph.schemaRegistry.getSchema(typename);
     invariant(schema, `Schema not found: ${typename}`);
     for (const { id, ...data } of objects) {
-      const object = space.db.add(create(schema, data));
+      const object = space.db.add(Obj.make(schema, data));
       objectMap.set(id, object);
     }
   }
@@ -116,11 +116,11 @@ export const addTestData = async (space: Space): Promise<void> => {
       invariant(targetObject, `Target object not found: ${target}`);
 
       space.db.add(
-        create(schema, {
-          ...data,
+        Relation.make(schema, {
           // TODO(burdon): Test source/target types match.
-          [RelationSourceId]: sourceObject,
-          [RelationTargetId]: targetObject,
+          [Relation.Source]: sourceObject,
+          [Relation.Target]: targetObject,
+          ...data,
         }),
       );
     }

package/src/testing/test-blueprint.ts

@@ -4,7 +4,13 @@
 
 import { ToolRegistry } from '@dxos/ai';
 import { EXA_API_KEY } from '@dxos/ai/testing';
-import { BlueprintParser, createExaTool, createGraphWriterTool, createLocalSearchTool } from '@dxos/assistant';
+import {
+  type BlueprintDefinition,
+  BlueprintParser,
+  createExaTool,
+  createGraphWriterTool,
+  createLocalSearchTool,
+} from '@dxos/assistant';
 import { type Space } from '@dxos/client/echo';
 import { type DXN } from '@dxos/keys';
 import { DataTypes } from '@dxos/schema';
@@ -12,7 +18,7 @@ import { isNonNullable } from '@dxos/util';
 
 // TODO(dmaretskyi): make db available through services (same as function executor).
 // TODO(burdon): Can tools implement "aspects" so that variants can be used rather than an explicit reference?
-export const createRegistry = (space: Space, queueDxn?: DXN): ToolRegistry => {
+export const createToolRegistry = (space: Space, queueDxn?: DXN): ToolRegistry => {
   return new ToolRegistry(
     [
       createExaTool({ apiKey: EXA_API_KEY }),
@@ -21,17 +27,17 @@ export const createRegistry = (space: Space, queueDxn?: DXN): ToolRegistry => {
         createGraphWriterTool({
           db: space.db,
           queue: space.queues.get(queueDxn),
-          schemaTypes: DataTypes,
+          schema: DataTypes,
           onDone: async (objects) => {
             const queue = space.queues.get(queueDxn);
-            queue.append(objects);
+            await queue.append(objects);
           },
         }),
     ].filter(isNonNullable),
   );
 };
 
-export const RESEARCH_BLUEPRINT = BlueprintParser.create().parse({
+export const RESEARCH_BLUEPRINT_DEFINITION: BlueprintDefinition = {
   steps: [
     {
       instructions: 'Research information and entities related to the selected objects.',
@@ -47,4 +53,6 @@ export const RESEARCH_BLUEPRINT = BlueprintParser.create().parse({
       tools: ['search/local_search', 'graph/writer'],
     },
   ],
-});
+};
+
+export const RESEARCH_BLUEPRINT = BlueprintParser.create().parse(RESEARCH_BLUEPRINT_DEFINITION);

package/src/testing/test-services.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { create } from '@dxos/echo-schema';
+import { Obj } from '@dxos/echo';
 
 import {
   type ApiAuthorization,
@@ -54,7 +54,7 @@ const VISUAL_CROSSING_CREDENTIALS: ApiAuthorization = {
 //  - e.g., https://github.com/konfig-sdks/openapi-examples/blob/main/xkcd/openapi.yaml
 
 const TEST_SERVICES: ServiceType[] = [
-  create(ServiceType, {
+  Obj.make(ServiceType, {
     serviceId: 'amadeus.com/service/FlightSearch',
     name: 'Amadeus Flight Search',
     description: 'Search for local and international flights.',
@@ -68,7 +68,7 @@ const TEST_SERVICES: ServiceType[] = [
     ],
   }),
 
-  create(ServiceType, {
+  Obj.make(ServiceType, {
     serviceId: 'amadeus.com/service/HotelSearch',
     name: 'Amadeus Hotel Search',
     description: 'Search for local and international hotels.',
@@ -82,7 +82,7 @@ const TEST_SERVICES: ServiceType[] = [
     ],
   }),
 
-  create(ServiceType, {
+  Obj.make(ServiceType, {
     serviceId: 'visualcrossing.com/service/Weather',
     name: 'Visual Crossing Weather',
     description: 'Search for global weather forecasts.',
@@ -97,7 +97,7 @@ const TEST_SERVICES: ServiceType[] = [
   }),
 
   // TODO(burdon): Needs auth.
-  create(ServiceType, {
+  Obj.make(ServiceType, {
     serviceId: 'abstractapi.com/service/GeoLocation',
     name: 'Abstract GeoLocation',
     description: 'Get the location of any IP address.',
@@ -115,7 +115,7 @@ const TEST_SERVICES: ServiceType[] = [
   //
 
   ...Array.from({ length: 20 }, (_, i) =>
-    create(ServiceType, {
+    Obj.make(ServiceType, {
       serviceId: `example.com/service/test-${i}`,
       name: `Test ${i}`,
       description: `Test ${i}`,

package/src/tools/function.ts

@@ -3,7 +3,7 @@
 //
 
 import { createTool, type ExecutableTool, ToolResult } from '@dxos/ai';
-import { toEffectSchema } from '@dxos/echo-schema';
+import { Type } from '@dxos/echo';
 import { getInvocationUrl, getUserFunctionUrlInMetadata } from '@dxos/functions';
 import { type FunctionType } from '@dxos/functions';
 import { log } from '@dxos/log';
@@ -29,7 +29,7 @@ export const convertFunctionToTool = (
   return createTool('user-function', {
     name: fn.name,
     description: fn.description,
-    schema: toEffectSchema(fn.inputSchema),
+    schema: Type.toEffectSchema(fn.inputSchema),
     execute: async (input) => {
       log.info('execute function tool', { name: fn.name, url, input });
       const response = await fetch(url, {

package/src/tools/openapi.test.ts

@@ -4,7 +4,7 @@
 
 import { describe, expect, test } from 'vitest';
 
-import { AIServiceEdgeClient } from '@dxos/ai';
+import { EdgeAiServiceClient } from '@dxos/ai';
 import { AI_SERVICE_ENDPOINT } from '@dxos/ai/testing';
 import { log } from '@dxos/log';
 
@@ -73,10 +73,8 @@ describe.skip('openapi', () => {
   describe.skip('AI uses tools', () => {
     test('amadeus flight availabilities', { timeout: 60_000 }, async () => {
       const tools = await createToolsFromApi(FLIGHT_SEARCH_API, { authorization: AMADEUS_AUTH });
-      const client = new AIServiceEdgeClient({
-        endpoint: AI_SERVICE_ENDPOINT.LOCAL,
-      });
-      const processor = new ChatProcessor(client, tools);
+      const aiClient = new EdgeAiServiceClient({ endpoint: AI_SERVICE_ENDPOINT.LOCAL });
+      const processor = new ChatProcessor(aiClient, tools);
       const reply = await processor.request(
         `What is the cheapest flight from New York to Paris? going on ${new Date().toISOString()} and returning after a week. 1 adult traveler`,
       );
@@ -87,10 +85,8 @@ describe.skip('openapi', () => {
     // TODO(dmaretskyi): Doesn't work.
     test('amadeus hotel name autocomplete', { timeout: 60_000 }, async () => {
       const tools = await createToolsFromApi(HOTEL_NAME_AUTOCOMPLETE_API, { authorization: AMADEUS_AUTH });
-      const client = new AIServiceEdgeClient({
-        endpoint: AI_SERVICE_ENDPOINT.LOCAL,
-      });
-      const processor = new ChatProcessor(client, tools);
+      const aiClient = new EdgeAiServiceClient({ endpoint: AI_SERVICE_ENDPOINT.LOCAL });
+      const processor = new ChatProcessor(aiClient, tools);
       const reply = await processor.request('Find me the William Wale in Brooklyn New York');
 
       log.info('reply', { reply });
@@ -101,10 +97,8 @@ describe.skip('openapi', () => {
         authorization: VISUAL_CROSSING_CREDENTIALS,
         instructions: WEATHER_INSTRUCTIONS,
       });
-      const client = new AIServiceEdgeClient({
-        endpoint: AI_SERVICE_ENDPOINT.LOCAL,
-      });
-      const processor = new ChatProcessor(client, tools);
+      const aiClient = new EdgeAiServiceClient({ endpoint: AI_SERVICE_ENDPOINT.LOCAL });
+      const processor = new ChatProcessor(aiClient, tools);
       const reply = await processor.request(
         `Today's date is ${new Date().toISOString().split('T')[0]}. Give me weather forecast for Warsaw for next 5 days.`,
       );

package/src/tools/openapi.ts

@@ -7,7 +7,8 @@ import jsonpointer from 'jsonpointer';
 import { type OpenAPIV2, type OpenAPIV3_1 } from 'openapi-types';
 
 import { type ExecutableTool, ToolResult, createRawTool } from '@dxos/ai';
-import { JsonSchemaType, normalizeSchema, toEffectSchema } from '@dxos/echo-schema';
+import { Type } from '@dxos/echo';
+import { normalizeSchema } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { deepMapValues } from '@dxos/util';
@@ -52,8 +53,7 @@ export const createToolsFromApi = async (
           return resolved;
         }) ?? [];
 
-      // TODO(burdon): Reconcile with toFunctionParameterSchema.
-      const inputSchema: JsonSchemaType = {
+      const inputSchema: Type.JsonSchema = {
         type: 'object',
         properties: {},
       };
@@ -86,7 +86,7 @@ export const createToolsFromApi = async (
       }
 
       log('inputSchema', { inputSchema });
-      Schema.validateSync(JsonSchemaType)(inputSchema);
+      Schema.validateSync(Type.JsonSchema)(inputSchema);
 
       const description = methodItem.description ?? methodItem.summary;
       if (!description) {
@@ -206,7 +206,7 @@ const callApiEndpoint = async (endpoint: EndpointDescriptor, input: any) => {
         const value = input[parameter.name];
 
         // Client-side validation
-        const effectSchema = toEffectSchema(parameter.schema);
+        const effectSchema = Type.toEffectSchema(parameter.schema);
         Schema.validateSync(effectSchema)(value);
 
         if (body) {