@dxos/assistant 0.9.1-main.c7dcc2e112 → 0.9.1-staging.ee54ba693a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/assistant",
-  "version": "0.9.1-main.c7dcc2e112",
+  "version": "0.9.1-staging.ee54ba693a",
   "description": "Natural language interface to DXOS",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -30,41 +30,44 @@
     "src"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.3.0-fragments.1",
+    "@automerge/automerge": "3.3.0-fragments.2",
     "@effect-atom/atom": "^0.5.3",
     "@effect-atom/atom-react": "^0.5.0",
     "@effect/ai": "0.36.0",
     "@effect/experimental": "0.60.0",
-    "@effect/platform": "0.96.1",
+    "@effect/platform": "0.96.2",
+    "@effect/rpc": "0.75.1",
     "@xenova/transformers": "^2.17.2",
     "lodash.defaultsdeep": "^4.6.1",
-    "@dxos/ai": "0.9.1-main.c7dcc2e112",
-    "@dxos/async": "0.9.1-main.c7dcc2e112",
-    "@dxos/compute": "0.9.1-main.c7dcc2e112",
-    "@dxos/context": "0.9.1-main.c7dcc2e112",
-    "@dxos/debug": "0.9.1-main.c7dcc2e112",
-    "@dxos/echo": "0.9.1-main.c7dcc2e112",
-    "@dxos/echo-client": "0.9.1-main.c7dcc2e112",
-    "@dxos/errors": "0.9.1-main.c7dcc2e112",
-    "@dxos/echo-protocol": "0.9.1-main.c7dcc2e112",
-    "@dxos/graph": "0.9.1-main.c7dcc2e112",
-    "@dxos/keys": "0.9.1-main.c7dcc2e112",
-    "@dxos/functions": "0.9.1-main.c7dcc2e112",
-    "@dxos/log": "0.9.1-main.c7dcc2e112",
-    "@dxos/mcp-client": "0.9.1-main.c7dcc2e112",
-    "@dxos/invariant": "0.9.1-main.c7dcc2e112",
-    "@dxos/node-std": "0.9.1-main.c7dcc2e112",
-    "@dxos/effect": "0.9.1-main.c7dcc2e112",
-    "@dxos/types": "0.9.1-main.c7dcc2e112",
-    "@dxos/schema": "0.9.1-main.c7dcc2e112",
-    "@dxos/util": "0.9.1-main.c7dcc2e112"
+    "@dxos/ai": "0.9.1-staging.ee54ba693a",
+    "@dxos/async": "0.9.1-staging.ee54ba693a",
+    "@dxos/compute": "0.9.1-staging.ee54ba693a",
+    "@dxos/compute-runtime": "0.9.1-staging.ee54ba693a",
+    "@dxos/debug": "0.9.1-staging.ee54ba693a",
+    "@dxos/context": "0.9.1-staging.ee54ba693a",
+    "@dxos/echo-client": "0.9.1-staging.ee54ba693a",
+    "@dxos/echo-doc": "0.9.1-staging.ee54ba693a",
+    "@dxos/effect": "0.9.1-staging.ee54ba693a",
+    "@dxos/echo": "0.9.1-staging.ee54ba693a",
+    "@dxos/echo-protocol": "0.9.1-staging.ee54ba693a",
+    "@dxos/errors": "0.9.1-staging.ee54ba693a",
+    "@dxos/functions": "0.9.1-staging.ee54ba693a",
+    "@dxos/graph": "0.9.1-staging.ee54ba693a",
+    "@dxos/keys": "0.9.1-staging.ee54ba693a",
+    "@dxos/log": "0.9.1-staging.ee54ba693a",
+    "@dxos/invariant": "0.9.1-staging.ee54ba693a",
+    "@dxos/mcp-client": "0.9.1-staging.ee54ba693a",
+    "@dxos/node-std": "0.9.1-staging.ee54ba693a",
+    "@dxos/schema": "0.9.1-staging.ee54ba693a",
+    "@dxos/types": "0.9.1-staging.ee54ba693a",
+    "@dxos/util": "0.9.1-staging.ee54ba693a"
   },
   "devDependencies": {
     "@types/lodash.defaultsdeep": "^4.6.6",
-    "effect": "3.21.3"
+    "effect": "3.21.4"
   },
   "peerDependencies": {
-    "effect": "3.21.3"
+    "effect": "3.21.4"
   },
   "publishConfig": {
     "access": "public"

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

@@ -12,7 +12,7 @@ import { Message } from '@dxos/types';
 
 import { findReferences, insertReferences } from '../quotes';
 
-const EXTRACTION_MODEL = 'ai.claude.model.claude-haiku-4-5';
+const EXTRACTION_MODEL = 'com.anthropic.model.claude-haiku-4-5.default';
 
 /**
  * Proper nouns extracted from transcript text.

package/src/index.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-export * from './functions';
+export * from './tool-runtime';
 export * from './request';
 export * from './session';
 export * from './templates';

package/src/request/AiRequest.ts

@@ -19,19 +19,19 @@ import {
   AiPreprocessor,
   AiSummarizer,
   type AiToolNotFoundError,
-  callTool,
   type OpaqueToolkit,
   type PromptPreprocessingError,
   type ToolExecutionService,
   type ToolResolverService,
+  callTool,
   withoutToolCallParising,
 } from '@dxos/ai';
-import { type Blueprint, Trace, Operation } from '@dxos/compute';
+import { Operation, type Skill, Trace } from '@dxos/compute';
 import { Database, Obj, Registry } from '@dxos/echo';
 import { log } from '@dxos/log';
 import { ContentBlock, Message } from '@dxos/types';
 
-import { getOperationFromTool } from '../functions/services';
+import { getOperationFromTool } from '../tool-runtime/services';
 import { type AiAssistantError, CompleteBlock, PartialBlock } from '../util';
 import { formatSystemPrompt, formatUserPrompt } from './format';
 import { GenerationObserver } from './observer';
@@ -75,7 +75,7 @@ export type RunProps<R = never> = {
   system?: string;
   history?: Message.Message[];
   objects?: Obj.Unknown[];
-  blueprints?: readonly Blueprint.Blueprint[];
+  skills?: readonly Skill.Skill[];
   toolkit?: OpaqueToolkit.OpaqueToolkit<R>;
 };
 
@@ -84,7 +84,7 @@ export type BeginProps = {
   system?: string;
   history?: Message.Message[];
   objects?: Obj.Unknown[];
-  blueprints?: readonly Blueprint.Blueprint[];
+  skills?: readonly Skill.Skill[];
 };
 
 export type TurnProps<R = never> = {
@@ -95,6 +95,12 @@ export type TurnProps<R = never> = {
 export type TurnResult = {
   messages: Message.Message[];
   done: boolean;
+  /**
+   * Provider finish reason for this turn. `pause` means the provider paused a server-tool turn
+   * mid-execution (e.g. Anthropic `pause_turn`) and the turn must be resumed by issuing another
+   * request without mutating the trailing assistant content.
+   */
+  finishReason?: ContentBlock.FinishReason;
 };
 
 /**
@@ -183,7 +189,7 @@ export class Request {
     prompt,
     system,
     history = [],
-    blueprints = [],
+    skills = [],
     objects = [],
   }: BeginProps): Effect.Effect<void, RunError, RunRequirements> =>
     Effect.gen(this, function* () {
@@ -191,7 +197,7 @@ export class Request {
       this._history = [...history];
       this._pending = [];
 
-      const systemPrompt = yield* formatSystemPrompt({ system, blueprints, objects }).pipe(Effect.orDie);
+      const systemPrompt = yield* formatSystemPrompt({ system, skills, objects }).pipe(Effect.orDie);
 
       if (this._options.summarizationThreshold !== undefined) {
         const tokenCount = yield* AiPreprocessor.estimateTokens(
@@ -210,7 +216,7 @@ export class Request {
 
   /**
    * Execute a single turn: one LLM generation followed by tool execution.
-   * The toolkit and system prompt can be updated between turns to reflect context changes (e.g. dynamically enabled blueprints).
+   * The toolkit and system prompt can be updated between turns to reflect context changes (e.g. dynamically enabled skills).
    */
   runAgentTurn = <const R = never>({
     system,
@@ -232,6 +238,7 @@ export class Request {
 
       const observer = this._observer;
       let currentMessageId: Obj.ID | null = null;
+      let finishReason: ContentBlock.FinishReason | undefined;
 
       const messages = yield* LanguageModel.streamText({
         prompt,
@@ -250,6 +257,9 @@ export class Request {
         Stream.mapEffect(
           (block) =>
             Effect.gen(this, function* () {
+              if (block._tag === 'stats' && block.finishReason !== undefined) {
+                finishReason = block.finishReason;
+              }
               if (block.pending) {
                 currentMessageId ??= Obj.ID.random();
                 log('emit ephemeral message', { id: currentMessageId, type: block._tag });
@@ -281,16 +291,23 @@ export class Request {
       );
       log('messages', { messages });
 
+      // A paused server-tool turn (e.g. Anthropic `pause_turn`) is not complete: the provider
+      // expects the assistant content to be resent so it can finish executing the server tool.
+      // No local tool execution is needed — just another request.
+      if (finishReason === 'pause') {
+        return { messages, done: false, finishReason };
+      }
+
       const toolCalls = this.getToolCalls();
 
       if (toolCalls.length === 0) {
         this._ended = Date.now();
-        return { messages, done: true };
+        return { messages, done: true, finishReason };
       } else if (!toolkit) {
         throw new Error('No toolkit provided');
       }
 
-      return { messages, done: false };
+      return { messages, done: false, finishReason };
     }).pipe(Effect.withSpan('AiRequest.runAgentTurn'));
 
   runTools = <const R = never>({
@@ -327,19 +344,23 @@ export class Request {
     system: systemTemplate,
     history = [],
     objects = [],
-    blueprints = [],
+    skills = [],
     toolkit,
   }: RunProps<R>): Effect.Effect<Message.Message[], RunError, RunRequirements | R> =>
     Effect.gen(this, function* () {
-      yield* this.begin({ prompt, system: systemTemplate, history, objects, blueprints });
+      yield* this.begin({ prompt, system: systemTemplate, history, objects, skills });
 
-      const system = yield* formatSystemPrompt({ system: systemTemplate, blueprints, objects }).pipe(Effect.orDie);
+      const system = yield* formatSystemPrompt({ system: systemTemplate, skills, objects }).pipe(Effect.orDie);
 
       do {
-        const { done } = yield* this.runAgentTurn({ system, toolkit });
+        const { done, finishReason } = yield* this.runAgentTurn({ system, toolkit });
         if (done) {
           break;
         }
+        // A paused server-tool turn resumes with another request and no local tool execution.
+        if (finishReason === 'pause') {
+          continue;
+        }
         yield* this.runTools({ toolkit });
       } while (true);
 

package/src/request/format.ts

@@ -25,31 +25,29 @@ import { ArtifactDiffResolver } from './artifact-diff';
 // TODO(burdon): Move to AiPreprocessor.
 export const formatSystemPrompt = ({
   system,
-  blueprints = [],
+  skills = [],
   objects = [],
-}: Pick<AiRequest.RunProps, 'system' | 'blueprints' | 'objects'>): Effect.Effect<
+}: Pick<AiRequest.RunProps, 'system' | 'skills' | 'objects'>): Effect.Effect<
   string,
   FunctionNotFoundError | EntityNotFoundError,
   Database.Service | Registry.Service | Operation.Service
 > =>
   Effect.gen(function* () {
-    const blueprintDefs = yield* Function.pipe(
-      blueprints,
-      Effect.forEach((blueprint) => Effect.succeed(blueprint.instructions)),
+    const skillDefs = yield* Function.pipe(
+      skills,
+      Effect.forEach((skill) => Effect.succeed(skill.instructions)),
       Effect.flatMap(
         Effect.forEach((template) =>
           Effect.gen(function* () {
             return trim`
-            <blueprint>
+            <skill>
               ${yield* Template.processTemplate(template)}
-            </blueprint>
+            </skill>
           `;
           }),
         ),
       ),
-      Effect.map((blueprints) =>
-        blueprints.length > 0 ? ['## Blueprints Definitions', ...blueprints].join('\n\n') : undefined,
-      ),
+      Effect.map((skills) => (skills.length > 0 ? ['## Skills Definitions', ...skills].join('\n\n') : undefined)),
     );
 
     const objectDefs = yield* Function.pipe(
@@ -66,7 +64,7 @@ export const formatSystemPrompt = ({
     );
 
     return yield* Function.pipe(
-      Effect.succeed([system, blueprintDefs, objectDefs].filter((def): def is string => def !== undefined)),
+      Effect.succeed([system, skillDefs, objectDefs].filter((def): def is string => def !== undefined)),
       Effect.map((parts) => parts.join('\n\n')),
     );
   }).pipe(Effect.withSpan('formatSystemPrompt'));

package/src/session/AiContext.test.ts

@@ -2,48 +2,68 @@
 // Copyright 2025 DXOS.org
 //
 
-import * as Context from 'effect/Context';
 import * as Effect from 'effect/Effect';
-import * as Layer from 'effect/Layer';
-import * as Runtime from 'effect/Runtime';
 import * as Schema from 'effect/Schema';
-import { describe, it } from 'vitest';
+import { describe, test } from 'vitest';
 
-import { DXN, Feed, Obj, Ref, Type } from '@dxos/echo';
+import { Database, DXN, Feed, Obj, Ref, Type } from '@dxos/echo';
+import { TestDatabaseLayer } from '@dxos/echo-client/testing';
 
 import * as AiContext from './AiContext';
 
-const createMockFeedRuntime = (): Runtime.Runtime<Feed.FeedService> => {
-  const mockFeedService: Context.Tag.Service<Feed.FeedService> = {
-    append: async () => {},
-    remove: async () => {},
-    query: () =>
-      ({
-        subscribe: () => () => {},
-        results: [],
-        run: async () => [],
-      }) as any,
-    sync: async () => {},
-    getSyncState: async () => ({ blocksToPull: 0, blocksToPush: 0, totalBlocks: 0 }),
-  };
-  const layer = Layer.succeed(Feed.FeedService, mockFeedService);
-  return Effect.runSync(Effect.runtime<Feed.FeedService>().pipe(Effect.provide(layer)));
-};
+const TypeA = Type.makeObject(DXN.make('org.dxos.type.a', '0.1.0'))(Schema.Struct({}));
+const TypeB = Type.makeObject(DXN.make('org.dxos.type.b', '0.1.0'))(Schema.Struct({}));
 
 describe('AiContext.Binder', () => {
-  it('should handle bind with Ref', async () => {
-    const feed = Feed.make();
-    const runtime = createMockFeedRuntime();
-    const binder = new AiContext.Binder({ feed, runtime });
+  const TestLayer = TestDatabaseLayer({ types: [Feed.Feed, TypeA, TypeB] });
 
-    const TestSchema = Schema.Struct({}).pipe(Type.makeObject(DXN.make('org.dxos.type.example', '0.1.0')));
+  test('reopened binder resolves all distinct bound objects', async ({ expect }) => {
+    await Effect.gen(function* () {
+      const feed = yield* Database.add(Feed.make());
+      const runtime = yield* Effect.runtime<Database.Service>();
 
-    const obj = Obj.make(TestSchema, {});
-    const ref = Ref.make(obj);
+      const a = yield* Database.add(Obj.make(TypeA, {}));
+      const b = yield* Database.add(Obj.make(TypeB, {}));
 
-    await binder.bind({
-      blueprints: [],
-      objects: [ref],
-    });
+      // Bind two distinct objects across two separate bindings (as the chat + companion do).
+      const writer = new AiContext.Binder({ feed, runtime });
+      yield* Effect.promise(() => writer.open());
+      yield* Effect.promise(() => writer.bind({ objects: [Ref.make(a)] }));
+      yield* Effect.promise(() => writer.bind({ objects: [Ref.make(b)] }));
+      yield* Effect.promise(() => writer.close());
+
+      // Reopen over the same feed (the path ContextModule takes): bindings are re-read via _reduce.
+      const reader = new AiContext.Binder({ feed, runtime });
+      yield* Effect.promise(() => reader.open());
+      const objects = reader.getObjects();
+      yield* Effect.promise(() => reader.close());
+
+      expect(objects.map((obj) => Obj.getURI(obj)).sort()).toEqual([Obj.getURI(a), Obj.getURI(b)].sort());
+    })
+      .pipe(Effect.provide(TestLayer))
+      .pipe(Effect.runPromise);
+  });
+
+  test('should handle bind with Ref', async () => {
+    await Effect.gen(function* () {
+      const feed = yield* Database.add(Feed.make());
+      const runtime = yield* Effect.runtime<Database.Service>();
+
+      const TestSchema = Type.makeObject(DXN.make('org.dxos.type.example', '0.1.0'))(Schema.Struct({}));
+
+      const obj = Obj.make(TestSchema, {});
+      const ref = Ref.make(obj);
+
+      const binder = new AiContext.Binder({ feed, runtime });
+
+      yield* Effect.promise(() =>
+        binder.bind({
+          skills: [],
+          objects: [ref],
+        }),
+      );
+    })
+      .pipe(Effect.provide(TestLayer))
+      .pipe(Effect.runPromise);
   });
 });