@dxos/plugin-assistant 0.8.4-main.74a063c4e0 → 0.8.4-main.765dc60934

package/src/containers/ChatCompanion/ChatCompanion.tsx

@@ -2,27 +2,25 @@
 // Copyright 2025 DXOS.org
 //
 
-import * as Array from 'effect/Array';
-import * as Function from 'effect/Function';
 import * as Option from 'effect/Option';
 import React, { forwardRef, useCallback, useMemo } from 'react';
 
-import { useCapabilities, useOperationInvoker } from '@dxos/app-framework/ui';
-import { AppCapabilities } from '@dxos/app-toolkit';
+import { useOperationInvoker } from '@dxos/app-framework/ui';
+import { BlueprintsAnnotation } from '@dxos/app-toolkit';
 import { type AppSurface } from '@dxos/app-toolkit/ui';
 import { Chat } from '@dxos/assistant-toolkit';
-import { Blueprint } from '@dxos/blueprints';
 import { getSpace } from '@dxos/client/echo';
+import { Blueprint } from '@dxos/compute';
 import { Filter, Obj, Ref } from '@dxos/echo';
-import { SpaceOperation } from '@dxos/plugin-space/operations';
+import { SpaceOperation } from '@dxos/plugin-space';
 import { useQuery } from '@dxos/react-client/echo';
 import { useAsyncEffect } from '@dxos/react-ui';
 
 import { type ChatEvent } from '#components';
 import { useBlueprintRegistry, useContextBinder } from '#hooks';
-import { AssistantOperation } from '#operations';
+import { AssistantOperation } from '#types';
 
-import ChatContainer from '../ChatContainer';
+import ChatArticle from '../ChatArticle';
 
 export type ChatCompanionProps = AppSurface.ArticleProps<Chat.Chat, {}, Obj.Unknown>;
 
@@ -41,7 +39,7 @@ export const ChatCompanion = forwardRef<HTMLDivElement, ChatCompanionProps>(
           return;
         }
 
