@dxos/plugin-assistant 0.8.4-main.72ec0f3 → 0.8.4-main.7ace549

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.4-main.72ec0f3",
+  "version": "0.8.4-main.7ace549",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -58,62 +58,62 @@
     "lodash.defaultsdeep": "^4.6.1",
     "unified": "^11.0.0",
     "use-deep-compare-effect": "^1.8.1",
-    "@dxos/ai": "0.8.4-main.72ec0f3",
-    "@dxos/assistant": "0.8.4-main.72ec0f3",
-    "@dxos/assistant-toolkit": "0.8.4-main.72ec0f3",
-    "@dxos/async": "0.8.4-main.72ec0f3",
-    "@dxos/app-framework": "0.8.4-main.72ec0f3",
-    "@dxos/blueprints": "0.8.4-main.72ec0f3",
-    "@dxos/compute": "0.8.4-main.72ec0f3",
-    "@dxos/client": "0.8.4-main.72ec0f3",
-    "@dxos/conductor": "0.8.4-main.72ec0f3",
-    "@dxos/context": "0.8.4-main.72ec0f3",
-    "@dxos/config": "0.8.4-main.72ec0f3",
-    "@dxos/echo": "0.8.4-main.72ec0f3",
-    "@dxos/echo-db": "0.8.4-main.72ec0f3",
-    "@dxos/echo-protocol": "0.8.4-main.72ec0f3",
-    "@dxos/echo-query": "0.8.4-main.72ec0f3",
-    "@dxos/edge-client": "0.8.4-main.72ec0f3",
-    "@dxos/functions": "0.8.4-main.72ec0f3",
-    "@dxos/functions-runtime": "0.8.4-main.72ec0f3",
-    "@dxos/graph": "0.8.4-main.72ec0f3",
-    "@dxos/invariant": "0.8.4-main.72ec0f3",
-    "@dxos/effect": "0.8.4-main.72ec0f3",
-    "@dxos/lit-ui": "0.8.4-main.72ec0f3",
-    "@dxos/keys": "0.8.4-main.72ec0f3",
-    "@dxos/live-object": "0.8.4-main.72ec0f3",
-    "@dxos/local-storage": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-attention": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-automation": "0.8.4-main.72ec0f3",
-    "@dxos/devtools": "0.8.4-main.72ec0f3",
-    "@dxos/debug": "0.8.4-main.72ec0f3",
-    "@dxos/log": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-client": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-deck": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-graph": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-space": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-transcription": "0.8.4-main.72ec0f3",
-    "@dxos/protocols": "0.8.4-main.72ec0f3",
-    "@dxos/react-edge-client": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-attention": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-canvas-compute": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-canvas-editor": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-chat": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-components": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-form": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-editor": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-graph": "0.8.4-main.72ec0f3",
-    "@dxos/react-client": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-list": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-menu": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-searchlist": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-sfx": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-stack": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-tabs": "0.8.4-main.72ec0f3",
-    "@dxos/types": "0.8.4-main.72ec0f3",
-    "@dxos/util": "0.8.4-main.72ec0f3",
-    "@dxos/schema": "0.8.4-main.72ec0f3"
+    "@dxos/ai": "0.8.4-main.7ace549",
+    "@dxos/app-framework": "0.8.4-main.7ace549",
+    "@dxos/async": "0.8.4-main.7ace549",
+    "@dxos/client": "0.8.4-main.7ace549",
+    "@dxos/conductor": "0.8.4-main.7ace549",
+    "@dxos/compute": "0.8.4-main.7ace549",
+    "@dxos/assistant": "0.8.4-main.7ace549",
+    "@dxos/blueprints": "0.8.4-main.7ace549",
+    "@dxos/config": "0.8.4-main.7ace549",
+    "@dxos/context": "0.8.4-main.7ace549",
+    "@dxos/debug": "0.8.4-main.7ace549",
+    "@dxos/echo": "0.8.4-main.7ace549",
+    "@dxos/echo-db": "0.8.4-main.7ace549",
+    "@dxos/devtools": "0.8.4-main.7ace549",
+    "@dxos/echo-protocol": "0.8.4-main.7ace549",
+    "@dxos/edge-client": "0.8.4-main.7ace549",
+    "@dxos/echo-query": "0.8.4-main.7ace549",
+    "@dxos/effect": "0.8.4-main.7ace549",
+    "@dxos/assistant-toolkit": "0.8.4-main.7ace549",
+    "@dxos/functions": "0.8.4-main.7ace549",
+    "@dxos/graph": "0.8.4-main.7ace549",
+    "@dxos/invariant": "0.8.4-main.7ace549",
+    "@dxos/keys": "0.8.4-main.7ace549",
+    "@dxos/functions-runtime": "0.8.4-main.7ace549",
+    "@dxos/lit-ui": "0.8.4-main.7ace549",
+    "@dxos/live-object": "0.8.4-main.7ace549",
+    "@dxos/log": "0.8.4-main.7ace549",
+    "@dxos/local-storage": "0.8.4-main.7ace549",
+    "@dxos/plugin-attention": "0.8.4-main.7ace549",
+    "@dxos/plugin-automation": "0.8.4-main.7ace549",
+    "@dxos/plugin-client": "0.8.4-main.7ace549",
+    "@dxos/plugin-deck": "0.8.4-main.7ace549",
+    "@dxos/plugin-graph": "0.8.4-main.7ace549",
+    "@dxos/plugin-space": "0.8.4-main.7ace549",
+    "@dxos/plugin-transcription": "0.8.4-main.7ace549",
+    "@dxos/protocols": "0.8.4-main.7ace549",
+    "@dxos/react-client": "0.8.4-main.7ace549",
+    "@dxos/react-edge-client": "0.8.4-main.7ace549",
+    "@dxos/react-ui-canvas-compute": "0.8.4-main.7ace549",
+    "@dxos/react-ui-attention": "0.8.4-main.7ace549",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.7ace549",
+    "@dxos/react-ui-components": "0.8.4-main.7ace549",
+    "@dxos/react-ui-chat": "0.8.4-main.7ace549",
+    "@dxos/react-ui-editor": "0.8.4-main.7ace549",
+    "@dxos/react-ui-form": "0.8.4-main.7ace549",
+    "@dxos/react-ui-graph": "0.8.4-main.7ace549",
+    "@dxos/react-ui-list": "0.8.4-main.7ace549",
+    "@dxos/react-ui-menu": "0.8.4-main.7ace549",
+    "@dxos/react-ui-searchlist": "0.8.4-main.7ace549",
+    "@dxos/react-ui-sfx": "0.8.4-main.7ace549",
+    "@dxos/react-ui-stack": "0.8.4-main.7ace549",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.7ace549",
+    "@dxos/react-ui-tabs": "0.8.4-main.7ace549",
+    "@dxos/schema": "0.8.4-main.7ace549",
+    "@dxos/util": "0.8.4-main.7ace549",
+    "@dxos/types": "0.8.4-main.7ace549"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.3.4",
@@ -126,18 +126,18 @@
     "react": "~19.2.0",
     "react-dom": "~19.2.0",
     "vite": "7.1.9",
