@dxos/assistant-toolkit 0.8.4-main.74a063c4e0 → 0.8.4-main.765dc60934

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

@@ -8,49 +8,43 @@ import * as Config from 'effect/Config';
 import * as Effect from 'effect/Effect';
 import * as Layer from 'effect/Layer';
 
-import { AiService } from '@dxos/ai';
-import { GenericToolkit } from '@dxos/ai';
-import { AiServiceTestingPreset } from '@dxos/ai/testing';
-import { ToolExecutionServices } from '@dxos/assistant';
+import { Operation, OperationHandlerSet } from '@dxos/compute';
 import { TestHelpers } from '@dxos/effect/testing';
-import { CredentialsService, FunctionInvocationService, TracingService } from '@dxos/functions';
-import { FunctionInvocationServiceLayerTestMocked, TestDatabaseLayer } from '@dxos/functions-runtime/testing';
-import { OperationHandlerSet } from '@dxos/operation';
+import { credentialsLayerConfig } from '@dxos/functions';
+import { AssistantTestLayer } from '@dxos/functions-runtime/testing';
 
 import { default as fetchMessages } from './fetch-messages';
 
-const TestLayer = Layer.mergeAll(AiService.model('@anthropic/claude-opus-4-0'), ToolExecutionServices).pipe(
-  Layer.provideMerge(
-    Layer.mergeAll(
-      GenericToolkit.providerEmpty,
-      AiServiceTestingPreset('direct'),
-      TestDatabaseLayer({}),
-      CredentialsService.layerConfig([{ service: 'discord.com', apiKey: Config.redacted('DISCORD_TOKEN') }]),
-      FetchHttpClient.layer,
-      FunctionInvocationServiceLayerTestMocked({ functions: OperationHandlerSet.make(fetchMessages) }).pipe(
-        Layer.provideMerge(TracingService.layerNoop),
-      ),
-    ),
-  ),
-);
+const TestLayer = AssistantTestLayer({
+  operationHandlers: OperationHandlerSet.make(fetchMessages),
+});
+
+const TestLayerWithCredentials = Layer.mergeAll(
+  credentialsLayerConfig([
+    {
+      service: 'discord.com',
+      apiKey: Config.redacted('DISCORD_TOKEN'),
+    },
+  ]),
+  FetchHttpClient.layer,
+).pipe(Layer.provideMerge(TestLayer));
 
 const DXOS_SERVER_ID = '837138313172353095';
 
