@dxos/assistant 0.8.4-main.fd6878d → 0.8.4-main.fffef41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/assistant",
-  "version": "0.8.4-main.fd6878d",
+  "version": "0.8.4-main.fffef41",
   "description": "Natural language interface to DXOS",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -38,40 +38,38 @@
     "src"
   ],
   "dependencies": {
-    "@effect/ai": "0.25.2",
-    "@effect/ai-anthropic": "^0.15.1",
-    "@effect/platform": "^0.90.2",
-    "@effect/platform-node": "^0.95.0",
-    "@preact/signals-core": "^1.9.0",
+    "@automerge/automerge": "3.1.2",
+    "@effect/ai": "0.29.1",
+    "@effect/experimental": "0.56.0",
+    "@effect/platform": "^0.92.1",
+    "@preact/signals-core": "^1.12.1",
     "@xenova/transformers": "^2.17.2",
-    "chalk": "^4.1.0",
-    "handlebars": "4.7.8",
     "lodash.defaultsdeep": "^4.6.1",
-    "@dxos/async": "0.8.4-main.fd6878d",
-    "@dxos/context": "0.8.4-main.fd6878d",
-    "@dxos/blueprints": "0.8.4-main.fd6878d",
-    "@dxos/debug": "0.8.4-main.fd6878d",
-    "@dxos/echo-db": "0.8.4-main.fd6878d",
-    "@dxos/echo": "0.8.4-main.fd6878d",
-    "@dxos/echo-protocol": "0.8.4-main.fd6878d",
-    "@dxos/echo-schema": "0.8.4-main.fd6878d",
-    "@dxos/errors": "0.8.4-main.fd6878d",
-    "@dxos/functions": "0.8.4-main.fd6878d",
-    "@dxos/effect": "0.8.4-main.fd6878d",
-    "@dxos/invariant": "0.8.4-main.fd6878d",
-    "@dxos/graph": "0.8.4-main.fd6878d",
-    "@dxos/ai": "0.8.4-main.fd6878d",
-    "@dxos/keys": "0.8.4-main.fd6878d",
-    "@dxos/log": "0.8.4-main.fd6878d",
-    "@dxos/node-std": "0.8.4-main.fd6878d",
-    "@dxos/schema": "0.8.4-main.fd6878d",
-    "@dxos/util": "0.8.4-main.fd6878d",
-    "@dxos/live-object": "0.8.4-main.fd6878d"
+    "@dxos/ai": "0.8.4-main.fffef41",
+    "@dxos/async": "0.8.4-main.fffef41",
+    "@dxos/blueprints": "0.8.4-main.fffef41",
+    "@dxos/echo": "0.8.4-main.fffef41",
+    "@dxos/debug": "0.8.4-main.fffef41",
+    "@dxos/echo-db": "0.8.4-main.fffef41",
+    "@dxos/echo-protocol": "0.8.4-main.fffef41",
+    "@dxos/context": "0.8.4-main.fffef41",
+    "@dxos/effect": "0.8.4-main.fffef41",
+    "@dxos/errors": "0.8.4-main.fffef41",
+    "@dxos/functions": "0.8.4-main.fffef41",
+    "@dxos/functions-runtime": "0.8.4-main.fffef41",
+    "@dxos/graph": "0.8.4-main.fffef41",
+    "@dxos/invariant": "0.8.4-main.fffef41",
+    "@dxos/keys": "0.8.4-main.fffef41",
+    "@dxos/live-object": "0.8.4-main.fffef41",
+    "@dxos/node-std": "0.8.4-main.fffef41",
+    "@dxos/schema": "0.8.4-main.fffef41",
+    "@dxos/log": "0.8.4-main.fffef41",
+    "@dxos/types": "0.8.4-main.fffef41",
+    "@dxos/util": "0.8.4-main.fffef41"
   },
   "devDependencies": {
     "@types/lodash.defaultsdeep": "^4.6.6",
-    "effect": "3.17.7",
-    "inquirer": "^12.0.0"
+    "effect": "3.18.3"
   },
   "peerDependencies": {
     "effect": "^3.13.3"
@@ -81,6 +79,6 @@
   },
   "beast": {},
   "scripts": {
-    "run:chat": "tsx ./bin/chat.ts"
+    "run:chat": "vite-node ./bin/chat.ts"
   }
 }

package/src/conversation/context.ts

@@ -3,18 +3,22 @@
 //
 
 import { type ReadonlySignal, computed } from '@preact/signals-core';
