@dxos/plugin-automation 0.7.2-main.f1adc9f → 0.7.2

package/src/AutomationPlugin.tsx

@@ -4,26 +4,17 @@
 
 import React from 'react';
 
-import { parseMetadataResolverPlugin, type PluginDefinition, resolvePlugin } from '@dxos/app-framework';
+import { type PluginDefinition, parseMetadataResolverPlugin, resolvePlugin } from '@dxos/app-framework';
 import { FunctionTrigger } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 import { parseClientPlugin } from '@dxos/plugin-client';
 import { createExtension, toSignal } from '@dxos/plugin-graph';
-import { memoizeQuery } from '@dxos/plugin-space';
-import {
-  getSpace,
-  getTypename,
-  isEchoObject,
-  loadObjectReferences,
-  parseId,
-  SpaceState,
-} from '@dxos/react-client/echo';
-import { translations as formTranslations } from '@dxos/react-ui-form';
+import { getTypename, loadObjectReferences, parseId } from '@dxos/react-client/echo';
 
-import { AssistantPanel, AutomationPanel } from './components';
+import { AutomationPanel } from './components';
 import meta, { AUTOMATION_PLUGIN } from './meta';
 import translations from './translations';
-import { type AutomationPluginProvides, ChainPromptType, ChainType } from './types';
+import { AutomationAction, type AutomationPluginProvides, ChainPromptType, ChainType } from './types';
 
 export const AutomationPlugin = (): PluginDefinition<AutomationPluginProvides> => {
   return {
@@ -39,7 +30,7 @@ export const AutomationPlugin = (): PluginDefinition<AutomationPluginProvides> =
           },
         },
       },
-      translations: [...translations, ...formTranslations],
+      translations,
       echo: {
         schema: [ChainType, ChainPromptType, FunctionTrigger],
       },
@@ -48,12 +39,7 @@ export const AutomationPlugin = (): PluginDefinition<AutomationPluginProvides> =
           {
             id: 'automation',
             label: ['open automation panel label', { ns: AUTOMATION_PLUGIN }],
-            icon: 'ph--magic-wand--regular',
-          },
-          {
-            id: 'assistant',
-            label: ['open assistant panel label', { ns: AUTOMATION_PLUGIN }],
-            icon: 'ph--atom--regular',
+            icon: 'ph--flow-arrow--regular',
           },
         ],
       },
@@ -76,17 +62,11 @@ export const AutomationPlugin = (): PluginDefinition<AutomationPluginProvides> =
                 }
 
                 const type = 'orphan-settings-for-subject';
-                const icon = 'ph--magic-wand--regular';
+                const icon = 'ph--flow-arrow--regular';
 
                 const [subjectId] = id.split('~');
                 const { spaceId, objectId } = parseId(subjectId);
-                const spaces = toSignal(
-                  (onChange) => client.spaces.subscribe(() => onChange()).unsubscribe,
-                  () => client.spaces.get(),
-                );
-                const space = spaces?.find(
-                  (space) => space.id === spaceId && space.state.get() === SpaceState.SPACE_READY,
-                );
+                const space = client.spaces.get().find((space) => space.id === spaceId);
                 if (!objectId) {
                   // TODO(burdon): Ref SPACE_PLUGIN ns.
                   const label = space
@@ -109,7 +89,18 @@ export const AutomationPlugin = (): PluginDefinition<AutomationPluginProvides> =
                   };
                 }
 
-                const [object] = memoizeQuery(space, { id: objectId });
+                const object = toSignal(
+                  (onChange) => {
+                    const timeout = setTimeout(async () => {
+                      await space?.db.query({ id: objectId }).first();
+                      onChange();
+                    });
+
+                    return () => clearTimeout(timeout);
+                  },
+                  () => space?.db.getObjectById(objectId),
+                  subjectId,
+                );
                 if (!object || !subjectId) {
                   return;
                 }
@@ -131,77 +122,33 @@ export const AutomationPlugin = (): PluginDefinition<AutomationPluginProvides> =
                 };
               },
             }),
