@dxos/plugin-assistant 0.8.3-staging.0fa589b → 0.8.4-main.28f8d3d

package/src/components/Thread/ToolInvocations.tsx

@@ -1,106 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import React, { type FC, useEffect, useMemo, useRef, useState } from 'react';
-
-import { type AgentStatus, type Message, 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 { 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');
-};
-
-const getToolName = (tool: Tool) => {
-  return tool.namespace && tool.function ? `${tool.namespace}:${tool.function}` : tool.name.split('_').pop();
-};
-
-const getToolCaption = (tool: Tool | undefined, status: AgentStatus | undefined) => {
-  if (!tool) {
-    return 'Calling tool...';
-  }
-
-  return status?.message ?? tool.caption ?? `Calling ${getToolName(tool)}...`;
-};
-
-export const ToolBlock: FC<ThemedClassName<ThreadMessageProps>> = ({ classNames, message, tools }) => {
-  const { content = [] } = 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
-    .map((block) => {
-      switch (block.type) {
-        case 'tool_use': {
-          // TODO(burdon): Skip these updates?
-          if (block.pending && request?.block.id === block.id) {
-            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 };
-        }
-
-        case 'tool_result': {
-          if (!request) {
-            log.warn('unexpected message', { block });
-            return { title: 'Error', block };
-          }
-
-          return { title: `${getToolCaption(request.tool, undefined)} (Success)`, block };
-        }
-
-        default: {
-          request = undefined;
-          return { title: 'Error', block };
-        }
-      }
-    })
-    .filter(isNonNullable);
-
-  return <ToolContainer classNames={classNames} items={items} />;
-};
-
-export const ToolContainer: FC<ThemedClassName<{ items: { title: string; block: any }[] }>> = ({
-  classNames,
-  items,
-}) => {
-  const tabsRef = useRef<HTMLDivElement>(null);
-  const [selected, setSelected] = useState(0);
-  const [open, setOpen] = useState(false);
-  useEffect(() => {
-    if (open) {
-      tabsRef.current?.focus();
-    }
-  }, [open]);
-
-  const handleSelect = (index: number) => {
-    if (index === selected) {
-      setOpen(false);
-    } else {
-      setSelected(index);
-    }
-  };
-
-  const title = useMemo(() => {
-    const lines = items.map((item) => item.title).filter(isNotFalsy);
-    return <StatusRoll key='status-roll' lines={lines} duration={1_000} autoAdvance />;
-  }, [items]);
-
-  return (
-    <ToggleContainer classNames={['flex flex-col', classNames]} title={title} open={open} onChangeOpen={setOpen}>
-      <div className='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' />
-      </div>
-    </ToggleContainer>
-  );
-};

package/src/components/Thread/index.ts

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

package/src/hooks/processor.test.ts

@@ -1,15 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { describe, it } from 'vitest';
-
-import { ChatProcessor } from './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/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);
-};

package/src/hooks/useServices.ts

@@ -1,28 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { useEffect, useMemo, useState } from 'react';
-
-import { type Space } from '@dxos/client/echo';
-
-import { MockServiceRegistry } from '../testing';
-import { type ServiceType, type ServiceQuery } from '../types';
-
-/**
- * Retrieves matching services from the registry.
- */
-export const useServices = (space: Space, query?: ServiceQuery): ServiceType[] => {
-  const registry = useMemo(() => new MockServiceRegistry(), []);
-  const [services, setServices] = useState<ServiceType[]>([]);
-  useEffect(() => {
-    const t = setTimeout(async () => {
-      const services = await registry.queryServices(query);
-      setServices(services);
-    });
-
-    return () => clearTimeout(t);
-  }, [query, registry]);
-
-  return services;
-};

package/src/hooks/useTextInputEvents.ts

@@ -1,49 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { useState, useCallback, type KeyboardEventHandler, type ChangeEventHandler } from 'react';
-
-/**
- * Hook that handles text input events.
- */
-// TODO(burdon): Factor out.
-export const useTextInputEvents = ({
-  onEnter,
-  onEscape,
-}: {
-  onEnter?: (text: string) => boolean | void;
-  onEscape?: () => void;
-}) => {
-  const [value, setValue] = useState('');
-
-  const onKeyDown = useCallback<KeyboardEventHandler<HTMLInputElement>>(
-    (ev) => {
-      switch (ev.key) {
-        case 'Escape': {
-          onEscape?.();
-          setValue('');
-          break;
-        }
-
-        case 'Enter': {
-          const value = (ev.target as HTMLInputElement).value.trim();
-          if (value.length > 0) {
-            const reset = onEnter?.(value);
-            if (reset) {
-              setValue('');
-            }
-          }
-          break;
-        }
-      }
-    },
-    [onEnter, onEscape],
-  );
-
-  const onChange = useCallback<ChangeEventHandler<HTMLInputElement>>((ev) => {
-    setValue(ev.target.value);
-  }, []);
-
-  return [{ value, onKeyDown, onChange }, setValue];
-};

package/src/stories/Prompt.stories.tsx

@@ -1,60 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import '@dxos-theme';
-
-import { type Meta, type StoryObj } from '@storybook/react';
-import React, { useCallback, useState } from 'react';
-
-import { withPluginManager } from '@dxos/app-framework/testing';
-import { JsonFilter } from '@dxos/react-ui-syntax-highlighter';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
-
-import { PromptBar, type PromptBarProps } from '../components';
-import { type Expression, QueryParser } from '../parser';
-import translations from '../translations';
-
-const DefaultStory = (props: PromptBarProps) => {
-  const [ast, setAst] = useState<Expression>();
-  const handleSubmit = useCallback<NonNullable<PromptBarProps['onSubmit']>>((text) => {
-    const parser = new QueryParser(text);
-    const ast = parser.parse();
-    setAst(ast);
-  }, []);
-
-  return (
-    <div className='flex flex-col w-[40rem] border border-separator rounded-md'>
-      <PromptBar {...props} onSubmit={handleSubmit} />
-      <JsonFilter data={{ ast }} />
-    </div>
-  );
-};
-
-const meta: Meta<typeof PromptBar> = {
-  title: 'plugins/plugin-assistant/QueryPrompt',
-  render: DefaultStory,
-  decorators: [
-    withPluginManager({
-      plugins: [],
-    }),
-    withTheme,
-    withLayout({
-      fullscreen: true,
-      classNames: 'justify-center',
-    }),
-  ],
-  parameters: {
-    translations,
-    layout: 'centered',
-    controls: { disable: true },
-  },
-};
-
-type Story = StoryObj<typeof PromptBar>;
-
-export default meta;
-
-export const Default: Story = {
-  args: {},
-};