@dxos/plugin-assistant 0.8.4-main.422d1c7879 → 0.8.4-main.4f23b4e393

package/src/containers/TracePanel/testing/index.ts

@@ -0,0 +1,6 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+export * from './simulated-agent';
+export * from './snapshot-playback';

package/src/containers/TracePanel/testing/simulated-agent.ts

@@ -0,0 +1,114 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import * as Schema from 'effect/Schema';
+
+import { AgentRequestBegin, AgentRequestEnd, CompleteBlock } from '@dxos/assistant';
+import { Process, Trace } from '@dxos/compute';
+import { ObjectId } from '@dxos/keys';
+
+export interface AgentScenario {
+  readonly prompt: string;
+  readonly tools: readonly string[];
+}
+
+/** Probability that any given run aborts with a simulated tool failure. */
+const FAILURE_PROBABILITY = 0.1;
+
+export const agentScenarios: readonly AgentScenario[] = [
+  {
+    prompt: 'Create an organization called "Cyberdyne Systems"',
+    tools: ['list-schemas', 'create-object'],
+  },
+  {
+    prompt: 'Search for all organizations and persons',
+    tools: ['list-schemas', 'query', 'query'],
+  },
+  {
+    prompt: 'Create a person named "John Connor"',
+    tools: ['create-object'],
+  },
+];
+
+const delay = (ms: number) => Effect.promise(() => new Promise<void>((resolve) => setTimeout(resolve, ms)));
+
+/**
+ * Write a trace event and yield to the event loop so FeedTraceSink flushes it to ECHO before continuing.
+ */
+const writeAndFlush = <T>(eventType: Trace.EventType<T>, payload: T) =>
+  Effect.gen(function* () {
+    yield* Trace.write(eventType, payload);
+    yield* Effect.promise(() => new Promise((resolve) => setTimeout(resolve, 100)));
+  });
+
+/**
+ * Storybook fixture: a {@link Process} that emits a deterministic stream of agent trace events
+ * (request begin/end, user message, sequential tool calls with simulated latency).
+ *
+ * Input is a scenario index into {@link agentScenarios} (modulo the array length).
+ */
+export const SimulatedAgent = Process.make(
+  {
+    key: 'org.dxos.testing.process.agent',
+    input: Schema.Number,
+    output: Schema.Void,
+    services: [Trace.TraceService],
+  },
+  (ctx) =>
+    Effect.succeed({
+      onInput: (index: number) =>
+        Effect.gen(function* () {
+          const messageId = ObjectId.random();
+          const scenario = agentScenarios[index % agentScenarios.length];
+
+          // Decide upfront whether this run will fail (and at which tool) so the trace shows a partial sequence.
+          const failAtToolIndex =
+            Math.random() < FAILURE_PROBABILITY ? Math.floor(Math.random() * scenario.tools.length) : -1;
+
+          // Agent begins processing.
+          yield* writeAndFlush(AgentRequestBegin, {});
+
+          // User message.
+          yield* writeAndFlush(CompleteBlock, {
+            messageId,
+            role: 'user',
+            block: { _tag: 'text', text: scenario.prompt },
+          });
+
+          // Simulate tool calls sequentially with delays.
+          for (const [index, toolName] of scenario.tools.entries()) {
+            const toolCallId = ObjectId.random();
+
+            // Tool call event.
+            yield* writeAndFlush(CompleteBlock, {
+              messageId,
+              role: 'assistant',
+              block: { _tag: 'toolCall', toolCallId, name: toolName, input: '{}', providerExecuted: false },
+            });
+
+            // Simulate tool execution time.
+            yield* delay(1_000 + Math.random() * 3_000);
+
+            if (index === failAtToolIndex) {
+              ctx.fail(new Error(`Simulated failure in tool '${toolName}'`));
+              return;
+            }
+
+            // Tool result event.
+            yield* writeAndFlush(CompleteBlock, {
+              messageId,
+              role: 'assistant',
+              block: { _tag: 'toolResult', toolCallId, name: toolName, providerExecuted: false },
+            });
+          }
+
+          // Agent completes.
+          yield* writeAndFlush(AgentRequestEnd, {});
+          ctx.succeed();
+        }).pipe(Effect.orDie),
+      onAlarm: () => Effect.void,
+      onChildEvent: () => Effect.void,
+    }),
+);