-            createExtension({
-              id: `${AUTOMATION_PLUGIN}/assistant-for-subject`,
-              resolver: ({ id }) => {
-                // TODO(Zan): Find util (or make one). Effect schema!!
-                if (!id.endsWith('~assistant')) {
-                  return;
-                }
-
-                const [subjectId] = id.split('~');
-                const { spaceId, objectId } = parseId(subjectId);
-                const spaces = toSignal(
-                  (onChange) => client.spaces.subscribe(() => onChange()).unsubscribe,
-                  () => client.spaces.get(),
-                );
-                const space = spaces?.find(
-                  (space) => space.id === spaceId && space.state.get() === SpaceState.SPACE_READY,
-                );
-                if (!objectId) {
-                  // TODO(wittjosiah): Support assistant for arbitrary subjects.
-                  //   This is to ensure that the assistant panel is not stuck on an old object.
-                  return {
-                    id,
-                    type: 'orphan-automation-for-subject',
-                    data: null,
-                    properties: {
-                      icon: 'ph--atom--regular',
-                      label: ['assistant panel label', { ns: AUTOMATION_PLUGIN }],
-                      object: null,
-                      space,
-                    },
-                  };
-                }
-
-                const [object] = memoizeQuery(space, { id: objectId });
-
-                return {
-                  id,
-                  type: 'orphan-automation-for-subject',
-                  data: null,
-                  properties: {
-                    icon: 'ph--atom--regular',
-                    label: ['assistant panel label', { ns: AUTOMATION_PLUGIN }],
-                    object,
-                  },
-                };
-              },
-            }),
           ];
         },
       },
       surface: {
         component: ({ data, role }) => {
           switch (role) {
-            case 'complementary--assistant':
-              return <AssistantPanel subject={data.subject as any} />;
-            case 'complementary--automation': {
-              const object = data.subject;
-              const space = isEchoObject(object) ? getSpace(object) : undefined;
-              if (space) {
-                invariant(isEchoObject(object));
-                return <AutomationPanel space={space} object={object} />;
-              }
-              break;
-            }
+            // case 'article':
+            // return data.object instanceof ChainType ? <ChainArticle chain={data.object} /> : null;
+
+            case 'complementary--automation':
+              return <AutomationPanel />;
           }
 
           return null;
         },
       },
       intent: {
-        resolver: (intent) => {},
+        resolver: (intent) => {
+          switch (intent.action) {
+            case AutomationAction.CREATE: {
+              return {
+                // data: create(ChainType, { prompts: [] }),
+                // data: create(FunctionTrigger, { function: '', spec: { type: 'timer', cron: '' } }),
+              };
+            }
+          }
+        },
       },
     },
   };

package/src/components/AutomationPanel.tsx

@@ -0,0 +1,23 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import React from 'react';
+
+import { Button, Icon, Toolbar } from '@dxos/react-ui';
+
+// TODO(burdon): Form components.
+
+export const AutomationPanel = () => {
+  const handleCreate = () => {};
+
+  return (
+    <div className='flex flex-col'>
+      <Toolbar.Root classNames='p-2'>
+        <Button onClick={handleCreate}>
+          <Icon icon='ph--plus--regular' />
+        </Button>
+      </Toolbar.Root>
+    </div>
+  );
+};

package/src/components/TriggerEditor/TriggerEditor.stories.tsx

@@ -7,7 +7,7 @@ import '@dxos-theme';
 import { type Meta } from '@storybook/react';
 import React, { useEffect, useState } from 'react';
 
-import { create } from '@dxos/echo-schema';
+import { AST, S, create, toJsonSchema } from '@dxos/echo-schema';
 import { FunctionTrigger, TriggerKind } from '@dxos/functions';
 import { FunctionType } from '@dxos/plugin-script/types';
 import { useSpaces } from '@dxos/react-client/echo';
@@ -15,10 +15,39 @@ import { withClientProvider } from '@dxos/react-client/testing';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { TriggerEditor } from './TriggerEditor';
-import { functions } from '../../testing';
 import translations from '../../translations';
 import { ChainPromptType } from '../../types';
 
