@dxos/plugin-assistant 0.8.4-main.ead640a → 0.8.4-main.effb148878

package/src/components/ChatThread/reducers.ts

@@ -1,151 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { type ContentBlock, type DataType } from '@dxos/schema';
-
-type Reducer<R, I> = (acc: R, value: I, idx: number) => R;
-
-/**
- * Reducer that collapses related message blocks into single messages.
- * For example, combines tool request/response pairs into a single message.
- *
- * Typical order:
- * - message 0
- *  - text
- * - message 1
- *  - text
- *  - toolCall
- *  - summary
- * - message 2
- *  - toolResult
- * - message 3
- *  - text
- *  - summary
- *
- * Coverts to:
- * - message 0
- *  - text
- * - message 1
- *  - text
- * - message 2
- *  - toolCall
- *  - toolResult
- *  - summary
- * - message 3
- *  - text
- *  - summary
- */
-export const reduceMessages: Reducer<
-  {
-    messages: DataType.Message[];
-    current?: DataType.Message;
-    toolBlock?: boolean;
-    assistantMessages?: DataType.Message[];
-  },
-  DataType.Message
-> = ({ messages, current, toolBlock, assistantMessages = [] }, message) => {
-  // Treat tool calls as assistant messages.
-  let assistant = message?.sender.role === 'assistant';
-  let i = 0;
-  for (const block of message.blocks) {
-    switch (block._tag) {
-      // TODO(burdon): Preserve call tool title.
-      case 'toolCall': {
-        assistant = true;
-        if (!toolBlock) {
-          current = {
-            ...message,
-            id: [message.id, i++].join('_'),
-            blocks: [block],
-          };
-          messages.push(current);
-          toolBlock = true;
-        } else {
-          current!.blocks.push(block);
-        }
-        break;
-      }
-
-      case 'toolResult': {
-        assistant = true;
-        if (toolBlock) {
-          current!.blocks.push(block);
-        }
-        break;
-      }
-
-      case 'summary': {
-        assistant = true;
-        if (toolBlock) {
-          current!.blocks.push(block);
-        } else {
-          const summary = reduceSummary([...assistantMessages, message]);
-          current!.blocks.push(summary);
-        }
-        break;
-      }
-
-      default: {
-        assistant = message.sender.role === 'assistant';
-        current = {
-          ...message,
-          id: [message.id, i++].join('_'),
-          blocks: [block],
-        };
-        messages.push(current);
-        toolBlock = false;
-        break;
-      }
-    }
-  }
-
-  return {
-    messages,
-    current,
-    toolBlock,
-    assistantMessages: assistant ? [...assistantMessages, message] : undefined,
-  };
-};
-
-/**
- * Accumulate token counts from all summary blocks in pending messages.
- */
-const reduceSummary = (messages: DataType.Message[]): ContentBlock.Summary => {
-  let start: number | undefined;
-  return messages.reduce<ContentBlock.Summary>(
-    (acc, msg) => {
-      const time = new Date(msg.created).getTime();
-      if (!start) {
-        start = time;
-      }
-      msg.blocks.forEach((block) => {
-        switch (block._tag) {
-          case 'toolCall': {
-            acc.toolCalls = (acc.toolCalls ?? 0) + 1;
-            break;
-          }
-          case 'summary': {
-            acc.model = block.model;
-            if (block.usage) {
-              acc.message = block.message;
-              acc.usage = {
-                inputTokens: (acc.usage?.inputTokens ?? 0) + (block.usage.inputTokens ?? 0),
-                outputTokens: (acc.usage?.outputTokens ?? 0) + (block.usage.outputTokens ?? 0),
-                totalTokens: (acc.usage?.totalTokens ?? 0) + (block.usage.totalTokens ?? 0),
-              };
-              acc.duration = time - (start ?? time);
-            }
-            break;
-          }
-        }
-      });
-
-      return acc;
-    },
-    {
-      _tag: 'summary',
-      duration: 0,
-    } satisfies ContentBlock.Summary,
-  );
-};

package/src/components/SequenceContainer.tsx

@@ -1,131 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { type EditorView } from '@codemirror/view';
-import JSON5 from 'json5';
-import React, { useCallback, useEffect, useRef, useState } from 'react';
-
-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 { meta } from '../meta';
-
-import { SequenceEditor } from './SequenceEditor';
-
-// 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 {
-    // 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>(null);
-
-  // 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]);
-
-  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