-    "@dxos/assistant-toolkit": "0.8.4-main.72ec0f3",
-    "@dxos/devtools": "0.8.4-main.72ec0f3",
-    "@dxos/echo-db": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-map": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-chess": "0.8.4-main.72ec0f3",
-    "@dxos/random": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-table": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-table": "0.8.4-main.72ec0f3",
-    "@dxos/storybook-utils": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-menu": "0.8.4-main.72ec0f3"
+    "@dxos/assistant-toolkit": "0.8.4-main.7ace549",
+    "@dxos/devtools": "0.8.4-main.7ace549",
+    "@dxos/echo-db": "0.8.4-main.7ace549",
+    "@dxos/plugin-chess": "0.8.4-main.7ace549",
+    "@dxos/plugin-map": "0.8.4-main.7ace549",
+    "@dxos/plugin-table": "0.8.4-main.7ace549",
+    "@dxos/random": "0.8.4-main.7ace549",
+    "@dxos/react-ui-menu": "0.8.4-main.7ace549",
+    "@dxos/react-ui": "0.8.4-main.7ace549",
+    "@dxos/react-ui-table": "0.8.4-main.7ace549",
+    "@dxos/react-ui-theme": "0.8.4-main.7ace549",
+    "@dxos/storybook-utils": "0.8.4-main.7ace549"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.3.4",
@@ -145,8 +145,8 @@
     "effect": "^3.13.3",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3"