-import { Schema } from 'effect';
-import { Array, pipe } from 'effect';
+import * as Array from 'effect/Array';
+import * as Context from 'effect/Context';
+import * as Function from 'effect/Function';
+import * as Schema from 'effect/Schema';
 
 import { Blueprint } from '@dxos/blueprints';
-import { Obj, type Ref, type Relation, Type } from '@dxos/echo';
+import { Resource } from '@dxos/context';
+import { DXN, Filter, Obj, Query, type Ref, type Relation, Type } from '@dxos/echo';
 import { type Queue } from '@dxos/echo-db';
+import { invariant } from '@dxos/invariant';
 import { ComplexSet } from '@dxos/util';
 
 /**
  * Thread message that binds or unbinds contextual objects to a conversation.
  */
-// TODO(burdon): Move to @dxos/schema ContentBlock.
+// TODO(burdon): Move to @dxos/schema ContentBlock?
 export const ContextBinding = Schema.Struct({
   blueprints: Schema.Struct({
     added: Schema.Array(Type.Ref(Blueprint.Blueprint)),
@@ -42,7 +46,8 @@ export type BindingProps = Partial<{
 
 export class Bindings {
   readonly blueprints = new ComplexSet<Ref.Ref<Blueprint.Blueprint>>((ref) => ref.dxn.toString());
-  readonly objects = new ComplexSet<Ref.Ref<Type.Expando>>((ref) => ref.dxn.toString());
+  // TODO(burdon): Some DXNs have the Space prefix so only compare the object ID.
+  readonly objects = new ComplexSet<Ref.Ref<Type.Expando>>((ref) => ref.dxn.asEchoDXN()?.echoId);
 
   toJSON() {
     return {
@@ -55,43 +60,78 @@ export class Bindings {
 /**
  * Manages bindings of blueprints and objects to a conversation.
  */
-export class AiContextBinder {
+// TODO(burdon): Context should manage ephemeral state of bindings until prompt is issued?
+export class AiContextBinder extends Resource {
   /**
    * Reactive query of all bindings.
    */
   // TODO(burdon): Cache value?
-  readonly bindings: ReadonlySignal<Bindings> = computed(() => this._reduce(this._queue.objects));
+  private _bindings?: ReadonlySignal<Bindings>;
+  private _blueprints?: ReadonlySignal<Ref.Ref<Blueprint.Blueprint>[]>;
+  private _objects?: ReadonlySignal<Ref.Ref<Type.Expando>[]>;
 
-  readonly blueprints: ReadonlySignal<Ref.Ref<Blueprint.Blueprint>[]> = computed(() => [
-    ...this.bindings.value.blueprints,
-  ]);
+  constructor(private readonly _queue: Queue) {
+    super();
+  }
+
+  get bindings() {
+    invariant(this._bindings, 'AiContextBinder not open');
+    return this._bindings;
+  }
 
-  readonly objects: ReadonlySignal<Ref.Ref<Type.Expando>[]> = computed(() => [...this.bindings.value.objects]);
+  get blueprints() {
+    invariant(this._blueprints, 'AiContextBinder not open');
+    return this._blueprints;
+  }
 
-  constructor(private readonly _queue: Queue) {}
+  get objects() {
+    invariant(this._objects, 'AiContextBinder not open');
+    return this._objects;
+  }
+
+  // TODO(wittjosiah): Use parent context?
+  protected override async _open(): Promise<void> {
+    const query = this._queue.query(Query.select(Filter.everything()));
+    this._ctx.onDispose(query.subscribe(() => {}));
+    this._bindings = computed(() => this._reduce(query.objects));
+    this._blueprints = computed(() => [...this.bindings.value.blueprints]);
+    this._objects = computed(() => [...this.bindings.value.objects]);
+  }
+
+  protected override async _close(): Promise<void> {
+    this._bindings = undefined;
+    this._blueprints = undefined;
+    this._objects = undefined;
+  }
 
   /**
    * Asynchronous query of all bindings.
    */
   async query(): Promise<Bindings> {
-    const queueItems = await this._queue.queryObjects();
-    return this._reduce(queueItems);
+    const { objects } = await this._queue.query(Query.select(Filter.everything())).run();
+    return this._reduce(objects);
   }
 
   // TODO(burdon): Pass in Blueprint obj (from registry?) and create reference.
   async bind(props: BindingProps): Promise<void> {
-    if (!props.blueprints?.length && !props.objects?.length) {
+    const blueprints =
+      props.blueprints?.filter((ref) => !this.blueprints.peek().find((b) => b.dxn.toString() === ref.dxn.toString())) ??
+      [];
+    const objects =
+      props.objects?.filter((ref) => !this.objects.peek().find((o) => o.dxn.toString() === ref.dxn.toString())) ?? [];
+
+    if (!blueprints.length && !objects.length) {
       return;
     }
 
     await this._queue.append([
       Obj.make(ContextBinding, {
         blueprints: {
-          added: props.blueprints ?? [],
+          added: blueprints,
           removed: [],
         },
         objects: {
-          added: props.objects ?? [],
+          added: objects,
           removed: [],
         },
       }),
@@ -118,16 +158,29 @@ export class AiContextBinder {
   }
 
   private _reduce(items: (Obj.Any | Relation.Any)[]): Bindings {
-    return pipe(
+    return Function.pipe(
       items,
       Array.filter(Obj.instanceOf(ContextBinding)),
       Array.reduce(new Bindings(), (context, item) => {
-        item.blueprints.removed.forEach((item) => context.blueprints.delete(item));
-        item.blueprints.added.forEach((item) => context.blueprints.add(item));
-        item.objects.removed.forEach((item) => context.objects.delete(item));
-        item.objects.added.forEach((item) => context.objects.add(item));
+        item.blueprints.removed.forEach((ref) => context.blueprints.delete(ref));
+        item.blueprints.added.forEach((ref) => context.blueprints.add(ref));
+        item.objects.removed.forEach((ref) => {
+          for (const obj of context.objects) {
+            if (DXN.equalsEchoId(obj.dxn, ref.dxn)) {
+              context.objects.delete(obj);
+            }
+          }
+        });
+        item.objects.added.forEach((ref) => context.objects.add(ref));
         return context;
       }),
     );
   }
 }
+
+export class AiContextService extends Context.Tag('@dxos/assistant/AiContextService')<
+  AiContextService,
+  {
+    binder: AiContextBinder;
+  }
+>() {}

package/src/conversation/conversation.ts

@@ -2,124 +2,127 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type AiError, type AiLanguageModel, type AiTool, type AiToolkit } from '@effect/ai';
-import { Effect } from 'effect';
+import type * as Toolkit from '@effect/ai/Toolkit';
+import * as Array from 'effect/Array';
+import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
 
-import {
-  type AiInputPreprocessingError,
-  type AiToolNotFoundError,
-  type ToolExecutionService,
-  type ToolResolverService,
-} from '@dxos/ai';
-import { Event } from '@dxos/async';
+import { Resource } from '@dxos/context';
 import { Obj } from '@dxos/echo';
 import { type Queue } from '@dxos/echo-db';
-import { DatabaseService } from '@dxos/functions';
+import { DatabaseService } from '@dxos/echo-db';
 import { log } from '@dxos/log';
-import { DataType } from '@dxos/schema';
+import { Message } from '@dxos/types';
 
-import { type AiAssistantError } from '../errors';
-import { AiSession, type GenerationObserver } from '../session';
+import {
+  AiSession,
+  type AiSessionRunError,
+  type AiSessionRunRequirements,
+  type GenerationObserver,
+  createToolkit,
+} from '../session';
 
-import { AiContextBinder, type ContextBinding } from './context';
+import { AiContextBinder, AiContextService, type ContextBinding } from './context';
 
-export interface AiConversationRunParams<Tools extends AiTool.Any> {
+export interface AiConversationRunParams {
   prompt: string;
   system?: string;
-  toolkit?: AiToolkit.AiToolkit<Tools>;
   observer?: GenerationObserver;
-
-  /**
-   * @deprecated Remove
-   */
-  session?: AiSession;
 }
 
-export type AiConversationOptions = {
-  queue: Queue<DataType.Message | ContextBinding>;
-};
-
 /**
- * Persistent conversation state.
- * Context + history + artifacts.
- * Backed by a Queue.
+ * Durable conversation state (initiated by users and agents) backed by a Queue.
+ * Executes tools based on AI responses and supports cancellation of in-progress requests.
  */
-export class AiConversation {
-  private readonly _queue: Queue<DataType.Message | ContextBinding>;
+export class AiConversation extends Resource {
+  /**
+   * Message and binding queue.
+   */
+  private readonly _queue: Queue<Message.Message | ContextBinding>;
 
   /**
    * Blueprints bound to the conversation.
    */
-  public readonly _context: AiContextBinder;
+  private readonly _context: AiContextBinder;
 
   /**
-   * Fired when the execution loop begins.
-   * This is called before the first message is sent.
-   *
-   * @deprecated Pass in a session instead.
+   * Toolkit from the current session request.
    */
-  // TODO(burdon): Is this still deprecated?
-  public readonly onBegin = new Event<AiSession>();
+  private _toolkit: Toolkit.WithHandler<any> | undefined;
 
-  constructor(options: AiConversationOptions) {
-    this._queue = options.queue;
+  public constructor(queue: Queue<Message.Message | ContextBinding>) {
+    super();
+    this._queue = queue;
     this._context = new AiContextBinder(this._queue);
   }
 
-  get context() {
+  protected override async _open(): Promise<void> {
+    // TODO(wittjosiah): Pass in parent context?
+    await this._context.open();
+  }
+
+  protected override async _close(): Promise<void> {
+    await this._context.close();
+  }
+
+  public get context() {
     return this._context;
   }
 
-  async getHistory(): Promise<DataType.Message[]> {
+  public get toolkit() {
+    return this._toolkit;
+  }
+
+  public async getHistory(): Promise<Message.Message[]> {
     const queueItems = await this._queue.queryObjects();
-    return queueItems.filter(Obj.instanceOf(DataType.Message));
+    return queueItems.filter(Obj.instanceOf(Message.Message));
   }
 
   /**
-   * Executes a prompt.
-   * Each invocation creates a new `AiSession`, which handles potential tool calls.
+   * Creates a new cancelable request effect.
    */
-  run = <Tools extends AiTool.Any>({
-    // TODO(burdon): Decide whether to pass in or to fully encapsulate.
-    session = new AiSession(),
-    ...params
-  }: AiConversationRunParams<Tools>): Effect.Effect<
-    DataType.Message[],
-    AiAssistantError | AiInputPreprocessingError | AiError.AiError | AiToolNotFoundError,
-    AiLanguageModel.AiLanguageModel | ToolResolverService | ToolExecutionService | AiTool.ToHandler<Tools>
-  > =>
-    Effect.gen(this, function* () {
+  createRequest(
+    params: AiConversationRunParams,
+  ): Effect.Effect<Message.Message[], AiSessionRunError, AiSessionRunRequirements> {
+    return Effect.gen(this, function* () {
+      const session = new AiSession();
       const history = yield* Effect.promise(() => this.getHistory());
-      const context = yield* Effect.promise(() => this.context.query());
-      const blueprints = yield* Effect.forEach(context.blueprints.values(), DatabaseService.load);
 
-      // TODO(burdon): These don't need to be loaded; just need id and typename from context.
-      const objects = yield* Effect.forEach(context.objects.values(), DatabaseService.load);
+      // Get context objects.
+      const context = yield* Effect.promise(() => this.context.query());
+      const blueprints = yield* Effect.forEach(context.blueprints.values(), DatabaseService.loadOption).pipe(
+        Effect.map(Array.filter(Option.isSome)),
+        Effect.map(Array.map((option) => option.value)),
+      );
+      const objects = yield* Effect.forEach(context.objects.values(), DatabaseService.loadOption).pipe(
+        Effect.map(Array.filter(Option.isSome)),
+        Effect.map(Array.map((option) => option.value)),
+      );
+
+      // Create toolkit.
+      const toolkit = yield* createToolkit({ blueprints });
+      this._toolkit = toolkit;
 
-      log.info('run', {
-        prompt: params.prompt,
-        system: params.system,
+      const start = Date.now();
+      log('run', {
         history: history.length,
-        objects: objects.length,
         blueprints: blueprints.length,
-        toolkit: params.toolkit,
+        objects: objects.length,
+        tools: this._toolkit?.tools.length ?? 0,
       });
 
-      const start = Date.now();
-      this.onBegin.emit(session);
-
-      const messages = yield* session.run({
-        prompt: params.prompt,
-        system: params.system,
-        history,
-        objects,
-        blueprints,
-        toolkit: params.toolkit,
-        observer: params.observer,
-      });
+      // Process request.
+      const messages = yield* session.run({ history, blueprints, objects, toolkit, ...params }).pipe(
+        Effect.provideService(AiContextService, {
+          binder: this.context,
+        }),
+      );
 
-      log.info('result', { messages: messages, duration: Date.now() - start });
+      log('result', { messages: messages.length, duration: Date.now() - start });
+
+      // Append to queue.
       yield* Effect.promise(() => this._queue.append(messages));
       return messages;
-    }).pipe(Effect.withSpan('AiConversation.run'));
+    }).pipe(Effect.withSpan('AiConversation.request'));
+  }
 }

package/src/diff.test.ts

@@ -0,0 +1,43 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { describe, expect, it } from 'vitest';
+
+import { createDocAccessor } from '@dxos/echo-db';
+import { EchoTestBuilder } from '@dxos/echo-db/testing';
+import { Text } from '@dxos/schema';
+import { trim } from '@dxos/util';
+
+import { applyDiffs } from './diff';
+
+describe('diff', () => {
+  it('should apply diffs', async () => {
+    const builder = new EchoTestBuilder();
+    const { db, graph } = await builder.createDatabase();
+    graph.schemaRegistry.addSchema([Text.Text]);
+
+    const document = trim`
+      # Hello World
+      There'z a typo in this sentence.
+      And another oon here.
+      But not this one.
+    `;
+
+    const text = db.add(Text.make(document));
+    const accessor = createDocAccessor(text, ['content']);
+    const result = applyDiffs(accessor, [
+      `- There'z a typo in this sentence.`,
+      `+ There is a typo in this sentence.`,
+      `- And another oon here.`,
+      `+ And another one here.`,
+    ]);
+
+    expect(result).toBe(trim`
+      # Hello World
+      There is a typo in this sentence.
+      And another one here.
+      But not this one.
+    `);
+  });
+});

package/src/diff.ts

@@ -0,0 +1,84 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { next as A, type Doc } from '@automerge/automerge';
+
+import { DocAccessor, toCursorRange } from '@dxos/echo-db';
+import { log } from '@dxos/log';
+import { isNonNullable } from '@dxos/util';
+
+// Relevant info:
+// https://github.com/Minahil-official/GPT-4.1-Promting-Guide?tab=readme-ov-file#-apply-patch-tool-format-v4a-diff
+
+// TODO(burdon): Anthropic only.
+//  https://docs.anthropic.com/en/docs/agents-and-tools/tool-use/text-editor-tool#example-str-replace-command
+//  AI_TOOL_NOT_FOUND: str_replace_based_edit_tool
+// 'str_replace_based_edit_tool',
+
+// TOOD(burdon): Support append to end (no "-").
+
+export type Diff = {
+  match: string;
+  replace: string;
+};
+
+/**
+ * Convert a list of diffs into a list of operations.
+ */
+export const reduceDiffs = (diffs: readonly string[]): Diff[] => {
+  return diffs.reduce<Diff[]>((acc, diff) => {
+    const current = acc[acc.length - 1];
+    const [op, ...rest] = diff.split(' ');
+    switch (op) {
+      case '-': {
+        if (current && !current.match) {
+          current.match += rest.join(' ');
+        } else {
+          acc.push({ match: rest.join(' '), replace: '' });
+        }
+        return acc;
+      }
+      case '+': {
+        if (current && !current.replace) {
+          current.replace += rest.join(' ');
+        } else {
+          acc.push({ match: '', replace: rest.join(' ') });
+        }
+        return acc;
+      }
+    }
+
+    return acc;
+  }, []);
+};
+
+export const computeDiffsWithCursors = <T>(accessor: DocAccessor<T>, diffs: readonly string[]) => {
+  return reduceDiffs(diffs)
+    .map((diff) => {
+      const text = DocAccessor.getValue<string>(accessor);
+      const idx = text.indexOf(diff.match);
+      if (idx !== -1) {
+        return { cursor: toCursorRange(accessor, idx, idx + diff.match.length), text: diff.replace };
+      }
+    })
+    .filter(isNonNullable);
+};
+
+export const applyDiffs = <T>(accessor: DocAccessor<T>, diffs: readonly string[]): string => {
+  for (const diff of reduceDiffs(diffs)) {
+    accessor.handle.change((doc: Doc<T>) => {
+      const text = DocAccessor.getValue<string>(accessor);
+      const idx = text.indexOf(diff.match);
+      if (idx !== -1) {
+        // TODO(burdon): Replace smallest substring.
+        // NOTE: This only replaces the first match.
+        A.splice(doc, accessor.path as A.Prop[], idx, diff.match.length, diff.replace);
+      } else {
+        log.warn('diff not found', diff);
+      }
+    });
+  }
+
+  return DocAccessor.getValue<string>(accessor);
+};

package/src/errors.ts

@@ -4,7 +4,12 @@
 
 import { BaseError } from '@dxos/errors';
 
+/**
+ * Generic error from AI model.
+ */
+export class AiModelError extends BaseError.extend('AI_MODEL_ERROR', 'AI model error') {}
+
 /**
  * Generic error for AI agent execution.
  */
-export class AiAssistantError extends BaseError.extend('AI_ASSISTANT_ERROR') {}
+export class AiAssistantError extends BaseError.extend('AI_ASSISTANT_ERROR', 'AI assistant error') {}