@dxos/plugin-assistant 0.8.3 → 0.8.4-main.5acf9ea

package/src/components/{Thread/ToolInvocations.tsx → ChatThread/ToolBlock.tsx}

@@ -4,17 +4,16 @@
 
 import React, { type FC, useEffect, useMemo, useRef, useState } from 'react';
 
-import { type AgentStatus, type Message, type Tool } from '@dxos/ai';
+import { type AgentStatus, type Tool } from '@dxos/ai';
 import { log } from '@dxos/log';
 import { type ThemedClassName } from '@dxos/react-ui';
 import { NumericTabs, StatusRoll, ToggleContainer } from '@dxos/react-ui-components';
-import { Json } from '@dxos/react-ui-syntax-highlighter';
+import { type JsonProps, Json as NativeJson } from '@dxos/react-ui-syntax-highlighter';
+import { type DataType } from '@dxos/schema';
 import { isNonNullable, isNotFalsy } from '@dxos/util';
 
-import { type ThreadMessageProps } from './ThreadMessage';
-
-export const isToolMessage = (message: Message) => {
-  return message.content.some((block) => block.type === 'tool_use' || block.type === 'tool_result');
+export const isToolMessage = (message: DataType.Message) => {
+  return message.blocks.some((block) => block._tag === 'toolCall' || block._tag === 'toolResult');
 };
 
 const getToolName = (tool: Tool) => {
@@ -29,38 +28,50 @@ const getToolCaption = (tool: Tool | undefined, status: AgentStatus | undefined)
   return status?.message ?? tool.caption ?? `Calling ${getToolName(tool)}...`;
 };
 
-export const ToolBlock: FC<ThemedClassName<ThreadMessageProps>> = ({ classNames, message, tools }) => {
-  const { content = [] } = message;
+export type ToolBlockProps = ThemedClassName<{
+  message: DataType.Message;
+  tools?: Tool[];
+}>;
+
+export const ToolBlock: FC<ToolBlockProps> = ({ classNames, message, tools }) => {
+  const { blocks = [] } = message;
 
   let request: { tool: Tool | undefined; block: any } | undefined;
-  const blocks = content.filter((block) => block.type === 'tool_use' || block.type === 'tool_result');
-  const items = blocks
+  const toolBlocks = blocks.filter((block) => block._tag === 'toolCall' || block._tag === 'toolResult');
+  const items = toolBlocks
     .map((block) => {
-      switch (block.type) {
-        case 'tool_use': {
+      switch (block._tag) {
+        case 'toolCall': {
           // TODO(burdon): Skip these updates?
-          if (block.pending && request?.block.id === block.id) {
+          if (block.pending && request?.block.toolCallId === block.toolCallId) {
             return null;
           }
 
-          log.info('tool_use', { tool: request?.tool, status: block.currentStatus });
-
           request = { tool: tools?.find((tool) => tool.name === block.name), block };
-          return { title: getToolCaption(request.tool, block.currentStatus), block };
+          return {
+            title: getToolCaption(request.tool, undefined), // block.status), // TODO(burdon): Get status?
+            block,
+          };
         }
 
-        case 'tool_result': {
+        case 'toolResult': {
           if (!request) {
             log.warn('unexpected message', { block });
             return { title: 'Error', block };
           }
 
-          return { title: `${getToolCaption(request.tool, undefined)} (Success)`, block };
+          return {
+            title: `${getToolCaption(request.tool, undefined)} (Success)`,
+            block,
+          };
         }
 
         default: {
           request = undefined;
-          return { title: 'Error', block };
+          return {
+            title: 'Error',
+            block,
+          };
         }
       }
     })
@@ -97,10 +108,14 @@ export const ToolContainer: FC<ThemedClassName<{ items: { title: string; block:
 
   return (
     <ToggleContainer classNames={['flex flex-col', classNames]} title={title} open={open} onChangeOpen={setOpen}>
-      <div className='grid grid-cols-[32px_1fr]'>
+      <div className='w-full grid grid-cols-[32px_1fr]'>
         <NumericTabs ref={tabsRef} length={items.length} selected={selected} onSelect={handleSelect} />
-        <Json data={items[selected].block} classNames='!p-1 text-xs' />
+        <Json data={items[selected].block} />
       </div>
     </ToggleContainer>
   );
 };
+
+export const Json = ({ data }: Pick<JsonProps, 'data'>) => (
+  <NativeJson data={data} classNames='!p-1 text-xs bg-transparent' />
+);

package/src/{experimental/transcription → components/ChatThread}/index.ts

@@ -1,3 +1,5 @@
 //
 // Copyright 2025 DXOS.org
 //
+
+export * from './ChatThread';

package/src/components/{Thread → ChatThread}/reducer.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Message } from '@dxos/ai';
+import { type DataType } from '@dxos/schema';
 
 // TODO(burdon): Move to util?
 type Reducer<R, I> = (acc: R, value: I) => R;
@@ -11,24 +11,24 @@ type Reducer<R, I> = (acc: R, value: I) => R;
  * Reducer that collapses related message blocks into single messages.
  * For example, combines tool request/response pairs into a single message.
  */
-export const messageReducer: Reducer<{ messages: Message[]; current?: Message }, Message> = (
+export const messageReducer: Reducer<{ messages: DataType.Message[]; current?: DataType.Message }, DataType.Message> = (
   { current, messages },
   message,
 ) => {
   let i = 0;
-  for (const block of message.content) {
-    switch (block.type) {
-      case 'tool_use':
-      case 'tool_result': {
+  for (const block of message.blocks) {
+    switch (block._tag) {
+      case 'toolCall':
+      case 'toolResult': {
         if (current) {
-          current.content.push(block);
+          current.blocks.push(block);
         } else {
           current = {
+            ...message,
             id: [message.id, i].join('_'),
-            role: message.role,
-            content: [block],
-          } as any;
-          messages.push(current as any);
+            blocks: [block],
+          };
+          messages.push(current);
         }
         break;
       }
@@ -37,10 +37,10 @@ export const messageReducer: Reducer<{ messages: Message[]; current?: Message },
       default: {
         current = undefined;
         messages.push({
+          ...message,
           id: [message.id, i].join('_'),
-          role: message.role,
-          content: [block],
-        } as any);
+          blocks: [block],
+        });
         break;
       }
     }

package/src/components/PromptSettings.tsx

@@ -2,63 +2,61 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Match, type Schema } from 'effect';
-import React, { type ChangeEvent, useCallback } from 'react';
+import React from 'react';
 
-import { debounce } from '@dxos/async';
-import { Input, Select, Toolbar, useTranslation } from '@dxos/react-ui';
+import { type Template } from '@dxos/blueprints';
+import { Toolbar, useTranslation } from '@dxos/react-ui';
 
-import { ASSISTANT_PLUGIN } from '../meta';
-import { TemplateKinds, type TemplateType, type TemplateKindSchema } from '../types';
+import { meta } from '../meta';
 
-export const PromptSettings = ({ template }: { template: TemplateType }) => {
-  const { t } = useTranslation(ASSISTANT_PLUGIN);
+export const PromptSettings = ({ template }: { template: Template.Template }) => {
+  const { t } = useTranslation(meta.id);
 
-  const handleKindChange = useCallback(
-    (value: string) => {
-      const kind = Match.type<string>().pipe(
-        Match.withReturnType<Schema.Schema.Type<typeof TemplateKindSchema>>(),
-        Match.when('always', () => ({ include: 'always' })),
-        Match.when('schema-matching', () => ({ include: 'schema-matching', typename: '' })),
-        Match.when('automatically', () => ({ include: 'automatically', description: '' })),
-        Match.orElse(() => ({ include: 'manual' })),
-      )(value);
+  // const handleKindChange = useCallback(
+  //   (value: string) => {
+  //     const kind = Match.type<string>().pipe(
+  //       Match.withReturnType<Schema.Schema.Type<typeof Template.Template>>(),
+  //       Match.when('always', () => ({ include: 'always' })),
+  //       Match.when('schema-matching', () => ({ include: 'schema-matching', typename: '' })),
+  //       Match.when('automatically', () => ({ include: 'automatically', description: '' })),
+  //       Match.orElse(() => ({ include: 'manual' })),
+  //     )(value);
+  //
+  //     template.kind = kind;
+  //   },
+  //   [template],
+  // );
 
-      template.kind = kind;
-    },
-    [template],
-  );
-
-  const handleTypenameChange = useCallback(
-    debounce((event: ChangeEvent<HTMLInputElement>) => {
-      if (template.kind.include === 'schema-matching') {
-        template.kind.typename = event.target.value;
-      }
-    }, 300),
-    [template.kind.include],
-  );
+  // const handleTypenameChange = useCallback(
+  //   debounce((event: ChangeEvent<HTMLInputElement>) => {
+  //     if (template.kind.include === 'schema-matching') {
+  //       template.kind.typename = event.target.value;
+  //     }
+  //   }, 300),
+  //   [template.kind.include],
+  // );
 
-  const handleDescriptionChange = useCallback(
-    debounce((event: ChangeEvent<HTMLInputElement>) => {
-      if (template.kind.include === 'automatically') {
-        template.kind.description = event.target.value;
-      }
-    }, 300),
-    [template.kind.include],
-  );
+  // const handleDescriptionChange = useCallback(
+  //   debounce((event: ChangeEvent<HTMLInputElement>) => {
+  //     if (template.kind.include === 'automatically') {
+  //       template.kind.description = event.target.value;
+  //     }
+  //   }, 300),
+  //   [template.kind.include],
+  // );
 
   return (
     <div className='flex flex-col gap-4'>
       <h2>{t('prompt rules label')}</h2>
       <Toolbar.Root>
-        <Select.Root value={template.kind.include} onValueChange={handleKindChange}>
+        {/* <Select.Root value={template.kind.include} onValueChange={handleKindChange}>
           <Toolbar.Button asChild>
             <Select.TriggerButton />
           </Toolbar.Button>
           <Select.Portal>
             <Select.Content>
               <Select.Viewport>
-                {TemplateKinds.map((kind) => (
+                {Template.Kinds.map((kind) => (
                   <Select.Option key={kind} value={kind}>
                     {kind}
                   </Select.Option>
@@ -66,8 +64,8 @@ export const PromptSettings = ({ template }: { template: TemplateType }) => {
               </Select.Viewport>
             </Select.Content>
           </Select.Portal>
-        </Select.Root>
-        {template.kind.include === 'schema-matching' && (
+        </Select.Root> */}
+        {/* {template.kind.include === 'schema-matching' && (
           <Input.Root>
             <Input.TextInput
               placeholder={t('typename placeholder')}
@@ -75,8 +73,8 @@ export const PromptSettings = ({ template }: { template: TemplateType }) => {
               onChange={handleTypenameChange}
             />
           </Input.Root>
-        )}
-        {template.kind.include === 'automatically' && (
+        )} */}
+        {/* {template.kind.include === 'automatically' && (
           <Input.Root>
             <Input.TextInput
               placeholder={t('description placeholder')}
@@ -84,7 +82,7 @@ export const PromptSettings = ({ template }: { template: TemplateType }) => {
               onChange={handleDescriptionChange}
             />
           </Input.Root>
-        )}
+        )} */}
       </Toolbar.Root>
     </div>
   );

package/src/components/SequenceContainer.tsx

@@ -0,0 +1,132 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type EditorView } from '@codemirror/view';
+import JSON5 from 'json5';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+
+import { ToolRegistry } from '@dxos/ai';
+import { getSpace } from '@dxos/client/echo';
+import { type Sequence, type SequenceDefinition } from '@dxos/conductor';
+import { Key } from '@dxos/echo';
+import { Toolbar, useTranslation } from '@dxos/react-ui';
+import { useSelectionManager } from '@dxos/react-ui-attention';
+import { StackItem } from '@dxos/react-ui-stack';
+
+import { SequenceEditor } from './SequenceEditor';
+import { meta } from '../meta';
+
+// TODO(burdon): Move to config.
+export const EXA_API_KEY = '9c7e17ff-0c85-4cd5-827a-8b489f139e03';
+
+// TODO(burdon): Validate.
+const parseSequence = (text: string): SequenceDefinition | undefined => {
+  try {
+    const json = JSON5.parse(text);
+    const { steps } = json;
+    return { steps };
+  } catch (error) {
+    // Ignore.
+  }
+};
+
+export const SequenceContainer = ({ sequence }: { sequence: Sequence }) => {
+  const { t } = useTranslation(meta.id);
+  const selectionManager = useSelectionManager();
+  const [definition, setDefinition] = useState<SequenceDefinition>();
+  useEffect(() => {
+    setDefinition({
+      steps: sequence.steps.map(({ instructions, tools }) => ({ instructions, tools })),
+    });
+  }, [sequence]);
+
+  const editorRef = useRef<EditorView | undefined>(undefined);
+
+  // TODO(burdon): Factor out.
+  const toolRegistry = useMemo(() => {
+    const space = getSpace(sequence);
+    if (!space) {
+      return;
+    }
+
+    // TODO(burdon): How should the queue be created?
+    // eslint-disable-next-line no-unused-vars
+    const _queue = space.queues.create();
+
+    return new ToolRegistry([
+      // createExaTool({ apiKey: EXA_API_KEY }),
+      // createLocalSearchTool(space.db, queue),
+      // createGraphWriterTool({
+      //   db: space.db,
+      //   queue,
+      //   schema: [], // TODO(burdon): Get schema from client/sequence?
+      //   onDone: async (objects) => {
+      //     await queue.append(objects);
+      //   },
+      // }),
+    ]);
+  }, [sequence]);
+
+  const formatAndSave = useCallback((): SequenceDefinition | undefined => {
+    if (!sequence) {
+      return;
+    }
+
+    const text = editorRef.current?.state.doc.toString();
+    if (!text) {
+      return;
+    }
+
+    const definition = parseSequence(text);
+    if (!definition) {
+      return;
+    }
+
+    setDefinition(definition);
+    const formatted = JSON.stringify(definition, null, 2);
+    editorRef.current?.dispatch({
+      changes: { from: 0, to: text.length, insert: formatted },
+    });
+
+    sequence.steps.length = 0;
+    for (const step of definition.steps) {
+      sequence.steps.push({
+        id: Key.ObjectId.random(),
+        instructions: step.instructions,
+        tools: step.tools,
+      });
+    }
+
+    return sequence;
+  }, [sequence]);
+
+  // TODO(burdon): Save raw sequence separately from parsed sequence? (like Script).
+  const handleSave = useCallback(() => formatAndSave(), [formatAndSave]);
+
+  const handleRun = useCallback(async () => {
+    // if (!aiClient?.value || !toolRegistry) {
+    //   return;
+    // }
+    // formatAndSave();
+    // // Get input from selection.
+    // const input = Array.from(getSelectionSet(selectionManager)).map((id) => DXN.fromLocalObjectId(id));
+    // if (!input.length) {
+    //   return;
+    // }
+    // const machine = new SequenceMachine(toolRegistry, sequence).setLogger(new QueueLogger(sequence));
+    // await machine.runToCompletion({ aiClient: aiClient.value, input });
+  }, [sequence, formatAndSave, selectionManager, toolRegistry]);
+
+  return (
+    <StackItem.Content toolbar>
+      <Toolbar.Root>
+        <Toolbar.Button onClick={handleSave}>{t('button save')}</Toolbar.Button>
+        <Toolbar.Button onClick={handleRun}>{t('button run')}</Toolbar.Button>
+      </Toolbar.Root>
+      {definition && <SequenceEditor ref={editorRef} sequence={definition} />}
+    </StackItem.Content>
+  );
+};
+
+export default SequenceContainer;

package/src/components/SequenceEditor/SequenceEditor.stories.tsx

@@ -0,0 +1,32 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import '@dxos-theme';
+
+import { type StoryObj, type Meta } from '@storybook/react-vite';
+
+import { withLayout, withTheme } from '@dxos/storybook-utils';
+
+import { SequenceEditor } from './SequenceEditor';
+import { RESEARCH_SEQUENCE_DEFINITION } from '../../testing';
+import { translations } from '../../translations';
+
+const meta: Meta<typeof SequenceEditor> = {
+  title: 'plugins/plugin-assistant/SequenceEditor',
+  component: SequenceEditor,
+  decorators: [withTheme, withLayout({ fullscreen: true, classNames: 'mli-auto max-is-[50rem] justify-center' })],
+  parameters: {
+    translations,
+  },
+};
+
+export default meta;
+
+type Story = StoryObj<typeof SequenceEditor>;
+
+export const Default: Story = {
+  args: {
+    sequence: RESEARCH_SEQUENCE_DEFINITION,
+  },
+};

package/src/components/{BlueprintEditor/BlueprintEditor.tsx → SequenceEditor/SequenceEditor.tsx}

@@ -4,7 +4,7 @@
 
 import React, { forwardRef, useImperativeHandle } from 'react';
 
-import { BlueprintDefinition } from '@dxos/assistant';
+import { SequenceDefinition } from '@dxos/conductor';
 import { Type } from '@dxos/echo';
 import { useThemeContext, type ThemedClassName } from '@dxos/react-ui';
 import {
@@ -16,16 +16,16 @@ import {
 } from '@dxos/react-ui-editor';
 import { mx } from '@dxos/react-ui-theme';
 
-export type BlueprintEditorProps = ThemedClassName<{
-  blueprint: BlueprintDefinition;
+export type SequenceEditorProps = ThemedClassName<{
+  sequence: SequenceDefinition;
 }>;
 
 // TODO(burdon): Factor out JsonEditor.
-export const BlueprintEditor = forwardRef<EditorView | undefined, BlueprintEditorProps>(
-  ({ classNames, blueprint }, forwardedRef) => {
+export const SequenceEditor = forwardRef<EditorView | undefined, SequenceEditorProps>(
+  ({ classNames, sequence }, forwardedRef) => {
     const { themeMode } = useThemeContext();
     const { parentRef, view } = useTextEditor({
-      initialValue: JSON.stringify(blueprint, null, 2),
+      initialValue: JSON.stringify(sequence, null, 2),
       extensions: [
         createBasicExtensions({
           lineNumbers: true,
@@ -38,7 +38,7 @@ export const BlueprintEditor = forwardRef<EditorView | undefined, BlueprintEdito
           syntaxHighlighting: true,
         }),
         createJsonExtensions({
-          schema: Type.toJsonSchema(BlueprintDefinition, { strict: true }),
+          schema: Type.toJsonSchema(SequenceDefinition, { strict: true }),
         }),
       ],
     });

package/src/components/{AmbientDialog → SequenceEditor}/index.ts

@@ -2,4 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './AmbientDialog';
+export * from './SequenceEditor';

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

@@ -4,48 +4,43 @@
 
 import '@dxos-theme';
 
-import { type Meta } from '@storybook/react';
+import { type Meta } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
-import { createSystemPrompt } from '@dxos/artifact';
-import { Obj } from '@dxos/echo';
+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 { ColumnContainer, withLayout, withTheme } from '@dxos/storybook-utils';
+import { trim } from '@dxos/util';
 
 import { TemplateEditor, type TemplateEditorProps } from './TemplateEditor';
-import translations from '../../translations';
-import { TemplateType } from '../../types';
+import { translations } from '../../translations';
 
-const TEMPLATE = [
-  '{{! System Prompt }}',
-  '',
-  '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.',
-  '',
-  '{{#each artifacts}}',
-  '- {{this}}',
-  '{{/each}}',
-  '',
-  '---',
-  '',
-  '{{input}}',
-  '',
-].join('\n');
+const TEMPLATE = trim`
+  {{! System Prompt }}
+  
+  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.
 
-const DefaultStory = ({ text }: TemplateEditorProps & { text: string }) => {
+  {{#each artifacts}}
+  - {{this}}
+  {{/each}}
+
+  ---
+
+  {{input}}
+`;
+
+const DefaultStory = ({ source }: TemplateEditorProps & { source: string }) => {
   const client = useClient();
-  const [template] = useState(() => {
+  const [blueprint] = useState(() => {
     const space = client.spaces.default;
-    return space.db.add(Obj.make(TemplateType, { source: text, kind: { include: 'manual' } }));
+    return space.db.add(Blueprint.make({ name: 'Test', instructions: { source } }));
   });
 
-  return (
-    <div role='none' className='flex w-[50rem] overflow-hidden border-x border-separator'>
-      <TemplateEditor template={template} />
-    </div>
-  );
+  return <TemplateEditor id={blueprint.id} template={blueprint.instructions} />;
 };
 
 const meta: Meta<typeof DefaultStory> = {
@@ -56,9 +51,9 @@ const meta: Meta<typeof DefaultStory> = {
     withClientProvider({
       createIdentity: true,
       createSpace: true,
-      types: [TemplateType],
+      types: [Template.Template],
     }),
-    withLayout({ fullscreen: true, classNames: 'flex justify-center' }),
+    withLayout({ fullscreen: true, Container: ColumnContainer }),
     withTheme,
   ],
   parameters: {
@@ -72,12 +67,12 @@ type Story = Meta<typeof DefaultStory>;
 
 export const Default: Story = {
   args: {
-    text: TEMPLATE,
+    source: TEMPLATE,
   },
 };
 
 export const System: Story = {
   args: {
-    text: createSystemPrompt(),
+    source: createSystemPrompt({}),
   },
 };