@dxos/plugin-assistant 0.8.4-main.9be5663bfe → 0.8.4-main.abd8ff62ef

package/src/components/ChatThread/widgets/ReasoningWidget.stories.tsx

@@ -37,7 +37,7 @@ const DefaultStory = ({ text }: DefaultStoryProps) => {
 };
 
 const meta = {
-  title: 'plugins/plugin-assistant/components/ChatThread/widgets/ReasoningWidget',
+  title: 'plugins/plugin-assistant/components/ChatWidgets/ReasoningWidget',
   component: DefaultStory,
   decorators: [withTheme(), withLayout({ layout: 'column' })],
   parameters: {

package/src/components/ChatThread/widgets/ReasoningWidget.ts

@@ -6,6 +6,8 @@ import { WidgetType } from '@codemirror/view';
 
 import { Domino } from '@dxos/ui';
 
+import { styles } from './defaults';
+
 /**
  * Props used to derive a stable key for a reasoning block across CodeMirror widget rebuilds.
  * CodeMirror does not assign persistent IDs to widgets; streaming re-runs the factory each tick.
@@ -36,15 +38,15 @@ export class ReasoningWidget extends WidgetType {
   }
 
   override toDOM() {
-    const root = Domino.of('div')
-      .classNames('pt-2 pb-2')
+    return Domino.of('div')
+      .classNames(styles.padding)
       .append(
         Domino.of('div')
-          .classNames('relative overflow-hidden p-px rounded-sm border border-subdued-separator')
+          .classNames('relative overflow-hidden p-px', styles.border)
           .attributes({ 'data-trail-container': '' })
           .append(
             Domino.of('div')
-              .classNames('relative z-10 bg-base-surface rounded-sm text-sm text-description px-2 py-1')
+              .classNames('relative z-10 bg-base-surface rounded-sm text-sm text-subdued px-2 py-1')
               .append(
                 Domino.of('div')
                   .classNames('max-h-[5lh] overflow-y-auto')
@@ -54,8 +56,6 @@ export class ReasoningWidget extends WidgetType {
             Domino.of('div').attributes({ 'data-id': this.#pos }),
           ),
       ).root;
-
-    return root;
   }
 
   override updateDOM(dom: HTMLElement) {

package/src/components/ChatThread/widgets/ReferenceWidget.ts

@@ -6,6 +6,8 @@ import { WidgetType } from '@codemirror/view';
 
 import { Domino } from '@dxos/ui';
 
+import { styles } from './defaults';
+
 export class ReferenceWidget extends WidgetType {
   constructor(
     private text: string,
@@ -20,7 +22,7 @@ export class ReferenceWidget extends WidgetType {
 
   override toDOM() {
     return Domino.of('div')
-      .classNames('pt-2 pb-2')
+      .classNames(styles.padding)
       .append(
         Domino.of('dx-anchor' as any)
           .classNames('dx-tag--anchor')

package/src/components/ChatThread/widgets/SelectWidget.ts

@@ -6,6 +6,8 @@ import { WidgetType } from '@codemirror/view';
 
 import { Domino } from '@dxos/ui';
 
+import { styles } from './defaults';
+
 /**
  * Simple prompt widget.
  */
@@ -24,7 +26,7 @@ export class SelectWidget extends WidgetType {
   override toDOM() {
     return Domino.of('div')
       .attributes({ role: 'group' })
-      .classNames('flex flex-wrap pt-2 pb-2 gap-1')
+      .classNames(styles.padding, 'flex flex-wrap gap-1')
       .append(
         ...this.options.map((option) =>
           Domino.of('button')

package/src/components/ChatThread/widgets/StatsWidget.ts

@@ -6,6 +6,8 @@ import { WidgetType } from '@codemirror/view';
 
 import { Domino } from '@dxos/ui';
 
+import { styles } from './defaults';
+
 /**
  * Simple stats widget.
  */
@@ -19,7 +21,7 @@ export class StatsWidget extends WidgetType {
   }
 
   override toDOM() {
-    return Domino.of('div').classNames('pt-2 pb-4 text-sm text-placeholder').text(this.text).root;
+    return Domino.of('div').classNames(styles.padding, 'text-sm text-placeholder').text(this.text).root;
   }
 
   override updateDOM(dom: HTMLElement) {

package/src/components/ChatThread/widgets/StatusWidget.ts

@@ -5,7 +5,8 @@
 import { WidgetType } from '@codemirror/view';
 
 import { Domino } from '@dxos/ui';
-import { XML_WIDGET_DATA_ATTR } from '@dxos/ui-editor';
+
+import { styles } from './defaults';
 
 /**
  * Props used to derive a stable key for a reasoning block across CodeMirror widget rebuilds.
@@ -38,8 +39,7 @@ export class StatusWidget extends WidgetType {
 
   override toDOM() {
     return Domino.of('div')
-      .classNames('py-0.5')
-      .attributes({ [XML_WIDGET_DATA_ATTR]: '' })
+      .classNames(styles.padding)
       .append(
         Domino.of('div')
           .classNames('relative overflow-hidden rounded-sm')

package/src/components/ChatThread/widgets/SuggestionWidget.ts

@@ -19,7 +19,7 @@ export class SuggestionWidget extends WidgetType {
   }
 
   override toDOM() {
-    // NOTE: Container must have `dx-size-container` to support cqi.
+    // NOTE: Container must have `dx-inline-size-container` (or `dx-size-container`) to support cqi.
     return Domino.of('span')
       .classNames(mx('inline-flex max-w-[calc(100cqi-8px)] my-1 pe-2 overflow-hidden'))
       .append(

package/src/components/ChatThread/widgets/SummaryWidget.tsx

@@ -11,15 +11,16 @@ import { type XmlWidgetProps } from '@dxos/ui-editor';
 import { meta } from '#meta';
 
 import { MessageThreadContext } from '../sync';
+import { styles } from './defaults';
 
 export const SummaryWidget = ({ children }: XmlWidgetProps<MessageThreadContext>) => {
   const { t } = useTranslation(meta.id);
 
   return (
-    <TogglePanel.Root classNames='border border-separator rounded-sm'>
+    <TogglePanel.Root classNames={styles.border}>
       <TogglePanel.Header classNames='text-sm bg-group-surface'>{t('summary.label')}</TogglePanel.Header>
       <TogglePanel.Content>
-        <div role='none' className='p-1 text-sm text-description'>
+        <div role='none' className='p-1 text-sm text-subdued'>
           {children}
         </div>
       </TogglePanel.Content>

package/src/components/ChatThread/widgets/ToolWidget.stories.tsx

@@ -7,7 +7,8 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { type ContentBlock } from '@dxos/types';
 
-import { translations } from '../../../translations';
+import { translations } from '#translations';
+
 import { ToolWidget, type ToolWidgetProps } from './ToolWidget';
 
 const baseWidgetProps = {
@@ -33,7 +34,7 @@ const toolCallAndResult: ContentBlock.Any[] = [
 ];
 
 const meta = {
-  title: 'plugins/plugin-assistant/components/ChatThread/widgets/ToolWidget',
+  title: 'plugins/plugin-assistant/components/ChatWidgets/ToolWidget',
   component: ToolWidget,
   decorators: [withTheme(), withLayout({ layout: 'column' })],
   parameters: {

package/src/components/ChatThread/widgets/ToolWidget.tsx

@@ -7,7 +7,7 @@ import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 
 import { useTranslation } from '@dxos/react-ui';
 import { NumericTabs, TextCrawl, TogglePanel, type TogglePanelRootProps } from '@dxos/react-ui-components';
-import { Json } from '@dxos/react-ui-syntax-highlighter';
+import { JsonHighlighter } from '@dxos/react-ui-syntax-highlighter';
 import { type ContentBlock, type Message } from '@dxos/types';
 import { type XmlWidgetProps } from '@dxos/ui-editor';
 import { isNonNullable, safeParseJson } from '@dxos/util';
@@ -140,7 +140,7 @@ const ToolPanel = ({ items, onChangeOpen }: ToolPanelProps) => {
             selected={selected}
             onSelect={handleSelect}
           />
-          <Json.Data
+          <JsonHighlighter
             data={items[selected]?.content}
             classNames='p-1 text-xs bg-transparent'
             replacer={{

package/src/components/ChatThread/widgets/defaults.ts

@@ -0,0 +1,8 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+export const styles = {
+  padding: 'my-4',
+  border: 'border border-subdued-separator rounded-sm',
+};

package/src/components/ChatThread/widgets/index.ts

@@ -3,12 +3,11 @@
 //
 
 export * from './FallbackWidget';
-export * from './PromptWidget';
 export * from './ReasoningWidget';
 export * from './ReferenceWidget';
 export * from './SelectWidget';
 export * from './StatsWidget';
+export * from './StatusWidget';
 export * from './SummaryWidget';
 export * from './SuggestionWidget';
 export * from './ToolWidget';
-export * from './StatusWidget';

package/src/components/ProcessTree/ProcessTree.stories.tsx

@@ -6,24 +6,14 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 import * as Option from 'effect/Option';
 
 import { Process } from '@dxos/functions-runtime';
+import { log } from '@dxos/log';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
-import { ProcessTree } from './ProcessTree';
+import { makeProcess } from '#testing';
 
-const makeProcess = (
-  overrides: Partial<Process.Info> & Pick<Process.Info, 'pid' | 'state'> & { name: string },
-): Process.Info => ({
-  parentPid: null,
-  key: `test.process.${overrides.name}`,
-  params: { name: overrides.name, target: null },
-  error: null,
-  startedAt: Date.now() - 10_000,
-  completedAt: Option.none(),
-  metrics: { wallTime: 0, inputCount: 0, outputCount: 0 },
-  ...overrides,
-});
+import { ProcessTree } from './ProcessTree';
 
-const seedProcesses: Process.Info[] = [
+const processes: Process.Info[] = [
   makeProcess({
     pid: Process.ID.make('97793611-815e-4a67-bc04-60fa67b2c987'),
     name: 'Trigger watcher',
@@ -73,7 +63,7 @@ const seedProcesses: Process.Info[] = [
 const meta: Meta<typeof ProcessTree> = {
   title: 'plugins/plugin-assistant/components/ProcessTree',
   component: ProcessTree,
-  decorators: [withLayout({ layout: 'column', classNames: 'w-(--dx-complementary-sidebar-size)' }), withTheme()],
+  decorators: [withTheme(), withLayout({ layout: 'column', classNames: 'w-(--dx-complementary-sidebar-size)' })],
 } satisfies Meta<typeof ProcessTree>;
 
 export default meta;
@@ -82,28 +72,12 @@ type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {
-    processes: seedProcesses,
-  },
-};
-
-export const AllRunning: Story = {
-  args: {
-    processes: [
-      makeProcess({
-        pid: Process.ID.make('1344bac8-745b-44a6-9af6-dc19509a7844'),
-        name: 'Agent alpha',
-        state: Process.State.RUNNING,
-      }),
-      makeProcess({
-        pid: Process.ID.make('b7c9787a-6705-47dc-a197-d37f1adfa338'),
-        name: 'Agent beta',
-        state: Process.State.RUNNING,
-      }),
-      makeProcess({
-        pid: Process.ID.make('43493533-a94c-4072-b18f-c0e0fd806bf5'),
-        name: 'Agent gamma',
-        state: Process.State.RUNNING,
-      }),
-    ],
+    processes: processes,
+    onProcessSelect: (process) => {
+      log.info('select', process);
+    },
+    onProcessTerminate: (process) => {
+      log.info('terminate', process);
+    },
   },
 };

package/src/components/ProcessTree/ProcessTree.tsx

@@ -3,41 +3,47 @@
 //
 
 import * as Match from 'effect/Match';
+import * as Option from 'effect/Option';
 import React from 'react';
 
 import { Process } from '@dxos/functions-runtime';
-import { Icon, ScrollArea, Treegrid } from '@dxos/react-ui';
+import { Icon, IconButton, ScrollArea, Tooltip, Treegrid } from '@dxos/react-ui';
 import { composable, composableProps, mx } from '@dxos/ui-theme';
+import { Unit } from '@dxos/util';
 
 export type ProcessTreeProps = {
+  // TODO(burdon): Atom.
   processes: readonly Process.Info[];
   onProcessSelect?: (process: Process.Info) => void;
+  onProcessTerminate?: (process: Process.Info) => void;
 };
 
 export const ProcessTree = composable<HTMLDivElement, ProcessTreeProps>(
-  ({ processes, onProcessSelect, ...props }, forwardedRef) => {
-    const filteredProcesses: Process.Info[] = [
+  ({ processes, onProcessSelect, onProcessTerminate, ...props }, forwardedRef) => {
+    const sortedProcesses = [
       ...processes.filter((process) => [Process.State.RUNNING, Process.State.HYBERNATING].includes(process.state)),
       ...processes.filter((process) => [Process.State.IDLE].includes(process.state)).slice(0, 3),
-      ...processes
-        .filter((process) =>
-          [Process.State.SUCCEEDED, Process.State.FAILED, Process.State.TERMINATED].includes(process.state),
-        )
-        .slice(0, 3),
-    ];
+      ...processes.filter((process) =>
+        [Process.State.SUCCEEDED, Process.State.FAILED, Process.State.TERMINATED].includes(process.state),
+      ),
+    ].sort((a, b) => {
+      const aCompletedAt = Option.getOrElse(a.completedAt, () => Infinity);
+      const bCompletedAt = Option.getOrElse(b.completedAt, () => Infinity);
+      return bCompletedAt - aCompletedAt;
+    });
 
     return (
       <ScrollArea.Root {...composableProps(props, { classNames: 'dx-expander' })} thin ref={forwardedRef}>
         <ScrollArea.Viewport>
           <Treegrid.Root gridTemplateColumns='1fr'>
-            {filteredProcesses
+            {sortedProcesses
               .filter((process) => process.parentPid === null)
               .map((process) => {
-                const activeChildren = filteredProcesses.filter(
-                  (candidate) =>
-                    candidate.parentPid?.toString() === process.pid.toString() &&
-                    candidate.state === Process.State.RUNNING,
-                );
+                // const activeChildren = filteredProcesses.filter(
+                //   (candidate) =>
+                //     candidate.parentPid?.toString() === process.pid.toString() &&
+                //     candidate.state === Process.State.RUNNING,
+                // );
                 return (
                   <Treegrid.Row
                     key={process.pid.toString()}
@@ -46,33 +52,60 @@ export const ProcessTree = composable<HTMLDivElement, ProcessTreeProps>(
                   >
                     <Treegrid.Cell
                       indent
-                      classNames='flex items-center p-1 gap-2 min-w-0'
+                      classNames={mx(
+                        'grid grid-cols-[min-content_1fr_min-content_min-content] items-center gap-1 min-w-0',
+                        onProcessSelect && 'dx-hover',
+                      )}
                       onClick={() => onProcessSelect?.(process)}
                     >
-                      <Icon
-                        size={4}
-                        icon={Match.value(process.state).pipe(
-                          Match.when(Process.State.RUNNING, () => 'ph--spinner-gap--regular'),
-                          Match.when(Process.State.SUCCEEDED, () => 'ph--check-circle--regular'),
-                          Match.when(Process.State.FAILED, () => 'ph--warning--regular'),
-                          Match.when(Process.State.HYBERNATING, () => 'ph--spinner--regular'),
-                          Match.when(Process.State.IDLE, () => 'ph--hourglass--regular'),
-                          Match.when(Process.State.TERMINATING, () => 'ph--x-circle--regular'),
-                          Match.when(Process.State.TERMINATED, () => 'ph--x-circle--regular'),
-                          Match.orElse(() => 'ph--spinner-gap--regular'),
-                        )}
-                        classNames={mx(
-                          process.state === Process.State.RUNNING && 'animate-spin',
-                          process.state === Process.State.FAILED && 'text-error-text',
-                          process.state === Process.State.SUCCEEDED && 'text-success-text',
-                        )}
-                      />
+                      <Tooltip.Trigger className='p-1' content={process.state.toString()}>
+                        <Icon
+                          size={4}
+                          classNames={mx(
+                            process.state === Process.State.RUNNING && 'animate-spin',
+                            process.state === Process.State.FAILED && 'text-error-text',
+                            process.state === Process.State.SUCCEEDED && 'text-success-text',
+                          )}
+                          icon={Match.value(process.state).pipe(
+                            Match.when(Process.State.RUNNING, () => 'ph--spinner-gap--regular'),
+                            Match.when(Process.State.SUCCEEDED, () => 'ph--check-circle--regular'),
+                            Match.when(Process.State.FAILED, () => 'ph--warning--regular'),
+                            Match.when(Process.State.HYBERNATING, () => 'ph--spinner--regular'),
+                            Match.when(Process.State.IDLE, () => 'ph--hourglass--regular'),
+                            Match.when(Process.State.TERMINATING, () => 'ph--x-circle--regular'),
+                            Match.when(Process.State.TERMINATED, () => 'ph--x-circle--regular'),
+                            Match.orElse(() => 'ph--spinner-gap--regular'),
+                          )}
+                        />
+                      </Tooltip.Trigger>
                       <div role='none' className='flex items-center gap-2 text-xs overflow-hidden'>
-                        <span className='text-description'>{process.params.name}</span>
-                        {activeChildren.length > 0 && (
+                        {/* TODO(burdon): Name is too long (and not informative). */}
+                        <span className='truncate text-description select-none'>
+                          {process.params.name ?? process.pid.toString()}
+                        </span>
+                        {/* {activeChildren.length > 0 && (
                           <span className='text-xs text-description ml-1'>{activeChildren[0].params.name}</span>
-                        )}
+                        )} */}
                       </div>
+                      {([Process.State.FAILED, Process.State.SUCCEEDED].includes(process.state) && (
+                        <div className='text-xs text-description tabular-nums'>
+                          {Unit.Millisecond(process.metrics.wallTime).toString()}
+                        </div>
+                      )) || <div />}
+                      {onProcessTerminate && (
+                        <IconButton
+                          classNames='min-h-0 p-1'
+                          icon='ph--x--regular'
+                          iconOnly
+                          variant='ghost'
+                          size={4}
+                          label='Actions'
+                          onClick={(event) => {
+                            event.stopPropagation();
+                            onProcessTerminate?.(process);
+                          }}
+                        />
+                      )}
                     </Treegrid.Cell>
                   </Treegrid.Row>
                 );

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

@@ -6,13 +6,14 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
 import { createSystemPrompt } from '@dxos/assistant';
-import { Blueprint, Template } from '@dxos/blueprints';
+import { Blueprint, Template } from '@dxos/compute';
 import { useClient } from '@dxos/react-client';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { trim } from '@dxos/util';
 
-import { translations } from '../../translations';
+import { translations } from '#translations';
+
 import { TemplateEditor, type TemplateEditorProps } from './TemplateEditor';
 
 const FENCE = '```';

package/src/components/TemplateEditor/TemplateEditor.tsx

@@ -6,7 +6,7 @@ import { defaultHighlightStyle, syntaxHighlighting } from '@codemirror/language'
 import { composeRefs } from '@radix-ui/react-compose-refs';
 import React from 'react';
 
-import { type Template } from '@dxos/blueprints';
+import { type Template } from '@dxos/compute';
 import { createDocAccessor } from '@dxos/echo-db';
 import { useThemeContext, useTranslation } from '@dxos/react-ui';
 import { useTextEditor } from '@dxos/react-ui-editor';
@@ -35,17 +35,17 @@ export const TemplateEditor = composable<HTMLDivElement, TemplateEditorProps>(
     const { t } = useTranslation(meta.id);
     const { themeMode } = useThemeContext();
     const { parentRef } = useTextEditor(() => {
-      const text = template.source?.target;
-      if (!text) {
+      const target = template.source?.target;
+      if (!target) {
         return {};
       }
 
       return {
-        initialValue: text.content ?? '',
+        initialValue: target.content ?? '',
         extensions: [
           createDataExtensions({
             id,
-            text: createDocAccessor(text, ['content']),
+            text: createDocAccessor(target, ['content']),
           }),
           createBasicExtensions({
             bracketMatching: false,

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

@@ -5,7 +5,7 @@
 import { type Meta } from '@storybook/react-vite';
 import React, { useCallback, useState } from 'react';
 
-import { Blueprint, Template } from '@dxos/blueprints';
+import { Blueprint, Template } from '@dxos/compute';
 import { Obj } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
 import { useClient } from '@dxos/react-client';
@@ -13,7 +13,8 @@ import { withClientProvider } from '@dxos/react-client/testing';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { trim } from '@dxos/util';
 
-import { translations } from '../../translations';
+import { translations } from '#translations';
+
 import { type TemplateChangeCallback, TemplateForm } from './TemplateForm';
 
 const TEMPLATE = trim`
@@ -42,7 +43,7 @@ const DefaultStory = () => {
 
   const handleChange: TemplateChangeCallback = useCallback(
     (mutate) => {
-      Obj.change(blueprint, (blueprint) => mutate(blueprint.instructions));
+      Obj.update(blueprint, (blueprint) => mutate(blueprint.instructions));
     },
     [blueprint],
   );

package/src/components/TemplateEditor/TemplateForm.tsx

@@ -5,7 +5,7 @@
 import type * as Schema from 'effect/Schema';
 import React, { Fragment, useCallback, useEffect } from 'react';
 
-import { type Template } from '@dxos/blueprints';
+import { type Template } from '@dxos/compute';
 import { type Obj } from '@dxos/echo';
 import { Input, Select, useTranslation } from '@dxos/react-ui';
 import { isNonNullable } from '@dxos/util';
@@ -15,7 +15,7 @@ import { meta } from '#meta';
 import { TemplateEditor } from './TemplateEditor';
 
 /**
- * Callback type for mutating template within a parent object's Obj.change context.
+ * Callback type for mutating template within a parent object's Obj.update context.
  */
 export type TemplateChangeCallback = (mutate: (template: Obj.Mutable<Template.Template>) => void) => void;
 
@@ -25,7 +25,7 @@ export type TemplateFormProps = {
   schema?: Schema.Schema<any, any, any>;
   commandEditable?: boolean;
   /**
-   * Callback to mutate the template. Should wrap mutations in parent's Obj.change.
+   * Callback to mutate the template. Should wrap mutations in parent's Obj.update.
    * If not provided, the component is read-only.
    */
   onChange?: TemplateChangeCallback;

package/src/components/TemplateEditor/extensions/handlebars-extension.ts

@@ -60,7 +60,7 @@ const regex = {
   // @dxn:queue:data:xxx
   dxn: /@?dxn:[\w@:]+/g,
 
-  // dxos.org/type/xxx
+  // example.com/path/xxx
   url: /[\w.-]+\.[\w.-]+\/[\w/]+/g,
 };
 

package/src/components/ToolBlock/ToolBlock.tsx

@@ -7,7 +7,7 @@ import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 
 import { useTranslation } from '@dxos/react-ui';
 import { NumericTabs, TextCrawl, TogglePanel, type TogglePanelRootProps } from '@dxos/react-ui-components';
-import { Json } from '@dxos/react-ui-syntax-highlighter';
+import { JsonHighlighter } from '@dxos/react-ui-syntax-highlighter';
 import { type ContentBlock, type Message } from '@dxos/types';
 import { type XmlWidgetProps } from '@dxos/ui-editor';
 import { isNonNullable, safeParseJson } from '@dxos/util';
@@ -129,7 +129,7 @@ const ToolPanel = ({ items, onChangeOpen }: ToolPanelProps) => {
       </TogglePanel.Header>
       <TogglePanel.Content classNames='grid grid-cols-[32px_1fr]'>
         <NumericTabs ref={tabsRef} classNames='p-1' length={items.length} selected={selected} onSelect={handleSelect} />
-        <Json.Data
+        <JsonHighlighter
           data={items[selected]?.content}
           classNames='p-1 text-xs bg-transparent'
           replacer={{

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

@@ -15,7 +15,8 @@ import { MapPlugin } from '@dxos/plugin-map';
 import { TablePlugin } from '@dxos/plugin-table';
 import { corePlugins } from '@dxos/plugin-testing';
 
-import { translations } from '../../translations';
+import { translations } from '#translations';
+
 import { Toolbox, type ToolboxProps } from './Toolbox';
 
 const DefaultStory = (props: ToolboxProps) => {

package/src/components/Toolbox/Toolbox.tsx

@@ -4,10 +4,10 @@
 
 import React, { Fragment, useEffect, useState } from 'react';
 
-import { type Blueprint } from '@dxos/blueprints';
+import { type Blueprint } from '@dxos/compute';
+import { Operation } from '@dxos/compute';
 import { type Database, type Ref } from '@dxos/echo';
 import { log } from '@dxos/log';
-import { Operation } from '@dxos/operation';
 import { Filter, useQuery } from '@dxos/react-client/echo';
 import { ScrollArea, type ThemedClassName } from '@dxos/react-ui';
 import { composable, composableProps, mx } from '@dxos/ui-theme';