@dxos/plugin-assistant 0.8.2-main.f11618f → 0.8.2-main.fbd8ed0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.2-main.f11618f",
+  "version": "0.8.2-main.fbd8ed0",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -42,79 +42,85 @@
     "@lezer/highlight": "^1.2.1",
     "@preact/signals-core": "^1.6.0",
     "@xiechao/codemirror-lang-handlebars": "1.0.4",
-    "effect": "3.13.3",
     "jsonpointer": "^5.0.1",
     "lodash.get": "^4.4.2",
     "unified": "^11.0.0",
-    "@dxos/app-framework": "0.8.2-main.f11618f",
-    "@dxos/artifact": "0.8.2-main.f11618f",
-    "@dxos/assistant": "0.8.2-main.f11618f",
-    "@dxos/client": "0.8.2-main.f11618f",
-    "@dxos/compute": "0.8.2-main.f11618f",
-    "@dxos/conductor": "0.8.2-main.f11618f",
-    "@dxos/async": "0.8.2-main.f11618f",
-    "@dxos/context": "0.8.2-main.f11618f",
-    "@dxos/echo-protocol": "0.8.2-main.f11618f",
-    "@dxos/echo-schema": "0.8.2-main.f11618f",
-    "@dxos/echo-db": "0.8.2-main.f11618f",
-    "@dxos/edge-client": "0.8.2-main.f11618f",
-    "@dxos/effect": "0.8.2-main.f11618f",
-    "@dxos/functions": "0.8.2-main.f11618f",
-    "@dxos/invariant": "0.8.2-main.f11618f",
-    "@dxos/keys": "0.8.2-main.f11618f",
-    "@dxos/local-storage": "0.8.2-main.f11618f",
-    "@dxos/plugin-client": "0.8.2-main.f11618f",
-    "@dxos/live-object": "0.8.2-main.f11618f",
-    "@dxos/plugin-deck": "0.8.2-main.f11618f",
-    "@dxos/plugin-graph": "0.8.2-main.f11618f",
-    "@dxos/plugin-inbox": "0.8.2-main.f11618f",
-    "@dxos/log": "0.8.2-main.f11618f",
-    "@dxos/plugin-markdown": "0.8.2-main.f11618f",
-    "@dxos/plugin-space": "0.8.2-main.f11618f",
-    "@dxos/plugin-script": "0.8.2-main.f11618f",
-    "@dxos/plugin-transcription": "0.8.2-main.f11618f",
-    "@dxos/plugin-stack": "0.8.2-main.f11618f",
-    "@dxos/plugin-wnfs": "0.8.2-main.f11618f",
-    "@dxos/plugin-sketch": "0.8.2-main.f11618f",
-    "@dxos/react-client": "0.8.2-main.f11618f",
-    "@dxos/react-ui-canvas-compute": "0.8.2-main.f11618f",
-    "@dxos/react-edge-client": "0.8.2-main.f11618f",
-    "@dxos/react-ui-components": "0.8.2-main.f11618f",
-    "@dxos/react-ui-canvas-editor": "0.8.2-main.f11618f",
-    "@dxos/react-ui-dnd": "0.8.2-main.f11618f",
-    "@dxos/react-ui-form": "0.8.2-main.f11618f",
-    "@dxos/react-ui-editor": "0.8.2-main.f11618f",
-    "@dxos/react-ui-list": "0.8.2-main.f11618f",
-    "@dxos/react-ui-sfx": "0.8.2-main.f11618f",
-    "@dxos/react-ui-stack": "0.8.2-main.f11618f",
-    "@dxos/react-ui-syntax-highlighter": "0.8.2-main.f11618f",
-    "@dxos/schema": "0.8.2-main.f11618f",
-    "@dxos/util": "0.8.2-main.f11618f"
+    "@dxos/app-framework": "0.8.2-main.fbd8ed0",
+    "@dxos/artifact": "0.8.2-main.fbd8ed0",
+    "@dxos/async": "0.8.2-main.fbd8ed0",
+    "@dxos/client": "0.8.2-main.fbd8ed0",
+    "@dxos/assistant": "0.8.2-main.fbd8ed0",
+    "@dxos/compute": "0.8.2-main.fbd8ed0",
+    "@dxos/context": "0.8.2-main.fbd8ed0",
+    "@dxos/echo": "0.8.2-main.fbd8ed0",
+    "@dxos/conductor": "0.8.2-main.fbd8ed0",
+    "@dxos/edge-client": "0.8.2-main.fbd8ed0",
+    "@dxos/echo-protocol": "0.8.2-main.fbd8ed0",
+    "@dxos/echo-db": "0.8.2-main.fbd8ed0",
+    "@dxos/echo-schema": "0.8.2-main.fbd8ed0",
+    "@dxos/effect": "0.8.2-main.fbd8ed0",
+    "@dxos/invariant": "0.8.2-main.fbd8ed0",
+    "@dxos/functions": "0.8.2-main.fbd8ed0",
+    "@dxos/keys": "0.8.2-main.fbd8ed0",
+    "@dxos/live-object": "0.8.2-main.fbd8ed0",
+    "@dxos/local-storage": "0.8.2-main.fbd8ed0",
+    "@dxos/log": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-client": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-deck": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-graph": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-markdown": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-script": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-sketch": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-inbox": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-stack": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-space": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-transcription": "0.8.2-main.fbd8ed0",
+    "@dxos/react-client": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-canvas-compute": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-wnfs": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-canvas-editor": "0.8.2-main.fbd8ed0",
+    "@dxos/react-edge-client": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-components": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-dnd": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-editor": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-sfx": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-list": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-stack": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-syntax-highlighter": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-form": "0.8.2-main.fbd8ed0",
+    "@dxos/schema": "0.8.2-main.fbd8ed0",
+    "@dxos/util": "0.8.2-main.fbd8ed0"
   },
   "devDependencies": {
+    "@effect-rx/rx-react": "^0.34.1",
+    "@effect/platform": "0.80.12",
     "@types/lodash.get": "^4.4.7",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
+    "effect": "3.14.21",
     "openapi-types": "^12.1.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/artifact-testing": "0.8.2-main.f11618f",
-    "@dxos/echo-db": "0.8.2-main.f11618f",
-    "@dxos/plugin-chess": "0.8.2-main.f11618f",
-    "@dxos/plugin-inbox": "0.8.2-main.f11618f",
-    "@dxos/plugin-map": "0.8.2-main.f11618f",
-    "@dxos/plugin-table": "0.8.2-main.f11618f",
-    "@dxos/random": "0.8.2-main.f11618f",
-    "@dxos/react-ui": "0.8.2-main.f11618f",
-    "@dxos/react-ui-theme": "0.8.2-main.f11618f",
-    "@dxos/storybook-utils": "0.8.2-main.f11618f"
+    "@dxos/echo-db": "0.8.2-main.fbd8ed0",
+    "@dxos/artifact-testing": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-chess": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-inbox": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-map": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-table": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-theme": "0.8.2-main.fbd8ed0",
+    "@dxos/random": "0.8.2-main.fbd8ed0",
+    "@dxos/storybook-utils": "0.8.2-main.fbd8ed0"
   },
   "peerDependencies": {
+    "@effect-rx/rx-react": "^0.34.1",
+    "@effect/platform": "0.80.12",
+    "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.2-main.f11618f",
-    "@dxos/react-ui-theme": "0.8.2-main.f11618f"
+    "@dxos/react-ui-theme": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui": "0.8.2-main.fbd8ed0"
   },
   "publishConfig": {
     "access": "public"

package/src/capabilities/ai-client.ts

@@ -4,7 +4,7 @@
 
 import { effect, signal } from '@preact/signals-core';
 
-import { Capabilities, contributes, type PluginsContext } from '@dxos/app-framework';
+import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
 import { type AIServiceClient, AIServiceEdgeClient, OllamaClient } from '@dxos/assistant';
 import { ClientCapabilities } from '@dxos/plugin-client';
 
@@ -15,15 +15,15 @@ import { type AssistantSettingsProps } from '../types';
 // TODO(wittjosiah): Factor out.
 const DEFAULT_AI_SERVICE_URL = 'http://localhost:8788';
 
-export default (context: PluginsContext) => {
-  const client = context.requestCapability(ClientCapabilities.Client);
+export default (context: PluginContext) => {
+  const client = context.getCapability(ClientCapabilities.Client);
   const endpoint = client.config.values.runtime?.services?.ai?.server ?? DEFAULT_AI_SERVICE_URL;
 
   const ai = signal<AIServiceClient>(new AIServiceEdgeClient({ endpoint }));
 
   const unsubscribe = effect(() => {
     const settings = context
-      .requestCapability(Capabilities.SettingsStore)
+      .getCapability(Capabilities.SettingsStore)
       .getStore<AssistantSettingsProps>(ASSISTANT_PLUGIN)?.value;
 
     if (settings?.llmProvider === 'ollama') {

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

@@ -2,154 +2,214 @@
 // Copyright 2025 DXOS.org
 //
 
+import { Rx } from '@effect-rx/rx-react';
+import { Option, pipe } from 'effect';
+
 import {
   Capabilities,
   contributes,
   createIntent,
   LayoutAction,
   type PromiseIntentDispatcher,
-  type PluginsContext,
+  type PluginContext,
 } from '@dxos/app-framework';
 import { invariant } from '@dxos/invariant';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { PLANK_COMPANION_TYPE, ATTENDABLE_PATH_SEPARATOR } from '@dxos/plugin-deck/types';
-import { createExtension, type Node, ROOT_ID } from '@dxos/plugin-graph';
-import { memoizeQuery } from '@dxos/plugin-space';
+import { createExtension, ROOT_ID } from '@dxos/plugin-graph';
+import { rxFromQuery } from '@dxos/plugin-space';
 import { SPACE_TYPE, SpaceAction } from '@dxos/plugin-space/types';
-import { type Space, Filter, fullyQualifiedId, getSpace, isLiveObject } from '@dxos/react-client/echo';
+import {
+  type Space,
+  Filter,
+  fullyQualifiedId,
+  getSpace,
+  isLiveObject,
+  isSpace,
+  Query,
+  type QueryResult,
+} from '@dxos/react-client/echo';
 
 import { ASSISTANT_DIALOG, ASSISTANT_PLUGIN } from '../meta';
 import { AIChatType, AssistantAction, TemplateType } from '../types';
 
-export default (context: PluginsContext) =>
+export default (context: PluginContext) =>
   contributes(Capabilities.AppGraphBuilder, [
     createExtension({
       id: `${ASSISTANT_PLUGIN}/assistant`,
-      filter: (node): node is Node<null> => node.id === ROOT_ID,
-      actions: () => [
-        {
-          id: `${LayoutAction.UpdateDialog._tag}/assistant/open`,
-          data: async () => {
-            const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
-            const client = context.requestCapability(ClientCapabilities.Client);
-            const layout = context.requestCapability(Capabilities.Layout);
-            const { graph } = context.requestCapability(Capabilities.AppGraph);
+      actions: (node) =>
+        Rx.make((get) =>
+          pipe(
+            get(node),
+            Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
+            Option.map(() => [
+              {
+                id: `${LayoutAction.UpdateDialog._tag}/assistant/open`,
+                data: async () => {
+                  const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
+                  const client = context.getCapability(ClientCapabilities.Client);
+                  const layout = context.getCapability(Capabilities.Layout);
+                  const { graph } = context.getCapability(Capabilities.AppGraph);
 
-            // TODO(burdon): Get space from workspace.
-            // TODO(burdon): If need to create chat, then add to dispatch stack below.
-            let chat: AIChatType | undefined;
-            if (layout.active.length > 0) {
-              const node = graph.findNode(layout.active[0]);
-              if (node) {
-                const space = getSpace(node.data);
-                if (space) {
-                  chat = await getOrCreateChat(dispatch, space);
-                }
-              }
-            } else {
-              const space = client.spaces.default;
-              chat = await getOrCreateChat(dispatch, space);
-            }
+                  // TODO(burdon): Get space from workspace.
+                  // TODO(burdon): If need to create chat, then add to dispatch stack below.
+                  let chat: AIChatType | undefined;
+                  if (layout.active.length > 0) {
+                    const node = graph.getNode(layout.active[0]).pipe(Option.getOrNull);
+                    if (node) {
+                      const space = getSpace(node.data);
+                      if (space) {
+                        chat = await getOrCreateChat(dispatch, space);
+                      }
+                    }
+                  } else {
+                    const space = client.spaces.default;
+                    chat = await getOrCreateChat(dispatch, space);
+                  }
 
-            if (!chat) {
-              return;
-            }
+                  if (!chat) {
+                    return;
+                  }
 
-            await dispatch(
-              createIntent(LayoutAction.UpdateDialog, {
-                part: 'dialog',
-                subject: ASSISTANT_DIALOG,
-                options: {
-                  state: true,
-                  blockAlign: 'end',
-                  props: {
-                    chat,
+                  await dispatch(
+                    createIntent(LayoutAction.UpdateDialog, {
+                      part: 'dialog',
+                      subject: ASSISTANT_DIALOG,
+                      options: {
+                        state: true,
+                        blockAlign: 'end',
+                        props: {
+                          chat,
+                        },
+                      },
+                    }),
+                  );
+                },
+                properties: {
+                  label: ['open assistant label', { ns: ASSISTANT_PLUGIN }],
+                  icon: 'ph--sparkle--regular',
+                  disposition: 'pin-end',
+                  position: 'hoist',
+                  keyBinding: {
+                    macos: 'shift+meta+k',
+                    windows: 'shift+ctrl+k',
                   },
                 },
-              }),
-            );
-          },
-          properties: {
-            label: ['open assistant label', { ns: ASSISTANT_PLUGIN }],
-            icon: 'ph--star-four--regular',
-            disposition: 'pin-end',
-            position: 'hoist',
-            keyBinding: {
-              macos: 'shift+meta+k',
-              windows: 'shift+ctrl+k',
-            },
-          },
-        },
-      ],
+              },
+            ]),
+            Option.getOrElse(() => []),
+          ),
+        ),
     }),
 
     createExtension({
       id: `${ASSISTANT_PLUGIN}/object-chat-companion`,
-      filter: (node): node is Node<AIChatType> =>
-        isLiveObject(node.data) && node.data.assistantChatQueue && node.data.type !== AIChatType.typename,
-      connector: ({ node }) => [
-        {
-          id: [node.id, 'assistant-chat'].join(ATTENDABLE_PATH_SEPARATOR),
-          type: PLANK_COMPANION_TYPE,
-          data: 'assistant-chat',
-          properties: {
-            label: ['assistant chat label', { ns: ASSISTANT_PLUGIN }],
-            icon: 'ph--star-four--regular',
-            position: 'hoist',
-          },
-        },
-      ],
-    }),
-
-    createExtension({
-      id: `${ASSISTANT_PLUGIN}/root`,
-      filter: (node): node is Node<Space> => node.type === SPACE_TYPE,
-      connector: ({ node }) => {
-        const templates = memoizeQuery(node.data, Filter.schema(TemplateType));
-        return templates.length > 0
-          ? [
+      // TODO(burdon): Add to all objects?
+      connector: (node) =>
+        Rx.make((get) =>
+          pipe(
+            get(node),
+            Option.flatMap((node) =>
+              isLiveObject(node.data) && node.data.assistantChatQueue && node.data.type !== AIChatType.typename
+                ? Option.some(node)
+                : Option.none(),
+            ),
+            Option.map((node) => [
               {
-                id: `${ASSISTANT_PLUGIN}/templates`,
-                type: `${ASSISTANT_PLUGIN}/templates`,
-                data: null,
+                id: [node.id, 'assistant-chat'].join(ATTENDABLE_PATH_SEPARATOR),
+                type: PLANK_COMPANION_TYPE,
+                data: 'assistant-chat',
                 properties: {
-                  label: ['templates label', { ns: ASSISTANT_PLUGIN }],
-                  icon: 'ph--file-code--regular',
-                  space: node.data,
+                  label: ['assistant chat label', { ns: ASSISTANT_PLUGIN }],
+                  icon: 'ph--sparkle--regular',
+                  position: 'hoist',
                 },
               },
-            ]
-          : [];
+            ]),
+            Option.getOrElse(() => []),
+          ),
+        ),
+    }),
+
+    createExtension({
+      id: `${ASSISTANT_PLUGIN}/root`,
+      connector: (node) => {
+        let query: QueryResult<TemplateType> | undefined;
+        return Rx.make((get) =>
+          pipe(
+            get(node),
+            Option.flatMap((node) =>
+              node.type === SPACE_TYPE && isSpace(node.data) ? Option.some(node.data) : Option.none(),
+            ),
+            Option.map((space) => {
+              if (!query) {
+                query = space.db.query(Query.type(TemplateType));
+              }
+
+              const templates = get(rxFromQuery(query));
+              return templates.length > 0
+                ? [
+                    {
+                      id: `${ASSISTANT_PLUGIN}/templates`,
+                      type: `${ASSISTANT_PLUGIN}/templates`,
+                      data: null,
+                      properties: {
+                        label: ['templates label', { ns: ASSISTANT_PLUGIN }],
+                        icon: 'ph--file-code--regular',
+                        space,
+                      },
+                    },
+                  ]
+                : [];
+            }),
+            Option.getOrElse(() => []),
+          ),
+        );
       },
     }),
 
     createExtension({
       id: `${ASSISTANT_PLUGIN}/templates`,
-      filter: (node): node is Node<null, { space: Space }> => node.id === `${ASSISTANT_PLUGIN}/templates`,
-      connector: ({ node }) => {
-        const templates = memoizeQuery(node.properties.space, Filter.schema(TemplateType));
-        return templates
-          .toSorted((a, b) => {
-            const nameA = a.name ?? '';
-            const nameB = b.name ?? '';
-            return nameA.localeCompare(nameB);
-          })
-          .map((template) => ({
-            id: fullyQualifiedId(template),
-            type: `${ASSISTANT_PLUGIN}/template`,
-            data: template,
-            properties: {
-              label: template.name ?? ['object placeholder', { ns: ASSISTANT_PLUGIN }],
-              icon: 'ph--file-code--regular',
-            },
-          }));
+      connector: (node) => {
+        let query: QueryResult<TemplateType> | undefined;
+        return Rx.make((get) =>
+          pipe(
+            get(node),
+            Option.flatMap((node) =>
+              node.id === `${ASSISTANT_PLUGIN}/templates` && isSpace(node.properties.space)
+                ? Option.some(node.properties.space)
+                : Option.none(),
+            ),
+            Option.map((space) => {
+              if (!query) {
+                query = space.db.query(Query.type(TemplateType));
+              }
+              return get(rxFromQuery(query))
+                .toSorted((a, b) => {
+                  const nameA = a.name ?? '';
+                  const nameB = b.name ?? '';
+                  return nameA.localeCompare(nameB);
+                })
+                .map((template) => ({
+                  id: fullyQualifiedId(template),
+                  type: `${ASSISTANT_PLUGIN}/template`,
+                  data: template,
+                  properties: {
+                    label: template.name ?? ['object placeholder', { ns: ASSISTANT_PLUGIN }],
+                    icon: 'ph--file-code--regular',
+                  },
+                }));
+            }),
+            Option.getOrElse(() => []),
+          ),
+        );
       },
     }),
   ]);
 
 // TODO(burdon): Factor out.
 const getOrCreateChat = async (dispatch: PromiseIntentDispatcher, space: Space): Promise<AIChatType | undefined> => {
-  const { objects } = await space.db.query(Filter.schema(AIChatType)).run();
+  const { objects } = await space.db.query(Filter.type(AIChatType)).run();
   // console.log('objects', JSON.stringify(objects, null, 2));
   if (objects.length > 0) {
     // TODO(burdon): Is this the most recent?

package/src/capabilities/intent-resolver.ts

@@ -3,8 +3,7 @@
 //
 
 import { Capabilities, contributes, createResolver } from '@dxos/app-framework';
-import { ObjectId } from '@dxos/echo-schema';
-import { DXN, QueueSubspaceTags } from '@dxos/keys';
+import { createQueueDxn } from '@dxos/echo-schema';
 import { live, refFromDXN } from '@dxos/live-object';
 
 import { AssistantAction, AIChatType, TemplateType } from '../types';
@@ -17,9 +16,7 @@ export default () => [
       resolve: ({ spaceId, name }) => ({
         data: {
           object: live(AIChatType, {
-            assistantChatQueue: refFromDXN(
-              new DXN(DXN.kind.QUEUE, [QueueSubspaceTags.DATA, spaceId, ObjectId.random()]),
-            ),
+            assistantChatQueue: refFromDXN(createQueueDxn(spaceId)),
           }),
         },
       }),

package/src/capabilities/react-surface.tsx

@@ -5,9 +5,9 @@
 import React, { useMemo } from 'react';
 
 import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
-import { isInstanceOf, getTypename } from '@dxos/echo-schema';
+import { Type } from '@dxos/echo';
 import { SettingsStore } from '@dxos/local-storage';
-import { fullyQualifiedId, getSpace, isLiveObject, type SpaceId } from '@dxos/react-client/echo';
+import { fullyQualifiedId, getSpace, getTypename, isLiveObject, type SpaceId } from '@dxos/react-client/echo';
 
 import { AssistantDialog, AssistantSettings, ChatContainer, PromptSettings, TemplateContainer } from '../components';
 import { ASSISTANT_PLUGIN, ASSISTANT_DIALOG } from '../meta';
@@ -32,7 +32,7 @@ export default () =>
       id: `${ASSISTANT_PLUGIN}/chat`,
       role: 'article',
       filter: (data): data is { subject: AIChatType; variant: undefined } =>
-        isInstanceOf(AIChatType, data.subject) && data.variant !== 'assistant-chat',
+        Type.instanceOf(AIChatType, data.subject) && data.variant !== 'assistant-chat',
       component: ({ data, role }) => <ChatContainer role={role} chat={data.subject} />,
     }),
     createSurface({
@@ -57,13 +57,13 @@ export default () =>
     createSurface({
       id: `${ASSISTANT_PLUGIN}/template`,
       role: 'article',
-      filter: (data): data is { subject: TemplateType } => isInstanceOf(TemplateType, data.subject),
+      filter: (data): data is { subject: TemplateType } => Type.instanceOf(TemplateType, data.subject),
       component: ({ data, role }) => <TemplateContainer role={role} template={data.subject} />,
     }),
     createSurface({
       id: `${ASSISTANT_PLUGIN}/prompt-settings`,
       role: 'object-settings',
-      filter: (data): data is { subject: TemplateType } => isInstanceOf(TemplateType, data.subject),
+      filter: (data): data is { subject: TemplateType } => Type.instanceOf(TemplateType, data.subject),
       component: ({ data }) => <PromptSettings template={data.subject} />,
     }),
   ]);

package/src/components/AmbientDialog/AmbientDialog.stories.tsx

@@ -69,7 +69,7 @@ const meta: Meta<typeof AmbientDialog> = {
       plugins: [IntentPlugin()],
     }),
     withTheme,
-    withLayout({ fullscreen: true, tooltips: true }),
+    withLayout({ fullscreen: true }),
   ],
   parameters: {
     translations,

package/src/components/Prompt/Prompt.stories.tsx

@@ -17,7 +17,7 @@ import translations from '../../translations';
 const meta: Meta<typeof Prompt> = {
   title: 'plugins/plugin-automation/Prompt',
   component: Prompt,
-  decorators: [withTheme, withLayout({ tooltips: true })],
+  decorators: [withTheme, withLayout()],
   parameters: {
     layout: 'centered',
     translations,

package/src/components/Prompt/PromptBar.tsx

@@ -7,7 +7,7 @@ import React, { useRef, useState } from 'react';
 import { useVoiceInput } from '@dxos/plugin-transcription';
 import { Icon, IconButton, type ThemedClassName, Tooltip, useTranslation } from '@dxos/react-ui';
 import { Spinner } from '@dxos/react-ui-sfx';
-import { errorMessageColors, errorText, mx } from '@dxos/react-ui-theme';
+import { errorText, mx } from '@dxos/react-ui-theme';
 
 import { Prompt, type PromptController, type PromptProps } from './Prompt';
 import { ASSISTANT_PLUGIN } from '../../meta';
@@ -54,17 +54,9 @@ export const PromptBar = ({
     >
       <div className='flex w-[--rail-action] h-[--rail-action] items-center justify-center'>
         {(error && (
-          <Tooltip.Root delayDuration={0}>
-            <Tooltip.Trigger>
-              <Icon icon='ph--warning-circle--regular' classNames={errorText} size={5} />
-            </Tooltip.Trigger>
-            <Tooltip.Portal>
-              <Tooltip.Content>
-                <div className={mx('text-sm', errorMessageColors)}>{error.message}</div>
-                <Tooltip.Arrow />
-              </Tooltip.Content>
-            </Tooltip.Portal>
-          </Tooltip.Root>
+          <Tooltip.Trigger content={error.message} delayDuration={0}>
+            <Icon icon='ph--warning-circle--regular' classNames={errorText} size={5} />
+          </Tooltip.Trigger>
         )) || <Spinner active={processing} />}
       </div>
       <Prompt

package/src/components/PromptSettings.tsx

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Match, type Schema as S } from 'effect';
+import { Match, type Schema } from 'effect';
 import React, { type ChangeEvent, useCallback } from 'react';
 
 import { debounce } from '@dxos/async';
@@ -17,7 +17,7 @@ export const PromptSettings = ({ template }: { template: TemplateType }) => {
   const handleKindChange = useCallback(
     (value: string) => {
       const kind = Match.type<string>().pipe(
-        Match.withReturnType<S.Schema.Type<typeof TemplateKindSchema>>(),
+        Match.withReturnType<Schema.Schema.Type<typeof TemplateKindSchema>>(),
         Match.when('always', () => ({ include: 'always' })),
         Match.when('schema-matching', () => ({ include: 'schema-matching', typename: '' })),
         Match.when('automatically', () => ({ include: 'automatically', description: '' })),