package/src/containers/TracePanel/testing/snapshot-playback.ts

@@ -0,0 +1,45 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { type Dispatch, type SetStateAction, useEffect, useRef, useState } from 'react';
+
+/**
+ * Interval (ms) between auto-played trace messages in the snapshot playback story.
+ */
+export const PLAYBACK_INTERVAL_MS = 250;
+
+export const STEP_STORAGE_KEY = 'plugin-assistant.trace-panel.snapshot.step';
+
+/**
+ * `useState<number>` that hydrates from and persists to `localStorage`.
+ * The third tuple member is `true` iff a valid value was loaded on first render.
+ */
+export const useLocalStorageNumber = (
+  key: string,
+  initial: number,
+): [number, Dispatch<SetStateAction<number>>, boolean] => {
+  const initRef = useRef<{ value: number; hydrated: boolean } | null>(null);
+  if (initRef.current === null) {
+    let value = initial;
+    let hydrated = false;
+    if (typeof window !== 'undefined') {
+      const stored = window.localStorage.getItem(key);
+      const parsed = stored === null ? Number.NaN : Number(stored);
+      if (Number.isInteger(parsed) && parsed >= 0) {
+        value = parsed;
+        hydrated = true;
+      }
+    }
+    initRef.current = { value, hydrated };
+  }
+
+  const [value, setValue] = useState(initRef.current.value);
+  useEffect(() => {
+    if (typeof window !== 'undefined') {
+      window.localStorage.setItem(key, String(value));
+    }
+  }, [key, value]);
+
+  return [value, setValue, initRef.current.hydrated];
+};

package/src/containers/TriggerStatus/TriggerStatus.tsx

@@ -7,7 +7,7 @@ import React, { useMemo } from 'react';
 import { AppSurface } from '@dxos/app-toolkit/ui';
 import { type InvocationsState } from '@dxos/functions-runtime';
 import { useTriggerRuntimeControls } from '@dxos/plugin-automation/hooks';
-import { StatusBar } from '@dxos/plugin-status-bar';
+import { StatusBar } from '@dxos/plugin-status-bar/components';
 import { useObject } from '@dxos/react-client/echo';
 import { IconButton, Popover, useTranslation } from '@dxos/react-ui';
 

package/src/containers/index.ts

@@ -4,13 +4,14 @@
 
 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 ChatContainer: ComponentType<any> = lazy(() => import('./ChatContainer'));
 export const ChatDialog: ComponentType<any> = lazy(() => import('./ChatDialog'));
-export const AgentArticle: ComponentType<any> = lazy(() => import('./AgentArticle'));
-export const AgentProperties: ComponentType<any> = lazy(() => import('./AgentProperties'));
-export const PromptArticle: ComponentType<any> = lazy(() => import('./PromptArticle'));
-export const PromptList: ComponentType<any> = lazy(() => import('./PromptList'));
+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/{queue-logger.ts → feed-logger.ts}

@@ -2,62 +2,63 @@
 // 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 { 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 { type InvocationTraceEvent } from '@dxos/functions-runtime';
 import { invariant } from '@dxos/invariant';
 import { QueueSubspaceTags } from '@dxos/keys';
 
