@dxos/plugin-assistant 0.8.4-main.c1de068 → 0.8.4-main.e098934

package/src/components/Toolbar/useChatToolbarActions.ts

@@ -0,0 +1,126 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Rx } from '@effect-rx/rx-react';
+import { Effect } from 'effect';
+import { useMemo } from 'react';
+
+import { createIntent, useIntentDispatcher } from '@dxos/app-framework';
+import { Filter, Obj, Query } from '@dxos/echo';
+import { invariant } from '@dxos/invariant';
+import { SpaceAction } from '@dxos/plugin-space/types';
+import { getSpace, useQuery } from '@dxos/react-client/echo';
+import { MenuBuilder, useMenuActions } from '@dxos/react-ui-menu';
+
+import { meta } from '../../meta';
+import { Assistant, AssistantAction } from '../../types';
+
+export type ChatToolbarActionsProps = {
+  chat: Assistant.Chat;
+  companionTo?: Obj.Any;
+  onReset?: () => void;
+};
+
+export const useChatToolbarActions = ({ chat, companionTo, onReset }: ChatToolbarActionsProps) => {
+  const { dispatch } = useIntentDispatcher();
+  const space = getSpace(chat);
+  const query = companionTo
+    ? Query.select(Filter.ids(companionTo.id)).targetOf(Assistant.CompanionTo).source()
+    : Query.select(Filter.nothing());
+  // TODO(wittjosiah): Query in react vs query in rx?
+  const chats = useQuery(space, query);
+
+  return useMenuActions(
+    useMemo(
+      () =>
+        Rx.make(() => {
+          const builder = MenuBuilder.make()
+            .root({
+              label: ['chat toolbar title', { ns: meta.id }],
+            })
+            .action(
+              'new',
+              {
+                label: ['button new thread', { ns: meta.id }],
+                icon: 'ph--plus--regular',
+                type: 'new',
+              },
+              () =>
+                Effect.gen(function* () {
+                  invariant(space);
+                  const { object } = yield* dispatch(createIntent(AssistantAction.CreateChat, { space }));
+                  yield* dispatch(createIntent(SpaceAction.AddObject, { object, target: space, hidden: true }));
+                  if (companionTo) {
+                    yield* dispatch(
+                      createIntent(SpaceAction.AddRelation, {
+                        space,
+                        schema: Assistant.CompanionTo,
+                        source: object,
+                        target: companionTo,
+                      }),
+                    );
+
+                    yield* dispatch(createIntent(AssistantAction.SetCurrentChat, { companionTo, chat: object }));
+                  }
+                }).pipe(Effect.runPromise),
+            )
+            .action(
+              'branch',
+              {
+                label: ['button branch thread', { ns: meta.id }],
+                icon: 'ph--git-branch--regular',
+                type: 'branch',
+                disabled: true,
+              },
+              () => {},
+            );
+
+          if (chats.length > 0) {
+            builder.group(
+              'chats',
+              {
+                label: ['chat history label', { ns: meta.id }],
+                icon: 'ph--clock-counter-clockwise--regular',
+                selectCardinality: 'single',
+                variant: 'dropdownMenu',
+              },
+              (builder) => {
+                chats
+                  // TODO(wittjosiah): This should be the default sort order.
+                  .toSorted((a, b) => a.id.localeCompare(b.id))
+                  .forEach((chat) => {
+                    builder.action(
+                      chat.id,
+                      {
+                        label: Obj.getLabel(chat) ?? ['object name placeholder', { ns: Assistant.Chat.typename }],
+                      },
+                      () =>
+                        Effect.gen(function* () {
+                          invariant(companionTo);
+                          yield* dispatch(createIntent(AssistantAction.SetCurrentChat, { companionTo, chat }));
+                        }).pipe(Effect.runPromise),
+                    );
+                  });
+              },
+            );
+          }
+
+          if (onReset) {
+            builder.action(
+              'reset',
+              {
+                label: ['button reset', { ns: meta.id }],
+                icon: 'ph--trash--regular',
+                type: 'reset',
+              },
+              onReset,
+            );
+          }
+
+          return builder.build();
+        }),
+      [chats],
+    ),
+  );
+};

