@dxos/plugin-assistant 0.8.4-main.5ea62a8 → 0.8.4-main.ae835ea

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 { type ThemedClassName, useThemeContext } 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/SequenceEditor/index.ts

@@ -1,5 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-export * from './SequenceEditor';

package/src/execution-graph/execution-graph.ts

@@ -1,211 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { AgentStatus } from '@dxos/ai';
-import { Obj, type Ref } from '@dxos/echo';
-import { MESSAGE_PROPERTY_TOOL_CALL_ID } from '@dxos/functions';
-import { type ObjectId } from '@dxos/keys';
-import { LogLevel } from '@dxos/log';
-import { type Commit } from '@dxos/react-ui-components';
-import { ContentBlock, DataType } from '@dxos/schema';
-import { isNotFalsy } from '@dxos/util';
-
-// TODO(burdon): Move to assistant.
-
-// TODO(burdon): Add colors?
-enum IconType {
-  // General status.
-  SUCCESS = 'ph--check-circle--regular',
-  WARNING = 'ph--warning-circle--regular',
-  ERROR = 'ph--x-circle--regular',
-  FLAG = 'ph--flag--regular',
-  ROCKET = 'ph--rocket--regular',
-  TIMER = 'ph--timer--regular',
-
-  // Interactions.
-  USER = 'ph--user--regular',
-  USER_INTERACTION = 'ph--user-sound--regular',
-  AGENT = 'ph--robot--regular',
-  THINKING = 'ph--brain--regular',
-  LINK = 'ph--link--regular',
-  TOOL = 'ph--wrench--regular',
-}
-
-/**
- * Models the execution graph based on a stream of events.
- */
-export class ExecutionGraph {
-  // TODO(dmaretskyi): Evolve the internal state to support chats, functions, circuit workflows, etc.
-  private _commits: Commit[] = [];
-  private _branchNames = new Set<string>();
-
-  /**
-   * Adds events to the graph.
-   */
-  addEvents(events: Obj.Any[]) {
-    for (const event of events) {
-      if (Obj.instanceOf(DataType.Message, event)) {
-        const messageCommits = messageToCommit(event);
-        this._commits.push(...messageCommits);
-        messageCommits.map((c) => c.branch).forEach((branch) => this._branchNames.add(branch));
-      } else if (Obj.instanceOf(AgentStatus, event)) {
-        const branch = getBranchName({ parentMessage: event.parentMessage, toolCallId: event.toolCallId });
-        this._branchNames.add(branch);
-        this._commits.push({
-          id: event.id,
-          branch,
-          message: event.message,
-          icon: IconType.FLAG,
-          parents:
-            event.parentMessage && event.toolCallId
-              ? [getToolCallId(event.parentMessage, event.toolCallId)]
-              : undefined, // TODO(burdon): Fix.
-        });
-      }
-    }
-  }
-
-  /**
-   * Returns the current state of the graph.
-   */
-  getGraph(lastRequest = false): { branches: string[]; commits: Commit[] } {
-    const idx = lastRequest ? this._commits.findLastIndex((c) => c.tags?.includes('user')) : -1;
-    const commits = idx === -1 ? this._commits : this._commits.slice(idx);
-
-    return {
-      branches: Array.from(this._branchNames),
-      commits: commits,
-    };
-  }
-}
-
-// TODO(burdon): Pass in AiToolProvider.
-const messageToCommit = (message: DataType.Message): Commit[] => {
-  return message.blocks
-    .map((block, idx) => {
-      const branch = getMessageBranch(message);
-      const parent = getParentId(message);
-      const parents = parent ? [parent] : [];
-      switch (block._tag) {
-        case 'text':
-          if (!block.text.trim().length) {
-            return null;
-          }
-          return {
-            id: getGenericBlockId(message.id, idx),
-            branch,
-            parents,
-            ...(message.sender.role === 'user'
-              ? {
-                  icon: IconType.USER,
-                  tags: ['user'],
-                  message: 'Processing request...',
-                }
-              : {
-                  icon: IconType.AGENT,
-                  message: `Response (${block.text.split(' ').length} words)`,
-                }),
-          } satisfies Commit;
-        case 'toolCall':
-          return {
-            id: getToolCallId(message.id, block.toolCallId),
-            branch,
-            parents,
-            icon: IconType.TOOL,
-            level: LogLevel.INFO,
-            // TODO(burdon): Lookup tool name/description?
-            message: `Calling tool (${block.name})`,
-          } satisfies Commit;
-        case 'toolResult':
-          return {
-            id: getToolResultId(message.id, block.toolCallId),
-            branch,
-            parents,
-            icon: block.error ? IconType.ERROR : IconType.SUCCESS,
-            level: block.error ? LogLevel.ERROR : LogLevel.INFO,
-            message: block.error ? 'Tool error: ' + block.error : 'Tool call succeeded',
-          } satisfies Commit;
-        case 'summary':
-          return {
-            id: getGenericBlockId(message.id, idx),
-            branch,
-            parents,
-            icon: IconType.ROCKET,
-            level: LogLevel.INFO,
-            message: ContentBlock.createSummaryMessage(block),
-          } satisfies Commit;
-        case 'status':
-          return {
-            id: getGenericBlockId(message.id, idx),
-            branch,
-            parents,
-            message: block.statusText,
-            level: LogLevel.INFO,
-            icon: IconType.FLAG,
-          } satisfies Commit;
-        case 'reasoning':
-          return {
-            id: getGenericBlockId(message.id, idx),
-            branch,
-            parents,
-            message: block.reasoningText ?? 'Thinking...',
-            icon: IconType.THINKING,
-          } satisfies Commit;
-        case 'reference':
-          return {
-            id: getGenericBlockId(message.id, idx),
-            branch,
-            parents,
-            icon: IconType.LINK,
-            message: stringifyRef(block.reference),
-          } satisfies Commit;
-        default:
-          return null;
-      }
-    })
-    .filter(isNotFalsy);
-};
-
-const getToolCallId = (messageId: ObjectId, toolCallId: string) => `${messageId}_toolCall_${toolCallId}`;
-
-const getToolResultId = (messageId: ObjectId, toolCallId: string) => `${messageId}_toolResult_${toolCallId}`;
-
-const getGenericBlockId = (messageId: ObjectId, idx: number) => `${messageId}_block_${idx}`;
-
-const getBranchName = (options: { parentMessage?: ObjectId; toolCallId?: string }) => {
-  if (options.parentMessage && options.toolCallId) {
-    return `${options.parentMessage}_${options.toolCallId}`;
-  } else if (options.parentMessage) {
-    return options.parentMessage;
-  } else {
-    return 'main';
-  }
-};
-
-const getMessageBranch = (message: DataType.Message) => {
-  return getBranchName({
-    parentMessage: message.parentMessage,
-    toolCallId: message.properties?.[MESSAGE_PROPERTY_TOOL_CALL_ID],
-  });
-};
-
-const getParentId = (message: DataType.Message) => {
-  if (message.parentMessage && message.properties?.[MESSAGE_PROPERTY_TOOL_CALL_ID]) {
-    return getToolCallId(message.parentMessage, message.properties[MESSAGE_PROPERTY_TOOL_CALL_ID]);
-  } else {
-    return undefined;
-  }
-};
-
-const stringifyRef = (ref: Ref.Any) => {
-  if (ref.target) {
-    return stringifyObject(ref.target);
-  }
-
-  return ref.dxn.asEchoDXN()?.echoId ?? ref.dxn.asQueueDXN()?.objectId ?? '';
-};
-
-const stringifyObject = (obj: Obj.Any) => {
-  return Obj.getLabel(obj) ?? Obj.getTypename(obj) ?? obj.id;
-};

