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

package/src/components/ProcessTree/ProcessTree.tsx

@@ -0,0 +1,85 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Match from 'effect/Match';
+import React from 'react';
+
+import { Process } from '@dxos/functions-runtime';
+import { Icon, ScrollArea, Treegrid } from '@dxos/react-ui';
+import { composable, composableProps, mx } from '@dxos/ui-theme';
+
+export type ProcessTreeProps = {
+  processes: readonly Process.Info[];
+  onProcessSelect?: (process: Process.Info) => void;
+};
+
+export const ProcessTree = composable<HTMLDivElement, ProcessTreeProps>(
+  ({ processes, onProcessSelect, ...props }, forwardedRef) => {
+    const filteredProcesses: Process.Info[] = [
+      ...processes.filter((process) => [Process.State.RUNNING, Process.State.HYBERNATING].includes(process.state)),
+      ...processes.filter((process) => [Process.State.IDLE].includes(process.state)).slice(0, 3),
+      ...processes
+        .filter((process) =>
+          [Process.State.SUCCEEDED, Process.State.FAILED, Process.State.TERMINATED].includes(process.state),
+        )
+        .slice(0, 3),
+    ];
+
+    return (
+      <ScrollArea.Root {...composableProps(props, { classNames: 'dx-expander' })} thin ref={forwardedRef}>
+        <ScrollArea.Viewport>
+          <Treegrid.Root gridTemplateColumns='1fr'>
+            {filteredProcesses
+              .filter((process) => process.parentPid === null)
+              .map((process) => {
+                const activeChildren = filteredProcesses.filter(
+                  (candidate) =>
+                    candidate.parentPid?.toString() === process.pid.toString() &&
+                    candidate.state === Process.State.RUNNING,
+                );
+                return (
+                  <Treegrid.Row
+                    key={process.pid.toString()}
+                    id={process.pid.toString()}
+                    parentOf={process.parentPid?.toString()}
+                  >
+                    <Treegrid.Cell
+                      indent
+                      classNames='flex items-center p-1 gap-2 min-w-0'
+                      onClick={() => onProcessSelect?.(process)}
+                    >
+                      <Icon
+                        size={4}
+                        icon={Match.value(process.state).pipe(
+                          Match.when(Process.State.RUNNING, () => 'ph--spinner-gap--regular'),
+                          Match.when(Process.State.SUCCEEDED, () => 'ph--check-circle--regular'),
+                          Match.when(Process.State.FAILED, () => 'ph--warning--regular'),
+                          Match.when(Process.State.HYBERNATING, () => 'ph--spinner--regular'),
+                          Match.when(Process.State.IDLE, () => 'ph--hourglass--regular'),
+                          Match.when(Process.State.TERMINATING, () => 'ph--x-circle--regular'),
+                          Match.when(Process.State.TERMINATED, () => 'ph--x-circle--regular'),
+                          Match.orElse(() => 'ph--spinner-gap--regular'),
+                        )}
+                        classNames={mx(
+                          process.state === Process.State.RUNNING && 'animate-spin',
+                          process.state === Process.State.FAILED && 'text-error-text',
+                          process.state === Process.State.SUCCEEDED && 'text-success-text',
+                        )}
+                      />
+                      <div role='none' className='flex items-center gap-2 text-xs overflow-hidden'>
+                        <span className='text-description'>{process.params.name}</span>
+                        {activeChildren.length > 0 && (
+                          <span className='text-xs text-description ml-1'>{activeChildren[0].params.name}</span>
+                        )}
+                      </div>
+                    </Treegrid.Cell>
+                  </Treegrid.Row>
+                );
+              })}
+          </Treegrid.Root>
+        </ScrollArea.Viewport>
+      </ScrollArea.Root>
+    );
+  },
+);

package/src/components/ProcessTree/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { ProcessTree, type ProcessTreeProps } from './ProcessTree';

package/src/components/TemplateEditor/TemplateEditor.stories.tsx

@@ -13,7 +13,6 @@ import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { trim } from '@dxos/util';
 
 import { translations } from '../../translations';
-
 import { TemplateEditor, type TemplateEditorProps } from './TemplateEditor';
 
 const FENCE = '```';
