@dxos/plugin-assistant 0.8.4-main.abd8ff62ef → 0.8.4-main.bc2380dfbc

package/src/AssistantPlugin.workerd.ts

@@ -0,0 +1,41 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { AiContext } from '@dxos/assistant';
+import { Agent, Chat, McpServer, Memory, Plan } from '@dxos/assistant-toolkit';
+import { Blueprint, Routine } from '@dxos/compute';
+import { Sequence } from '@dxos/conductor';
+import { Feed } from '@dxos/echo';
+import { Text } from '@dxos/schema';
+import { HasSubject, Message } from '@dxos/types';
+
+import { OperationHandler } from '#capabilities';
+import { meta } from '#meta';
+
+export const AssistantPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addSchemaModule({
+    schema: [
+      Chat.Chat,
+      Chat.CompanionTo,
+      Blueprint.Blueprint,
+      AiContext.Binding,
+      Feed.Feed,
+      HasSubject.HasSubject,
+      Message.Message,
+      Routine.Routine,
+      Agent.Agent,
+      McpServer.McpServer,
+      Plan.Plan,
+      Sequence.Sequence,
+      Memory.Memory,
+      Text.Text,
+    ],
+  }),
+  Plugin.make,
+);
+
+export default AssistantPlugin;

package/src/blueprints/assistant/blueprint.ts

@@ -6,7 +6,7 @@ import { LayoutOperation } from '@dxos/app-toolkit';
 import { templates } from '@dxos/assistant';
 import { Blueprint } from '@dxos/compute';
 
-import { AssistantOperation } from '#operations';
+import { AssistantOperation } from '#types';
 
 const BLUEPRINT_KEY = 'org.dxos.blueprint.assistant';
 

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

@@ -8,20 +8,22 @@ import * as Option from 'effect/Option';
 
 import { Capability } from '@dxos/app-framework';
 import { AppCapabilities, AppNode, getActiveSpace, getPersonalSpace } from '@dxos/app-toolkit';
-import { Chat } from '@dxos/assistant-toolkit';
+import { AgentPrompt, Chat } from '@dxos/assistant-toolkit';
 import { Blueprint, Routine, Operation } from '@dxos/compute';
 import { Sequence } from '@dxos/conductor';
 import { DXN, Database, Filter, Obj, type Ref } from '@dxos/echo';
 import { AtomObj } from '@dxos/echo-atom';
 import { invariant } from '@dxos/invariant';
-import { AutomationCapabilities } from '@dxos/plugin-automation/types';
-import { ClientCapabilities } from '@dxos/plugin-client/types';
+import { AutomationCapabilities } from '@dxos/plugin-automation';
+import { ClientCapabilities } from '@dxos/plugin-client';
 import { GraphBuilder, Node, NodeMatcher } from '@dxos/plugin-graph';
 import { linkedSegment } from '@dxos/react-ui-attention';
 
 import { ASSISTANT_COMPANION_VARIANT, meta } from '#meta';
