@dxos/plugin-assistant 0.8.4-main.fcfe5033a5 → 0.8.4-staging.60fe92afc8

package/src/{queue-logger.ts → feed-logger.ts}

@@ -2,62 +2,65 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Queue, Ref, type Space, getSpace } from '@dxos/client/echo';
-import { type Sequence, type SequenceEvent, type SequenceLogger } from '@dxos/conductor';
-import { DXN, Feed, Obj } from '@dxos/echo';
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
+
+import { createFeedServiceLayer, type Space, getSpace } from '@dxos/client/echo';
+import { Sequence, type SequenceEvent, type SequenceLogger } from '@dxos/conductor';
+import { Feed, Obj, Ref } from '@dxos/echo';
+import { type Queue } from '@dxos/echo-client';
+import { EffectEx } from '@dxos/effect';
 import { InvocationTraceEndEvent, InvocationTraceEventType, InvocationTraceStartEvent } from '@dxos/functions-runtime';
 import { TraceEvent } from '@dxos/functions-runtime';
 import { InvocationOutcome } from '@dxos/functions-runtime';
-import { type InvocationTraceEvent } from '@dxos/functions-runtime';
 import { invariant } from '@dxos/invariant';
-import { QueueSubspaceTags } from '@dxos/keys';
+import { EID, type EntityId } from '@dxos/keys';
 
 export class QueueLogger implements SequenceLogger {
   private _space: Space;
-  private _invocationTraceQueue: Queue<InvocationTraceEvent>;
+  private _invocationTraceFeed: Feed.Feed;
+  private _feedServiceLayer: Layer.Layer<Feed.FeedService>;
 
-  constructor(private readonly sequence: Sequence) {
+  constructor(private readonly sequence: Sequence.Sequence) {
     const space = getSpace(sequence);
     invariant(space, 'Space not found');
     this._space = space;
+    this._feedServiceLayer = createFeedServiceLayer(space.queues);
 
     const existingFeedRef = this._space.properties.invocationTraceFeed;
-    let queueDxn: DXN | undefined;
 
     if (existingFeedRef) {
-      // A feed reference exists; resolve its queue DXN. If the target isn't loaded yet,
-      // fail loudly rather than silently creating a new feed and orphaning existing traces.
+      // A feed reference exists; ensure its target is loaded. If not, fail loudly
+      // rather than silently creating a new feed and orphaning existing traces.
       invariant(existingFeedRef.target, 'invocationTraceFeed reference is not yet loaded');
-      queueDxn = Feed.getQueueDxn(existingFeedRef.target) ?? undefined;
-      invariant(queueDxn, 'invocationTraceFeed has no queue DXN');
+      invariant(Feed.getQueueUri(existingFeedRef.target), 'invocationTraceFeed has no queue DXN');
+      this._invocationTraceFeed = existingFeedRef.target;
     } else {
       const feed = space.db.add(Feed.make({ namespace: 'trace' }));
-      queueDxn = Feed.getQueueDxn(feed) ?? undefined;
-      invariant(queueDxn, 'New invocationTraceFeed has no queue DXN');
-      Obj.change(this._space.properties, (obj) => {
+      invariant(Feed.getQueueUri(feed), 'New invocationTraceFeed has no queue DXN');
+      Obj.update(this._space.properties, (obj) => {
         obj.invocationTraceFeed = Ref.make(feed);
       });
+      this._invocationTraceFeed = feed;
     }
-
-    this._invocationTraceQueue = this._space.queues.get(queueDxn);
   }
 
   log(event: SequenceEvent) {
     switch (event.type) {
       case 'begin':
-        void this._invocationTraceQueue.append([
+        void this._appendToTraceFeed([
           Obj.make(InvocationTraceStartEvent, {
             type: InvocationTraceEventType.START,
             invocationId: event.invocationId,
             timestamp: Date.now(),
             input: {},
-            invocationTraceQueue: Ref.fromDXN(this._getTraceQueueDxn(event.invocationId)),
+            invocationTraceFeed: Ref.fromURI(this._getTraceQueueEchoId(event.invocationId)),
             invocationTarget: Ref.make(this.sequence),
           }),
         ]);
         break;
       case 'end':
-        void this._invocationTraceQueue.append([
+        void this._appendToTraceFeed([
           Obj.make(InvocationTraceEndEvent, {
             type: InvocationTraceEventType.END,
             invocationId: event.invocationId,
@@ -124,12 +127,23 @@ export class QueueLogger implements SequenceLogger {
     }
   }
 
-  private _getTraceQueueDxn(invocationId: string): DXN {
-    return DXN.fromQueue(QueueSubspaceTags.TRACE, this._space.id, invocationId);
+  private _getTraceQueueEchoId(invocationId: EntityId): EID.EID {
+    return EID.make({ spaceId: this._space.id, entityId: invocationId });
+  }
+
+  private _appendToTraceFeed(items: any[]): Promise<void> {
+    return Feed.append(this._invocationTraceFeed, items).pipe(
+      Effect.provide(this._feedServiceLayer),
+      EffectEx.runAndForwardErrors,
+    );
   }
 
-  private _getTraceEventQueue(invocationId: string): Queue<TraceEvent> {
-    const dxn = this._getTraceQueueDxn(invocationId);
-    return this._space.queues.get(dxn);
+  // TODO(burdon): The per-invocation trace event queues address feeds by raw queue DXN
+  // (no backing Feed.Feed object). Migration to Feed.append is blocked on either
+  // (a) materializing a Feed object per invocation, or (b) a lower-level
+  // FeedService.appendByDxn primitive. Tracked as Phase 6 work in echo/AUDIT.md.
+  private _getTraceEventQueue(invocationId: EntityId): Queue<TraceEvent> {
+    const echoUri = this._getTraceQueueEchoId(invocationId);
+    return this._space.queues.get(echoUri);
   }
 }

package/src/functions/services.test.ts

@@ -0,0 +1,53 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { LayoutOperation } from '@dxos/app-toolkit';
+import {
+  AgentBlueprintHandlers,
+  AgentHandlers,
+  AgentWizardHandlers,
+  BlueprintManagerHandlers,
+  DatabaseHandlers,
+  DelegationHandlers,
+  WebSearchHandlers,
+} from '@dxos/assistant-toolkit';
+import { Operation, OperationHandlerSet } from '@dxos/compute';
+import { EffectEx } from '@dxos/effect';
+
+import { AssistantOperationHandlerSet } from '#operations';
+
+const handlerSet = OperationHandlerSet.merge(
+  AssistantOperationHandlerSet,
+  AgentHandlers,
+  AgentBlueprintHandlers,
+  BlueprintManagerHandlers,
+  DatabaseHandlers,
+  WebSearchHandlers,
+  AgentWizardHandlers,
+  DelegationHandlers,
+);
+
+describe('operation registry round-trip', () => {
+  test('LayoutOperation.Open input survives serialization', ({ expect }) => {
+    const record = Operation.serialize(LayoutOperation.Open);
+    const restored = Operation.deserialize(record);
+    expect(restored.input.ast._tag).toBe('TypeLiteral');
+  });
+
+  test('assistant plugin operation inputs deserialize to struct-like schemas', async ({ expect }) => {
+    const handlers = await EffectEx.runPromise(handlerSet.handlers);
+    const failures: string[] = [];
+    for (const operation of handlers) {
+      const record = Operation.serialize(operation);
+      const restored = Operation.deserialize(record);
+      const tag = restored.input.ast._tag;
+      if (tag !== 'TypeLiteral' && tag !== 'VoidKeyword') {
+        failures.push(`${operation.meta.key}: ${tag}`);
+      }
+    }
+    expect(failures, failures.join('\n')).toEqual([]);
+  });
+});

package/src/hooks/index.ts

@@ -1,15 +1,20 @@
 //
 // Copyright 2024 DXOS.org
 //
+// TODO(wittjosiah): Factor hooks out of plugin-assistant into a standalone package.
 
 export * from './useBlueprintRegistry';
+export * from './useChatKeymap';
 export * from './useChatProcessor';
 export * from './useChatServices';
 export * from './useChatToolbarActions';
 export * from './useContextBinder';
 export * from './useContextObjects';
+export { useDebug } from './useDebug';
 export * from './useFilteredTypes';
 export * from './useFlush';
 export * from './useOnline';
 export * from './usePresets';
 export * from './useReferencesProvider';
+
+export { type AiChatProcessor } from '../processor';

package/src/hooks/useBlueprintRegistry.ts

@@ -4,47 +4,40 @@
 
 import { useCallback, useEffect, useMemo, useState } from 'react';
 
-import { useCapabilities } from '@dxos/app-framework/ui';
-import { AppCapabilities } from '@dxos/app-toolkit';
-import { type AiContextBinder } from '@dxos/assistant';
-import { Blueprint } from '@dxos/blueprints';
-import { type Database, Filter, Obj, Ref } from '@dxos/echo';
+import { type AiContext } from '@dxos/assistant';
+import { Blueprint } from '@dxos/compute';
+import { type Database, Filter, Obj, Ref, type Registry } from '@dxos/echo';
 import { useQuery } from '@dxos/react-client/echo';
 import { distinctBy } from '@dxos/util';
 
-/**
- * Provide a registry of blueprints from plugins.
- */
-// TODO(burdon): Reconcile with eventual public registry.
-// TODO(dmaretskyi): Reconcile with blueprint registry in compute runtime.
-export const useBlueprintRegistry = () => {
-  const blueprintDefinitions = useCapabilities(AppCapabilities.BlueprintDefinition);
-  return useMemo(
-    () => new Blueprint.Registry(blueprintDefinitions.map((blueprint) => blueprint.make())),
-    [blueprintDefinitions],
+export const useBlueprints = ({ registry, db }: { registry?: Registry.Registry; db?: Database.Database }) => {
+  const [registryBlueprints, setRegistryBlueprints] = useState<Blueprint.Blueprint[]>(
+    () => registry?.query(Filter.type(Blueprint.Blueprint)).runSync() ?? [],
   );
-};
 
-export const useBlueprints = ({
-  blueprintRegistry,
-  db,
-}: {
-  blueprintRegistry?: Blueprint.Registry;
-  db?: Database.Database;
-}) => {
-  const staticBlueprints = useMemo(() => blueprintRegistry?.query() ?? [], [blueprintRegistry]);
+  useEffect(() => {
+    if (!registry) {
+      setRegistryBlueprints([]);
+      return;
+    }
+    setRegistryBlueprints(registry.query(Filter.type(Blueprint.Blueprint)).runSync());
+    return registry.changed.on(() => {
+      setRegistryBlueprints(registry.query(Filter.type(Blueprint.Blueprint)).runSync());
+    });
+  }, [registry]);
+
   const spaceBlueprints = useQuery(db, Filter.type(Blueprint.Blueprint));
   return useMemo(() => {
-    const blueprints = distinctBy([...staticBlueprints, ...spaceBlueprints], (b) => b.key);
+    const blueprints = distinctBy([...registryBlueprints, ...spaceBlueprints], (b) => Obj.getMeta(b).key);
     blueprints.sort(({ name: a }, { name: b }) => a.localeCompare(b));
     return blueprints;
-  }, [staticBlueprints, spaceBlueprints]);
+  }, [registryBlueprints, spaceBlueprints]);
 };
 
 /**
  * Create reactive map of active blueprints (by key).
  */
-export const useActiveBlueprints = ({ context }: { context?: AiContextBinder }) => {
+export const useActiveBlueprints = ({ context }: { context?: AiContext.Binder }) => {
   const [active, setActive] = useState<Map<string, Blueprint.Blueprint>>(new Map());
 
   useEffect(() => {
@@ -55,7 +48,13 @@ export const useActiveBlueprints = ({ context }: { context?: AiContextBinder })
 
     const updateActive = () => {
       const blueprints = context.getBlueprints();
-      setActive(new Map(blueprints.map((blueprint) => [blueprint.key, blueprint])));
+      setActive(
+        new Map(
+          blueprints
+            .map((blueprint) => [Obj.getMeta(blueprint).key, blueprint] as const)
+            .filter((entry): entry is readonly [string, Blueprint.Blueprint] => entry[0] !== undefined),
+        ),
+      );
     };
 
     // Set initial value.
@@ -72,37 +71,54 @@ export const useActiveBlueprints = ({ context }: { context?: AiContextBinder })
 export const useBlueprintHandlers = ({
   db,
   context,
-  blueprintRegistry,
+  registry,
 }: {
   db: Database.Database;
-  context?: AiContextBinder;
-  blueprintRegistry?: Blueprint.Registry;
+  context?: AiContext.Binder;
+  registry?: Registry.Registry;
 }) => {
   const onUpdateBlueprint = useCallback(
     async (key: string, checked: boolean) => {
-      if (!context || !blueprintRegistry) {
+      if (!context) {
         return;
       }
 
-      // Find existing cloned blueprint.
-      const objects = await db.query(Filter.type(Blueprint.Blueprint)).run();
-      let storedBlueprint = objects.find((blueprint) => blueprint.key === key);
       if (checked) {
-        if (!storedBlueprint) {
-          const blueprint = blueprintRegistry.getByKey(key);
-          if (!blueprint) {
-            return;
-          }
+        // Check if the blueprint is in the registry — if so, bind via its key URI directly
+        // (no DB clone needed). Fall back to an existing DB copy for user-forked blueprints.
+        const registryBlueprint = registry
+          ?.query(Filter.type(Blueprint.Blueprint))
+          .runSync()
+          .find((b) => Obj.getMeta(b).key === key);
 
-          // NOTE: Possible race condition with other peers.
-          storedBlueprint = db.add(Obj.clone(blueprint));
+        if (registryBlueprint) {
+          await context.bind({ blueprints: [Ref.fromURI(Blueprint.registryURI(key))] });
+        } else {
+          // User-forked blueprint (in DB but not in registry): bind via DB ref.
+          const objects = await db.query(Filter.type(Blueprint.Blueprint)).run();
+          const storedBlueprint = objects.find((blueprint) => Obj.getMeta(blueprint).key === key);
+          if (storedBlueprint) {
+            await context.bind({ blueprints: [Ref.make(storedBlueprint)] });
+          }
+        }
+      } else {
+        // Unbind: try registry ref first, then DB ref.
+        const registryBlueprint = registry
+          ?.query(Filter.type(Blueprint.Blueprint))
+          .runSync()
+          .find((b) => Obj.getMeta(b).key === key);
+        if (registryBlueprint) {
+          await context.unbind({ blueprints: [Ref.fromURI(Blueprint.registryURI(key))] });
+        } else {
+          const objects = await db.query(Filter.type(Blueprint.Blueprint)).run();
+          const storedBlueprint = objects.find((blueprint) => Obj.getMeta(blueprint).key === key);
+          if (storedBlueprint) {
+            await context.unbind({ blueprints: [Ref.make(storedBlueprint)] });
+          }
         }
-        await context.bind({ blueprints: [Ref.make(storedBlueprint)] });
-      } else if (storedBlueprint) {
-        await context.unbind({ blueprints: [Ref.make(storedBlueprint)] });
       }
     },
-    [db, context, blueprintRegistry],
+    [db, context, registry],
   );
 
   return { onUpdateBlueprint };

package/src/hooks/useChatKeymap.ts

@@ -0,0 +1,52 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Extension, Prec } from '@codemirror/state';
+import { keymap } from '@codemirror/view';
+import { useMemo } from 'react';
+
+import { type Event } from '@dxos/async';
+import { isTruthy } from '@dxos/util';
+
+import { type ChatEvent } from '../components/Chat/events';
+
+/**
+ * CodeMirror keymap shared by the chat document (Thread) and the prompt editor — pressing
+ * Mod-Arrow keys when either editor is focused emits the corresponding `ChatEvent` on the
+ * shared event bus.
+ */
+export const useChatKeymapExtensions = ({ event }: { event: Event<ChatEvent> }): Extension[] => {
+  return useMemo<Extension[]>(() => {
+    return [
+      Prec.highest(
+        keymap.of([
+          {
+            key: 'Mod-ArrowUp',
+            preventDefault: true,
+            run: () => {
+              event.emit({ type: 'nav-previous' });
+              return true;
+            },
+            shift: () => {
+              event.emit({ type: 'thread-open' });
+              return true;
+            },
+          },
+          {
+            key: 'Mod-ArrowDown',
+            preventDefault: true,
+            run: () => {
+              event.emit({ type: 'nav-next' });
+              return true;
+            },
+            shift: () => {
+              event.emit({ type: 'thread-close' });
+              return true;
+            },
+          },
+        ]),
+      ),
+    ].filter(isTruthy);
+  }, [event]);
+};

package/src/hooks/useChatProcessor.ts

@@ -2,18 +2,22 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Registry, RegistryContext } from '@effect-atom/atom-react';
+import { RegistryContext } from '@effect-atom/atom-react';
 import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
 import { useContext, useMemo, useState } from 'react';
 
+import { AiService, OpaqueToolkit } from '@dxos/ai';
+import { Capabilities } from '@dxos/app-framework';
+import { useCapability } from '@dxos/app-framework/ui';
 import { AiSession } from '@dxos/assistant';
 import { type Chat } from '@dxos/assistant-toolkit';
-import { type Blueprint } from '@dxos/blueprints';
-import { Feed, Ref } from '@dxos/echo';
-import { createFeedServiceLayer } from '@dxos/echo-db';
-import { runAndForwardErrors } from '@dxos/effect';
+import { Credential, ServiceResolver } from '@dxos/compute';
+import { Database, Feed, Ref, Registry } from '@dxos/echo';
+import { createFeedServiceLayer } from '@dxos/echo-client';
+import { EffectEx } from '@dxos/effect';
+import { AgentService } from '@dxos/functions-runtime';
 import { log } from '@dxos/log';
-import { type AutomationCapabilities } from '@dxos/plugin-automation/types';
 import { type Space } from '@dxos/react-client/echo';
 import { useAsyncEffect } from '@dxos/react-ui';
 
@@ -25,8 +29,8 @@ export type UseChatProcessorProps = {
   space?: Space;
   chat?: Chat.Chat;
   preset?: AiServicePreset;
-  runtime?: AutomationCapabilities.ComputeRuntime;
-  blueprintRegistry?: Blueprint.Registry;
+  runtime?: Capabilities.ProcessManagerRuntime;
+  registry?: Registry.Registry;
   settings?: Assistant.Settings;
 };
 
@@ -38,12 +42,12 @@ export const useChatProcessor = ({
   chat,
   preset,
   runtime,
-  blueprintRegistry,
+  registry,
   settings,
 }: UseChatProcessorProps): AiChatProcessor | undefined => {
   const observableRegistry = useContext(RegistryContext);
 
-  const [session, setSession] = useState<AiSession>();
+  const [session, setSession] = useState<AiSession.Session>();
   useAsyncEffect(async () => {
     if (!space || !chat) {
       return;
@@ -54,13 +58,13 @@ export const useChatProcessor = ({
       return;
     }
     const feedServiceLayer = createFeedServiceLayer(space.queues);
-    const runtime = await runAndForwardErrors(
+    const runtime = await EffectEx.runAndForwardErrors(
       Effect.runtime<Feed.FeedService>().pipe(Effect.provide(feedServiceLayer)),
     );
-    const session = new AiSession({
+    const session = new AiSession.Session({
       feed: feedTarget,
       runtime,
-      registry: observableRegistry as Registry.Registry,
+      registry: observableRegistry,
     });
     await session.open();
     setSession(session);
@@ -71,20 +75,32 @@ export const useChatProcessor = ({
   }, [space, chat?.feed.target]);
 
   const feed = chat?.feed.target;
+  const serviceResolver = useCapability(Capabilities.ServiceResolver);
 
   const processor = useMemo(() => {
-    if (!runtime || !session || !chat || !feed) {
+    if (!runtime || !session || !chat || !feed || !space) {
       return undefined;
     }
 
+    const spaceLayer = ServiceResolver.provide(
+      { space: space.id },
+      Database.Service,
+      Feed.FeedService,
+      Credential.CredentialsService,
+      AiService.AiService,
+      AgentService.AgentService,
+      Registry.Service,
+      OpaqueToolkit.OpaqueToolkitProvider,
+    ).pipe(Layer.provide(Layer.succeed(ServiceResolver.ServiceResolver, serviceResolver)));
+
     log('creating processor', { preset, model: preset?.model, settings });
-    return new AiChatProcessor(session, runtime, feed, {
+    return new AiChatProcessor(session, runtime, feed, spaceLayer, {
       chat: chat ? Ref.make(chat) : undefined,
       observableRegistry,
-      blueprintRegistry,
+      registry,
       model: preset?.model,
     });
-  }, [runtime, session, blueprintRegistry, preset, feed]);
+  }, [runtime, session, registry, preset, chat, feed, space?.id]);
 
   return processor;
 };

package/src/hooks/useChatServices.ts

@@ -2,12 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import { useMemo } from 'react';
-
+import { Capabilities } from '@dxos/app-framework';
 import { useCapability } from '@dxos/app-framework/ui';
 import { getPersonalSpace } from '@dxos/app-toolkit';
 import { type Key } from '@dxos/echo';
-import { AutomationCapabilities } from '@dxos/plugin-automation/types';
 import { useClient } from '@dxos/react-client';
 
 export type UseChatServicesProps = {
@@ -15,12 +13,16 @@ export type UseChatServicesProps = {
 };
 
 /**
- * Resolves the compute runtime for a space.
+ * Resolves the shared {@link Capabilities.ProcessManagerRuntime} for the given space.
+ *
+ * The runtime itself is space-agnostic; the returned value can be used to run
+ * effects that pipe through {@link ServiceResolver.provide} (or the
+ * `useSpaceCallback`/`useSpaceService` hooks) with the resolved {@link Key.SpaceId}.
  */
 export const useChatServices = ({ id }: UseChatServicesProps) => {
   const client = useClient();
   id ??= getPersonalSpace(client)?.id;
 
-  const runtimeResolver = useCapability(AutomationCapabilities.ComputeRuntime);
-  return useMemo(() => (!id ? undefined : runtimeResolver.getRuntime(id)), [id]);
+  const runtime = useCapability(Capabilities.ProcessManagerRuntime);
+  return id ? runtime : undefined;
 };