@dxos/assistant-toolkit 0.8.4-main.ae835ea → 0.8.4-main.e8ec1fe

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/assistant-toolkit",
-  "version": "0.8.4-main.ae835ea",
+  "version": "0.8.4-main.e8ec1fe",
   "description": "Assistant toolkit, definitions, and utilities.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -25,31 +25,33 @@
   ],
   "dependencies": {
     "@effect/ai": "0.29.1",
-    "@effect/ai-anthropic": "0.19.2",
+    "@effect/ai-anthropic": "0.21.1",
     "@effect/experimental": "0.56.0",
     "@effect/platform": "^0.92.1",
     "dfx": "^0.126.0",
     "exa-js": "^1.5.12",
-    "@dxos/ai": "0.8.4-main.ae835ea",
-    "@dxos/app-framework": "0.8.4-main.ae835ea",
-    "@dxos/assistant": "0.8.4-main.ae835ea",
-    "@dxos/blueprints": "0.8.4-main.ae835ea",
-    "@dxos/context": "0.8.4-main.ae835ea",
-    "@dxos/conductor": "0.8.4-main.ae835ea",
-    "@dxos/echo-db": "0.8.4-main.ae835ea",
-    "@dxos/echo": "0.8.4-main.ae835ea",
-    "@dxos/echo-protocol": "0.8.4-main.ae835ea",
-    "@dxos/edge-client": "0.8.4-main.ae835ea",
-    "@dxos/functions": "0.8.4-main.ae835ea",
-    "@dxos/errors": "0.8.4-main.ae835ea",
-    "@dxos/invariant": "0.8.4-main.ae835ea",
-    "@dxos/keys": "0.8.4-main.ae835ea",
-    "@dxos/log": "0.8.4-main.ae835ea",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.ae835ea",
-    "@dxos/util": "0.8.4-main.ae835ea",
-    "@dxos/effect": "0.8.4-main.ae835ea",
-    "@dxos/plugin-markdown": "0.8.4-main.ae835ea",
-    "@dxos/schema": "0.8.4-main.ae835ea"
+    "@dxos/ai": "0.8.4-main.e8ec1fe",
+    "@dxos/assistant": "0.8.4-main.e8ec1fe",
+    "@dxos/blueprints": "0.8.4-main.e8ec1fe",
+    "@dxos/app-framework": "0.8.4-main.e8ec1fe",
+    "@dxos/context": "0.8.4-main.e8ec1fe",
+    "@dxos/echo-db": "0.8.4-main.e8ec1fe",
+    "@dxos/conductor": "0.8.4-main.e8ec1fe",
+    "@dxos/echo-protocol": "0.8.4-main.e8ec1fe",
+    "@dxos/edge-client": "0.8.4-main.e8ec1fe",
+    "@dxos/effect": "0.8.4-main.e8ec1fe",
+    "@dxos/echo": "0.8.4-main.e8ec1fe",
+    "@dxos/errors": "0.8.4-main.e8ec1fe",
+    "@dxos/functions": "0.8.4-main.e8ec1fe",
+    "@dxos/keys": "0.8.4-main.e8ec1fe",
+    "@dxos/functions-runtime": "0.8.4-main.e8ec1fe",
+    "@dxos/log": "0.8.4-main.e8ec1fe",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.e8ec1fe",
+    "@dxos/schema": "0.8.4-main.e8ec1fe",
+    "@dxos/invariant": "0.8.4-main.e8ec1fe",
+    "@dxos/plugin-markdown": "0.8.4-main.e8ec1fe",
+    "@dxos/types": "0.8.4-main.e8ec1fe",
+    "@dxos/util": "0.8.4-main.e8ec1fe"
   },
   "devDependencies": {
     "effect": "3.18.3",

package/src/blueprints/design/design-blueprint.test.ts

@@ -18,17 +18,12 @@ import {
 import { Blueprint } from '@dxos/blueprints';
 import { Obj, Ref } from '@dxos/echo';
 import { TestHelpers, acquireReleaseResource } from '@dxos/effect';
-import {
-  ComputeEventLogger,
-  DatabaseService,
-  FunctionInvocationService,
-  QueueService,
-  TracingService,
-} from '@dxos/functions';
-import { TestDatabaseLayer } from '@dxos/functions/testing';
+import { DatabaseService, QueueService, TracingService } from '@dxos/functions';
+import { FunctionInvocationServiceLayerTestMocked, TestDatabaseLayer } from '@dxos/functions-runtime/testing';
 import { log } from '@dxos/log';
 import { Markdown } from '@dxos/plugin-markdown/types';
-import { DataType } from '@dxos/schema';
+import { Text } from '@dxos/schema';
+import { type Message } from '@dxos/types';
 import { trim } from '@dxos/util';
 
 import { Document } from '../../functions';
@@ -42,7 +37,7 @@ describe('Design Blueprint', { timeout: 120_000 }, () => {
     Effect.fn(
       function* ({ expect }) {
         const observer = GenerationObserver.fromPrinter(new ConsolePrinter());
-        const queue = yield* QueueService.createQueue<DataType.Message | ContextBinding>();
+        const queue = yield* QueueService.createQueue<Message.Message | ContextBinding>();
         const conversation = yield* acquireReleaseResource(() => new AiConversation(queue));
 
         yield* DatabaseService.add(blueprint);
@@ -52,7 +47,7 @@ describe('Design Blueprint', { timeout: 120_000 }, () => {
           }),
         );
 
-        const artifact = yield* DatabaseService.add(Markdown.makeDocument({ content: 'Hello, world!' }));
+        const artifact = yield* DatabaseService.add(Markdown.make({ content: 'Hello, world!' }));
         let prevContent = artifact.content;
 
         {
@@ -92,16 +87,16 @@ describe('Design Blueprint', { timeout: 120_000 }, () => {
           makeToolExecutionServiceFromFunctions(testToolkit, testToolkit.toLayer({}) as any),
           AiService.model('@anthropic/claude-3-5-sonnet-20241022'),
         ).pipe(
-          Layer.provideMerge(TestDatabaseLayer({ types: [DataType.Text, Markdown.Document, Blueprint.Blueprint] })),
+          Layer.provideMerge(TestDatabaseLayer({ types: [Text.Text, Markdown.Document, Blueprint.Blueprint] })),
           Layer.provideMerge(AiServiceTestingPreset('direct')),
           Layer.provideMerge(
-            FunctionInvocationService.layerTestMocked({ functions: [Document.read, Document.update] }).pipe(
-              Layer.provideMerge(ComputeEventLogger.layerFromTracing),
+            FunctionInvocationServiceLayerTestMocked({ functions: [Document.read, Document.update] }).pipe(
               Layer.provideMerge(TracingService.layerNoop),
             ),
           ),
         ),
       ),
+      TestHelpers.provideTestContext,
       TestHelpers.taggedTest('llm'),
     ),
   );

package/src/blueprints/design/design-blueprint.ts

@@ -5,7 +5,7 @@
 import { ToolId } from '@dxos/ai';
 import { Blueprint } from '@dxos/blueprints';
 import { Obj, Ref } from '@dxos/echo';
-import { DataType } from '@dxos/schema';
+import { Text } from '@dxos/schema';
 import { trim } from '@dxos/util';
 
 import { Document } from '../../functions';
@@ -25,7 +25,7 @@ const blueprint: Blueprint.Blueprint = Obj.make(Blueprint.Blueprint, {
   name: 'Design Spec',
   description: 'Preserve the conversation in the design spec.',
   instructions: {
-    source: Ref.make(DataType.makeText(instructions)),
+    source: Ref.make(Text.make(instructions)),
   },
   tools: [Document.read, Document.update].map((fn) => ToolId.make(fn.key)),
 });

package/src/blueprints/discord/discord-blueprint.ts

@@ -5,7 +5,7 @@
 import { ToolId } from '@dxos/ai';
 import { Blueprint } from '@dxos/blueprints';
 import { Obj, Ref } from '@dxos/echo';
-import { DataType } from '@dxos/schema';
+import { Text } from '@dxos/schema';
 import { trim } from '@dxos/util';
 
 import { Discord } from '../../functions';
@@ -26,7 +26,7 @@ export const blueprint = Obj.make(Blueprint.Blueprint, {
   name: 'Discord',
   description: 'Discord integration.',
   instructions: {
-    source: Ref.make(DataType.makeText(instructions)),
+    source: Ref.make(Text.make(instructions)),
   },
   tools: [ToolId.make(Discord.fetch.key)],
 });

package/src/blueprints/linear/linear-blueprint.ts

@@ -5,7 +5,7 @@
 import { ToolId } from '@dxos/ai';
 import { Blueprint } from '@dxos/blueprints';
 import { Obj, Ref } from '@dxos/echo';
-import { DataType } from '@dxos/schema';
+import { Text } from '@dxos/schema';
 import { trim } from '@dxos/util';
 
 import { Linear } from '../../functions';
@@ -27,7 +27,7 @@ export const blueprint = Obj.make(Blueprint.Blueprint, {
   name: 'Linear',
   description: 'Syncs Linear workspaces.',
   instructions: {
-    source: Ref.make(DataType.makeText(instructions)),
+    source: Ref.make(Text.make(instructions)),
   },
   tools: [Linear.sync].map((tool) => ToolId.make(tool.key)),
 });

package/src/blueprints/planning/planning-blueprint.test.ts

@@ -17,18 +17,13 @@ import {
 import { Blueprint } from '@dxos/blueprints';
 import { Obj, Ref } from '@dxos/echo';
 import { TestHelpers, acquireReleaseResource } from '@dxos/effect';
-import {
-  ComputeEventLogger,
-  DatabaseService,
-  FunctionImplementationResolver,
-  FunctionInvocationService,
-  QueueService,
-  TracingService,
-} from '@dxos/functions';
-import { TestDatabaseLayer } from '@dxos/functions/testing';
+import { DatabaseService, QueueService, TracingService } from '@dxos/functions';
+import { FunctionImplementationResolver } from '@dxos/functions-runtime';
+import { FunctionInvocationServiceLayerTestMocked, TestDatabaseLayer } from '@dxos/functions-runtime/testing';
 import { log } from '@dxos/log';
 import { Markdown } from '@dxos/plugin-markdown/types';
-import { DataType } from '@dxos/schema';
+import { Text } from '@dxos/schema';
+import { type Message } from '@dxos/types';
 import { trim } from '@dxos/util';
 
 import { Tasks } from '../../functions';
@@ -41,7 +36,7 @@ describe('Planning Blueprint', { timeout: 120_000 }, () => {
     'planning blueprint',
     Effect.fn(
       function* ({ expect }) {
-        const queue = yield* QueueService.createQueue<DataType.Message | ContextBinding>();
+        const queue = yield* QueueService.createQueue<Message.Message | ContextBinding>();
         const conversation = yield* acquireReleaseResource(() => new AiConversation(queue));
 
         yield* DatabaseService.add(blueprint);
@@ -51,7 +46,7 @@ describe('Planning Blueprint', { timeout: 120_000 }, () => {
           }),
         );
 
-        const artifact = yield* DatabaseService.add(Markdown.makeDocument());
+        const artifact = yield* DatabaseService.add(Markdown.make());
         let prevContent = artifact.content;
         const matchList =
           ({ includes = [], excludes = [] }: { includes: RegExp[]; excludes?: RegExp[] }) =>
@@ -107,22 +102,22 @@ describe('Planning Blueprint', { timeout: 120_000 }, () => {
       },
       Effect.provide(
         Layer.mergeAll(
-          TestDatabaseLayer({ types: [DataType.Text, Markdown.Document, Blueprint.Blueprint] }),
+          TestDatabaseLayer({ types: [Text.Text, Markdown.Document, Blueprint.Blueprint] }),
           makeToolResolverFromFunctions([Tasks.read, Tasks.update], testToolkit),
           makeToolExecutionServiceFromFunctions(testToolkit, testToolkit.toLayer({}) as any),
           AiService.model('@anthropic/claude-3-5-sonnet-20241022'),
         ).pipe(
           Layer.provideMerge(
-            FunctionInvocationService.layerTestMocked({ functions: [Tasks.read, Tasks.update] }).pipe(
-              Layer.provideMerge(ComputeEventLogger.layerFromTracing),
+            FunctionInvocationServiceLayerTestMocked({ functions: [Tasks.read, Tasks.update] }).pipe(
               Layer.provideMerge(TracingService.layerNoop),
             ),
           ),
           Layer.provideMerge(FunctionImplementationResolver.layerTest({ functions: [Tasks.read, Tasks.update] })),
-          Layer.provideMerge(TestDatabaseLayer({ types: [DataType.Text, Markdown.Document, Blueprint.Blueprint] })),
+          Layer.provideMerge(TestDatabaseLayer({ types: [Text.Text, Markdown.Document, Blueprint.Blueprint] })),
           Layer.provideMerge(AiServiceTestingPreset('direct')),
         ),
       ),
+      TestHelpers.provideTestContext,
       TestHelpers.taggedTest('llm'),
     ),
   );

package/src/blueprints/planning/planning-blueprint.ts

@@ -5,7 +5,7 @@
 import { ToolId } from '@dxos/ai';
 import { Blueprint } from '@dxos/blueprints';
 import { Obj, Ref } from '@dxos/echo';
-import { DataType } from '@dxos/schema';
+import { Text } from '@dxos/schema';
 import { trim } from '@dxos/util';
 
 import { Tasks } from '../../functions';
@@ -90,7 +90,7 @@ export const blueprint: Blueprint.Blueprint = Obj.make(Blueprint.Blueprint, {
   name: 'Planning',
   description: 'Plans and tracks complex tasks with artifact management.',
   instructions: {
-    source: Ref.make(DataType.makeText(instructions)),
+    source: Ref.make(Text.make(instructions)),
   },
   tools: [Tasks.read, Tasks.update].map((fn) => ToolId.make(fn.key)),
 });

package/src/blueprints/research/research-blueprint.ts

@@ -5,7 +5,7 @@
 import { ToolId } from '@dxos/ai';
 import { Blueprint } from '@dxos/blueprints';
 import { Obj, Ref } from '@dxos/echo';
-import { DataType } from '@dxos/schema';
+import { Text } from '@dxos/schema';
 import { trim } from '@dxos/util';
 
 import { Research } from '../../functions';
@@ -17,19 +17,27 @@ const instructions = trim`
   {{! Research }}
 
   You are an analyst that does research tasks using tools that scrape the web and create structured data.
-  The result of the research is a set of structured entities forming an interconnected graph.
-  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.
-  Print the rest of the created objects as block references after the main note.
-
-  <example>
-    Based on my research, Google was founded by @dxn:queue:data:B6INSIBY3CBEF4M5VZRYBCMAHQMPYK5AJ:01K24XMVHSZHS97SG1VTVQDM5Z:01K24XPK464FSCKVQJAB2H662M and @dxn:queue:data:B6INSIBY3CBEF4M5VZRYBCMAHQMPYK5AJ:01K24XMVHSZHS97SG1VTVQDM5Z:01K24XPK46K31DDW62PBW9H2ZQ
-
-    <object><dxn>dxn:queue:data:B6INSIBY3CBEF4M5VZRYBCMAHQMPYK5AJ:01K24XMVHSZHS97SG1VTVQDM5Z:01K24XPK464FSCKVQJAB2H662M</dxn></object>
-    <object><dxn>dxn:queue:data:B6INSIBY3CBEF4M5VZRYBCMAHQMPYK5AJ:01K24XMVHSZHS97SG1VTVQDM5Z:01K24XPK46K31DDW62PBW9H2ZQ</dxn></object>
-    <object><dxn>dxn:queue:data:B6INSIBY3CBEF4M5VZRYBCMAHQMPYK5AJ:01K24XMVHSZHS97SG1VTVQDM5Z:01K24XPK46K31DDW62PBW92333</dxn></object>
-  </example>
+  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>
+    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.
+    Print the rest of the created objects as block references after the main note.
+
+    <example>
+      Based on my research, Google was founded by @dxn:queue:data:B6INSIBY3CBEF4M5VZRYBCMAHQMPYK5AJ:01K24XMVHSZHS97SG1VTVQDM5Z:01K24XPK464FSCKVQJAB2H662M and @dxn:queue:data:B6INSIBY3CBEF4M5VZRYBCMAHQMPYK5AJ:01K24XMVHSZHS97SG1VTVQDM5Z:01K24XPK46K31DDW62PBW9H2ZQ
+
+      <object><dxn>dxn:queue:data:B6INSIBY3CBEF4M5VZRYBCMAHQMPYK5AJ:01K24XMVHSZHS97SG1VTVQDM5Z:01K24XPK464FSCKVQJAB2H662M</dxn></object>
+      <object><dxn>dxn:queue:data:B6INSIBY3CBEF4M5VZRYBCMAHQMPYK5AJ:01K24XMVHSZHS97SG1VTVQDM5Z:01K24XPK46K31DDW62PBW9H2ZQ</dxn></object>
+      <object><dxn>dxn:queue:data:B6INSIBY3CBEF4M5VZRYBCMAHQMPYK5AJ:01K24XMVHSZHS97SG1VTVQDM5Z:01K24XPK46K31DDW62PBW92333</dxn></object>
+    </example>
+  </structured_mode>
+
+  <unstructured_mode>
+    Reply normally with the text mode of the result of your research.
+  </unstructured_mode>
 `;
 
 export const blueprint: Blueprint.Blueprint = Obj.make(Blueprint.Blueprint, {
@@ -37,7 +45,7 @@ export const blueprint: Blueprint.Blueprint = Obj.make(Blueprint.Blueprint, {
   name: 'Research',
   description: 'Researches the web and creates structured data.',
   instructions: {
-    source: Ref.make(DataType.makeText(instructions)),
+    source: Ref.make(Text.make(instructions)),
   },
   tools: [Research.create, Research.research].map((fn) => ToolId.make(fn.key)),
 });

package/src/blueprints/websearch/websearch-blueprint.ts

@@ -5,14 +5,14 @@
 import { ToolId } from '@dxos/ai';
 import { Blueprint } from '@dxos/blueprints';
 import { Obj, Ref } from '@dxos/echo';
-import { DataType } from '@dxos/schema';
+import { Text } from '@dxos/schema';
 
 const blueprint: Blueprint.Blueprint = Obj.make(Blueprint.Blueprint, {
   key: 'dxos.org/blueprint/web-search',
   name: 'Web Search',
   description: 'Search the web.',
   instructions: {
-    source: Ref.make(DataType.makeText('')), // No instructions required.
+    source: Ref.make(Text.make()),
   },
   tools: [ToolId.make('AnthropicWebSearch')],
 });

package/src/{functions/research → crud}/graph.test.ts

@@ -17,7 +17,7 @@ import { AiSession } from '@dxos/assistant';
 import { TestHelpers } from '@dxos/effect';
 import { DatabaseService, TracingService } from '@dxos/functions';
 import { log } from '@dxos/log';
-import { DataType } from '@dxos/schema';
+import { Project } from '@dxos/types';
 
 import { makeGraphWriterHandler, makeGraphWriterToolkit } from './graph';
 
@@ -46,7 +46,7 @@ describe('graph', () => {
   //   const relatedSchemas = await findRelatedSchema(db, Schema.Struct({}));
   // });
 
-  const Toolkit = makeGraphWriterToolkit({ schema: [DataType.Project] });
+  const Toolkit = makeGraphWriterToolkit({ schema: [Project.Project] });
   const ToolkitLayer = makeGraphWriterHandler(Toolkit);
 
   it.effect.skip(

package/src/crud/index.ts

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

package/src/experimental/feed.test.ts

@@ -14,8 +14,13 @@ import { AiService } from '@dxos/ai';
 import { AiServiceTestingPreset, EXA_API_KEY } from '@dxos/ai/testing';
 import { makeToolExecutionServiceFromFunctions, makeToolResolverFromFunctions } from '@dxos/assistant';
 import { TestHelpers } from '@dxos/effect';
-import { ComputeEventLogger, CredentialsService, FunctionInvocationService, TracingService } from '@dxos/functions';
-import { TestDatabaseLayer, testStoragePath } from '@dxos/functions/testing';
+import { CredentialsService, FunctionInvocationService } from '@dxos/functions';
+import { TracingServiceExt } from '@dxos/functions-runtime';
+import {
+  FunctionInvocationServiceLayerTestMocked,
+  TestDatabaseLayer,
+  testStoragePath,
+} from '@dxos/functions-runtime/testing';
 
 import { Discord, Linear } from '../functions';
 
@@ -23,7 +28,6 @@ const TestLayer = Layer.mergeAll(
   AiService.model('@anthropic/claude-opus-4-0'),
   makeToolResolverFromFunctions([], Toolkit.make()),
   makeToolExecutionServiceFromFunctions(Toolkit.make() as any, Layer.empty as any),
-  ComputeEventLogger.layerFromTracing,
 ).pipe(
   Layer.provideMerge(
     Layer.mergeAll(
@@ -38,9 +42,8 @@ const TestLayer = Layer.mergeAll(
         { service: 'discord.com', apiKey: Config.redacted('DISCORD_TOKEN') },
         { service: 'linear.app', apiKey: Config.redacted('LINEAR_API_KEY') },
       ]),
-      FunctionInvocationService.layerTestMocked({ functions: [Linear.sync, Discord.fetch] }).pipe(
-        Layer.provideMerge(ComputeEventLogger.layerFromTracing),
-        Layer.provideMerge(TracingService.layerLogInfo()),
+      FunctionInvocationServiceLayerTestMocked({ functions: [Linear.sync, Discord.fetch] }).pipe(
+        Layer.provideMerge(TracingServiceExt.layerLogInfo()),
       ),
       FetchHttpClient.layer,
     ),
@@ -64,7 +67,7 @@ describe('Feed', { timeout: 600_000 }, () => {
 
         // const result = yield* AiSession.run({
         //   history: [
-        //     Obj.make(DataType.Message, {
+        //     Obj.make(Message.Message, {
         //       created: new Date().toISOString(),
         //       sender: { role: 'user' },
         //       blocks: messages
@@ -90,7 +93,7 @@ describe('Feed', { timeout: 600_000 }, () => {
 
         // const result = yield* AiSession.run({
         //   history: [
-        //     Obj.make(DataType.Message, {
+        //     Obj.make(Message.Message, {
         //       created: new Date().toISOString(),
         //       sender: { role: 'user' },
         //       blocks: [{ _tag: 'text', text: JSON.stringify(linearIssues) }],

package/src/functions/agent/prompt.ts

@@ -5,6 +5,7 @@
 import * as Array from 'effect/Array';
 import * as Effect from 'effect/Effect';
 import * as Function from 'effect/Function';
+import * as Match from 'effect/Match';
 import * as Option from 'effect/Option';
 import * as Schema from 'effect/Schema';
 
@@ -32,29 +33,41 @@ export default defineFunction({
      * Input object or data.
      * References get auto-resolved.
      */
-    input: Schema.Record({ key: Schema.String, value: Schema.Any }),
+    input: Schema.Any.pipe(Schema.annotations({ title: 'Input' })),
   }),
   outputSchema: Schema.Any,
   handler: Effect.fnUntraced(function* ({ data }) {
     log.info('processing input', { input: data.input });
 
-    const input = { ...data.input };
-    for (const key of Object.keys(data.input)) {
-      const value = data.input[key];
-      if (Ref.isRef(value)) {
-        const object = yield* DatabaseService.load(value);
-        input[key] = Obj.toJSON(object);
-      } else {
-        input[key] = JSON.stringify(value);
-      }
-    }
+    // TODO(wittjosiah): Support templated object as input.
+    //   Currently the object templating only supports direct pass-through or strings.
+    // const input = { ...data.input };
+    // for (const key of Object.keys(data.input)) {
+    //   const value = data.input[key];
+    //   if (Ref.isRef(value)) {
+    //     const object = yield* DatabaseService.load(value);
+    //     input[key] = Obj.toJSON(object);
+    //   } else {
+    //     input[key] = JSON.stringify(value);
+    //   }
+    // }
+    const input = yield* Match.value(data.input).pipe(
+      Match.when(
+        (value: any) => Ref.isRef(value),
+        Effect.fnUntraced(function* (ref) {
+          const object = yield* DatabaseService.load(ref);
+          return Obj.toJSON(object as Obj.Any);
+        }),
+      ),
+      Match.orElse(() => Effect.succeed(data.input)),
+    );
 
     yield* DatabaseService.flush({ indexes: true });
     const prompt = yield* DatabaseService.load(data.prompt);
     const systemPrompt = data.systemPrompt ? yield* DatabaseService.load(data.systemPrompt) : undefined;
     yield* TracingService.emitStatus({ message: `Running ${prompt.id}` });
 
-    log.info('starting agent', { prompt: prompt.id, input: data.input });
+    log.info('starting agent', { prompt: prompt.id, input });
 
     const blueprints = yield* Function.pipe(
       prompt.blueprints,

package/src/functions/discord/fetch-messages.test.ts

@@ -13,8 +13,8 @@ import { AiService } from '@dxos/ai';
 import { AiServiceTestingPreset } from '@dxos/ai/testing';
 import { makeToolExecutionServiceFromFunctions, makeToolResolverFromFunctions } from '@dxos/assistant';
 import { TestHelpers } from '@dxos/effect';
-import { ComputeEventLogger, CredentialsService, FunctionInvocationService, TracingService } from '@dxos/functions';
-import { TestDatabaseLayer } from '@dxos/functions/testing';
+import { CredentialsService, FunctionInvocationService, TracingService } from '@dxos/functions';
+import { FunctionInvocationServiceLayerTestMocked, TestDatabaseLayer } from '@dxos/functions-runtime/testing';
 
 import { default as fetchMessages } from './fetch-messages';
 
@@ -22,7 +22,6 @@ const TestLayer = Layer.mergeAll(
   AiService.model('@anthropic/claude-opus-4-0'),
   makeToolResolverFromFunctions([], Toolkit.make()),
   makeToolExecutionServiceFromFunctions(Toolkit.make() as any, Layer.empty as any),
-  ComputeEventLogger.layerFromTracing,
 ).pipe(
   Layer.provideMerge(
     Layer.mergeAll(
@@ -30,9 +29,8 @@ const TestLayer = Layer.mergeAll(
       TestDatabaseLayer({}),
       CredentialsService.layerConfig([{ service: 'discord.com', apiKey: Config.redacted('DISCORD_TOKEN') }]),
       FetchHttpClient.layer,
-      FunctionInvocationService.layerTestMocked({ functions: [fetchMessages] }).pipe(
-        Layer.provideMerge(ComputeEventLogger.layerFromTracing),
-        Layer.provideMerge(TracingService.layerLogInfo()),
+      FunctionInvocationServiceLayerTestMocked({ functions: [fetchMessages] }).pipe(
+        Layer.provideMerge(TracingService.layerNoop),
       ),
     ),
   ),
@@ -53,6 +51,7 @@ describe('Feed', { timeout: 600_000 }, () => {
         console.log(messages);
       },
       Effect.provide(TestLayer),
+      TestHelpers.provideTestContext,
       TestHelpers.taggedTest('sync'),
     ),
   );

package/src/functions/discord/fetch-messages.ts

@@ -21,7 +21,7 @@ import * as Schema from 'effect/Schema';
 import { Obj } from '@dxos/echo';
 import { CredentialsService, TracingService, defineFunction } from '@dxos/functions';
 import { log } from '@dxos/log';
-import { DataType } from '@dxos/schema';
+import { Message } from '@dxos/types';
 
 // TODO(dmaretskyi): Extract.
 const TimeRange = class extends Schema.String.pipe(Schema.pattern(/\d+(s|m|h|d)/)).annotations({
@@ -71,7 +71,7 @@ const DEFAULT_IGNORE_USERNAMES = ['GitHub', 'Needle'];
 type Thread = {
   discordChannelId: string;
   name?: string;
-  messages: DataType.Message[];
+  messages: Message.Message[];
 };
 
 export default defineFunction({
@@ -141,9 +141,9 @@ export default defineFunction({
       const threads = yield* Effect.forEach(
         channels,
         Effect.fnUntraced(function* (channel) {
-          const allMessages: DataType.Message[] = [];
+          const allMessages: Message.Message[] = [];
 
-          let lastMessage: Option.Option<DataType.Message> = Option.none();
+          let lastMessage: Option.Option<Message.Message> = Option.none();
           while (true) {
             const { id: lastId = undefined } = Function.pipe(
               lastMessage,
@@ -188,7 +188,7 @@ export default defineFunction({
             messages: allMessages
               .filter((message) => !message.sender.name || !ignoreUsernames.includes(message.sender.name))
               .filter((message) =>
-                message.blocks.some((block) => block._tag === 'text' && block.text.trim().length > 0),
+                message.blocks.some((block: any) => block._tag === 'text' && block.text.trim().length > 0),
               ),
           } satisfies Thread;
         }),
@@ -222,8 +222,9 @@ const parseSnowflake = (snowflake: string): Date => {
   return new Date(Number((BigInt(snowflake) >> 22n) + discordEpoch));
 };
 
-const makeMessage = (message: MessageResponse): DataType.Message =>
-  Obj.make(DataType.Message, {
+// TODO(burdon): Move to @dxos/types.
+const makeMessage = (message: MessageResponse): Message.Message =>
+  Obj.make(Message.Message, {
     [Obj.Meta]: {
       keys: [
         { id: message.id, source: 'discord.com' },
@@ -243,8 +244,8 @@ const serializeThread = (thread: Thread): string => {
     .map(
       (message) =>
         `  ${message.sender.name}: ${message.blocks
-          .filter((block) => block._tag === 'text')
-          .map((block) => block.text)
+          .filter((block: any) => block._tag === 'text')
+          .map((block: any) => block.text)
           .join(' ')}`,
     )
     .join('\n')}\n</thread>`;

package/src/functions/document/index.ts

@@ -5,6 +5,7 @@
 import { default as read$ } from './read';
 import { default as update$ } from './update';
 
+/** @deprecated */
 export namespace Document {
   export const read = read$;
   export const update = update$;