@dxos/plugin-assistant 0.8.4-main.f9ba587 → 0.8.4-main.fcfe5033a5

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/components/TemplateContainer.tsx

@@ -1,25 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import React from 'react';
-
-import { StackItem } from '@dxos/react-ui-stack';
-
-import { TemplateEditor } from './TemplateEditor';
-import { type TemplateType } from '../types';
-
-export type TemplateContainerProps = {
-  role: string;
-  template: TemplateType;
-};
-
-export const TemplateContainer = ({ role, template }: TemplateContainerProps) => {
-  return (
-    <StackItem.Content role={role} classNames='container-max-width'>
-      <TemplateEditor template={template} />
-    </StackItem.Content>
-  );
-};
-
-export default TemplateContainer;

package/src/events.ts

@@ -1,11 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { Events } from '@dxos/app-framework';
-
-import { meta } from './meta';
-
-export namespace AssistantEvents {
-  export const AiClientReady = Events.createStateEvent(`${meta.id}/ai-client-ready`);
-}

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

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

package/src/hooks/chat-processor.ts

@@ -1,281 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { type Signal, batch, computed, signal } from '@preact/signals-core';
-
-import {
-  DEFAULT_EDGE_MODEL,
-  type ExecutableTool,
-  type GenerateRequest,
-  type Message,
-  type MessageContentBlock,
-  type ToolUseContentBlock,
-} from '@dxos/ai';
-import { type PromiseIntentDispatcher } from '@dxos/app-framework';
-import { type ArtifactDefinition } from '@dxos/artifact';
-import {
-  type AISession,
-  type ArtifactDiffResolver,
-  type BlueprintRegistry,
-  type ContextBinder,
-  type Conversation,
-} from '@dxos/assistant';
-import { Context } from '@dxos/context';
-import { log } from '@dxos/log';
-import { Filter, type Space, getVersion } from '@dxos/react-client/echo';
-
-// 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[];
-  artifacts?: readonly ArtifactDefinition[];
-  extensions?: ToolContextExtensions;
-  blueprintRegistry?: BlueprintRegistry;
-} & Pick<GenerateRequest, 'model' | 'systemPrompt'>;
-
-const defaultOptions: 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<Message[]> = signal([]);
-
-  /**
-   * Current streaming block (from the AI service).
-   * @reactive
-   */
-  private readonly _block: Signal<MessageContentBlock | undefined> = signal(undefined);
-
-  /**
-   * Streaming state.
-   * @reactive
-   */
-  public readonly streaming: Signal<boolean> = computed(() => this._block.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<Message[]> = computed(() => {
-    const messages = [...this._pending.value];
-    if (this._block.value && messages.length) {
-      const { content, ...rest } = messages.pop()!;
-      const message = { ...rest, content: [...content, this._block.value] };
-      messages.push(message);
-    }
-
-    return messages;
-  });
-
-  // TODO(burdon): Replace with Toolkit.
-  private _tools?: ExecutableTool[];
-
-  /** Current session. */
-  private _session: AISession | undefined = undefined;
-
-  constructor(
-    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<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;
-        }
-      });
-
-      // Message complete.
-      session.message.on((message) => {
-        batch(() => {
-          this._pending.value = [...this._pending.value, message];
-          this._block.value = undefined;
-        });
-      });
-
-      // Streaming update (happens before message complete).
-      session.update.on((block) => {
-        batch(() => {
-          this._block.value = block;
-        });
-      });
-
-      session.userMessage.on((message) => {
-        log.info('userMessage', { message });
-        this._pending.value = [...this._pending.value, message];
-      });
-
-      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 this._conversation.run({
-        artifacts: [...(this._options.artifacts ?? [])],
-        requiredArtifactIds: this._options.artifacts?.map((artifact) => artifact.id) ?? [],
-
-        // TODO(dmaretskyi): Migrate to Effect's AiToolkit.
-        tools: this._tools ?? [],
-        systemPrompt: this._options.systemPrompt,
-        prompt: message,
-        extensions: this._options.extensions,
-        artifactDiffResolver: this._artifactDiffResolver,
-        generationOptions: {
-          model: this._options.model,
-        },
-      });
-
-      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<Message[]> {
-    log.info('cancelling...');
-
-    // TODO(dmaretskyi): Conversation should handle aborting.
-    this._session?.abort();
-    return this._reset();
-  }
-
-  private async _reset(): Promise<Message[]> {
-    const messages = this._pending.value;
-    batch(() => {
-      this._pending.value = [];
-      this._block.value = undefined;
-    });
-
-    return messages;
-  }
-
-  private _artifactDiffResolver: ArtifactDiffResolver = 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,31 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { useCallback, useState } from 'react';
-
-import { type Blueprint, type ContextBinder } from '@dxos/assistant';
-import { Ref } from '@dxos/echo';
-import { log } from '@dxos/log';
-import { useTimeout } from '@dxos/react-ui';
-import { isNonNullable } from '@dxos/util';
-
-export type UpdateCallback = (key: string, active: boolean) => void;
-
-export const useBlueprints = (context: ContextBinder): [Blueprint[], UpdateCallback] => {
-  const [blueprints, setBlueprints] = useState<Blueprint[]>([]);
-  useTimeout(
-    async () => {
-      const blueprints = (await Ref.Array.loadAll(context.blueprints.value ?? [])).filter(isNonNullable);
-      setBlueprints(blueprints);
-    },
-    0,
-    [context],
-  );
-
-  const handleUpdate = useCallback<UpdateCallback>((key: string, active: boolean) => {
-    log.info('update', { key, active });
-  }, []);
-
-  return [blueprints, handleUpdate] as const;
-};

