@dxos/plugin-assistant 0.8.4-main.67995b8 → 0.8.4-main.ae835ea

package/src/components/PromptSettings.tsx

@@ -1,89 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import React from 'react';
-
-import { type Template } from '@dxos/blueprints';
-import { Toolbar, useTranslation } from '@dxos/react-ui';
-
-import { meta } from '../meta';
-
-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 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],
-  // );
-
-  // 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],
-  // );
-
-  return (
-    <div className='flex flex-col gap-4'>
-      <h2>{t('prompt rules label')}</h2>
-      <Toolbar.Root>
-        {/* <Select.Root value={template.kind.include} onValueChange={handleKindChange}>
-          <Toolbar.Button asChild>
-            <Select.TriggerButton />
-          </Toolbar.Button>
-          <Select.Portal>
-            <Select.Content>
-              <Select.Viewport>
-                {Template.Kinds.map((kind) => (
-                  <Select.Option key={kind} value={kind}>
-                    {kind}
-                  </Select.Option>
-                ))}
-              </Select.Viewport>
-            </Select.Content>
-          </Select.Portal>
-        </Select.Root> */}
-        {/* {template.kind.include === 'schema-matching' && (
-          <Input.Root>
-            <Input.TextInput
-              placeholder={t('typename placeholder')}
-              defaultValue={template.kind.typename}
-              onChange={handleTypenameChange}
-            />
-          </Input.Root>
-        )} */}
-        {/* {template.kind.include === 'automatically' && (
-          <Input.Root>
-            <Input.TextInput
-              placeholder={t('description placeholder')}
-              defaultValue={template.kind.description}
-              onChange={handleDescriptionChange}
-            />
-          </Input.Root>
-        )} */}
-      </Toolbar.Root>
-    </div>
-  );
-};

package/src/components/SequenceContainer.tsx

@@ -1,132 +0,0 @@
-//
-// 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

@@ -1,32 +0,0 @@
-//
-// 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/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 { useThemeContext, type ThemedClassName } 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 | undefined, 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(forwardedRef, () => view, [view]);
-
-    return <div ref={parentRef} className={mx('overflow-hidden', classNames)} />;
-  },
-);

package/src/hooks/chat-processor.test.ts

@@ -1,16 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { describe, it } from 'vitest';
-
-import { ChatProcessor } from './chat-processor';
-
-describe('ChatProcessor', () => {
-  it('should be instantiable', ({ expect }) => {
-    const services = {} as any; // TODO(burdon): Create mock.
-    const client = {} as any; // TODO(burdon): Create mock.
-    const processor = new ChatProcessor(services, client);
-    expect(processor).toBeDefined();
-  });
-});

package/src/hooks/chat-processor.ts