package/src/execution-graph/index.ts

@@ -1,5 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-export * from './execution-graph';

package/src/hooks/useExecutionGraph.ts

@@ -1,20 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { useMemo } from 'react';
-
-import { type Queue } from '@dxos/client/echo';
-import { Obj, type Ref } from '@dxos/echo';
-import { useQueue } from '@dxos/react-client/echo';
-
-import { ExecutionGraph } from '../execution-graph';
-
-export const useExecutionGraph = (queueRef?: Ref.Ref<Queue>, lastRequest = false) => {
-  const queue = useQueue(queueRef?.dxn);
-  return useMemo(() => {
-    const graph = new ExecutionGraph();
-    graph.addEvents(queue?.objects.filter(Obj.isObject) ?? []);
-    return graph.getGraph(lastRequest);
-  }, [queue?.objects, lastRequest]);
-};

package/src/hooks/useMatcherExtension.ts

@@ -1,45 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { useMemo } from 'react';
-
-import { type Space } from '@dxos/client/echo';
-import { Type } from '@dxos/echo';
-import { type TypeaheadContext, matchCompletion, staticCompletion, typeahead } from '@dxos/react-ui-editor';
-
-// TODO(burdon): Move def to @dxos/echo.
-export const useMatcherExtension = (space: Space) => {
-  return useMemo(() => {
-    const handleComplete = ({ line }: TypeaheadContext) => {
-      const words = line.split(/\s+/).filter(Boolean);
-      if (words.length > 0) {
-        const word = words.at(-1)!;
-
-        // Match type.
-        const match = word.match(/^type:(.+)/);
-        if (match) {
-          const part = match[1];
-          for (const schema of space?.db.graph.schemaRegistry.schemas ?? []) {
-            const typename = Type.getTypename(schema);
-            if (typename) {
-              const completion = matchCompletion(typename, part);
-              if (completion) {
-                return completion;
-              }
-            }
-          }
-        }
-
-        // Match static.
-        return staticCompletion(['type:', 'AND', 'OR', 'NOT'])({ line });
-      }
-    };
-
-    return [
-      typeahead({
-        onComplete: handleComplete,
-      }),
-    ];
-  }, [space]);
-};

