@dxos/plugin-assistant 0.8.4-main.72ec0f3 → 0.8.4-main.74a063c4e0

package/src/testing/test-generator.ts

@@ -5,8 +5,9 @@
 import * as Effect from 'effect/Effect';
 
 import { Obj } from '@dxos/echo';
-import { ContextQueueService, DatabaseService } from '@dxos/functions';
-import { faker } from '@dxos/random';
+import { Database } from '@dxos/echo';
+import { ContextQueueService } from '@dxos/functions';
+import { random } from '@dxos/random';
 import { renderObjectLink } from '@dxos/react-ui-components';
 import { type Actor, type ContentBlock, Message, Organization } from '@dxos/types';
 import { trim } from '@dxos/util';
@@ -19,7 +20,7 @@ export const createMessage = (role: Actor.Role, blocks: ContentBlock.Any[]): Mes
   });
 };
 
-export type MessageGenerator = Effect.Effect<void, never, DatabaseService | ContextQueueService>;
+export type MessageGenerator = Effect.Effect<void, never, Database.Service | ContextQueueService>;
 
 export const createMessageGenerator = (): MessageGenerator[] => [
   Effect.gen(function* () {
@@ -29,7 +30,7 @@ export const createMessageGenerator = (): MessageGenerator[] => [
         createMessage('user', [
           {
             _tag: 'text',
-            text: faker.lorem.sentence(5),
+            text: random.lorem.sentence(5),
           },
         ]),
       ]),
@@ -68,11 +69,11 @@ export const createMessageGenerator = (): MessageGenerator[] => [
             disposition: 'cot',
             text:
               [
-                faker.lorem.paragraph(),
+                random.lorem.paragraph(),
                 '',
                 ...Array.from({
-                  length: faker.number.int({ min: 3, max: 5 }),
-                }).map((_, idx) => `${idx + 1}. ${faker.lorem.paragraph()}`),
+                  length: random.number.int({ min: 3, max: 5 }),
+                }).map((_, idx) => `${idx + 1}. ${random.lorem.paragraph()}`),
               ].join('\n') + '\n',
           },
         ]),
