@dxos/plugin-assistant 0.8.4-main.67995b8 → 0.8.4-main.dedc0f3

package/src/components/ChatThread/ToolBlock.tsx

@@ -1,121 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import React, { type FC, useEffect, useMemo, useRef, useState } from 'react';
-
-import { type AgentStatus, 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 { type JsonProps, Json as NativeJson } from '@dxos/react-ui-syntax-highlighter';
-import { type DataType } from '@dxos/schema';
-import { isNonNullable, isNotFalsy } from '@dxos/util';
-
-export const isToolMessage = (message: DataType.Message) => {
-  return message.blocks.some((block) => block._tag === 'toolCall' || block._tag === 'toolResult');
-};
-
-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 type ToolBlockProps = ThemedClassName<{
-  message: DataType.Message;
-  tools?: Tool[];
-}>;
-
-export const ToolBlock: FC<ToolBlockProps> = ({ classNames, message, tools }) => {
-  const { blocks = [] } = message;
-
-  let request: { tool: Tool | undefined; block: any } | undefined;
-  const toolBlocks = blocks.filter((block) => block._tag === 'toolCall' || block._tag === 'toolResult');
-  const items = toolBlocks
-    .map((block) => {
-      switch (block._tag) {
-        case 'toolCall': {
-          // TODO(burdon): Skip these updates?
-          if (block.pending && request?.block.toolCallId === block.toolCallId) {
-            return null;
-          }
-
-          request = { tool: tools?.find((tool) => tool.name === block.name), block };
-          return {
-            title: getToolCaption(request.tool, undefined), // block.status), // TODO(burdon): Get status?
-            block,
-          };
-        }
-
-        case 'toolResult': {
-          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='w-full grid grid-cols-[32px_1fr]'>
-        <NumericTabs ref={tabsRef} length={items.length} selected={selected} onSelect={handleSelect} />
-        <Json data={items[selected].block} />
-      </div>
-    </ToggleContainer>
-  );
-};
-
-export const Json = ({ data }: Pick<JsonProps, 'data'>) => (
-  <NativeJson data={data} classNames='!p-1 text-xs bg-transparent' />
-);

package/src/components/ChatThread/reducer.ts

@@ -1,52 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { type DataType } from '@dxos/schema';
-
-// TODO(burdon): Move to util?
-type Reducer<R, I> = (acc: R, value: I) => R;
-
-/**
- * Reducer that collapses related message blocks into single messages.
- * For example, combines tool request/response pairs into a single message.
- */
-export const messageReducer: Reducer<{ messages: DataType.Message[]; current?: DataType.Message }, DataType.Message> = (
-  { current, messages },
-  message,
-) => {
-  let i = 0;
-  for (const block of message.blocks) {
-    switch (block._tag) {
-      case 'toolCall':
-      case 'toolResult': {
-        if (current) {
-          current.blocks.push(block);
-        } else {
-          current = {
-            ...message,
-            id: [message.id, i].join('_'),
-            blocks: [block],
-          };
-          messages.push(current);
-        }
-        break;
-      }
-
-      case 'text':
-      default: {
-        current = undefined;
-        messages.push({
-          ...message,
-          id: [message.id, i].join('_'),
-          blocks: [block],
-        });
-        break;
-      }
-    }
-
-    i++;
-  }
-
-  return { current, messages };
-};

package/src/hooks/chat-processor.test.ts

@@ -1,16 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { describe, it } from 'vitest';
-
-import { ChatProcessor } from './chat-processor';
-
-describe('ChatProcessor', () => {
-  it('should be instantiable', ({ expect }) => {
-    const services = {} as any; // TODO(burdon): Create mock.
-    const client = {} as any; // TODO(burdon): Create mock.
-    const processor = new ChatProcessor(services, client);
-    expect(processor).toBeDefined();
-  });
-});

package/src/hooks/chat-processor.ts

@@ -1,314 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { type Signal, batch, computed, signal } from '@preact/signals-core';
-import { Effect, type Layer } from 'effect';
-
-import { AiService, DEFAULT_EDGE_MODEL, type ExecutableTool, type GenerateRequest } from '@dxos/ai';
-import { type PromiseIntentDispatcher } from '@dxos/app-framework';
-import { type AiSession, ArtifactDiffResolver, type ContextBinder, type Conversation } from '@dxos/assistant';
-import { type ArtifactDefinition, type Blueprint } from '@dxos/blueprints';
-import { Context } from '@dxos/context';
-import { Obj } from '@dxos/echo';
-import { runAndForwardErrors } from '@dxos/effect';
-import { log } from '@dxos/log';
-import { Filter, type Space, getVersion } from '@dxos/react-client/echo';
-import { DataType } from '@dxos/schema';
-
-import type { ChatServices } from './useChatServices';
-
-// TODO(burdon): Factor out.
-declare global {
-  interface ToolContextExtensions {
-    space?: Space;
-    dispatch?: PromiseIntentDispatcher;
-  }
-}
-
-type RequestOptions = {
-  // Empty for now.
-};
-
-export type ChatProcessorOptions = {
-  // TODO(burdon): Change to AiToolkit.
-  tools?: readonly ExecutableTool[];
-  blueprintRegistry?: Blueprint.Registry;
-
-  // TODO(dmaretskyi): Remove.
-  artifacts?: readonly ArtifactDefinition[];
-  extensions?: ToolContextExtensions;
-  // TODO(burdon): Remove systemPrompt -- should come from blueprint.
-} & Pick<GenerateRequest, 'model' | 'systemPrompt'>;
-
-const defaultOptions: Partial<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.
- */
-// TODO(burdon): Rename ChatContext?
-export class ChatProcessor {
-  /**
-   * Pending messages (incl. the current user request).
-   * @reactive
-   */
-  private readonly _pending: Signal<DataType.Message[]> = signal([]);
-
-  /**
-   * Current streaming message (from the AI service).
-   * @reactive
-   */
-  private readonly _streaming: Signal<DataType.Message | undefined> = signal(undefined);
-
-  /**
-   * Streaming state.
-   * @reactive
-   */
-  public readonly streaming: Signal<boolean> = computed(() => this._streaming.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<DataType.Message[]> = computed(() => {
-    const messages = [...this._pending.value];
-    if (this._streaming.value) {
-      // TODO(dmaretskyi): Replace with Obj.clone.
-      // NOTE: We have to clone the message here so that react will re-render.
-      messages.push(Obj.make(DataType.Message, this._streaming.value));
-    }
-
-    return messages;
-  });
-
-  // TODO(burdon): Replace with Toolkit.
-  private _tools?: ExecutableTool[];
-
-  /** Current session. */
-  private _session: AiSession | undefined = undefined;
-
-  constructor(
-    // TODO(dmaretskyi): Replace this with effect's ManagedRuntime wrapping this layer.
-    private readonly _services: Layer.Layer<ChatServices>,
-    private readonly _conversation: Conversation,
-    private readonly _options: ChatProcessorOptions = defaultOptions,
-  ) {
-    this._tools = [...(_options.tools ?? [])];
-  }
-
-  get conversation() {
-    return this._conversation;
-  }
-
-  get context(): ContextBinder {
-    return this._conversation.context;
-  }
-
-  get blueprintRegistry() {
-    return this._options.blueprintRegistry;
-  }
-
-  get tools() {
-    return this._tools;
-  }
-
-  /**
-   * @deprecated Replace with blueprints
-   */
-  setTools(tools: ExecutableTool[]): void {
-    this._tools = tools;
-  }
-
-  /**
-   * Make GPT request.
-   */
-  async request(message: string, options: RequestOptions = {}): Promise<DataType.Message[]> {
-    await using ctx = Context.default(); // Auto-disposed at the end of this block.
-
-    this._conversation.onBegin.on(ctx, (session) => {
-      log.info('onBegin', { session, isDisposed: ctx.disposed });
-
-      this._session = session;
-      ctx.onDispose(() => {
-        log.info('onDispose', { session, isDisposed: ctx.disposed });
-        if (this._session === session) {
-          this._session = undefined;
-        }
-      });
-
-      // User message.
-      session.userMessage.on((message) => {
-        log.info('userMessage', { message });
-        this._pending.value = [...this._pending.value, message];
-      });
-
-      // Message complete.
-      session.message.on((message) => {
-        batch(() => {
-          this._pending.value = [...this._pending.value, message];
-          this._streaming.value = undefined;
-        });
-      });
-
-      // Streaming update (happens before message complete).
-      session.update.on((block) => {
-        batch(() => {
-          if (!this._streaming.value) {
-            // TODO(burdon): Hack to create temp message; better for session to send initial partial object?
-            this._streaming.value = Obj.make(DataType.Message, {
-              created: new Date().toISOString(),
-              sender: { role: 'assistant' },
-              blocks: [block],
-            });
-          } else if (this._streaming.value.blocks.at(-1)?.pending === true) {
-            this._streaming.value.blocks[this._streaming.value.blocks.length - 1] = block;
-          } else {
-            this._streaming.value.blocks.push(block);
-          }
-        });
-      });
-
-      session.block.on((block) => {
-        if (!this._streaming.value) {
-          // TODO(burdon): Hack to create temp message; better for session to send initial partial object?
-          this._streaming.value = Obj.make(DataType.Message, {
-            created: new Date().toISOString(),
-            sender: { role: 'assistant' },
-            blocks: [block],
-          });
-        } else if (this._streaming.value.blocks.at(-1)?.pending === true) {
-          this._streaming.value.blocks[this._streaming.value.blocks.length - 1] = block;
-        } else {
-          this._streaming.value.blocks.push(block);
-        }
-      });
-
-      // TODO(dmaretskyi): Handle tool status reports.
-      // 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((block) =>
-      //             block.type === 'tool_use' && block.id === toolUse.id ? { ...block, currentStatus: status } : block,
-      //           ),
-      //         };
-      //       }
-
-      //       return m;
-      //     });
-      //   } else {
-      //     log.warn('no block for status report');
-      //   }
-      // });
-    });
-
-    try {
-      const messages = await runAndForwardErrors(
-        this._conversation
-          .run({
-            prompt: message,
-            // TODO(burdon): Construct from blueprints?
-            systemPrompt: this._options.systemPrompt,
-          })
-          .pipe(
-            //
-            Effect.provide(AiService.model(this._options.model ?? DEFAULT_EDGE_MODEL)),
-            // TODO(dmaretskyi): Move ArtifactDiffResolver upstream.
-            Effect.provideService(ArtifactDiffResolver, this._artifactDiffResolver),
-            Effect.provide(this._services),
-            Effect.tapErrorCause((cause) => {
-              log.error('error', { cause });
-              return Effect.void;
-            }),
-          ),
-      );
-
-      log('completed', { messages });
-    } 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 });
-      }
-    }
-
-    return this._reset();
-  }
-
-  /**
-   * Cancel pending requests.
-   * @returns Pending requests (incl. the request message).
-   */
-  async cancel(): Promise<DataType.Message[]> {
-    log.info('cancelling...');
-
-    // TODO(dmaretskyi): Conversation should handle aborting.
-    this._session?.abort();
-    return this._reset();
-  }
-
-  private async _reset(): Promise<DataType.Message[]> {
-    const messages = this._pending.value;
-    batch(() => {
-      this._pending.value = [];
-      this._streaming.value = undefined;
-    });
-
-    return messages;
-  }
-
-  private _artifactDiffResolver: ArtifactDiffResolver.Service = {
-    resolve: async (artifacts) => {
-      const space = this._options.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/useBlueprints.ts

@@ -1,57 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { effect } from '@preact/signals-react';
-import { useCallback, useEffect, useState } from 'react';
-
-import { type ContextBinder } from '@dxos/assistant';
-import { Blueprint } from '@dxos/blueprints';
-import { type Space } from '@dxos/client/echo';
-import { Obj, Ref } from '@dxos/echo';
-import { log } from '@dxos/log';
-import { isNonNullable } from '@dxos/util';
-
-export type UpdateCallback = (key: string, active: boolean) => void;
-
-/**
- * Get collection of active blueprints based on the context.
- */
-export const useBlueprints = (
-  space: Space,
-  context: ContextBinder,
-  blueprintRegistry?: Blueprint.Registry,
-): [Blueprint.Blueprint[], UpdateCallback] => {
-  const [blueprints, setBlueprints] = useState<Blueprint.Blueprint[]>([]);
-  useEffect(() => {
-    let t: NodeJS.Timeout;
-    effect(() => {
-      const refs = [...(context.blueprints.value ?? [])];
-      t = setTimeout(async () => {
-        const blueprints = (await Ref.Array.loadAll(refs)).filter(isNonNullable);
-        setBlueprints(blueprints);
-      });
-    });
-
-    return () => clearTimeout(t);
-  }, [context]);
-
-  const handleUpdate = useCallback<UpdateCallback>(
-    (key: string, active: boolean) => {
-      log.info('update', { key, active });
-      if (active) {
-        // TODO(burdon): Check if already in space.
-        const blueprint = blueprintRegistry?.getByKey(key);
-        if (blueprint) {
-          // TODO(dmaretskyi): This should be done by Obj.clone.
-          const { id: _id, ...data } = blueprint;
-          const obj = space.db.add(Obj.make(Blueprint.Blueprint, data));
-          void context.bind({ blueprints: [Ref.make(obj)] });
-        }
-      }
-    },
-    [space, context],
-  );
-
-  return [blueprints, handleUpdate] as const;
-};

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 type * from './types';