@dxos/plugin-assistant 0.8.3 → 0.8.4-main.1f223c7

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/parser/filter-generator.test.ts

@@ -1,32 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { describe, test } from 'vitest';
-
-import { Filter } from '@dxos/echo';
-
-import { createFilter } from './filter-generator';
-import { QueryParser } from './query-parser';
-
-describe('FilterGenerator', () => {
-  test('simple queries', ({ expect }) => {
-    const parser = new QueryParser('type:example.com/type/Person');
-    const ast = parser.parse();
-    expect(ast).toEqual({
-      type: 'binary',
-      operator: 'EQ',
-      left: {
-        type: 'identifier',
-        name: 'type',
-      },
-      right: {
-        type: 'literal',
-        value: 'example.com/type/Person',
-      },
-    });
-
-    const filter = createFilter(ast);
-    expect(filter).toEqual(Filter.typename('example.com/type/Person'));
-  });
-});

package/src/parser/filter-generator.ts

@@ -1,81 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { Filter } from '@dxos/echo';
-
-import {
-  type BinaryExpression,
-  type Expression,
-  type Identifier,
-  type Literal,
-  type RelationalOperator,
-  type UnaryExpression,
-} from './types';
-
-const relationalOperators: Record<RelationalOperator, (value: any) => Filter<any>> = {
-  EQ: Filter.eq,
-  LT: Filter.lt,
-  GT: Filter.gt,
-};
-
-const specialPredicates: Record<string, (value: string) => Filter<any>> = {
-  ['type' as const]: Filter.typename,
-};
-
-export const createFilter = (ast: Expression): Filter<any> => {
-  switch (ast.type) {
-    case 'binary': {
-      const { operator, left, right } = ast as BinaryExpression;
-
-      // Handle logical operators.
-      if (operator === 'AND') {
-        return Filter.and(createFilter(left), createFilter(right));
-      }
-      if (operator === 'OR') {
-        return Filter.or(createFilter(left), createFilter(right));
-      }
-
-      // Handle special predicates (e.g., "type:Person")
-      const predicateName = (left as Identifier).name;
-      const specialFilter = specialPredicates[predicateName];
-      if (specialFilter) {
-        return specialFilter((right as Literal).value);
-      }
-
-      // Handle relational operators
-      const filterFn = relationalOperators[operator as RelationalOperator];
-      if (filterFn) {
-        return filterFn((right as Literal).value);
-      }
-
-      throw new Error(`Unsupported operator: ${operator}`);
-    }
-
-    case 'unary': {
-      const { operator, argument } = ast as UnaryExpression;
-      if (operator === 'NOT') {
-        return Filter.not(createFilter(argument));
-      }
-      throw new Error(`Unsupported unary operator: ${operator}`);
-    }
-
-    case 'identifier': {
-      const { name } = ast as Identifier;
-      return Filter._props({ [name]: true });
-    }
-
-    case 'literal': {
-      const { value } = ast as Literal;
-      // Handle special '*' value for empty input.
-      if (value === '*') {
-        return Filter.everything();
-      }
-
-      return Filter.eq(value);
-    }
-
-    default:
-      throw new Error(`Unsupported expression type: ${(ast as any).type}`);
-  }
-};

package/src/parser/index.ts

@@ -1,7 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-export * from './filter-generator';
-export * from './query-parser';
-export * from './types';

package/src/parser/query-parser.test.ts