@@ -45,7 +44,7 @@ const TEMPLATE = trim`
 const DefaultStory = ({ source }: TemplateEditorProps & { source: string }) => {
   const client = useClient();
   const [blueprint] = useState(() => {
-    const space = client.spaces.default;
+    const space = client.spaces.get()[0];
     return space.db.add(
       Blueprint.make({
         key: 'example.com/blueprint/test',
@@ -56,21 +55,17 @@ const DefaultStory = ({ source }: TemplateEditorProps & { source: string }) => {
   });
 
   return (
-    <TemplateEditor
-      classNames='bg-baseSurface max-is-prose is-full'
-      id={blueprint.id}
-      template={blueprint.instructions}
-    />
+    <TemplateEditor classNames='dx-document bg-base-surface' id={blueprint.id} template={blueprint.instructions} />
   );
 };
 
 const meta = {
-  title: 'plugins/plugin-assistant/TemplateEditor',
+  title: 'plugins/plugin-assistant/components/TemplateEditor',
   component: TemplateEditor as any,
   render: DefaultStory,
   decorators: [
-    withTheme,
-    withLayout({ container: 'column' }),
+    withTheme(),
+    withLayout({ layout: 'column' }),
     withClientProvider({
       types: [Blueprint.Blueprint],
       createIdentity: true,

package/src/components/TemplateEditor/TemplateEditor.tsx

@@ -3,65 +3,76 @@
 //
 
 import { defaultHighlightStyle, syntaxHighlighting } from '@codemirror/language';
+import { composeRefs } from '@radix-ui/react-compose-refs';
 import React from 'react';
 
 import { type Template } from '@dxos/blueprints';
-import { createDocAccessor } from '@dxos/react-client/echo';
-import { type ThemedClassName, useThemeContext, useTranslation } from '@dxos/react-ui';
+import { createDocAccessor } from '@dxos/echo-db';
+import { useThemeContext, useTranslation } from '@dxos/react-ui';
+import { useTextEditor } from '@dxos/react-ui-editor';
 import {
   createBasicExtensions,
   createDataExtensions,
   createMarkdownExtensions,
   createThemeExtensions,
   decorateMarkdown,
-  useTextEditor,
-} from '@dxos/react-ui-editor';
-import { mx } from '@dxos/react-ui-theme';
+} from '@dxos/ui-editor';
+import { composable, composableProps } from '@dxos/ui-theme';
 import { isNonNullable } from '@dxos/util';
 
-import { meta } from '../../meta';
+import { meta } from '#meta';
 
 import { handlebars, xmlDecorator } from './extensions';
 
-export type TemplateEditorProps = ThemedClassName<{
+export type TemplateEditorProps = {
   id: string;
   template: Template.Template;
   lineNumbers?: boolean;
-}>;
+};
 
-export const TemplateEditor = ({ id, classNames, template, lineNumbers = true }: TemplateEditorProps) => {
-  const { t } = useTranslation(meta.id);
-  const { themeMode } = useThemeContext();
-  const { parentRef } = useTextEditor(() => {
-    const text = template.source?.target;
-    if (!text) {
-      return {};
-    }
+export const TemplateEditor = composable<HTMLDivElement, TemplateEditorProps>(
+  ({ classNames, id, template, lineNumbers = true, ...props }, forwardedRef) => {
+    const { t } = useTranslation(meta.id);
+    const { themeMode } = useThemeContext();
+    const { parentRef } = useTextEditor(() => {
+      const text = template.source?.target;
+      if (!text) {
+        return {};
+      }
 
-    return {
-      initialValue: text.content ?? '',
-      extensions: [
-        createDataExtensions({
-          id,
-          text: createDocAccessor(text, ['content']),
-        }),
-        createBasicExtensions({
-          bracketMatching: false,
-          lineNumbers,
-          lineWrapping: true,
-          placeholder: t('template placeholder'),
-        }),
-        createThemeExtensions({ themeMode, slots: { content: { className: '!pie-4' } } }),
-        createMarkdownExtensions(),
-        decorateMarkdown(),
-        handlebars(),
-        // xml(),
-        // NOTE: Since we're using markdown only HTML nodes are parsed.
-        xmlDecorator(),
-        syntaxHighlighting(defaultHighlightStyle),
-      ].filter(isNonNullable),
-    };
-  }, [themeMode, template.source?.target, lineNumbers]);
+      return {
+        initialValue: text.content ?? '',
+        extensions: [
+          createDataExtensions({
+            id,
+            text: createDocAccessor(text, ['content']),
+          }),
+          createBasicExtensions({
+            bracketMatching: false,
+            lineNumbers,
+            lineWrapping: true,
+            placeholder: t('template.placeholder'),
+          }),
+          createThemeExtensions({ themeMode }),
+          createMarkdownExtensions(),
+          decorateMarkdown(),
+          handlebars(),
+          // xml(),
+          // NOTE: Since we're using markdown only HTML nodes are parsed.
+          xmlDecorator(),
+          syntaxHighlighting(defaultHighlightStyle),
+        ].filter(isNonNullable),
+      };
+    }, [themeMode, template.source?.target, lineNumbers]);
 
-  return <div ref={parentRef} className={mx('bs-full overflow-hidden', classNames)} />;
-};
+    return (
+      <div
+        {...composableProps(props, {
+          role: 'none',
+          classNames: ['h-full overflow-hidden', classNames],
+        })}
+        ref={composeRefs(parentRef, forwardedRef)}
+      />
+    );
+  },
+);

package/src/components/TemplateEditor/TemplateForm.stories.tsx

@@ -3,32 +3,34 @@
 //
 
 import { type Meta } from '@storybook/react-vite';
-import React, { useState } from 'react';
+import React, { useCallback, useState } from 'react';
 
 import { Blueprint, Template } from '@dxos/blueprints';
+import { Obj } from '@dxos/echo';
+import { invariant } from '@dxos/invariant';
 import { useClient } from '@dxos/react-client';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { trim } from '@dxos/util';
 
 import { translations } from '../../translations';
-
-import { TemplateForm } from './TemplateForm';
+import { type TemplateChangeCallback, TemplateForm } from './TemplateForm';
 
 const TEMPLATE = trim`
   You are a machine that is an expert chess player.
   The move history of the current game is: {{history}}
   If asked to suggest a move explain why it is a good move.