@@ -1,34 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { type Meta, type StoryObj } from '@storybook/react-vite';
-import React from 'react';
-
-import { withLayout, withTheme } from '@dxos/react-ui/testing';
-
-import { RESEARCH_SEQUENCE_DEFINITION } from '../../testing';
-import { translations } from '../../translations';
-
-import { SequenceEditor } from './SequenceEditor';
-
-const meta = {
-  title: 'plugins/plugin-assistant/SequenceEditor',
-  component: SequenceEditor,
-  // TODO(wittjosiah): Fix story.
-  render: () => <>TODO</>,
-  decorators: [withTheme, withLayout({ container: 'column' })],
-  parameters: {
-    translations,
-  },
-} satisfies Meta<typeof SequenceEditor>;
-
-export default meta;
-
-type Story = StoryObj<typeof SequenceEditor>;
-
-export const Default: Story = {
-  args: {
-    sequence: RESEARCH_SEQUENCE_DEFINITION,
-  },
-};

package/src/components/SequenceEditor/SequenceEditor.tsx

@@ -1,50 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import React, { forwardRef, useImperativeHandle } from 'react';
-
-import { SequenceDefinition } from '@dxos/conductor';
-import { Type } from '@dxos/echo';
-import { type ThemedClassName, useThemeContext } from '@dxos/react-ui';
-import {
-  type EditorView,
-  createBasicExtensions,
-  createJsonExtensions,
-  createThemeExtensions,
-  useTextEditor,
-} from '@dxos/react-ui-editor';
-import { mx } from '@dxos/react-ui-theme';
-
-export type SequenceEditorProps = ThemedClassName<{
-  sequence: SequenceDefinition;
-}>;
-
-// TODO(burdon): Factor out JsonEditor.
-export const SequenceEditor = forwardRef<EditorView | null, SequenceEditorProps>(
-  ({ classNames, sequence }, forwardedRef) => {
-    const { themeMode } = useThemeContext();
-    const { parentRef, view } = useTextEditor({
-      initialValue: JSON.stringify(sequence, null, 2),
-      extensions: [
-        createBasicExtensions({
-          lineNumbers: true,
-          lineWrapping: false,
-          monospace: true,
-          scrollPastEnd: true,
-        }),
-        createThemeExtensions({
-          themeMode,
-          syntaxHighlighting: true,
-        }),
-        createJsonExtensions({
-          schema: Type.toJsonSchema(SequenceDefinition, { strict: true }),
-        }),
-      ],
-    });
-
-    useImperativeHandle<EditorView | null, EditorView | null>(forwardedRef, () => view, [view]);
-
-    return <div ref={parentRef} className={mx('overflow-hidden', classNames)} />;
-  },
-);

package/src/components/SequenceEditor/index.ts

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

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