@@ -1,139 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { describe, test } from 'vitest';
-
-import { QueryParser } from './query-parser';
-
-describe('QueryParser', () => {
-  test('empty', ({ expect }) => {
-    const parser = new QueryParser('');
-    expect(parser.parse()).toEqual({
-      type: 'literal',
-      value: '*',
-    });
-  });
-
-  test('invalid queries', ({ expect }) => {
-    const cases = [
-      //
-      '!',
-      'X:',
-      ':Y',
-      'X;Y',
-      'x==100',
-    ];
-
-    for (const query of cases) {
-      const parser = new QueryParser(query);
-      expect(() => parser.parse()).toThrow();
-    }
-  });
-
-  test('valid queries', ({ expect }) => {
-    const cases = [
-      //
-      '',
-      'type:Person',
-      '$title = "foo"',
-      '(type:Person OR type:Organization) AND $title = "DXOS" AND $ts < TODAY',
-    ];
-
-    for (const query of cases) {
-      const parser = new QueryParser(query);
-      expect(parser.parse()).to.exist;
-    }
-  });
-
-  test('simple queries', ({ expect }) => {
-    const cases = [
-      {
-        query: 'type:Person',
-        ast: {
-          type: 'binary',
-          operator: 'EQ',
-          left: { type: 'identifier', name: 'type' },
-          right: { type: 'literal', value: 'Person' },
-        },
-      },
-      {
-        query: '$title = "DXOS"',
-        ast: {
-          type: 'binary',
-          operator: 'EQ',
-          left: { type: 'identifier', name: '$title' },
-          right: { type: 'literal', value: 'DXOS' },
-        },
-      },
-      {
-        query: '(type:Person OR type:Organization) AND $title = "DXOS" AND $ts < TODAY',
-        ast: {
-          left: {
-            left: {
-              left: {
-                left: {
-                  name: 'type',
-                  type: 'identifier',
-                },
-                operator: 'EQ',
-                right: {
-                  type: 'literal',
-                  value: 'Person',
-                },
-                type: 'binary',
-              },
-              operator: 'OR',
-              right: {
-                left: {
-                  name: 'type',
-                  type: 'identifier',
-                },
-                operator: 'EQ',
-                right: {
-                  type: 'literal',
-                  value: 'Organization',
-                },
-                type: 'binary',
-              },
-              type: 'binary',
-            },
-            operator: 'AND',
-            right: {
-              left: {
-                name: '$title',
-                type: 'identifier',
-              },
-              operator: 'EQ',
-              right: {
-                type: 'literal',
-                value: 'DXOS',
-              },
-              type: 'binary',
-            },
-            type: 'binary',
-          },
-          operator: 'AND',
-          right: {
-            left: {
-              name: '$ts',
-              type: 'identifier',
-            },
-            operator: 'LT',
-            right: {
-              type: 'literal',
-              value: 'TODAY',
-            },
-            type: 'binary',
-          },
-          type: 'binary',
-        },
-      },
-    ];
-
-    for (const { query, ast } of cases) {
-      const parser = new QueryParser(query);
-      expect(parser.parse()).toEqual(ast);
-    }
-  });
-});

package/src/parser/query-parser.ts