-  
+
   ---
- 
+
   {{input}},
 `;
 
 const DefaultStory = () => {
   const client = useClient();
   const [blueprint] = useState(() => {
-    const space = client.spaces.default;
+    const space = client.spaces.get()[0];
+    invariant(space, 'TemplateForm story requires at least one space');
     return space.db.add(
       Blueprint.make({
         key: 'example.com/blueprint/test',
@@ -38,20 +40,27 @@ const DefaultStory = () => {
     );
   });
 
+  const handleChange: TemplateChangeCallback = useCallback(
+    (mutate) => {
+      Obj.change(blueprint, (obj) => mutate(obj.instructions));
+    },
+    [blueprint],
+  );
+
   return (
-    <div role='none' className='flex is-[40rem] border border-separator overflow-hidden'>
-      <TemplateForm id={blueprint.id} template={blueprint.instructions} />
+    <div role='none' className='flex w-[40rem] border border-separator overflow-hidden'>
+      <TemplateForm id={blueprint.id} template={blueprint.instructions} onChange={handleChange} />
     </div>
   );
 };
 
 const meta = {
-  title: 'plugins/plugin-assistant/TemplateForm',
+  title: 'plugins/plugin-assistant/components/TemplateForm',
   component: TemplateForm,
   render: DefaultStory,
   decorators: [
-    withTheme,
-    withLayout({ container: 'column' }),
+    withTheme(),
+    withLayout({ layout: 'column' }),
     withClientProvider({
       types: [Blueprint.Blueprint],
       createIdentity: true,

package/src/components/TemplateEditor/TemplateForm.tsx

@@ -3,62 +3,96 @@
 //
 
 import type * as Schema from 'effect/Schema';
-import React, { Fragment, useEffect } from 'react';
+import React, { Fragment, useCallback, useEffect } from 'react';
 
 import { type Template } from '@dxos/blueprints';
+import { type Obj } from '@dxos/echo';
 import { Input, Select, useTranslation } from '@dxos/react-ui';
-import { attentionSurface, groupBorder, mx } from '@dxos/react-ui-theme';
 import { isNonNullable } from '@dxos/util';
 
-import { meta } from '../../meta';
+import { meta } from '#meta';
 
 import { TemplateEditor } from './TemplateEditor';
 
+/**
+ * Callback type for mutating template within a parent object's Obj.change context.
+ */
+export type TemplateChangeCallback = (mutate: (template: Obj.Mutable<Template.Template>) => void) => void;
+
 export type TemplateFormProps = {
   id: string;
   template: Template.Template;
   schema?: Schema.Schema<any, any, any>;
   commandEditable?: boolean;
+  /**
+   * Callback to mutate the template. Should wrap mutations in parent's Obj.change.
+   * If not provided, the component is read-only.
+   */
+  onChange?: TemplateChangeCallback;
 };
 
-export const TemplateForm = ({ id, template, commandEditable = true }: TemplateFormProps) => {
+export const TemplateForm = ({ id, template, commandEditable = true, onChange }: TemplateFormProps) => {
   const { t } = useTranslation(meta.id);
-  usePromptInputs(template);
+  usePromptInputs(template, onChange);
+
+  const handleInputKindChange = useCallback(
+    (inputName: string, kind: Template.InputKind) => {
+      onChange?.((t) => {
+        const input = t.inputs?.find((i) => i?.name === inputName);
+        if (input) {
+          input.kind = kind;
+        }
+      });
+    },
+    [onChange],
+  );
+
+  const handleInputDefaultChange = useCallback(
+    (inputName: string, value: string) => {
+      onChange?.((t) => {
+        const input = t.inputs?.find((i) => i?.name === inputName);
+        if (input) {
+          input.default = value;
+        }
+      });
+    },
+    [onChange],
+  );
 
   return (
-    <div className={mx('flex flex-col is-full overflow-hidden gap-4', groupBorder)}>
+    <div className='flex flex-col w-full overflow-hidden gap-4'>
       {/* {commandEditable && (
         <div className='flex items-center pl-4'>
           <span className='text-neutral-500'>/</span>
           <Input.Root>
             <Input.TextInput
-              placeholder={t('command placeholder')}
-              classNames='is-full bg-transparent m-2'
+              placeholder={t('command.placeholder')}
+              classNames='w-full bg-transparent m-2'
               value={template.command ?? ''}
               onChange={(event) => {
-                template.command = event.target.value.replace(/\w/g, '');
+                onChange?.((t) => {
+                  t.command = event.target.value.replace(/\w/g, '');
+                });
               }}
             />
           </Input.Root>
         </div>
       )} */}
 
-      <TemplateEditor id={id} template={template} classNames={[attentionSurface, 'min-h-[120px]']} />
+      <TemplateEditor id={id} template={template} classNames='bg-base-surface min-h-[120px]' />
 
       {(template.inputs?.length ?? 0) > 0 && (
         <div className='grid grid-cols-[10rem_10rem_1fr] gap-1 items-center'>
           {template.inputs?.filter(isNonNullable).map((input) => (
             <Fragment key={input.name}>
-              <div className='pis-3 text-blueText'>{input.name}</div>
+              <div className='ps-3 text-blue-text'>{input.name}</div>
 
               <Input.Root>
                 <Select.Root
                   value={input.kind}
-                  onValueChange={(kind) => {
-                    input.kind = kind as Template.InputKind;
-                  }}
+                  onValueChange={(kind) => handleInputKindChange(input.name, kind as Template.InputKind)}
                 >
-                  <Select.TriggerButton placeholder='Type' classNames='is-full' />
+                  <Select.TriggerButton placeholder='Type' classNames='w-full' />
                   <Select.Portal>
                     <Select.Content>
                       <Select.Viewport>
@@ -79,12 +113,10 @@ export const TemplateForm = ({ id, template, commandEditable = true }: TemplateF
                   <div>
                     <Input.Root>
                       <Input.TextInput
-                        placeholder={t('command placeholder')}
-                        classNames='is-full bg-transparent'
+                        placeholder={t('command.placeholder')}
+                        classNames='w-full bg-transparent'
                         value={input.default ?? ''}
-                        onChange={(event) => {
-                          input.default = event.target.value;
-                        }}
+                        onChange={(event) => handleInputDefaultChange(input.name, event.target.value)}
                       />
                     </Input.Root>
                   </div>
@@ -136,13 +168,14 @@ const inputs: { kind: Template.InputKind; label: string }[] = [
 
 export const NAME_REGEXP = /\{\{([\w-]+)\}\}/;
 
-const usePromptInputs = (template: Template.Template) => {
+const usePromptInputs = (template: Template.Template, onChange?: TemplateChangeCallback) => {
   useEffect(() => {
-    const text = template.source ?? '';
-    if (!template.inputs) {
-      template.inputs = []; // TODO(burdon): Required?
+    if (!onChange) {
+      return;
     }
 
+    const text = template.source ?? '';
+
     const regex = new RegExp(NAME_REGEXP, 'g');
     const variables = new Set<string>([...(text.target?.content.matchAll(regex) ?? [])].map((m) => m[1]));
 
@@ -161,19 +194,32 @@ const usePromptInputs = (template: Template.Template) => {
 
     // Match or create new inputs.
     const values = unclaimed.values();
-    missing.forEach((name) => {
-      const next = values.next().value;
-      if (next) {
-        next.name = name;
-      } else {
-        template.inputs?.push({ name });
+    onChange((t) => {
+      if (!t.inputs) {
+        t.inputs = [];
       }
-    });
 
-    // Remove unclaimed (deleted) inputs.
-    // TODO(burdon): If user types incorrect name value, it will be deleted. Garbage collect?
-    for (const input of values) {
-      template.inputs.splice(template.inputs.indexOf(input), 1);
-    }
-  }, [template.source]);
+      missing.forEach((name) => {
+        const next = values.next().value;
+        if (next) {
+          // Find the input in the mutable draft and update it.
+          const inputIndex = t.inputs!.findIndex((i) => i?.name === next.name);
+          if (inputIndex !== -1) {
+            t.inputs![inputIndex].name = name;
+          }
+        } else {
+          t.inputs!.push({ name });
+        }
+      });
+
+      // Remove unclaimed (deleted) inputs.
+      // TODO(burdon): If user types incorrect name value, it will be deleted. Garbage collect?
+      for (const input of values) {
+        const inputIndex = t.inputs!.findIndex((i) => i?.name === input.name);
+        if (inputIndex !== -1) {
+          t.inputs!.splice(inputIndex, 1);
+        }
+      }
+    });
+  }, [template.source, onChange]);
 };

package/src/components/TemplateEditor/extensions/handlebars-extension.ts

@@ -19,8 +19,7 @@ import {
   keymap,
 } from '@codemirror/view';
 
-import { Domino } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+import { Domino, mx } from '@dxos/ui';
 
 export type HandlebarsOptions = {};
 
@@ -65,7 +64,7 @@ const regex = {
   url: /[\w.-]+\.[\w.-]+\/[\w/]+/g,
 };
 
-const tagPadding = 'mli-0.5 pli-1 rounded-sm';
+const tagPadding = 'mx-0.5 px-1 rounded-xs';
 
 /**
  * ViewPlugin that decorates Handlebars syntax.
@@ -87,7 +86,11 @@ const handlebarsHighlightPlugin = ViewPlugin.fromClass(
     // NOTE: Decorations may clash with other extensions (e.g., markdown).
     buildDecorations(view: EditorView) {
       const selection = view.state.selection.main;
-      const decorations: Array<{ from: number; to: number; decoration: Decoration }> = [];
+      const decorations: Array<{
+        from: number;
+        to: number;
+        decoration: Decoration;
+      }> = [];
 
       for (const { from, to } of view.visibleRanges) {
         const text = view.state.doc.sliceString(from, to);
@@ -121,7 +124,9 @@ const handlebarsHighlightPlugin = ViewPlugin.fromClass(
             decorations.push({
               from: start,
               to: end,
-              decoration: Decoration.mark({ class: mx('dx-tag--blue', tagPadding) }),
+              decoration: Decoration.mark({
+                class: mx('dx-tag--blue', tagPadding),
+              }),
             });
           }
         }
@@ -153,14 +158,14 @@ const handlebarsHighlightPlugin = ViewPlugin.fromClass(
               decorations.push({
                 from: idx,
                 to: end,
-                decoration: Decoration.mark({ class: 'text-greenText' }),
+                decoration: Decoration.mark({ class: 'text-green-text' }),
               });
               end = idx;
             }
             decorations.push({
               from: start,
               to: end,
-              decoration: Decoration.mark({ class: 'text-blueText' }),
+              decoration: Decoration.mark({ class: 'text-blue-text' }),
             });
           }
         }
@@ -174,7 +179,7 @@ const handlebarsHighlightPlugin = ViewPlugin.fromClass(
             decorations.push({
               from: start,
               to: end,
-              decoration: Decoration.mark({ class: 'text-greenText' }),
+              decoration: Decoration.mark({ class: 'text-green-text' }),
             });
           }
         }
@@ -222,7 +227,7 @@ class DXNWidget extends WidgetType {
         return part;
       })
       .join(':');
-    return Domino.of('span').classNames(['font-mono dx-tag--blue', tagPadding]).text(text).build();
+    return Domino.of('span').classNames(mx('font-mono dx-tag--blue', tagPadding)).text(text).root;
   }
 }