@@ -1,314 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { type Signal, batch, computed, signal } from '@preact/signals-core';
-import { Effect, type Layer } from 'effect';
-
-import { AiService, DEFAULT_EDGE_MODEL, type ExecutableTool, type GenerateRequest } from '@dxos/ai';
-import { type PromiseIntentDispatcher } from '@dxos/app-framework';
-import { type AiSession, ArtifactDiffResolver, type ContextBinder, type Conversation } from '@dxos/assistant';
-import { type ArtifactDefinition, type Blueprint } from '@dxos/blueprints';
-import { Context } from '@dxos/context';
-import { Obj } from '@dxos/echo';
-import { runAndForwardErrors } from '@dxos/effect';
-import { log } from '@dxos/log';
-import { Filter, type Space, getVersion } from '@dxos/react-client/echo';
-import { DataType } from '@dxos/schema';
-
-import type { ChatServices } from './useChatServices';
-
-// TODO(burdon): Factor out.
-declare global {
-  interface ToolContextExtensions {
-    space?: Space;
-    dispatch?: PromiseIntentDispatcher;
-  }
-}
-
-type RequestOptions = {
-  // Empty for now.
-};
-
-export type ChatProcessorOptions = {
-  // TODO(burdon): Change to AiToolkit.
-  tools?: readonly ExecutableTool[];
-  blueprintRegistry?: Blueprint.Registry;
-
-  // TODO(dmaretskyi): Remove.
-  artifacts?: readonly ArtifactDefinition[];
-  extensions?: ToolContextExtensions;
-  // TODO(burdon): Remove systemPrompt -- should come from blueprint.
-} & Pick<GenerateRequest, 'model' | 'systemPrompt'>;
-
-const defaultOptions: Partial<ChatProcessorOptions> = {
-  model: DEFAULT_EDGE_MODEL,
-  systemPrompt: 'you are a helpful assistant',
-};
-
-/**
- * Handles interactions with the AI service.
- * Maintains a queue of messages and handles streaming responses from the AI service.
- * Executes tools based on AI responses.
- * Supports cancellation of in-progress requests.
- */
-// TODO(burdon): Rename ChatContext?
-export class ChatProcessor {
-  /**
-   * Pending messages (incl. the current user request).
-   * @reactive
-   */
-  private readonly _pending: Signal<DataType.Message[]> = signal([]);
-
-  /**
-   * Current streaming message (from the AI service).
-   * @reactive
-   */
-  private readonly _streaming: Signal<DataType.Message | undefined> = signal(undefined);
-
-  /**
-   * Streaming state.
-   * @reactive
-   */
-  public readonly streaming: Signal<boolean> = computed(() => this._streaming.value !== undefined);
-
-  /**
-   * Last error.
-   * @reactive
-   */
-  public readonly error: Signal<Error | undefined> = signal(undefined);
-
-  /**
-   * Array of Messages (incl. the current message being streamed).
-   * @reactive
-   */
-  public readonly messages: Signal<DataType.Message[]> = computed(() => {
-    const messages = [...this._pending.value];
-    if (this._streaming.value) {
-      // TODO(dmaretskyi): Replace with Obj.clone.
-      // NOTE: We have to clone the message here so that react will re-render.
-      messages.push(Obj.make(DataType.Message, this._streaming.value));
-    }
-
-    return messages;
-  });
-
-  // TODO(burdon): Replace with Toolkit.
-  private _tools?: ExecutableTool[];
-
-  /** Current session. */
-  private _session: AiSession | undefined = undefined;
-
-  constructor(
-    // TODO(dmaretskyi): Replace this with effect's ManagedRuntime wrapping this layer.
-    private readonly _services: Layer.Layer<ChatServices>,
-    private readonly _conversation: Conversation,
-    private readonly _options: ChatProcessorOptions = defaultOptions,
-  ) {
-    this._tools = [...(_options.tools ?? [])];
-  }
-
-  get conversation() {
-    return this._conversation;
-  }
-
-  get context(): ContextBinder {
-    return this._conversation.context;
-  }
-
-  get blueprintRegistry() {
-    return this._options.blueprintRegistry;
-  }
-
-  get tools() {
-    return this._tools;
-  }
-
-  /**
-   * @deprecated Replace with blueprints
-   */
-  setTools(tools: ExecutableTool[]): void {
-    this._tools = tools;
-  }
-
-  /**
-   * Make GPT request.
-   */
-  async request(message: string, options: RequestOptions = {}): Promise<DataType.Message[]> {
-    await using ctx = Context.default(); // Auto-disposed at the end of this block.
-
-    this._conversation.onBegin.on(ctx, (session) => {
-      log.info('onBegin', { session, isDisposed: ctx.disposed });
-
-      this._session = session;
-      ctx.onDispose(() => {
-        log.info('onDispose', { session, isDisposed: ctx.disposed });
-        if (this._session === session) {
-          this._session = undefined;
-        }
-      });
-
-      // User message.
-      session.userMessage.on((message) => {
-        log.info('userMessage', { message });
-        this._pending.value = [...this._pending.value, message];
-      });
-
-      // Message complete.
-      session.message.on((message) => {
-        batch(() => {
-          this._pending.value = [...this._pending.value, message];
-          this._streaming.value = undefined;
-        });
-      });
-
-      // Streaming update (happens before message complete).
-      session.update.on((block) => {
-        batch(() => {
-          if (!this._streaming.value) {
-            // TODO(burdon): Hack to create temp message; better for session to send initial partial object?
-            this._streaming.value = Obj.make(DataType.Message, {
-              created: new Date().toISOString(),
-              sender: { role: 'assistant' },
-              blocks: [block],
-            });
-          } else if (this._streaming.value.blocks.at(-1)?.pending === true) {
-            this._streaming.value.blocks[this._streaming.value.blocks.length - 1] = block;
-          } else {
-            this._streaming.value.blocks.push(block);
-          }
-        });
-      });
-
-      session.block.on((block) => {
-        if (!this._streaming.value) {
-          // TODO(burdon): Hack to create temp message; better for session to send initial partial object?
-          this._streaming.value = Obj.make(DataType.Message, {
-            created: new Date().toISOString(),
-            sender: { role: 'assistant' },
-            blocks: [block],
-          });
-        } else if (this._streaming.value.blocks.at(-1)?.pending === true) {
-          this._streaming.value.blocks[this._streaming.value.blocks.length - 1] = block;
-        } else {
-          this._streaming.value.blocks.push(block);
-        }
-      });
-
-      // TODO(dmaretskyi): Handle tool status reports.
-      // session.toolStatusReport.on(({ message, status }) => {
-      //   const msg = this._pending.peek().find((m) => m.id === message.id);
-      //   const toolUse = msg?.content.find((block) => block.type === 'tool_use');
-      //   if (!toolUse) {
-      //     return;
-      //   }
-
-      //   const block = msg?.content.find(
-      //     (block): block is ToolUseContentBlock => block.type === 'tool_use' && block.id === toolUse.id,
-      //   );
-      //   if (block) {
-      //     this._pending.value = this._pending.value.map((m) => {
-      //       if (m.id === message.id) {
-      //         return {
-      //           ...m,
-      //           content: m.content.map((block) =>
-      //             block.type === 'tool_use' && block.id === toolUse.id ? { ...block, currentStatus: status } : block,
-      //           ),
-      //         };
-      //       }
-
-      //       return m;
-      //     });
-      //   } else {
-      //     log.warn('no block for status report');
-      //   }
-      // });
-    });
-
-    try {
-      const messages = await runAndForwardErrors(
-        this._conversation
-          .run({
-            prompt: message,
-            // TODO(burdon): Construct from blueprints?
-            systemPrompt: this._options.systemPrompt,
-          })
-          .pipe(
-            //
-            Effect.provide(AiService.model(this._options.model ?? DEFAULT_EDGE_MODEL)),
-            // TODO(dmaretskyi): Move ArtifactDiffResolver upstream.
-            Effect.provideService(ArtifactDiffResolver, this._artifactDiffResolver),
-            Effect.provide(this._services),
-            Effect.tapErrorCause((cause) => {
-              log.error('error', { cause });
-              return Effect.void;
-            }),
-          ),
-      );
-
-      log('completed', { messages });
-    } catch (err) {
-      log.catch(err);
-      if (err instanceof Error && err.message.includes('Overloaded')) {
-        this.error.value = new AiServiceOverloadedError('AI service overloaded', { cause: err });
-      } else {
-        this.error.value = new Error('AI service error', { cause: err });
-      }
-    }
-
-    return this._reset();
-  }
-
-  /**
-   * Cancel pending requests.
-   * @returns Pending requests (incl. the request message).
-   */
-  async cancel(): Promise<DataType.Message[]> {
-    log.info('cancelling...');
-
-    // TODO(dmaretskyi): Conversation should handle aborting.
-    this._session?.abort();
-    return this._reset();
-  }
-
-  private async _reset(): Promise<DataType.Message[]> {
-    const messages = this._pending.value;
-    batch(() => {
-      this._pending.value = [];
-      this._streaming.value = undefined;
-    });
-
-    return messages;
-  }
-
-  private _artifactDiffResolver: ArtifactDiffResolver.Service = {
-    resolve: async (artifacts) => {
-      const space = this._options.extensions?.space;
-      if (!space) {
-        return new Map();
-      }
-
-      const versions = new Map();
-      await Promise.all(
-        artifacts.map(async (artifact) => {
-          const {
-            objects: [object],
-          } = await space.db.query(Filter.ids(artifact.id)).run();
-          if (!object) {
-            return;
-          }
-          versions.set(artifact.id, {
-            version: getVersion(object),
-            diff: `Current state: ${JSON.stringify(object)}`,
-          });
-        }),
-      );
-      return versions;
-    },
-  };
-}
-
-// TODO(wittjosiah): Move to ai-service-client.
-export class AiServiceOverloadedError extends Error {
-  code = 'AI_SERVICE_OVERLOADED';
-}

