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

package/src/components/TemplateEditor/TemplateForm.stories.tsx

@@ -7,15 +7,16 @@ import '@dxos-theme';
 import { type Meta } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
-import { Template } from '@dxos/blueprints';
+import { Blueprint, Template } from '@dxos/blueprints';
 import { useClient } from '@dxos/react-client';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 import { trim } from '@dxos/util';
 
-import { TemplateForm } from './TemplateForm';
 import { translations } from '../../translations';
 
+import { TemplateForm } from './TemplateForm';
+
 const TEMPLATE = trim`
   You are a machine that is an expert chess player.
   The move history of the current game is: {{history}}
@@ -28,14 +29,20 @@ const TEMPLATE = trim`
 
 const DefaultStory = () => {
   const client = useClient();
-  const [template] = useState(() => {
+  const [blueprint] = useState(() => {
     const space = client.spaces.default;
-    return space.db.add(Template.make({ source: TEMPLATE }));
+    return space.db.add(
+      Blueprint.make({
+        key: 'example.com/blueprint/test',
+        name: 'Test',
+        instructions: Template.make({ source: TEMPLATE }),
+      }),
+    );
   });
 
   return (
     <div role='none' className='flex w-[40rem] border border-separator overflow-hidden'>
-      <TemplateForm template={template} />
+      <TemplateForm id={blueprint.id} template={blueprint.instructions} />
     </div>
   );
 };

package/src/components/TemplateEditor/TemplateForm.tsx

@@ -10,16 +10,18 @@ import { Input, Select, useTranslation } from '@dxos/react-ui';
 import { attentionSurface, groupBorder, mx } from '@dxos/react-ui-theme';
 import { isNonNullable } from '@dxos/util';
 
-import { TemplateEditor } from './TemplateEditor';
 import { meta } from '../../meta';
 
+import { TemplateEditor } from './TemplateEditor';
+
 export type TemplateFormProps = {
+  id: string;
   template: Template.Template;
   schema?: Schema.Schema<any, any, any>;
   commandEditable?: boolean;
 };
 
-export const TemplateForm = ({ template, commandEditable = true }: TemplateFormProps) => {
+export const TemplateForm = ({ id, template, commandEditable = true }: TemplateFormProps) => {
   const { t } = useTranslation(meta.id);
   usePromptInputs(template);
 
@@ -41,7 +43,7 @@ export const TemplateForm = ({ template, commandEditable = true }: TemplateFormP
         </div>
       )} */}
 
-      <TemplateEditor template={template} classNames={[attentionSurface, 'min-h-[120px]']} />
+      <TemplateEditor id={id} template={template} classNames={[attentionSurface, 'min-h-[120px]']} />
 
       {(template.inputs?.length ?? 0) > 0 && (
         <div className='grid grid-cols-[10rem_10rem_1fr] gap-1 items-center'>

package/src/components/Timeline/Timeline.stories.tsx

@@ -0,0 +1,144 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import '@dxos-theme';
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React, { useRef, useState } from 'react';
+
+import { LogLevel } from '@dxos/log';
+import { faker } from '@dxos/random';
+import { Button, Toolbar, useInterval } from '@dxos/react-ui';
+import { ScrollContainer, type ScrollController } from '@dxos/react-ui-components';
+import { withLayout, withTheme } from '@dxos/storybook-utils';
+
+import { type Branch, type Commit, IconType, Timeline } from './Timeline';
+
+faker.seed(1);
+
+const meta: Meta<typeof Timeline> = {
+  title: 'plugins/plugin-assistant/Timeline',
+  component: Timeline,
+  decorators: [withTheme, withLayout({ fullscreen: true })],
+};
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {
+    branches: [{ name: 'main' }, { name: 'feature-a' }, { name: 'feature-b' }, { name: 'feature-c' }],
+    commits: [
+      { id: 'c1', message: faker.lorem.paragraph(), branch: 'main' },
+      { id: 'c2', message: faker.lorem.paragraph(), branch: 'main', parent: 'c1' },
+      { id: 'c3', message: faker.lorem.paragraph(), branch: 'feature-a', parent: 'c2' },
+      { id: 'c4', message: faker.lorem.paragraph(), branch: 'main', parent: 'c2' },
+      { id: 'c5', message: faker.lorem.paragraph(), branch: 'feature-b', parent: 'c2' },
+      { id: 'c6', message: faker.lorem.paragraph(), branch: 'feature-a', parent: 'c3' },
+      { id: 'c7', message: faker.lorem.paragraph(), branch: 'feature-a', parent: 'c6' },
+      { id: 'c8', message: faker.lorem.paragraph(), branch: 'feature-c', parent: 'c6' },
+      { id: 'c9', message: faker.lorem.paragraph(), branch: 'main', parent: 'c4' },
+    ],
+  },
+};
+
+export const Linear: Story = {
+  args: {
+    branches: [{ name: 'main' }],
+    commits: [
+      { id: 'c1', message: faker.lorem.paragraph(), branch: 'main' },
+      { id: 'c2', message: faker.lorem.paragraph(), branch: 'main', parent: 'c1' },
+      { id: 'c3', message: faker.lorem.paragraph(), branch: 'main', parent: 'c2' },
+      { id: 'c4', message: faker.lorem.paragraph(), branch: 'main', parent: 'c3' },
+    ],
+  },
+};
+
+export const Empty: Story = {
+  args: {
+    branches: [],
+    commits: [],
+  },
+};
+
+export const Random: Story = {
+  render: () => {
+    const [branches, setBranches] = useState<Branch[]>([{ name: 'main' }]);
+    const [commits, setCommits] = useState<Commit[]>([
+      {
+        id: faker.string.uuid(),
+        branch: branches[0].name,
+        message: faker.lorem.paragraph(),
+      },
+    ]);
+    const lastCommit = useRef<string | undefined>(commits[0].id);
+    const lastBranch = useRef<string>(branches[0].name);
+
+    const [running, setRunning] = useState(true);
+    useInterval(
+      () => {
+        if (!running) {
+          return;
+        }
+
+        const p = Math.random();
+        if (p < 0.15 && branches.length < 6) {
+          const branch = { name: faker.lorem.word() } satisfies Branch;
+          setBranches((branches) => [...branches, branch]);
+          lastBranch.current = branch.name;
+        } else if (p < 0.4) {
+          const branch = branches[Math.floor(Math.random() * branches.length)];
+          lastBranch.current = branch.name;
+        }
+
+        const commit = {
+          id: faker.string.uuid(),
+          branch: lastBranch.current,
+          icon: faker.helpers.arrayElement([
+            IconType.WARN,
+            IconType.CHECK,
+            IconType.ROCKET,
+            IconType.X,
+            IconType.FLAG,
+            IconType.TIMER,
+            IconType.USER,
+            IconType.USER_INTERACTION,
+            IconType.AGENT,
+          ]),
+          level: faker.helpers.arrayElement([
+            LogLevel.TRACE,
+            LogLevel.DEBUG,
+            LogLevel.VERBOSE,
+            LogLevel.INFO,
+            LogLevel.WARN,
+            LogLevel.ERROR,
+          ]),
+          message: faker.lorem.paragraph(),
+          parent: lastCommit.current,
+        } satisfies Commit;
+        lastCommit.current = commit.id;
+        setCommits((commits) => [...commits, commit]);
+      },
+      500,
+      [running],
+    );
+
+    const scrollerRef = useRef<ScrollController>(null);
+
+    return (
+      <div className='flex flex-col is-full bs-full overflow-hidden'>
+        <Toolbar.Root>
+          <Button onClick={() => setRunning(true)}>Start</Button>
+          <Button onClick={() => setRunning(false)}>Stop</Button>
+          <Button onClick={() => scrollerRef.current?.scrollToTop()}>Top</Button>
+          <Button onClick={() => scrollerRef.current?.scrollToBottom()}>Bottom</Button>
+        </Toolbar.Root>
+        <ScrollContainer ref={scrollerRef} classNames='border border-separator'>
+          <Timeline branches={branches} commits={commits} />
+        </ScrollContainer>
+      </div>
+    );
+  },
+};

package/src/components/Timeline/Timeline.tsx

@@ -0,0 +1,202 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React, { Fragment, useMemo } from 'react';
+
+import { LogLevel } from '@dxos/log';
+import { Icon, type ThemedClassName } from '@dxos/react-ui';
+import { mx } from '@dxos/react-ui-theme';
+import { trim } from '@dxos/util';
+
+const lineHeight = 24;
+const columnWidth = 24;
+const nodeRadius = 5;
+const lineStyle = 'stroke-1';
+
+const colors = [
+  { stroke: 'stroke-orange-500', hover: 'group-hover:fill-orange-500' },
+  { stroke: 'stroke-sky-500', hover: 'group-hover:fill-sky-500' },
+  { stroke: 'stroke-green-500', hover: 'group-hover:fill-green-500' },
+  { stroke: 'stroke-fuchsia-500', hover: 'group-hover:fill-fuchsia-500' },
+  { stroke: 'stroke-cyan-500', hover: 'group-hover:fill-cyan-500' },
+  { stroke: 'stroke-emerald-500', hover: 'group-hover:fill-emerald-500' },
+  { stroke: 'stroke-violet-500', hover: 'group-hover:fill-violet-500' },
+  { stroke: 'stroke-teal-500', hover: 'group-hover:fill-teal-500' },
+];
+
+export enum IconType {
+  // General status.
+  WARN = 'ph--warning-circle--regular',
+  CHECK = 'ph--check-circle--regular',
+  ROCKET = 'ph--rocket--regular',
+  X = 'ph--x-circle--regular',
+  FLAG = 'ph--flag--regular',
+  TIMER = 'ph--timer--regular',
+
+  // Interactions.
+  USER = 'ph--user--regular',
+  USER_INTERACTION = 'ph--user-sound--regular',
+  AGENT = 'ph--robot--regular',
+  THINK = 'ph--brain--regular',
+  LINK = 'ph--link--regular',
+  TOOL = 'ph--wrench--regular',
+}
+
+const levelColors: Record<LogLevel, string> = {
+  [LogLevel.TRACE]: 'text-gray-500',
+  [LogLevel.DEBUG]: 'text-gray-500',
+  [LogLevel.VERBOSE]: 'text-gray-500',
+  [LogLevel.INFO]: 'text-green-500',
+  [LogLevel.WARN]: 'text-orange-500',
+  [LogLevel.ERROR]: 'text-red-500',
+};
+
+export type Commit = {
+  id: string;
+  parent?: string;
+  branch: string;
+  icon?: string;
+  level?: LogLevel;
+  message: string;
+  timestamp?: Date;
+  tags?: string[];
+};
+
+export type Branch = {
+  name: string;
+};
+
+export type Span = {
+  start: number;
+  end: number;
+  parent?: number;
+};
+
+export type TimelineProps = ThemedClassName<{
+  branches: Branch[];
+  commits: Commit[];
+  showIcon?: boolean;
+}>;
+
+// TODO(burdon): Reuse in toolCall messages.
+// TODO(burdon): Key up/down; selected.
+export const Timeline = ({ classNames, branches, commits, showIcon = true }: TimelineProps) => {
+  const spans = useMemo(() => {
+    const spans = new Map<string, Span>();
+    branches.forEach((branch) => {
+      spans.set(branch.name, { start: -1, end: -1 });
+    });
+
+    commits.forEach((commit, index) => {
+      const span = spans.get(commit.branch);
+      if (span) {
+        if (span.start === -1) {
+          const parentIndex = commit.parent ? commits.findIndex((c) => c.id === commit.parent) : 0;
+          span.start = parentIndex;
+          span.parent = commit.parent
+            ? branches.findIndex((branch) => branch.name === commits[parentIndex].branch)
+            : undefined;
+        }
+        span.end = index;
+      }
+    });
+
+    return spans;
+  }, [commits, branches]);
+
+  return (
+    <div className={mx('flex flex-col is-full', classNames)}>
+      {commits.map((commit, index) => {
+        return (
+          <div
+            key={commit.id}
+            className='group flex shrink-0 items-center gap-2 overflow-hidden hover:bg-hoverSurface'
+            style={{ height: `${lineHeight}px` }}
+          >
+            <svg width={branches.length * columnWidth} height={lineHeight} className='shrink-0'>
+              {[...branches].reverse().map((branch, _j) => {
+                const j = branches.length - 1 - _j;
+                const span = spans.get(branch.name);
+                const color = colors[j % colors.length];
+                if (!span) {
+                  return null;
+                }
+
+                return (
+                  <Fragment key={j}>
+                    {/* Upper */}
+                    {index !== 0 && span.start !== -1 && span.start < index && span.end >= index && (
+                      <line
+                        x1={j * columnWidth + columnWidth / 2}
+                        y1={0}
+                        x2={j * columnWidth + columnWidth / 2}
+                        y2={lineHeight / 2}
+                        className={mx(lineStyle, color.stroke)}
+                      />
+                    )}
+                    {/* Lower */}
+                    {span.end !== -1 && (span.start < index || span.start === 0) && index < span.end && (
+                      <line
+                        x1={j * columnWidth + columnWidth / 2}
+                        y1={lineHeight / 2}
+                        x2={j * columnWidth + columnWidth / 2}
+                        y2={lineHeight}
+                        className={mx(lineStyle, color.stroke)}
+                      />
+                    )}
+                    {/* Arc to parent */}
+                    {span.start === index && span.parent !== undefined && span.parent !== -1 && (
+                      <path
+                        d={trim`
+                          M ${0.5 + span.parent * columnWidth + columnWidth / 2} ${lineHeight / 2} 
+                          L ${j * columnWidth + columnWidth / 4} ${lineHeight / 2} 
+                          A ${lineHeight / 4} ${lineHeight / 4} 0 0 1 ${j * columnWidth + columnWidth / 2} ${(lineHeight * 3) / 4} 
+                          L ${j * columnWidth + columnWidth / 2} ${lineHeight}
+                        `}
+                        className={mx(lineStyle, color.stroke)}
+                        fill='none'
+                      />
+                    )}
+                    {branch.name === commit.branch && (
+                      <circle
+                        cx={j * columnWidth + columnWidth / 2}
+                        cy={lineHeight / 2}
+                        r={nodeRadius}
+                        className={mx(lineStyle, color.stroke, color.hover)}
+                      />
+                    )}
+                  </Fragment>
+                );
+              })}
+              {branches.map((branch, j) => {
+                const color = colors[j % colors.length];
+                return (
+                  branch.name === commit.branch && (
+                    <circle
+                      key={j}
+                      cx={j * columnWidth + columnWidth / 2}
+                      cy={lineHeight / 2}
+                      r={nodeRadius}
+                      className={mx(lineStyle, color.stroke, color.hover)}
+                    />
+                  )
+                );
+              })}
+            </svg>
+            {showIcon && (
+              <div className='flex shrink-0 w-6 justify-center'>
+                {commit.icon && (
+                  <Icon icon={commit.icon} classNames={mx(commit.level && levelColors[commit.level])} size={4} />
+                )}
+              </div>
+            )}
+            <div className='text-sm truncate cursor-pointer text-subdued group-hover:text-baseText'>
+              {commit.message}
+            </div>
+          </div>
+        );
+      })}
+    </div>
+  );
+};

package/src/components/Timeline/index.ts

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

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

@@ -7,7 +7,7 @@ import '@dxos-theme';
 import { type Meta } 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,18 +17,12 @@ 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> = {
@@ -39,7 +33,7 @@ const meta: Meta<typeof Toolbox> = {
     withPluginManager({
       plugins: [
         ClientPlugin({
-          onClientInitialized: async (_, client) => {
+          onClientInitialized: async ({ client }) => {
             await client.halo.createIdentity();
           },
         }),
@@ -65,4 +59,4 @@ export default meta;
 
 type Story = Meta<typeof Toolbox>;
 
-export const Default: Story = {};
+export const Default = {} satisfies Story;

package/src/components/Toolbox/Toolbox.tsx

@@ -2,11 +2,9 @@
 // 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 Tool } from '@dxos/ai';
 import { type Blueprint } from '@dxos/blueprints';
 import { type Ref } from '@dxos/echo';
 import { FunctionType } from '@dxos/functions';
@@ -16,29 +14,20 @@ 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 { type AiChatProcessor } from '../../hooks';
 import { meta } from '../../meta';
 import { createToolsFromService } from '../../tools';
 import { ServiceType } from '../../types';
 
 export type ToolboxProps = ThemedClassName<{
-  blueprints?: readonly Ref.Ref<Blueprint.Blueprint>[];
-  artifacts?: ArtifactDefinition[];
   services?: { service: ServiceType; tools: Tool[] }[];
   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 +38,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 +49,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)}` })),
           }))}
         />
       )}
@@ -91,11 +69,9 @@ export const Toolbox = ({
         <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>}
+      {!blueprints?.length && !activeBlueprints?.length && !services?.length && !functions?.length && (
+        <div>{t('no tools')}</div>
+      )}
     </div>
   );
 };
@@ -136,13 +112,10 @@ 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[] }[]>([]);
@@ -164,9 +137,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

@@ -8,13 +8,10 @@ export * from './AssistantSettings';
 export * from './Chat';
 export * from './PromptSettings';
 export * from './TemplateEditor';
+export * from './Timeline';
 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 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`);
 }