@dxos/plugin-assistant 0.8.4-main.28f8d3d → 0.8.4-main.406dc2a

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 BinaryOperator, type Expression, 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;
-}

package/src/stories/Chat.stories.tsx

@@ -1,317 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import '@dxos-theme';
-
-import { type Meta, type StoryObj } from '@storybook/react-vite';
-import React, { type FC, useCallback } from 'react';
-
-import { EXA_API_KEY } from '@dxos/ai/testing';
-import { Capabilities, useCapabilities } from '@dxos/app-framework';
-import { RESEARCH_BLUEPRINT, ResearchDataTypes, ResearchGraph } from '@dxos/assistant-testing';
-import { Filter, Obj, Ref } from '@dxos/echo';
-import { log } from '@dxos/log';
-import { Board, BoardPlugin } from '@dxos/plugin-board';
-import { Chess, ChessPlugin } from '@dxos/plugin-chess';
-import { InboxPlugin } from '@dxos/plugin-inbox';
-import { Map, MapPlugin } from '@dxos/plugin-map';
-import { MarkdownPlugin } from '@dxos/plugin-markdown';
-import { Markdown } from '@dxos/plugin-markdown';
-import { TablePlugin } from '@dxos/plugin-table';
-import { useClient } from '@dxos/react-client';
-import { useSpace } from '@dxos/react-client/echo';
-import { useAsyncEffect } from '@dxos/react-ui';
-import { DataType } from '@dxos/schema';
-import { render } from '@dxos/storybook-utils';
-import { trim } from '@dxos/util';
-
-import { translations } from '../translations';
-import { Assistant } from '../types';
-
-import {
-  BlueprintContainer,
-  ChatContainer,
-  type ComponentProps,
-  GraphContainer,
-  LoggingContainer,
-  SurfaceContainer,
-  TasksContainer,
-} from './components';
-import { addTestData, config, getDecorators, testTypes } from './testing';
-
-const DefaultStory = ({
-  debug = true,
-  components,
-  blueprints = [],
-}: {
-  debug?: boolean;
-  components: (FC<ComponentProps> | FC<ComponentProps>[])[];
-  blueprints?: string[];
-}) => {
-  const client = useClient();
-  const space = useSpace();
-
-  const blueprintsDefinitions = useCapabilities(Capabilities.BlueprintDefinition);
-  useAsyncEffect(async () => {
-    if (!space) {
-      return;
-    }
-    const { objects: chats = [] } = await space.db.query(Filter.type(Assistant.Chat)).run();
-    const chat = chats[0];
-    if (!chat) {
-      return;
-    }
-
-    // TODO(burdon): Active should be ephemeral state of AiProcessor; write on edit/prompt.
-
-    // TODO(burdon): RACE CONDITION; must handle concurrently adding multiple blueprints instances with same key.
-    // Add blueprints to context.
-    // const binder = new AiContextBinder(await chat.queue.load());
-    // for (const key of blueprints) {
-    //   const blueprint = blueprintsDefinitions.find((blueprint) => blueprint.key === key);
-    //   if (blueprint) {
-    //     const obj = space.db.add(Obj.clone(blueprint));
-    //     await binder.bind({ blueprints: [Ref.make(obj)] });
-    //   }
-    // }
-  }, [space, blueprints, blueprintsDefinitions]);
-
-  const handleEvent = useCallback<NonNullable<ComponentProps['onEvent']>>((event) => {
-    log.info('event', { event });
-    switch (event) {
-      case 'reset': {
-        void client?.reset().then(() => {
-          document.location.reload();
-        });
-        break;
-      }
-    }
-  }, []);
-
-  if (!space) {
-    return null;
-  }
-
-  return (
-    <div
-      className='grid grid-cols gap-2 m-2'
-      style={{ gridTemplateColumns: `repeat(${components.length}, minmax(0, 40rem))` }}
-    >
-      {components.map((Component, index) =>
-        Array.isArray(Component) ? (
-          <div
-            key={index}
-            className='grid grid-rows gap-2 overflow-hidden'
-            style={{ gridTemplateRows: `repeat(${Component.length}, 1fr)` }}
-          >
-            {Component.map((Component, index) => (
-              <div key={index} className='flex flex-col overflow-hidden bg-baseSurface rounded border border-separator'>
-                <Component space={space} debug={debug} onEvent={handleEvent} />
-              </div>
-            ))}
-          </div>
-        ) : (
-          <div key={index} className='flex flex-col overflow-hidden bg-baseSurface rounded border border-separator'>
-            <Component space={space} debug={debug} onEvent={handleEvent} />
-          </div>
-        ),
-      )}
-    </div>
-  );
-};
-
-const storybook = {
-  title: 'plugins/plugin-assistant/Chat',
-  render: render(DefaultStory),
-  parameters: {
-    translations,
-    controls: { disable: true },
-  },
-} satisfies Meta<typeof DefaultStory>;
-
-export default storybook;
-
-type Story = StoryObj<typeof storybook>;
-
-//
-// Stories
-//
-
-export const Default = {
-  decorators: getDecorators({
-    config: config.remote,
-  }),
-  args: {
-    components: [ChatContainer],
-  },
-} satisfies Story;
-
-export const WithDocument = {
-  decorators: getDecorators({
-    plugins: [MarkdownPlugin()],
-    config: config.remote,
-    onInit: async ({ space, binder }) => {
-      const object = space.db.add(
-        Markdown.makeDocument({
-          name: 'Document',
-          content: trim`
-            # Hello, world!
-            This is a test.
-          `,
-        }),
-      );
-      await binder.bind({ objects: [Ref.make(object)] });
-    },
-  }),
-  args: {
-    components: [ChatContainer, SurfaceContainer],
-  },
-} satisfies Story;
-
-export const WithBlueprints = {
-  decorators: getDecorators({
-    plugins: [InboxPlugin(), MarkdownPlugin(), TablePlugin()],
-    config: config.remote,
-    onInit: async ({ space, binder }) => {
-      const object = space.db.add(Markdown.makeDocument({ name: 'Tasks' }));
-      await binder.bind({ objects: [Ref.make(object)] });
-    },
-  }),
-  args: {
-    components: [ChatContainer, [TasksContainer, BlueprintContainer]],
-  },
-} satisfies Story;
-
-export const WithChess = {
-  decorators: getDecorators({
-    plugins: [ChessPlugin()],
-    config: config.remote,
-    types: [Chess.Game],
-    onInit: async ({ space, binder }) => {
-      // TODO(burdon): Add player DID (for user and assistant).
-      const object = space.db.add(
-        Chess.makeGame({
-          name: 'Challenge',
-          pgn: '1. e4 e5 2. Nf3 Nc6 3. Bc4 Bc5 4. c3 Nf6 5. d4 exd4 6. cxd4 Bb4+ 7. Nc3 d5 8. exd5 Nxd5 9. O-O Be6 10. Qb3 Na5 11. Qa4+ c6 12. Bxd5 Bxc3 13. Bxe6 fxe6 *',
-        }),
-      );
-      await binder.bind({ objects: [Ref.make(object)] });
-    },
-  }),
-  args: {
-    components: [ChatContainer, SurfaceContainer],
-    blueprints: ['dxos.org/blueprint/assistant', 'dxos.org/blueprint/chess'],
-  },
-} satisfies Story;
-
-export const WithMap = {
-  decorators: getDecorators({
-    plugins: [MapPlugin()],
-    config: config.remote,
-    types: [Map.Map],
-    onInit: async ({ space, binder }) => {
-      const object = space.db.add(Map.makeMap());
-      await binder.bind({ objects: [Ref.make(object)] });
-    },
-  }),
-  args: {
-    components: [ChatContainer, SurfaceContainer],
-  },
-} satisfies Story;
-
-export const WithTrip = {
-  decorators: getDecorators({
-    plugins: [MarkdownPlugin(), MapPlugin()],
-    config: config.remote,
-    types: [Map.Map],
-    onInit: async ({ space, binder }) => {
-      // TODO(burdon): Table.
-      {
-        const object = space.db.add(Map.makeMap({ name: 'Trip' }));
-        await binder.bind({ objects: [Ref.make(object)] });
-      }
-      {
-        const object = space.db.add(
-          Markdown.makeDocument({
-            name: 'Itinerary',
-            content: trim`
-              # Itinerary
-
-              ## Day 1
-              - Visit the Sagrada Familia
-              - Visit the Park Güell
-              - Visit the Casa Batlló
-
-              ## Day 2
-              - Visit the Eiffel Tower
-              - Visit the Louvre
-              - Visit the Musée d'Orsay
-            `,
-          }),
-        );
-        await binder.bind({ objects: [Ref.make(object)] });
-      }
-      {
-        const object = space.db.add(
-          Markdown.makeDocument({
-            name: 'Barcelona',
-            content: trim`
-              # Barcelona
-
-              Barcelona is the capital and most populous city of Catalonia, an autonomous community in northeastern Spain. 
-              It is located on the Mediterranean coast, on the banks of the Llobregat River, in the comarca of the Baix Llobregat. 
-              The city is known for its rich history, vibrant culture, and stunning architecture, including the Sagrada Familia, Park Güell, and Casa Batlló.
-            `,
-          }),
-        );
-        await binder.bind({ objects: [Ref.make(object)] });
-      }
-    },
-  }),
-  args: {
-    components: [ChatContainer, SurfaceContainer],
-  },
-} satisfies Story;
-
-export const WithBoard = {
-  decorators: getDecorators({
-    plugins: [BoardPlugin()],
-    config: config.remote,
-    types: [Board.Board],
-    onInit: async ({ space, binder }) => {
-      const object = space.db.add(Board.makeBoard());
-      await binder.bind({ objects: [Ref.make(object)] });
-    },
-  }),
-  args: {
-    debug: true,
-    components: [ChatContainer, SurfaceContainer],
-  },
-} satisfies Story;
-
-export const WithResearch = {
-  decorators: getDecorators({
-    plugins: [MarkdownPlugin(), TablePlugin()],
-    config: config.persistent,
-    types: [...ResearchDataTypes, ResearchGraph, DataType.AccessToken],
-    accessTokens: [Obj.make(DataType.AccessToken, { source: 'exa.ai', token: EXA_API_KEY })],
-  }),
-  args: {
-    components: [ChatContainer, [GraphContainer, BlueprintContainer, LoggingContainer]],
-    blueprints: [RESEARCH_BLUEPRINT.key],
-  },
-} satisfies Story;
-
-export const WithSearch = {
-  decorators: getDecorators({
-    config: config.remote,
-    types: testTypes,
-    onInit: async ({ space }) => {
-      await addTestData(space);
-    },
-  }),
-  args: {
-    components: [ChatContainer, [GraphContainer]],
-  },
-} satisfies Story;