package/src/components/Toolbox/Toolbox.stories.tsx

@@ -4,10 +4,10 @@
 
 import '@dxos-theme';
 
-import { type Meta } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { IntentPlugin, Capabilities, useCapabilities, SettingsPlugin } from '@dxos/app-framework';
+import { IntentPlugin, SettingsPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { capabilities } from '@dxos/assistant-testing';
 import { ChessPlugin } from '@dxos/plugin-chess';
@@ -17,29 +17,23 @@ import { SpacePlugin } from '@dxos/plugin-space';
 import { TablePlugin } from '@dxos/plugin-table';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
-import { Toolbox, type ToolboxProps } from './Toolbox';
 import { translations } from '../../translations';
 
+import { Toolbox, type ToolboxProps } from './Toolbox';
+
 const DefaultStory = (props: ToolboxProps) => {
-  const artifactDefinitions = useCapabilities(Capabilities.ArtifactDefinition);
-  return (
-    <Toolbox
-      {...props}
-      artifacts={artifactDefinitions}
-      classNames='w-[30rem] h-[15rem] rounded-sm border border-separator py-1'
-    />
-  );
+  return <Toolbox {...props} classNames='w-[30rem] h-[15rem] rounded-sm border border-separator py-1' />;
 };
 
-const meta: Meta<typeof Toolbox> = {
+const meta = {
   title: 'plugins/plugin-assistant/Toolbox',
-  component: Toolbox,
+  component: Toolbox as any,
   render: DefaultStory,
   decorators: [
     withPluginManager({
       plugins: [
         ClientPlugin({
-          onClientInitialized: async (_, client) => {
+          onClientInitialized: async ({ client }) => {
             await client.halo.createIdentity();
           },
         }),
@@ -59,10 +53,10 @@ const meta: Meta<typeof Toolbox> = {
     layout: 'centered',
     translations,
   },
-};
+} satisfies Meta<typeof DefaultStory>;
 
 export default meta;
 
-type Story = Meta<typeof Toolbox>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {};

package/src/components/Toolbox/Toolbox.tsx

@@ -2,11 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { useState, useEffect, Fragment, type FC } from 'react';
+import React, { type FC, Fragment, useEffect, useState } from 'react';
 
-import { parseToolName, type Tool } from '@dxos/ai';
-import { Capabilities, useCapabilities } from '@dxos/app-framework';
-import { type ArtifactDefinition } from '@dxos/blueprints';
 import { type Blueprint } from '@dxos/blueprints';
 import { type Ref } from '@dxos/echo';
 import { FunctionType } from '@dxos/functions';
@@ -16,29 +13,19 @@ import { type ThemedClassName } from '@dxos/react-ui';
 import { useTranslation } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
 
-import { type ChatProcessor } from '../../hooks';
 import { meta } from '../../meta';
-import { createToolsFromService } from '../../tools';
+import { type AiChatProcessor } from '../../processor';
 import { ServiceType } from '../../types';
 
 export type ToolboxProps = ThemedClassName<{
-  blueprints?: readonly Ref.Ref<Blueprint.Blueprint>[];
-  artifacts?: ArtifactDefinition[];
-  services?: { service: ServiceType; tools: Tool[] }[];
+  services?: { service: ServiceType }[];
   functions?: FunctionType[];
+  // TODO(burdon): Combine into single array.
+  blueprints?: readonly Ref.Ref<Blueprint.Blueprint>[];
   activeBlueprints?: readonly Ref.Ref<Blueprint.Blueprint>[];
-  striped?: boolean;
 }>;
 
-export const Toolbox = ({
-  classNames,
-  artifacts,
-  functions,
-  services,
-  blueprints,
-  activeBlueprints,
-  striped,
-}: ToolboxProps) => {
+export const Toolbox = ({ classNames, functions, services, blueprints, activeBlueprints }: ToolboxProps) => {
   const { t } = useTranslation(meta.id);
 
   return (
@@ -49,7 +36,7 @@ export const Toolbox = ({
           items={blueprints.map(({ target }) => ({
             name: target?.name ?? '',
             description: target?.description ?? '',
-            subitems: target?.tools.map((toolId) => ({ name: `∙ ${parseToolName(toolId)}` })),
+            subitems: target?.tools.map((toolId) => ({ name: `∙ ${safeToolId(toolId)}` })),
           }))}
         />
       )}
@@ -60,18 +47,7 @@ export const Toolbox = ({
           items={activeBlueprints.map(({ target }) => ({
             name: target?.name ?? '',
             description: target?.description ?? '',
-            subitems: target?.tools.map((toolId) => ({ name: `∙ ${parseToolName(toolId)}` })),
-          }))}
-        />
-      )}
-
-      {artifacts && artifacts.length > 0 && (
-        <Section
-          title='Artifacts'
-          items={artifacts.map(({ name, description, tools }) => ({
-            name,
-            description,
-            subitems: tools.map(({ name, description }) => ({ name: `∙ ${parseToolName(name)}`, description })),
+            subitems: target?.tools.map((toolId) => ({ name: `∙ ${safeToolId(toolId)}` })),
           }))}
         />
       )}
@@ -79,10 +55,10 @@ export const Toolbox = ({
       {services && services.length > 0 && (
         <Section
           title='Services'
-          items={services.map(({ service: { serviceId, name, description }, tools }) => ({
+          items={services.map(({ service: { serviceId, name, description } }) => ({
             name: name ?? serviceId,
             description,
-            subitems: tools.map(({ name, description }) => ({ name: `∙ ${name}`, description })),
+            // subitems: tools.map(({ name, description }) => ({ name: `∙ ${name}`, description })),
           }))}
         />
       )}
@@ -90,12 +66,6 @@ export const Toolbox = ({
       {functions && functions.length > 0 && (
         <Section title='Functions' items={functions.map(({ name, description }) => ({ name, description }))} />
       )}
-
-      {!blueprints?.length &&
-        !activeBlueprints?.length &&
-        !artifacts?.length &&
-        !services?.length &&
-        !functions?.length && <div>{t('no tools')}</div>}
     </div>
   );
 };
@@ -136,24 +106,21 @@ const Section: FC<{
 
 export type ToolboxContainerProps = ThemedClassName<{
   space?: Space;
-  processor?: ChatProcessor;
+  processor?: AiChatProcessor;
 }>;
 
 export const ToolboxContainer = ({ classNames, space, processor }: ToolboxContainerProps) => {
-  // Plugin artifacts.
-  const artifactDefinitions = useCapabilities(Capabilities.ArtifactDefinition);
-
   // Registered services.
   const services = useQuery(space, Filter.type(ServiceType));
-  const [serviceTools, setServiceTools] = useState<{ service: ServiceType; tools: Tool[] }[]>([]);
+  const [serviceTools, setServiceTools] = useState<{ service: ServiceType }[]>([]);
   useEffect(() => {
     log('creating service tools...', { services: services.length });
     queueMicrotask(async () => {
-      const tools = await Promise.all(
-        services.map(async (service) => ({ service, tools: await createToolsFromService(service) })),
-      );
-
-      setServiceTools(tools);
+      // TODO(burdon): Fix.
+      // const tools = await Promise.all(
+      //   services.map(async (service) => ({ service, tools: await createToolsFromService(service) })),
+      // );
+      // setServiceTools(tools);
     });
   }, [services]);
 
@@ -164,9 +131,12 @@ export const ToolboxContainer = ({ classNames, space, processor }: ToolboxContai
     <Toolbox
       classNames={classNames}
       blueprints={processor?.context.blueprints.value}
-      artifacts={artifactDefinitions}
       services={serviceTools}
       functions={functions}
     />
   );
 };
+
+const safeToolId = (name: string) => {
+  return name.split('_').pop();
+};

package/src/components/index.ts

@@ -6,15 +6,14 @@ import { lazy } from 'react';
 
 export * from './AssistantSettings';
 export * from './Chat';
+export * from './ChatProgress';
 export * from './PromptSettings';
 export * from './TemplateEditor';
+export * from './Toolbar';
 export * from './Toolbox';
 
-// TODO(burdon): Lazy loading causes issues with Tabster.
-//  Repro: open assistant dialog then close.
-//  https://github.com/microsoft/fluentui/issues/34020
-
+export const BlueprintContainer = lazy(() => import('./BlueprintContainer'));
+export const ChatCompanion = lazy(() => import('./ChatCompanion'));
 export const ChatContainer = lazy(() => import('./ChatContainer'));
 export const ChatDialog = lazy(() => import('./ChatDialog'));
 export const SequenceContainer = lazy(() => import('./SequenceContainer'));
-export const TemplateContainer = lazy(() => import('./TemplateContainer'));

package/src/events.ts

@@ -2,10 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Events } from '@dxos/app-framework';
+import { defineEvent } from '@dxos/app-framework';
 
 import { meta } from './meta';
 
 export namespace AssistantEvents {
-  export const AiClientReady = Events.createStateEvent(`${meta.id}/ai-client-ready`);
+  export const SetupAiServiceProviders = defineEvent(`${meta.id}/event/setup-ai-service-providers`);
 }

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

@@ -0,0 +1,211 @@
+//
+// 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

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

package/src/functions/analysis.ts

@@ -0,0 +1,20 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Effect, Schema } from 'effect';
+
+import { defineFunction } from '@dxos/functions';
+import { log } from '@dxos/log';
+
+export default defineFunction({
+  name: 'dxos.org/function/assistant-analysis',
+  description: 'Enter analysis analysis mode.',
+  inputSchema: Schema.Struct({
+    enable: Schema.Boolean.annotations({ description: 'Enable or disable analysis mode.' }),
+  }),
+  outputSchema: Schema.Void,
+  handler: Effect.fn(function* ({ context, data: { enable } }) {
+    log.info('analysis mode', { space: context.space?.id, enable });
+  }),
+});

package/src/functions/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { default as analysis } from './analysis';
+export { default as list } from './list';
+export { default as load } from './load';

package/src/functions/list.ts

@@ -0,0 +1,46 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Effect, Schema } from 'effect';
+
+import { Filter, Obj, Query } from '@dxos/echo';
+import { DatabaseService, defineFunction } from '@dxos/functions';
+import { trim } from '@dxos/util';
+
+// TODO(burdon): Factor out to space plugin.
+export default defineFunction({
+  name: 'dxos.org/function/assistant/list',
+  description:
+    // TODO(wittjosiah): Find a better way to prompt for looking up typenames before querying with them.
+    trim`
+      Lists the objects of the given type.
+      Check the list-schemas tool for available types before calling this function.
+    `,
+  inputSchema: Schema.Struct({
+    typename: Schema.String.annotations({
+      description: 'The typename of the objects to list.',
+    }),
+  }),
+  outputSchema: Schema.Struct({
+    results: Schema.Array(
+      Schema.Struct({
+        dxn: Schema.String.annotations({ description: 'The DXN of the object.' }),
+        label: Schema.optional(Schema.String.annotations({ description: 'The label of the object.' })),
+      }),
+    ),
+  }),
+  handler: Effect.fn(function* ({ data: { typename } }) {
+    // TODO(wittjosiah): Typename query is not working for dynamic schemas.
+    const [schema] = yield* DatabaseService.runSchemaQuery({ typename });
+    const filter = schema ? Filter.type(schema) : Filter.typename(typename);
+
+    const { objects } = yield* DatabaseService.runQuery(Query.select(filter));
+    const results = objects.map((object) => ({
+      dxn: Obj.getDXN(object).toString(),
+      label: Obj.getLabel(object),
+    }));
+
+    return { results };
+  }),
+});