package/src/hooks/useResolveRef.ts

@@ -1,33 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { useMemo, useSyncExternalStore } from 'react';
-
-import { type Space } from '@dxos/client/echo';
-import { type Ref } from '@dxos/echo';
-
-// TODO(burdon): Factor out.
-export const useResolvedRef = <T>(space: Space, ref: Ref.Ref<T>): T | undefined => {
-  const { subscribe, getSnapshot } = useMemo(() => {
-    const resolver = space.db.graph.createRefResolver({});
-    let currentCallback: (() => void) | undefined = undefined;
-
-    return {
-      subscribe: (cb: () => void) => {
-        currentCallback = cb;
-        return () => {
-          if (currentCallback === cb) {
-            currentCallback = undefined;
-          }
-        };
-      },
-      getSnapshot: () =>
-        resolver?.resolveSync(ref.dxn, true, () => {
-          currentCallback?.();
-        }) as T | undefined,
-    };
-  }, [space, ref.dxn.toString()]);
-
-  return useSyncExternalStore<T | undefined>(subscribe, getSnapshot);
-};

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,76 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { Filter } from '@dxos/echo';
-
-// TODO(burdon): Factor out.
-
-import { type Expression, type Identifier, type Literal, type RelationalOperator } 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;
-
-      // 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];
-      if (filterFn) {
-        return filterFn((right as Literal).value);
-      }
-
-      throw new Error(`Unsupported operator: ${operator}`);
-    }
-
-    case 'unary': {
-      const { operator, argument } = ast;
-      if (operator === 'NOT') {
-        return Filter.not(createFilter(argument));
-      }
-      throw new Error(`Unsupported unary operator: ${operator}`);
-    }
-
-    case 'identifier': {
-      const { name } = ast;
-      return Filter._props({ [name]: true });
-    }
-
-    case 'literal': {
-      const { value } = ast;
-      // 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 type * 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);
-    }
-  });
-});