@dxos/plugin-assistant 0.8.4-main.1f223c7 → 0.8.4-main.2244d791bb

package/src/components/InitiativeContainer/InitiativeContainer.tsx

@@ -0,0 +1,340 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { Atom, useAtomValue } from '@effect-atom/atom-react';
+import * as Effect from 'effect/Effect';
+import * as Match from 'effect/Match';
+import * as Option from 'effect/Option';
+import type * as Record from 'effect/Record';
+import React, { useCallback, useMemo, useState } from 'react';
+
+import { Surface, useCapability } from '@dxos/app-framework/ui';
+import { type SurfaceComponentProps } from '@dxos/app-toolkit/ui';
+import { Initiative, InitiativeFunctions, Plan } from '@dxos/assistant-toolkit';
+import { DXN, Filter, Obj, Query, Ref } from '@dxos/echo';
+import { type JsonPath, splitJsonPath } from '@dxos/echo/internal';
+import { AtomObj, AtomRef } from '@dxos/echo-atom';
+import { FunctionDefinition, QueueService, Trigger } from '@dxos/functions';
+import { AutomationCapabilities } from '@dxos/plugin-automation/types';
+import { MarkdownEditor } from '@dxos/plugin-markdown';
+import { useObject, useQuery } from '@dxos/react-client/echo';
+import { Button, ButtonGroup, IconButton, Input, Layout, toLocalizedString, useTranslation } from '@dxos/react-ui';
+import { Form, type FormFieldMap, omitId } from '@dxos/react-ui-form';
+import { StackItem } from '@dxos/react-ui-stack';
+import { type Text } from '@dxos/schema';
+
+const TAB_INITATIVE = 'Initiative';
+const TAB_CHAT = 'Chat';
+
+export type InitiativeContainerProps = SurfaceComponentProps<Initiative.Initiative>;
+
+export const InitiativeContainer = ({ subject: initiative }: InitiativeContainerProps) => {
+  const [selectedTab, setSelectedTab] = useState<string>(TAB_INITATIVE);
+
+  const tabs = useAtomValue(
+    useMemo(
+      () =>
+        AtomObj.make(initiative).pipe((initiative) =>
+          Atom.make((get) => {
+            return [TAB_INITATIVE, TAB_CHAT, ...get(initiative).artifacts.map((artifact) => artifact.name)];
+          }),
+        ),
+      [initiative],
+    ),
+  );
+
+  const chat = useAtomValue(
+    useMemo(
+      () =>
+        AtomObj.make(initiative).pipe((initiative) =>
+          Atom.make((get) => {
+            const chat = get(initiative).chat;
+            return chat ? get(AtomRef.make(chat)) : undefined;
+          }),
+        ),
+      [initiative],
+    ),
+  );
+
+  const artifacts = useAtomValue(
+    useMemo(
+      () =>
+        AtomObj.make(initiative).pipe((initiative) =>
+          Atom.make((get) => {
+            return get(initiative).artifacts.map((artifact) => ({
+              name: artifact.name,
+              data: get(AtomRef.make(artifact.data)),
+            }));
+          }),
+        ),
+      [initiative],
+    ),
+  );
+
+  const selectedArtifact = artifacts.find((artifact) => artifact.name === selectedTab);
+
+  return (
+    <StackItem.Content toolbar>
+      <div
+        role='none'
+        className='flex flex-1 min-is-0 overflow-x-auto scrollbar-none gap-1 border-b border-subduedSeparator'
+      >
+        {tabs.map((tab) => (
+          <IconButton
+            key={tab}
+            icon={Match.value(tab).pipe(
+              Match.when(TAB_INITATIVE, () => 'ph--sparkle--regular'),
+              Match.when(TAB_CHAT, () => 'ph--chat--regular'),
+              Match.orElse(() => 'ph--file--regular'),
+            )}
+            label={tab}
+            variant={selectedTab === tab ? 'primary' : 'ghost'}
+            onClick={() => setSelectedTab(tab)}
+          />
+        ))}
+      </div>
+      {selectedTab === TAB_INITATIVE && <InitiativeForm initiative={initiative} />}
+      {selectedTab === TAB_CHAT && <Surface.Surface role='article' data={{ subject: chat }} limit={1} />}
+      {selectedArtifact && <Surface.Surface role='section' data={{ subject: selectedArtifact.data }} limit={1} />}
+    </StackItem.Content>
+  );
+};
+
+export default InitiativeContainer;
+
+const InitiativeForm = ({ initiative }: { initiative: Initiative.Initiative }) => {
+  const handleChange = useCallback(
+    (
+      values: Omit<Initiative.Initiative, 'id'>,
+      { isValid, changed }: { isValid: boolean; changed: Record<string, boolean> },
+    ) => {
+      if (!isValid) {
+        return;
+      }
+
+      const changedPaths = Object.keys(changed).filter((path) => changed[path as string]) as JsonPath[];
+      // Handle other property changes.
+      if (changedPaths.length > 0) {
+        Obj.change(initiative, () => {
+          for (const path of changedPaths) {
+            const parts = splitJsonPath(path);
+            const value = Obj.getValue(values as any, parts);
+            Obj.setValue(initiative, parts, value);
+          }
+        });
+      }
+
+      queueMicrotask(() => syncTriggers(initiative));
+    },
+    [initiative],
+  );
+
+  const fieldMap = useMemo<FormFieldMap>(
+    () => ({
+      spec: ({ type, label, getValue, onValueChange }) => {
+        const { t } = useTranslation();
+
+        const value: Ref.Ref<Text.Text> = getValue();
+        const target = useAtomValue(AtomRef.make(value));
+        const [initialValue] = useObject(target, 'content');
+
+        return (
+          <Input.Root>
+            <div role='none'>
+              <Input.Label>{toLocalizedString(label, t)}</Input.Label>
+            </div>
+            <MarkdownEditor.Root id={target?.id ?? ''} object={target}>
+              <MarkdownEditor.Content initialValue={initialValue} />
+            </MarkdownEditor.Root>
+          </Input.Root>
+        );
+      },
+      plan: ({ type, label, getValue, onValueChange }) => {
+        const { t } = useTranslation();
+
+        const value: Ref.Ref<Plan.Plan> = getValue();
+        const target = useAtomValue(AtomRef.make(value));
+
+        return (
+          <Input.Root>
+            <div role='none'>
+              <Input.Label>{toLocalizedString(label, t)}</Input.Label>
+            </div>
+            <MarkdownEditor.Root id={target?.id ?? ''}>
+              <MarkdownEditor.Content initialValue={target ? Plan.formatPlan(target) : ''} />
+            </MarkdownEditor.Root>
+          </Input.Root>
+        );
+      },
+    }),
+    [],
+  );
+
+  const computeRuntime = useCapability(AutomationCapabilities.ComputeRuntime);
+
+  const handleResetHistory = useCallback(async () => {
+    const runtime = computeRuntime.getRuntime(Obj.getDatabase(initiative)!.spaceId);
+
+    await runtime.runPromise(Initiative.resetChatHistory(initiative));
+
+    if (!initiative.queue) {
+      await runtime.runPromise(
+        Effect.gen(function* () {
+          const queue = yield* QueueService.createQueue();
+          Obj.change(initiative, (initiative) => {
+            initiative.queue = Ref.fromDXN(queue.dxn);
+          });
+        }),
+      );
+    }
+  }, [initiative, computeRuntime]);
+
+  const inputQueue = useAtomValue(
+    AtomObj.make(initiative).pipe((_) =>
+      Atom.make((get) =>
+        Option.fromNullable(get(_).queue).pipe(Option.map(AtomRef.make), Option.map(get), Option.getOrUndefined),
+      ),
+    ),
+  );
+
+  const inputQueueItems = useQuery(inputQueue, Query.select(Filter.everything()));
+
+  // TODO(dmaretskyi): Form breaks if we provide the echo object directly.
+  const spreadValue = useMemo(() => ({ ...initiative }), [initiative]);
+  return (
+    <Layout.Main>
+      <ButtonGroup classNames='h-10'>
+        <Button onClick={handleResetHistory}>Reset History</Button>
+      </ButtonGroup>
+      <h3 className='mb-2'>Input Queue</h3>
+      <div className='border border-subduedSeparator rounded-md p-2 h-64 overflow-y-auto'>
+        {inputQueueItems.map((item) => (
+          <Surface.Surface key={item.id} role='section' data={{ subject: item }} limit={1} />
+        ))}
+        {inputQueueItems.length === 0 && <div className='text-subdued'>No items in queue</div>}
+      </div>
+      <Form.Root
+        schema={omitId(Initiative.Initiative)}
+        onValuesChanged={handleChange as any}
+        values={spreadValue}
+        db={Obj.getDatabase(initiative)}
+        fieldMap={fieldMap}
+      >
+        <Form.FieldSet />
+      </Form.Root>
+    </Layout.Main>
+  );
+};
+
+// TODO(dmaretskyi): Perhaps the association is better done with a relation.
+
+/**
+ * Foreign key {@link INITIATIVE_TRIGGER_EXTENSION_KEY} => <initative id : ObjectId>
+ */
+const INITIATIVE_TRIGGER_EXTENSION_KEY = 'dxos.org/extension/InitiativeTrigger';
+
+/**
+ * Foreign key {@link INITIATIVE_TRIGGER_EXTENSION_KEY} => <dxn string of subscription target>
+ */
+const INITIATIVE_TRIGGER_TARGET_EXTENSION_KEY = 'dxos.org/extension/InitiativeTriggerTarget';
+
+/**
+ * Syncs triggers in the database with the initiative subscriptions.
+ */
+
+const syncTriggers = async (initiative: Initiative.Initiative) => {
+  const db = Obj.getDatabase(initiative);
+  if (!db) {
+    return;
+  }
+
+  const triggers = await db
+    .query(Filter.foreignKeys(Trigger.Trigger, [{ source: INITIATIVE_TRIGGER_EXTENSION_KEY, id: initiative.id }]))
+    .run();
+
+  // Delete triggers that are not in subscriptions.
+  for (const trigger of triggers) {
+    const target = Obj.getKeys(trigger, INITIATIVE_TRIGGER_TARGET_EXTENSION_KEY).at(0)?.id;
+
+    const exists = initiative.subscriptions.find((subscription) => subscription.dxn.toString() === target);
+    if (!exists && !(initiative.useQualifyingAgent && target === Obj.getDXN(initiative)?.toString())) {
+      db.remove(trigger);
+    }
+  }
+
+  // Add triggers that are not in the database.
+  for (const subscription of initiative.subscriptions) {
+    const relevantTrigger = triggers.find((trigger) =>
+      Obj.getKeys(trigger, INITIATIVE_TRIGGER_TARGET_EXTENSION_KEY).some(
+        (key) => key.id === subscription.dxn.toString(),
+      ),
+    );
+    if (relevantTrigger) {
+      continue;
+    }
+
+    const target = await subscription.tryLoad();
+    if (!target || !target.queue || !(target.queue.dxn instanceof DXN) || target.queue.dxn.kind !== DXN.kind.QUEUE) {
+      continue;
+    }
+
+    db.add(
+      Trigger.make({
+        [Obj.Meta]: {
+          keys: [
+            { source: INITIATIVE_TRIGGER_EXTENSION_KEY, id: initiative.id },
+            { source: INITIATIVE_TRIGGER_TARGET_EXTENSION_KEY, id: subscription.dxn.toString() },
+          ],
+        },
+        enabled: true,
+        spec: {
+          kind: 'queue',
+          queue: target.queue.dxn.toString(),
+        },
+        function: Ref.make(
+          FunctionDefinition.serialize(
+            initiative.useQualifyingAgent ? InitiativeFunctions.Qualifier : InitiativeFunctions.Agent,
+          ),
+        ),
+        input: {
+          initiative: Ref.make(initiative),
+          event: '{{event}}',
+        },
+        concurrency: initiative.useQualifyingAgent ? 5 : undefined,
+      }),
+    );
+  }
+
+  if (initiative.useQualifyingAgent) {
+    const qualifierTrigger = triggers.find((trigger) =>
+      Obj.getKeys(trigger, INITIATIVE_TRIGGER_TARGET_EXTENSION_KEY).some(
+        (key) => key.id === Obj.getDXN(initiative)?.toString(),
+      ),
+    );
+    if (!qualifierTrigger && initiative.queue) {
+      db.add(
+        Trigger.make({
+          [Obj.Meta]: {
+            keys: [
+              { source: INITIATIVE_TRIGGER_EXTENSION_KEY, id: initiative.id },
+              { source: INITIATIVE_TRIGGER_TARGET_EXTENSION_KEY, id: Obj.getDXN(initiative)?.toString() ?? '' },
+            ],
+          },
+          function: Ref.make(FunctionDefinition.serialize(InitiativeFunctions.Agent)),
+          enabled: true,
+          spec: {
+            kind: 'queue',
+            queue: initiative.queue.dxn.toString(),
+          },
+          input: {
+            initiative: Ref.make(initiative),
+            event: '{{event}}',
+          },
+        }),
+      );
+    }
+  }
+
+  await db.flush({ indexes: true });
+};

