@dxos/plugin-assistant 0.8.4-main.e8ec1fe → 0.8.4-main.effb148878

package/src/execution-graph/testing/collect-trace-events.ts

@@ -0,0 +1,74 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import * as Cause from 'effect/Cause';
+import * as Context from 'effect/Context';
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
+
+import { Trace } from '@dxos/compute';
+
+/**
+ * Internal tag carrying the monotonic clock created by {@link collectTraceEvents}. Nested
+ * {@link withMeta} scopes read it so every emitted message gets a strictly increasing
+ * timestamp regardless of how many writes happened in the same wall-clock millisecond.
+ */
+class TestClock extends Context.Tag('@dxos/plugin-assistant/CollectTraceEvents/TestClock')<TestClock, () => number>() {}
+
+/**
+ * Runs the given Effect with a mock {@link Trace.TraceService} and {@link Trace.TraceSink}
+ * whose writes accumulate into an in-memory list of {@link Trace.Message}s.
+ *
+ * Each `Trace.write(...)` call inside the effect produces one `Trace.Message` carrying the
+ * meta of the innermost {@link withMeta} scope (or empty meta if none is provided). Useful
+ * for building deterministic span fixtures without spinning up a feed sink.
+ *
+ * Timestamps are produced by an internal monotonic counter so multiple synchronous writes
+ * are ordered in insertion order — wall-clock `Date.now()` would otherwise tie and corrupt
+ * the resulting graph for fast tests.
+ *
+ * The effect is run synchronously; any failure is rethrown so callers don't pay error
+ * boilerplate in tests.
+ */
+export const collectTraceEvents = <A, E>(
+  effect: Effect.Effect<A, E, Trace.TraceService | Trace.TraceSink | TestClock>,
+): Trace.Message[] => {
+  const messages: Trace.Message[] = [];
+  let counter = 0;
+  const clock = () => {
+    counter += 1;
+    return counter;
+  };
+
+  const sinkLayer: Layer.Layer<Trace.TraceSink> = Layer.succeed(Trace.TraceSink, {
+    write: (message) => {
+      messages.push(message);
+    },
+  });
+  const clockLayer: Layer.Layer<TestClock> = Layer.succeed(TestClock, clock);
+  const traceLayer: Layer.Layer<Trace.TraceService> = Trace.testTraceService({ clock }).pipe(Layer.provide(sinkLayer));
+  const layer = Layer.mergeAll(traceLayer, sinkLayer, clockLayer);
+
+  const exit = Effect.runSyncExit(effect.pipe(Effect.provide(layer)));
+  if (exit._tag === 'Failure') {
+    throw new Error(`collectTraceEvents: effect failed\n${Cause.pretty(exit.cause)}`);
+  }
+  return messages;
+};
+
+/**
+ * Wraps an effect so that {@link Trace.write} calls inside it tag their messages with the
+ * given {@link Trace.Meta}. Nested `withMeta` scopes shadow the outer meta for their inner
+ * effect — exactly the pattern needed to fixture multi-process traces (e.g. an agent
+ * process containing nested operation processes).
+ *
+ * Implemented by re-providing a fresh {@link Trace.TraceService} layer over the existing
+ * {@link Trace.TraceSink} and shared monotonic clock, so all messages still flow into the
+ * same accumulator with monotonically increasing timestamps.
+ */
+export const withMeta = <A, E, R>(
+  meta: Trace.Meta,
+  effect: Effect.Effect<A, E, R>,
+): Effect.Effect<A, E, Exclude<R, Trace.TraceService> | Trace.TraceSink | TestClock> =>
+  Effect.flatMap(TestClock, (clock) => Effect.provide(effect, Trace.testTraceService({ meta, clock })));

package/src/execution-graph/testing/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+export { collectTraceEvents, withMeta } from './collect-trace-events';

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/{queue-logger.ts → feed-logger.ts}

@@ -2,48 +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, Key, 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-db';
+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 { type InvocationTraceEvent } from '@dxos/functions-runtime';
 import { invariant } from '@dxos/invariant';
