@dxos/plugin-assistant 0.8.4-main.f9ba587 → 0.8.4-main.fd6878d

package/src/components/TemplateEditor/TemplateForm.tsx

@@ -5,33 +5,35 @@
 import { type Schema } from 'effect';
 import React, { Fragment, useEffect } from 'react';
 
+import { type Template } from '@dxos/blueprints';
 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 { type TemplateInput, TemplateInputType, type TemplateType } from '../../types';
+
+import { TemplateEditor } from './TemplateEditor';
 
 export type TemplateFormProps = {
-  template: TemplateType;
+  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);
 
   return (
     <div className={mx('flex flex-col w-full overflow-hidden gap-4', groupBorder)}>
-      {commandEditable && (
+      {/* {commandEditable && (
         <div className='flex items-center pl-4'>
           <span className='text-neutral-500'>/</span>
           <Input.Root>
             <Input.TextInput
               placeholder={t('command placeholder')}
-              classNames={mx('is-full bg-transparent m-2')}
+              classNames='is-full bg-transparent m-2'
               value={template.command ?? ''}
               onChange={(event) => {
                 template.command = event.target.value.replace(/\w/g, '');
@@ -39,9 +41,9 @@ export const TemplateForm = ({ template, commandEditable = true }: TemplateFormP
             />
           </Input.Root>
         </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'>
@@ -51,17 +53,17 @@ export const TemplateForm = ({ template, commandEditable = true }: TemplateFormP
 
               <Input.Root>
                 <Select.Root
-                  value={String(input.type)}
-                  onValueChange={(type) => {
-                    input.type = getInputType(type) ?? TemplateInputType.VALUE;
+                  value={input.kind}
+                  onValueChange={(kind) => {
+                    input.kind = kind as Template.InputKind;
                   }}
                 >
                   <Select.TriggerButton placeholder='Type' classNames='is-full' />
                   <Select.Portal>
                     <Select.Content>
                       <Select.Viewport>
-                        {inputTypes.map(({ value, label }) => (
-                          <Select.Option key={value} value={String(value)}>
+                        {inputs.map(({ kind, label }) => (
+                          <Select.Option key={kind} value={kind}>
                             {label}
                           </Select.Option>
                         ))}
@@ -72,26 +74,20 @@ export const TemplateForm = ({ template, commandEditable = true }: TemplateFormP
               </Input.Root>
 
               <div>
-                {input.type !== undefined &&
-                  [
-                    TemplateInputType.VALUE,
-                    TemplateInputType.CONTEXT,
-                    TemplateInputType.RESOLVER,
-                    TemplateInputType.SCHEMA,
-                  ].includes(input.type) && (
-                    <div>
-                      <Input.Root>
-                        <Input.TextInput
-                          placeholder={t('command placeholder')}
-                          classNames={mx('is-full bg-transparent')}
-                          value={input.value ?? ''}
-                          onChange={(event) => {
-                            input.value = event.target.value;
-                          }}
-                        />
-                      </Input.Root>
-                    </div>
-                  )}
+                {input.kind !== undefined && ['value', 'context', 'resolver', 'schema'].includes(input.kind) && (
+                  <div>
+                    <Input.Root>
+                      <Input.TextInput
+                        placeholder={t('command placeholder')}
+                        classNames='is-full bg-transparent'
+                        value={input.default ?? ''}
+                        onChange={(event) => {
+                          input.default = event.target.value;
+                        }}
+                      />
+                    </Input.Root>
+                  </div>
+                )}
               </div>
             </Fragment>
           ))}
@@ -101,57 +97,56 @@ export const TemplateForm = ({ template, commandEditable = true }: TemplateFormP
   );
 };
 
-const inputTypes = [
+// TODO(burdon): Translations.
+const inputs: { kind: Template.InputKind; label: string }[] = [
   {
-    value: TemplateInputType.VALUE,
+    kind: 'value',
     label: 'Value',
   },
   {
-    value: TemplateInputType.PASS_THROUGH,
+    kind: 'pass-through',
     label: 'Pass through',
   },
   {
-    value: TemplateInputType.RETRIEVER,
+    kind: 'retriever',
     label: 'Retriever',
   },
-  // {
-  //   value: TemplateInputType.FUNCTION,
-  //   label: 'Function',
-  // },
-  // {
-  //   value: TemplateInputType.QUERY,
-  //   label: 'Query',
-  // },
   {
-    value: TemplateInputType.RESOLVER,
+    kind: 'function',
+    label: 'Function',
+  },
+  {
+    kind: 'query',
+    label: 'Query',
+  },
+  {
+    kind: 'resolver',
     label: 'Resolver',
   },
   {
-    value: TemplateInputType.CONTEXT,
+    kind: 'context',
     label: 'Context',
   },
   {
-    value: TemplateInputType.SCHEMA,
+    kind: 'schema',
     label: 'Schema',
   },
 ];
 
-export const nameRegex = /\{\{([\w-]+)\}\}/;
-
-const getInputType = (type: string) => inputTypes.find(({ value }) => String(value) === type)?.value;
+export const NAME_REGEXP = /\{\{([\w-]+)\}\}/;
 
-const usePromptInputs = (template: TemplateType) => {
+const usePromptInputs = (template: Template.Template) => {
   useEffect(() => {
     const text = template.source ?? '';
     if (!template.inputs) {
       template.inputs = []; // TODO(burdon): Required?
     }
 
-    const regex = new RegExp(nameRegex, 'g');
-    const variables = new Set<string>([...text.matchAll(regex)].map((m) => m[1]));
+    const regex = new RegExp(NAME_REGEXP, 'g');
+    const variables = new Set<string>([...(text.target?.content.matchAll(regex) ?? [])].map((m) => m[1]));
 
     // Create map of unclaimed inputs.
-    const unclaimed = new Map<string, TemplateInput>(
+    const unclaimed = new Map<string, Template.Input>(
       template.inputs?.filter(isNonNullable).map((input) => [input.name, input]),
     );
     const missing: string[] = [];

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

@@ -0,0 +1,53 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import '@dxos-theme';
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+
+import { faker } from '@dxos/random';
+import { withTheme } from '@dxos/storybook-utils';
+
+import { Timeline } from './Timeline';
+
+faker.seed(1);
+
+const meta: Meta<typeof Timeline> = {
+  title: 'plugins/plugin-assistant/Timeline',
+  component: Timeline,
+  decorators: [withTheme],
+};
+
+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' },
+    ],
+  },
+};

package/src/components/Timeline/Timeline.tsx

@@ -0,0 +1,159 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React, { Fragment, useMemo } from 'react';
+
+import { type ThemedClassName } from '@dxos/react-ui';
+import { mx } from '@dxos/react-ui-theme';
+import { trim } from '@dxos/util';
+
+export type Commit = {
+  id: string;
+  parent?: string;
+  branch: string;
+  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[] }>;
+
+// TODO(burdon): Reuse in toolCall messages.
+// TODO(burdon): Key up/down; selected.
+export const Timeline = ({ classNames, branches, commits }: 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 w-full overflow-hidden', classNames)}>
+      {commits.map((commit, index) => {
+        return (
+          <div
+            key={commit.id}
+            className='group flex items-center gap-2 overflow-hidden hover:bg-hoverSurface'
+            style={{ height: `${lineHeight}px` }}
+          >
+            <svg width={branches.length * columnWidth} height={lineHeight} className='shrink-0'>
+              {branches.map((branch, 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('stroke-2', 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('stroke-2', 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('stroke-2', color.stroke)}
+                        fill='none'
+                      />
+                    )}
+                    {branch.name === commit.branch && (
+                      <circle
+                        cx={j * columnWidth + columnWidth / 2}
+                        cy={lineHeight / 2}
+                        r={nodeRadius}
+                        className={mx('stroke-2 fill-red-500', 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('stroke-2', color.stroke, color.hover)}
+                    />
+                  )
+                );
+              })}
+            </svg>
+            <div className='text-sm truncate cursor-pointer text-subdued group-hover:text-baseText'>
+              {commit.message}
+            </div>
+          </div>
+        );
+      })}
+    </div>
+  );
+};
+
+const lineHeight = 24;
+const columnWidth = 24;
+const nodeRadius = 6;
+
+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' },
+];

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,9 +7,9 @@ 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/artifact-testing';
+import { capabilities } from '@dxos/assistant-testing';
 import { ChessPlugin } from '@dxos/plugin-chess';
 import { ClientPlugin } from '@dxos/plugin-client';
 import { MapPlugin } from '@dxos/plugin-map';
@@ -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,12 +2,10 @@
 // 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/artifact';
-import { type Blueprint } from '@dxos/assistant';
+import { type Tool } from '@dxos/ai';
+import { type Blueprint } from '@dxos/blueprints';
 import { type Ref } from '@dxos/echo';
 import { FunctionType } from '@dxos/functions';
 import { log } from '@dxos/log';
@@ -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>[];
-  artifacts?: ArtifactDefinition[];
   services?: { service: ServiceType; tools: Tool[] }[];
   functions?: FunctionType[];
-  activeBlueprints?: readonly Ref.Ref<Blueprint>[];
-  striped?: boolean;
+  // TODO(burdon): Combine into single array.
+  blueprints?: readonly Ref.Ref<Blueprint.Blueprint>[];
+  activeBlueprints?: readonly Ref.Ref<Blueprint.Blueprint>[];
 }>;
 
-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>
   );
 };
@@ -134,12 +110,12 @@ const Section: FC<{
   );
 };
 
-export type ToolboxContainerProps = ThemedClassName<{ space?: Space; processor?: ChatProcessor }>;
+export type ToolboxContainerProps = ThemedClassName<{
+  space?: Space;
+  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[] }[]>([]);
@@ -161,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`);
 }

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* ({ data: { enable } }) {
+    log.info('analysis mode', { 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';