@dxos/assistant-toolkit 0.8.4-main.c85a9c8dae → 0.8.4-main.dfabb4ec29

package/src/blueprints/browser/blueprint.test.ts

@@ -4,67 +4,58 @@
 
 import { describe, it } from '@effect/vitest';
 import * as Effect from 'effect/Effect';
-import * as Layer from 'effect/Layer';
 
 import { MemoizedAiService } from '@dxos/ai/testing';
-import { AiConversationService } from '@dxos/assistant';
-import { AssistantTestLayerWithTriggers } from '@dxos/assistant/testing';
-import { Blueprint } from '@dxos/blueprints';
 import { SpaceProperties } from '@dxos/client-protocol';
-import { Collection, Database, Query } from '@dxos/echo';
+import { Blueprint, OperationHandlerSet } from '@dxos/compute';
+import { Collection, Database, Feed, Query } from '@dxos/echo';
 import { TestHelpers } from '@dxos/effect/testing';
+import { AgentService } from '@dxos/functions-runtime';
+import { AssistantTestLayerWithTriggers } from '@dxos/functions-runtime/testing';
 import { ObjectId } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { MarkdownBlueprint } from '@dxos/plugin-markdown/blueprints';
+import { MarkdownBlueprint } from '@dxos/plugin-markdown';
+import { Markdown } from '@dxos/plugin-markdown';
+import { MarkdownOperationHandlerSet } from '@dxos/plugin-markdown/plugin';
 import { WithProperties } from '@dxos/plugin-markdown/testing';
-import { Markdown } from '@dxos/plugin-markdown/types';
 import { Person } from '@dxos/types';
-import { trim } from '@dxos/util';
-
-import { DatabaseBlueprint } from '../database';
-import { addBlueprints } from '../testing';
 
+import { DatabaseBlueprint, DatabaseHandlers } from '../database';
 import BrowserBlueprint from './blueprint';
 
 ObjectId.dangerouslyDisableRandomness();
 
 const TestLayer = AssistantTestLayerWithTriggers({
   aiServicePreset: 'edge-remote',
-  functions: [DatabaseBlueprint, MarkdownBlueprint, BrowserBlueprint].flatMap((blueprint) => blueprint.functions),
-  types: [Blueprint.Blueprint, Person.Person, Markdown.Document, SpaceProperties, Collection.Collection],
+  operationHandlers: OperationHandlerSet.merge(DatabaseHandlers, MarkdownOperationHandlerSet),
+  types: [Blueprint.Blueprint, Person.Person, Markdown.Document, SpaceProperties, Collection.Collection, Feed.Feed],
+  blueprints: [BrowserBlueprint.make(), MarkdownBlueprint.make(), DatabaseBlueprint.make()],
   tracing: 'pretty',
 });
 
 describe('Browser', () => {
-  it.scoped(
+  it.effect(
     'scrape effect blog',
     Effect.fnUntraced(
       function* (_) {
-        yield* addBlueprints([BrowserBlueprint, MarkdownBlueprint, DatabaseBlueprint]);
-        yield* AiConversationService.run({
-          system: NON_INTERACTIVE_SYSTEM,
-          prompt: `
-            Scrape effect blog at https://effect.website/blog and find the content of last 3 articles.
-            Create/update Person object for each author.
-            Create Markdown document for each article.
-          `,
+        const agent = yield* AgentService.createSession({
+          blueprints: [BrowserBlueprint.make(), MarkdownBlueprint.make(), DatabaseBlueprint.make()],
         });
+        yield* agent.submitPrompt(`
+          Scrape effect blog at https://effect.website/blog and find the content of last 3 articles.
+          Create/update Person object for each author.
+          Create Markdown document for each article.
+        `);
+        yield* agent.waitForCompletion();
         const people = yield* Database.runQuery(Query.type(Person.Person));
         log.info(`people`, { people });
         const documents = yield* Database.runQuery(Query.type(Markdown.Document));
         log.info(`documents`, { documents });
       },
-      WithProperties, // TODO(dmaretskyi): Still required.
-      Effect.provide(AiConversationService.layerNewQueue().pipe(Layer.provideMerge(TestLayer))),
+      WithProperties,
+      Effect.provide(TestLayer),
       TestHelpers.provideTestContext,
-      TestHelpers.taggedTest('sync'),
     ),
-    MemoizedAiService.isGenerationEnabled() ? 240_000 : 30_000,
+    { timeout: MemoizedAiService.isGenerationEnabled() ? 240_000 : 30_000, tags: ['sync'] },
   );
 });
-
-const NON_INTERACTIVE_SYSTEM = trim`
-  You are running in a non-interactive session.
-  Do not ask questions.
-  Complete the task, if unable to complete the task, inform why in a detailed and factual way, (i.e. "I tried to use tool X but got error Y").
-`;

package/src/blueprints/browser/blueprint.ts

@@ -2,13 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type AppCapabilities } from '@dxos/app-toolkit';
-import { Blueprint } from '@dxos/blueprints';
+import { Blueprint } from '@dxos/compute';
 import { Ref } from '@dxos/echo';
 import { Text } from '@dxos/schema';
 import { trim } from '@dxos/util';
 
-const BLUEPRINT_KEY = 'dxos.org/blueprint/browser';
+const BLUEPRINT_KEY = 'org.dxos.blueprint.browser';
 
 const instructions = trim`
   You are able to connect and use a virtual browser with persistent session.
@@ -20,8 +19,9 @@ const make = () =>
     key: BLUEPRINT_KEY,
     name: 'Browser',
     description: 'Access to a real isolated browser.',
+    agentCanEnable: true,
     instructions: {
-      source: Ref.make(Text.make(instructions)),
+      source: Ref.make(Text.make({ content: instructions })),
     },
     mcpServers: [
       {
@@ -32,10 +32,9 @@ const make = () =>
     ],
   });
 
-const blueprint: AppCapabilities.BlueprintDefinition = {
+const blueprint: Blueprint.Definition = {
   key: BLUEPRINT_KEY,
   make,
-  functions: [],
 };
 
 export default blueprint;