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

package/src/components/Thread/ThreadContainer.tsx

@@ -1,105 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import React, { useCallback, type FC, useEffect } from 'react';
-
-import { CollaborationActions, createIntent, useIntentDispatcher } from '@dxos/app-framework';
-import { type AssociatedArtifact } from '@dxos/artifact';
-import { DXN, Ref } from '@dxos/echo';
-import { invariant } from '@dxos/invariant';
-import { log } from '@dxos/log';
-import { getSpace } from '@dxos/react-client/echo';
-import { type ThemedClassName } from '@dxos/react-ui';
-
-import { Thread, type ThreadProps } from './Thread';
-import { useChatProcessor, useContextProvider, useMessageQueue } from '../../hooks';
-import { type AIChatType, type AssistantSettingsProps } from '../../types';
-
-export type ThreadContainerProps = {
-  chat?: AIChatType;
-  settings?: AssistantSettingsProps;
-  part?: 'deck' | 'dialog';
-  associatedArtifact?: AssociatedArtifact;
-} & Pick<ThreadProps, 'debug' | 'transcription' | 'onOpenChange' | 'onAddToGraph'>;
-
-// TODO(burdon): Since this only wraps Thread, just separate out hook?
-export const ThreadContainer: FC<ThemedClassName<ThreadContainerProps>> = ({
-  classNames,
-  chat,
-  settings,
-  part,
-  associatedArtifact,
-  onOpenChange,
-  ...props
-}) => {
-  const space = getSpace(chat);
-  const contextProvider = useContextProvider(space);
-  const processor = useChatProcessor({ chat, space, settings, part, associatedArtifact });
-  const messageQueue = useMessageQueue(chat);
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
-  // TODO(thure): This will be referentially new on every render, is it causing overreactivity?
-  const messages = [...(messageQueue?.objects ?? []), ...processor.messages.value];
-
-  // Post last message to document.
-  useEffect(() => {
-    if (!processor.streaming.value && messageQueue?.objects) {
-      const message = messageQueue.objects[messageQueue.objects.length - 1];
-      if (space && chat && message && dispatch && associatedArtifact) {
-        void dispatch(
-          createIntent(CollaborationActions.InsertContent, {
-            target: associatedArtifact,
-            object: Ref.fromDXN(new DXN(DXN.kind.QUEUE, [...chat.queue.dxn.parts, message.id])),
-            label: 'View proposal',
-          }),
-        );
-      }
-    }
-  }, [messageQueue, associatedArtifact, processor.streaming.value]);
-
-  const handleSubmit = useCallback(
-    (text: string) => {
-      // Don't accept input if still processing.
-      if (processor.streaming.value) {
-        log.warn('ignoring submit; still processing.');
-        return false;
-      }
-
-      onOpenChange?.(true);
-
-      invariant(messageQueue);
-      void processor.request(text, {
-        history: messageQueue.objects,
-        onComplete: (messages) => {
-          void messageQueue.append(messages);
-        },
-      });
-
-      return true;
-    },
-    [processor, messageQueue, onOpenChange],
-  );
-
-  const handleCancel = useCallback(() => {
-    if (processor.streaming.value) {
-      void processor.cancel();
-    }
-  }, [processor]);
-
-  return (
-    <Thread
-      classNames={classNames}
-      space={space}
-      messages={messages}
-      processing={processor.streaming.value}
-      error={processor.error.value}
-      tools={processor.tools}
-      contextProvider={contextProvider}
-      onSubmit={handleSubmit}
-      onCancel={handleCancel}
-      onPrompt={handleSubmit}
-      onOpenChange={onOpenChange}
-      {...props}
-    />
-  );
-};

package/src/components/Thread/ThreadMessage.tsx

