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

package/src/blueprints/research/{research-blueprint.ts → blueprint.ts}

@@ -3,12 +3,17 @@
 //
 
 import { ToolId } from '@dxos/ai';
+import { type AppCapabilities } from '@dxos/app-toolkit';
 import { Blueprint } from '@dxos/blueprints';
 import { Ref } from '@dxos/echo';
 import { Text } from '@dxos/schema';
 import { trim } from '@dxos/util';
 
-import { Research } from '../../functions';
+import { ResearchFunctions } from './functions';
+
+const BLUEPRINT_KEY = 'dxos.org/blueprint/research';
+
+const functions = Object.values(ResearchFunctions);
 
 /**
  * Agent prompt instructions for managing hierarchical task lists.
@@ -20,7 +25,7 @@ const instructions = trim`
   Structured data extraction is an experimental feature -- only enable it if the user explicitly requests it in the prompt.
   Prefer updating existing notes instead of creating new ones.
 
-  <strcutured_mode>
+  <structured_mode>
     When you are done, reply with the created objects.
     Do not print the data, instead reply with inline references to the created objects.
     Those will be later substituted with the pills representing the created objects.
@@ -40,12 +45,21 @@ const instructions = trim`
   </unstructured_mode>
 `;
 
-export const blueprint = Blueprint.make({
-  key: 'dxos.org/blueprint/research',
-  name: 'Research',
-  description: 'Researches the web and creates structured data.',
-  instructions: {
-    source: Ref.make(Text.make(instructions)),
-  },
-  tools: [Research.create, Research.research].map((fn) => ToolId.make(fn.key)),
-});
+const make = () =>
+  Blueprint.make({
+    key: BLUEPRINT_KEY,
+    name: 'Research',
+    description: 'Researches the web and creates structured data.',
+    instructions: {
+      source: Ref.make(Text.make(instructions)),
+    },
+    tools: functions.map((fn) => ToolId.make(fn.key)),
+  });
+
+const blueprint: AppCapabilities.BlueprintDefinition = {
+  key: BLUEPRINT_KEY,
+  functions,
+  make,
+};
+
+export default blueprint;

package/src/{functions/research → blueprints/research/functions}/document-create.ts

@@ -5,9 +5,7 @@
 import * as Effect from 'effect/Effect';
 import * as Schema from 'effect/Schema';
 
-import { ArtifactId } from '@dxos/assistant';
-import { Obj, Relation } from '@dxos/echo';
-import { Database } from '@dxos/echo';
+import { Database, Obj, Ref, Relation } from '@dxos/echo';
 import { TracingService, defineFunction } from '@dxos/functions';
 import { log } from '@dxos/log';
 import { Markdown } from '@dxos/plugin-markdown/types';
@@ -19,7 +17,7 @@ export default defineFunction({
   name: 'Create research document',
   description: 'Creates a note summarizing the research.',
   inputSchema: Schema.Struct({
-    subject: ArtifactId.annotations({
+    subject: Ref.Ref(Obj.Unknown).annotations({
       description: trim`
         ID of the object (organization, contact, etc.) for which the research was performed. 
       `,
@@ -35,7 +33,7 @@ export default defineFunction({
     }),
   }),
   outputSchema: Schema.Struct({
-    document: ArtifactId.annotations({
+    document: Schema.String.annotations({
       description: 'DXN of the created document.',
     }),
   }),
@@ -43,14 +41,13 @@ export default defineFunction({
     log.info('Creating research document', { subject, name, content });
 
     // TODO(burdon): Auto flush before and after calling function?
-    yield* Database.Service.flush({ indexes: true });
+    yield* Database.flush({ indexes: true });
     yield* TracingService.emitStatus({ message: 'Creating research document...' });
 
-    // TODO(burdon): Type check.
-    const target = (yield* Database.Service.resolve(ArtifactId.toDXN(subject))) as Obj.Unknown;
+    const target = yield* Database.load(subject);
 
     // Create document.
-    const object = yield* Database.Service.add(
+    const object = yield* Database.add(
       Markdown.make({
         name,
         content,
@@ -58,7 +55,7 @@ export default defineFunction({
     );
 
     // Create relation.
-    yield* Database.Service.add(
+    yield* Database.add(
       Relation.make(HasSubject.HasSubject, {
         [Relation.Source]: object,
         [Relation.Target]: target,
@@ -66,7 +63,7 @@ export default defineFunction({
       }),
     );
 
-    yield* Database.Service.flush({ indexes: true });
+    yield* Database.flush({ indexes: true });
     log.info('Created research document', { subject, object });
 
     return {

package/src/blueprints/research/functions/index.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import Create from './document-create';
+import Research from './research';
+
+export const ResearchFunctions = {
+  Create,
+  Research,
+};