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

package/src/hooks/useChatToolbarActions.ts

@@ -2,9 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Atom } from '@effect-atom/atom-react';
 import * as Effect from 'effect/Effect';
-import { useMemo } from 'react';
 
 import { useOperationInvoker } from '@dxos/app-framework/ui';
 import { Chat } from '@dxos/assistant-toolkit';
@@ -12,11 +10,11 @@ import { Filter, Obj, Query } from '@dxos/echo';
 import { runAndForwardErrors } from '@dxos/effect';
 import { invariant } from '@dxos/invariant';
 import { useQuery } from '@dxos/react-client/echo';
-import { MenuBuilder, useMenuActions } from '@dxos/react-ui-menu';
+import { MenuBuilder, useMenuBuilder } from '@dxos/react-ui-menu';
 
 import { useChatContext } from '#components';
 import { meta } from '#meta';
-import { AssistantOperation } from '#operations';
+import { AssistantOperation } from '#types';
 
 export type ChatToolbarActionsProps = {
   chat?: Chat.Chat;
@@ -33,90 +31,90 @@ export const useChatToolbarActions = ({ chat, companionTo }: ChatToolbarActionsP
   // TODO(wittjosiah): Query in react vs query in atom?
   const chats = useQuery(db, query);
 
-  // Create stable reference for dependency array to avoid circular reference issues.
-  return useMenuActions(
-    useMemo(() => {
-      return Atom.make(() => {
-        const builder = MenuBuilder.make()
-          .root({
-            label: ['chat-toolbar.title', { ns: meta.id }],
-          })
-          .action(
-            'new',
-            {
-              label: ['new-thread.button', { ns: meta.id }],
-              icon: 'ph--plus--regular',
-              type: 'new',
-              disabled: !companionTo,
-            },
-            () => {
-              invariant(companionTo);
-              return invoke(AssistantOperation.SetCurrentChat, {
-                companionTo,
-                chat: undefined,
-              }).pipe(runAndForwardErrors);
-            },
-          )
-          .action(
-            'rename',
-            {
-              label: ['rename-thread.button', { ns: meta.id }],
-              icon: 'ph--magic-wand--regular',
-              type: 'rename',
-              disabled: !chat,
-            },
-            () =>
-              Effect.gen(function* () {
-                invariant(chat);
-                yield* invoke(AssistantOperation.UpdateChatName, { chat });
-              }).pipe(runAndForwardErrors),
-          )
-          .action(
-            'branch',
-            {
-              label: ['branch-thread.menu', { ns: meta.id }],
-              icon: 'ph--git-branch--regular',
-              type: 'branch',
-              disabled: true,
-            },
-            () => {},
-          );
+  // Stable projection of chat identity + label so the menu rebuilds when a chat is renamed
+  // (same count, same ids → without this the history labels go stale).
+  const chatsVersion = chats.map((chat) => `${chat.id}:${Obj.getLabel(chat) ?? ''}`).join('|');
 
-        if (chats.length > 0) {
-          builder.group(
-            'chats',
-            {
-              label: ['chat-history.label', { ns: meta.id }],
-              icon: 'ph--clock-counter-clockwise--regular',
-              selectCardinality: 'single',
-              variant: 'dropdownMenu',
-            },
-            (builder) => {
-              chats
-                // TODO(wittjosiah): This should be the default sort order.
-                .toSorted((a, b) => a.id.localeCompare(b.id))
-                .forEach((chat) => {
-                  builder.action(
-                    chat.id,
-                    {
-                      label: Obj.getLabel(chat) ?? ['object-name.placeholder', { ns: Chat.Chat.typename }],
-                    },
-                    () =>
-                      Effect.gen(function* () {
-                        invariant(companionTo);
-                        yield* invoke(AssistantOperation.SetCurrentChat, {
-                          companionTo,
-                          chat,
-                        });
-                      }).pipe(runAndForwardErrors),
-                  );
-                });
-            },
-          );
-        }
+  // Stable references in deps avoid circular reference issues.
+  return useMenuBuilder(() => {
+    const builder = MenuBuilder.make()
+      .root({
+        label: ['chat-toolbar.title', { ns: meta.id }],
+      })
+      .action(
+        'new',
+        {
+          label: ['new-thread.button', { ns: meta.id }],
+          icon: 'ph--plus--regular',
+          type: 'new',
+          disabled: !companionTo,
+        },
+        () => {
+          invariant(companionTo);
+          return invoke(AssistantOperation.SetCurrentChat, {
+            companionTo,
+            chat: undefined,
+          }).pipe(runAndForwardErrors);
+        },
+      )
+      .action(
+        'rename',
+        {
+          label: ['rename-thread.button', { ns: meta.id }],
+          icon: 'ph--magic-wand--regular',
+          type: 'rename',
+          disabled: !chat,
+        },
+        () =>
+          Effect.gen(function* () {
+            invariant(chat);
+            yield* invoke(AssistantOperation.UpdateChatName, { chat });
+          }).pipe(runAndForwardErrors),
+      )
+      .action(
+        'branch',
+        {
+          label: ['branch-thread.menu', { ns: meta.id }],
+          icon: 'ph--git-branch--regular',
+          type: 'branch',
+          disabled: true,
+        },
+        () => {},
+      );
 
-        return builder.build();
-      });
-    }, [chats.length, db?.spaceId, companionTo?.id, chat?.id, invoke]),
-  );
+    if (chats.length > 0) {
+      builder.group(
+        'chats',
+        {
+          label: ['chat-history.label', { ns: meta.id }],
+          icon: 'ph--clock-counter-clockwise--regular',
+          selectCardinality: 'single',
+          variant: 'dropdownMenu',
+        },
+        (builder) => {
+          chats
+            // TODO(wittjosiah): This should be the default sort order.
+            .toSorted((a, b) => a.id.localeCompare(b.id))
+            .forEach((chat) => {
+              builder.action(
+                chat.id,
+                {
+                  label: Obj.getLabel(chat) ?? ['object-name.placeholder', { ns: Chat.Chat.typename }],
+                },
+                () =>
+                  Effect.gen(function* () {
+                    invariant(companionTo);
+                    yield* invoke(AssistantOperation.SetCurrentChat, {
+                      companionTo,
+                      chat,
+                    });
+                  }).pipe(runAndForwardErrors),
+              );
+            });
+        },
+      );
+    }
+
+    return builder.build();
+  }, [chatsVersion, db?.spaceId, companionTo?.id, chat?.id, invoke]);
 };

package/src/hooks/useContextBinder.ts

@@ -6,7 +6,7 @@ import { type Registry, RegistryContext } from '@effect-atom/atom-react';
 import * as Effect from 'effect/Effect';
 import { useContext, useState } from 'react';
 
-import { AiContextBinder } from '@dxos/assistant';
+import { AiContext } from '@dxos/assistant';
 import { Feed } from '@dxos/echo';
 import { createFeedServiceLayer } from '@dxos/echo-db';
 import { runAndForwardErrors } from '@dxos/effect';
@@ -16,9 +16,9 @@ import { useAsyncEffect } from '@dxos/react-ui';
 export const useContextBinder = (
   space: Space | undefined,
   feed: Feed.Feed | undefined,
-): AiContextBinder | undefined => {
+): AiContext.Binder | undefined => {
   const registry = useContext(RegistryContext) as Registry.Registry;
-  const [binder, setBinder] = useState<AiContextBinder>();
+  const [binder, setBinder] = useState<AiContext.Binder>();
 
   useAsyncEffect(async () => {
     setBinder(undefined);
@@ -30,7 +30,7 @@ export const useContextBinder = (
     const runtime = await runAndForwardErrors(
       Effect.runtime<Feed.FeedService>().pipe(Effect.provide(feedServiceLayer)),
     );
-    const binder = new AiContextBinder({ feed, runtime, registry });
+    const binder = new AiContext.Binder({ feed, runtime, registry });
     await binder.open();
     setBinder(binder);
 

package/src/hooks/useContextObjects.ts

@@ -5,12 +5,12 @@
 import { Atom, useAtomValue } from '@effect-atom/atom-react';
 import { useCallback } from 'react';
 
-import { type AiContextBinder } from '@dxos/assistant';
+import { type AiContext } from '@dxos/assistant';
 import { type DXN, type Database, type Obj } from '@dxos/echo';
 
 export type UseContextObjectsProps = {
   db?: Database.Database;
-  context?: AiContextBinder;
+  context?: AiContext.Binder;
 };
 
 export type UseContextObjects = {

package/src/index.ts

@@ -2,13 +2,6 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Plugin } from '@dxos/app-framework';
-
-import { meta } from './meta';
-
-export const AssistantPlugin = Plugin.lazy(meta, () => import('#plugin'));
-
+export * from './blueprints';
 export * from './meta';
-
-export * from './components';
-export * from './hooks';
+export * from './types';

package/src/operations/create-chat.ts

@@ -5,19 +5,18 @@
 import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import { AiContextBinder } from '@dxos/assistant';
+import { AiContext } from '@dxos/assistant';
 import { Chat, DatabaseBlueprint, AgentWizardBlueprint } from '@dxos/assistant-toolkit';
 import { Blueprint, Operation } from '@dxos/compute';
 import { Feed, Filter, Obj, Ref } from '@dxos/echo';
 import { createFeedServiceLayer } from '@dxos/echo-db';
 import { invariant } from '@dxos/invariant';
-import { ClientCapabilities } from '@dxos/plugin-client/types';
+import { ClientCapabilities } from '@dxos/plugin-client';
 
 import { AssistantBlueprint } from '#blueprints';
+import { AssistantOperation } from '#types';
 
-import { CreateChat } from './definitions';
-
-const handler: Operation.WithHandler<typeof CreateChat> = CreateChat.pipe(
+const handler: Operation.WithHandler<typeof AssistantOperation.CreateChat> = AssistantOperation.CreateChat.pipe(
   Operation.withHandler(
     Effect.fnUntraced(function* ({ db, name, addToSpace = true }) {
       const registry = yield* Capability.get(Capabilities.AtomRegistry);
@@ -34,22 +33,28 @@ const handler: Operation.WithHandler<typeof CreateChat> = CreateChat.pipe(
       // 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 defaultAssistantBlueprint = blueprints.find((blueprint) => blueprint.key === AssistantBlueprint.key);
+      let defaultAssistantBlueprint = blueprints.find(
+        (blueprint) => Obj.getMeta(blueprint).key === AssistantBlueprint.key,
+      );
       if (!defaultAssistantBlueprint) {
         defaultAssistantBlueprint = db.add(AssistantBlueprint.make());
       }
-      let defaultDatabaseBlueprint = blueprints.find((blueprint) => blueprint.key === DatabaseBlueprint.key);
+      let defaultDatabaseBlueprint = blueprints.find(
+        (blueprint) => Obj.getMeta(blueprint).key === DatabaseBlueprint.key,
+      );
       if (!defaultDatabaseBlueprint) {
         defaultDatabaseBlueprint = db.add(DatabaseBlueprint.make());
       }
-      let defaultAgentWizardBlueprint = blueprints.find((blueprint) => blueprint.key === AgentWizardBlueprint.key);
+      let defaultAgentWizardBlueprint = blueprints.find(
+        (blueprint) => Obj.getMeta(blueprint).key === AgentWizardBlueprint.key,
+      );
       if (!defaultAgentWizardBlueprint) {
         defaultAgentWizardBlueprint = db.add(AgentWizardBlueprint.make());
       }
       // Dynamic import to avoid circular dependency with the barrel that also exports BlueprintManagerHandlers.
       const { BlueprintManagerBlueprint } = yield* Effect.promise(() => import('@dxos/assistant-toolkit'));
       let defaultBlueprintManagerBlueprint = blueprints.find(
-        (blueprint) => blueprint.key === BlueprintManagerBlueprint.key,
+        (blueprint) => Obj.getMeta(blueprint).key === BlueprintManagerBlueprint.key,
       );
       if (!defaultBlueprintManagerBlueprint) {
         defaultBlueprintManagerBlueprint = db.add(BlueprintManagerBlueprint.make());
@@ -57,9 +62,9 @@ const handler: Operation.WithHandler<typeof CreateChat> = CreateChat.pipe(
 
       const feedServiceLayer = createFeedServiceLayer(space.queues);
       const runtime = yield* Effect.runtime<Feed.FeedService>().pipe(Effect.provide(feedServiceLayer));
-      const binder = new AiContextBinder({ feed, runtime, registry });
+      const binder = new AiContext.Binder({ feed, runtime, registry });
       yield* Effect.promise(() =>
-        binder.use((b: AiContextBinder) =>
+        binder.use((b: AiContext.Binder) =>
           b.bind({
             blueprints: [
               Ref.make(defaultAssistantBlueprint!),

package/src/operations/ensure-companion-chat.ts

@@ -9,53 +9,55 @@ import { Chat } from '@dxos/assistant-toolkit';
 import { Operation } from '@dxos/compute';
 import { Filter, Obj, Query } from '@dxos/echo';
 
-import { AssistantCapabilities } from '../types';
-import { CreateChat, EnsureCompanionChat, SetCurrentChat } from './definitions';
-
-const handler: Operation.WithHandler<typeof EnsureCompanionChat> = EnsureCompanionChat.pipe(
-  Operation.withHandler(
-    Effect.fnUntraced(function* ({ db, companionTo }) {
-      const operationInvoker = yield* Capability.get(Capabilities.OperationInvoker);
-      const companionDxn = Obj.getDXN(companionTo).toString();
-
-      // 1. Look for an existing persisted companion chat in the space.
-      const existingChats = yield* Effect.promise(() =>
-        db.query(Query.select(Filter.id(companionTo.id)).targetOf(Chat.CompanionTo).source()).run(),
-      );
-      if (existingChats.length > 0) {
-        const chat = existingChats.at(-1) as Chat.Chat;
-        // Cache the persisted chat so the graph connector can resolve it immediately
-        // via the cache fallback, without waiting for AtomObj.make(ref) to hydrate.
+import { AssistantCapabilities, AssistantOperation } from '#types';
+
+const handler: Operation.WithHandler<typeof AssistantOperation.EnsureCompanionChat> =
+  AssistantOperation.EnsureCompanionChat.pipe(
+    Operation.withHandler(
+      Effect.fnUntraced(function* ({ db, companionTo }) {
+        const operationInvoker = yield* Capability.get(Capabilities.OperationInvoker);
+        const companionDXN = Obj.getDXN(companionTo).toString();
+
+        // 1. Look for an existing persisted companion chat in the space.
+        const existingChats = yield* Effect.promise(() =>
+          db.query(Query.select(Filter.id(companionTo.id)).targetOf(Chat.CompanionTo).source()).run(),
+        );
+        if (existingChats.length > 0) {
+          const chat = existingChats.at(-1) as Chat.Chat;
+          // Cache the persisted chat so the graph connector can resolve it immediately
+          // via the cache fallback, without waiting for AtomObj.make(ref) to hydrate.
+          yield* Capabilities.updateAtomValue(AssistantCapabilities.CompanionChatCache, (current) => ({
+            ...current,
+            [companionDXN]: chat,
+          }));
+          yield* Effect.promise(() =>
+            operationInvoker.invokePromise(AssistantOperation.SetCurrentChat, { companionTo, chat }),
+          );
+          return { chat, persisted: true };
+        }
+
+        // 2. Return cached transient chat for this companion if present.
+        const cache = yield* Capabilities.getAtomValue(AssistantCapabilities.CompanionChatCache);
+        const cached = cache[companionDXN] as Chat.Chat | undefined;
+        if (cached) {
+          return { chat: cached, persisted: false };
+        }
+
+        // 3. Create a new transient chat, cache it, and return it without persisting.
+        const { data } = yield* Effect.promise(() =>
+          operationInvoker.invokePromise(AssistantOperation.CreateChat, { db, addToSpace: false }),
+        );
+        if (!data?.object) {
+          return yield* Effect.fail(new Error('CreateChat did not return a chat object'));
+        }
+        const chat = data.object;
         yield* Capabilities.updateAtomValue(AssistantCapabilities.CompanionChatCache, (current) => ({
           ...current,
-          [companionDxn]: chat,
+          [companionDXN]: chat,
         }));
-        yield* Effect.promise(() => operationInvoker.invokePromise(SetCurrentChat, { companionTo, chat }));
-        return { chat, persisted: true };
-      }
-
-      // 2. Return cached transient chat for this companion if present.
-      const cache = yield* Capabilities.getAtomValue(AssistantCapabilities.CompanionChatCache);
-      const cached = cache[companionDxn] as Chat.Chat | undefined;
-      if (cached) {
-        return { chat: cached, persisted: false };
-      }
-
-      // 3. Create a new transient chat, cache it, and return it without persisting.
-      const { data } = yield* Effect.promise(() =>
-        operationInvoker.invokePromise(CreateChat, { db, addToSpace: false }),
-      );
-      if (!data?.object) {
-        return yield* Effect.fail(new Error('CreateChat did not return a chat object'));
-      }
-      const chat = data.object;
-      yield* Capabilities.updateAtomValue(AssistantCapabilities.CompanionChatCache, (current) => ({
-        ...current,
-        [companionDxn]: chat,
-      }));
-      return { chat, persisted: false };
-    }),
-  ),
-);
+        return { chat, persisted: false };
+      }),
+    ),
+  );
 
 export default handler;

package/src/operations/index.ts

@@ -4,8 +4,6 @@
 
 import { OperationHandlerSet } from '@dxos/compute';
 
-export * as AssistantOperation from './definitions';
-
 export const AssistantOperationHandlerSet = OperationHandlerSet.lazy(
   () => import('./create-chat'),
   () => import('./ensure-companion-chat'),
@@ -13,5 +11,6 @@ export const AssistantOperationHandlerSet = OperationHandlerSet.lazy(
   () => import('./resolve-navigation-targets'),
   () => import('./run-prompt-in-new-chat'),
   () => import('./set-current-chat'),
+  () => import('./toggle-trace-panel-debug'),
   () => import('./update-chat-name'),
 );

package/src/operations/on-create-space.ts

@@ -7,15 +7,15 @@ import * as Effect from 'effect/Effect';
 import { AgentPrompt } from '@dxos/assistant-toolkit';
 import { Operation } from '@dxos/compute';
 
-import { CreateChat, OnCreateSpace } from './definitions';
+import { AssistantOperation } from '#types';
 
-const handler: Operation.WithHandler<typeof OnCreateSpace> = OnCreateSpace.pipe(
+const handler: Operation.WithHandler<typeof AssistantOperation.OnCreateSpace> = AssistantOperation.OnCreateSpace.pipe(
   Operation.withHandler(
     Effect.fnUntraced(function* ({ space }) {
       // TODO(wittjosiah): Remove once function registry is avaiable.
       space.db.add(Operation.serialize(AgentPrompt));
 
-      const { object: chat } = yield* Operation.invoke(CreateChat, { db: space.db });
+      const { object: chat } = yield* Operation.invoke(AssistantOperation.CreateChat, { db: space.db });
       space.db.add(chat);
     }),
   ),

package/src/operations/prompt.test.ts

@@ -11,15 +11,15 @@ import { Routine, Operation } from '@dxos/compute';
 import { Database, Feed, Filter, Ref } from '@dxos/echo';
 import { runAndForwardErrors } from '@dxos/effect';
 import { ObjectId } from '@dxos/keys';
-import { AutomationPlugin } from '@dxos/plugin-automation';
-import { AutomationCapabilities } from '@dxos/plugin-automation/types';
-import { ClientPlugin } from '@dxos/plugin-client';
+import { AutomationCapabilities } from '@dxos/plugin-automation';
+import { AutomationPlugin } from '@dxos/plugin-automation/plugin';
+import { ClientCapabilities } from '@dxos/plugin-client';
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
 import { initializeIdentity } from '@dxos/plugin-client/testing';
-import { ClientCapabilities } from '@dxos/plugin-client/types';
 import { createComposerTestApp } from '@dxos/plugin-testing/harness';
 import { Message } from '@dxos/types';
 
-import { AssistantPlugin } from '../cli';
+import { AssistantPlugin } from '#plugin';
 
 ObjectId.dangerouslyDisableRandomness();
 

package/src/operations/resolve-navigation-targets.ts

@@ -8,9 +8,9 @@ import { Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
 import { Operation } from '@dxos/compute';
 
-import { ResolveNavigationTargets } from './definitions';
+import { AssistantOperation } from '#types';
 
-export default ResolveNavigationTargets.pipe(
+export default AssistantOperation.ResolveNavigationTargets.pipe(
   Operation.withHandler(
     Effect.fn(function* ({ query }) {
       const capabilities = yield* Capability.Service;