@dxos/assistant 0.8.4-main.a4bbb77 → 0.8.4-main.ae835ea

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/assistant",
-  "version": "0.8.4-main.a4bbb77",
+  "version": "0.8.4-main.ae835ea",
   "description": "Natural language interface to DXOS",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -40,40 +40,34 @@
   "dependencies": {
     "@automerge/automerge": "3.1.2",
     "@effect/ai": "0.29.1",
-    "@effect/ai-anthropic": "^0.19.2",
     "@effect/experimental": "0.56.0",
     "@effect/platform": "^0.92.1",
-    "@effect/platform-node": "^0.98.3",
     "@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.a4bbb77",
-    "@dxos/async": "0.8.4-main.a4bbb77",
-    "@dxos/blueprints": "0.8.4-main.a4bbb77",
-    "@dxos/context": "0.8.4-main.a4bbb77",
-    "@dxos/debug": "0.8.4-main.a4bbb77",
-    "@dxos/echo": "0.8.4-main.a4bbb77",
-    "@dxos/echo-schema": "0.8.4-main.a4bbb77",
-    "@dxos/effect": "0.8.4-main.a4bbb77",
-    "@dxos/echo-db": "0.8.4-main.a4bbb77",
-    "@dxos/errors": "0.8.4-main.a4bbb77",
-    "@dxos/echo-protocol": "0.8.4-main.a4bbb77",
-    "@dxos/graph": "0.8.4-main.a4bbb77",
-    "@dxos/invariant": "0.8.4-main.a4bbb77",
-    "@dxos/functions": "0.8.4-main.a4bbb77",
-    "@dxos/keys": "0.8.4-main.a4bbb77",
-    "@dxos/live-object": "0.8.4-main.a4bbb77",
-    "@dxos/log": "0.8.4-main.a4bbb77",
-    "@dxos/node-std": "0.8.4-main.a4bbb77",
-    "@dxos/schema": "0.8.4-main.a4bbb77",
-    "@dxos/util": "0.8.4-main.a4bbb77"
+    "@dxos/async": "0.8.4-main.ae835ea",
+    "@dxos/blueprints": "0.8.4-main.ae835ea",
+    "@dxos/context": "0.8.4-main.ae835ea",
+    "@dxos/echo": "0.8.4-main.ae835ea",
+    "@dxos/debug": "0.8.4-main.ae835ea",
+    "@dxos/echo-db": "0.8.4-main.ae835ea",
+    "@dxos/ai": "0.8.4-main.ae835ea",
+    "@dxos/errors": "0.8.4-main.ae835ea",
+    "@dxos/effect": "0.8.4-main.ae835ea",
+    "@dxos/functions": "0.8.4-main.ae835ea",
+    "@dxos/graph": "0.8.4-main.ae835ea",
+    "@dxos/invariant": "0.8.4-main.ae835ea",
+    "@dxos/live-object": "0.8.4-main.ae835ea",
+    "@dxos/keys": "0.8.4-main.ae835ea",
+    "@dxos/node-std": "0.8.4-main.ae835ea",
+    "@dxos/log": "0.8.4-main.ae835ea",
+    "@dxos/schema": "0.8.4-main.ae835ea",
+    "@dxos/echo-protocol": "0.8.4-main.ae835ea",
+    "@dxos/util": "0.8.4-main.ae835ea"
   },
   "devDependencies": {
     "@types/lodash.defaultsdeep": "^4.6.6",
-    "effect": "3.18.3",
-    "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,9 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Toolkit } 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';
@@ -27,15 +30,11 @@ export interface AiConversationRunParams {
   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.
    */
@@ -51,11 +50,21 @@ export class AiConversation {
    */
   private _toolkit: Toolkit.WithHandler<any> | undefined;
 
-  public constructor(options: AiConversationOptions) {
-    this._queue = options.queue;
+  public constructor(queue: Queue<DataType.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;
   }

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 = {

package/src/execution-graph.test.ts

@@ -6,7 +6,7 @@ import { describe, expect, it } from '@effect/vitest';
 
 import { AgentStatus } from '@dxos/ai';
 import { Obj } from '@dxos/echo';
-import { ObjectId } from '@dxos/echo-schema';
+import { ObjectId } from '@dxos/echo/internal';
 import { log } from '@dxos/log';
 import { DataType } from '@dxos/schema';
 

package/src/extraction/extraction-llm-function/extraction-llm-function.ts

@@ -7,7 +7,7 @@
 
 import { AiService } from '@dxos/ai';
 import { Obj } from '@dxos/echo';
-import { create } from '@dxos/echo-schema';
+import { create } from '@dxos/echo/internal';
 import { type FunctionDefinition, defineFunction } from '@dxos/functions';
 import { type ContentBlock, DataType } from '@dxos/schema';
 

package/src/extraction/extraction-ner-function/extraction-ner-function.ts

@@ -6,7 +6,7 @@
 // @ts-nocheck
 
 import { asyncTimeout } from '@dxos/async';
-import { create } from '@dxos/echo-schema';
+import { create } from '@dxos/echo/internal';
 import { DatabaseService, defineFunction } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';

package/src/extraction/extraction.ts

@@ -2,10 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
 import { asyncTimeout } from '@dxos/async';
-import { Expando } from '@dxos/echo-schema';
+import { Expando } from '@dxos/echo/internal';
 import { type FunctionDefinition, type FunctionExecutor } from '@dxos/functions';
 import { log } from '@dxos/log';
 import { DataType } from '@dxos/schema';

package/src/extraction/quotes.ts

@@ -2,11 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
 import { Filter, Query } from '@dxos/echo';
+import { ObjectId } from '@dxos/echo/internal';
 import { type EchoDatabase } from '@dxos/echo-db';
-import { ObjectId } from '@dxos/echo-schema';
 import { DXN } from '@dxos/keys';
 import { log } from '@dxos/log';
 

package/src/functions/services.ts

@@ -2,13 +2,18 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Tool, type Toolkit } from '@effect/ai';
-import { Context, Effect, Layer, Record, Schema } from 'effect';
+import * as Tool from '@effect/ai/Tool';
+import type * as Toolkit from '@effect/ai/Toolkit';
+import * as Context from 'effect/Context';
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
+import * as Record from 'effect/Record';
+import * as Schema from 'effect/Schema';
 
 import { AiToolNotFoundError, ToolExecutionService, ToolResolverService } from '@dxos/ai';
 import { todo } from '@dxos/debug';
 import { Query } from '@dxos/echo';
-import { DatabaseService, FunctionDefinition, FunctionInvocationService, FunctionType } from '@dxos/functions';
+import { DatabaseService, Function, FunctionDefinition, FunctionInvocationService } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 
 /**
@@ -40,7 +45,7 @@ export const makeToolResolverFromFunctions = (
 
             const {
               objects: [dbFunction],
-            } = yield* DatabaseService.runQuery(Query.type(FunctionType, { key: id }));
+            } = yield* DatabaseService.runQuery(Query.type(Function.Function, { key: id }));
 
             const functionDef = dbFunction
               ? FunctionDefinition.deserialize(dbFunction)

package/src/session/artifact-diff.ts

@@ -2,10 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Context } from 'effect';
+import * as Context from 'effect/Context';
 
+import { type ObjectId } from '@dxos/echo/internal';
 import { type ObjectVersion } from '@dxos/echo-db';
-import { type ObjectId } from '@dxos/echo-schema';
 
 /**
  * Resolves artifact ids to their versions.

package/src/session/error-handling.ts

@@ -2,9 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import { AiError } from '@effect/ai';
-import { HttpClientError } from '@effect/platform';
-import { Effect, Schema } from 'effect';
+import * as AiError from '@effect/ai/AiError';
+import * as HttpClientError from '@effect/platform/HttpClientError';
+import * as Effect from 'effect/Effect';
+import * as Schema from 'effect/Schema';
 
 import { AiModelError } from '../errors';
 

package/src/session/format.test.ts

@@ -3,7 +3,7 @@
 //
 
 import { beforeAll, describe, it } from '@effect/vitest';
-import { Effect } from 'effect';
+import * as Effect from 'effect/Effect';
 
 import { Blueprint, Template } from '@dxos/blueprints';
 import { Obj } from '@dxos/echo';

package/src/session/format.ts

@@ -2,12 +2,15 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Array, Effect, Option, pipe } from 'effect';
+import * as Array from 'effect/Array';
+import * as Effect from 'effect/Effect';
+import * as Function from 'effect/Function';
+import * as Option from 'effect/Option';
 
 import { Template } from '@dxos/blueprints';
 import { Obj } from '@dxos/echo';
+import { type ObjectId } from '@dxos/echo/internal';
 import { ObjectVersion } from '@dxos/echo-db';
-import { type ObjectId } from '@dxos/echo-schema';
 import { DatabaseService } from '@dxos/functions';
 import { log } from '@dxos/log';
 import { type ContentBlock, DataType } from '@dxos/schema';
@@ -28,7 +31,7 @@ export const formatSystemPrompt = ({
   objects = [],
 }: Pick<AiSessionRunParams<any>, 'system' | 'blueprints' | 'objects'>) =>
   Effect.gen(function* () {
-    const blueprintDefs = yield* pipe(
+    const blueprintDefs = yield* Function.pipe(
       blueprints,
       Effect.forEach((blueprint) => Effect.succeed(blueprint.instructions)),
       Effect.flatMap(Effect.forEach((template) => DatabaseService.loadOption(template.source))),
@@ -47,7 +50,7 @@ export const formatSystemPrompt = ({
       ),
     );
 
-    const objectDefs = yield* pipe(
+    const objectDefs = yield* Function.pipe(
       objects,
       Effect.forEach((object) =>
         Effect.succeed(trim`
@@ -60,7 +63,7 @@ export const formatSystemPrompt = ({
       Effect.map((objects) => (objects.length > 0 ? ['## Context Objects', ...objects].join('\n\n') : undefined)),
     );
 
-    return yield* pipe(
+    return yield* Function.pipe(
       Effect.succeed([system, blueprintDefs, objectDefs].filter((def): def is string => def !== undefined)),
       Effect.map((parts) => parts.join('\n\n')),
     );

package/src/session/observer.ts

@@ -2,7 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Effect, Function } from 'effect';
+import * as Effect from 'effect/Effect';
+import * as Function from 'effect/Function';
 
 import { type AiParser, type ConsolePrinter } from '@dxos/ai';
 import { type DataType } from '@dxos/schema';

package/src/session/session.test.ts

@@ -2,9 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Tool, Toolkit } from '@effect/ai';
+import * as Tool from '@effect/ai/Tool';
+import * as Toolkit from '@effect/ai/Toolkit';
 import { describe, it } from '@effect/vitest';
-import { Effect, Layer, Schema } from 'effect';
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
+import * as Schema from 'effect/Schema';
 
 import { AiService, MemoizedAiService, ToolExecutionService, ToolResolverService } from '@dxos/ai';
 import { AiServiceTestingPreset } from '@dxos/ai/testing';
@@ -30,7 +33,7 @@ const CalendarEventSchema = Schema.Struct({
 
 type CalendarEvent = Schema.Schema.Type<typeof CalendarEventSchema>;
 
-class TestToolkit extends Toolkit.make(
+const TestToolkit = Toolkit.make(
   Tool.make('Calculator', {
     description: 'Basic calculator tool',
     parameters: {
@@ -43,7 +46,7 @@ class TestToolkit extends Toolkit.make(
     }),
     failure: Schema.Never,
   }),
-) {}
+);
 
 // Tool handlers.
 const toolkitLayer = TestToolkit.toLayer({

package/src/session/session.ts

@@ -2,8 +2,14 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type AiError, LanguageModel, type Tool, type Toolkit } from '@effect/ai';
-import { Chunk, Effect, type Schema, Stream } from 'effect';
+import type * as AiError from '@effect/ai/AiError';
+import * as LanguageModel from '@effect/ai/LanguageModel';
+import type * as Tool from '@effect/ai/Tool';
+import type * as Toolkit from '@effect/ai/Toolkit';
+import * as Chunk from 'effect/Chunk';
+import * as Effect from 'effect/Effect';
+import type * as Schema from 'effect/Schema';
+import * as Stream from 'effect/Stream';
 
 import {
   AiParser,
@@ -37,6 +43,7 @@ export type AiSessionRunRequirements =
 
 export type AiSessionRunParams<Tools extends Record<string, Tool.Any>> = {
   prompt: string;
+  // TODO(wittjosiah): Rename to systemPrompt.
   system?: string;
   history?: DataType.Message[];
   objects?: Obj.Any[];

package/src/session/toolkit.ts

@@ -2,8 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Tool, Toolkit } from '@effect/ai';
-import { type Context, Effect } from 'effect';
+import type * as Tool from '@effect/ai/Tool';
+import * as Toolkit from '@effect/ai/Toolkit';
+import type * as Context from 'effect/Context';
+import * as Effect from 'effect/Effect';
 
 import { type AiToolNotFoundError, ToolExecutionService, type ToolId, ToolResolverService } from '@dxos/ai';
 import { type Blueprint } from '@dxos/blueprints';

package/src/session/version-pin.ts

@@ -2,11 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
+import { type AnyEchoObject, ObjectId } from '@dxos/echo/internal';
 import { type ObjectVersion } from '@dxos/echo-db';
 import { getVersion } from '@dxos/echo-db';
-import { type AnyEchoObject, ObjectId } from '@dxos/echo-schema';
 import { type ContentBlock } from '@dxos/schema';
 
 // TODO(dmaretskyi): Extract.

package/src/summarization/summarization.test.ts

@@ -5,7 +5,8 @@
 // ISSUE(burdon): defineFunction
 // @ts-nocheck
 
-import { Schema, pipe } from 'effect';
+import * as Function from 'effect/Function';
+import * as Schema from 'effect/Schema';
 import { beforeAll, describe, test } from 'vitest';
 
 import { AiService, MixedStreamParser } from '@dxos/ai';
@@ -79,7 +80,7 @@ const summarizationFn = defineFunction({
       }),
     );
 
-    return DataType.makeText(pipe(result[0]?.blocks[0], (c) => (c?._tag === 'text' ? c.text : '')));
+    return DataType.makeText(Function.pipe(result[0]?.blocks[0], (c) => (c?._tag === 'text' ? c.text : '')));
   },
 });
 
@@ -136,7 +137,7 @@ const refinementFn = defineFunction({
       }),
     );
     return {
-      summary: DataType.makeText(pipe(result[0]?.blocks[0], (c) => (c?._tag === 'text' ? c.text : ''))),
+      summary: DataType.makeText(Function.pipe(result[0]?.blocks[0], (c) => (c?._tag === 'text' ? c.text : ''))),
     };
   },
 });

package/src/{types.ts → types/artifact.ts}

@@ -2,9 +2,9 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
-import { type ObjectId } from '@dxos/echo-schema';
+import { type ObjectId } from '@dxos/echo/internal';
 import { DXN, LOCAL_SPACE_TAG, type SpaceId } from '@dxos/keys';
 import { trim } from '@dxos/util';
 

package/src/types/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export * from './artifact';