@dxos/plugin-assistant 0.8.4-main.3eb6e50203 → 0.8.4-main.422d1c7879

package/src/processor/index.ts

@@ -4,4 +4,3 @@
 
 export * from './presets';
 export * from './processor';
-export * from './update-name';

package/src/processor/presets.ts

@@ -6,7 +6,7 @@ import * as Schema from 'effect/Schema';
 
 import { type ModelName } from '@dxos/ai';
 
-const ModelProviders = ['dxos-local', 'dxos-remote', 'lm-studio'] as const;
+const ModelProviders = ['dxos-local', 'dxos-remote', 'lm-studio', 'ollama'] as const;
 
 const ModelProvider = Schema.Literal(...ModelProviders);
 type ModelProvider = Schema.Schema.Type<typeof ModelProvider>;
@@ -27,16 +27,24 @@ const createModelLabel = (model: ModelName) => {
 export const AiServicePresets: AiServicePreset[] = [
   {
     provider: 'dxos-remote' as const,
-    model: '@anthropic/claude-opus-4-0' as const,
+    model: '@anthropic/claude-opus-4-6' as const,
   },
   {
     provider: 'dxos-remote' as const,
-    model: '@anthropic/claude-sonnet-4-0' as const,
+    model: '@anthropic/claude-sonnet-4-5' as const,
   },
   {
     provider: 'dxos-remote' as const,
     model: '@anthropic/claude-3-5-haiku-20241022' as const,
   },
+  {
+    provider: 'ollama' as const,
+    model: 'gpt-oss:20b' as const,
+  },
+  {
+    provider: 'ollama' as const,
+    model: 'gemma4:latest' as const,
+  },
   {
     provider: 'lm-studio' as const,
     model: '@google/gemma-3-27b' as const,

package/src/processor/processor.test.ts

@@ -2,71 +2,39 @@
 // Copyright 2025 DXOS.org
 //
 
-import * as Tool from '@effect/ai/Tool';
-import * as Toolkit from '@effect/ai/Toolkit';
 import { describe, it } from '@effect/vitest';
 import * as Effect from 'effect/Effect';
-import * as Layer from 'effect/Layer';
-import * as Schema from 'effect/Schema';
+import * as ManagedRuntime from 'effect/ManagedRuntime';
 
-import { AiService } from '@dxos/ai';
-import { AiServiceTestingPreset } from '@dxos/ai/testing';
-import { AiConversation, GenericToolkit, ToolExecutionServices } from '@dxos/assistant';
+import { AiSession } from '@dxos/assistant';
+import { Chat } from '@dxos/assistant-toolkit';
+import { AssistantTestLayer } from '@dxos/assistant/testing';
+import { Database, Feed } from '@dxos/echo';
 import { acquireReleaseResource } from '@dxos/effect';
 import { TestHelpers } from '@dxos/effect/testing';
-import { CredentialsService, QueueService, TracingService } from '@dxos/functions';
-import { FunctionInvocationServiceLayerTestMocked, TestDatabaseLayer } from '@dxos/functions-runtime/testing';
-import { type Message } from '@dxos/types';
 
-import { AiChatProcessor, type AiChatServices } from './processor';
+import { AiChatProcessor } from './processor';
 
-const TestToolkit = Toolkit.make(
-  Tool.make('random', {
-    description: 'Random number generator',
-    parameters: {},
-    success: Schema.Number,
-  }),
-);
+const TestLayer = AssistantTestLayer({ tracing: 'noop', types: [Chat.Chat, Feed.Feed] });
 
-// TODO(burdon): Explain structure.
-const TestServicesLayer = Layer.mergeAll(
-  TracingService.layerNoop,
-  AiServiceTestingPreset('direct'),
-  TestDatabaseLayer({
-    // indexing: { vector: true },
-    // types: [],
-  }),
-  // CredentialsService.configuredLayer([{ service: 'exa.ai', apiKey: EXA_API_KEY }]),
-  FunctionInvocationServiceLayerTestMocked({ functions: [] }).pipe(Layer.provideMerge(TracingService.layerNoop)),
-);
-
-const TestLayer: Layer.Layer<AiChatServices, never, never> = Layer.mergeAll(
-  AiService.model('@anthropic/claude-opus-4-0'),
-  ToolExecutionServices,
-  CredentialsService.layerFromDatabase(),
-).pipe(
-  Layer.provideMerge(GenericToolkit.providerLayer(GenericToolkit.make(TestToolkit, TestToolkit.toLayer({} as any)))),
-  Layer.provideMerge(TestServicesLayer),
-  Layer.orDie,
-);
-
-// TODO(burdon): Create actual test with mock LLM.
 describe('Chat processor', () => {
   it.scoped(
     'basic',
     Effect.fn(
       function* ({ expect }) {
-        const services = yield* Effect.runtime<AiChatServices>();
-        const queue = yield* QueueService.createQueue<Message.Message>();
-        const conversation = yield* acquireReleaseResource(() => new AiConversation({ queue }));
-        const processor = new AiChatProcessor(conversation, async () => services);
-        const result = yield* Effect.promise(() => processor.request({ message: 'Hello' }));
-        void processor.cancel();
-        expect(processor.active).to.be.false;
-        expect(result).to.exist;
+        const feed = Feed.make();
+        yield* Database.add(feed);
+        const runtime = yield* Effect.runtime<Feed.FeedService>();
+        const session = yield* acquireReleaseResource(() => new AiSession({ feed, runtime }));
+        const managedRuntime = ManagedRuntime.make(
+          Effect.runSync(Effect.map(Effect.context<never>(), () => undefined as any)) as any,
+        );
+        const processor = new AiChatProcessor(session, managedRuntime as any, feed);
+        expect(processor).toBeDefined();
+        expect(processor.active).toBeDefined();
       },
       Effect.provide(TestLayer),
-      TestHelpers.taggedTest('llm'),
+      TestHelpers.provideTestContext,
     ),
   );
 });

package/src/processor/processor.ts

@@ -2,71 +2,68 @@
 // Copyright 2025 DXOS.org
 //
 
-import type * as Tool from '@effect/ai/Tool';
 import { Atom, Registry } from '@effect-atom/atom-react';
-import * as Cause from 'effect/Cause';
 import * as Effect from 'effect/Effect';
-import * as Exit from 'effect/Exit';
 import * as Fiber from 'effect/Fiber';
 import * as Option from 'effect/Option';
-import * as Runtime from 'effect/Runtime';
+import * as Stream from 'effect/Stream';
 
-import {
-  AiService,
-  DEFAULT_EDGE_MODEL,
-  type ModelName,
-  type ModelRegistry,
-  type ToolExecutionService,
-  type ToolResolverService,
-} from '@dxos/ai';
+import { type AiService, DEFAULT_EDGE_MODEL, type ModelName, type ModelRegistry } from '@dxos/ai';
 import {
   AiContextService,
-  type AiConversation,
-  type AiConversationRunProps,
-  ArtifactDiffResolver,
-  GenerationObserver,
+  type AiSession,
   createSystemPrompt,
+  formatSystemPrompt,
+  AgentService,
+  PartialBlock,
+  ToolExecutionServices,
 } from '@dxos/assistant';
-import { formatSystemPrompt } from '@dxos/assistant';
 import { type Chat } from '@dxos/assistant-toolkit';
 import { type Blueprint } from '@dxos/blueprints';
-import { Obj } from '@dxos/echo';
-import { type Database } from '@dxos/echo';
-import { runAndForwardErrors, throwCause, unwrapExit } from '@dxos/effect';
-import {
-  type CredentialsService,
-  type FunctionInvocationService,
-  type QueueService,
-  type TracingService,
-} from '@dxos/functions';
+import { type Database, Feed, Obj, Ref } from '@dxos/echo';
+import { runAndForwardErrors, unwrapExit } from '@dxos/effect';
+import { Trace, type CredentialsService, type QueueService } from '@dxos/functions';
 import { log } from '@dxos/log';
-import { type ContentBlock, Message } from '@dxos/types';
+import { Operation } from '@dxos/operation';
+import type { AutomationCapabilities } from '@dxos/plugin-automation/types';
+import { Message } from '@dxos/types';
 
-import { updateName } from './update-name';
+import { UpdateChatName } from '../operations/definitions';
 
+/**
+ * @deprecated Services type for the old direct-conversation processor path.
+ * Retained for backward compatibility with CLI and update-name.
+ */
 export type AiChatServices =
   | CredentialsService
   | Database.Service
   | QueueService
-  | FunctionInvocationService
   | AiService.AiService
-  | ToolExecutionService
-  | ToolResolverService
-  | TracingService;
+  | Trace.TraceService;
 
 export type AiChatProcessorOptions = {
   model?: ModelName;
   modelRegistry?: ModelRegistry;
   blueprintRegistry?: Blueprint.Registry;
   observableRegistry?: Registry.Registry;
-  extensions?: ToolContextExtensions;
-} & Pick<AiConversationRunProps, 'system'>;
+  /**
+   * For tracing.
+   */
+  chat?: Ref.Ref<Chat.Chat>;
+  system?: string;
+  /**
+   * Probability of automatically updating chat name after each request.
+   * Chat name is always updated if it has no name.
+   * @default 0.1 (10%)
+   */
+  autoUpdateNameChance?: number;
+};
 
 const defaultOptions: Partial<AiChatProcessorOptions> = {
   model: DEFAULT_EDGE_MODEL,
+  autoUpdateNameChance: 0.1,
 };
 
-// TODO(burdon): Retry, timeout?
 export type AiRequestOptions = {};
 
 export type AiRequest = {
@@ -76,55 +73,45 @@ export type AiRequest = {
 
 /**
  * Handles interactions with the AI service.
- * Handles streaming responses from the conversation.
+ * Uses AgentService to spawn a process-backed agent and subscribes to ephemeral trace events for streaming.
  */
 export class AiChatProcessor {
-  private readonly _registry: Registry.Registry;
+  readonly #registry: Registry.Registry;
 
-  /** External observer. */
-  private readonly _observer: GenerationObserver;
+  /** Pending messages (finalized, non-streaming). */
+  readonly #pending = Atom.make<Message.Message[]>([]);
 
-  /** Pending messages (incl. the current user request). */
-  private readonly _pending = Atom.make<Message.Message[]>([]);
+  /** Currently streaming messages (from ephemeral trace events). */
+  readonly #streaming = Atom.make<Message.Message[]>([]);
 
-  /** Currently streaming message (from the AI service). */
-  private readonly _streaming = Atom.make<Option.Option<Message.Message>>(Option.none());
+  /** Set of message IDs that have been finalized (non-pending delivered via ephemeral). */
+  readonly #finalizedIds = new Set<string>();
 
   /** Currently active request fiber. */
-  private _fiber: Fiber.Fiber<void, any> | undefined;
+  #requestFiber: Fiber.RuntimeFiber<void, unknown> | undefined;
 
   /** Last request (for retries). */
-  private _lastRequest: AiRequest | undefined;
+  #lastRequest: AiRequest | undefined;
 
   /** Streaming state. */
-  public readonly streaming = Atom.make<boolean>((get) => Option.isSome(get(this._streaming)));
+  public readonly streaming = Atom.make<boolean>((get) => get(this.#streaming).length > 0);
 
   /** Active state. */
   public readonly active = Atom.make(false);
 
   /** Array of Messages (incl. the current message being streamed). */
-  public readonly messages = Atom.make<Message.Message[]>((get) =>
-    Option.match(get(this._streaming), {
-      onNone: () => get(this._pending),
-      onSome: (streaming) => [...get(this._pending), streaming],
-    }),
-  );
+  public readonly messages = Atom.make<Message.Message[]>((get) => [...get(this.#pending), ...get(this.#streaming)]);
 
   /** Last error. */
   public readonly error = Atom.make<Option.Option<Error>>(Option.none());
 
   constructor(
-    private readonly _conversation: AiConversation,
-    // TODO(dmaretskyi): Replace this with effect's ManagedRuntime wrapping this layer.
-    private readonly _services: () => Promise<Runtime.Runtime<AiChatServices>>,
+    private readonly _conversation: AiSession,
+    private readonly _runtime: AutomationCapabilities.ComputeRuntime,
+    private readonly _feed: Feed.Feed,
     private readonly _options: AiChatProcessorOptions = defaultOptions,
   ) {
-    // Initialize registries and defaults before using in other logic.
-    this._registry = this._options.observableRegistry ?? Registry.make();
-    this._observer = GenerationObserver.make({
-      onBlock: this._onBlock,
-      onMessage: this._onMessage,
-    });
+    this.#registry = this._options.observableRegistry ?? Registry.make();
     if (this._options.model && !this._options.system) {
       const capabilities = this._options.modelRegistry?.getCapabilities(this._options.model) ?? {};
       this._options.system = createSystemPrompt(capabilities);
@@ -147,72 +134,83 @@ export class AiChatProcessor {
     return this._options.system ?? '';
   }
 
-  async getTools(): Promise<Record<string, Tool.Any>> {
-    return unwrapExit(await this._conversation.getTools().pipe(await Runtime.runPromiseExit(await this._services())));
+  async getTools(): Promise<Record<string, any>> {
+    return this._runtime.runPromise(Effect.provide(this._conversation.getTools(), ToolExecutionServices));
   }
 
   async getSystemPrompt(): Promise<string> {
-    return unwrapExit(
-      await Effect.gen(this, function* () {
+    return this._runtime.runPromise(
+      Effect.gen(this, function* () {
         const blueprints = this.context.getBlueprints();
         const objects = this.context.getObjects();
-        const system = yield* formatSystemPrompt({ system: this._options.system, blueprints, objects });
-        return system;
-      }).pipe(
-        Effect.provideService(AiContextService, {
-          binder: this.context,
-        }),
-        await Runtime.runPromiseExit(await this._services()),
-      ),
+        return yield* formatSystemPrompt({ system: this._options.system, blueprints, objects });
+      }).pipe(Effect.provideService(AiContextService, { binder: this.context }), Effect.orDie),
     );
   }
 
   /**
-   * Initiates a new request.
+   * Initiates a new request via AgentService.
    */
   async request(requestProp: AiRequest): Promise<void> {
-    if (this._fiber) {
+    if (this.#requestFiber) {
       await this.cancel();
     }
 
     try {
-      this._lastRequest = requestProp;
-      this._registry.set(this.error, Option.none());
-      this._registry.set(this.active, true);
+      this.#lastRequest = requestProp;
+      this.#registry.set(this.error, Option.none());
+      this.#registry.set(this.active, true);
+
+      const effect = Effect.gen(this, function* () {
+        // NOTE: Gets or creates a session for the feed.
+        log.info('init agent session', { feed: Obj.getDXN(this._feed).toString(), model: this._options.model });
+        const session = yield* AgentService.getSession(this._feed, { model: this._options.model });
+        const ephemeralStream = session.subscribeEphemeral();
+        yield* ephemeralStream.pipe(
+          Stream.runForEach((message) =>
+            Effect.sync(() => {
+              for (const event of message.events) {
+                if (Trace.isOfType(PartialBlock, event)) {
+                  this.#handleEphemeralMessage(event.data);
+                }
+              }
+            }),
+          ),
+          Effect.fork,
+        );
+
+        log('chat processor submitting prompt', { length: requestProp.message.length });
+        yield* session.submitPrompt(requestProp.message);
+        log('chat processor submitPrompt returned, waiting for agent', {});
+        yield* session.waitForCompletion();
+        log.info('session complete');
 
-      const services = await this._services();
+        this.#flushStreaming();
 
-      // Create request.
-      const request = this._conversation.createRequest({
-        system: this._options.system,
-        prompt: requestProp.message,
-        observer: this._observer,
+        yield* this.#maybeUpdateChatName();
       });
 
-      // Create fiber.
-      this._fiber = request.pipe(
-        Effect.provide(AiService.model(this._options.model ?? DEFAULT_EDGE_MODEL)),
-        // TODO(dmaretskyi): Move ArtifactDiffResolver upstream.
-        Effect.provideService(ArtifactDiffResolver, this._artifactDiffResolver),
-        Effect.asVoid,
-        Runtime.runFork(services), // Runs in the background.
-      );
-
-      // Execute request.
-      const response = await this._fiber.pipe(Fiber.join, Effect.runPromiseExit);
-      if (!Exit.isSuccess(response) && !Cause.isInterruptedOnly(response.cause)) {
-        throwCause(response.cause);
+      this.#requestFiber = this._runtime.runFork(effect);
+
+      try {
+        await this._runtime.runPromise(Fiber.join(this.#requestFiber));
+      } catch (err: any) {
+        if (err._tag === 'InterruptedException' || err.message?.includes('interrupted')) {
+          return;
+        }
+        throw err;
       }
 
-      this._registry.set(this.error, Option.none());
-      this._lastRequest = undefined;
-      this._fiber = undefined;
+      this.#registry.set(this.error, Option.none());
+      this.#lastRequest = undefined;
+      this.#requestFiber = undefined;
     } catch (err) {
       log.error('request failed', { error: err });
-      this._registry.set(this.error, Option.some(new Error('AI service error', { cause: err })));
+      this.#registry.set(this.error, Option.some(new Error('AI service error', { cause: err })));
     } finally {
-      this._registry.set(this.active, false);
-      this._fiber = undefined;
+      log.info('setting active to false');
+      this.#registry.set(this.active, false);
+      this.#requestFiber = undefined;
     }
   }
 
@@ -222,22 +220,22 @@ export class AiChatProcessor {
   async cancel(): Promise<void> {
     await runAndForwardErrors(
       Effect.gen(this, function* () {
-        if (this._fiber) {
-          yield* this._fiber.pipe(Fiber.interrupt);
+        if (this.#requestFiber) {
+          yield* Fiber.interrupt(this.#requestFiber);
         }
       }),
     );
 
-    this._fiber = undefined;
-    this._registry.set(this.active, false);
+    this.#requestFiber = undefined;
+    this.#registry.set(this.active, false);
   }
 
   /**
    * Retry last failed request.
    */
   async retry(): Promise<void> {
-    if (this._lastRequest) {
-      return this.request(this._lastRequest);
+    if (this.#lastRequest) {
+      return this.request(this.#lastRequest);
     }
   }
 
@@ -245,57 +243,79 @@ export class AiChatProcessor {
    * Update the current chat's name.
    */
   async updateName(chat: Chat.Chat): Promise<void> {
-    const runtime = await this._services();
-    await updateName(runtime, this._conversation, chat, this._options.model);
+    unwrapExit(await this._runtime.runPromiseExit(Operation.invoke(UpdateChatName, { chat })));
   }
 
-  // TODO(burdon): Fix/factor out.
-  private _artifactDiffResolver: ArtifactDiffResolver.Service = {
-    resolve: async (_artifacts) => {
-      const versions = new Map();
-      // await Promise.all(
-      //   artifacts.map(async (artifact) => {
-      //     const {
-      //       objects: [object],
-      //     } = await space.db.query(Filter.id(artifact.id)).run();
-      //     if (!object) {
-      //       return;
-      //     }
-
-      //     versions.set(artifact.id, {
-      //       version: getVersion(object),
-      //       diff: `Current state: ${JSON.stringify(object)}`,
-      //     });
-      //   }),
-      // );
-
-      return versions;
-    },
-  };
-
-  private _onMessage = Effect.fn(
-    function* (this: AiChatProcessor, message: Message.Message) {
-      this._registry.set(this._streaming, Option.none());
-      this._registry.update(this._pending, (pending) => [...pending, message]);
-    }.bind(this),
-  );
-
-  private _onBlock = Effect.fn(
-    function* (this: AiChatProcessor, block: ContentBlock.Any) {
-      this._registry.update(this._streaming, (streaming) => {
-        const blocks = streaming.pipe(
-          Option.map((streaming) => streaming.blocks.filter((b: ContentBlock.Any) => !b.pending)),
-          Option.getOrElse(() => []),
-        );
+  /**
+   * Handles an ephemeral message from the agent process.
+   * Both pending and completed blocks arrive here. Completed blocks are deduped
+   * against messages already written to the feed queue to handle the race between
+   * ephemeral delivery and feed replication.
+   */
+  #handleEphemeralMessage(event: Trace.PayloadType<typeof PartialBlock>) {
+    const isPending = event.block.pending;
+    const message = Obj.make(Message.Message, {
+      id: event.messageId,
+      created: new Date().toISOString(),
+      sender: { role: event.role },
+      blocks: [event.block],
+    });
 
-        return Option.some(
-          Obj.make(Message.Message, {
-            created: new Date().toISOString(),
-            sender: { role: 'assistant' },
-            blocks: [...blocks, block],
-          }),
-        );
+    if (isPending) {
+      if (this.#finalizedIds.has(event.messageId)) {
+        return;
+      }
+      this.#registry.update(this.#streaming, (streaming) => {
+        const idx = streaming.findIndex((existing) => existing.id === event.messageId);
+        if (idx >= 0) {
+          const updated = [...streaming];
+          updated[idx] = message;
+          return updated;
+        }
+        return [...streaming, message];
       });
-    }.bind(this),
-  );
+    } else {
+      this.#finalizedIds.add(event.messageId);
+      this.#registry.update(this.#streaming, (streaming) => streaming.filter((existing) => existing.id !== message.id));
+      this.#registry.update(this.#pending, (pending) => {
+        if (pending.some((existing) => existing.id === message.id)) {
+          return pending;
+        }
+        return [...pending, message];
+      });
+    }
+  }
+
+  /**
+   * Move remaining streaming messages to pending (called when agent completes).
+   */
+  #flushStreaming() {
+    const remaining = this.#registry.get(this.#streaming);
+    if (remaining.length > 0) {
+      this.#registry.update(this.#pending, (pending) => [...pending, ...remaining]);
+      this.#registry.set(this.#streaming, []);
+    }
+    this.#finalizedIds.clear();
+  }
+
+  /**
+   * Conditionally schedule chat name update in detached fork mode.
+   * Updates if chat has no name OR based on random chance (default 10%).
+   */
+  #maybeUpdateChatName(): Effect.Effect<void, never, Operation.Service> {
+    const chat = this._options.chat?.target;
+    if (!chat) {
+      return Effect.void;
+    }
+
+    const chance = this._options.autoUpdateNameChance ?? defaultOptions.autoUpdateNameChance ?? 0.1;
+    const shouldUpdate = !chat.name || Math.random() < chance;
+    if (!shouldUpdate) {
+      return Effect.void;
+    }
+
+    // TODO(dmaretskyi): Operation.schedule didn't work.
+    log.info('scheduling chat name update', { hasName: !!chat.name, chance });
+    return Operation.schedule(UpdateChatName, { chat });
+  }
 }

package/src/queue-logger.ts

@@ -4,7 +4,7 @@
 
 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 { DXN, Feed, Obj } from '@dxos/echo';
 import { InvocationTraceEndEvent, InvocationTraceEventType, InvocationTraceStartEvent } from '@dxos/functions-runtime';
 import { TraceEvent } from '@dxos/functions-runtime';
 import { InvocationOutcome } from '@dxos/functions-runtime';
@@ -20,15 +20,26 @@ export class QueueLogger implements SequenceLogger {
     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());
-      const newDxn = dxn;
-      Obj.change(this._space.properties, (p) => {
-        p.invocationTraceQueue = Ref.fromDXN(newDxn);
+
+    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.
+      invariant(existingFeedRef.target, 'invocationTraceFeed reference is not yet loaded');
+      queueDxn = Feed.getQueueDxn(existingFeedRef.target) ?? undefined;
+      invariant(queueDxn, 'invocationTraceFeed has no queue DXN');
+    } 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) => {
+        obj.invocationTraceFeed = Ref.make(feed);
       });
     }
-    this._invocationTraceQueue = this._space.queues.get(dxn);
+
+    this._invocationTraceQueue = this._space.queues.get(queueDxn);
   }
 
   log(event: SequenceEvent) {