@dxos/plugin-assistant 0.8.4-main.3eb6e50203 → 0.8.4-main.4a85c3132b

package/src/blueprints/assistant/blueprint.test.ts

@@ -0,0 +1,48 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { describe, expect, it } from '@effect/vitest';
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
+
+import { AiConversationService } from '@dxos/assistant';
+import { AssistantTestLayer } from '@dxos/assistant/testing';
+import { DatabaseBlueprint } from '@dxos/assistant-toolkit';
+import { addBlueprints } from '@dxos/assistant-toolkit/testing';
+import { Blueprint } from '@dxos/blueprints';
+import { TestHelpers } from '@dxos/effect/testing';
+import { ObjectId } from '@dxos/keys';
+import { Organization } from '@dxos/types';
+
+import AssistantBlueprint from './blueprint';
+
+ObjectId.dangerouslyDisableRandomness();
+
+const TestLayer = AssistantTestLayer({
+  functions: [...Object.values(DatabaseBlueprint.functions)],
+  types: [Organization.Organization, Blueprint.Blueprint],
+  tracing: 'pretty',
+});
+
+const provideTestLayers = Effect.provide(AiConversationService.layerNewQueue().pipe(Layer.provideMerge(TestLayer)));
+
+describe('Assistant Blueprint', () => {
+  // TODO(dmaretskyi): Regenerate memoized conversation with ALLOW_LLM_GENERATION=1.
+  it.effect.skip(
+    'works with Database blueprint to create objects',
+    Effect.fnUntraced(
+      function* (_) {
+        yield* addBlueprints([AssistantBlueprint, DatabaseBlueprint]);
+        const messages = yield* AiConversationService.run({
+          prompt: 'Create a new organization called "Test Corp".',
+        });
+        const lastMessage = messages.at(-1);
+        expect(lastMessage).toBeDefined();
+      },
+      provideTestLayers,
+      TestHelpers.provideTestContext,
+    ),
+    { timeout: 60_000 },
+  );
+});

package/src/blueprints/assistant/blueprint.ts

@@ -0,0 +1,27 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type AppCapabilities } from '@dxos/app-toolkit';
+import { templates } from '@dxos/assistant';
+import { Blueprint } from '@dxos/blueprints';
+
+const BLUEPRINT_KEY = 'dxos.org/blueprint/assistant';
+
+const tools = ['open-item'];
+
+const make = () =>
+  Blueprint.make({
+    key: BLUEPRINT_KEY,
+    name: 'Assistant',
+    tools: Blueprint.toolDefinitions({ tools }),
+    instructions: templates.system,
+  });
+
+const blueprint: AppCapabilities.BlueprintDefinition = {
+  key: BLUEPRINT_KEY,
+  functions: [],
+  make,
+};
+
+export default blueprint;

package/src/blueprints/assistant/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { default as AssistantBlueprint } from './blueprint';

package/src/blueprints/index.ts

@@ -2,11 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Blueprint } from '@dxos/blueprints';
-import { type FunctionDefinition } from '@dxos/functions';
-
-import * as AssistantBlueprint from './assistant-blueprint';
-
-export { AssistantBlueprint };
-export const blueprints: Blueprint.Blueprint[] = AssistantBlueprint.blueprints;
-export const functions: FunctionDefinition[] = AssistantBlueprint.functions;
+export * from './assistant';

package/src/capabilities/app-graph-builder/app-graph-builder.ts