-        if (event.type === 'submit' && !getSpace(chat)) {
+        if (event.type === 'submit' && !Obj.getDatabase(chat)) {
           await invokePromise(SpaceOperation.AddObject, {
             object: chat,
             target: space.db,
@@ -62,27 +60,20 @@ export const ChatCompanion = forwardRef<HTMLDivElement, ChatCompanionProps>(
       [chat, space, companionTo, invokePromise],
     );
 
-    const metadata = useCapabilities(AppCapabilities.Metadata);
-    const blueprintKeys = useMemo(
-      () =>
-        Function.pipe(
-          metadata,
-          Array.findFirst(
-            (
-              capability,
-            ): capability is {
-              id: string;
-              metadata: { blueprints?: string[] };
-            } => capability.id === Obj.getTypename(companionTo),
-          ),
-          Option.flatMap((c) => Option.fromNullable(c.metadata.blueprints)),
-          Option.getOrElse(() => [] as string[]),
-        ),
-      [metadata, companionTo],
-    );
+    const blueprintKeys = useMemo(() => {
+      const schema = companionTo ? Obj.getSchema(companionTo) : undefined;
+      if (!schema) {
+        return [] as string[];
+      }
+      return Option.getOrElse(() => [] as string[])(BlueprintsAnnotation.get(schema));
+    }, [companionTo]);
     const existingBlueprints = useQuery(space?.db, Filter.type(Blueprint.Blueprint));
     const pluginBlueprints = useMemo(
-      () => existingBlueprints.filter((blueprint) => blueprintKeys.includes(blueprint.key)),
+      () =>
+        existingBlueprints.filter((blueprint) => {
+          const key = Obj.getMeta(blueprint).key;
+          return key !== undefined && blueprintKeys.includes(key);
+        }),
       [existingBlueprints, blueprintKeys],
     );
 
@@ -95,7 +86,7 @@ export const ChatCompanion = forwardRef<HTMLDivElement, ChatCompanionProps>(
       // NOTE: This must be run instead of using the useQuery result to avoid duplicates.
       const existingBlueprints = await space.db.query(Filter.type(Blueprint.Blueprint)).run();
       for (const key of blueprintKeys) {
-        const existingBlueprint = existingBlueprints.find((blueprint) => blueprint.key === key);
+        const existingBlueprint = existingBlueprints.find((blueprint) => Obj.getMeta(blueprint).key === key);
         if (existingBlueprint) {
           continue;
         }
@@ -128,7 +119,7 @@ export const ChatCompanion = forwardRef<HTMLDivElement, ChatCompanionProps>(
     }, [binder, companionTo, blueprintKeys]);
 
     return (
-      <ChatContainer
+      <ChatArticle
         role={role ?? 'article'}
         space={space}
         subject={chat}

package/src/containers/ChatDialog/ChatDialog.tsx

@@ -13,7 +13,7 @@ import { ChatDialog as NaturalChatDialog } from '@dxos/react-ui-chat';
 import { Chat, type ChatRootProps } from '#components';
 import { useBlueprintRegistry, useChatProcessor, useChatServices, useOnline, usePresets } from '#hooks';
 import { meta } from '#meta';
-import { AssistantCapabilities } from '#types';
+import { type Assistant, AssistantCapabilities } from '#types';
 
 export type ChatDialogProps = {
   chat?: ChatTypes.Chat;
@@ -28,13 +28,7 @@ export const ChatDialog = ({ chat }: ChatDialogProps) => {
   const [online, setOnline] = useOnline();
   const { preset, ...chatProps } = usePresets(online);
   const blueprintRegistry = useBlueprintRegistry();
-  const processor = useChatProcessor({
-    chat,
-    preset,
-    runtime,
-    blueprintRegistry,
-    settings,
-  });
+  const processor = useChatProcessor({ chat, preset, runtime, blueprintRegistry, settings });
 
   // TODO(burdon): Refocus when open.
   const [open, setOpen] = useState(true);
@@ -61,7 +55,7 @@ export const ChatDialog = ({ chat }: ChatDialogProps) => {
       <NaturalChatDialog.Root open={open} expanded={expanded} onOpenChange={setOpen}>
         <NaturalChatDialog.Header title={t('assistant-dialog.title')} />
         <NaturalChatDialog.Content>
-          <Chat.Thread />
+          <Chat.Thread viewType={(chat.view as Assistant.ChatView | undefined) ?? settings.chatView} />
         </NaturalChatDialog.Content>
         <NaturalChatDialog.Footer classNames='p-1.5'>
           <Chat.Prompt {...chatProps} preset={preset?.id} online={online} onOnlineChange={setOnline} expandable />

package/src/containers/PlanArticle/PlanArticle.tsx

@@ -0,0 +1,33 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import React from 'react';
+
+import { type AppSurface } from '@dxos/app-toolkit/ui';
+import { type Plan } from '@dxos/assistant-toolkit';
+import { Panel, ScrollArea, Toolbar } from '@dxos/react-ui';
+import { useAttention } from '@dxos/react-ui-attention';
+
+import { TaskList } from '#components';
+
+export type PlanArticleProps = AppSurface.ObjectArticleProps<Plan.Plan>;
+
+export const PlanArticle = ({ role, attendableId, subject }: PlanArticleProps) => {
+  const { hasAttention } = useAttention(attendableId);
+
+  return (
+    <Panel.Root role={role} classNames='dx-document'>
+      <Panel.Toolbar asChild>
+        <Toolbar.Root disabled={!hasAttention} />
+      </Panel.Toolbar>
+      <Panel.Content asChild>
+        <ScrollArea.Root orientation='vertical'>
+          <ScrollArea.Viewport>
+            <TaskList plan={subject} />
+          </ScrollArea.Viewport>
+        </ScrollArea.Root>
+      </Panel.Content>
+    </Panel.Root>
+  );
+};

package/src/containers/PlanArticle/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+export { PlanArticle as default } from './PlanArticle';

package/src/containers/RoutineArticle/RoutineArticle.stories.tsx

@@ -0,0 +1,75 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import * as Effect from 'effect/Effect';
+import React from 'react';
+
+import { withPluginManager } from '@dxos/app-framework/testing';
+import { Routine } from '@dxos/compute';
+import { Filter } from '@dxos/echo';
+import { AutomationPlugin } from '@dxos/plugin-automation/testing';
+import { ClientPlugin } from '@dxos/plugin-client/testing';
+import { initializeIdentity } from '@dxos/plugin-client/testing';
+import { corePlugins } from '@dxos/plugin-testing';
+import { useQuery, useSpaces } from '@dxos/react-client/echo';
+import { Loading, withLayout, withTheme } from '@dxos/react-ui/testing';
+
+import { translations } from '#translations';
+
+import { AssistantPlugin } from '../../AssistantPlugin';
+import { RoutineArticle } from './RoutineArticle';
+
+const DefaultStory = () => {
+  const [space] = useSpaces();
+  const [routine] = useQuery(space?.db, Filter.type(Routine.Routine));
+  if (!routine) {
+    return <Loading />;
+  }
+
+  return <RoutineArticle role='article' subject={routine} attendableId='story' />;
+};
+
+const meta = {
+  title: 'plugins/plugin-assistant/containers/RoutineArticle',
+  render: DefaultStory,
+  decorators: [
+    withTheme(),
+    withLayout({ layout: 'column' }),
+    withPluginManager({
+      plugins: [
+        ...corePlugins(),
+        ClientPlugin({
+          types: [Routine.Routine],
+          onClientInitialized: ({ client }) =>
+            Effect.gen(function* () {
+              yield* initializeIdentity(client);
+              const [space] = client.spaces.get();
+              yield* Effect.promise(() => space.waitUntilReady());
+
+              space.db.add(
+                Routine.make({
+                  name: 'Summarize',
+                  description: 'Summarize the selected object.',
+                  instructions: 'Create a new markdown document that is a summary of the selected object.',
+                }),
+              );
+            }),
+        }),
+        AutomationPlugin(),
+        AssistantPlugin(),
+      ],
+    }),
+  ],
+  parameters: {
+    layout: 'fullscreen',
+    translations,
+  },
+} satisfies Meta<typeof DefaultStory>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};

package/src/containers/RoutineArticle/RoutineArticle.tsx

@@ -0,0 +1,109 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+
+import { type AppSurface } from '@dxos/app-toolkit/ui';
+import { AgentPrompt } from '@dxos/assistant-toolkit';
+import { type Routine } from '@dxos/compute';
+import { Operation } from '@dxos/compute';
+import { Obj } from '@dxos/echo';
+import { invariant } from '@dxos/invariant';
+import { useComputeRuntimeCallback } from '@dxos/plugin-automation/hooks';
+import { Panel, Toolbar, useTranslation } from '@dxos/react-ui';
+import { useAttention } from '@dxos/react-ui-attention';
+import { JsonHighlighter } from '@dxos/react-ui-syntax-highlighter';
+
+import { TemplateEditor } from '#components';
+import { meta } from '#meta';
+
+export type RoutineArticleProps = AppSurface.ObjectArticleProps<Routine.Routine>;
+
+type RunState =
+  | { status: 'idle' }
+  | { status: 'running' }
+  | { status: 'success'; result: unknown }
+  | { status: 'error'; error: Error };
+
+// TODO(burdon): Trigger editor.
+export const RoutineArticle = ({ role, attendableId, subject }: RoutineArticleProps) => {
+  const { t } = useTranslation(meta.id);
+  const { hasAttention } = useAttention(attendableId);
+  const invoke = usePromptHandler(subject);
+  const [state, setState] = useState<RunState>({ status: 'idle' });
+  const mountedRef = useRef(true);
+  useEffect(() => {
+    return () => {
+      mountedRef.current = false;
+    };
+  }, []);
+
+  const handleRun = useCallback(async () => {
+    setState({ status: 'running' });
+    try {
+      const result = await invoke();
+      if (mountedRef.current) {
+        setState({ status: 'success', result });
+      }
+    } catch (err) {
+      if (mountedRef.current) {
+        setState({ status: 'error', error: err instanceof Error ? err : new Error(String(err)) });
+      }
+    }
+  }, [invoke]);
+
+  return (
+    <Panel.Root role={role} className='dx-document'>
+      <Panel.Toolbar asChild>
+        <Toolbar.Root disabled={!hasAttention || state.status === 'running'}>
+          <Toolbar.IconButton
+            iconOnly
+            icon={state.status === 'running' ? 'ph--spinner-gap--regular' : 'ph--play--regular'}
+            label={t('run-prompt.label')}
+            onClick={handleRun}
+          />
+        </Toolbar.Root>
+      </Panel.Toolbar>
+      <Panel.Content classNames='flex flex-col gap-2'>
+        <TemplateEditor id={subject.id} template={subject.instructions} />
+        <RoutineResult state={state} />
+      </Panel.Content>
+    </Panel.Root>
+  );
+};
+
+const RoutineResult = ({ state }: { state: RunState }) => {
+  const { t } = useTranslation(meta.id);
+  switch (state.status) {
+    case 'idle':
+      return null;
+    case 'running':
+      return <div className='p-2 text-sm text-subdued'>{t('routine-running.label')}</div>;
+    case 'error':
+      return <div className='p-2 text-sm text-error'>{state.error.message}</div>;
+    case 'success':
+      return <JsonHighlighter classNames='p-2! text-sm' data={state.result} />;
+  }
+};
+
+const usePromptHandler = (routine: Routine.Routine) => {
+  const db = Obj.getDatabase(routine);
+  const data = useMemo<Operation.Definition.Input<typeof AgentPrompt> | undefined>(() => {
+    if (db && routine) {
+      return {
+        prompt: db.makeRef(Obj.getDXN(routine)),
+        input: {},
+      };
+    }
+  }, [routine, db]);
+
+  return useComputeRuntimeCallback(
+    db?.spaceId,
+    () => {
+      invariant(data);
+      return Operation.invoke(AgentPrompt, data);
+    },
+    [data],
+  );
+};

package/src/containers/RoutineArticle/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { RoutineArticle as default } from './RoutineArticle';

package/src/containers/{PromptList/PromptList.stories.tsx → RoutineList/RoutineList.stories.tsx}

@@ -8,11 +8,11 @@ import React from 'react';
 
 import { SERVICES_CONFIG } from '@dxos/ai/testing';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { Prompt } from '@dxos/blueprints';
+import { Routine } from '@dxos/compute';
 import { Filter } from '@dxos/echo';
-import { AutomationPlugin } from '@dxos/plugin-automation';
-import { ClientPlugin } from '@dxos/plugin-client';
-import { Markdown } from '@dxos/plugin-markdown/types';
+import { AutomationPlugin } from '@dxos/plugin-automation/testing';
+import { ClientPlugin } from '@dxos/plugin-client/testing';
+import { Markdown } from '@dxos/plugin-markdown';
 import { corePlugins } from '@dxos/plugin-testing';
 import { Config } from '@dxos/react-client';
 import { useQuery, useSpaces } from '@dxos/react-client/echo';
@@ -20,10 +20,11 @@ import { Panel } from '@dxos/react-ui';
 import { Loading, withLayout } from '@dxos/react-ui/testing';
 import { Organization } from '@dxos/types';
 
+import { translations } from '#translations';
+
 import { AssistantPlugin } from '../../AssistantPlugin';
-import { translations } from '../../translations';
 import { TracePanel } from '../TracePanel';
-import { PromptList } from './PromptList';
+import { RoutineList } from './RoutineList';
 
 // TODO(burdon): Factor out (see assistant-stories)
 export const config = {
@@ -60,17 +61,17 @@ const DefaultStory = () => {
   return (
     <Panel.Root>
       <Panel.Toolbar className='flex p-1 items-center'>
-        <PromptList subject={subject} role='toolbar-input' />
+        <RoutineList subject={subject} role='toolbar-input' attendableId='story' />
       </Panel.Toolbar>
       <Panel.Content>
-        <TracePanel space={space} />
+        <TracePanel role='article' space={space} attendableId={space.id} />
       </Panel.Content>
     </Panel.Root>
   );
 };
 
 const meta = {
-  title: 'plugins/plugin-assistant/containers/PromptList',
+  title: 'plugins/plugin-assistant/containers/RoutineList',
   render: DefaultStory,
   decorators: [
     withLayout({ layout: 'column' }),
@@ -78,7 +79,7 @@ const meta = {
       plugins: [
         ...corePlugins(),
         ClientPlugin({
-          types: [Prompt.Prompt, Organization.Organization, Markdown.Document],
+          types: [Routine.Routine, Organization.Organization, Markdown.Document],
           config: config.remote,
           onClientInitialized: ({ client }) =>
             Effect.gen(function* () {
@@ -91,19 +92,19 @@ const meta = {
                 }),
               );
               space.db.add(
-                Prompt.make({
+                Routine.make({
                   name: 'Summarize',
                   instructions: 'Create a new markdown document that is a summary of the selected object.',
                 }),
               );
               space.db.add(
-                Prompt.make({
+                Routine.make({
                   name: 'Analyze',
                   instructions: 'Analyze the selected content.',
                 }),
               );
               space.db.add(
-                Prompt.make({
+                Routine.make({
                   name: 'Translate',
                   instructions: 'Translate the selected content to Spanish.',
                 }),

package/src/containers/{PromptList/PromptList.tsx → RoutineList/RoutineList.tsx}

@@ -6,26 +6,27 @@ import React from 'react';
 
 import { useOperationInvoker } from '@dxos/app-framework/ui';
 import { type AppSurface } from '@dxos/app-toolkit/ui';
-import { DatabaseBlueprint, MarkdownBlueprint, WebSearchBlueprint } from '@dxos/assistant-toolkit';
-import { Prompt } from '@dxos/blueprints';
+import { DatabaseBlueprint, WebSearchBlueprint } from '@dxos/assistant-toolkit';
+import { Routine } from '@dxos/compute';
 import { Filter, Obj, Ref } from '@dxos/echo';
+import { MarkdownBlueprint } from '@dxos/plugin-markdown';
 import { useQuery } from '@dxos/react-client/echo';
 import { IconButton } from '@dxos/react-ui';
 
-import { AssistantOperation } from '#operations';
+import { AssistantOperation } from '#types';
 
-export type PromptListProps = AppSurface.ObjectSectionProps<Obj.Unknown>;
+export type RoutineListProps = AppSurface.ObjectSectionProps<Obj.Unknown>;
 
-export const PromptList = ({ subject }: PromptListProps) => {
+export const RoutineList = ({ subject }: RoutineListProps) => {
   const { invokePromise } = useOperationInvoker();
   const db = Obj.getDatabase(subject);
-  const prompts = useQuery(db, Filter.type(Prompt.Prompt));
+  const prompts = useQuery(db, Filter.type(Routine.Routine));
   if (!db) {
     return null;
   }
 
   return (
-    <div role='none' className='flex gap-2'>
+    <div className='flex gap-2'>
       {prompts.map((prompt, i) => (
         <div key={i}>
           <IconButton

package/src/containers/RoutineList/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { RoutineList as default } from './RoutineList';