+// TODO(burdon): Extract type?
+const functions = [
+  {
+    name: 'example.com/function/chess',
+    version: 1,
+    inputSchema: toJsonSchema(
+      S.Struct({
+        level: S.Number.annotations({
+          [AST.TitleAnnotationId]: 'Level',
+        }),
+      }),
+    ),
+  },
+  {
+    name: 'example.com/function/forex',
+    version: 1,
+    binding: 'FOREX',
+    inputSchema: toJsonSchema(
+      S.Struct({
+        from: S.String.annotations({
+          [AST.TitleAnnotationId]: 'Currency from',
+        }),
+        to: S.String.annotations({
+          [AST.TitleAnnotationId]: 'Currency to',
+        }),
+      }),
+    ),
+  },
+];
+
 const DefaultStory = () => {
   const spaces = useSpaces();
   const space = spaces[1];
@@ -53,6 +82,7 @@ const meta: Meta = {
       createSpace: true,
       types: [FunctionType, FunctionTrigger, ChainPromptType],
       onSpaceCreated: ({ space }) => {
+        console.log(space.id);
         for (const fn of functions) {
           space.db.add(create(FunctionType, fn));
         }

package/src/components/TriggerEditor/TriggerEditor.tsx

@@ -14,26 +14,60 @@ import { AUTOMATION_PLUGIN } from '../../meta';
 
 export type TriggerEditorProps = {
   space: Space;
-  trigger: Omit<FunctionTrigger, 'id'>;
-  onSave?: (trigger: Omit<FunctionTrigger, 'id'>) => void;
-  onCancel?: () => void;
+  trigger: FunctionTrigger;
 };
 
-export const TriggerEditor = ({ space, trigger, onSave, onCancel }: TriggerEditorProps) => {
+// TODO(burdon): Functions (new def).
+// TODO(burdon): Function meta (remove meta from existing trigger def).
+// TODO(burdon): Actual integration.
+
+export const TriggerEditor = ({ space, trigger }: TriggerEditorProps) => {
   const { t } = useTranslation(AUTOMATION_PLUGIN);
   const functions = useQuery(space, Filter.schema(FunctionType));
 
-  const handleSave = (values: FunctionTriggerType) => {
-    onSave?.(values);
-  };
+  // const script = useMemo(() => scripts.find((script) => script.id === trigger.function), [trigger.function, scripts]);
+  // useLocalTriggerManager(space);
+
+  // useEffect(() => {
+  //   void space.db.schemaRegistry
+  //     .query()
+  //     .then((schemas) => {
+  //       // TODO(zan): We should solve double adding of stored schemas in the schema registry.
+  //       state.schemas = distinctBy([...state.schemas, ...schemas], (schema) => schema.typename).sort((a, b) =>
+  //         a.typename < b.typename ? -1 : 1,
+  //       );
+  //     })
+  //     .catch(() => {});
+  // }, [space]);
+
+  // Keen an enriched version of the schema in memory so we can share it with prompt editor.
+  // useEffect(() => {
+  //   const spec = trigger.spec;
+  //   invariant(spec);
+  //   if (spec.type === 'subscription') {
+  //     if (spec.filter) {
+  //       const type = spec.filter.type;
+  //       const foundSchema = state.schemas.find((schema) => schema.typename === type);
+  //       if (foundSchema) {
+  //         state.selectedSchema[trigger.id] = foundSchema;
+  //       }
+  //     }
+  //   }
+  //   // TODO(burdon): API issue.
+  // }, [JSON.stringify(trigger.spec), state.schemas]);
+
+  // useEffect(() => {
+  //   if (!trigger.meta) {
+  //     const extension = getFunctionMetaExtension(trigger, script);
+  //     trigger.meta = extension?.initialValue?.();
+  //   }
+  // }, [trigger.function, trigger.meta]);
 
   return (
     <Form<FunctionTriggerType>
       schema={FunctionTriggerSchema}
       values={trigger}
       filter={(props) => props.filter((p) => p.name !== 'meta')}
-      onSave={handleSave}
-      onCancel={onCancel}
       Custom={{
         ['function' satisfies keyof FunctionTriggerType]: (props) => (
           <SelectInput<FunctionTriggerType>

package/src/components/index.ts

@@ -2,7 +2,6 @@
 // Copyright 2023 DXOS.org
 //
 
-import { lazy } from 'react';
-
-export const AssistantPanel = lazy(() => import('./AssistantPanel'));
-export const AutomationPanel = lazy(() => import('./AutomationPanel'));
+export * from './AutomationPanel';
+export * from './PromptEditor';
+export * from './TriggerEditor';

package/src/meta.ts

@@ -10,7 +10,7 @@ export default {
   id: AUTOMATION_PLUGIN,
   name: 'Automation',
   description: 'Automation workflows.',
-  icon: 'ph--magic-wand--regular',
+  icon: 'ph--flow-arrow--regular',
   source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/experimental/plugin-automation',
   tags: ['experimental'],
 } satisfies PluginMeta;

package/src/translations.ts

@@ -34,9 +34,6 @@ export default [
         'trigger cron': 'Cron',
         'trigger method': 'Method',
         'trigger endpoint': 'Endpoint',
-
-        'open assistant panel label': 'Show Assistant',
-        'assistant panel label': 'Assistant',
       },
     },
   },

package/src/types/types.ts

@@ -12,11 +12,13 @@ import type {
 import { type SchemaProvides } from '@dxos/plugin-client';
 import { type PanelProvides } from '@dxos/plugin-deck/types';
 
-// import { AUTOMATION_PLUGIN } from '../meta';
+import { AUTOMATION_PLUGIN } from '../meta';
 
-// const AUTOMATION_ACTION = `${AUTOMATION_PLUGIN}/action`;
+const AUTOMATION_ACTION = `${AUTOMATION_PLUGIN}/action`;
 
-export enum AutomationAction {}
+export enum AutomationAction {
+  CREATE = `${AUTOMATION_ACTION}/create`,
+}
 
 export type AutomationPluginProvides = SurfaceProvides &
   IntentResolverProvides &