@@ -1,165 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import {
-  type CompletionContext,
-  type CompletionResult,
-  autocompletion,
-  completionKeymap,
-} from '@codemirror/autocomplete';
-import { type Extension } from '@codemirror/state';
-import { Decoration, type DecorationSet, type EditorView, ViewPlugin, type ViewUpdate, keymap } from '@codemirror/view';
-
-export type HandlebarsOptions = {};
-
-/**
- * Simple Handlebars plugin for CodeMirror.
- * Supports:
- * - Comments: {{! comment }}
- * - Commands: {{#command}} {{/command}}
- * - Variables: {{var}}
- * - Commands with variables: {{#each items}} {{/each}}
- */
-export const handlebars = (_: HandlebarsOptions = {}): Extension => {
-  return [
-    handlebarsHighlightPlugin,
-    autocompletion({
-      activateOnTyping: true,
-      aboveCursor: true,
-      closeOnBlur: true,
-      override: [handlebarsCompletions],
-    }),
-    keymap.of(completionKeymap),
-  ];
-};
-
-const regex = {
-  comment: /\{\{!\s*[^}]*\}\}/g,
-  brackets: /\{\{[^}]*\}\}/g,
-  command: /\{\{[#/]([^}]+)\}\}/g,
-  var: /\{\{(?!\s*!)(\w[^}]*)\}\}/g,
-};
-
-/**
- * ViewPlugin that decorates Handlebars syntax.
- */
-const handlebarsHighlightPlugin = ViewPlugin.fromClass(
-  class {
-    decorations: DecorationSet;
-
-    constructor(view: EditorView) {
-      this.decorations = this.buildDecorations(view);
-    }
-
-    buildDecorations(view: EditorView) {
-      const widgets: any[] = [];
-
-      for (const { from, to } of view.visibleRanges) {
-        const text = view.state.doc.sliceString(from, to);
-
-        // Match comments: {{! comment }}
-        {
-          let match;
-          while ((match = regex.comment.exec(text)) !== null) {
-            const start = from + match.index;
-            const end = start + match[0].length;
-            widgets.push(Decoration.mark({ class: 'text-subdued' }).range(start, end));
-          }
-        }
-
-        // Match brackets: {{ and }}
-        {
-          let match;
-          while ((match = regex.brackets.exec(text)) !== null) {
-            const start = from + match.index;
-            const end = start + match[0].length;
-            widgets.push(Decoration.mark({ class: 'text-subdued' }).range(start, end));
-          }
-        }
-
-        // Match commands: {{#command}} and {{/command}}
-        {
-          let match;
-          while ((match = regex.command.exec(text)) !== null) {
-            const start = from + match.index + 2;
-            let end = start + match[0].length - 4;
-            const text = view.state.doc.sliceString(start, end);
-            const parts = text.split(/\s+/);
-            if (parts.length > 1) {
-              const idx = start + parts[0].length;
-              widgets.push(Decoration.mark({ class: 'text-greenText' }).range(idx, end));
-              end = idx;
-            }
-            widgets.push(Decoration.mark({ class: 'text-blueText' }).range(start, end));
-          }
-        }
-
-        // Match variables: {{var}}
-        {
-          let match;
-          while ((match = regex.var.exec(text)) !== null) {
-            const start = from + match.index + 2;
-            const end = start + match[0].length - 4;
-            widgets.push(Decoration.mark({ class: 'text-greenText' }).range(start, end));
-          }
-        }
-      }
-
-      // Sort decorations by position to avoid "Ranges must be added sorted" error.
-      widgets.sort((a, b) => a.from - b.from || a.startSide - b.startSide);
-      return Decoration.set(widgets);
-    }
-
-    update(update: ViewUpdate) {
-      if (update.docChanged || update.viewportChanged) {
-        this.decorations = this.buildDecorations(update.view);
-      }
-    }
-  },
-  {
-    decorations: (v) => v.decorations,
-  },
-);
-
-// TODO(burdon): Pass in variables.
-const variables = ['this'];
-const commands = ['this', 'each', 'if', 'unless', 'with'];
-
-/**
- * Provides completions for Handlebars variables.
- */
-function handlebarsCompletions(context: CompletionContext): CompletionResult | null {
-  const match = context.matchBefore(/\{\{[^}]*/);
-  if (!match || match.from === match.to) {
-    return null;
-  }
-
-  let type = 'variable';
-  let text = match.text.slice(2);
-  let from = match.from + 2;
-  let matches = [];
-  if (text.startsWith('#') || text.startsWith('/')) {
-    const idx = text.lastIndexOf(' ');
-    if (idx !== -1) {
-      type = 'variable';
-      matches = variables;
-      text = text.slice(idx + 1);
-      from += idx + 1;
-    } else {
-      type = 'command';
-      text = text.slice(1);
-      matches = commands;
-      from += 1;
-    }
-  } else {
-    type = 'variable';
-    matches = variables;
-  }
-
-  const options = matches.filter((name) => name.startsWith(text)).map((name) => ({ type, label: name }));
-  return {
-    from,
-    options,
-  };
-}

package/src/components/Toolbar/Toolbar.tsx

@@ -1,21 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import React from 'react';
-
-import { fullyQualifiedId } from '@dxos/react-client/echo';
-import { type ThemedClassName } from '@dxos/react-ui';
-import { MenuProvider, ToolbarMenu } from '@dxos/react-ui-menu';
-
-import { type ChatToolbarActionsProps, useChatToolbarActions } from './useChatToolbarActions';
-
-export const Toolbar = ({ chat, companionTo, onReset, classNames }: ThemedClassName<ChatToolbarActionsProps>) => {
-  const menu = useChatToolbarActions({ chat, companionTo, onReset });
-
-  return (
-    <MenuProvider {...menu} attendableId={companionTo ? fullyQualifiedId(companionTo) : fullyQualifiedId(chat)}>
-      <ToolbarMenu classNames={classNames} textBlockWidth />
-    </MenuProvider>
-  );
-};

package/src/components/Toolbar/useChatToolbarActions.ts

@@ -1,126 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { Rx } from '@effect-rx/rx-react';
-import * as Effect from 'effect/Effect';
-import { useMemo } from 'react';
-
-import { createIntent, useIntentDispatcher } from '@dxos/app-framework';
-import { Filter, Obj, Query } from '@dxos/echo';
-import { invariant } from '@dxos/invariant';
-import { SpaceAction } from '@dxos/plugin-space/types';
-import { getSpace, useQuery } from '@dxos/react-client/echo';
-import { MenuBuilder, useMenuActions } from '@dxos/react-ui-menu';
-
-import { meta } from '../../meta';
-import { Assistant, AssistantAction } from '../../types';
-
-export type ChatToolbarActionsProps = {
-  chat: Assistant.Chat;
-  companionTo?: Obj.Any;
-  onReset?: () => void;
-};
-
-export const useChatToolbarActions = ({ chat, companionTo, onReset }: ChatToolbarActionsProps) => {
-  const { dispatch } = useIntentDispatcher();
-  const space = getSpace(chat);
-  const query = companionTo
-    ? Query.select(Filter.ids(companionTo.id)).targetOf(Assistant.CompanionTo).source()
-    : Query.select(Filter.nothing());
-  // TODO(wittjosiah): Query in react vs query in rx?
-  const chats = useQuery(space, query);
-
-  return useMenuActions(
-    useMemo(
-      () =>
-        Rx.make(() => {
-          const builder = MenuBuilder.make()
-            .root({
-              label: ['chat toolbar title', { ns: meta.id }],
-            })
-            .action(
-              'new',
-              {
-                label: ['button new thread', { ns: meta.id }],
-                icon: 'ph--plus--regular',
-                type: 'new',
-              },
-              () =>
-                Effect.gen(function* () {
-                  invariant(space);
-                  const { object } = yield* dispatch(createIntent(AssistantAction.CreateChat, { space }));
-                  yield* dispatch(createIntent(SpaceAction.AddObject, { object, target: space, hidden: true }));
-                  if (companionTo) {
-                    yield* dispatch(
-                      createIntent(SpaceAction.AddRelation, {
-                        space,
-                        schema: Assistant.CompanionTo,
-                        source: object,
-                        target: companionTo,
-                      }),
-                    );
-
-                    yield* dispatch(createIntent(AssistantAction.SetCurrentChat, { companionTo, chat: object }));
-                  }
-                }).pipe(Effect.runPromise),
-            )
-            .action(
-              'branch',
-              {
-                label: ['button branch thread', { ns: meta.id }],
-                icon: 'ph--git-branch--regular',
-                type: 'branch',
-                disabled: true,
-              },
-              () => {},
-            );
-
-          if (chats.length > 0) {
-            builder.group(
-              'chats',
-              {
-                label: ['chat history label', { ns: meta.id }],
-                icon: 'ph--clock-counter-clockwise--regular',
-                selectCardinality: 'single',
-                variant: 'dropdownMenu',
-              },
-              (builder) => {
-                chats
-                  // TODO(wittjosiah): This should be the default sort order.
-                  .toSorted((a, b) => a.id.localeCompare(b.id))
-                  .forEach((chat) => {
-                    builder.action(
-                      chat.id,
-                      {
-                        label: Obj.getLabel(chat) ?? ['object name placeholder', { ns: Assistant.Chat.typename }],
-                      },
-                      () =>
-                        Effect.gen(function* () {
-                          invariant(companionTo);
-                          yield* dispatch(createIntent(AssistantAction.SetCurrentChat, { companionTo, chat }));
-                        }).pipe(Effect.runPromise),
-                    );
-                  });
-              },
-            );
-          }
-
-          if (onReset) {
-            builder.action(
-              'reset',
-              {
-                label: ['button reset', { ns: meta.id }],
-                icon: 'ph--trash--regular',
-                type: 'reset',
-              },
-              onReset,
-            );
-          }
-
-          return builder.build();
-        }),
-      [chats],
-    ),
-  );
-};

package/src/events.ts

@@ -1,11 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { defineEvent } from '@dxos/app-framework';
-
-import { meta } from './meta';
-
-export namespace AssistantEvents {
-  export const SetupAiServiceProviders = defineEvent(`${meta.id}/event/setup-ai-service-providers`);
-}