-describe('Feed', { timeout: 600_000 }, () => {
+describe.skipIf(!process.env.DISCORD_TOKEN)('Feed', { timeout: 600_000 }, () => {
   it.effect(
     'fetch discord messages',
     Effect.fnUntraced(
       function* (_) {
-        const messages = yield* FunctionInvocationService.invokeFunction(fetchMessages, {
+        const messages = yield* Operation.invoke(fetchMessages, {
           serverId: DXOS_SERVER_ID,
-          // channelId: '1404487604761526423',
           last: '7d',
-        });
+        }).pipe(Effect.orDie);
         console.log(messages);
       },
-      Effect.provide(TestLayer),
+      Effect.provide(TestLayerWithCredentials),
       TestHelpers.provideTestContext,
-      TestHelpers.taggedTest('sync'),
     ),
+    { tags: ['sync'] },
   );
 });

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

@@ -17,10 +17,9 @@ import * as Function from 'effect/Function';
 import * as Layer from 'effect/Layer';
 import * as Option from 'effect/Option';
 
+import { Credential, Trace, Operation } from '@dxos/compute';
 import { Obj } from '@dxos/echo';
-import { CredentialsService, TracingService } from '@dxos/functions';
 import { log } from '@dxos/log';
-import { Operation } from '@dxos/operation';
 import { Message } from '@dxos/types';
 
 import { FetchMessages, TimeRange } from './definitions';
@@ -28,7 +27,7 @@ import { FetchMessages, TimeRange } from './definitions';
 const DiscordConfigFromCredential = Layer.unwrapEffect(
   Effect.gen(function* () {
     return DiscordConfig.layer({
-      token: yield* CredentialsService.getApiKey({ service: 'discord.com' }),
+      token: yield* Credential.CredentialsService.getApiKey({ service: 'discord.com' }),
       rest: {
         baseUrl: 'https://api-proxy.dxos.workers.dev/discord.com/api/v10',
       },
@@ -82,7 +81,7 @@ export default FetchMessages.pipe(
           log.info('channel', { id: channel.id, name: 'name' in channel ? channel.name : undefined });
         }
 
-        yield* TracingService.emitStatus({ message: `Will fetch from channels: ${channels.length}` });
+        yield* Trace.emitStatus(`Will fetch from channels: ${channels.length}`);
 
         const threads = yield* Effect.forEach(
           channels,
@@ -122,7 +121,7 @@ export default FetchMessages.pipe(
               } else {
                 break;
               }
-              yield* TracingService.emitStatus({ message: `Fetched messages: ${allMessages.length}` });
+              yield* Trace.emitStatus(`Fetched messages: ${allMessages.length}`);
               if (allMessages.length >= limit) {
                 break;
               }

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

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { OperationHandlerSet } from '@dxos/operation';
+import { OperationHandlerSet } from '@dxos/compute';
 
 export * from './definitions';
 

package/src/blueprints/github/functions/definitions.ts

@@ -5,8 +5,7 @@
 import * as HttpClient from '@effect/platform/HttpClient';
 import * as Schema from 'effect/Schema';
 
-import { CredentialsService } from '@dxos/functions';
-import { Operation } from '@dxos/operation';
+import { Credential, Operation } from '@dxos/compute';
 
 export const FetchPrs = Operation.make({
   meta: {
@@ -23,5 +22,5 @@ export const FetchPrs = Operation.make({
     }),
   }),
   output: Schema.Any,
-  services: [CredentialsService, HttpClient.HttpClient],
+  services: [Credential.CredentialsService, HttpClient.HttpClient],
 });

package/src/blueprints/github/functions/fetch-prs.ts

@@ -5,15 +5,15 @@
 import * as HttpClient from '@effect/platform/HttpClient';
 import * as Effect from 'effect/Effect';
 
-import { CredentialsService, withAuthorization } from '@dxos/functions';
-import { Operation } from '@dxos/operation';
+import { Credential, Operation } from '@dxos/compute';
+import { withAuthorization } from '@dxos/functions';
 
 import { FetchPrs } from './definitions';
 
 export default FetchPrs.pipe(
   Operation.withHandler(
     Effect.fnUntraced(function* ({ owner, repo }) {
-      const credential = yield* CredentialsService.getCredential({ service: 'github.com' });
+      const credential = yield* Credential.CredentialsService.getCredential({ service: 'github.com' });
       const client = yield* HttpClient.HttpClient.pipe(Effect.map(withAuthorization(credential.apiKey!)));
 
       const response = yield* client.get(`https://api.github.com/repos/${owner}/${repo}/pulls`);

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

@@ -2,7 +2,7 @@
 // Copyright 2026 DXOS.org
 //
 
-import { OperationHandlerSet } from '@dxos/operation';
+import { OperationHandlerSet } from '@dxos/compute';
 
 export * from './definitions';
 

package/src/blueprints/index.ts

@@ -2,13 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './design';
 export * from './discord';
 export * from './project';
 export * from './linear';
-export * from './markdown';
 export * from './planning';
-export * from './research';
 export * from './websearch';
 export * from './browser';
 export * from './database';

package/src/blueprints/linear/blueprint.ts

@@ -2,8 +2,7 @@
 // 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';
@@ -30,12 +29,12 @@ const make = () =>
     name: 'Linear',
     description: 'Syncs Linear workspaces.',
     instructions: {
-      source: Ref.make(Text.make(instructions)),
+      source: Ref.make(Text.make({ content: instructions })),
     },
     tools: Blueprint.toolDefinitions({ operations: [SyncIssues] }),
   });
 
-const blueprint: AppCapabilities.BlueprintDefinition = {
+const blueprint: Blueprint.Definition = {
   key: BLUEPRINT_KEY,
   make,
 };

package/src/blueprints/linear/functions/definitions.ts

@@ -4,9 +4,8 @@
 
 import * as Schema from 'effect/Schema';
 
+import { Credential, Operation } from '@dxos/compute';
 import { Database } from '@dxos/echo';
-import { CredentialsService } from '@dxos/functions';
-import { Operation } from '@dxos/operation';
 
 export const SyncIssues = Operation.make({
   meta: {
@@ -20,5 +19,5 @@ export const SyncIssues = Operation.make({
     }),
   }),
   output: Schema.Any,
-  services: [CredentialsService, Database.Service],
+  services: [Credential.CredentialsService, Database.Service],
 });

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

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { OperationHandlerSet } from '@dxos/operation';
+import { OperationHandlerSet } from '@dxos/compute';
 
 export * from './definitions';
 

package/src/blueprints/linear/functions/linear.test.ts

@@ -5,12 +5,10 @@
 import { describe, it } from '@effect/vitest';
 import * as Effect from 'effect/Effect';
 
-import { AssistantTestLayer } from '@dxos/assistant/testing';
-import { Obj, Query } from '@dxos/echo';
-import { Database } from '@dxos/echo';
+import { Operation, OperationHandlerSet } from '@dxos/compute';
+import { Database, Obj, Query } from '@dxos/echo';
 import { TestHelpers } from '@dxos/effect/testing';
-import { FunctionInvocationService } from '@dxos/functions';
-import { OperationHandlerSet } from '@dxos/operation';
+import { AssistantTestLayer } from '@dxos/functions-runtime/testing';
 import { Person, Pipeline, Task } from '@dxos/types';
 
 import { LINEAR_ID_KEY, default as fetchLinearIssues } from './sync-issues';
@@ -29,7 +27,7 @@ describe.skip('Linear', { timeout: 600_000 }, () => {
       function* (_) {
         yield* Database.flush();
 
-        yield* FunctionInvocationService.invokeFunction(fetchLinearIssues, {
+        yield* Operation.invoke(fetchLinearIssues, {
           team: '1127c63a-6f77-4725-9229-50f6cd47321c',
         });
 
@@ -52,8 +50,8 @@ describe.skip('Linear', { timeout: 600_000 }, () => {
         yield* Database.flush();
       },
       Effect.provide(TestLayer),
-      TestHelpers.taggedTest('sync'),
       TestHelpers.provideTestContext,
     ),
+    { tags: ['sync'] },
   );
 });

package/src/blueprints/linear/functions/sync-issues.ts

@@ -8,11 +8,10 @@ import * as Array from 'effect/Array';
 import * as Effect from 'effect/Effect';
 import * as Function from 'effect/Function';
 
-import { Filter, Obj, Query, Ref, type Type } from '@dxos/echo';
-import { Database } from '@dxos/echo';
-import { CredentialsService, withAuthorization } from '@dxos/functions';
+import { Credential, Operation } from '@dxos/compute';
+import { Database, Filter, Obj, Query, Ref, type Type } from '@dxos/echo';
+import { withAuthorization } from '@dxos/functions';
 import { log } from '@dxos/log';
-import { Operation } from '@dxos/operation';
 import { Person, Pipeline, Task } from '@dxos/types';
 
 import { syncObjects } from '../../../sync';
@@ -79,7 +78,7 @@ export const LINEAR_UPDATED_AT_KEY = 'linear.app/updatedAt';
 export default SyncIssues.pipe(
   Operation.withHandler(
     Effect.fnUntraced(function* ({ team }) {
-      const credential = yield* CredentialsService.getCredential({ service: 'linear.app' });
+      const credential = yield* Credential.CredentialsService.getCredential({ service: 'linear.app' });
       const client = yield* HttpClient.HttpClient.pipe(Effect.map(withAuthorization(credential.apiKey!)));
 
       const after = yield* getLatestUpdateTimestamp(team, Task.Task);