@@ -1,199 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { invariant } from '@dxos/invariant';
-
-import { type Expression, type BinaryOperator, type RelationalOperator } from './types';
-
-// TODO(burdon): Move to echo-schema?
-
-type RelationalSymbol = '=' | '<' | '>';
-
-const operators: Record<RelationalSymbol, RelationalOperator> = {
-  '=': 'EQ',
-  '<': 'LT',
-  '>': 'GT',
-};
-
-export class QueryParser {
-  private tokens: string[] = [];
-  private current = 0;
-
-  constructor(input: string) {
-    // Tokenize the input string.
-    this.tokens = this.tokenize(input);
-  }
-
-  private tokenize(input: string): string[] {
-    // Handle empty input.
-    if (!input.trim()) {
-      return [];
-    }
-
-    // Split on spaces but preserve quoted strings.
-    const tokens: string[] = [];
-    let current = '';
-    let inQuotes = false;
-
-    for (let i = 0; i < input.length; i++) {
-      const char = input[i];
-
-      if (char === '"') {
-        // Handle quoted strings.
-        inQuotes = !inQuotes;
-        current += char;
-      } else if (char === '(' || char === ')') {
-        // If we have accumulated tokens, add them first.
-        if (current) {
-          tokens.push(current);
-          current = '';
-        }
-        // Add the parenthesis as a separate token.
-        tokens.push(char);
-      } else if (operators[char as RelationalSymbol]) {
-        // If we have accumulated tokens, add them first.
-        if (current) {
-          tokens.push(current);
-          current = '';
-        }
-        // Add the operator as a separate token.
-        tokens.push(operators[char as RelationalSymbol]);
-      } else if (char === ' ' && !inQuotes) {
-        if (current) {
-          tokens.push(current);
-          current = '';
-        }
-      } else {
-        current += char;
-      }
-    }
-
-    if (current) {
-      tokens.push(current);
-    }
-
-    return tokens;
-  }
-
-  private peek(): string {
-    return this.tokens[this.current];
-  }
-
-  private advance(): string {
-    return this.tokens[this.current++];
-  }
-
-  private match(type: string): boolean {
-    if (this.peek() === type) {
-      this.advance();
-      return true;
-    }
-    return false;
-  }
-
-  private isAtEnd(): boolean {
-    return this.current >= this.tokens.length;
-  }
-
-  private parseExpression(): Expression {
-    let expr = this.parseTerm();
-
-    while (!this.isAtEnd()) {
-      const operator = this.peek();
-      if (operator === 'AND' || operator === 'OR') {
-        this.advance();
-        const right = this.parseTerm();
-        expr = {
-          type: 'binary',
-          operator: operator as BinaryOperator,
-          left: expr,
-          right,
-        };
-      } else {
-        break;
-      }
-    }
-
-    return expr;
-  }
-
-  private parseTerm(): Expression {
-    // Handle NOT operator
-    if (this.peek() === 'NOT') {
-      this.advance();
-      const argument = this.parseTerm();
-      return {
-        type: 'unary',
-        operator: 'NOT',
-        argument,
-      };
-    }
-
-    // Handle parentheses.
-    if (this.match('(')) {
-      const expr = this.parseExpression();
-      if (!this.match(')')) {
-        throw new Error('Expected closing parenthesis');
-      }
-      return expr;
-    }
-
-    const token = this.peek();
-
-    // Handle type:Person style expressions.
-    if (token.includes(':')) {
-      const [field, value] = token.split(':');
-      this.advance();
-      if (!field || !value) {
-        throw new Error(`Invalid type expression: ${token}`);
-      }
-
-      return {
-        type: 'binary',
-        operator: 'EQ',
-        left: { type: 'identifier', name: field },
-        right: { type: 'literal', value },
-      };
-    }
-
-    // Handle $field expressions with operators.
-    if (token.startsWith('$')) {
-      const field = token;
-      this.advance();
-
-      // Get the operator.
-      const operator = this.peek();
-      if (operator !== 'EQ' && operator !== 'LT' && operator !== 'GT') {
-        throw new Error(`Expected operator after field ${field}, got ${operator}`);
-      }
-      this.advance();
-
-      // Get the value
-      const value = this.peek();
-      this.advance();
-      invariant(value);
-
-      return {
-        type: 'binary',
-        operator: operator as BinaryOperator,
-        left: { type: 'identifier', name: field },
-        right: { type: 'literal', value: value.replace(/^"|"$/g, '') },
-      };
-    }
-
-    throw new Error(`Unexpected token: ${token}`);
-  }
-
-  public parse(): Expression {
-    // Return a special expression for empty input.
-    if (this.tokens.length === 0) {
-      return {
-        type: 'literal',
-        value: '*',
-      };
-    }
-
-    return this.parseExpression();
-  }
-}

package/src/parser/types.ts

@@ -1,34 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-export type UnaryOperator = 'NOT';
-
-export type RelationalOperator = 'EQ' | 'LT' | 'GT';
-
-export type BinaryOperator = RelationalOperator | 'AND' | 'OR';
-
-export type Expression = BinaryExpression | UnaryExpression | Identifier | Literal;
-
-export interface BinaryExpression {
-  type: 'binary';
-  operator: BinaryOperator;
-  left: Expression;
-  right: Expression;
-}
-
-export interface UnaryExpression {
-  type: 'unary';
-  operator: UnaryOperator;
-  argument: Expression;
-}
-
-export interface Identifier {
-  type: 'identifier';
-  name: string;
-}
-
-export interface Literal {
-  type: 'literal';
-  value: string;
-}

package/src/shims.d.ts

@@ -1,8 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-declare module '*?raw' {
-  const content: string;
-  export default content;
-}