@@ -68,9 +68,7 @@ export default Capability.makeModule(
                   subject: ASSISTANT_DIALOG,
                   state: true,
                   blockAlign: 'end',
-                  props: {
-                    chat,
-                  },
+                  props: { chat },
                 });
               }),
               properties: {

package/src/capabilities/blueprint-definition/blueprint-definition.ts

@@ -8,67 +8,43 @@ import * as Record from 'effect/Record';
 import { Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
 import {
-  Agent,
-  Discord,
+  AgentFunctions,
+  BrowserBlueprint,
+  DatabaseBlueprint,
   DiscordBlueprint,
-  EntityExtraction,
-  Initiative,
-  Linear,
+  EntityExtractionFunctions,
   LinearBlueprint,
-  Planning,
-  Research,
+  PlanningBlueprint,
+  ProjectBlueprint,
+  ProjectFunctions,
   ResearchBlueprint,
   WebSearchBlueprint,
+  MemoryBlueprint,
 } from '@dxos/assistant-toolkit';
-import { type Blueprint } from '@dxos/blueprints';
 
 import { AssistantBlueprint } from '../../blueprints';
 
-export const createBlueprint: () => Blueprint.Blueprint = AssistantBlueprint.make;
-export { AssistantBlueprint };
-
-export type BlueprintCapabilities = [
-  Capability.Capability<typeof AppCapabilities.Functions>,
-  Capability.Capability<typeof AppCapabilities.BlueprintDefinition>,
-  Capability.Capability<typeof AppCapabilities.Functions>,
-  Capability.Capability<typeof AppCapabilities.BlueprintDefinition>,
-  Capability.Capability<typeof AppCapabilities.Functions>,
-  Capability.Capability<typeof AppCapabilities.BlueprintDefinition>,
-  Capability.Capability<typeof AppCapabilities.Functions>,
-  Capability.Capability<typeof AppCapabilities.BlueprintDefinition>,
-  Capability.Capability<typeof AppCapabilities.Functions>,
-  Capability.Capability<typeof AppCapabilities.BlueprintDefinition>,
-  Capability.Capability<typeof AppCapabilities.Functions>,
-  Capability.Capability<typeof AppCapabilities.BlueprintDefinition>,
-  Capability.Capability<typeof AppCapabilities.Functions>,
-  Capability.Capability<typeof AppCapabilities.BlueprintDefinition>,
-];
-
-export default Capability.makeModule<[], BlueprintCapabilities>(() =>
+const blueprintDefinition = Capability.makeModule(() =>
   Effect.succeed([
-    Capability.contributes(AppCapabilities.Functions, AssistantBlueprint.functions$),
-    Capability.contributes(AppCapabilities.BlueprintDefinition, AssistantBlueprint.blueprint),
-
-    // TODO(burdon): Factor out.
-    Capability.contributes(AppCapabilities.Functions, [Research.create, Research.research]),
+    Capability.contributes(AppCapabilities.BlueprintDefinition, AssistantBlueprint),
+    Capability.contributes(AppCapabilities.BlueprintDefinition, BrowserBlueprint),
+    Capability.contributes(AppCapabilities.BlueprintDefinition, DatabaseBlueprint),
     Capability.contributes(AppCapabilities.BlueprintDefinition, ResearchBlueprint),
-
-    // TODO(burdon): Factor out.
-    Capability.contributes(AppCapabilities.Functions, [Agent.prompt, EntityExtraction.extract]),
     Capability.contributes(AppCapabilities.BlueprintDefinition, WebSearchBlueprint),
-
-    // TODO(burdon): Factor out.
-    Capability.contributes(AppCapabilities.Functions, [Discord.fetch]),
     Capability.contributes(AppCapabilities.BlueprintDefinition, DiscordBlueprint),
-
-    // TODO(burdon): Factor out.
-    Capability.contributes(AppCapabilities.Functions, [Linear.sync]),
     Capability.contributes(AppCapabilities.BlueprintDefinition, LinearBlueprint),
-
-    Capability.contributes(AppCapabilities.Functions, Initiative.getFunctions()),
-    Capability.contributes(AppCapabilities.BlueprintDefinition, Initiative.makeBlueprint()),
-
-    Capability.contributes(AppCapabilities.Functions, Record.values(Planning.PlanningFunctions)),
-    Capability.contributes(AppCapabilities.BlueprintDefinition, Planning.PlanningBlueprint),
+    Capability.contributes(AppCapabilities.BlueprintDefinition, ProjectBlueprint),
+    Capability.contributes(AppCapabilities.BlueprintDefinition, PlanningBlueprint),
+    Capability.contributes(AppCapabilities.BlueprintDefinition, MemoryBlueprint),
+
+    Capability.contributes(AppCapabilities.Functions, Record.values(AgentFunctions)),
+    Capability.contributes(AppCapabilities.Functions, Record.values(EntityExtractionFunctions)),
+    Capability.contributes(AppCapabilities.Functions, [
+      ProjectFunctions.Agent,
+      ProjectFunctions.GetContext,
+      ProjectFunctions.Qualifier,
+    ]),
   ]),
 );
+
+export default blueprintDefinition;

package/src/capabilities/blueprint-definition/index.ts

@@ -5,4 +5,3 @@
 import { Capability } from '@dxos/app-framework';
 
 export const BlueprintDefinition = Capability.lazy('BlueprintDefinition', () => import('./blueprint-definition'));
-export { AssistantBlueprint } from './blueprint-definition';

package/src/capabilities/operation-resolver/operation-resolver.ts

@@ -6,7 +6,8 @@ import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { AiContextBinder, AiConversation } from '@dxos/assistant';
-import { Agent, Chat } from '@dxos/assistant-toolkit';
+import { AgentFunctions, Chat } from '@dxos/assistant-toolkit';
+import { DatabaseBlueprint } from '@dxos/assistant-toolkit';
 import { Blueprint, Prompt } from '@dxos/blueprints';
 import { type Queue } from '@dxos/client/echo';
 import { Filter, Obj, Ref, Type } from '@dxos/echo';
@@ -15,12 +16,12 @@ import { invariant } from '@dxos/invariant';
 import { Operation, OperationResolver } from '@dxos/operation';
 import { AutomationCapabilities } from '@dxos/plugin-automation';
 import { ClientCapabilities } from '@dxos/plugin-client';
-import { Collection } from '@dxos/schema';
+import { ManagedCollection } from '@dxos/schema';
 import { type Message } from '@dxos/types';
 
+import { AssistantBlueprint } from '../../blueprints';
 import { type AiChatServices, updateName } from '../../processor';
 import { AssistantCapabilities, AssistantOperation } from '../../types';
-import { AssistantBlueprint, createBlueprint } from '../blueprint-definition/blueprint-definition';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
@@ -28,15 +29,15 @@ export default Capability.makeModule(
       OperationResolver.make({
         operation: AssistantOperation.OnCreateSpace,
         handler: Effect.fnUntraced(function* ({ space, rootCollection }) {
-          const chatCollection = Collection.makeManaged({ key: Chat.Chat.typename });
-          const blueprintCollection = Collection.makeManaged({ key: Blueprint.Blueprint.typename });
-          const promptCollection = Collection.makeManaged({ key: Type.getTypename(Prompt.Prompt) });
+          const chatCollection = ManagedCollection.makeManagedCollection({ key: Chat.Chat.typename });
+          const blueprintCollection = ManagedCollection.makeManagedCollection({ key: Blueprint.Blueprint.typename });
+          const promptCollection = ManagedCollection.makeManagedCollection({ key: Type.getTypename(Prompt.Prompt) });
           Obj.change(rootCollection, (c) => {
             c.objects.push(Ref.make(chatCollection), Ref.make(blueprintCollection), Ref.make(promptCollection));
           });
 
           // TODO(wittjosiah): Remove once function registry is avaiable.
-          space.db.add(serializeFunction(Agent.prompt));
+          space.db.add(serializeFunction(AgentFunctions.Prompt));
 
           // Create default chat.
           const { object: chat } = yield* Operation.invoke(AssistantOperation.CreateChat, { db: space.db });
@@ -51,7 +52,7 @@ export default Capability.makeModule(
           const space = client.spaces.get(db.spaceId);
           invariant(space, 'Space not found');
           const queue = space.queues.create();
-          const chat = Chat.make({ name, queue: Ref.fromDXN(queue.dxn) });
+          const chat = Chat.make({ name, queue: db.makeRef<any>(queue.dxn) });
           if (addToSpace) {
             space.db.add(chat);
           }
@@ -59,14 +60,22 @@ export default Capability.makeModule(
           // TODO(wittjosiah): This should be a space-level setting.
           // TODO(burdon): Clone when activated. Copy-on-write for template.
           const blueprints = yield* Effect.promise(() => db.query(Filter.type(Blueprint.Blueprint)).run());
-          let defaultBlueprint = blueprints.find((blueprint) => blueprint.key === AssistantBlueprint.Key);
-          if (!defaultBlueprint) {
-            defaultBlueprint = db.add(createBlueprint());
+          let defaultAssistantBlueprint = blueprints.find((blueprint) => blueprint.key === AssistantBlueprint.key);
+          if (!defaultAssistantBlueprint) {
+            defaultAssistantBlueprint = db.add(AssistantBlueprint.make());
+          }
+          let defaultDatabaseBlueprint = blueprints.find((blueprint) => blueprint.key === DatabaseBlueprint.key);
+          if (!defaultDatabaseBlueprint) {
+            defaultDatabaseBlueprint = db.add(DatabaseBlueprint.make());
           }
 
           const binder = new AiContextBinder({ queue, registry });
           yield* Effect.promise(() =>
-            binder.use((b: AiContextBinder) => b.bind({ blueprints: [Ref.make(defaultBlueprint!)] })),
+            binder.use((b: AiContextBinder) =>
+              b.bind({
+                blueprints: [Ref.make(defaultAssistantBlueprint!), Ref.make(defaultDatabaseBlueprint!)],
+              }),
+            ),
           );
 
           return { object: chat };

package/src/capabilities/react-surface/react-surface.tsx

@@ -8,13 +8,13 @@ import React from 'react';
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { Surface, useSettingsState } from '@dxos/app-framework/ui';
 import { AppCapabilities } from '@dxos/app-toolkit';
-import { Chat, Initiative } from '@dxos/assistant-toolkit';
+import { Chat, Project } from '@dxos/assistant-toolkit';
 import { Blueprint, Prompt } from '@dxos/blueprints';
 import { getSpace } from '@dxos/client/echo';
 import { Sequence } from '@dxos/conductor';
 import { InvocationTraceContainer } from '@dxos/devtools';
 import { Obj } from '@dxos/echo';
-import { Layout } from '@dxos/react-ui';
+import { Panel } from '@dxos/react-ui';
 
 import {
   AssistantSettings,
@@ -22,10 +22,11 @@ import {
   ChatCompanion,
   ChatContainer,
   ChatDialog,
-  InitiativeContainer,
+  ProjectArticle,
+  ProjectSettings,
   PromptArticle,
   TriggerStatus,
-} from '../../components';
+} from '../../containers';
 import { ASSISTANT_DIALOG, meta } from '../../meta';
 import { type Assistant } from '../../types';
 
@@ -50,11 +51,16 @@ export default Capability.makeModule(() =>
         component: ({ data, role, ref }) => <ChatContainer role={role} subject={data.subject} ref={ref} />,
       }),
       Surface.create({
-        id: `${meta.id}/initiative`,
+        id: `${meta.id}/project`,
         role: 'article',
-        filter: (data): data is { subject: Initiative.Initiative } =>
-          Obj.instanceOf(Initiative.Initiative, data.subject),
-        component: ({ data, role }) => <InitiativeContainer role={role} initiative={data.subject} />,
+        filter: (data): data is { subject: Project.Project } => Obj.instanceOf(Project.Project, data.subject),
+        component: ({ data, role }) => <ProjectArticle role={role} subject={data.subject} />,
+      }),
+      Surface.create({
+        id: `${meta.id}/project/companion/settings`,
+        role: 'object-settings',
+        filter: (data): data is { subject: Project.Project } => Obj.instanceOf(Project.Project, data.subject),
+        component: ({ data }) => <ProjectSettings subject={data.subject} />,
       }),
       // TODO(wittjosiah): This is flashing when chat changes.
       Surface.create({
@@ -77,9 +83,13 @@ export default Capability.makeModule(() =>
           // TODO(wittjosiah): Support invocation filtering for prompts.
           const target = Obj.instanceOf(Prompt.Prompt, data.companionTo) ? undefined : data.companionTo;
           return (
-            <Layout.Main role={role}>
-              <InvocationTraceContainer db={space?.db} queueDxn={queueDxn} target={target} detailAxis='block' />
-            </Layout.Main>
+            <Panel.Root role={role} className='dx-article'>
+              <Panel.Content asChild>
+                <Panel.Content asChild>
+                  <InvocationTraceContainer db={space?.db} queueDxn={queueDxn} target={target} detailAxis='block' />
+                </Panel.Content>
+              </Panel.Content>
+            </Panel.Root>
           );
         },
       }),

package/src/capabilities/repair/repair.ts

@@ -8,9 +8,10 @@ import { Capability } from '@dxos/app-framework';
 import { Chat } from '@dxos/assistant-toolkit';
 import { Blueprint, Prompt } from '@dxos/blueprints';
 import { Obj, Ref, Type } from '@dxos/echo';
+import { Collection } from '@dxos/echo';
 import { SpaceCapabilities } from '@dxos/plugin-space';
 import { type Space } from '@dxos/react-client/echo';
-import { Collection } from '@dxos/schema';
+import { ManagedCollection } from '@dxos/schema';
 
 export default Capability.makeModule(() =>
   Effect.succeed(
@@ -31,30 +32,36 @@ const ensureSystemCollections = async (space: Space) => {
 
   const objects = await Promise.all(rootCollection.objects.map((ref) => ref.load()));
   const chats = objects.find(
-    (object) => Obj.instanceOf(Collection.Managed, object) && object.key === Chat.Chat.typename,
+    (object) => Obj.instanceOf(ManagedCollection.ManagedCollection, object) && object.key === Chat.Chat.typename,
   );
   if (!chats) {
-    const chatsCollectionRef = Ref.make(Collection.makeManaged({ key: Chat.Chat.typename }));
+    const chatsCollectionRef = Ref.make(ManagedCollection.makeManagedCollection({ key: Chat.Chat.typename }));
     Obj.change(rootCollection, (c) => {
       c.objects.push(chatsCollectionRef);
     });
   }
 
   const blueprints = objects.find(
-    (object) => Obj.instanceOf(Collection.Managed, object) && object.key === Blueprint.Blueprint.typename,
+    (object) =>
+      Obj.instanceOf(ManagedCollection.ManagedCollection, object) && object.key === Blueprint.Blueprint.typename,
   );
   if (!blueprints) {
-    const blueprintsCollectionRef = Ref.make(Collection.makeManaged({ key: Blueprint.Blueprint.typename }));
+    const blueprintsCollectionRef = Ref.make(
+      ManagedCollection.makeManagedCollection({ key: Blueprint.Blueprint.typename }),
+    );
     Obj.change(rootCollection, (c) => {
       c.objects.push(blueprintsCollectionRef);
     });
   }
 
   const prompts = objects.find(
-    (object) => Obj.instanceOf(Collection.Managed, object) && object.key === Type.getTypename(Prompt.Prompt),
+    (object) =>
+      Obj.instanceOf(ManagedCollection.ManagedCollection, object) && object.key === Type.getTypename(Prompt.Prompt),
   );
   if (!prompts) {
-    const promptsCollectionRef = Ref.make(Collection.makeManaged({ key: Type.getTypename(Prompt.Prompt) }));
+    const promptsCollectionRef = Ref.make(
+      ManagedCollection.makeManagedCollection({ key: Type.getTypename(Prompt.Prompt) }),
+    );
     Obj.change(rootCollection, (c) => {
       c.objects.push(promptsCollectionRef);
     });

package/src/capabilities/toolkit/toolkit.ts

@@ -5,23 +5,11 @@
 import * as Effect from 'effect/Effect';
 import * as Layer from 'effect/Layer';
 
+import { GenericToolkit } from '@dxos/ai';
 import { Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
-import { GenericToolkit } from '@dxos/assistant';
-import { AssistantToolkit, SystemToolkit, WebSearchToolkit } from '@dxos/assistant-toolkit';
+import { WebSearchToolkit } from '@dxos/assistant-toolkit';
 
 export default Capability.makeModule(() =>
-  Effect.succeed([
-    Capability.contributes(
-      AppCapabilities.Toolkit,
-      GenericToolkit.make(AssistantToolkit.AssistantToolkit, AssistantToolkit.layer()),
-    ),
-
-    // TODO(burdon): How to manage dependencies across blueprints.
-    Capability.contributes(
-      AppCapabilities.Toolkit,
-      GenericToolkit.make(SystemToolkit.SystemToolkit, SystemToolkit.layer()),
-    ),
-    Capability.contributes(AppCapabilities.Toolkit, GenericToolkit.make(WebSearchToolkit, Layer.empty)),
-  ]),
+  Effect.succeed([Capability.contributes(AppCapabilities.Toolkit, GenericToolkit.make(WebSearchToolkit, Layer.empty))]),
 );

package/src/components/Chat/Chat.tsx

@@ -8,7 +8,15 @@ import { useAtomValue } from '@effect-atom/atom-react';
 import { createContext } from '@radix-ui/react-context';
 import * as Array from 'effect/Array';
 import * as Option from 'effect/Option';
-import React, { type PropsWithChildren, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import React, {
+  type ComponentPropsWithoutRef,
+  type PropsWithChildren,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
 
 import { type Chat as ChatModule } from '@dxos/assistant-toolkit';
 import { Event } from '@dxos/async';
@@ -19,7 +27,7 @@ import { useIdentity } from '@dxos/react-client/halo';
 import { Input, type ThemedClassName, useDynamicRef, useTranslation } from '@dxos/react-ui';
 import { ChatEditor, type ChatEditorController, type ChatEditorProps } from '@dxos/react-ui-chat';
 import { type MarkdownStreamController } from '@dxos/react-ui-components';
-import { MenuProvider, ToolbarMenu } from '@dxos/react-ui-menu';
+import { Menu } from '@dxos/react-ui-menu';
 import { Message } from '@dxos/types';
 import { mx } from '@dxos/ui-theme';
 import { isTruthy } from '@dxos/util';
@@ -84,7 +92,8 @@ const ChatRoot = ({ children, chat, processor, onEvent, ...props }: ChatRootProp
     return event.on((ev) => {
       switch (ev.type) {
         case 'toggle-debug': {
-          setDebug((current) => !current);
+          setDebug((debug) => !debug);
+
           // Dump state to console.
           queueMicrotask(async () => {
             const objects = processor.context.getObjects();
@@ -162,11 +171,11 @@ ChatRoot.displayName = 'Chat.Root';
 
 const CHAT_VIEWPORT_NAME = 'Chat.Viewport';
 
-type ChatViewportProps = ThemedClassName<PropsWithChildren>;
+type ChatViewportProps = ThemedClassName<PropsWithChildren<ComponentPropsWithoutRef<'div'>>>;
 
-const ChatViewport = ({ classNames, children }: ChatViewportProps) => {
+const ChatViewport = ({ classNames, children, ...props }: ChatViewportProps) => {
   return (
-    <div role='none' className={mx('flex flex-col bs-full is-full', classNames)}>
+    <div role='none' {...props} className={mx('flex flex-col h-full w-full', classNames)}>
       {children}
     </div>
   );
@@ -362,9 +371,9 @@ const ChatPrompt = ({
     <div
       role='group'
       className={mx(
-        'flex flex-col is-full density-fine',
+        'flex flex-col w-full dx-density-fine',
         outline &&
-          'bg-groupSurface border border-subduedSeparator transition transition-border [&:has(.cm-content:focus)]:border-separator rounded',
+          'bg-group-surface border border-subdued-separator transition transition-border [&:has(.cm-content:focus)]:border-separator rounded-sm',
         classNames,
       )}
     >
@@ -374,7 +383,7 @@ const ChatPrompt = ({
           ref={editorRef}
           autoFocus
           lineWrapping
-          classNames='col-span-2 pbs-0.5'
+          classNames='col-span-2 pt-0.5'
           placeholder={placeholder ?? t('prompt placeholder')}
           extensions={extensions}
           onSubmit={handleSubmit}
@@ -407,7 +416,7 @@ const ChatPrompt = ({
             {online !== undefined && (
               <Input.Root>
                 <Input.Label srOnly>{t('online switch label')}</Input.Label>
-                <Input.Switch classNames='mli-2' checked={online} onCheckedChange={onOnlineChange} />
+                <Input.Switch classNames='mx-2' checked={online} onCheckedChange={onOnlineChange} />
               </Input.Root>
             )}
           </ChatActions>
@@ -425,19 +434,20 @@ ChatPrompt.displayName = CHAT_PROMPT_NAME;
 
 const CHAT_TOOLBAR_NAME = 'Chat.Toolbar';
 
-type ChatToolbarProps = ThemedClassName<{ companionTo?: Obj.Unknown }>;
+type ChatToolbarProps = ThemedClassName<{ companionTo?: Obj.Unknown } & ComponentPropsWithoutRef<typeof Menu.Root>>;
 
-const ChatToolbar = ({ classNames, companionTo }: ChatToolbarProps) => {
+const ChatToolbar = ({ classNames, companionTo, ...props }: ChatToolbarProps) => {
   const { chat } = useChatContext(CHAT_TOOLBAR_NAME);
   const menu = useChatToolbarActions({ chat, companionTo });
 
   return (
-    <MenuProvider
+    <Menu.Root
+      {...props}
       {...menu}
       attendableId={companionTo ? Obj.getDXN(companionTo).toString() : chat ? Obj.getDXN(chat).toString() : ''}
     >
-      <ToolbarMenu classNames={classNames} textBlockWidth />
-    </MenuProvider>
+      <Menu.Toolbar classNames={classNames} textBlockWidth />
+    </Menu.Root>
   );
 };
 

package/src/components/ChatProgress/ChatProgress.tsx

@@ -45,9 +45,9 @@ export const ChatProgress = ({ chat }: ChatProgressProps) => {
   }, [nodes.length]);
 
   return (
-    <div role='none' tabIndex={0} ref={ref} className='flex flex-col outline-none'>
+    <div role='none' tabIndex={0} ref={ref} className='flex flex-col outline-hidden'>
       <ProgressBar nodes={nodes} index={index} onSelect={handleSelect} />
-      <TextCrawl classNames='pis-4 text-sm text-description' lines={lines} autoAdvance />
+      <TextCrawl classNames='ps-4 text-sm text-description' lines={lines} autoAdvance />
     </div>
   );
 };

package/src/components/ChatPrompt/ChatActions.tsx

@@ -23,7 +23,7 @@ export const ChatActions = ({ classNames, children, microphone, recording, proce
   const { t } = useTranslation(meta.id);
 
   return (
-    <div className={mx('flex items-center mie-1', classNames)}>
+    <div className={mx('flex items-center me-1', classNames)}>
       {children}
 
       <IconButton