package/src/hooks/useChatProcessor.tsx

@@ -1,142 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { useEffect, useMemo, useState } from 'react';
-
-import { DEFAULT_EDGE_MODEL, DEFAULT_OLLAMA_MODEL, type ExecutableTool } from '@dxos/ai';
-import { Capabilities, useCapabilities, useIntentDispatcher } from '@dxos/app-framework';
-import { type ArtifactDefinition, type AssociatedArtifact, createSystemPrompt } from '@dxos/artifact';
-import { type BlueprintRegistry, Conversation } from '@dxos/assistant';
-import { FunctionType, type ServiceContainer } from '@dxos/functions';
-import { log } from '@dxos/log';
-import { useConfig } from '@dxos/react-client';
-import { Filter, fullyQualifiedId, type Queue, type Space, useQuery } from '@dxos/react-client/echo';
-import { isNonNullable } from '@dxos/util';
-
-import { ChatProcessor, type ChatProcessorOptions } from '../hooks';
-import { convertFunctionToTool, createToolsFromService } from '../tools';
-import { type Assistant, ServiceType } from '../types';
-
-type UseChatProcessorProps = {
-  /** @deprecated Why is this required? */
-  part?: 'deck' | 'dialog';
-  space?: Space;
-  chat?: Assistant.Chat;
-  // TODO(burdon): Reconcile all of below (overlapping concepts). Figure out how to inject vie effect layers.
-  serviceContainer: ServiceContainer;
-  blueprintRegistry?: BlueprintRegistry;
-  settings?: Assistant.Settings;
-  /** @deprecated */
-  instructions?: string;
-  /** @deprecated */
-  artifact?: AssociatedArtifact;
-  /** @deprecated */
-  noPluginArtifacts?: boolean;
-};
-
-/**
- * Configure and create ChatProcessor.
- */
-export const useChatProcessor = ({
-  part = 'deck',
-  space,
-  chat,
-  serviceContainer,
-  blueprintRegistry,
-  settings,
-  instructions,
-  artifact,
-  noPluginArtifacts,
-}: UseChatProcessorProps): ChatProcessor | undefined => {
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
-  const globalTools = useCapabilities(Capabilities.Tools);
-
-  // TODO(burdon): Spec artifacts.
-  let artifacts: readonly ArtifactDefinition[] = useCapabilities(Capabilities.ArtifactDefinition);
-  if (noPluginArtifacts) {
-    artifacts = Stable.array;
-  }
-
-  // Services.
-  const services = useQuery(space, Filter.type(ServiceType));
-  const [serviceTools, setServiceTools] = useState<ExecutableTool[]>([]);
-  useEffect(() => {
-    log('creating service tools...');
-    queueMicrotask(async () => {
-      const tools = await Promise.all(services.map((service) => createToolsFromService(service)));
-      setServiceTools(tools.flat());
-    });
-  }, [services]);
-
-  // Tools and context.
-  const config = useConfig();
-  const functions = useQuery(space, Filter.type(FunctionType));
-  const chatId = useMemo(() => (chat ? fullyQualifiedId(chat) : undefined), [chat]);
-  const [tools, extensions] = useMemo(() => {
-    log('creating tools...');
-    const tools: ExecutableTool[] = [
-      ...globalTools.flat(),
-      ...serviceTools,
-      ...functions
-        .map((fn) => convertFunctionToTool(fn, config.values.runtime?.services?.edge?.url ?? '', space?.id))
-        .filter(isNonNullable),
-    ];
-    const extensions = { part, space, dispatch, pivotId: chatId };
-    return [tools, extensions];
-  }, [dispatch, globalTools, space, chatId, serviceTools, functions]);
-
-  // Prompt.
-  const systemPrompt = useMemo(
-    () =>
-      createSystemPrompt({
-        artifacts: artifacts.map((definition) => `${definition.name}\n${definition.instructions}`),
-        artifact,
-        instructions,
-      }),
-    [artifacts, artifact, instructions],
-  );
-
-  // TODO(burdon): Remove default (let backend decide if not specified).
-  const model: ChatProcessorOptions['model'] =
-    settings?.llmProvider === 'ollama'
-      ? ((settings?.ollamaModel ?? DEFAULT_OLLAMA_MODEL) as ChatProcessorOptions['model'])
-      : ((settings?.edgeModel ?? DEFAULT_EDGE_MODEL) as ChatProcessorOptions['model']);
-
-  const conversation = useMemo(() => {
-    if (!chat?.queue.target) {
-      return;
-    }
-
-    return new Conversation({
-      serviceContainer,
-      queue: chat.queue.target as Queue<any>,
-    });
-  }, [chat?.queue.target, serviceContainer]);
-
-  // Create processor.
-  // TODO(burdon): Updated on each query update above; should just update current processor.
-  const processor = useMemo(() => {
-    if (!conversation) {
-      return undefined;
-    }
-
-    log('creating processor...', { settings });
-    return new ChatProcessor(conversation, {
-      tools,
-      extensions,
-      blueprintRegistry,
-      artifacts,
-      systemPrompt,
-      model,
-    });
-  }, [conversation, tools, blueprintRegistry, artifacts, extensions, systemPrompt, model]);
-
-  return processor;
-};
-
-// TODO(dmaretskyi): Extract.
-export const Stable = Object.freeze({
-  array: [] as readonly never[],
-  object: {} as {},
-});