-import { QueueSubspaceTags } from '@dxos/keys';
+import { EchoURI, type ObjectId } 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;
-    let dxn = this._space.properties.invocationTraceQueue?.dxn;
-    if (!dxn) {
-      dxn = DXN.fromQueue(QueueSubspaceTags.TRACE, this._space.id, Key.ObjectId.random());
-      this._space.properties.invocationTraceQueue = Ref.fromDXN(dxn);
+    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;
     }
-    this._invocationTraceQueue = this._space.queues.get(dxn);
   }
 
   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,
@@ -110,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: ObjectId): EchoURI.EchoURI {
+    return EchoURI.make({ spaceId: this._space.id, objectId: invocationId });
+  }
+
+  private _appendToTraceFeed(items: any[]): Promise<void> {
+    return Feed.append(this._invocationTraceFeed, items).pipe(
+      Effect.provide(this._feedServiceLayer),
+      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: ObjectId): Queue<TraceEvent> {
+    const echoUri = this._getTraceQueueEchoId(invocationId);
+    return this._space.queues.get(echoUri);
   }
 }

package/src/hooks/index.ts

@@ -3,13 +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,38 +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 } from '@dxos/app-framework';
-import { useCapabilities } from '@dxos/app-framework/react';
-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]);
@@ -42,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(
@@ -71,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);
@@ -81,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,24 +2,34 @@
 // Copyright 2025 DXOS.org
 //
 
-import { RegistryContext } from '@effect-atom/atom-react';
-import type * as Runtime from 'effect/Runtime';
+import { type Registry, 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 { AiConversation } from '@dxos/assistant';
-import { type Blueprint } from '@dxos/blueprints';
+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, Credential, OperationRegistry, ServiceResolver } from '@dxos/compute';
+import { Database, Feed, Ref } from '@dxos/echo';
+import { createFeedServiceLayer } from '@dxos/echo-db';
+import { runAndForwardErrors } from '@dxos/effect';
+import { AgentService } from '@dxos/functions-runtime';
 import { log } from '@dxos/log';
-import { type Queue, type Space } from '@dxos/react-client/echo';
+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 = {
   space?: Space;
-  chat?: Assistant.Chat;
+  chat?: Chat.Chat;
   preset?: AiServicePreset;
-  services?: () => Promise<Runtime.Runtime<AiChatServices>>;
+  runtime?: Capabilities.ProcessManagerRuntime;
   blueprintRegistry?: Blueprint.Registry;
   settings?: Assistant.Settings;
 };
@@ -31,44 +41,66 @@ 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 (!space || !chat) {
       return;
     }
 
-    // NOTE: Passing in space and getting queue from space rather than resolving the reference.
-    //  This is because if the chat isn't in a space yet, the reference will not be resolvable.
-    const queue = space.queues.get(chat.queue.dxn);
-    const conversation = new AiConversation(queue 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();
-      setConversation(undefined);
+      void session.close();
+      setSession(undefined);
     };
-  }, [space, chat?.queue.dxn.toString()]);
+  }, [space, chat?.feed.target]);
+
+  const feed = chat?.feed.target;
+  const serviceResolver = useCapability(Capabilities.ServiceResolver);
 
-  // Create processor.
   const processor = useMemo(() => {
-    if (!services || !conversation) {
+    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,
+      OperationRegistry.Service,
+      OpaqueToolkit.OpaqueToolkitProvider,
+    ).pipe(Layer.provide(Layer.succeed(ServiceResolver.ServiceResolver, serviceResolver)));
+
     log('creating processor', { preset, model: preset?.model, settings });
-    return new AiChatProcessor(conversation, services, {
+    return new AiChatProcessor(session, runtime, feed, spaceLayer, {
+      chat: chat ? Ref.make(chat) : undefined,
       observableRegistry,
       blueprintRegistry,
       model: preset?.model,
     });
-  }, [services, conversation, blueprintRegistry, preset]);
+  }, [runtime, session, blueprintRegistry, preset, feed, space?.id]);
 
   return processor;
 };