@dxos/assistant 0.8.4-main.69d29f4 → 0.8.4-main.6fa680abb7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/assistant",
-  "version": "0.8.4-main.69d29f4",
+  "version": "0.8.4-main.6fa680abb7",
   "description": "Natural language interface to DXOS",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -16,20 +16,17 @@
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs"
+      "default": "./dist/lib/neutral/index.mjs"
     },
     "./extraction": {
       "source": "./src/extraction/index.ts",
       "types": "./dist/types/src/extraction/index.d.ts",
-      "browser": "./dist/lib/browser/extraction/index.mjs",
-      "node": "./dist/lib/node-esm/extraction/index.mjs"
+      "default": "./dist/lib/neutral/extraction/index.mjs"
     },
     "./testing": {
       "source": "./src/testing/index.ts",
       "types": "./dist/types/src/testing/index.d.ts",
-      "browser": "./dist/lib/browser/testing/index.mjs",
-      "node": "./dist/lib/node-esm/testing/index.mjs"
+      "default": "./dist/lib/neutral/testing/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -49,39 +46,41 @@
   ],
   "dependencies": {
     "@automerge/automerge": "3.2.3",
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/ai": "0.32.1",
-    "@effect/experimental": "0.57.11",
-    "@effect/platform": "0.93.6",
+    "@effect-atom/atom": "^0.5.1",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/ai": "0.33.2",
+    "@effect/experimental": "0.58.0",
+    "@effect/platform": "0.94.4",
     "@xenova/transformers": "^2.17.2",
     "lodash.defaultsdeep": "^4.6.1",
-    "@dxos/ai": "0.8.4-main.69d29f4",
-    "@dxos/async": "0.8.4-main.69d29f4",
-    "@dxos/blueprints": "0.8.4-main.69d29f4",
-    "@dxos/context": "0.8.4-main.69d29f4",
-    "@dxos/echo": "0.8.4-main.69d29f4",
-    "@dxos/debug": "0.8.4-main.69d29f4",
-    "@dxos/echo-db": "0.8.4-main.69d29f4",
-    "@dxos/echo-protocol": "0.8.4-main.69d29f4",
-    "@dxos/errors": "0.8.4-main.69d29f4",
-    "@dxos/effect": "0.8.4-main.69d29f4",
-    "@dxos/functions": "0.8.4-main.69d29f4",
-    "@dxos/functions-runtime": "0.8.4-main.69d29f4",
-    "@dxos/graph": "0.8.4-main.69d29f4",
-    "@dxos/keys": "0.8.4-main.69d29f4",
-    "@dxos/invariant": "0.8.4-main.69d29f4",
-    "@dxos/log": "0.8.4-main.69d29f4",
-    "@dxos/node-std": "0.8.4-main.69d29f4",
-    "@dxos/schema": "0.8.4-main.69d29f4",
-    "@dxos/types": "0.8.4-main.69d29f4",
-    "@dxos/util": "0.8.4-main.69d29f4"
+    "@dxos/blueprints": "0.8.4-main.6fa680abb7",
+    "@dxos/ai": "0.8.4-main.6fa680abb7",
+    "@dxos/context": "0.8.4-main.6fa680abb7",
+    "@dxos/debug": "0.8.4-main.6fa680abb7",
+    "@dxos/async": "0.8.4-main.6fa680abb7",
+    "@dxos/echo": "0.8.4-main.6fa680abb7",
+    "@dxos/echo-protocol": "0.8.4-main.6fa680abb7",
+    "@dxos/echo-db": "0.8.4-main.6fa680abb7",
+    "@dxos/errors": "0.8.4-main.6fa680abb7",
+    "@dxos/effect": "0.8.4-main.6fa680abb7",
+    "@dxos/functions": "0.8.4-main.6fa680abb7",
+    "@dxos/functions-runtime": "0.8.4-main.6fa680abb7",
+    "@dxos/graph": "0.8.4-main.6fa680abb7",
+    "@dxos/invariant": "0.8.4-main.6fa680abb7",
+    "@dxos/keys": "0.8.4-main.6fa680abb7",
+    "@dxos/mcp-client": "0.8.4-main.6fa680abb7",
+    "@dxos/node-std": "0.8.4-main.6fa680abb7",
+    "@dxos/log": "0.8.4-main.6fa680abb7",
+    "@dxos/schema": "0.8.4-main.6fa680abb7",
+    "@dxos/types": "0.8.4-main.6fa680abb7",
+    "@dxos/util": "0.8.4-main.6fa680abb7"
   },
   "devDependencies": {
     "@types/lodash.defaultsdeep": "^4.6.6",
-    "effect": "3.19.11"
+    "effect": "3.19.16"
   },
   "peerDependencies": {
-    "effect": "3.19.11"
+    "effect": "3.19.16"
   },
   "publishConfig": {
     "access": "public"

package/src/conversation/context.test.ts

@@ -30,7 +30,7 @@ describe('AiContextBinder', () => {
 
     const TestSchema = Schema.Struct({}).pipe(
       Type.object({
-        typename: 'dxos.org/type/Example',
+        typename: 'org.dxos.type.example',
         version: '0.1.0',
       }),
     );

package/src/conversation/context.ts

@@ -5,13 +5,15 @@
 import { Atom, Registry } from '@effect-atom/atom-react';
 import * as EArray from 'effect/Array';
 import * as Context from 'effect/Context';
+import * as Effect from 'effect/Effect';
 import * as Function from 'effect/Function';
 import * as Schema from 'effect/Schema';
 
 import { Blueprint } from '@dxos/blueprints';
 import { Resource } from '@dxos/context';
-import { DXN, Obj, Query, type Ref, Type } from '@dxos/echo';
+import { DXN, Obj, Query, Ref, Type } from '@dxos/echo';
 import { type Queue } from '@dxos/echo-db';
+import { assertArgument } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { ComplexSet, isTruthy } from '@dxos/util';
 
@@ -21,17 +23,17 @@ import { ComplexSet, isTruthy } from '@dxos/util';
 // TODO(burdon): Move to @dxos/schema ContentBlock?
 export const ContextBinding = Schema.Struct({
   blueprints: Schema.Struct({
-    added: Schema.Array(Type.Ref(Blueprint.Blueprint)),
-    removed: Schema.Array(Type.Ref(Blueprint.Blueprint)),
+    added: Schema.Array(Ref.Ref(Blueprint.Blueprint)),
+    removed: Schema.Array(Ref.Ref(Blueprint.Blueprint)),
   }),
 
   objects: Schema.Struct({
-    added: Schema.Array(Type.Ref(Type.Obj)),
-    removed: Schema.Array(Type.Ref(Type.Obj)),
+    added: Schema.Array(Ref.Ref(Obj.Unknown)),
+    removed: Schema.Array(Ref.Ref(Obj.Unknown)),
   }),
 }).pipe(
   Type.object({
-    typename: 'dxos.org/type/ContextBinding',
+    typename: 'org.dxos.type.context-binding',
     version: '0.1.0',
   }),
 );
@@ -74,6 +76,7 @@ export class AiContextBinder extends Resource {
 
   constructor(options: AiContextBinderOptions) {
     super();
+    assertArgument(options.queue, 'options.queue', 'Queue is required');
     this._queue = options.queue;
     this._registry = options.registry ?? Registry.make();
   }
@@ -278,7 +281,7 @@ export class AiContextBinder extends Resource {
     const refArray = [...refs];
 
     // Load all refs that need loading.
-    await Promise.all(refArray.map((ref) => ref.load()));
+    await Promise.all(refArray.map((ref) => ref.tryLoad()));
 
     return refArray
       .map((ref) => {
@@ -300,4 +303,28 @@ export class AiContextService extends Context.Tag('@dxos/assistant/AiContextServ
   {
     binder: AiContextBinder;
   }
->() {}
+>() {
+  static bindContext = ({ blueprints, objects }: BindingProps): Effect.Effect<void, never, AiContextService> =>
+    Effect.gen(function* () {
+      const { binder } = yield* AiContextService;
+      yield* Effect.promise(() => binder.bind({ blueprints, objects }));
+    });
+
+  static findObjects = <T extends Type.AnyEntity>(
+    type: T,
+  ): Effect.Effect<Schema.Schema.Type<T>[], never, AiContextService> => {
+    return Effect.gen(function* () {
+      const { binder } = yield* AiContextService;
+      return binder.getObjects().filter(Obj.instanceOf(type));
+    });
+  };
+
+  /**
+   * Glorified type cast until we figure out function service typing.
+   * For context, the AiContextService is provided to functions called from tool calls, but it's not implemented in types yet.
+   * @deprecated
+   */
+  static fixFunctionHandlerType = <A, E, R>(
+    eff: Effect.Effect<A, E, R>,
+  ): Effect.Effect<A, E, Exclude<R, AiContextService>> => eff as any;
+}

package/src/conversation/conversation.ts

@@ -2,15 +2,27 @@
 // Copyright 2025 DXOS.org
 //
 
+import type * as Tool from '@effect/ai/Tool';
 import type * as Toolkit from '@effect/ai/Toolkit';
 import type { Registry } from '@effect-atom/atom-react';
+import * as Array from 'effect/Array';
+import * as Context from 'effect/Context';
 import * as Effect from 'effect/Effect';
+import * as Either from 'effect/Either';
+import { pipe } from 'effect/Function';
+import * as Layer from 'effect/Layer';
 
+import { type ToolExecutionService, type ToolResolverService } from '@dxos/ai';
+import { type GenericToolkit } from '@dxos/ai';
+import { type Blueprint } from '@dxos/blueprints';
 import { Resource } from '@dxos/context';
 import { Obj } from '@dxos/echo';
 import { type Queue } from '@dxos/echo-db';
+import { acquireReleaseResource } from '@dxos/effect';
+import { QueueService } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
+import { McpToolkit } from '@dxos/mcp-client';
 import { Message } from '@dxos/types';
 
 import {
@@ -35,6 +47,12 @@ export type AiConversationOptions = {
   registry?: Registry.Registry;
 };
 
+// TODO(dmaretskyi): Take from model characteristics. opus has 200k max tokens.
+/**
+ * Summarization threshold in tokens.
+ */
+const SUMMARY_THRESHOLD = 80_000;
+
 /**
  * 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.
@@ -76,25 +94,36 @@ export class AiConversation extends Resource {
     return queueItems.filter(Obj.instanceOf(Message.Message));
   }
 
+  getTools(): Effect.Effect<Record<string, Tool.Any>, never, ToolExecutionService | ToolResolverService> {
+    return Effect.gen(this, function* () {
+      const blueprints = this.context.getBlueprints();
+      const tookit = yield* createToolkit({ toolkit: this._toolkit, blueprints });
+      return tookit.tools;
+    }).pipe(Effect.orDie);
+  }
+
   /**
    * Creates a new cancelable request effect.
    */
   public createRequest(
     params: AiConversationRunProps,
   ): Effect.Effect<Message.Message[], AiSessionRunError, AiSessionRunRequirements> {
-    const self = this;
-    return Effect.gen(function* () {
-      const history = yield* Effect.promise(() => self.getHistory());
+    return Effect.gen(this, function* () {
+      const history = yield* Effect.promise(() => this.getHistory());
 
       // Create toolkit.
-      const blueprints = self.context.getBlueprints();
+      const blueprints = this.context.getBlueprints();
+
+      const mcps = yield* connectMcpServers(blueprints);
+
       const toolkit = yield* createToolkit({
-        toolkit: self._toolkit,
+        toolkit: this._toolkit,
         blueprints,
+        genericToolkits: mcps,
       });
 
       // Context objects.
-      const objects = self.context.getObjects();
+      const objects = this.context.getObjects();
 
       log('run', {
         history: history.length,
@@ -104,12 +133,28 @@ export class AiConversation extends Resource {
       });
 
       // Process request.
-      const session = new AiSession();
-      const messages = yield* session.run({ history, blueprints, toolkit, objects, ...params }).pipe(
-        Effect.provideService(AiContextService, {
-          binder: self.context,
-        }),
-      );
+      const session = new AiSession({
+        summarizationThreshold: SUMMARY_THRESHOLD,
+      });
+      const messages = yield* session
+        .run({
+          history,
+          blueprints,
+          toolkit,
+          objects,
+          ...params,
+          onOutput: (message) => Effect.promise(() => this._queue.append([message])),
+        })
+        .pipe(
+          Effect.provide(
+            Layer.mergeAll(
+              Layer.succeed(AiContextService, {
+                binder: this.context,
+              }),
+              Layer.succeed(AiConversationService, this),
+            ),
+          ),
+        );
 
       log('result', {
         messages: messages.length,
@@ -117,9 +162,86 @@ export class AiConversation extends Resource {
         toolCalls: session.toolCalls,
       });
 
-      // Append to queue.
-      yield* Effect.promise(() => self._queue.append(messages));
       return messages;
     });
   }
 }
+
+/**
+ * Gives access to the ai conversation.
+ */
+export class AiConversationService extends Context.Tag('@dxos/assistant/AiConversationService')<
+  AiConversationService,
+  AiConversation
+>() {
+  /**
+   * Create a new conversation layer from options.
+   */
+  static layer = (options: AiConversationOptions): Layer.Layer<AiConversationService | AiContextService> =>
+    aiContextFromConversation.pipe(
+      Layer.provideMerge(
+        Layer.scoped(
+          AiConversationService,
+          Effect.gen(function* () {
+            const conversation = yield* acquireReleaseResource(() => new AiConversation(options));
+            return conversation;
+          }),
+        ),
+      ),
+    );
+
+  /**
+   * Create a new conversation with a new queue.
+   */
+  static layerNewQueue = (
+    options?: Omit<AiConversationOptions, 'queue'>,
+  ): Layer.Layer<AiConversationService | AiContextService, never, QueueService> =>
+    Layer.unwrapScoped(
+      Effect.gen(function* () {
+        return AiConversationService.layer({
+          ...options,
+          queue: yield* QueueService.createQueue<Message.Message | ContextBinding>(),
+        });
+      }),
+    );
+
+  /**
+   * Run a prompt in the current conversation.
+   */
+  static run = (
+    params: AiConversationRunProps,
+  ): Effect.Effect<Message.Message[], AiSessionRunError, AiSessionRunRequirements | AiConversationService> =>
+    Effect.gen(function* () {
+      const conversation = yield* AiConversationService;
+      return yield* conversation.createRequest(params);
+    });
+}
+
+const aiContextFromConversation = Layer.effect(
+  AiContextService,
+  Effect.gen(function* () {
+    const conversation = yield* AiConversationService;
+    return {
+      binder: conversation.context,
+    };
+  }),
+);
+
+const connectMcpServers = (
+  blueprints: readonly Blueprint.Blueprint[],
+): Effect.Effect<GenericToolkit.GenericToolkit[]> =>
+  pipe(
+    blueprints,
+    Array.flatMap((_) => _.mcpServers ?? []),
+    Effect.forEach(({ url, protocol }) =>
+      McpToolkit.make({ url, kind: protocol }).pipe(
+        // NOTE: Type-inference fails here without explicit void return.
+        Effect.tap((toolkit): void =>
+          log.info('Connected to MCP server', { url, tools: Object.keys(toolkit.toolkit.tools).length }),
+        ),
+        Effect.tapDefect((error) => Effect.sync(() => log.warn('Failed to connect to MCP server', { error }))),
+        Effect.either,
+      ),
+    ),
+    Effect.map(Array.filterMap((_) => Either.getRight(_))),
+  );

package/src/diff.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { describe, expect, it } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import { createDocAccessor } from '@dxos/echo-db';
 import { EchoTestBuilder } from '@dxos/echo-db/testing';
@@ -12,10 +12,17 @@ import { trim } from '@dxos/util';
 import { applyDiffs } from './diff';
 
 describe('diff', () => {
+  let builder: EchoTestBuilder;
+  beforeEach(async () => {
+    builder = await new EchoTestBuilder().open();
+  });
+
+  afterEach(async () => {
+    await builder.close();
+  });
+
   it('should apply diffs', async () => {
-    const builder = new EchoTestBuilder();
-    const { db, graph } = await builder.createDatabase();
-    await graph.schemaRegistry.register([Text.Text]);
+    const { db } = await builder.createDatabase({ types: [Text.Text] });
 
     const document = trim`
       # Hello World
@@ -40,4 +47,28 @@ describe('diff', () => {
       But not this one.
     `);
   });
+
+  it('should apply diffs that append content at the end', async () => {
+    const { db } = await builder.createDatabase({ types: [Text.Text] });
+
+    const document = '# Shopping list';
+
+    const text = db.add(Text.make(document));
+    const accessor = createDocAccessor(text, ['content']);
+    const result = applyDiffs(accessor, ['- # Shopping list', '+ # Shopping list\n- Milk']);
+
+    expect(result).toBe('# Shopping list\n- Milk');
+  });
+
+  it('should append text to an empty document', async () => {
+    const builder = new EchoTestBuilder();
+    const { db, graph } = await builder.createDatabase();
+    await graph.schemaRegistry.register([Text.Text]);
+
+    const text = db.add(Text.make(''));
+    const accessor = createDocAccessor(text, ['content']);
+    const result = applyDiffs(accessor, ['+ # Shopping list']);
+
+    expect(result).toBe('# Shopping list');
+  });
 });

package/src/diff.ts

@@ -47,9 +47,10 @@ export const reduceDiffs = (diffs: readonly string[]): Diff[] => {
         }
         return acc;
       }
+      default: {
+        throw new Error(`Invalid diff format: each line must start with "- " or "+ ", got: ${JSON.stringify(diff)}`);
+      }
     }
-
-    return acc;
   }, []);
 };
 
@@ -65,7 +66,11 @@ export const computeDiffsWithCursors = <T>(accessor: DocAccessor<T>, diffs: read
     .filter(isNonNullable);
 };
 
-export const applyDiffs = <T>(accessor: DocAccessor<T>, diffs: readonly string[]): string => {
+export const applyDiffs = <T>(
+  accessor: DocAccessor<T>,
+  diffs: readonly string[],
+  { errorOnNotFound = false }: { errorOnNotFound?: boolean } = {},
+): string => {
   for (const diff of reduceDiffs(diffs)) {
     accessor.handle.change((doc: Doc<T>) => {
       const text = DocAccessor.getValue<string>(accessor);
@@ -75,7 +80,11 @@ export const applyDiffs = <T>(accessor: DocAccessor<T>, diffs: readonly string[]
         // 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);
+        if (errorOnNotFound) {
+          throw new Error(`Diff not found: ${diff.match}`);
+        } else {
+          log.warn('diff not found', diff);
+        }
       }
     });
   }

package/src/execution-graph.test.ts

@@ -71,7 +71,7 @@ describe('ExecutionGraph', () => {
         blocks: [
           {
             _tag: 'text',
-            text: '{"id":"01K6AXZKK79H4E54RKP1YZDARK","@type":"dxn:type:dxos.org/type/Organization:0.1.0","@meta":{"keys":[]},"name":"Blue Yard","website":"https://blueyard.com"}',
+            text: '{"id":"01K6AXZKK79H4E54RKP1YZDARK","@type":"dxn:type:org.dxos.type.organization:0.1.0","@meta":{"keys":[]},"name":"Blue Yard","website":"https://blueyard.com"}',
           },
         ],
         properties: {},
@@ -619,7 +619,7 @@ describe('ExecutionGraph', () => {
           { _tag: 'reasoning', reasoningText: 'I need to think about this' },
           { _tag: 'toolCall', toolCallId: 'tool1', name: 'analyze', input: '{}', providerExecuted: false },
           {
-            _tag: 'summary',
+            _tag: 'stats',
             message: 'OK',
             duration: 1000,
             toolCalls: 1,

package/src/execution-graph.ts

@@ -412,7 +412,7 @@ const createBlockCommit = (
         message: block.error ? 'Tool error: ' + block.error : 'Tool call succeeded',
       } satisfies Commit;
 
-    case 'summary':
+    case 'stats':
       return {
         id: getGenericBlockId(message.id, idx),
         branch,
@@ -420,7 +420,7 @@ const createBlockCommit = (
         timestamp,
         icon: IconType.ROCKET,
         level: LogLevel.INFO,
-        message: ContentBlock.createSummaryMessage(block),
+        message: ContentBlock.createStatsMessage(block),
       } satisfies Commit;
 
     case 'status':

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

@@ -7,7 +7,7 @@ import { type FunctionDefinition, defineFunction } from '@dxos/functions';
 import { ExtractionInput, ExtractionOutput } from '../extraction';
 
 export const extractionAnthropicFunction: FunctionDefinition<ExtractionInput, ExtractionOutput> = defineFunction({
-  key: 'dxos.org/function/extraction/extract-entities',
+  key: 'org.dxos.function.extraction.extract-entities',
   name: 'Extract Entities',
   description: 'Extract entities from the transcript message and add them to the message.',
   inputSchema: ExtractionInput,

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

@@ -35,7 +35,7 @@ describe.skip('NER EntityExtraction', () => {
   beforeAll(async () => {
     // TODO(dmaretskyi): Helper to scaffold this from a config.
     builder = await new EchoTestBuilder().open();
-    const { db: db1 } = await builder.createDatabase({ indexing: { vector: true } });
+    const { db: db1 } = await builder.createDatabase();
     db = db1;
     await db.graph.schemaRegistry.register(TYPES);
     const data = createTestData();

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

@@ -11,7 +11,7 @@ import { ExtractionInput, ExtractionOutput } from '../extraction';
  */
 // TODO(mykola): Make it use vector index to query objects and not pass objects as input.
 export const extractionNerFunction = defineFunction({
-  key: 'dxos.org/function/extraction/extract-entities',
+  key: 'org.dxos.function.extraction.extract-entities',
   name: 'Extract Entities',
   description: 'Extracts named entities from a text',
   inputSchema: ExtractionInput,

package/src/extraction/extraction.ts

@@ -5,7 +5,7 @@
 import * as Schema from 'effect/Schema';
 
 import { asyncTimeout } from '@dxos/async';
-import { Type } from '@dxos/echo';
+import { Obj } from '@dxos/echo';
 import { type FunctionDefinition } from '@dxos/functions';
 import { type FunctionExecutor } from '@dxos/functions-runtime';
 import { log } from '@dxos/log';
@@ -13,7 +13,7 @@ import { Message } from '@dxos/types';
 
 export const ExtractionInput = Schema.Struct({
   message: Message.Message,
-  objects: Schema.optional(Schema.Array(Type.Obj)),
+  objects: Schema.optional(Schema.Array(Obj.Unknown)),
   options: Schema.optional(
     Schema.Struct({
       timeout: Schema.optional(Schema.Number),