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

package/src/extensions/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { promptRunExtension, type PromptExtensionOptions } from './prompt-extension';

package/src/extensions/prompt-extension.ts

@@ -0,0 +1,111 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { syntaxTree } from '@codemirror/language';
+import { type Extension } from '@codemirror/state';
+import { Decoration, type DecorationSet, EditorView, ViewPlugin, type ViewUpdate, WidgetType } from '@codemirror/view';
+
+import { Domino } from '@dxos/ui';
+
+export type PromptExtensionOptions = {
+  /** Called when the user clicks the run button on a prompt code block. */
+  onRun: (promptText: string) => void;
+};
+
+/**
+ * CodeMirror extension that adds a green "run" button to ```prompt fenced code blocks.
+ */
+export const promptRunExtension = ({ onRun }: PromptExtensionOptions): Extension => {
+  return [
+    ViewPlugin.fromClass(
+      class {
+        decorations: DecorationSet;
+
+        constructor(view: EditorView) {
+          this.decorations = this.buildDecorations(view);
+        }
+
+        update(update: ViewUpdate) {
+          if (update.docChanged || update.viewportChanged || update.selectionSet || update.focusChanged) {
+            this.decorations = this.buildDecorations(update.view);
+          }
+        }
+
+        buildDecorations(view: EditorView): DecorationSet {
+          const decorations: Array<{ from: number; to: number; decoration: Decoration }> = [];
+
+          syntaxTree(view.state).iterate({
+            enter: (node) => {
+              if (node.name === 'FencedCode') {
+                const info = node.node.getChild('CodeInfo');
+                if (info) {
+                  const type = view.state.sliceDoc(info.from, info.to);
+                  const text = node.node.getChild('CodeText');
+                  if (type === 'prompt' && text) {
+                    const content = view.state.sliceDoc(text.from, text.to).trim();
+                    if (content.length > 0) {
+                      const widget = new PromptRunWidget(content, onRun);
+                      decorations.push({
+                        from: node.from,
+                        to: node.from,
+                        decoration: Decoration.widget({ widget, side: -1 }),
+                      });
+                    }
+                  }
+                }
+              }
+            },
+          });
+
+          return Decoration.set(
+            decorations.sort((a, b) => a.from - b.from || a.to - b.to).map((d) => d.decoration.range(d.from, d.to)),
+          );
+        }
+      },
+      {
+        decorations: (v) => v.decorations,
+      },
+    ),
+  ];
+};
+
+class PromptRunWidget extends WidgetType {
+  constructor(
+    private readonly prompt: string,
+    private readonly onClick: (promptText: string) => void,
+  ) {
+    super();
+  }
+
+  override eq(other: this) {
+    return this.prompt === other.prompt;
+  }
+
+  override ignoreEvent() {
+    return false;
+  }
+
+  override toDOM() {
+    return Domino.of('div')
+      .classNames('relative')
+      .append(
+        Domino.of('button')
+          .classNames('dx-button absolute right-0 top-4')
+          .on('mousedown', (event) => {
+            event.preventDefault();
+            event.stopPropagation();
+            this.onClick(this.prompt);
+          })
+          .append(
+            Domino.of('svg', Domino.SVG)
+              .classNames('w-4 h-4 cursor-pointer')
+              .append(
+                Domino.of('use', Domino.SVG).attributes({
+                  href: Domino.icon('ph--play--regular'),
+                }),
+              ),
+          ),
+      ).root;
+  }
+}

package/src/feed-logger.ts

@@ -0,0 +1,149 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+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 { invariant } from '@dxos/invariant';
+import { EID, type EntityId } from '@dxos/keys';
+
+export class QueueLogger implements SequenceLogger {
+  private _space: Space;
+  private _invocationTraceFeed: Feed.Feed;
+  private _feedServiceLayer: Layer.Layer<Feed.FeedService>;
+
+  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;
+
+    if (existingFeedRef) {
+      // 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');
+      invariant(Feed.getQueueUri(existingFeedRef.target), 'invocationTraceFeed has no queue DXN');
+      this._invocationTraceFeed = existingFeedRef.target;
+    } else {
+      const feed = space.db.add(Feed.make({ namespace: 'trace' }));
+      invariant(Feed.getQueueUri(feed), 'New invocationTraceFeed has no queue DXN');
+      Obj.update(this._space.properties, (obj) => {
+        obj.invocationTraceFeed = Ref.make(feed);
+      });
+      this._invocationTraceFeed = feed;
+    }
+  }
+
+  log(event: SequenceEvent) {
+    switch (event.type) {
+      case 'begin':
+        void this._appendToTraceFeed([
+          Obj.make(InvocationTraceStartEvent, {
+            type: InvocationTraceEventType.START,
+            invocationId: event.invocationId,
+            timestamp: Date.now(),
+            input: {},
+            invocationTraceFeed: Ref.fromURI(this._getTraceQueueEchoId(event.invocationId)),
+            invocationTarget: Ref.make(this.sequence),
+          }),
+        ]);
+        break;
+      case 'end':
+        void this._appendToTraceFeed([
+          Obj.make(InvocationTraceEndEvent, {
+            type: InvocationTraceEventType.END,
+            invocationId: event.invocationId,
+            timestamp: Date.now(),
+            outcome: InvocationOutcome.SUCCESS,
+          }),
+        ]);
+        break;
+      case 'step-start':
+      case 'step-complete':
+        void this._getTraceEventQueue(event.invocationId).append([
+          Obj.make(TraceEvent, {
+            outcome: event.type,
+            truncated: false,
+            ingestionTimestamp: Date.now(),
+            logs: [
+              {
+                timestamp: Date.now(),
+                level: 'info',
+                message: event.type,
+                context: { step: event.step },
+              },
+            ],
+            exceptions: [],
+          }),
+        ]);
+        break;
+      case 'message':
+        void this._getTraceEventQueue(event.invocationId).append([
+          Obj.make(TraceEvent, {
+            outcome: event.type,
+            truncated: false,
+            ingestionTimestamp: Date.now(),
+            logs: [
+              {
+                timestamp: Date.now(),
+                level: 'info',
+                message: event.type,
+                context: { message: event.message },
+              },
+            ],
+            exceptions: [],
+          }),
+        ]);
+        break;
+      case 'block':
+        void this._getTraceEventQueue(event.invocationId).append([
+          Obj.make(TraceEvent, {
+            outcome: event.type,
+            truncated: false,
+            ingestionTimestamp: Date.now(),
+            logs: [
+              {
+                timestamp: Date.now(),
+                level: 'info',
+                message: event.type,
+                context: { block: event.block },
+              },
+            ],
+            exceptions: [],
+          }),
+        ]);
+        break;
+    }
+  }
+
+  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,
+    );
+  }
+
+  // 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
 //