-import { AssistantOperation } from '#operations';
-import { AssistantCapabilities } from '#types';
+import { AssistantCapabilities, AssistantOperation } from '#types';
+
+/** Operation definitions to seed as `PersistentOperation` records for automation / triggers. */
+const computeOperationsToImport = [AgentPrompt] as const;
 
 /** Match ECHO objects that are NOT chats. */
 const whenNonChatObject = NodeMatcher.whenAll(
@@ -65,6 +67,43 @@ export default Capability.makeModule(
         match: NodeMatcher.whenRoot,
         actions: () =>
           Effect.succeed([
+            Node.makeAction({
+              id: 'import-compute-operations',
+              data: Effect.fnUntraced(function* () {
+                const capabilities = yield* Capability.Service;
+                const client = yield* Capability.get(ClientCapabilities.Client);
+                const space = getActiveSpace(client, capabilities) ?? getPersonalSpace(client);
+                if (!space) {
+                  return;
+                }
+                for (const definition of computeOperationsToImport) {
+                  const key = definition.meta.key;
+                  if (!key) {
+                    continue;
+                  }
+                  const existing = yield* Effect.promise(
+                    (): Promise<Operation.PersistentOperation[]> =>
+                      space.db.query(Filter.and(Filter.type(Operation.PersistentOperation), Filter.key(key))).run(),
+                  );
+                  if (existing.length === 0) {
+                    space.db.add(Operation.serialize(definition));
+                  }
+                }
+                yield* Database.flush();
+              }),
+              properties: {
+                label: ['import-compute-operations.label', { ns: meta.id }],
+                icon: 'ph--download-simple--regular',
+              },
+            }),
+            Node.makeAction({
+              id: AssistantOperation.ToggleTracePanelDebug.meta.key,
+              data: () => Operation.invoke(AssistantOperation.ToggleTracePanelDebug, {}),
+              properties: {
+                label: ['toggle-trace-panel-debug.label', { ns: meta.id }],
+                icon: 'ph--brackets-curly--regular',
+              },
+            }),
             Node.makeAction({
               id: 'reset-blueprints',
               data: Effect.fnUntraced(function* () {
@@ -98,16 +137,16 @@ export default Capability.makeModule(
           Effect.gen(function* () {
             const state = get(yield* Capability.get(AssistantCapabilities.State));
             const cache = get(yield* Capability.get(AssistantCapabilities.CompanionChatCache));
-            const objectDxn = Obj.getDXN(object).toString();
+            const objectDXN = Obj.getDXN(object).toString();
 
             // Resolve chat from persisted state or transient cache.
             const chat = pipe(
-              Option.fromNullable(state.currentChat[objectDxn]),
+              Option.fromNullable(state.currentChat[objectDXN]),
               Option.flatMap((dxnStr) => Option.fromNullable(DXN.tryParse(dxnStr))),
               Option.flatMap((dxn) => Option.fromNullable(Obj.getDatabase(object)?.makeRef(dxn))),
               Option.map((ref) => get(AtomObj.make(ref as Ref.Ref<Obj.Unknown>))),
               Option.filter(Obj.isObject),
-              Option.orElse(() => pipe(Option.fromNullable(cache[objectDxn]), Option.filter(Obj.isObject))),
+              Option.orElse(() => pipe(Option.fromNullable(cache[objectDXN]), Option.filter(Obj.isObject))),
               Option.getOrNull,
             );
 
@@ -126,7 +165,7 @@ export default Capability.makeModule(
       GraphBuilder.createExtension({
         id: 'invocations',
         match: NodeMatcher.whenAny(
-          NodeMatcher.whenEchoTypeMatches(Sequence),
+          NodeMatcher.whenEchoTypeMatches(Sequence.Sequence),
           NodeMatcher.whenEchoTypeMatches(Routine.Routine),
         ),
         connector: () =>

package/src/capabilities/companion-chat-provisioner.ts

@@ -12,13 +12,12 @@ import { AppCapabilities } from '@dxos/app-toolkit';
 import { Chat } from '@dxos/assistant-toolkit';
 import { Obj } from '@dxos/echo';
 import { log } from '@dxos/log';
-import { DeckCapabilities, PLANK_COMPANION_TYPE, type StoredDeckState } from '@dxos/plugin-deck/types';
+import { DeckCapabilities, PLANK_COMPANION_TYPE, type StoredDeckState } from '@dxos/plugin-deck';
 import { getLinkedVariant } from '@dxos/react-ui-attention';
 import { byPosition } from '@dxos/util';
 
 import { ASSISTANT_COMPANION_VARIANT } from '#meta';
-import { AssistantOperation } from '#operations';
-import { AssistantCapabilities } from '#types';
+import { AssistantCapabilities, AssistantOperation } from '#types';
 
 /**
  * Non-React capability that watches deck companion state and provisions transient chats
@@ -65,9 +64,9 @@ export default Capability.makeModule(
       }
 
       const object = node.data;
-      const companionDxn = Obj.getDXN(object).toString();
+      const companionDXN = Obj.getDXN(object).toString();
       const cache = registry.get(cacheAtom);
-      if (cache[companionDxn]) {
+      if (cache[companionDXN]) {
         return true;
       }
 

package/src/capabilities/create-object.ts

@@ -0,0 +1,107 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { Agent, AgentBlueprint, Chat } from '@dxos/assistant-toolkit';
+import { Blueprint, Operation, Routine } from '@dxos/compute';
+import { Sequence } from '@dxos/conductor';
+import { Obj } from '@dxos/echo';
+import { type SpaceId } from '@dxos/keys';
+import { AutomationCapabilities } from '@dxos/plugin-automation';
+import { SpaceOperation } from '@dxos/plugin-space';
+import { SpaceCapabilities } from '@dxos/plugin-space';
+
+import { AssistantOperation } from '#types';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    return [
+      Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
+        id: Chat.Chat.typename,
+        createObject: (props, options) =>
+          Effect.gen(function* () {
+            const { object } = yield* Operation.invoke(AssistantOperation.CreateChat, {
+              db: options.db,
+              name: props?.name,
+            });
+            return yield* Operation.invoke(SpaceOperation.AddObject, {
+              object,
+              target: options.target,
+              hidden: true,
+              targetNodeId: options.targetNodeId,
+            });
+          }),
+      }),
+      Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
+        id: Blueprint.Blueprint.typename,
+        inputSchema: AssistantOperation.BlueprintForm,
+        createObject: (props, options) =>
+          Effect.gen(function* () {
+            const object = Blueprint.make(props);
+            return yield* Operation.invoke(SpaceOperation.AddObject, {
+              object,
+              target: options.target,
+              hidden: true,
+              targetNodeId: options.targetNodeId,
+            });
+          }),
+      }),
+      Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
+        id: Routine.Routine.typename,
+        createObject: (props, options) =>
+          Effect.gen(function* () {
+            const object = Routine.make(props);
+            return yield* Operation.invoke(SpaceOperation.AddObject, {
+              object,
+              target: options.target,
+              hidden: true,
+              targetNodeId: options.targetNodeId,
+            });
+          }),
+      }),
+      Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
+        id: Sequence.Sequence.typename,
+        createObject: (props, options) =>
+          Effect.gen(function* () {
+            const object = Obj.make(Sequence.Sequence, props);
+            return yield* Operation.invoke(SpaceOperation.AddObject, {
+              object,
+              target: options.target,
+              hidden: true,
+              targetNodeId: options.targetNodeId,
+            });
+          }),
+      }),
+      Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
+        id: Agent.Agent.typename,
+        createObject: (props, options) =>
+          Effect.gen(function* () {
+            const object = yield* Agent.makeInitialized({ name: '', instructions: '' }, AgentBlueprint.make()).pipe(
+              withComputeRuntime(options.db.spaceId),
+            );
+            return yield* Operation.invoke(SpaceOperation.AddObject, {
+              object,
+              target: options.target,
+              hidden: true,
+              targetNodeId: options.targetNodeId,
+            });
+          }),
+      }),
+    ];
+  }),
+);
+
+// TODO(dmaretskyi): Extract to a helper module.
+const withComputeRuntime =
+  (spaceId: SpaceId) =>
+  <A, E, R>(
+    effect: Effect.Effect<A, E, R>,
+  ): Effect.Effect<A, E, Exclude<R, AutomationCapabilities.ComputeServices> | Capability.Service> =>
+    Effect.gen(function* () {
+      const provider = yield* Capability.get(AutomationCapabilities.ComputeRuntime).pipe(Effect.orDie);
+      const runtime = yield* provider.getRuntime(spaceId).runtimeEffect;
+      return yield* effect.pipe(Effect.provide(runtime));
+    });

package/src/capabilities/index.ts

@@ -13,6 +13,7 @@ export const CompanionChatProvisioner = Capability.lazy(
   'CompanionChatProvisioner',
   () => import('./companion-chat-provisioner'),
 );
+export const CreateObject = Capability.lazy('CreateObject', () => import('./create-object'));
 export const EdgeModelResolver = Capability.lazy('EdgeModelResolver', () => import('./edge-model-resolver'));
 export const LocalModelResolver = Capability.lazy('LocalModelResolver', () => import('./local-model-resolver'));
 export const MarkdownExtension = Capability.lazy('MarkdownExtension', () => import('./markdown'));

package/src/capabilities/markdown.ts

@@ -6,9 +6,9 @@ import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { Obj } from '@dxos/echo';
-import { MarkdownCapabilities } from '@dxos/plugin-markdown/types';
+import { MarkdownCapabilities } from '@dxos/plugin-markdown';
 
-import { AssistantOperation } from '#operations';
+import { AssistantOperation } from '#types';
 
 import { promptRunExtension } from '../extensions';
 

package/src/capabilities/migrations.ts

@@ -6,14 +6,14 @@ import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
 import { Chat } from '@dxos/assistant-toolkit';
-import { defineObjectMigration } from '@dxos/client/echo';
-import { ClientCapabilities } from '@dxos/plugin-client/types';
+import { Migration } from '@dxos/echo';
+import { ClientCapabilities } from '@dxos/plugin-client';
 
 const identityTransform = async (from: any) => ({ ...from });
 const noopCallback = async () => {};
 
 const migrations = [
-  defineObjectMigration({
+  Migration.define({
     from: Chat.LegacyCompanionTo,
     to: Chat.CompanionTo,
     transform: identityTransform,

package/src/capabilities/react-surface.tsx

@@ -8,7 +8,7 @@ import React, { type ComponentProps, useEffect } from 'react';
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { Surface, useSettingsState } from '@dxos/app-framework/ui';
 import { AppSurface, useActiveSpace } from '@dxos/app-toolkit/ui';
-import { Chat, Agent } from '@dxos/assistant-toolkit';
+import { Chat, Agent, Plan } from '@dxos/assistant-toolkit';
 import { getSpace } from '@dxos/client/echo';
 import { Blueprint, Routine } from '@dxos/compute';
 import { Sequence } from '@dxos/conductor';
@@ -21,10 +21,11 @@ import { AssistantSettings } from '#components';
 import {
   BlueprintArticle,
   ChatCompanion,
-  ChatContainer,
+  ChatArticle,
   ChatDialog,
   AgentArticle,
   AgentProperties,
+  PlanArticle,
   RoutineArticle,
   RoutineList,
   TracePanel,
@@ -52,7 +53,7 @@ export default Capability.makeModule(() =>
           Obj.instanceOf(Chat.Chat, data.subject) &&
           data.variant !== ASSISTANT_COMPANION_VARIANT,
         component: ({ data, role, ref }) => {
-          return <ChatContainer role={role} subject={data.subject} attendableId={data.attendableId} ref={ref} />;
+          return <ChatArticle role={role} subject={data.subject} attendableId={data.attendableId} ref={ref} />;
         },
       }),
       Surface.create({
@@ -87,20 +88,20 @@ export default Capability.makeModule(() =>
       Surface.create({
         id: 'companion-invocations',
         role: 'article',
-        filter: (data): data is { companionTo: Sequence } =>
-          (Obj.instanceOf(Sequence, data.companionTo) || Obj.instanceOf(Routine.Routine, data.companionTo)) &&
+        filter: (data): data is { companionTo: Sequence.Sequence } =>
+          (Obj.instanceOf(Sequence.Sequence, data.companionTo) || Obj.instanceOf(Routine.Routine, data.companionTo)) &&
           data.subject === 'invocations',
         component: ({ data, role }) => {
           const space = getSpace(data.companionTo);
           const feed = space?.properties.invocationTraceFeed?.target;
-          const queueDxn = feed ? Feed.getQueueDxn(feed) : undefined;
+          const feedDXN = feed ? Feed.getQueueDxn(feed) : undefined;
           // TODO(wittjosiah): Support invocation filtering for prompts.
           const target = Obj.instanceOf(Routine.Routine, data.companionTo) ? undefined : data.companionTo;
 
           return (
             <Panel.Root role={role} className='dx-document'>
               <Panel.Content asChild>
-                <InvocationTraceContainer db={space?.db} queueDxn={queueDxn} target={target} detailAxis='block' />
+                <InvocationTraceContainer db={space?.db} feedDXN={feedDXN} target={target} detailAxis='block' />
               </Panel.Content>
             </Panel.Root>
           );
@@ -120,6 +121,13 @@ export default Capability.makeModule(() =>
           <RoutineArticle role={role} subject={data.subject} attendableId={data.attendableId} />
         ),
       }),
+      Surface.create({
+        id: 'plan',
+        filter: AppSurface.object(AppSurface.Article, Plan.Plan),
+        component: ({ data, role }) => (
+          <PlanArticle role={role} subject={data.subject} attendableId={data.attendableId} />
+        ),
+      }),
       Surface.create({
         id: ASSISTANT_DIALOG,
         filter: AppSurface.component<ComponentProps<typeof ChatDialog>>(AppSurface.Dialog, ASSISTANT_DIALOG),

package/src/components/Chat/Chat.tsx

@@ -7,9 +7,10 @@ import * as Array from 'effect/Array';
 import * as Option from 'effect/Option';
 import React, { type PropsWithChildren, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
+import { Agent, Plan } from '@dxos/assistant-toolkit';
 import { Event } from '@dxos/async';
-import { Filter, Obj } from '@dxos/echo';
-import { type Queue, useQuery } from '@dxos/react-client/echo';
+import { type Feed, Filter, Obj, Query } from '@dxos/echo';
+import { useQuery } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { type MarkdownStreamController } from '@dxos/react-ui-markdown';
 import { Menu, MenuRootProps } from '@dxos/react-ui-menu';
@@ -24,6 +25,7 @@ import {
   type ChatPromptProps as NaturalChatPromptProps,
 } from '../ChatPrompt';
 import { ChatThread as NaturalChatThread, type ChatThreadProps as NaturalChatThreadProps } from '../ChatThread';
+import { TaskList } from '../TaskList';
 import { ChatContextProvider, type ChatContextValue, type ChatRequestTiming, useChatContext } from './context';
 import { type ChatEvent } from './events';
 
@@ -35,7 +37,7 @@ export { useChatContext };
 
 type ChatRootProps = PropsWithChildren<
   Pick<ChatContextValue, 'db' | 'chat' | 'processor'> & {
-    feed?: Queue;
+    feed?: Feed.Feed;
     onEvent?: (event: ChatEvent) => void;
   }
 >;
@@ -48,7 +50,10 @@ const ChatRoot = ({ children, chat, feed, processor, onEvent, ...props }: ChatRo
   const lastPrompt = useRef<string | undefined>(undefined);
   const db = props.db ?? (chat && Obj.getDatabase(chat));
 
-  const feedMessages = useQuery(feed, Filter.type(Message.Message));
+  const feedMessages = useQuery(
+    db,
+    feed ? Query.select(Filter.type(Message.Message)).from(feed) : Query.select(Filter.nothing()),
+  );
   const pendingMessages = useAtomValue(processor.messages);
   const messages = useMemo(
     () => Array.dedupeWith([...feedMessages, ...pendingMessages], ({ id: a }, { id: b }) => a === b),
@@ -219,7 +224,7 @@ const ChatThread = ({ viewType, debug: debugProp, ...props }: ChatThreadProps) =
   );
 
   if (!identity) {
-    return null;
+    return <div className='dx-expander' />;
   }
 
   return (
@@ -254,6 +259,30 @@ const ChatPrompt = (props: ChatPromptProps) => {
 
 ChatPrompt.displayName = CHAT_PROMPT_NAME;
 
+//
+// TaskList
+//
+
+const CHAT_TASK_LIST_NAME = 'Chat.TaskList';
+
+type ChatTaskListProps = {
+  plan?: Plan.Plan;
+};
+
+const ChatTaskList = composable<HTMLDivElement, ChatTaskListProps>(({ plan: planProp, ...props }, forwardedRef) => {
+  const { chat } = useChatContext(CHAT_TASK_LIST_NAME);
+  const parent = chat ? Obj.getParent(chat) : undefined;
+  const agent = parent && Obj.instanceOf(Agent.Agent, parent) ? parent : undefined;
+  const plan = planProp ?? agent?.plan.target;
+  if (!plan) {
+    return null;
+  }
+
+  return <TaskList {...props} plan={plan} ref={forwardedRef} />;
+});
+
+ChatTaskList.displayName = CHAT_TASK_LIST_NAME;
+
 //
 // Chat
 //
@@ -265,6 +294,7 @@ export const Chat = {
   Prompt: ChatPrompt,
   Status: ChatStatus,
   Thread: ChatThread,
+  TaskList: ChatTaskList,
 };
 
 export type { ChatRootProps, ChatToolbarProps, ChatContentProps, ChatPromptProps, ChatThreadProps, ChatEvent };

package/src/components/ChatPrompt/ChatMcpErrors.tsx

@@ -37,7 +37,7 @@ export const ChatMcpErrors = ({ classNames, processor }: ChatMcpErrorsProps) =>
       <Message.Content asChild>
         <ul className='flex flex-col gap-0.5 text-sm'>
           {errors.map((error) => (
-            <li key={`${error.url}::${error.kind}`} className='truncate'>
+            <li key={`${error.url}::${error.protocol}`} className='truncate'>
               <span className='font-mono'>{error.url}</span>
               {' — '}
               <span>{error.message}</span>

package/src/components/ChatPrompt/ChatOptions.stories.tsx

@@ -10,11 +10,11 @@ import { withPluginManager } from '@dxos/app-framework/testing';
 import { Chat } from '@dxos/assistant-toolkit';
 import { capabilities } from '@dxos/assistant-toolkit/testing';
 import { Feed, Filter, Ref } from '@dxos/echo';
-import { ChessPlugin } from '@dxos/plugin-chess';
-import { ClientPlugin } from '@dxos/plugin-client';
+import { ChessPlugin } from '@dxos/plugin-chess/testing';
+import { ClientPlugin } from '@dxos/plugin-client/testing';
 import { initializeIdentity } from '@dxos/plugin-client/testing';
-import { MapPlugin } from '@dxos/plugin-map';
-import { TablePlugin } from '@dxos/plugin-table';
+import { MapPlugin } from '@dxos/plugin-map/testing';
+import { TablePlugin } from '@dxos/plugin-table/testing';
 import { corePlugins } from '@dxos/plugin-testing';
 import { useQuery, useSpaces } from '@dxos/react-client/echo';
 import { Loading, withTheme } from '@dxos/react-ui/testing';

package/src/components/ChatPrompt/ChatOptions.tsx

@@ -5,7 +5,7 @@
 import * as Option from 'effect/Option';
 import React, { type JSX, useCallback, useMemo, useState } from 'react';
 
-import { type AiContextBinder } from '@dxos/assistant';
+import { type AiContext } from '@dxos/assistant';
 import { type Chat as ChatModule, McpServer } from '@dxos/assistant-toolkit';
 import { type Blueprint } from '@dxos/compute';
 import { Annotation, type Database, Filter, Obj, Type } from '@dxos/echo';
@@ -28,7 +28,7 @@ const styles = {
 export type ChatOptionsProps = {
   chat?: ChatModule.Chat;
   db: Database.Database;
-  context: AiContextBinder;
+  context: AiContext.Binder;
   blueprintRegistry?: Blueprint.Registry;
   presets?: { id: string; label: string }[];
   preset?: string;
@@ -50,7 +50,7 @@ export const ChatOptions = ({
   const { t } = useTranslation(meta.id);
 
   return (
-    <div role='none' className='flex'>
+    <div className='flex'>
       <Popover.Root>
         <Popover.Trigger asChild>
           <IconButton variant='ghost' icon='ph--plus--regular' iconOnly label={t('context-objects.button')} />
@@ -142,15 +142,16 @@ const BlueprintsPanel = ({
       <SearchList.Content classNames='flex flex-col'>
         <SearchList.Viewport>
           {results.map((blueprint) => {
-            const isActive = activeBlueprints.has(blueprint.key);
+            const blueprintKey = Obj.getMeta(blueprint).key ?? blueprint.id;
+            const isActive = activeBlueprints.has(blueprintKey);
             return (
               <SearchList.Item
                 classNames='flex items-center overflow-hidden'
-                key={blueprint.key}
-                value={blueprint.key}
+                key={blueprintKey}
+                value={blueprintKey}
                 label={blueprint.name}
                 checked={isActive}
-                onSelect={() => onUpdateBlueprint?.(blueprint.key, !isActive)}
+                onSelect={() => onUpdateBlueprint?.(blueprintKey, !isActive)}
               />
             );
           })}
@@ -229,7 +230,7 @@ const McpServersPanel = ({ db }: McpServersPanelProps) => {
       {adding ? (
         <McpServerForm onSubmit={handleAdd} onCancel={() => setAdding(false)} />
       ) : (
-        <div role='none'>
+        <div>
           <IconButton
             variant='ghost'
             icon='ph--plus--regular'
@@ -333,7 +334,7 @@ const McpServerForm = ({ onSubmit, onCancel }: McpServerFormProps) => {
           onChange={(event) => setApiKey(event.target.value)}
         />
       </Input.Root>
-      <div role='none' className='flex gap-2'>
+      <div className='flex gap-2'>
         <IconButton
           variant='ghost'
           icon='ph--check--regular'
@@ -405,7 +406,7 @@ export const ObjectsPanel = ({ db, context }: Pick<ChatOptionsProps, 'db' | 'con
                   key={object.id}
                   value={object.id}
                   icon={icon}
-                  iconClassNames={styles?.surfaceText}
+                  iconClassNames={styles?.foreground}
                   label={Obj.getLabel(object) ?? Obj.getTypename(object) ?? object.id}
                   checked={isActive}
                   onSelect={() => onUpdateObject?.(Obj.getDXN(object), !isActive)}
@@ -418,7 +419,7 @@ export const ObjectsPanel = ({ db, context }: Pick<ChatOptionsProps, 'db' | 'con
         </SearchList.Viewport>
       </SearchList.Content>
 
-      <div role='none' className={mx('flex flex-col', styles.toolbar)}>
+      <div className={mx('flex flex-col', styles.toolbar)}>
         <Select.Root value={typename === ANY ? undefined : typename} onValueChange={setTypename}>
           <Select.TriggerButton placeholder={t('type-filter.placeholder')} />
           <Select.Portal>

package/src/components/ChatPrompt/ChatPrompt.tsx

@@ -129,7 +129,7 @@ export const ChatPrompt = ({
     >
       <ChatMcpErrors processor={processor} />
 
-      <div role='none' className='flex p-2 gap-2'>
+      <div className='flex p-2 gap-2'>
         <ChatStatusIndicator classNames='p-1' preset={preset} error={error} processing={streaming} />
         <ChatEditor
           ref={editorRef}
@@ -143,7 +143,7 @@ export const ChatPrompt = ({
       </div>
 
       {db && settings && (
-        <div role='none' className='flex items-center overflow-hidden p-1.5'>
+        <div className='flex items-center overflow-hidden p-1.5'>
           <ChatOptions
             chat={chat}
             db={db}
@@ -154,7 +154,7 @@ export const ChatPrompt = ({
             onPresetChange={onPresetChange}
           />
 
-          <div role='none' className='flex h-8 grow overflow-x-auto scrollbar-none'>
+          <div className='flex h-8 grow overflow-x-auto scrollbar-none'>
             <ChatReferences db={db} context={processor.context} />
           </div>
 

package/src/components/ChatPrompt/ChatReferences.tsx

@@ -5,7 +5,7 @@
 import * as Option from 'effect/Option';
 import React from 'react';
 
-import { type AiContextBinder } from '@dxos/assistant';
+import { type AiContext } from '@dxos/assistant';
 import { Annotation, type Database, Obj } from '@dxos/echo';
 import { Icon, IconButton, type Label, type ThemedClassName, toLocalizedString, useTranslation } from '@dxos/react-ui';
 import { getStyles, mx } from '@dxos/ui-theme';
@@ -14,7 +14,7 @@ import { useContextObjects } from '#hooks';
 import { meta } from '#meta';
 
 export type ChatReferencesProps = ThemedClassName<{
-  context: AiContextBinder;
+  context: AiContext.Binder;
   db: Database.Database;
 }>;
 
@@ -35,7 +35,7 @@ export const ChatReferences = ({ classNames, context, db }: ChatReferencesProps)
         const styles = hue ? getStyles(hue) : undefined;
         return (
           <li key={dxn.toString()} className='dx-tag py-0 ps-2 flex items-center gap-1' data-hue='neutral'>
-            <Icon icon={icon} size={4} classNames={styles?.surfaceText} />
+            <Icon icon={icon} size={4} classNames={styles?.foreground} />
             {toLocalizedString(label, t)}
             <IconButton
               icon='ph--x--bold'

package/src/components/ChatPrompt/ChatStatus.tsx

@@ -76,7 +76,7 @@ export const ChatStatus = ({ classNames, icon }: ChatStreamStatusProps) => {
         </NaturalChatStatus.Icon>
       )}
       {show && (
-        <div role='none' className='flex items-center'>
+        <div className='flex items-center'>
           {requestTiming && (
             <NaturalChatStatus.Text>
               <Elapsed timing={requestTiming} />