-export class QueueLogger implements SequenceLogger {
+export class FeedLogger 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.getQueueDxn(existingFeedRef.target), 'invocationTraceFeed has no 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.getQueueDxn(feed), 'New invocationTraceFeed has no 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.fromDXN(this._getTraceFeedDXN(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,
@@ -68,7 +69,7 @@ export class QueueLogger implements SequenceLogger {
         break;
       case 'step-start':
       case 'step-complete':
-        void this._getTraceEventQueue(event.invocationId).append([
+        void this._appendTraceEvent(event.invocationId, [
           Obj.make(TraceEvent, {
             outcome: event.type,
             truncated: false,
@@ -86,7 +87,7 @@ export class QueueLogger implements SequenceLogger {
         ]);
         break;
       case 'message':
-        void this._getTraceEventQueue(event.invocationId).append([
+        void this._appendTraceEvent(event.invocationId, [
           Obj.make(TraceEvent, {
             outcome: event.type,
             truncated: false,
@@ -104,7 +105,7 @@ export class QueueLogger implements SequenceLogger {
         ]);
         break;
       case 'block':
-        void this._getTraceEventQueue(event.invocationId).append([
+        void this._appendTraceEvent(event.invocationId, [
           Obj.make(TraceEvent, {
             outcome: event.type,
             truncated: false,
@@ -124,12 +125,21 @@ export class QueueLogger implements SequenceLogger {
     }
   }
 
-  private _getTraceQueueDxn(invocationId: string): DXN {
+  private _getTraceFeedDXN(invocationId: string): DXN {
     return DXN.fromQueue(QueueSubspaceTags.TRACE, this._space.id, invocationId);
   }
 
-  private _getTraceEventQueue(invocationId: string): Queue<TraceEvent> {
-    const dxn = this._getTraceQueueDxn(invocationId);
-    return this._space.queues.get(dxn);
+  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,11 +3,13 @@
 //
 
 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';

package/src/hooks/useBlueprintRegistry.ts

@@ -6,8 +6,8 @@ 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 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 } from '@dxos/util';
@@ -44,7 +44,7 @@ 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());
 
   useEffect(() => {
@@ -75,7 +75,7 @@ export const useBlueprintHandlers = ({
   blueprintRegistry,
 }: {
   db: Database.Database;
-  context?: AiContextBinder;
+  context?: AiContext.Binder;
   blueprintRegistry?: Blueprint.Registry;
 }) => {
   const onUpdateBlueprint = useCallback(

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

@@ -8,12 +8,12 @@ import { useContext, useMemo, useState } from 'react';
 
 import { AiSession } from '@dxos/assistant';
 import { type Chat } from '@dxos/assistant-toolkit';
-import { type Blueprint } from '@dxos/blueprints';
+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 AutomationCapabilities } from '@dxos/plugin-automation/types';
+import { type AutomationCapabilities } from '@dxos/plugin-automation';
 import { type Space } from '@dxos/react-client/echo';
 import { useAsyncEffect } from '@dxos/react-ui';
 
@@ -43,7 +43,7 @@ export const useChatProcessor = ({
 }: UseChatProcessorProps): AiChatProcessor | undefined => {
   const observableRegistry = useContext(RegistryContext);
 
-  const [session, setSession] = useState<AiSession>();
+  const [session, setSession] = useState<AiSession.Session>();
   useAsyncEffect(async () => {
     if (!space || !chat) {
       return;
@@ -57,7 +57,7 @@ export const useChatProcessor = ({
     const runtime = await 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,

package/src/hooks/useChatServices.ts

@@ -7,7 +7,7 @@ import { useMemo } from 'react';
 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 { AutomationCapabilities } from '@dxos/plugin-automation';
 import { useClient } from '@dxos/react-client';
 
 export type UseChatServicesProps = {

package/src/hooks/useChatToolbarActions.ts

@@ -16,7 +16,7 @@ import { MenuBuilder, useMenuActions } 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;

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/hooks/useDebug.ts

@@ -0,0 +1,38 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { useCallback } from 'react';
+
+import { trim } from '@dxos/util';
+
+import { type AiChatProcessor } from '../processor';
+
+/**
+ * Returns an async callback that logs the chat's current context, system prompt,
+ * and resolved tools to the browser console under a collapsible group.
+ * Used by the chat's debug-toggle event handler.
+ */
+export const useDebug = ({ processor }: { processor: AiChatProcessor }) => {
+  return useCallback(async () => {
+    const objects = processor.context.getObjects();
+    const blueprints = processor.context.getBlueprints();
+    const system = await processor.getSystemPrompt();
+    const tools = (await processor.getTools()) ?? {};
+    console.group('Chat', { objects, blueprints });
+    try {
+      console.log(trim`
+        System Prompt:
+        ${system}
+      `);
+      console.log(trim`
+        Tools:
+        ${Object.values(tools)
+          .map((tool) => JSON.stringify(tool, null, 2))
+          .join('\n')}
+      `);
+    } finally {
+      console.groupEnd();
+    }
+  }, [processor]);
+};

package/src/index.ts

@@ -3,10 +3,5 @@
 //
 
 export * from './blueprints';
-export * from './components';
-export * from './hooks';
 export * from './meta';
-export * from './translations';
 export * from './types';
-
-export * from './AssistantPlugin';

package/src/operations/create-chat.ts

@@ -5,20 +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 } from '@dxos/blueprints';
+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 { Operation } from '@dxos/operation';
-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);
@@ -58,9 +56,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!),