@@ -1,234 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import React, { type FC, type PropsWithChildren } from 'react';
-
-import { type MessageContentBlock, type Message, type Tool } from '@dxos/ai';
-import { Surface } from '@dxos/app-framework';
-import { type Obj } from '@dxos/echo';
-import { invariant } from '@dxos/invariant';
-import { type Space } from '@dxos/react-client/echo';
-import { Button, Icon, IconButton, type ThemedClassName } from '@dxos/react-ui';
-import {
-  MarkdownViewer,
-  ToggleContainer as NativeToggleContainer,
-  type ToggleContainerProps,
-} from '@dxos/react-ui-components';
-import { Json } from '@dxos/react-ui-syntax-highlighter';
-import { mx } from '@dxos/react-ui-theme';
-import { safeParseJson } from '@dxos/util';
-
-import { ToolBlock, isToolMessage } from './ToolInvocations';
-import { ToolboxContainer } from '../Toolbox';
-
-const panelClassNames = 'flex flex-col w-full px-2 bg-activeSurface rounded-md';
-const userClassNames = 'bg-[--user-fill] text-accentSurfaceText';
-
-const ToggleContainer = (props: ToggleContainerProps) => {
-  return <NativeToggleContainer {...props} classNames={mx(panelClassNames, props.classNames)} />;
-};
-
-const MessageContainer = ({ children, classNames, user }: ThemedClassName<PropsWithChildren<{ user?: boolean }>>) => {
-  if (!children) {
-    return null;
-  }
-
-  return (
-    <div role='list-item' className={mx('flex w-full', user && 'justify-end', classNames)}>
-      <div className={mx(user ? ['px-2 py-1 rounded-md', userClassNames] : 'w-full')}>{children}</div>
-    </div>
-  );
-};
-
-export type ThreadMessageProps = ThemedClassName<{
-  space?: Space;
-  message: Message;
-  debug?: boolean;
-  tools?: Tool[];
-  onPrompt?: (text: string) => void;
-  onDelete?: (id: string) => void;
-  onAddToGraph?: (object: Obj.Any) => void;
-}>;
-
-export const ThreadMessage: FC<ThreadMessageProps> = ({
-  classNames,
-  space,
-  message,
-  tools,
-  onPrompt,
-  onAddToGraph,
-}) => {
-  const { role, content = [] } = message;
-
-  // TODO(burdon): Restructure types to make check unnecessary.
-  if (isToolMessage(message)) {
-    return (
-      <MessageContainer classNames={mx(classNames, 'animate-[fadeIn_0.5s]')}>
-        <ToolBlock space={space} classNames={panelClassNames} message={message} tools={tools} />
-      </MessageContainer>
-    );
-  }
-
-  return content.map((block, idx) => {
-    // TODO(burdon): Filter empty messages.
-    if (block.type === 'text' && block.text.replaceAll(/\s+/g, '').length === 0) {
-      return null;
-    }
-
-    const Component = components[block.type] ?? components.default;
-
-    return (
-      <MessageContainer
-        key={idx}
-        classNames={mx(classNames, 'animate-[fadeIn_0.5s]')}
-        user={block.type === 'text' && role === 'user'}
-      >
-        <Component space={space} block={block} onPrompt={onPrompt} onAddToGraph={onAddToGraph} />
-      </MessageContainer>
-    );
-  });
-};
-
-type BlockComponent = FC<{
-  space?: Space;
-  block: MessageContentBlock;
-  onPrompt?: (text: string) => void;
-  onAddToGraph?: (object: Obj.Any) => void;
-}>;
-
-const components: Record<string, BlockComponent> = {
-  //
-  // Text
-  //
-  ['text' as const]: ({ block }) => {
-    invariant(block.type === 'text');
-    // const [open, setOpen] = useState(block.disposition === 'cot' && block.pending);
-    const title = block.disposition ? titles[block.disposition] : undefined;
-    if (!title) {
-      return <MarkdownViewer classNames='[&>p]:animate-[fadeIn_0.5s]' content={block.text} />;
-    }
-
-    // TOOD(burdon): Store last time user opened/closed COT.
-    // Autoclose when streaming ends.
-    // useEffect(() => {
-    //   if (block.disposition === 'cot' && !block.pending) {
-    //     setOpen(false);
-    //   }
-    // }, [block.disposition, block.pending]);
-
-    return (
-      <ToggleContainer
-        // open={open}
-        defaultOpen={systemDispositions.includes(block.disposition ?? '') && block.pending}
-        title={title}
-        icon={
-          block.pending ? (
-            <Icon icon={'ph--circle-notch--regular'} classNames='text-subdued ml-2 animate-spin' size={4} />
-          ) : undefined
-        }
-      >
-        <MarkdownViewer
-          content={block.text}
-          classNames={['pbe-2', systemDispositions.includes(block.disposition ?? '') && 'text-sm text-subdued']}
-        />
-      </ToggleContainer>
-    );
-  },
-
-  //
-  // JSON
-  //
-  ['json' as const]: ({ space, block, onPrompt, onAddToGraph }) => {
-    invariant(block.type === 'json');
-
-    switch (block.disposition) {
-      case 'tool_list': {
-        return (
-          <ToggleContainer title={titles[block.disposition]} defaultOpen={true}>
-            <ToolboxContainer space={space} classNames='pbe-2' />
-          </ToggleContainer>
-        );
-      }
-
-      case 'suggest': {
-        const { text = '' }: { text: string } = safeParseJson(block.json ?? '{}') ?? ({} as any);
-        return <IconButton icon='ph--lightning--regular' label={text} onClick={() => onPrompt?.(text)} />;
-      }
-
-      case 'select': {
-        const { options = [] }: { options: string[] } = safeParseJson(block.json ?? '{}') ?? ({} as any);
-        return (
-          <div className='flex flex-wrap gap-1'>
-            {options.map((option, idx) => (
-              <Button
-                classNames={'animate-[fadeIn_0.5s] rounded-2xl text-sm'}
-                key={option}
-                onClick={() => onPrompt?.(option)}
-              >
-                {option}
-              </Button>
-            ))}
-          </div>
-        );
-      }
-
-      case 'graph': {
-        return (
-          <div className='flex flex-wrap gap-1'>
-            <Surface
-              role='card'
-              data={{ subject: JSON.parse(block.json ?? '{}') }}
-              limit={1}
-              fallback={<div className='font-mono text-xs text-pre'>{block.json}</div>}
-            />
-            {onAddToGraph && (
-              <IconButton
-                icon='ph--plus--regular'
-                label='Add to graph'
-                onClick={() => onAddToGraph?.(JSON.parse(block.json ?? '{}'))}
-              />
-            )}
-          </div>
-        );
-      }
-
-      default: {
-        const title = block.disposition ? titles[block.disposition] : undefined;
-        return (
-          <ToggleContainer title={title ?? 'JSON'}>
-            <Json data={safeParseJson(block.json ?? block)} classNames='!p-1 text-xs' />
-          </ToggleContainer>
-        );
-      }
-    }
-  },
-
-  //
-  // Default
-  //
-  default: ({ block }) => {
-    let title = titles[block.type];
-    if (block.type === 'tool_use') {
-      title = `Tool [${block.name}]`; // TODO(burdon): Get label from tool.
-    }
-
-    return (
-      <ToggleContainer title={title ?? 'JSON'}>
-        <Json data={block} classNames='!p-1 text-xs' />
-      </ToggleContainer>
-    );
-  },
-};
-
-// TODO(burdon): Translations.
-const titles: Record<string, string> = {
-  ['cot' as const]: 'Chain of thought',
-  ['artifact' as const]: 'Artifact',
-  ['tool_use' as const]: 'Tool request',
-  ['tool_result' as const]: 'Tool result',
-  ['tool_list' as const]: 'Tools',
-  ['artifact-update' as const]: 'Artifact(s) changed',
-};
-
-const systemDispositions: string[] = ['cot', 'artifact-update'];

