@dxos/plugin-assistant 0.8.4-main.c85a9c8dae → 0.8.4-main.dfabb4ec29

package/src/components/ProcessTree/ProcessTree.tsx

@@ -0,0 +1,119 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Match from 'effect/Match';
+import * as Option from 'effect/Option';
+import React from 'react';
+
+import { Process } from '@dxos/functions-runtime';
+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, 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),
+      ),
+    ].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'>
+            {sortedProcesses
+              .filter((process) => process.parentPid === null)
+              .map((process) => {
+                // const activeChildren = filteredProcesses.filter(
+                //   (candidate) =>
+                //     candidate.parentPid?.toString() === process.pid.toString() &&
+                //     candidate.state === Process.State.RUNNING,
+                // );
+                return (
+                  <Treegrid.Row
+                    key={process.pid.toString()}
+                    id={process.pid.toString()}
+                    parentOf={process.parentPid?.toString()}
+                  >
+                    <Treegrid.Cell
+                      indent
+                      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)}
+                    >
+                      <Tooltip.Trigger className='p-1' content={process.state.toString()}>
+                        <Icon
+                          size={4}
+                          synchronized
+                          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 className='flex items-center gap-2 text-xs overflow-hidden'>
+                        {/* 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>
+                );
+              })}
+          </Treegrid.Root>
+        </ScrollArea.Viewport>
+      </ScrollArea.Root>
+    );
+  },
+);

package/src/components/ProcessTree/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { ProcessTree, type ProcessTreeProps } from './ProcessTree';

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

@@ -6,13 +6,13 @@ 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';
 
@@ -45,10 +45,10 @@ const TEMPLATE = trim`
 const DefaultStory = ({ source }: TemplateEditorProps & { source: string }) => {
   const client = useClient();
   const [blueprint] = useState(() => {
-    const space = client.spaces.default;
+    const space = client.spaces.get()[0];
     return space.db.add(
       Blueprint.make({
-        key: 'example.com/blueprint/test',
+        key: 'com.example.blueprint.test',
         name: 'Test',
         instructions: Template.make({ source }),
       }),
@@ -56,11 +56,7 @@ const DefaultStory = ({ source }: TemplateEditorProps & { source: string }) => {
   });
 
   return (
-    <TemplateEditor
-      classNames='bg-base-surface w-full max-w-prose-max-width'
-      id={blueprint.id}
-      template={blueprint.instructions}
-    />
+    <TemplateEditor classNames='dx-document bg-base-surface' id={blueprint.id} template={blueprint.instructions} />
   );
 };
 

package/src/components/TemplateEditor/TemplateEditor.tsx

@@ -3,11 +3,12 @@
 //
 
 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 { type ThemedClassName, useThemeContext, useTranslation } from '@dxos/react-ui';
+import { useThemeContext, useTranslation } from '@dxos/react-ui';
 import { useTextEditor } from '@dxos/react-ui-editor';
 import {
   createBasicExtensions,
@@ -16,55 +17,62 @@ import {
   createThemeExtensions,
   decorateMarkdown,
 } from '@dxos/ui-editor';
-import { mx } from '@dxos/ui-theme';
+import { composable, composableProps } from '@dxos/ui-theme';
 import { isNonNullable } from '@dxos/util';
 
-import { meta } from '../../meta';
+import { meta } from '#meta';
 
 import { handlebars, xmlDecorator } from './extensions';
 
-export type TemplateEditorProps = ThemedClassName<{
+export type TemplateEditorProps = {
   id: string;
   template: Template.Template;
   lineNumbers?: boolean;
-}>;
+};
 
-export const TemplateEditor = ({ id, classNames, template, lineNumbers = true }: TemplateEditorProps) => {
-  const { t } = useTranslation(meta.id);
-  const { themeMode } = useThemeContext();
-  const { parentRef } = useTextEditor(() => {
-    const text = template.source?.target;
-    if (!text) {
-      return {};
-    }
+export const TemplateEditor = composable<HTMLDivElement, TemplateEditorProps>(
+  ({ classNames, id, template, lineNumbers = true, ...props }, forwardedRef) => {
+    const { t } = useTranslation(meta.id);
+    const { themeMode } = useThemeContext();
+    const { parentRef } = useTextEditor(() => {
+      const target = template.source?.target;
+      if (!target) {
+        return {};
+      }
 
-    return {
-      initialValue: text.content ?? '',
-      extensions: [
-        createDataExtensions({
-          id,
-          text: createDocAccessor(text, ['content']),
-        }),
-        createBasicExtensions({
-          bracketMatching: false,
-          lineNumbers,
-          lineWrapping: true,
-          placeholder: t('template placeholder'),
-        }),
-        createThemeExtensions({
-          themeMode,
-          slots: { content: { className: '!pe-4' } },
-        }),
-        createMarkdownExtensions(),
-        decorateMarkdown(),
-        handlebars(),
-        // xml(),
-        // NOTE: Since we're using markdown only HTML nodes are parsed.
-        xmlDecorator(),
-        syntaxHighlighting(defaultHighlightStyle),
-      ].filter(isNonNullable),
-    };
-  }, [themeMode, template.source?.target, lineNumbers]);
+      return {
+        initialValue: target.content ?? '',
+        extensions: [
+          createDataExtensions({
+            id,
+            text: createDocAccessor(target, ['content']),
+          }),
+          createBasicExtensions({
+            bracketMatching: false,
+            lineNumbers,
+            lineWrapping: true,
+            placeholder: t('template.placeholder'),
+          }),
+          createThemeExtensions({ themeMode }),
+          createMarkdownExtensions(),
+          decorateMarkdown(),
+          handlebars(),
+          // xml(),
+          // NOTE: Since we're using markdown only HTML nodes are parsed.
+          xmlDecorator(),
+          syntaxHighlighting(defaultHighlightStyle),
+        ].filter(isNonNullable),
+      };
+    }, [themeMode, template.source?.target, lineNumbers]);
 
-  return <div ref={parentRef} className={mx('h-full overflow-hidden', classNames)} />;
-};
+    return (
+      <div
+        {...composableProps(props, {
+          role: 'none',
+          classNames: ['h-full overflow-hidden', classNames],
+        })}
+        ref={composeRefs(parentRef, forwardedRef)}
+      />
+    );
+  },
+);

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

@@ -5,14 +5,15 @@
 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';
 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';
 
@@ -29,10 +30,11 @@ const TEMPLATE = trim`
 const DefaultStory = () => {
   const client = useClient();
   const [blueprint] = useState(() => {
-    const space = client.spaces.default;
+    const space = client.spaces.get()[0];
+    invariant(space, 'TemplateForm story requires at least one space');
     return space.db.add(
       Blueprint.make({
-        key: 'example.com/blueprint/test',
+        key: 'com.example.blueprint.test',
         name: 'Test',
         instructions: Template.make({ source: TEMPLATE }),
       }),
@@ -41,16 +43,12 @@ const DefaultStory = () => {
 
   const handleChange: TemplateChangeCallback = useCallback(
     (mutate) => {
-      Obj.change(blueprint, (b) => mutate(b.instructions));
+      Obj.update(blueprint, (blueprint) => mutate(blueprint.instructions));
     },
     [blueprint],
   );
 
-  return (
-    <div role='none' className='flex w-[40rem] border border-separator overflow-hidden'>
-      <TemplateForm id={blueprint.id} template={blueprint.instructions} onChange={handleChange} />
-    </div>
-  );
+  return <TemplateForm id={blueprint.id} template={blueprint.instructions} onChange={handleChange} />;
 };
 
 const meta = {

package/src/components/TemplateEditor/TemplateForm.tsx

@@ -5,17 +5,17 @@
 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';
 
-import { meta } from '../../meta';
+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;
 
@@ -23,22 +23,21 @@ export type TemplateFormProps = {
   id: string;
   template: Template.Template;
   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;
 };
 
-export const TemplateForm = ({ id, template, commandEditable = true, onChange }: TemplateFormProps) => {
+export const TemplateForm = ({ id, template, onChange }: TemplateFormProps) => {
   const { t } = useTranslation(meta.id);
   usePromptInputs(template, onChange);
 
   const handleInputKindChange = useCallback(
     (inputName: string, kind: Template.InputKind) => {
-      onChange?.((t) => {
-        const input = t.inputs?.find((i) => i?.name === inputName);
+      onChange?.((draft) => {
+        const input = draft.inputs?.find((i) => i?.name === inputName);
         if (input) {
           input.kind = kind;
         }
@@ -49,8 +48,8 @@ export const TemplateForm = ({ id, template, commandEditable = true, onChange }:
 
   const handleInputDefaultChange = useCallback(
     (inputName: string, value: string) => {
-      onChange?.((t) => {
-        const input = t.inputs?.find((i) => i?.name === inputName);
+      onChange?.((draft) => {
+        const input = draft.inputs?.find((i) => i?.name === inputName);
         if (input) {
           input.default = value;
         }
@@ -61,24 +60,6 @@ export const TemplateForm = ({ id, template, commandEditable = true, onChange }:
 
   return (
     <div className='flex flex-col w-full overflow-hidden gap-4'>
-      {/* {commandEditable && (
-        <div className='flex items-center pl-4'>
-          <span className='text-neutral-500'>/</span>
-          <Input.Root>
-            <Input.TextInput
-              placeholder={t('command placeholder')}
-              classNames='w-full bg-transparent m-2'
-              value={template.command ?? ''}
-              onChange={(event) => {
-                onChange?.((t) => {
-                  t.command = event.target.value.replace(/\w/g, '');
-                });
-              }}
-            />
-          </Input.Root>
-        </div>
-      )} */}
-
       <TemplateEditor id={id} template={template} classNames='bg-base-surface min-h-[120px]' />
 
       {(template.inputs?.length ?? 0) > 0 && (
@@ -109,17 +90,15 @@ export const TemplateForm = ({ id, template, commandEditable = true, onChange }:
               </Input.Root>
 
               <div>
-                {input.kind !== undefined && ['value', 'context', 'resolver', 'schema'].includes(input.kind) && (
-                  <div>
-                    <Input.Root>
-                      <Input.TextInput
-                        placeholder={t('command placeholder')}
-                        classNames='w-full bg-transparent'
-                        value={input.default ?? ''}
-                        onChange={(event) => handleInputDefaultChange(input.name, event.target.value)}
-                      />
-                    </Input.Root>
-                  </div>
+                {input.kind === 'value' && (
+                  <Input.Root>
+                    <Input.TextInput
+                      placeholder={t('command.placeholder')}
+                      classNames='w-full bg-transparent'
+                      value={input.default ?? ''}
+                      onChange={(event) => handleInputDefaultChange(input.name, event.target.value)}
+                    />
+                  </Input.Root>
                 )}
               </div>
             </Fragment>
@@ -137,33 +116,33 @@ const inputs: { kind: Template.InputKind; label: string }[] = [
     label: 'Value',
   },
   {
-    kind: 'pass-through',
-    label: 'Pass through',
-  },
-  {
-    kind: 'retriever',
-    label: 'Retriever',
-  },
-  {
-    kind: 'function',
-    label: 'Function',
-  },
-  {
-    kind: 'query',
-    label: 'Query',
-  },
-  {
-    kind: 'resolver',
-    label: 'Resolver',
-  },
-  {
-    kind: 'context',
-    label: 'Context',
-  },
-  {
-    kind: 'schema',
-    label: 'Schema',
+    kind: 'operation',
+    label: 'Operation',
   },
+  // {
+  //   kind: 'pass-through',
+  //   label: 'Pass through',
+  // },
+  // {
+  //   kind: 'retriever',
+  //   label: 'Retriever',
+  // },
+  // {
+  //   kind: 'query',
+  //   label: 'Query',
+  // },
+  // {
+  //   kind: 'resolver',
+  //   label: 'Resolver',
+  // },
+  // {
+  //   kind: 'context',
+  //   label: 'Context',
+  // },
+  // {
+  //   kind: 'schema',
+  //   label: 'Schema',
+  // },
 ];
 
 export const NAME_REGEXP = /\{\{([\w-]+)\}\}/;
@@ -194,30 +173,30 @@ const usePromptInputs = (template: Template.Template, onChange?: TemplateChangeC
 
     // Match or create new inputs.
     const values = unclaimed.values();
-    onChange((t) => {
-      if (!t.inputs) {
-        t.inputs = [];
+    onChange((draft) => {
+      if (!draft.inputs) {
+        draft.inputs = [];
       }
 
       missing.forEach((name) => {
         const next = values.next().value;
         if (next) {
           // Find the input in the mutable draft and update it.
-          const inputIndex = t.inputs!.findIndex((i) => i?.name === next.name);
+          const inputIndex = draft.inputs!.findIndex((i) => i?.name === next.name);
           if (inputIndex !== -1) {
-            t.inputs![inputIndex].name = name;
+            draft.inputs![inputIndex].name = name;
           }
         } else {
-          t.inputs!.push({ name });
+          draft.inputs!.push({ name, kind: 'value' });
         }
       });
 
       // Remove unclaimed (deleted) inputs.
       // TODO(burdon): If user types incorrect name value, it will be deleted. Garbage collect?
       for (const input of values) {
-        const inputIndex = t.inputs!.findIndex((i) => i?.name === input.name);
+        const inputIndex = draft.inputs!.findIndex((i) => i?.name === input.name);
         if (inputIndex !== -1) {
-          t.inputs!.splice(inputIndex, 1);
+          draft.inputs!.splice(inputIndex, 1);
         }
       }
     });

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

@@ -6,13 +6,13 @@ import type * as Tool from '@effect/ai/Tool';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
 import { useTranslation } from '@dxos/react-ui';
-import { NumericTabs, TextCrawl, ToggleContainer, type ToggleContainerRootProps } from '@dxos/react-ui-components';
-import { Json } from '@dxos/react-ui-syntax-highlighter';
+import { NumericTabs, TextCrawl, TogglePanel, type TogglePanelRootProps } from '@dxos/react-ui-components';
+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';
 
-import { meta } from '../../meta';
+import { meta } from '#meta';
 
 export const isToolMessage = (message: Message.Message) => {
   return message.blocks.some((block: ContentBlock.Any) => block._tag === 'toolCall' || block._tag === 'toolResult');
@@ -25,7 +25,7 @@ export type ToolBlockProps = XmlWidgetProps<{
 export const ToolBlock = ({ view, blocks = [] }: ToolBlockProps) => {
   const { t } = useTranslation(meta.id);
 
-  const items = useMemo<ToolContainerProps['items']>(() => {
+  const items = useMemo<ToolPanelProps['items']>(() => {
     let lastToolCall: { tool: Tool.Any | undefined; block: ContentBlock.ToolCall } | undefined;
     // TODO(burdon): Get from context?
     const tools: Tool.Any[] = []; //processor.conversation.toolkit?.tools ?? [];
@@ -41,7 +41,7 @@ export const ToolBlock = ({ view, blocks = [] }: ToolBlockProps) => {
             const tool = tools.find((tool) => tool.name === block.name);
             lastToolCall = { tool, block };
             return {
-              title: tool?.description ?? [t('tool call label'), tool?.name].join(' '),
+              title: tool?.description ?? [t('tool-call.label'), block?.name].join(' '),
               content: {
                 ...block,
                 input: safeParseJson(block.input),
@@ -53,13 +53,13 @@ export const ToolBlock = ({ view, blocks = [] }: ToolBlockProps) => {
             // TODO(burdon): Parse error type.
             if (block.error) {
               return {
-                title: t('tool error label'),
+                title: t('tool-error.label'),
                 content: block,
               };
             }
 
             const title =
-              lastToolCall?.tool?.description ?? [t('tool result label'), lastToolCall?.tool?.name].join(' ');
+              lastToolCall?.tool?.description ?? [t('tool-result.label'), lastToolCall?.block?.name].join(' ');
             lastToolCall = undefined;
             return {
               title,
@@ -76,7 +76,7 @@ export const ToolBlock = ({ view, blocks = [] }: ToolBlockProps) => {
             }
 
             return {
-              title: t('stats label'),
+              title: t('stats.label'),
               content: block,
             };
           }
@@ -92,20 +92,21 @@ export const ToolBlock = ({ view, blocks = [] }: ToolBlockProps) => {
     }, 1_000);
   }, [view]);
 
+  // Ignore if empty.
   if (!items.length) {
     return null;
   }
 
-  return <ToolContainer items={items} onChangeOpen={handleChangeOpen} />;
+  return <ToolPanel items={items} onChangeOpen={handleChangeOpen} />;
 };
 
 ToolBlock.displayName = 'ToolBlock';
 
-type ToolContainerProps = {
+type ToolPanelProps = {
   items: { title: string; content: any }[];
-} & Pick<ToggleContainerRootProps, 'onChangeOpen'>;
+} & Pick<TogglePanelRootProps, 'onChangeOpen'>;
 
-export const ToolContainer = ({ items, onChangeOpen }: ToolContainerProps) => {
+const ToolPanel = ({ items, onChangeOpen }: ToolPanelProps) => {
   const tabsRef = useRef<HTMLDivElement>(null);
   const [selected, setSelected] = useState(0);
   const [open, setOpen] = useState(false);
@@ -122,13 +123,13 @@ export const ToolContainer = ({ items, onChangeOpen }: ToolContainerProps) => {
   }, []);
 
   return (
-    <ToggleContainer.Root classNames='mt-2 w-full rounded-xs' open={open} onChangeOpen={setOpen}>
-      <ToggleContainer.Header classNames='text-sm text-placeholder'>
+    <TogglePanel.Root classNames='w-full rounded-xs border border-subdued-separator' open={open} onChangeOpen={setOpen}>
+      <TogglePanel.Header classNames='text-sm text-placeholder'>
         <TextCrawl key='status-roll' lines={items.map((item) => item.title)} autoAdvance greedy />
-      </ToggleContainer.Header>
-      <ToggleContainer.Content classNames='grid grid-cols-[32px_1fr]'>
+      </TogglePanel.Header>
+      <TogglePanel.Content classNames='grid grid-cols-[32px_1fr]'>
         <NumericTabs ref={tabsRef} classNames='p-1' length={items.length} selected={selected} onSelect={handleSelect} />
-        <Json
+        <JsonHighlighter
           data={items[selected]?.content}
           classNames='p-1 text-xs bg-transparent'
           replacer={{
@@ -137,7 +138,7 @@ export const ToolContainer = ({ items, onChangeOpen }: ToolContainerProps) => {
             maxStringLen: 128,
           }}
         />
-      </ToggleContainer.Content>
-    </ToggleContainer.Root>
+      </TogglePanel.Content>
+    </TogglePanel.Root>
   );
 };