package/src/components/InitiativeContainer/index.ts

@@ -0,0 +1,6 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+export { default } from './InitiativeContainer';
+export * from './InitiativeContainer';

package/src/components/PromptArticle.tsx

@@ -0,0 +1,58 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React, { useMemo } from 'react';
+
+import { type SurfaceComponentProps } from '@dxos/app-toolkit/ui';
+import { AgentFunctions } from '@dxos/assistant-toolkit';
+import { type Prompt } from '@dxos/blueprints';
+import { Obj } from '@dxos/echo';
+import { type FunctionDefinition } from '@dxos/functions';
+import { invariant } from '@dxos/invariant';
+import { invokeFunctionWithTracing, useComputeRuntimeCallback } from '@dxos/plugin-automation';
+import { Layout, Toolbar, useTranslation } from '@dxos/react-ui';
+import { useAttention } from '@dxos/react-ui-attention';
+
+import { meta } from '../meta';
+
+import { TemplateEditor } from './TemplateEditor';
+
+export type PromptArticleProps = SurfaceComponentProps<Prompt.Prompt>;
+
+export const PromptArticle = ({ role, subject }: PromptArticleProps) => {
+  const { t } = useTranslation(meta.id);
+  const { hasAttention } = useAttention(Obj.getDXN(subject).toString());
+  const db = Obj.getDatabase(subject);
+
+  const inputData = useMemo<FunctionDefinition.Input<typeof AgentFunctions.Prompt> | undefined>(
+    () =>
+      subject && db
+        ? {
+            prompt: db.makeRef(Obj.getDXN(subject)),
+            input: {},
+          }
+        : undefined,
+    [subject, db],
+  );
+
+  const handleRun = useComputeRuntimeCallback(
+    db?.spaceId,
+    () => {
+      invariant(inputData);
+      return invokeFunctionWithTracing(AgentFunctions.Prompt, inputData);
+    },
+    [inputData],
+  );
+
+  return (
+    <Layout.Main role={role} toolbar>
+      <Toolbar.Root disabled={!hasAttention} onClick={handleRun}>
+        <Toolbar.IconButton iconOnly icon='ph--play--regular' label={t('run prompt label')} onClick={handleRun} />
+      </Toolbar.Root>
+      <TemplateEditor id={subject.id} template={subject.instructions} classNames='container-max-width' />
+    </Layout.Main>
+  );
+};
+
+export default PromptArticle;

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