package/src/hooks/useContextProvider.ts

@@ -1,61 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { useMemo } from 'react';
-
-import { Capabilities, useCapabilities } from '@dxos/app-framework';
-import { type Space } from '@dxos/client/echo';
-import { Filter, Obj, type Type } from '@dxos/echo';
-
-/**
- * @deprecated
- */
-export type ContextProvider = {
-  query: (params: { query: string }) => Promise<Array<{ uri: string; label: string }>>;
-  resolveMetadata: (params: { uri: string }) => Promise<{ uri: string; label: string }>;
-};
-
-/**
- * @deprecated
- */
-export const useContextProvider = (space?: Space): ContextProvider | undefined => {
-  const artifactDefinitions = useCapabilities(Capabilities.ArtifactDefinition);
-
-  return useMemo<ContextProvider | undefined>((): ContextProvider | undefined => {
-    if (!space) {
-      return undefined;
-    }
-
-    return {
-      query: async ({ query }) => {
-        const artifactSchemas = artifactDefinitions.map((artifact) => artifact.schema);
-        const { objects } = await space.db
-          .query(Filter.or(...artifactSchemas.map((schema) => Filter.type(schema as Type.Schema))))
-          .run();
-
-        return (
-          objects
-            // TODO(burdon): Remove cast ??? (+ two instances below).
-            // .map((object) => {
-            //   log.info('object', { object, label: Obj.getLabel(object as any) });
-            //   return object;
-            // })
-            .filter((object) => stringMatch(query, Obj.getLabel(object as any) ?? ''))
-            // TODO(dmaretskyi): `Type.getDXN` (at the point of writing) didn't work here as it was schema-only.
-            .filter((object) => !!Obj.getDXN(object as Obj.Any))
-            .map((object) => ({
-              uri: Obj.getDXN(object as any)!.toString(),
-              label: Obj.getLabel(object as any) ?? '',
-            }))
-        );
-      },
-      resolveMetadata: async ({ uri }) => {
-        const object = await space.db.query(Filter.ids(uri)).first();
-        return { uri, label: Obj.getLabel(object) ?? '' };
-      },
-    };
-  }, [space, artifactDefinitions]);
-};
-
-const stringMatch = (query: string, label: string) => label.toLowerCase().startsWith(query.toLowerCase());

package/src/hooks/useServiceContainer.ts

@@ -1,42 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { useEffect, useMemo, useState } from 'react';
-
-import { ToolRegistry } from '@dxos/ai';
-import { Capabilities, useCapabilities, useCapability } from '@dxos/app-framework';
-import { AiService, DatabaseService, QueueService, ServiceContainer, ToolResolverService } from '@dxos/functions';
-import { type Space } from '@dxos/react-client/echo';
-
-import { AssistantCapabilities } from '../capabilities';
-
-interface UseServiceContainerProps {
-  space?: Space;
-}
-
-export const useServiceContainer = ({ space }: UseServiceContainerProps) => {
-  const aiClient = useCapability(AssistantCapabilities.AiClient);
-  const tools = useCapabilities(Capabilities.Tools).flat();
-
-  const [toolRegistry] = useState(() => new ToolRegistry([]));
-  useEffect(() => {
-    for (const tool of tools) {
-      if (!toolRegistry.has(tool)) {
-        toolRegistry.register(tool);
-      }
-    }
-  }, [toolRegistry, JSON.stringify(tools.map((tool) => tool.id))]);
-
-  return useMemo(
-    () =>
-      new ServiceContainer().setServices({
-        ai: AiService.make(aiClient.value),
-        database: space ? DatabaseService.make(space.db) : undefined,
-        queues: space ? QueueService.make(space.queues, undefined) : undefined,
-        // eventLogger: consoleLogger,
-        toolResolver: ToolResolverService.make(toolRegistry),
-      }),
-    [space, aiClient],
-  );
-};