package/src/components/Thread/index.ts

@@ -1,6 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-export * from './Thread';
-export * from './ThreadContainer';

package/src/hooks/processor.ts

@@ -1,238 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { type Signal, batch, computed, signal } from '@preact/signals-core';
-
-import {
-  DEFAULT_EDGE_MODEL,
-  type ExecutableTool,
-  type AiServiceClient,
-  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 { AISession, type ArtifactDiffResolver } from '@dxos/assistant';
-import { invariant } from '@dxos/invariant';
-import { log } from '@dxos/log';
-import { Filter, getVersion, type Space } from '@dxos/react-client/echo';
-
-// TODO(burdon): Factor out.
-declare global {
-  interface ToolContextExtensions {
-    space?: Space;
-    dispatch?: PromiseIntentDispatcher;
-  }
-}
-
-type RequestOptions = {
-  history?: Message[];
-  onComplete?: (messages: Message[]) => void;
-};
-
-export type ChatProcessorOptions = 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.
- */
-export class ChatProcessor {
-  /** Pending messages (incl. the current user request). */
-  private readonly _pending: Signal<Message[]> = signal([]);
-
-  /** Current streaming block (from the AI service). */
-  private readonly _block: Signal<MessageContentBlock | undefined> = signal(undefined);
-
-  /** Current streaming response. */
-  private _session: AISession | 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) {
-      const current = messages.pop();
-      invariant(current);
-      const { content, ...rest } = current;
-      const message = { ...rest, content: [...content, this._block.value] };
-      messages.push(message);
-    }
-
-    return messages;
-  });
-
-  constructor(
-    private readonly _ai: AiServiceClient,
-    private _tools?: ExecutableTool[],
-    private _artifacts?: ArtifactDefinition[],
-    private readonly _extensions?: ToolContextExtensions,
-    private readonly _options: ChatProcessorOptions = defaultOptions,
-  ) {}
-
-  get tools() {
-    return this._tools;
-  }
-
-  /**
-   * Update tools.
-   */
-  setTools(tools: ExecutableTool[]): void {
-    this._tools = tools;
-  }
-
-  /**
-   * Make GPT request.
-   */
-  async request(message: string, options: RequestOptions = {}): Promise<Message[]> {
-    this._session = new AISession({ operationModel: 'configured' });
-
-    // Message complete.
-    this._session.message.on((message) => {
-      batch(() => {
-        this._pending.value = [...this._pending.value, message];
-        this._block.value = undefined;
-      });
-    });
-
-    // Streaming update (happens before message complete).
-    this._session.update.on((block) => {
-      batch(() => {
-        this._block.value = block;
-      });
-    });
-
-    this._session.userMessage.on((message) => {
-      this._pending.value = [...this._pending.value, message];
-    });
-
-    this._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((b) =>
-                b.type === 'tool_use' && b.id === toolUse.id ? { ...b, currentStatus: status } : b,
-              ),
-            };
-          }
-          return m;
-        });
-      } else {
-        log.warn('no block for status report');
-      }
-    });
-
-    try {
-      const messages = await this._session.run({
-        client: this._ai,
-        history: options.history ?? [],
-        artifacts: this._artifacts ?? [],
-        requiredArtifactIds: this._artifacts?.map((artifact) => artifact.id) ?? [],
-        tools: this._tools ?? [],
-        prompt: message,
-        systemPrompt: this._options.systemPrompt,
-        extensions: this._extensions,
-        artifactDiffResolver: this._artifactDiffResolver,
-        generationOptions: {
-          model: this._options.model,
-        },
-      });
-
-      log('completed', { messages });
-      options.onComplete?.(this._pending.value);
-    } 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 });
-      }
-    } finally {
-      this._session = undefined;
-    }
-
-    return this._reset();
-  }
-
-  /**
-   * Cancel pending requests.
-   * @returns Pending requests (incl. the request message).
-   */
-  async cancel(): Promise<Message[]> {
-    log.info('cancelling...');
-    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._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/useChatProcessor.tsx

@@ -1,97 +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, useCapability, useIntentDispatcher } from '@dxos/app-framework';
-import { type AssociatedArtifact, createSystemPrompt } from '@dxos/artifact';
-import { FunctionType } from '@dxos/functions';
-import { log } from '@dxos/log';
-import { useConfig } from '@dxos/react-client';
-import { Filter, fullyQualifiedId, type Space, useQuery } from '@dxos/react-client/echo';
-import { isNonNullable } from '@dxos/util';
-
-import { AssistantCapabilities } from '../capabilities';
-import { ChatProcessor, type ChatProcessorOptions } from '../hooks';
-import { convertFunctionToTool, createToolsFromService } from '../tools';
-import { type AIChatType, type AssistantSettingsProps, ServiceType } from '../types';
-
-type UseChatProcessorProps = {
-  chat?: AIChatType;
-  space?: Space;
-  settings?: AssistantSettingsProps;
-  part?: 'deck' | 'dialog';
-  associatedArtifact?: AssociatedArtifact;
-};
-
-/**
- * Configure and create ChatProcessor.
- */
-export const useChatProcessor = ({
-  chat,
-  space,
-  settings,
-  // part = 'deck',
-  part,
-  associatedArtifact,
-}: UseChatProcessorProps): ChatProcessor => {
-  const aiClient = useCapability(AssistantCapabilities.AiClient);
-  const globalTools = useCapabilities(Capabilities.Tools);
-  const artifactDefinitions = useCapabilities(Capabilities.ArtifactDefinition);
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
-
-  // 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 = { space, dispatch, pivotId: chatId, part };
-    return [tools, extensions];
-  }, [dispatch, globalTools, space, chatId, serviceTools, functions]);
-
-  // Prompt.
-  const systemPrompt = useMemo(
-    () =>
-      createSystemPrompt({
-        artifacts: artifactDefinitions.map((definition) => `${definition.name}\n${definition.instructions}`),
-        associatedArtifact,
-      }),
-    [artifactDefinitions, associatedArtifact],
-  );
-
-  // 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']);
-
-  // Create processor.
-  // TODO(burdon): Updated on each query update above; should just update current processor.
-  const processor = useMemo(() => {
-    log('creating processor...', { settings });
-    return new ChatProcessor(aiClient.value, tools, artifactDefinitions, extensions, { model, systemPrompt });
-  }, [aiClient.value, tools, artifactDefinitions, extensions, model, systemPrompt]);
-
-  return processor;
-};

package/src/hooks/useMessageQueue.ts

@@ -1,22 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { useMemo } from 'react';
-
-import { type Message } from '@dxos/ai';
-import { createQueueDXN } from '@dxos/echo-schema';
-import { getSpace, useQueue } from '@dxos/react-client/echo';
-
-import { type AIChatType } from '../types';
-
-export const useMessageQueue = (chat?: AIChatType) => {
-  const space = getSpace(chat);
-  const queueDxn = useMemo(() => {
-    // TODO(dmaretskyi): Chat.queue.dxn should be a valid DXN already.
-    const dxn = space && chat?.queue.dxn;
-    return dxn ? createQueueDXN(space.id, dxn.parts.at(-1)) : undefined;
-  }, [space, chat?.queue.dxn]);
-
-  return useQueue<Message>(queueDxn);
-};