@@ -2,8 +2,6 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
@@ -11,26 +9,36 @@ import { createSystemPrompt } from '@dxos/assistant';
 import { Blueprint, Template } from '@dxos/blueprints';
 import { useClient } from '@dxos/react-client';
 import { withClientProvider } from '@dxos/react-client/testing';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+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 = '```';
+
 const TEMPLATE = trim`
   {{! System Prompt }}
   
-  You are a machine that is an expert chess player.
+  You are 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.
 
   {{#each artifacts}}
-  - {{this}}
+    {{this}}
   {{/each}}
 
+  Reponse in the format: <suggestion>SUGGESTION</suggestion>
+
+  @dxn:queue:data:B6INSIBY3CBEF4M5VZRYBCMAHQMPYK5AJ:01K24XMVHSZHS97SG1VTVQDM5Z:01K24XPK464FSCKVQJAB2H662M
+
   ---
 
+  ${FENCE}ts
+  const x = 100;
+  ${FENCE}
+
   {{input}}
 `;
 
@@ -49,7 +57,7 @@ const DefaultStory = ({ source }: TemplateEditorProps & { source: string }) => {
 
   return (
     <TemplateEditor
-      classNames='bg-baseSurface max-is-prose is-full'
+      classNames='bg-baseSurface is-full max-is-proseMaxWidth'
       id={blueprint.id}
       template={blueprint.instructions}
     />
@@ -61,13 +69,13 @@ const meta = {
   component: TemplateEditor as any,
   render: DefaultStory,
   decorators: [
+    withTheme(),
+    withLayout({ layout: 'column' }),
     withClientProvider({
       types: [Blueprint.Blueprint],
       createIdentity: true,
       createSpace: true,
     }),
-    withLayout({ fullscreen: true, classNames: 'justify-center bg-deckSurface' }),
-    withTheme,
   ],
   parameters: {
     translations,

package/src/components/TemplateEditor/TemplateEditor.tsx

@@ -2,31 +2,34 @@
 // Copyright 2025 DXOS.org
 //
 
+import { defaultHighlightStyle, syntaxHighlighting } from '@codemirror/language';
 import React from 'react';
 
 import { type Template } from '@dxos/blueprints';
-import { createDocAccessor } from '@dxos/react-client/echo';
+import { createDocAccessor } from '@dxos/echo-db';
 import { type ThemedClassName, useThemeContext, useTranslation } from '@dxos/react-ui';
+import { useTextEditor } from '@dxos/react-ui-editor';
 import {
   createBasicExtensions,
   createDataExtensions,
   createMarkdownExtensions,
   createThemeExtensions,
-  useTextEditor,
-} from '@dxos/react-ui-editor';
-import { mx } from '@dxos/react-ui-theme';
-import { isNotFalsy } from '@dxos/util';
+  decorateMarkdown,
+} from '@dxos/ui-editor';
+import { mx } from '@dxos/ui-theme';
+import { isNonNullable } from '@dxos/util';
 
 import { meta } from '../../meta';
 
-import { handlebars } from './handlebars-extension';
+import { handlebars, xmlDecorator } from './extensions';
 
 export type TemplateEditorProps = ThemedClassName<{
   id: string;
   template: Template.Template;
+  lineNumbers?: boolean;
 }>;
 
-export const TemplateEditor = ({ id, classNames, template }: TemplateEditorProps) => {
+export const TemplateEditor = ({ id, classNames, template, lineNumbers = true }: TemplateEditorProps) => {
   const { t } = useTranslation(meta.id);
   const { themeMode } = useThemeContext();
   const { parentRef } = useTextEditor(() => {
@@ -38,21 +41,30 @@ export const TemplateEditor = ({ id, classNames, template }: TemplateEditorProps
     return {
       initialValue: text.content ?? '',
       extensions: [
-        createDataExtensions({ id, text: createDocAccessor(text, ['content']) }),
+        createDataExtensions({
+          id,
+          text: createDocAccessor(text, ['content']),
+        }),
         createBasicExtensions({
           bracketMatching: false,
-          lineNumbers: true,
+          lineNumbers,
           lineWrapping: true,
           placeholder: t('template placeholder'),
         }),
-        createThemeExtensions({ themeMode }),
-
-        // Extend markdown with handlebars support.
+        createThemeExtensions({
+          themeMode,
+          slots: { content: { className: '!pie-4' } },
+        }),
         createMarkdownExtensions(),
+        decorateMarkdown(),
         handlebars(),
-      ].filter(isNotFalsy),
+        // xml(),
+        // NOTE: Since we're using markdown only HTML nodes are parsed.
+        xmlDecorator(),
+        syntaxHighlighting(defaultHighlightStyle),
+      ].filter(isNonNullable),
     };
-  }, [themeMode, template.source?.target]);
+  }, [themeMode, template.source?.target, lineNumbers]);
 
   return <div ref={parentRef} className={mx('bs-full overflow-hidden', classNames)} />;
 };

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

@@ -2,28 +2,27 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
 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 { useClient } from '@dxos/react-client';
 import { withClientProvider } from '@dxos/react-client/testing';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+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}},
 `;
 
@@ -40,9 +39,16 @@ const DefaultStory = () => {
     );
   });
 
+  const handleChange: TemplateChangeCallback = useCallback(
+    (mutate) => {
+      Obj.change(blueprint, (b) => mutate(b.instructions));
+    },
+    [blueprint],
+  );
+
   return (
-    <div role='none' className='flex w-[40rem] border border-separator overflow-hidden'>
-      <TemplateForm id={blueprint.id} template={blueprint.instructions} />
+    <div role='none' className='flex is-[40rem] border border-separator overflow-hidden'>
+      <TemplateForm id={blueprint.id} template={blueprint.instructions} onChange={handleChange} />
     </div>
   );
 };
@@ -52,13 +58,13 @@ const meta = {
   component: TemplateForm,
   render: DefaultStory,
   decorators: [
+    withTheme(),
+    withLayout({ layout: 'column' }),
     withClientProvider({
       types: [Blueprint.Blueprint],
       createIdentity: true,
       createSpace: true,
     }),
-    withLayout({ fullscreen: true, classNames: 'flex justify-center' }),
-    withTheme,
   ],
   parameters: {
     translations,