package/src/hooks/useBlueprints.ts

@@ -1,57 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { effect } from '@preact/signals-react';
-import { useCallback, useEffect, useState } from 'react';
-
-import { type ContextBinder } from '@dxos/assistant';
-import { Blueprint } from '@dxos/blueprints';
-import { type Space } from '@dxos/client/echo';
-import { Obj, Ref } from '@dxos/echo';
-import { log } from '@dxos/log';
-import { isNonNullable } from '@dxos/util';
-
-export type UpdateCallback = (key: string, active: boolean) => void;
-
-/**
- * Get collection of active blueprints based on the context.
- */
-export const useBlueprints = (
-  space: Space,
-  context: ContextBinder,
-  blueprintRegistry?: Blueprint.Registry,
-): [Blueprint.Blueprint[], UpdateCallback] => {
-  const [blueprints, setBlueprints] = useState<Blueprint.Blueprint[]>([]);
-  useEffect(() => {
-    let t: NodeJS.Timeout;
-    effect(() => {
-      const refs = [...(context.blueprints.value ?? [])];
-      t = setTimeout(async () => {
-        const blueprints = (await Ref.Array.loadAll(refs)).filter(isNonNullable);
-        setBlueprints(blueprints);
-      });
-    });
-
-    return () => clearTimeout(t);
-  }, [context]);
-
-  const handleUpdate = useCallback<UpdateCallback>(
-    (key: string, active: boolean) => {
-      log.info('update', { key, active });
-      if (active) {
-        // TODO(burdon): Check if already in space.
-        const blueprint = blueprintRegistry?.getByKey(key);
-        if (blueprint) {
-          // TODO(dmaretskyi): This should be done by Obj.clone.
-          const { id: _id, ...data } = blueprint;
-          const obj = space.db.add(Obj.make(Blueprint.Blueprint, data));
-          void context.bind({ blueprints: [Ref.make(obj)] });
-        }
-      }
-    },
-    [space, context],
-  );
-
-  return [blueprints, handleUpdate] as const;
-};