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

package/src/containers/index.ts

@@ -0,0 +1,17 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type ComponentType, lazy } from 'react';
+
+export const AgentArticle: ComponentType<any> = lazy(() => import('./AgentArticle'));
+export const AgentProperties: ComponentType<any> = lazy(() => import('./AgentProperties'));
+export const BlueprintArticle: ComponentType<any> = lazy(() => import('./BlueprintArticle'));
+export const ChatCompanion: ComponentType<any> = lazy(() => import('./ChatCompanion'));
+export const ChatArticle: ComponentType<any> = lazy(() => import('./ChatArticle'));
+export const ChatDialog: ComponentType<any> = lazy(() => import('./ChatDialog'));
+export const PlanArticle: ComponentType<any> = lazy(() => import('./PlanArticle'));
+export const RoutineArticle: ComponentType<any> = lazy(() => import('./RoutineArticle'));
+export const RoutineList: ComponentType<any> = lazy(() => import('./RoutineList'));
+export const TracePanel: ComponentType<any> = lazy(() => import('./TracePanel'));
+export const TriggerStatus: ComponentType<any> = lazy(() => import('./TriggerStatus'));

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,145 @@
+//
+// 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 { DXN, Feed, Obj, Ref } from '@dxos/echo';
+import { runAndForwardErrors } 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 { QueueSubspaceTags } from '@dxos/keys';
+
+export class FeedLogger 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.getQueueDxn(existingFeedRef.target), 'invocationTraceFeed has no DXN');
+      this._invocationTraceFeed = existingFeedRef.target;
+    } else {
+      const feed = space.db.add(Feed.make({ namespace: 'trace' }));
+      invariant(Feed.getQueueDxn(feed), 'New invocationTraceFeed has no 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.fromDXN(this._getTraceFeedDXN(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._appendTraceEvent(event.invocationId, [
+          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._appendTraceEvent(event.invocationId, [
+          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._appendTraceEvent(event.invocationId, [
+          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 _getTraceFeedDXN(invocationId: string): DXN {
+    return DXN.fromQueue(QueueSubspaceTags.TRACE, this._space.id, invocationId);
+  }
+
+  private _appendToTraceFeed(items: any[]): Promise<void> {
+    return Feed.append(this._invocationTraceFeed, items).pipe(
+      Effect.provide(this._feedServiceLayer),
+      runAndForwardErrors,
+    );
+  }
+
+  /**
+   * Per-invocation trace event feeds are deprecated and no longer functional;
+   * this is a no-op until a replacement tracing data structure lands.
+   */
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  private async _appendTraceEvent(_invocationId: string, _items: TraceEvent[]): Promise<void> {}
+}

package/src/hooks/index.ts

@@ -3,12 +3,15 @@
 //
 
 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 './useItemTypes';
 export * from './useOnline';
 export * from './usePresets';
 export * from './useReferencesProvider';

package/src/hooks/useBlueprintRegistry.ts

@@ -2,37 +2,40 @@
 // 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 { useCapabilities } from '@dxos/app-framework/ui';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { type AiContext } from '@dxos/assistant';
+import { Blueprint } from '@dxos/compute';
+import { type Database, Filter, Obj, Ref } from '@dxos/echo';
 import { useQuery } from '@dxos/react-client/echo';
-import { distinctBy, isNonNullable } from '@dxos/util';
+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 blueprints = useCapabilities(Capabilities.BlueprintDefinition);
-  return useMemo(() => new Blueprint.Registry(blueprints), [blueprints]);
+  const blueprintDefinitions = useCapabilities(AppCapabilities.BlueprintDefinition);
+  return useMemo(
+    () => new Blueprint.Registry(blueprintDefinitions.map((blueprint) => blueprint.make())),
+    [blueprintDefinitions],
+  );
 };
 
 export const useBlueprints = ({
   blueprintRegistry,
-  space,
+  db,
 }: {
   blueprintRegistry?: Blueprint.Registry;
-  space?: Space;
+  db?: Database.Database;
 }) => {
   const staticBlueprints = useMemo(() => blueprintRegistry?.query() ?? [], [blueprintRegistry]);
-  const spaceBlueprints = useQuery(space, Filter.type(Blueprint.Blueprint));
+  const spaceBlueprints = useQuery(db, Filter.type(Blueprint.Blueprint));
   return useMemo(() => {
-    const blueprints = distinctBy([...staticBlueprints, ...spaceBlueprints], (b) => b.key);
+    const blueprints = distinctBy([...staticBlueprints, ...spaceBlueprints], (b) => Obj.getMeta(b).key);
     blueprints.sort(({ name: a }, { name: b }) => a.localeCompare(b));
     return blueprints;
   }, [staticBlueprints, spaceBlueprints]);
@@ -41,26 +44,44 @@ export const useBlueprints = ({
 /**
  * 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());
 
-  useSignalEffect(() => {
-    const refs = [...(context?.blueprints.value ?? [])];
-    const blueprints = refs.map((ref) => ref.target).filter(isNonNullable);
-    setActive(new Map(blueprints.map((blueprint) => [blueprint.key, blueprint])));
-  });
+  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): Move logic into binder.
 export const useBlueprintHandlers = ({
-  space,
+  db,
   context,
   blueprintRegistry,
 }: {
-  space: Space;
-  context?: AiContextBinder;
+  db: Database.Database;
+  context?: AiContext.Binder;
   blueprintRegistry?: Blueprint.Registry;
 }) => {
   const onUpdateBlueprint = useCallback(
@@ -70,8 +91,8 @@ export const useBlueprintHandlers = ({
       }
 
       // Find existing cloned blueprint.
-      const { objects } = await space.db.query(Filter.type(Blueprint.Blueprint)).run();
-      let storedBlueprint = objects.find((blueprint) => blueprint.key === key);
+      const objects = await db.query(Filter.type(Blueprint.Blueprint)).run();
+      let storedBlueprint = objects.find((blueprint) => Obj.getMeta(blueprint).key === key);
       if (checked) {
         if (!storedBlueprint) {
           const blueprint = blueprintRegistry.getByKey(key);
@@ -80,14 +101,14 @@ export const useBlueprintHandlers = ({
           }
 
           // NOTE: Possible race condition with other peers.
-          storedBlueprint = space.db.add(Obj.clone(blueprint));
+          storedBlueprint = 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, blueprintRegistry],
   );
 
   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,23 +2,30 @@
 // Copyright 2025 DXOS.org
 //
 
-import { RegistryContext } from '@effect-rx/rx-react';
-import type * as Runtime from 'effect/Runtime';
+import { type Registry, RegistryContext } from '@effect-atom/atom-react';
+import * as Effect from 'effect/Effect';
 import { useContext, useMemo, useState } from 'react';
 
-import { AiConversation } from '@dxos/assistant';
-import { type Blueprint } from '@dxos/blueprints';
+import { AiSession } from '@dxos/assistant';
+import { type Chat } from '@dxos/assistant-toolkit';
+import { type Blueprint } from '@dxos/compute';
+import { Feed, Ref } from '@dxos/echo';
+import { createFeedServiceLayer } from '@dxos/echo-db';
+import { runAndForwardErrors } from '@dxos/effect';
 import { log } from '@dxos/log';
-import { type Queue } from '@dxos/react-client/echo';
+import { type AutomationCapabilities } from '@dxos/plugin-automation';
+import { type Space } from '@dxos/react-client/echo';
 import { useAsyncEffect } from '@dxos/react-ui';
 
-import { AiChatProcessor, type AiChatServices, type AiServicePreset } from '../processor';
-import { type Assistant } from '../types';
+import { type Assistant } from '#types';
+
+import { AiChatProcessor, type AiServicePreset } from '../processor';
 
 export type UseChatProcessorProps = {
-  chat?: Assistant.Chat;
+  space?: Space;
+  chat?: Chat.Chat;
   preset?: AiServicePreset;
-  services?: () => Promise<Runtime.Runtime<AiChatServices>>;
+  runtime?: AutomationCapabilities.ComputeRuntime;
   blueprintRegistry?: Blueprint.Registry;
   settings?: Assistant.Settings;
 };
@@ -27,48 +34,57 @@ export type UseChatProcessorProps = {
  * Configure and create AiChatProcessor.
  */
 export const useChatProcessor = ({
+  space,
   chat,
   preset,
-  services,
+  runtime,
   blueprintRegistry,
   settings,
 }: UseChatProcessorProps): AiChatProcessor | undefined => {
   const observableRegistry = useContext(RegistryContext);
 
-  // Create conversation from chat queue.
-  const [conversation, setConversation] = useState<AiConversation>();
+  const [session, setSession] = useState<AiSession.Session>();
   useAsyncEffect(async () => {
-    if (!chat?.queue.target) {
+    if (!space || !chat) {
       return;
     }
 
-    const conversation = new AiConversation(chat.queue.target as Queue<any>);
-    await conversation.open();
-    setConversation(conversation);
-
+    const feedTarget = chat.feed.target;
+    if (!feedTarget) {
+      return;
+    }
+    const feedServiceLayer = createFeedServiceLayer(space.queues);
+    const runtime = await runAndForwardErrors(
+      Effect.runtime<Feed.FeedService>().pipe(Effect.provide(feedServiceLayer)),
+    );
+    const session = new AiSession.Session({
+      feed: feedTarget,
+      runtime,
+      registry: observableRegistry as Registry.Registry,
+    });
+    await session.open();
+    setSession(session);
     return () => {
-      void conversation.close();
+      void session.close();
+      setSession(undefined);
     };
-  }, [chat?.queue.target]);
+  }, [space, chat?.feed.target]);
+
+  const feed = chat?.feed.target;
 
-  // Create processor.
   const processor = useMemo(() => {
-    if (!services || !conversation) {
+    if (!runtime || !session || !chat || !feed) {
       return undefined;
     }
 
-    log('creating processor', {
-      preset,
-      model: preset?.model,
-      settings,
-    });
-
-    return new AiChatProcessor(conversation, services, {
+    log('creating processor', { preset, model: preset?.model, settings });
+    return new AiChatProcessor(session, runtime, feed, {
+      chat: chat ? Ref.make(chat) : undefined,
       observableRegistry,
       blueprintRegistry,
       model: preset?.model,
     });
-  }, [services, conversation, blueprintRegistry, preset]);
+  }, [runtime, session, blueprintRegistry, preset, feed]);
 
   return processor;
 };

package/src/hooks/useChatServices.ts

@@ -2,47 +2,25 @@
 // Copyright 2025 DXOS.org
 //
 
-import * as Effect from 'effect/Effect';
-import type * as Runtime from 'effect/Runtime';
 import { useMemo } from 'react';
 
-import { useCapability } from '@dxos/app-framework';
-import { type Space } from '@dxos/client/echo';
-import { TracingService } from '@dxos/functions';
+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';
 import { useClient } from '@dxos/react-client';
 
-import { type AiChatServices } from '../processor';
-import { type Assistant } from '../types';
-
 export type UseChatServicesProps = {
-  space?: Space;
-  chat?: Assistant.Chat;
+  id?: Key.SpaceId;
 };
 
 /**
- * Construct service layer.
+ * Resolves the compute runtime for a space.
  */
-// TODO(dmaretskyi): Better return type.
-export const useChatServices = ({
-  space,
-  chat,
-}: UseChatServicesProps): (() => Promise<Runtime.Runtime<AiChatServices>>) | undefined => {
+export const useChatServices = ({ id }: UseChatServicesProps) => {
   const client = useClient();
-  space ??= client.spaces.default;
+  id ??= getPersonalSpace(client)?.id;
 
   const runtimeResolver = useCapability(AutomationCapabilities.ComputeRuntime);
-  return useMemo(() => {
-    const runtime = runtimeResolver.getRuntime(space.id);
-    return () =>
-      runtime.runPromise(
-        Effect.gen(function* () {
-          return yield* Effect.runtime<AiChatServices>().pipe(
-            Effect.provide(
-              chat?.traceQueue?.target ? TracingService.layerQueue(chat.traceQueue?.target) : TracingService.layerNoop,
-            ),
-          );
-        }),
-      );
-  }, [space, chat?.traceQueue?.target]);
+  return useMemo(() => (!id ? undefined : runtimeResolver.getRuntime(id)), [id]);
 };