@dxos/plugin-assistant 0.8.2-main.2f9c567 → 0.8.2-main.5885341

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.2-main.2f9c567",
+  "version": "0.8.2-main.5885341",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -46,78 +46,75 @@
     "jsonpointer": "^5.0.1",
     "lodash.get": "^4.4.2",
     "unified": "^11.0.0",
-    "@dxos/app-framework": "0.8.2-main.2f9c567",
-    "@dxos/assistant": "0.8.2-main.2f9c567",
-    "@dxos/artifact": "0.8.2-main.2f9c567",
-    "@dxos/client": "0.8.2-main.2f9c567",
-    "@dxos/compute": "0.8.2-main.2f9c567",
-    "@dxos/conductor": "0.8.2-main.2f9c567",
-    "@dxos/async": "0.8.2-main.2f9c567",
-    "@dxos/echo": "0.8.2-main.2f9c567",
-    "@dxos/echo-db": "0.8.2-main.2f9c567",
-    "@dxos/echo-protocol": "0.8.2-main.2f9c567",
-    "@dxos/echo-schema": "0.8.2-main.2f9c567",
-    "@dxos/context": "0.8.2-main.2f9c567",
-    "@dxos/edge-client": "0.8.2-main.2f9c567",
-    "@dxos/effect": "0.8.2-main.2f9c567",
-    "@dxos/invariant": "0.8.2-main.2f9c567",
-    "@dxos/functions": "0.8.2-main.2f9c567",
-    "@dxos/keys": "0.8.2-main.2f9c567",
-    "@dxos/log": "0.8.2-main.2f9c567",
-    "@dxos/local-storage": "0.8.2-main.2f9c567",
-    "@dxos/live-object": "0.8.2-main.2f9c567",
-    "@dxos/plugin-deck": "0.8.2-main.2f9c567",
-    "@dxos/plugin-client": "0.8.2-main.2f9c567",
-    "@dxos/plugin-markdown": "0.8.2-main.2f9c567",
-    "@dxos/plugin-graph": "0.8.2-main.2f9c567",
-    "@dxos/plugin-inbox": "0.8.2-main.2f9c567",
-    "@dxos/plugin-script": "0.8.2-main.2f9c567",
-    "@dxos/plugin-sketch": "0.8.2-main.2f9c567",
-    "@dxos/plugin-space": "0.8.2-main.2f9c567",
-    "@dxos/plugin-stack": "0.8.2-main.2f9c567",
-    "@dxos/plugin-transcription": "0.8.2-main.2f9c567",
-    "@dxos/plugin-wnfs": "0.8.2-main.2f9c567",
-    "@dxos/react-client": "0.8.2-main.2f9c567",
-    "@dxos/react-edge-client": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-canvas-editor": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-components": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-editor": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-dnd": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-canvas-compute": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-form": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-list": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-stack": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-sfx": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-syntax-highlighter": "0.8.2-main.2f9c567",
-    "@dxos/schema": "0.8.2-main.2f9c567",
-    "@dxos/util": "0.8.2-main.2f9c567"
+    "@dxos/app-framework": "0.8.2-main.5885341",
+    "@dxos/artifact": "0.8.2-main.5885341",
+    "@dxos/assistant": "0.8.2-main.5885341",
+    "@dxos/async": "0.8.2-main.5885341",
+    "@dxos/client": "0.8.2-main.5885341",
+    "@dxos/conductor": "0.8.2-main.5885341",
+    "@dxos/context": "0.8.2-main.5885341",
+    "@dxos/compute": "0.8.2-main.5885341",
+    "@dxos/echo-protocol": "0.8.2-main.5885341",
+    "@dxos/edge-client": "0.8.2-main.5885341",
+    "@dxos/echo-db": "0.8.2-main.5885341",
+    "@dxos/echo-schema": "0.8.2-main.5885341",
+    "@dxos/functions": "0.8.2-main.5885341",
+    "@dxos/invariant": "0.8.2-main.5885341",
+    "@dxos/keys": "0.8.2-main.5885341",
+    "@dxos/live-object": "0.8.2-main.5885341",
+    "@dxos/effect": "0.8.2-main.5885341",
+    "@dxos/local-storage": "0.8.2-main.5885341",
+    "@dxos/plugin-client": "0.8.2-main.5885341",
+    "@dxos/plugin-deck": "0.8.2-main.5885341",
+    "@dxos/log": "0.8.2-main.5885341",
+    "@dxos/plugin-graph": "0.8.2-main.5885341",
+    "@dxos/plugin-script": "0.8.2-main.5885341",
+    "@dxos/plugin-sketch": "0.8.2-main.5885341",
+    "@dxos/plugin-inbox": "0.8.2-main.5885341",
+    "@dxos/plugin-markdown": "0.8.2-main.5885341",
+    "@dxos/plugin-space": "0.8.2-main.5885341",
+    "@dxos/plugin-stack": "0.8.2-main.5885341",
+    "@dxos/plugin-transcription": "0.8.2-main.5885341",
+    "@dxos/plugin-wnfs": "0.8.2-main.5885341",
+    "@dxos/react-ui-canvas-compute": "0.8.2-main.5885341",
+    "@dxos/react-client": "0.8.2-main.5885341",
+    "@dxos/react-ui-canvas-editor": "0.8.2-main.5885341",
+    "@dxos/react-ui-components": "0.8.2-main.5885341",
+    "@dxos/react-ui-dnd": "0.8.2-main.5885341",
+    "@dxos/react-ui-editor": "0.8.2-main.5885341",
+    "@dxos/react-ui-form": "0.8.2-main.5885341",
+    "@dxos/react-edge-client": "0.8.2-main.5885341",
+    "@dxos/react-ui-sfx": "0.8.2-main.5885341",
+    "@dxos/react-ui-list": "0.8.2-main.5885341",
+    "@dxos/react-ui-syntax-highlighter": "0.8.2-main.5885341",
+    "@dxos/util": "0.8.2-main.5885341",
+    "@dxos/schema": "0.8.2-main.5885341",
+    "@dxos/react-ui-stack": "0.8.2-main.5885341"
   },
   "devDependencies": {
     "@types/lodash.get": "^4.4.7",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
-    "effect": "3.14.21",
     "openapi-types": "^12.1.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/artifact-testing": "0.8.2-main.2f9c567",
-    "@dxos/echo-db": "0.8.2-main.2f9c567",
-    "@dxos/plugin-chess": "0.8.2-main.2f9c567",
-    "@dxos/plugin-inbox": "0.8.2-main.2f9c567",
-    "@dxos/plugin-table": "0.8.2-main.2f9c567",
-    "@dxos/plugin-map": "0.8.2-main.2f9c567",
-    "@dxos/random": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-theme": "0.8.2-main.2f9c567",
-    "@dxos/react-ui": "0.8.2-main.2f9c567",
-    "@dxos/storybook-utils": "0.8.2-main.2f9c567"
+    "@dxos/artifact-testing": "0.8.2-main.5885341",
+    "@dxos/echo-db": "0.8.2-main.5885341",
+    "@dxos/plugin-map": "0.8.2-main.5885341",
+    "@dxos/plugin-chess": "0.8.2-main.5885341",
+    "@dxos/plugin-inbox": "0.8.2-main.5885341",
+    "@dxos/plugin-table": "0.8.2-main.5885341",
+    "@dxos/random": "0.8.2-main.5885341",
+    "@dxos/react-ui": "0.8.2-main.5885341",
+    "@dxos/react-ui-theme": "0.8.2-main.5885341",
+    "@dxos/storybook-utils": "0.8.2-main.5885341"
   },
   "peerDependencies": {
-    "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-theme": "0.8.2-main.2f9c567"
+    "@dxos/react-ui": "0.8.2-main.5885341",
+    "@dxos/react-ui-theme": "0.8.2-main.5885341"
   },
   "publishConfig": {
     "access": "public"

package/src/components/PromptSettings.tsx

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Match, type Schema } from 'effect';
+import { Match, type Schema as S } from 'effect';
 import React, { type ChangeEvent, useCallback } from 'react';
 
 import { debounce } from '@dxos/async';
