@dxos/assistant 0.8.4-main.e098934 → 0.8.4-main.e8ec1fe

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/assistant",
-  "version": "0.8.4-main.e098934",
+  "version": "0.8.4-main.e8ec1fe",
   "description": "Natural language interface to DXOS",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -38,41 +38,38 @@
     "src"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.1.1",
-    "@effect/ai": "0.25.2",
-    "@effect/ai-anthropic": "^0.16.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/ai": "0.8.4-main.e098934",
-    "@dxos/blueprints": "0.8.4-main.e098934",
-    "@dxos/async": "0.8.4-main.e098934",
-    "@dxos/context": "0.8.4-main.e098934",
-    "@dxos/debug": "0.8.4-main.e098934",
-    "@dxos/echo": "0.8.4-main.e098934",
-    "@dxos/echo-db": "0.8.4-main.e098934",
-    "@dxos/echo-protocol": "0.8.4-main.e098934",
-    "@dxos/effect": "0.8.4-main.e098934",
-    "@dxos/functions": "0.8.4-main.e098934",
-    "@dxos/errors": "0.8.4-main.e098934",
-    "@dxos/echo-schema": "0.8.4-main.e098934",
-    "@dxos/graph": "0.8.4-main.e098934",
-    "@dxos/invariant": "0.8.4-main.e098934",
-    "@dxos/keys": "0.8.4-main.e098934",
-    "@dxos/log": "0.8.4-main.e098934",
-    "@dxos/node-std": "0.8.4-main.e098934",
-    "@dxos/live-object": "0.8.4-main.e098934",
-    "@dxos/schema": "0.8.4-main.e098934",
-    "@dxos/util": "0.8.4-main.e098934"
+    "@dxos/ai": "0.8.4-main.e8ec1fe",
+    "@dxos/async": "0.8.4-main.e8ec1fe",
+    "@dxos/context": "0.8.4-main.e8ec1fe",
+    "@dxos/debug": "0.8.4-main.e8ec1fe",
+    "@dxos/echo": "0.8.4-main.e8ec1fe",
+    "@dxos/echo-db": "0.8.4-main.e8ec1fe",
+    "@dxos/blueprints": "0.8.4-main.e8ec1fe",
+    "@dxos/effect": "0.8.4-main.e8ec1fe",
+    "@dxos/errors": "0.8.4-main.e8ec1fe",
+    "@dxos/echo-protocol": "0.8.4-main.e8ec1fe",
+    "@dxos/functions-runtime": "0.8.4-main.e8ec1fe",
+    "@dxos/graph": "0.8.4-main.e8ec1fe",
+    "@dxos/invariant": "0.8.4-main.e8ec1fe",
+    "@dxos/keys": "0.8.4-main.e8ec1fe",
+    "@dxos/live-object": "0.8.4-main.e8ec1fe",
+    "@dxos/log": "0.8.4-main.e8ec1fe",
+    "@dxos/node-std": "0.8.4-main.e8ec1fe",
+    "@dxos/functions": "0.8.4-main.e8ec1fe",
+    "@dxos/types": "0.8.4-main.e8ec1fe",
+    "@dxos/schema": "0.8.4-main.e8ec1fe",
+    "@dxos/util": "0.8.4-main.e8ec1fe"
   },
   "devDependencies": {
     "@types/lodash.defaultsdeep": "^4.6.6",
-    "effect": "3.17.7",
-    "inquirer": "^12.0.0"
+    "effect": "3.18.3"
   },
   "peerDependencies": {
     "effect": "^3.13.3"

package/src/conversation/context.ts

@@ -3,12 +3,16 @@
 //
 
 import { type ReadonlySignal, computed } from '@preact/signals-core';
-import { Context, 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 { DXN, 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';
 
 /**
@@ -57,41 +61,69 @@ export class Bindings {
  * Manages bindings of blueprints and objects to a conversation.
  */
 // TODO(burdon): Context should manage ephemeral state of bindings until prompt is issued?
-export class AiContextBinder {
+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;
+  }
+
+  get blueprints() {
+    invariant(this._blueprints, 'AiContextBinder not open');
+    return this._blueprints;
+  }
+
+  get objects() {
+    invariant(this._objects, 'AiContextBinder not open');
+    return this._objects;
+  }
 
-  readonly objects: ReadonlySignal<Ref.Ref<Type.Expando>[]> = computed(() => [...this.bindings.value.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]);
+  }
 
-  constructor(private readonly _queue: Queue) {}
+  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) {
-      return;
-    }
-
     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: {
@@ -126,7 +158,7 @@ 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) => {

package/src/conversation/conversation.ts

@@ -2,14 +2,17 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type AiTool, type AiToolkit } from '@effect/ai';
-import { Array, Effect, Option } 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 { 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 {
   AiSession,
@@ -21,29 +24,21 @@ import {
 
 import { AiContextBinder, AiContextService, type ContextBinding } from './context';
 
-export type AiConversationRunRequirements<Tools extends AiTool.Any> =
-  | AiSessionRunRequirements
-  | AiTool.ToHandler<Tools>;
-
 export interface AiConversationRunParams {
   prompt: string;
   system?: string;
   observer?: GenerationObserver;
 }
 
-export type AiConversationOptions = {
-  queue: Queue<DataType.Message | ContextBinding>;
-};
-
 /**
  * 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 {
+export class AiConversation extends Resource {
   /**
    * Message and binding queue.
    */
-  private readonly _queue: Queue<DataType.Message | ContextBinding>;
+  private readonly _queue: Queue<Message.Message | ContextBinding>;
 
   /**
    * Blueprints bound to the conversation.
@@ -53,13 +48,23 @@ export class AiConversation {
   /**
    * Toolkit from the current session request.
    */
-  private _toolkit: AiToolkit.ToHandler<AiTool.Any> | undefined;
+  private _toolkit: Toolkit.WithHandler<any> | undefined;
 
-  public constructor(options: AiConversationOptions) {
-    this._queue = options.queue;
+  public constructor(queue: Queue<Message.Message | ContextBinding>) {
+    super();
+    this._queue = queue;
     this._context = new AiContextBinder(this._queue);
   }
 
+  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;
   }
@@ -68,17 +73,17 @@ export class AiConversation {
     return this._toolkit;
   }
 
-  public async getHistory(): Promise<DataType.Message[]> {
+  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));
   }
 
   /**
    * Creates a new cancelable request effect.
    */
-  createRequest<Tools extends AiTool.Any>(
+  createRequest(
     params: AiConversationRunParams,
-  ): Effect.Effect<DataType.Message[], AiSessionRunError, AiConversationRunRequirements<Tools>> {
+  ): Effect.Effect<Message.Message[], AiSessionRunError, AiSessionRunRequirements> {
     return Effect.gen(this, function* () {
       const session = new AiSession();
       const history = yield* Effect.promise(() => this.getHistory());
@@ -95,7 +100,7 @@ export class AiConversation {
       );
 
       // Create toolkit.
-      const toolkit = yield* createToolkit<Tools>({ blueprints });
+      const toolkit = yield* createToolkit({ blueprints });
       this._toolkit = toolkit;
 
       const start = Date.now();
@@ -107,7 +112,7 @@ export class AiConversation {
       });
 
       // Process request.
-      const messages = yield* session.run<Tools>({ history, blueprints, objects, toolkit, ...params }).pipe(
+      const messages = yield* session.run({ history, blueprints, objects, toolkit, ...params }).pipe(
         Effect.provideService(AiContextService, {
           binder: this.context,
         }),

package/src/diff.test.ts

@@ -6,7 +6,7 @@ import { describe, expect, it } from 'vitest';
 
 import { createDocAccessor } from '@dxos/echo-db';
 import { EchoTestBuilder } from '@dxos/echo-db/testing';
-import { DataType } from '@dxos/schema';
+import { Text } from '@dxos/schema';
 import { trim } from '@dxos/util';
 
 import { applyDiffs } from './diff';
@@ -15,7 +15,7 @@ describe('diff', () => {
   it('should apply diffs', async () => {
     const builder = new EchoTestBuilder();
     const { db, graph } = await builder.createDatabase();
-    graph.schemaRegistry.addSchema([DataType.Text]);
+    graph.schemaRegistry.addSchema([Text.Text]);
 
     const document = trim`
       # Hello World
@@ -24,7 +24,7 @@ describe('diff', () => {
       But not this one.
     `;
 
-    const text = db.add(DataType.makeText(document));
+    const text = db.add(Text.make(document));
     const accessor = createDocAccessor(text, ['content']);
     const result = applyDiffs(accessor, [
       `- There'z a typo in this sentence.`,

package/src/diff.ts

@@ -11,6 +11,11 @@ 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 = {