-
-export * from './chat-processor';
-export * from './errors';
-export * from './presets';
+// 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 * from './useResolveRef';
+
+export { type AiChatProcessor } from '../processor';

package/src/hooks/useBlueprintRegistry.ts

@@ -2,77 +2,123 @@
 // Copyright 2025 DXOS.org
 //
 
-import { useSignalEffect } from '@preact/signals-react';
-import { useCallback, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 
-import { Capabilities, useCapabilities } from '@dxos/app-framework';
-import { type AiContextBinder } from '@dxos/assistant';
-import { Blueprint } from '@dxos/blueprints';
-import { type Space } from '@dxos/client/echo';
-import { Filter, Obj, Ref } from '@dxos/echo';
-import { isNonNullable } from '@dxos/util';
+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.
-export const useBlueprintRegistry = () => {
-  const blueprints = useCapabilities(Capabilities.BlueprintDefinition);
-  return useMemo(() => new Blueprint.Registry(blueprints), [blueprints]);
+export const useBlueprints = ({ registry, db }: { registry?: Registry.Registry; db?: Database.Database }) => {
+  const [registryBlueprints, setRegistryBlueprints] = useState<Blueprint.Blueprint[]>(
+    () => registry?.query(Filter.type(Blueprint.Blueprint)).runSync() ?? [],
+  );
+
+  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([...registryBlueprints, ...spaceBlueprints], (b) => Obj.getMeta(b).key);
+    blueprints.sort(({ name: a }, { name: b }) => a.localeCompare(b));
+    return blueprints;
+  }, [registryBlueprints, spaceBlueprints]);
 };
 
 /**
  * Create reactive map of active blueprints (by key).
  */
-export const useBlueprints = ({ context }: { context?: AiContextBinder }) => {
+export const useActiveBlueprints = ({ context }: { context?: AiContext.Binder }) => {
   const [active, setActive] = useState<Map<string, Blueprint.Blueprint>>(new Map());
-  useSignalEffect(() => {
-    const refs = [...(context?.blueprints.value ?? [])];
-    const t = setTimeout(async () => {
-      const blueprints = (await Ref.Array.loadAll(refs)).filter(isNonNullable);
-      setActive(new Map(blueprints.map((blueprint) => [blueprint.key, blueprint])));
-    });
 
-    return () => clearTimeout(t);
-  });
+  useEffect(() => {
+    if (!context) {
+      setActive(new Map());
+      return;
+    }
+
+    const updateActive = () => {
+      const blueprints = context.getBlueprints();
+      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.
+    updateActive();
+
+    // Subscribe to changes.
+    return context.subscribeBlueprints(updateActive);
+  }, [context]);
 
   return active;
 };
 
-// TODO(burdon): Context should manage ephemeral state of bindings until prompt is issued?
+// TODO(burdon): Move logic into binder.
 export const useBlueprintHandlers = ({
-  space,
+  db,
   context,
-  blueprintRegistry,
+  registry,
 }: {
-  space: Space;
-  context?: AiContextBinder;
-  blueprintRegistry?: Blueprint.Registry;
+  db: Database.Database;
+  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 space.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);
+
+        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)] });
           }
-          // NOTE: Possible race condition with other peers.
-          storedBlueprint = space.db.add(Obj.clone(blueprint));
         }
-        await context.bind({ blueprints: [Ref.make(storedBlueprint)] });
-      } else if (storedBlueprint) {
-        await context.unbind({ blueprints: [Ref.make(storedBlueprint)] });
       }
     },
-    [space, 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]);
+};