@@ -17,7 +17,7 @@ export const PromptSettings = ({ template }: { template: TemplateType }) => {
   const handleKindChange = useCallback(
     (value: string) => {
       const kind = Match.type<string>().pipe(
-        Match.withReturnType<Schema.Schema.Type<typeof TemplateKindSchema>>(),
+        Match.withReturnType<S.Schema.Type<typeof TemplateKindSchema>>(),
         Match.when('always', () => ({ include: 'always' })),
         Match.when('schema-matching', () => ({ include: 'schema-matching', typename: '' })),
         Match.when('automatically', () => ({ include: 'automatically', description: '' })),

package/src/components/TemplateEditor/TemplateForm.tsx

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type Schema } from 'effect';
+import { type Schema as S } from 'effect';
 import React, { Fragment, useEffect } from 'react';
 
 import { Input, Select, useTranslation } from '@dxos/react-ui';
@@ -15,7 +15,7 @@ import { type TemplateInput, TemplateInputType, type TemplateType } from '../../
 
 export type TemplateFormProps = {
   template: TemplateType;
-  schema?: Schema.Schema<any, any, any>;
+  schema?: S.Schema<any, any, any>;
   commandEditable?: boolean;
 };
 

package/src/components/Thread/ThreadContainer.stories.tsx

@@ -18,9 +18,8 @@ import {
 } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Message, type Tool } from '@dxos/artifact';
-import { genericTools, localServiceEndpoints } from '@dxos/artifact-testing';
+import { genericTools, localServiceEndpoints, type IsObject } from '@dxos/artifact-testing';
 import { AIServiceEdgeClient } from '@dxos/assistant';
-import { type Type } from '@dxos/echo';
 import { create, ObjectId } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { DXN } from '@dxos/keys';
@@ -44,7 +43,7 @@ import translations from '../../translations';
 const endpoints = localServiceEndpoints;
 
 type RenderProps = {
-  items?: Type.AnyObject[];
+  items?: IsObject[];
   prompts?: string[];
 } & Pick<ThreadProps, 'debug'>;
 

package/src/components/Toolbox/Toolbox.tsx

@@ -6,7 +6,7 @@ import React, { useState, useEffect, Fragment, type FC } from 'react';
 
 import { Capabilities, useCapabilities } from '@dxos/app-framework';
 import { parseToolName, type ArtifactDefinition, type Tool } from '@dxos/artifact';
-import { FunctionType } from '@dxos/functions';
+import { FunctionType } from '@dxos/functions/types';
 import { log } from '@dxos/log';
 import { Filter, type Space, useQuery } from '@dxos/react-client/echo';
 import { type ThemedClassName } from '@dxos/react-ui';

package/src/hooks/index.ts

@@ -5,6 +5,7 @@
 export * from './processor';
 
 export * from './useChatProcessor';
+export * from './useLocalTriggerManager';
 export * from './useMessageQueue';
 export * from './useServices';
 export * from './useTextInputEvents';

package/src/hooks/invocation-handler.ts

@@ -0,0 +1,107 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { sleep } from '@dxos/async';
+import { getObjectCore, ResultFormat } from '@dxos/echo-db';
+import { type AnyObjectData } from '@dxos/echo-schema';
+import { FunctionType, getUserFunctionUrlInMetadata } from '@dxos/functions/types';
+import { type FunctionTrigger } from '@dxos/functions/types';
+import { invariant } from '@dxos/invariant';
+import { DXN, LOCAL_SPACE_TAG } from '@dxos/keys';
+import { log } from '@dxos/log';
+import { type Client, type Config } from '@dxos/react-client';
+import { type Space } from '@dxos/react-client/echo';
+
+const MAX_RETRIES = 3;
+const RETRY_DELAY = 1_000;
+
+const callFunction = async (funcUrl: string, trigger: any, data: any) => {
+  const body = { event: 'trigger', trigger, data };
+
+  let retryCount = 0;
+  while (retryCount < MAX_RETRIES) {
+    log.info('exec', { funcUrl, body, retryCount });
+    const response = await fetch(funcUrl, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify(body),
+    });
+
+    const data = await response.text();
+    log.info('response', { status: response.status, body: data });
+    if (response.status === 409) {
+      retryCount++;
+      await sleep(RETRY_DELAY * Math.min(retryCount, 2));
+      continue;
+    }
+
+    return { status: response.status, data };
+  }
+  return { status: 500 };
+};
+
+export const invokeFunction = async (client: Client, space: Space, trigger: FunctionTrigger, data: any) => {
+  try {
+    invariant(trigger.spec);
+    invariant(trigger.function);
+
+    const script = await space.db.query({ id: trigger.function }, { format: ResultFormat.Plain }).first();
+    const { objects: functions } = await space.db
+      .query({ __typename: FunctionType.typename }, { format: ResultFormat.Plain })
+      .run();
+    const func = functions.find((fn) => referenceEquals(fn.source, trigger.function!)) as AnyObjectData | undefined;
+    const funcSlug = func && getUserFunctionUrlInMetadata(func.__meta);
+    if (!funcSlug) {
+      log.warn('function not deployed', { scriptId: script.id, name: script.name });
+      return 404;
+    }
+
+    const funcUrl = getFunctionUrl(client.config, funcSlug, space.id);
+    const triggerData: AnyObjectData = {
+      ...getObjectCore(trigger).toPlainObject(),
+      // TODO: Remove when functions can query by DXN.
+      promptId: trigger.meta?.prompt?.id,
+    };
+    // TODO: Remove when functions can add objects and easily modify collections (push, splice).
+    return (await callFunction(funcUrl, triggerData, data)).status;
+  } catch (err) {
+    return 400;
+  }
+};
+
+const getFunctionUrl = (config: Config, slug: string, spaceId?: string) => {
+  const baseUrl = new URL('functions/', config.values.runtime?.services?.edge?.url);
+
+  // Leading slashes cause the URL to be treated as an absolute path.
+  const relativeUrl = slug.replace(/^\//, '');
+  const url = new URL(`./${relativeUrl}`, baseUrl.toString());
+  spaceId && url.searchParams.set('spaceId', spaceId);
+  url.protocol = 'https';
+  return url.toString();
+};
+
+// TODO(dmaretskyi): Factor out.
+
+type ReferenceLike = { '/': string } | string;
+
+const referenceEquals = (a: ReferenceLike, b: ReferenceLike): boolean => {
+  const aDXN = toDXN(a);
+  const bDXN = toDXN(b);
+  return aDXN.toString() === bDXN.toString();
+};
+
+const toDXN = (ref: ReferenceLike): DXN => {
+  if (typeof ref === 'string') {
+    if (ref.startsWith('dxn:')) {
+      return DXN.parse(ref);
+    } else {
+      return new DXN(DXN.kind.ECHO, [LOCAL_SPACE_TAG, ref]);
+    }
+  }
+
+  invariant(typeof ref['/'] === 'string');
+  return DXN.parse(ref['/']);
+};

package/src/hooks/useChatProcessor.tsx

@@ -7,7 +7,7 @@ import { useEffect, useMemo, useState } from 'react';
 import { Capabilities, useCapabilities, useCapability, useIntentDispatcher } from '@dxos/app-framework';
 import { type AssociatedArtifact, createSystemPrompt, type Tool } from '@dxos/artifact';
 import { DEFAULT_EDGE_MODEL, DEFAULT_OLLAMA_MODEL } from '@dxos/assistant';
-import { FunctionType } from '@dxos/functions';
+import { FunctionType } from '@dxos/functions/types';
 import { log } from '@dxos/log';
 import { useConfig } from '@dxos/react-client';
 import { Filter, fullyQualifiedId, type Space, useQuery } from '@dxos/react-client/echo';

package/src/hooks/useLocalTriggerManager.ts

@@ -0,0 +1,82 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { useEffect, useState } from 'react';
+
+import { Mutex } from '@dxos/async';
+import { Context } from '@dxos/context';
+import { createSubscriptionTrigger, type TriggerFactory } from '@dxos/functions';
+import { FunctionTrigger } from '@dxos/functions/types';
+import { invariant } from '@dxos/invariant';
+import { log } from '@dxos/log';
+import { useClient } from '@dxos/react-client';
+import { Filter, type Space, useQuery } from '@dxos/react-client/echo';
+
+import { invokeFunction } from './invocation-handler';
+
+const registerTriggersMutex = new Mutex();
+
+export const useLocalTriggerManager = (space: Space) => {
+  const client = useClient();
+
+  // TODO(burdon): Factor out, creating context for plugin (runs outside of component).
+  const [registry] = useState(new Map<string, Context>());
+  const triggers = useQuery(space, Filter.schema(FunctionTrigger));
+  useEffect(() => {
+    setTimeout(async () => {
+      // Mark-and-sweep removing disabled triggers.
+      await registerTriggersMutex.executeSynchronized(async () => {
+        const deprecated = new Set(Array.from(registry.keys()));
+        log('triggers', {
+          deprecated,
+          all: triggers.map((t) => t.id),
+          enabled: triggers.filter((t) => t.enabled).map((t) => t.id),
+        });
+
+        for (const trigger of triggers) {
+          if (trigger.enabled) {
+            if (registry.has(trigger.id)) {
+              deprecated.delete(trigger.id);
+              continue;
+            }
+            log.info('activating trigger', trigger.id);
+
+            const ctx = new Context();
+            registry.set(trigger.id, ctx);
+            const triggerSpec = trigger.spec;
+            invariant(triggerSpec);
+
+            let triggerFactory: TriggerFactory<any>;
+            if (triggerSpec.type === 'subscription') {
+              triggerFactory = createSubscriptionTrigger;
+            } else {
+              log.info('unsupported trigger', { type: triggerSpec.type });
+              continue;
+            }
+
+            await triggerFactory(ctx, space, trigger.spec, (data: any) => {
+              return invokeFunction(client, space, trigger, data);
+            });
+          }
+        }
+
+        for (const id of deprecated) {
+          const ctx = registry.get(id);
+          if (ctx) {
+            await ctx.dispose();
+            registry.delete(id);
+          }
+        }
+      });
+    });
+  }, [JSON.stringify(triggers)]);
+
+  useEffect(() => {
+    return () => {
+      for (const ctx of registry.values()) {
+        void ctx.dispose();
+      }
+    };
+  }, []);
+};

package/src/tools/function.ts

@@ -5,8 +5,8 @@
 import { defineTool, ToolResult } from '@dxos/artifact';
 import type { Tool } from '@dxos/artifact';
 import { toEffectSchema } from '@dxos/echo-schema';
-import { getInvocationUrl, getUserFunctionUrlInMetadata } from '@dxos/functions';
-import type { FunctionType } from '@dxos/functions';
+import { getInvocationUrl, getUserFunctionUrlInMetadata } from '@dxos/functions/types';
+import type { FunctionType } from '@dxos/functions/types';
 import { log } from '@dxos/log';
 import type { SpaceId } from '@dxos/react-client/echo';
 import { getMeta } from '@dxos/react-client/echo';

package/src/tools/openapi.ts

@@ -2,12 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
 import jsonpointer from 'jsonpointer';
 import { type OpenAPIV2, type OpenAPIV3_1 } from 'openapi-types';
 
 import { ToolResult, type Tool } from '@dxos/artifact';
-import { JsonSchemaType, normalizeSchema, toEffectSchema } from '@dxos/echo-schema';
+import { JsonSchemaType, normalizeSchema, S, toEffectSchema } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { deepMapValues } from '@dxos/util';
@@ -83,7 +82,7 @@ export const createToolsFromApi = async (url: string, options?: CreateToolsFromA
       }
 
       log('inputSchema', { inputSchema });
-      Schema.validateSync(JsonSchemaType)(inputSchema);
+      S.validateSync(JsonSchemaType)(inputSchema);
 
       const description = methodItem.description ?? methodItem.summary;
       if (!description) {
@@ -201,7 +200,7 @@ const callApiEndpoint = async (endpoint: EndpointDescriptor, input: any) => {
 
         // Client-side validation
         const effectSchema = toEffectSchema(parameter.schema);
-        Schema.validateSync(effectSchema)(value);
+        S.validateSync(effectSchema)(value);
 
         if (body) {
           throw new Error(`Duplicate body parameter: ${parameter.name}`);

package/src/types/service.ts

@@ -2,80 +2,78 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
-
 import { ComputeGraph } from '@dxos/conductor';
-import { Ref, TypedObject, type Ref$ } from '@dxos/echo-schema';
-import { FunctionType } from '@dxos/functions';
-
-const ApiAuthorizationKey = Schema.Struct({
-  type: Schema.Literal('api-key'),
-  key: Schema.String,
-  placement: Schema.Union(
-    Schema.Struct({
-      type: Schema.Literal('authorization-header'),
+import { Ref, S, TypedObject, type Ref$ } from '@dxos/echo-schema';
+import { FunctionType } from '@dxos/functions/types';
+
+const ApiAuthorizationKey = S.Struct({
+  type: S.Literal('api-key'),
+  key: S.String,
+  placement: S.Union(
+    S.Struct({
+      type: S.Literal('authorization-header'),
     }),
-    Schema.Struct({
-      type: Schema.Literal('query'),
-      name: Schema.String,
+    S.Struct({
+      type: S.Literal('query'),
+      name: S.String,
     }),
   ),
 });
 
-const ApiAuthorizationOauth = Schema.Struct({
-  type: Schema.Literal('oauth'),
-  clientId: Schema.String,
-  clientSecret: Schema.String,
-  tokenUrl: Schema.String,
-  grantType: Schema.String,
+const ApiAuthorizationOauth = S.Struct({
+  type: S.Literal('oauth'),
+  clientId: S.String,
+  clientSecret: S.String,
+  tokenUrl: S.String,
+  grantType: S.String,
 });
 
-export const ApiAuthorization = Schema.Union(ApiAuthorizationKey, ApiAuthorizationOauth);
-export type ApiAuthorization = Schema.Schema.Type<typeof ApiAuthorization>;
+export const ApiAuthorization = S.Union(ApiAuthorizationKey, ApiAuthorizationOauth);
+export type ApiAuthorization = S.Schema.Type<typeof ApiAuthorization>;
 
-const ServiceInterfaceFunction = Schema.Struct({
-  kind: Schema.Literal('function'),
+const ServiceInterfaceFunction = S.Struct({
+  kind: S.Literal('function'),
   fn: Ref(FunctionType) as Ref$<FunctionType>,
 });
 
-const ServiceInterfaceWorkflow = Schema.Struct({
-  kind: Schema.Literal('workflow'),
+const ServiceInterfaceWorkflow = S.Struct({
+  kind: S.Literal('workflow'),
   workflow: Ref(ComputeGraph) as Ref$<ComputeGraph>,
 });
 
-const ServiceInterfaceApi = Schema.Struct({
-  kind: Schema.Literal('api'),
+const ServiceInterfaceApi = S.Struct({
+  kind: S.Literal('api'),
 
   /**
    * URL to fetch the openapi schema.
    */
-  schemaUrl: Schema.optional(Schema.String),
+  schemaUrl: S.optional(S.String),
 
   /**
    * Inlined openapi schema.
    */
-  schema: Schema.optional(Schema.Any),
+  schema: S.optional(S.Any),
 
   /**
    * Authorization configuration if required.
    */
-  authorization: Schema.optional(ApiAuthorization),
+  authorization: S.optional(ApiAuthorization),
 });
 
-const ServiceInterface = Schema.Union(ServiceInterfaceFunction, ServiceInterfaceWorkflow, ServiceInterfaceApi);
-export type ServiceInterface = Schema.Schema.Type<typeof ServiceInterface>;
+const ServiceInterface = S.Union(ServiceInterfaceFunction, ServiceInterfaceWorkflow, ServiceInterfaceApi);
+export type ServiceInterface = S.Schema.Type<typeof ServiceInterface>;
 
 export class ServiceType extends TypedObject({ typename: 'dxos.org/type/ServiceType', version: '0.1.0' })({
-  serviceId: Schema.String,
-  name: Schema.optional(Schema.String),
-  description: Schema.optional(Schema.String),
-  category: Schema.optional(Schema.String),
-  enabled: Schema.optional(Schema.Boolean),
+  serviceId: S.String,
+  name: S.optional(S.String),
+  description: S.optional(S.String),
+  category: S.optional(S.String),
+  enabled: S.optional(S.Boolean),
 
   /**
    * Entries exposed: functions, workflows, and APIs.
    */
-  interfaces: Schema.optional(Schema.Array(ServiceInterface)),
+  interfaces: S.optional(S.Array(ServiceInterface)),
 }) {}
 
 //