@@ -99,7 +100,7 @@ export const createMessageGenerator = (): MessageGenerator[] => [
           },
           {
             _tag: 'suggestion',
-            text: faker.lorem.paragraph(),
+            text: random.lorem.paragraph(),
           },
         ]),
         createMessage('assistant', [
@@ -136,7 +137,7 @@ export const createMessageGenerator = (): MessageGenerator[] => [
         createMessage('user', [
           {
             _tag: 'text',
-            text: faker.lorem.sentence(5),
+            text: random.lorem.sentence(5),
           },
         ]),
       ]),
@@ -145,7 +146,7 @@ export const createMessageGenerator = (): MessageGenerator[] => [
 
   Effect.gen(function* () {
     const { queue } = yield* ContextQueueService;
-    const { db } = yield* DatabaseService;
+    const { db } = yield* Database.Service;
     const obj1 = db.add(Obj.make(Organization.Organization, { name: 'DXOS' }));
     // const obj2 = db.add(Obj.make(Person.Person, { fullName: 'Alice' }));
     // const obj3 = db.add(Obj.make(Person.Person, { fullName: 'Bob' }));
@@ -156,7 +157,7 @@ export const createMessageGenerator = (): MessageGenerator[] => [
           // Inline tag.
           {
             _tag: 'text',
-            text: [faker.lorem.paragraph(), renderObjectLink(obj1), faker.lorem.paragraph(), '\n'].join(' '),
+            text: [random.lorem.paragraph(), renderObjectLink(obj1), random.lorem.paragraph(), '\n'].join(' '),
           },
 
           // Inline cards.
@@ -179,7 +180,7 @@ export const createMessageGenerator = (): MessageGenerator[] => [
         createMessage('assistant', [
           {
             _tag: 'text',
-            text: faker.lorem.paragraph() + '\n',
+            text: random.lorem.paragraph() + '\n',
           },
         ]),
         createMessage('assistant', [
@@ -211,7 +212,7 @@ export const createMessageGenerator = (): MessageGenerator[] => [
         createMessage('assistant', [
           {
             _tag: 'text',
-            text: faker.lorem.paragraph() + '\n',
+            text: random.lorem.paragraph() + '\n',
           },
         ]),
         createMessage('assistant', [
@@ -236,8 +237,8 @@ export const createMessageGenerator = (): MessageGenerator[] => [
           {
             _tag: 'text',
             text:
-              Array.from({ length: faker.number.int({ min: 2, max: 3 }) })
-                .map(() => faker.lorem.paragraph())
+              Array.from({ length: random.number.int({ min: 2, max: 3 }) })
+                .map(() => random.lorem.paragraph())
                 .join('\n\n') + '\n',
           },
         ]),
@@ -252,7 +253,7 @@ export const createMessageGenerator = (): MessageGenerator[] => [
         createMessage('assistant', [
           {
             _tag: 'text',
-            text: faker.lorem.paragraph(),
+            text: random.lorem.paragraph(),
           },
         ]),
       ]),

package/src/testing/test-sequence.ts

@@ -9,16 +9,16 @@ export const RESEARCH_SEQUENCE_DEFINITION: SequenceDefinition = {
   steps: [
     {
       instructions: 'Research information and entities related to the selected objects.',
-      tools: [ToolId.make('search/web_search')],
+      tools: [ToolId.make('search/web-search')],
     },
     {
       instructions:
         'Based on your research find matching entires that are already in the graph. Do exaustive research.',
-      tools: [ToolId.make('search/local_search')],
+      tools: [ToolId.make('search/local-search')],
     },
     {
       instructions: 'Add researched data to the graph. Make connections to existing objects.',
-      tools: [ToolId.make('search/local_search'), ToolId.make('graph/writer')],
+      tools: [ToolId.make('search/local-search'), ToolId.make('graph/writer')],
     },
   ],
 };

package/src/testing/test-services.ts

@@ -2,9 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Obj } from '@dxos/echo';
+import { Obj, type Type } from '@dxos/echo';
 
-import { type ApiAuthorization, type BaseServiceRegistry, ServiceType, categoryIcons } from '../types';
+import { type ApiAuthorization, type BaseServiceRegistry, ServiceType, categoryIcons } from '#types';
+
+const ServiceTypeSchema = ServiceType as unknown as Type.AnyObj;
 
 export class MockServiceRegistry implements BaseServiceRegistry {
   async queryServices(): Promise<ServiceType[]> {
@@ -48,7 +50,7 @@ const VISUAL_CROSSING_CREDENTIALS: ApiAuthorization = {
 //  - e.g., https://github.com/konfig-sdks/openapi-examples/blob/main/xkcd/openapi.yaml
 
 const TEST_SERVICES: ServiceType[] = [
-  Obj.make(ServiceType, {
+  Obj.make(ServiceTypeSchema, {
     serviceId: 'amadeus.com/service/FlightSearch',
     name: 'Amadeus Flight Search',
     description: 'Search for local and international flights.',
@@ -62,7 +64,7 @@ const TEST_SERVICES: ServiceType[] = [
     ],
   }),
 
-  Obj.make(ServiceType, {
+  Obj.make(ServiceTypeSchema, {
     serviceId: 'amadeus.com/service/HotelSearch',
     name: 'Amadeus Hotel Search',
     description: 'Search for local and international hotels.',
@@ -76,7 +78,7 @@ const TEST_SERVICES: ServiceType[] = [
     ],
   }),
 
-  Obj.make(ServiceType, {
+  Obj.make(ServiceTypeSchema, {
     serviceId: 'visualcrossing.com/service/Weather',
     name: 'Visual Crossing Weather',
     description: 'Search for global weather forecasts.',
@@ -91,7 +93,7 @@ const TEST_SERVICES: ServiceType[] = [
   }),
 
   // TODO(burdon): Needs auth.
-  Obj.make(ServiceType, {
+  Obj.make(ServiceTypeSchema, {
     serviceId: 'abstractapi.com/service/GeoLocation',
     name: 'Abstract GeoLocation',
     description: 'Get the location of any IP address.',
@@ -109,7 +111,7 @@ const TEST_SERVICES: ServiceType[] = [
   //
 
   ...Array.from({ length: 20 }, (_, i) =>
-    Obj.make(ServiceType, {
+    Obj.make(ServiceTypeSchema, {
       serviceId: `example.com/service/test-${i}`,
       name: `Test ${i}`,
       description: `Test ${i}`,

package/src/translations.ts

@@ -2,13 +2,13 @@
 // Copyright 2023 DXOS.org
 //
 
+import { Chat, Project } from '@dxos/assistant-toolkit';
 import { Blueprint, Prompt } from '@dxos/blueprints';
 import { Sequence } from '@dxos/conductor';
 import { Type } from '@dxos/echo';
 import { type Resource } from '@dxos/react-ui';
 
-import { meta } from './meta';
-import { Assistant } from './types';
+import { meta } from '#meta';
 
 // TODO(burdon): Standardize translation names.
 export const translations = [
@@ -16,99 +16,146 @@ export const translations = [
     'en-US': {
       // TODO(burdon): From assistant.
       [Blueprint.Blueprint.typename]: {
-        'typename label': 'Blueprint',
-        'typename label_zero': 'Blueprints',
-        'typename label_one': 'Blueprint',
-        'typename label_other': 'Blueprints',
-        'object name placeholder': 'New blueprint',
-        'rename object label': 'Rename blueprint',
-        'delete object label': 'Delete blueprint',
+        'typename.label': 'Blueprint',
+        'typename.label_zero': 'Blueprints',
+        'typename.label_one': 'Blueprint',
+        'typename.label_other': 'Blueprints',
+        'object-name.placeholder': 'New blueprint',
+        'add-object.label': 'Add blueprint',
+        'rename-object.label': 'Rename blueprint',
+        'delete-object.label': 'Delete blueprint',
+        'object-deleted.label': 'Blueprint deleted',
       },
       [Type.getTypename(Prompt.Prompt)]: {
-        'typename label': 'Prompt',
-        'typename label_zero': 'Prompts',
-        'typename label_one': 'Prompt',
-        'typename label_other': 'Prompts',
-        'object name placeholder': 'New prompt',
-        'rename object label': 'Rename prompt',
-        'delete object label': 'Delete prompt',
+        'typename.label': 'Prompt',
+        'typename.label_zero': 'Prompts',
+        'typename.label_one': 'Prompt',
+        'typename.label_other': 'Prompts',
+        'object-name.placeholder': 'New prompt',
+        'add-object.label': 'Add prompt',
+        'rename-object.label': 'Rename prompt',
+        'delete-object.label': 'Delete prompt',
+        'object-deleted.label': 'Prompt deleted',
       },
       // TODO(burdon): From conductor.
       [Sequence.typename]: {
-        'typename label': 'Sequence',
-        'typename label_zero': 'Sequences',
-        'typename label_one': 'Sequence',
-        'typename label_other': 'Sequences',
-        'object name placeholder': 'New sequence',
-        'rename object label': 'Rename sequence',
-        'delete object label': 'Delete sequence',
+        'typename.label': 'Sequence',
+        'typename.label_zero': 'Sequences',
+        'typename.label_one': 'Sequence',
+        'typename.label_other': 'Sequences',
+        'object-name.placeholder': 'New sequence',
+        'add-object.label': 'Add sequence',
+        'rename-object.label': 'Rename sequence',
+        'delete-object.label': 'Delete sequence',
+        'object-deleted.label': 'Sequence deleted',
       },
-      [Assistant.Chat.typename]: {
-        'typename label': 'AI Chat',
-        'object name placeholder': 'New AI Chat',
-        'rename object label': 'Rename AI Chat',
-        'delete object label': 'Delete AI Chat',
+      [Chat.Chat.typename]: {
+        'typename.label': 'AI Chat',
+        'object-name.placeholder': 'New AI Chat',
+        'add-object.label': 'Add AI chat',
+        'rename-object.label': 'Rename AI Chat',
+        'delete-object.label': 'Delete AI Chat',
+        'object-deleted.label': 'AI Chat deleted',
+      },
+      [Project.Project.typename]: {
+        'typename.label': 'Project',
+        'typename.label_zero': 'Projects',
+        'typename.label_one': 'Project',
+        'typename.label_other': 'Projects',
+        'object-name.placeholder': 'New project',
+        'add-object.label': 'Add project',
+        'rename-object.label': 'Rename project',
+        'delete-object.label': 'Delete project',
+        'object-deleted.label': 'Project deleted',
       },
       // TODO(burdon): Reconcile with react-ui-chat.
       [meta.id]: {
-        'templates label': 'Templates',
-        'open ambient chat label': 'Open Assistant',
-        'assistant chat label': 'Assistant',
-        'plugin name': 'Assistant',
-        'settings title': 'Assistant settings',
-        'object placeholder': 'New prompt',
-        'create object label': 'Create prompt',
-        'create trigger label': 'Create trigger',
-        'create stack section label': 'Create prompt',
-        'command placeholder': 'Enter slash command...',
-        'template placeholder': 'Enter template...',
-        'value placeholder': 'Enter value...',
-        'prompt rules label': 'Prompt Rules',
-        'typename placeholder': 'Enter typename of objects which this template is for',
-        'description placeholder': 'Enter description of when this template should be used',
-        'select preset template placeholder': 'Select preset',
-        'service registry label': 'Service Registry',
-        'type filter placeholder': 'Type',
-        'any type filter label': 'Any',
-        'no blueprint message': 'No active blueprints',
-        'tool call label': 'Calling tool...',
-        'tool result label': 'Success',
-        'tool error label': 'Tool call failed',
+        'templates.label': 'Templates',
+        'open-ambient-chat.label': 'Open Assistant',
+        'assistant-chat.label': 'Assistant',
+        'plugin.name': 'Assistant',
+        'settings.title': 'Assistant settings',
+        'object.placeholder': 'New prompt',
+        'create-object.label': 'Create prompt',
+        'create-trigger.label': 'Create trigger',
+        'create-stack-section.label': 'Create prompt',
+        'command.placeholder': 'Enter slash command...',
+        'template.placeholder': 'Enter template...',
+        'value.placeholder': 'Enter value...',
+        'prompt-rules.label': 'Prompt Rules',
+        'typename.placeholder': 'Enter typename of objects which this template is for',
+        'description.placeholder': 'Enter description of when this template should be used',
+        'select-preset-template.placeholder': 'Select preset',
+        'service-registry.label': 'Service Registry',
+        'type-filter.placeholder': 'Type',
+        'any-type-filter.label': 'Any',
+        'no-blueprint.message': 'No active blueprints',
+        'tool-call.label': 'Calling tool...',
+        'tool-result.label': 'Success',
+        'tool-error.label': 'Tool call failed',
+
+        'invocations.label': 'Invocations',
+        'trace.label': 'Trace',
+
+        'assistant-dialog.title': 'Assistant',
+        'open-assistant.label': 'Open assistant',
+        'reset-blueprints.label': 'Reset blueprints',
+
+        'no-results.message': 'No results',
 
-        'invocations label': 'Invocations',
+        'cancel.button': 'Cancel',
+        'save.button': 'Save',
+        'new-thread.button': 'New Chat',
+        'rename-thread.button': 'Rename Chat',
+        'chat-history.label': 'Chat History',
+        'chat-update-name.label': 'Update AI Chat name',
 
-        'assistant dialog title': 'Assistant',
-        'open assistant label': 'Open assistant',
+        'toolkit.label': 'Toolkit',
+        'stats.label': 'Stats',
+        'summary.label': 'Summary',
 
-        'no tools': 'No tools are configured',
-        'no results': 'No results',
+        'search.placeholder': 'Search...',
+        'prompt.placeholder': 'Enter question or command...',
+        'context-objects.button': 'Add to context',
+        'context-settings.button': 'Chat settings',
+        'microphone.button': 'Click to speak',
+        'cancel-processing.button': 'Stop processing',
+        'blueprints-in-context.title': 'Blueprints',
+        'objects-in-context.title': 'Content',
+        'remove-object-in-context.label': 'Remove document',
+        'chat-model.title': 'Model',
 
-        'cancel button': 'Cancel',
-        'save button': 'Save',
-        'new thread button': 'New Chat',
-        'rename thread button': 'Rename Chat',
-        'chat history label': 'Chat History',
-        'chat update name label': 'Update AI Chat name',
+        'settings.default.label': 'Default',
+        'settings.custom-prompts.label': 'Use custom prompts',
+        'settings.custom-prompts.description': 'Allow the assistant to use custom prompts defined in your spaces.',
+        'settings.llm-provider.label': 'LLM provider',
+        'settings.llm-provider.description': 'Select which language model service to use for AI responses.',
+        'settings.edge-llm-model.label': 'Remote language model',
+        'settings.edge-llm-model.description': 'Choose the remote language model used for AI requests.',
+        'settings.ollama-llm-model.label': 'Ollama language model',
+        'settings.ollama-llm-model.description': 'Choose the locally hosted Ollama model for AI requests.',
+        'settings.default-llm-model.label': 'Default language model',
 
-        'toolkit label': 'Toolkit',
-        'summary label': 'Summary',
+        // Trigger status
+        'trigger-status-disabled.label': 'Triggers disabled',
+        'trigger-status-idle.label': 'Triggers idle',
+        'trigger-status-running.label': 'Trigger running',
+        'trigger-status-error.label': 'Trigger error',
+        'trigger-runtime.label': 'Auto trigger execution',
+        'trigger-last-invocation.label': 'Last run',
+        'trigger-duration.label': 'Duration',
 
-        'search placeholder': 'Search...',
-        'prompt placeholder': 'Enter question or command...',
-        'context objects button': 'Add to context',
-        'context settings button': 'Chat settings',
-        'microphone button': 'Click to speak',
-        'cancel processing button': 'Stop processing',
-        'blueprints in context title': 'Blueprints',
-        'objects in context title': 'Content',
-        'remove object in context label': 'Remove document',
-        'chat model title': 'Model',
+        'debug.button': 'Debug',
+        'online-switch.label': 'Online',
+        'run-prompt.label': 'Run prompt',
+        'typename.label': 'Typename',
+        'branch-thread.menu': 'Branch chat',
+        'chat-toolbar.title': 'Chat toolbar',
 
-        'settings default label': 'Default',
-        'settings custom prompts label': 'Use custom prompts',
-        'settings llm provider label': 'LLM provider',
-        'settings edge llm model label': 'Remote language model',
-        'settings ollama llm model label': 'Ollama language model',
+        // ProjectSettings
+        'instructions.label': 'Instructions',
+        'reset-history.button': 'Reset',
+        'subscriptions.label': 'Subscriptions',
       },
     },
   },

package/src/types/Assistant.ts

@@ -2,62 +2,13 @@
 // Copyright 2024 DXOS.org
 //
 
-import * as Schema from 'effect/Schema';
+import { Chat as ChatModule } from '@dxos/assistant-toolkit';
 
-import { Obj, Ref, Type } from '@dxos/echo';
-import { FormAnnotation, LabelAnnotation } from '@dxos/echo/internal';
-import { Queue } from '@dxos/echo-db';
+// Re-export Chat schema for backward compatibility.
+export const Chat = ChatModule.Chat;
+export type Chat = ChatModule.Chat;
 
-import { LLM_PROVIDERS } from './defs';
-
-/**
- * AI chat.
- */
-export const Chat = Schema.Struct({
-  name: Schema.String.pipe(Schema.optional),
-  queue: Type.Ref(Queue).pipe(FormAnnotation.set(false)),
-  // TODO(dmaretskyi): Eventually this and the message queue will be the same.
-  traceQueue: Type.Ref(Queue).pipe(FormAnnotation.set(false), Schema.optional),
-}).pipe(
-  Type.Obj({
-    typename: 'dxos.org/type/assistant/Chat',
-    version: '0.2.0',
-  }),
-  LabelAnnotation.set(['name']),
-);
-
-export interface Chat extends Schema.Schema.Type<typeof Chat> {}
-
-export const makeChat = ({ name, queue }: { name?: string; queue: Queue }) =>
-  Obj.make(Chat, { name, queue: Ref.fromDXN(queue.dxn) });
-
-/**
- * Relation between a Chat and companion objects (e.g., artifacts).
- */
-export const CompanionTo = Schema.Struct({
-  id: Type.ObjectId,
-}).pipe(
-  Type.Relation({
-    typename: 'dxos.org/relation/assistant/CompanionTo',
-    version: '0.1.0',
-    source: Chat,
-    target: Type.Expando,
-  }),
-);
-
-export interface CompanionTo extends Schema.Schema.Type<typeof CompanionTo> {}
-
-/**
- * Plugin settings.
- */
-export const Settings = Schema.mutable(
-  Schema.Struct({
-    llmProvider: Schema.optional(Schema.Literal(...LLM_PROVIDERS)),
-    edgeModel: Schema.optional(Schema.String),
-    ollamaModel: Schema.optional(Schema.String),
-    lmstudioModel: Schema.optional(Schema.String),
-    customPrompts: Schema.optional(Schema.Boolean),
-  }),
-);
-
-export type Settings = Schema.Schema.Type<typeof Settings>;
+// Re-export Settings as merged const/type (not as namespace).
+import * as SettingsModule from './Settings';
+export const Settings = SettingsModule.Settings;
+export type Settings = SettingsModule.Settings;

package/src/types/Settings.ts

@@ -0,0 +1,21 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+// @import-as-namespace
+
+import * as Schema from 'effect/Schema';
+
+import { LLM_PROVIDERS } from './defs';
+
+export const Settings = Schema.mutable(
+  Schema.Struct({
+    llmProvider: Schema.optional(Schema.Literal(...LLM_PROVIDERS)),
+    edgeModel: Schema.optional(Schema.String),
+    ollamaModel: Schema.optional(Schema.String),
+    lmstudioModel: Schema.optional(Schema.String),
+    customPrompts: Schema.optional(Schema.Boolean),
+  }),
+);
+
+export type Settings = Schema.Schema.Type<typeof Settings>;

package/src/types/capabilities.ts

@@ -0,0 +1,35 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Atom } from '@effect-atom/atom-react';
+import * as Schema from 'effect/Schema';
+
+import { Capability } from '@dxos/app-framework';
+import { type Obj } from '@dxos/echo';
+
+import { meta } from '#meta';
+
+import { type Assistant } from './';
+
+export namespace AssistantCapabilities {
+  export const Settings = Capability.make<Atom.Writable<Assistant.Settings>>(`${meta.id}.capability.settings`);
+
+  export const StateSchema = Schema.mutable(
+    Schema.Struct({
+      /** Map of primary object dxn to current chat dxn. */
+      currentChat: Schema.Record({ key: Schema.String, value: Schema.UndefinedOr(Schema.String) }),
+      /** Map of chat object path to prompt text to auto-submit when the chat opens. */
+      pendingPrompts: Schema.Record({ key: Schema.String, value: Schema.UndefinedOr(Schema.String) }),
+    }),
+  );
+
+  export type AssistantState = Schema.Schema.Type<typeof StateSchema>;
+
+  export const State = Capability.make<Atom.Writable<AssistantState>>(`${meta.id}.capability.state`);
+
+  /** Session-scoped cache of transient (not yet persisted) companion chats keyed by companion DXN string. */
+  export const CompanionChatCache = Capability.make<Atom.Writable<Record<string, Obj.Unknown | undefined>>>(
+    `${meta.id}.capability.companion-chat-cache`,
+  );
+}

package/src/types/events.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { ActivationEvent } from '@dxos/app-framework';
+
+import { meta } from '#meta';
+
+export namespace AssistantEvents {
+  export const SetupAiServiceProviders = ActivationEvent.make(`${meta.id}.event.setup-ai-service-providers`);
+}

package/src/types/index.ts

@@ -2,8 +2,12 @@
 // Copyright 2024 DXOS.org
 //
 
+// Re-export Chat type from assistant-toolkit for public API type declarations.
+export type { Chat as ChatType } from '@dxos/assistant-toolkit';
+
 export * as Assistant from './Assistant';
-export * as AssistantAction from './AssistantAction';
 
+export * from './capabilities';
 export * from './defs';
+export * from './events';
 export * from './service';

package/src/types/service.ts

@@ -5,9 +5,8 @@
 import * as Schema from 'effect/Schema';
 
 import { ComputeGraph } from '@dxos/conductor';
-import { Type } from '@dxos/echo';
-import { TypedObject } from '@dxos/echo/internal';
-import { Function } from '@dxos/functions';
+import { Ref, Type } from '@dxos/echo';
+import { Operation } from '@dxos/operation';
 
 // TODO(burdon): Factor out and reconcile with https://github.com/dxos/dxos/blob/main/packages/plugins/plugin-token-manager/src/defs/presets.ts#L7
 
@@ -38,12 +37,12 @@ export type ApiAuthorization = Schema.Schema.Type<typeof ApiAuthorization>;
 
 const ServiceInterfaceFunction = Schema.Struct({
   kind: Schema.Literal('function'),
-  fn: Type.Ref(Function.Function),
+  fn: Ref.Ref(Operation.PersistentOperation),
 });
 
 const ServiceInterfaceWorkflow = Schema.Struct({
   kind: Schema.Literal('workflow'),
-  workflow: Type.Ref(ComputeGraph),
+  workflow: Ref.Ref(ComputeGraph),
 });
 
 const ServiceInterfaceApi = Schema.Struct({
@@ -70,14 +69,11 @@ const ServiceInterface = Schema.Union(
   ServiceInterfaceFunction,
   ServiceInterfaceWorkflow,
   ServiceInterfaceApi,
-);
+) as any;
 
 export type ServiceInterface = Schema.Schema.Type<typeof ServiceInterface>;
 
-export class ServiceType extends TypedObject({
-  typename: 'dxos.org/type/ServiceType',
-  version: '0.1.0',
-})({
+export const ServiceType = Schema.Struct({
   serviceId: Schema.String,
   name: Schema.optional(Schema.String),
   description: Schema.optional(Schema.String),
@@ -88,7 +84,14 @@ export class ServiceType extends TypedObject({
    * Entries exposed: functions, workflows, and APIs.
    */
   interfaces: Schema.optional(Schema.Array(ServiceInterface)),
-}) {}
+}).pipe(
+  Type.object({
+    typename: 'org.dxos.type.service',
+    version: '0.1.0',
+  }),
+);
+
+export interface ServiceType extends Schema.Schema.Type<typeof ServiceType> {}
 
 //
 // Service Registry