+    "@dxos/react-ui": "0.8.4-main.7ace549",
+    "@dxos/react-ui-theme": "0.8.4-main.7ace549"
   },
   "publishConfig": {
     "access": "public"

package/src/AssistantPlugin.tsx

@@ -9,7 +9,7 @@ import { Sequence } from '@dxos/conductor';
 import { Type } from '@dxos/echo';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
 import { SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space';
-import { defineObjectForm } from '@dxos/plugin-space/types';
+import { type CreateObjectIntent } from '@dxos/plugin-space/types';
 import { HasSubject } from '@dxos/types';
 
 import {
@@ -21,13 +21,14 @@ import {
   IntentResolver,
   LocalModelResolver,
   ReactSurface,
+  Repair,
   Settings,
   Toolkit,
 } from './capabilities';
 import { AssistantEvents } from './events';
 import { meta } from './meta';
 import { translations } from './translations';
-import { Assistant, AssistantAction, ServiceType } from './types';
+import { Assistant, AssistantAction } from './types';
 
 export const AssistantPlugin = definePlugin(meta, () => [
   defineModule({
@@ -57,6 +58,8 @@ export const AssistantPlugin = definePlugin(meta, () => [
         metadata: {
           icon: 'ph--atom--regular',
           iconHue: 'sky',
+          createObjectIntent: ((_, options) =>
+            createIntent(AssistantAction.CreateChat, { space: options.space })) satisfies CreateObjectIntent,
         },
       }),
       contributes(Capabilities.Metadata, {
@@ -64,6 +67,9 @@ export const AssistantPlugin = definePlugin(meta, () => [
         metadata: {
           icon: 'ph--blueprint--regular',
           iconHue: 'sky',
+          inputSchema: AssistantAction.BlueprintForm,
+          createObjectIntent: ((props) =>
+            createIntent(AssistantAction.CreateBlueprint, props)) satisfies CreateObjectIntent,
         },
       }),
       contributes(Capabilities.Metadata, {
@@ -71,6 +77,7 @@ export const AssistantPlugin = definePlugin(meta, () => [
         metadata: {
           icon: 'ph--scroll--regular',
           iconHue: 'sky',
+          createObjectIntent: (() => createIntent(AssistantAction.CreatePrompt)) satisfies CreateObjectIntent,
         },
       }),
       contributes(Capabilities.Metadata, {
@@ -78,64 +85,36 @@ export const AssistantPlugin = definePlugin(meta, () => [
         metadata: {
           icon: 'ph--circuitry--regular',
           iconHue: 'sky',
+          createObjectIntent: (() => createIntent(AssistantAction.CreateSequence)) satisfies CreateObjectIntent,
+          addToCollectionOnCreate: true,
         },
       }),
     ],
   }),
-  defineModule({
-    id: `${meta.id}/module/object-form`,
-    activatesOn: ClientEvents.SetupSchema,
-    activate: () => [
-      contributes(
-        SpaceCapabilities.ObjectForm,
-        defineObjectForm({
-          objectSchema: Assistant.Chat,
-          getIntent: (_, options) => createIntent(AssistantAction.CreateChat, { space: options.space }),
-        }),
-      ),
-      contributes(
-        SpaceCapabilities.ObjectForm,
-        defineObjectForm({
-          objectSchema: Blueprint.Blueprint,
-          formSchema: AssistantAction.BlueprintForm,
-          getIntent: (props) => createIntent(AssistantAction.CreateBlueprint, props),
-        }),
-      ),
-      contributes(
-        SpaceCapabilities.ObjectForm,
-        defineObjectForm({
-          objectSchema: Prompt.Prompt,
-          getIntent: () => createIntent(AssistantAction.CreatePrompt),
-        }),
-      ),
-      contributes(
-        SpaceCapabilities.ObjectForm,
-        defineObjectForm({
-          objectSchema: Sequence,
-          getIntent: () => createIntent(AssistantAction.CreateSequence),
-        }),
-      ),
-    ],
-  }),
   defineModule({
     id: `${meta.id}/module/schema`,
     activatesOn: ClientEvents.SetupSchema,
     activate: () =>
       contributes(ClientCapabilities.Schema, [
-        ServiceType,
+        Assistant.Chat,
         Assistant.CompanionTo,
-        ResearchGraph,
+        Blueprint.Blueprint,
         HasSubject.HasSubject,
         Prompt.Prompt,
+        ResearchGraph,
+        Sequence,
       ]),
   }),
   defineModule({
     id: `${meta.id}/module/on-space-created`,
     activatesOn: SpaceEvents.SpaceCreated,
     activate: () =>
-      contributes(SpaceCapabilities.onCreateSpace, ({ rootCollection, space }) =>
-        createIntent(AssistantAction.onCreateSpace, { rootCollection, space }),
-      ),
+      contributes(SpaceCapabilities.OnCreateSpace, (params) => createIntent(AssistantAction.OnCreateSpace, params)),
+  }),
+  defineModule({
+    id: `${meta.id}/module/repair`,
+    activatesOn: ClientEvents.SpacesReady,
+    activate: Repair,
   }),
   defineModule({
     id: `${meta.id}/module/app-graph-builder`,

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

@@ -120,7 +120,7 @@ export default (context: PluginContext) =>
           Function.pipe(
             get(node),
             Option.flatMap((node) => (Obj.isObject(node.data) ? Option.some(node.data) : Option.none())),
-            Option.flatMap((object) => {
+            Option.flatMap((object): Option.Option<{ object: Obj.Any; currentChat: Obj.Any | undefined }> => {
               const currentChatState = get(
                 atomFromSignal(
                   () => context.getCapability(AssistantCapabilities.State).currentChat[Obj.getDXN(object).toString()],
@@ -133,9 +133,9 @@ export default (context: PluginContext) =>
 
               const space = getSpace(object);
               const currentChatDxn = DXN.tryParse(currentChatState);
-              const currentChatRef = currentChatDxn ? space?.db.ref(currentChatDxn) : undefined;
+              const currentChatRef = currentChatDxn ? space?.db.makeRef(currentChatDxn) : undefined;
               const currentChat = get(atomFromSignal(() => currentChatRef?.target));
-              return currentChat ? Option.some({ object, currentChat }) : Option.none();
+              return Obj.isObject(currentChat) ? Option.some({ object, currentChat }) : Option.none();
             }),
             Option.map(({ object, currentChat }) => {
               return [

package/src/capabilities/index.ts

@@ -12,6 +12,7 @@ export const EdgeModelResolver = lazy(() => import('./edge-model-resolver'));
 export const IntentResolver = lazy(() => import('./intent-resolver'));
 export const LocalModelResolver = lazy(() => import('./local-model-resolver'));
 export const ReactSurface = lazy(() => import('./react-surface'));
+export const Repair = lazy(() => import('./repair'));
 export const Settings = lazy(() => import('./settings'));
 export const Toolkit = lazy(() => import('./toolkit'));
 

package/src/capabilities/intent-resolver.ts

@@ -13,8 +13,8 @@ import { Sequence } from '@dxos/conductor';
 import { Filter, Key, Obj, Ref, Type } from '@dxos/echo';
 import { TracingService, serializeFunction } from '@dxos/functions';
 import { AutomationCapabilities } from '@dxos/plugin-automation';
-import { CollectionAction } from '@dxos/plugin-space/types';
 import { getSpace } from '@dxos/react-client/echo';
+import { Collection } from '@dxos/schema';
 import { type Message } from '@dxos/types';
 
 import { type AiChatServices, updateName } from '../processor';
@@ -26,25 +26,13 @@ import { AssistantCapabilities } from './capabilities';
 export default (context: PluginContext) => [
   contributes(Capabilities.IntentResolver, [
     createResolver({
-      intent: AssistantAction.onCreateSpace,
+      intent: AssistantAction.OnCreateSpace,
       resolve: ({ space, rootCollection }) =>
         Effect.gen(function* () {
           const { dispatch } = context.getCapability(Capabilities.IntentDispatcher);
-          const { object: chatCollection } = yield* dispatch(
-            createIntent(CollectionAction.CreateQueryCollection, {
-              typename: Assistant.Chat.typename,
-            }),
-          );
-          const { object: blueprintCollection } = yield* dispatch(
-            createIntent(CollectionAction.CreateQueryCollection, {
-              typename: Blueprint.Blueprint.typename,
-            }),
-          );
-          const { object: promptCollection } = yield* dispatch(
-            createIntent(CollectionAction.CreateQueryCollection, {
-              typename: Type.getTypename(Prompt.Prompt),
-            }),
-          );
+          const chatCollection = Collection.makeManaged({ key: Assistant.Chat.typename });
+          const blueprintCollection = Collection.makeManaged({ key: Blueprint.Blueprint.typename });
+          const promptCollection = Collection.makeManaged({ key: Type.getTypename(Prompt.Prompt) });
           rootCollection.objects.push(
             Ref.make(chatCollection),
             Ref.make(blueprintCollection),

package/src/capabilities/repair.ts

@@ -0,0 +1,49 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { contributes } from '@dxos/app-framework';
+import { Blueprint, Prompt } from '@dxos/blueprints';
+import { Obj, Ref, Type } from '@dxos/echo';
+import { SpaceCapabilities } from '@dxos/plugin-space';
+import { type Space } from '@dxos/react-client/echo';
+import { Collection } from '@dxos/schema';
+
+import { Assistant } from '../types';
+
+export default () =>
+  contributes(SpaceCapabilities.Repair, async ({ space }) => {
+    await ensureSystemCollections(space);
+  });
+
+/**
+ * Ensure the root collection has system collections for AI Chats, Blueprints, and Prompts.
+ */
+const ensureSystemCollections = async (space: Space) => {
+  const rootCollection: Collection.Collection = await space.properties[Collection.Collection.typename]?.load();
+  if (!rootCollection) {
+    return;
+  }
+
+  const objects = await Promise.all(rootCollection.objects.map((ref) => ref.load()));
+  const chats = objects.find(
+    (object) => Obj.instanceOf(Collection.Managed, object) && object.key === Assistant.Chat.typename,
+  );
+  if (!chats) {
+    rootCollection.objects.push(Ref.make(Collection.makeManaged({ key: Assistant.Chat.typename })));
+  }
+
+  const blueprints = objects.find(
+    (object) => Obj.instanceOf(Collection.Managed, object) && object.key === Blueprint.Blueprint.typename,
+  );
+  if (!blueprints) {
+    rootCollection.objects.push(Ref.make(Collection.makeManaged({ key: Blueprint.Blueprint.typename })));
+  }
+
+  const prompts = objects.find(
+    (object) => Obj.instanceOf(Collection.Managed, object) && object.key === Type.getTypename(Prompt.Prompt),
+  );
+  if (!prompts) {
+    rootCollection.objects.push(Ref.make(Collection.makeManaged({ key: Type.getTypename(Prompt.Prompt) })));
+  }
+};

package/src/components/ChatPrompt/ChatOptions.tsx

@@ -12,7 +12,13 @@ import { Icon, IconButton, Popover, Select, useTranslation } from '@dxos/react-u
 import { Listbox, SearchList } from '@dxos/react-ui-searchlist';
 import { Tabs } from '@dxos/react-ui-tabs';
 
-import { useActiveBlueprints, useBlueprintHandlers, useBlueprints, useContextObjects, useItemTypes } from '../../hooks';
+import {
+  useActiveBlueprints,
+  useBlueprintHandlers,
+  useBlueprints,
+  useContextObjects,
+  useFilteredTypes,
+} from '../../hooks';
 import { meta } from '../../meta';
 
 const panelClassNames = 'is-[calc(100dvw-.5rem)] sm:is-max md:is-72 max-is-[--text-content]';
@@ -153,7 +159,7 @@ const ObjectsPanel = ({ space, context }: Pick<ChatOptionsProps, 'space' | 'cont
   const { t } = useTranslation(meta.id);
 
   // Item types sorted by label.
-  const types = useItemTypes(space);
+  const types = useFilteredTypes(space);
   const typenames = useMemo(() => {
     const typenames = types.map((type) => {
       const typename = Type.getTypename(type);

package/src/components/ChatThread/Link.tsx

@@ -15,9 +15,9 @@ export type ObjectLinkProps = {
 };
 
 export const ObjectLink = ({ space, dxn }: ObjectLinkProps) => {
-  const ref = useMemo(() => space.db.ref(dxn), [space, dxn.toString()]);
+  const ref = useMemo(() => space.db.makeRef(dxn), [space, dxn.toString()]);
 
-  const title = Obj.getLabel(ref.target) ?? ref.target?.id ?? ref.dxn.toString();
+  const title = (ref.target && Obj.getLabel(ref.target)) ?? ref.target?.id ?? ref.dxn.toString();
   return (
     <DxAnchor rootclassname='dx-tag--anchor' refid={dxn.toString()}>
       {title}

package/src/components/PromptArticle.tsx

@@ -28,7 +28,7 @@ export const PromptArticle = ({ subject }: PromptArticleProps) => {
   const inputData = useMemo(
     () =>
       subject && {
-        prompt: space?.db.ref(Obj.getDXN(subject)),
+        prompt: space?.db.makeRef(Obj.getDXN(subject)),
         input: {},
       },
     [subject, space],

package/src/components/TemplateEditor/TemplateEditor.tsx

@@ -6,7 +6,7 @@ import { defaultHighlightStyle, syntaxHighlighting } from '@codemirror/language'
 import React from 'react';
 
 import { type Template } from '@dxos/blueprints';
-import { createDocAccessor } from '@dxos/react-client/echo';
+import { createDocAccessor } from '@dxos/echo-db';
 import { type ThemedClassName, useThemeContext, useTranslation } from '@dxos/react-ui';
 import {
   createBasicExtensions,

package/src/components/ToolBlock/ToolBlock.tsx

@@ -115,7 +115,7 @@ export const ToolContainer = ({ items, onChangeOpen }: ToolContainerParams) => {
     if (open) {
       tabsRef.current?.focus();
     }
-  }, [onChangeOpen, open]);
+  }, [open, onChangeOpen]);
 
   const handleSelect = (index: number) => {
     setSelected(index);

package/src/functions/object-load.ts

@@ -25,7 +25,7 @@ export default defineFunction({
     }),
   }),
   outputSchema: Schema.Struct({
-    // TODO(wittjosiah): Type.Obj.Any | Type.Relation.Any
+    // TODO(wittjosiah): Type.Entity.Any
     object: Schema.Any,
   }),
   handler: Effect.fn(function* ({ data: { id, typename } }) {

package/src/hooks/index.ts

@@ -8,8 +8,8 @@ export * from './useChatServices';
 export * from './useChatToolbarActions';
 export * from './useContextBinder';
 export * from './useContextObjects';
+export * from './useFilteredTypes';
 export * from './useFlush';
-export * from './useItemTypes';
 export * from './useOnline';
 export * from './usePresets';
 export * from './useReferencesProvider';

package/src/hooks/useContextObjects.ts

@@ -35,7 +35,7 @@ export const useContextObjects = ({
 
       // Load the object by DXN/id from the current space.
       const id = dxn.asEchoDXN();
-      const object = id && (await space.db.getObjectById(id.echoId));
+      const object = id && space.db.getObjectById(id.echoId);
       if (!object) {
         log.warn('Object not found', { dxn, id });
         return;

package/src/hooks/{useItemTypes.ts → useFilteredTypes.ts}

@@ -6,12 +6,13 @@ import * as Option from 'effect/Option';
 import { useEffect, useState } from 'react';
 
 import { type Type } from '@dxos/echo';
+import { EntityKind, SystemTypeAnnotation, getTypeAnnotation } from '@dxos/echo/internal';
 import { type Space } from '@dxos/react-client/echo';
-import { ItemAnnotation } from '@dxos/schema';
 
 // TODO(burdon): Pass in filter.
-export const useItemTypes = (space?: Space): Type.Obj.Any[] => {
-  const [types, setTypes] = useState<Type.Obj.Any[]>([]);
+// TODO(wittjosiah): Factor out.
+export const useFilteredTypes = (space?: Space): Type.Entity.Any[] => {
+  const [types, setTypes] = useState<Type.Entity.Any[]>([]);
   useEffect(() => {
     if (!space) {
       return;
@@ -21,9 +22,9 @@ export const useItemTypes = (space?: Space): Type.Obj.Any[] => {
       (query) => {
         const types = Array.from(
           new Set(
-            [...space.db.graph.schemaRegistry.schemas, ...query.results].filter((type) =>
-              Option.isSome(ItemAnnotation.get(type)),
-            ),
+            [...space.db.graph.schemaRegistry.schemas, ...query.results]
+              .filter((schema) => getTypeAnnotation(schema)?.kind !== EntityKind.Relation)
+              .filter((schema) => SystemTypeAnnotation.get(schema).pipe(Option.getOrElse(() => false))),
           ),
         );
 

package/src/translations.ts

@@ -23,6 +23,7 @@ export const translations = [
         'object name placeholder': 'New blueprint',
         'rename object label': 'Rename blueprint',
         'delete object label': 'Delete blueprint',
+        'object deleted label': 'Blueprint deleted',
       },
       [Type.getTypename(Prompt.Prompt)]: {
         'typename label': 'Prompt',
@@ -32,6 +33,7 @@ export const translations = [
         'object name placeholder': 'New prompt',
         'rename object label': 'Rename prompt',
         'delete object label': 'Delete prompt',
+        'object deleted label': 'Prompt deleted',
       },
       // TODO(burdon): From conductor.
       [Sequence.typename]: {
@@ -42,12 +44,14 @@ export const translations = [
         'object name placeholder': 'New sequence',
         'rename object label': 'Rename sequence',
         'delete object label': 'Delete sequence',
+        'object deleted label': 'Sequence deleted',
       },
       [Assistant.Chat.typename]: {
         'typename label': 'AI Chat',
         'object name placeholder': 'New AI Chat',
         'rename object label': 'Rename AI Chat',
         'delete object label': 'Delete AI Chat',
+        'object deleted label': 'AI Chat deleted',
       },
       // TODO(burdon): Reconcile with react-ui-chat.
       [meta.id]: {

package/src/types/Assistant.ts

@@ -5,7 +5,7 @@
 import * as Schema from 'effect/Schema';
 
 import { Obj, Ref, Type } from '@dxos/echo';
-import { FormAnnotation, LabelAnnotation } from '@dxos/echo/internal';
+import { FormInputAnnotation, LabelAnnotation } from '@dxos/echo/internal';
 import { Queue } from '@dxos/echo-db';
 
 import { LLM_PROVIDERS } from './defs';
@@ -15,9 +15,9 @@ import { LLM_PROVIDERS } from './defs';
  */
 export const Chat = Schema.Struct({
   name: Schema.String.pipe(Schema.optional),
-  queue: Type.Ref(Queue).pipe(FormAnnotation.set(false)),
+  queue: Type.Ref(Queue).pipe(FormInputAnnotation.set(false)),
   // TODO(dmaretskyi): Eventually this and the message queue will be the same.
-  traceQueue: Type.Ref(Queue).pipe(FormAnnotation.set(false), Schema.optional),
+  traceQueue: Type.Ref(Queue).pipe(FormInputAnnotation.set(false), Schema.optional),
 }).pipe(
   Type.Obj({
     typename: 'dxos.org/type/assistant/Chat',
@@ -35,7 +35,7 @@ export const makeChat = ({ name, queue }: { name?: string; queue: Queue }) =>
  * Relation between a Chat and companion objects (e.g., artifacts).
  */
 export const CompanionTo = Schema.Struct({
-  id: Type.ObjectId,
+  id: Obj.ID,
 }).pipe(
   Type.Relation({
     typename: 'dxos.org/relation/assistant/CompanionTo',

package/src/types/AssistantAction.ts

@@ -14,7 +14,7 @@ import { meta } from '../meta';
 import { Chat } from './Assistant';
 
 // TODO(burdon): Name?
-export class onCreateSpace extends Schema.TaggedClass<onCreateSpace>()(`${meta.id}/on-space-created`, {
+export class OnCreateSpace extends Schema.TaggedClass<OnCreateSpace>()(`${meta.id}/on-space-created`, {
   input: Schema.Struct({
     space: SpaceSchema,
     rootCollection: Collection.Collection,