@dxos/assistant-toolkit 0.8.4-main.abd8ff62ef → 0.8.4-main.bc2380dfbc

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

@@ -237,8 +237,8 @@ describe('Database Blueprint', () => {
             role: 'Director',
           }),
         );
-        const relationDxn = Relation.getDXN(relation).toString();
-        yield* agent.submitPrompt(`Delete the relation ${relationDxn}.`);
+        const relationDXN = Relation.getDXN(relation).toString();
+        yield* agent.submitPrompt(`Delete the relation ${relationDXN}.`);
         yield* agent.waitForCompletion();
         expect(Relation.isDeleted(relation)).toBe(true);
       },
@@ -282,14 +282,14 @@ describe('Database Blueprint', () => {
         });
         const org = yield* Database.add(Obj.make(Organization.Organization, { name: 'Untagged Corp' }));
         const tag = yield* Database.add(Tag.make({ label: 'obsolete' }));
-        const tagDxn = Obj.getDXN(tag).toString();
-        Entity.update(org, (org) => Entity.addTag(org, tagDxn));
-        expect(Obj.getMeta(org).tags ?? []).toContain(tagDxn);
+        const tagDXN = Obj.getDXN(tag).toString();
+        Entity.update(org, (org) => Entity.addTag(org, tagDXN));
+        expect(Obj.getMeta(org).tags ?? []).toContain(tagDXN);
         yield* agent.submitPrompt(`Remove tag "obsolete" from the organization "Untagged Corp".`);
         yield* agent.waitForCompletion();
         const tags = Obj.getMeta(org).tags ?? [];
         // TODO(dmaretskyi): matcher doesnt work with echo proxies.
-        expect([...tags]).not.toContain(tagDxn);
+        expect([...tags]).not.toContain(tagDXN);
       },
       Effect.provide(TestLayer),
       TestHelpers.provideTestContext,

package/src/blueprints/database/blueprint.ts

@@ -37,7 +37,7 @@ const make = () =>
     description: 'Query and manipulate objects in the ECHO database.',
     agentCanEnable: true,
     instructions: {
-      source: Ref.make(Text.make(instructions)),
+      source: Ref.make(Text.make({ content: instructions })),
     },
     tools: Blueprint.toolDefinitions({
       operations: [

package/src/blueprints/database/functions/context-add.ts

@@ -4,7 +4,7 @@
 
 import * as Effect from 'effect/Effect';
 
-import { AiContextService } from '@dxos/assistant';
+import { AiContext } from '@dxos/assistant';
 import { Operation } from '@dxos/compute';
 
 import { ContextAdd } from './definitions';
@@ -12,7 +12,7 @@ import { ContextAdd } from './definitions';
 export default ContextAdd.pipe(
   Operation.withHandler(
     Effect.fn(function* ({ obj }) {
-      const { binder } = yield* AiContextService;
+      const { binder } = yield* AiContext.Service;
       yield* Effect.promise(() =>
         binder.bind({
           blueprints: [],

package/src/blueprints/database/functions/context-remove.ts

@@ -4,7 +4,7 @@
 
 import * as Effect from 'effect/Effect';
 
-import { AiContextService } from '@dxos/assistant';
+import { AiContext } from '@dxos/assistant';
 import { Operation } from '@dxos/compute';
 
 import { ContextRemove } from './definitions';
@@ -12,7 +12,7 @@ import { ContextRemove } from './definitions';
 export default ContextRemove.pipe(
   Operation.withHandler(
     Effect.fn(function* ({ obj }) {
-      const { binder } = yield* AiContextService;
+      const { binder } = yield* AiContext.Service;
       yield* Effect.promise(() =>
         binder.unbind({
           blueprints: [],

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

@@ -4,7 +4,7 @@
 
 import * as Schema from 'effect/Schema';
 
-import { AiContextService } from '@dxos/assistant';
+import { AiContext } from '@dxos/assistant';
 import { Operation } from '@dxos/compute';
 import { Database, Obj, Ref, Relation, Tag } from '@dxos/echo';
 import { trim } from '@dxos/util';
@@ -101,7 +101,7 @@ export const Query = Operation.make({
   }),
   output: Schema.Array(Schema.Unknown),
   services: [Database.Service],
-});
+}).pipe(Operation.intrinsic);
 
 export const Load = Operation.make({
   meta: {
@@ -121,7 +121,7 @@ export const Load = Operation.make({
   }),
   output: Schema.Unknown,
   services: [Database.Service],
-});
+}).pipe(Operation.intrinsic);
 
 export const ObjectCreate = Operation.make({
   meta: {
@@ -140,7 +140,7 @@ export const ObjectCreate = Operation.make({
   }),
   output: Schema.Unknown,
   services: [Database.Service],
-});
+}).pipe(Operation.intrinsic);
 
 export const ObjectUpdate = Operation.make({
   meta: {
@@ -158,7 +158,7 @@ export const ObjectUpdate = Operation.make({
   }),
   output: Schema.Unknown,
   services: [Database.Service],
-});
+}).pipe(Operation.intrinsic);
 
 export const ObjectDelete = Operation.make({
   meta: {
@@ -173,7 +173,7 @@ export const ObjectDelete = Operation.make({
   }),
   output: Schema.Void,
   services: [Database.Service],
-});
+}).pipe(Operation.intrinsic);
 
 export const SchemaAdd = Operation.make({
   meta: {
@@ -193,7 +193,7 @@ export const SchemaAdd = Operation.make({
   }),
   output: Schema.Void,
   services: [Database.Service],
-});
+}).pipe(Operation.intrinsic);
 
 export const SchemaList = Operation.make({
   meta: {
@@ -208,7 +208,7 @@ export const SchemaList = Operation.make({
   }),
   output: Schema.Array(Schema.Unknown),
   services: [Database.Service],
-});
+}).pipe(Operation.intrinsic);
 
 export const ContextAdd = Operation.make({
   meta: {
@@ -225,8 +225,8 @@ export const ContextAdd = Operation.make({
     }),
   }),
   output: Schema.Void,
-  services: [AiContextService],
-});
+  services: [AiContext.Service],
+}).pipe(Operation.intrinsic);
 
 export const ContextRemove = Operation.make({
   meta: {
@@ -243,8 +243,8 @@ export const ContextRemove = Operation.make({
     }),
   }),
   output: Schema.Void,
-  services: [AiContextService],
-});
+  services: [AiContext.Service],
+}).pipe(Operation.intrinsic);
 
 export const RelationCreate = Operation.make({
   meta: {
@@ -265,7 +265,7 @@ export const RelationCreate = Operation.make({
   }),
   output: Schema.Unknown,
   services: [Database.Service],
-});
+}).pipe(Operation.intrinsic);
 
 export const RelationDelete = Operation.make({
   meta: {
@@ -280,7 +280,7 @@ export const RelationDelete = Operation.make({
   }),
   output: Schema.Void,
   services: [Database.Service],
-});
+}).pipe(Operation.intrinsic);
 
 export const TagAdd = Operation.make({
   meta: {
@@ -298,7 +298,7 @@ export const TagAdd = Operation.make({
   }),
   output: Schema.Unknown,
   services: [Database.Service],
-});
+}).pipe(Operation.intrinsic);
 
 export const TagRemove = Operation.make({
   meta: {
@@ -315,4 +315,4 @@ export const TagRemove = Operation.make({
   }),
   output: Schema.Unknown,
   services: [Database.Service],
-});
+}).pipe(Operation.intrinsic);

package/src/blueprints/database/functions/query.ts

@@ -5,8 +5,7 @@
 import * as Effect from 'effect/Effect';
 
 import { Operation } from '@dxos/compute';
-import { Entity, Filter, Obj, Query as EchoQuery } from '@dxos/echo';
-import { Database } from '@dxos/echo';
+import { Database, Entity, Filter, Obj, Query as EchoQuery } from '@dxos/echo';
 
 import { Query } from './definitions';
 
@@ -43,7 +42,7 @@ export default Query.pipe(
 
       query = query.limit(limit);
       if (includeQueues) {
-        // Must scope to the current space: `from({ allQueuesFromSpaces: true })` alone has no spaceIds, so the SQL
+        // Must scope to the current space: `from({ allFeedsFromSpaces: true })` alone has no spaceIds, so the SQL
         // index returns nothing (see ObjectMetaIndex.buildSourceCondition / early returns when spaceIds are empty).
         query = query.from(db, { includeFeeds: true });
       }

package/src/blueprints/discord/blueprint.ts

@@ -28,7 +28,7 @@ const make = () =>
     name: 'Discord',
     description: 'Discord integration.',
     instructions: {
-      source: Ref.make(Text.make(instructions)),
+      source: Ref.make(Text.make({ content: instructions })),
     },
     tools: Blueprint.toolDefinitions({ operations: [FetchMessages] }),
   });

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

@@ -20,13 +20,18 @@ const TestLayer = AssistantTestLayer({
 });
 
 const TestLayerWithCredentials = Layer.mergeAll(
-  credentialsLayerConfig([{ service: 'discord.com', apiKey: Config.redacted('DISCORD_TOKEN') }]),
+  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(

package/src/blueprints/linear/blueprint.ts

@@ -29,7 +29,7 @@ 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] }),
   });

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

@@ -6,8 +6,7 @@ import { describe, it } from '@effect/vitest';
 import * as Effect from 'effect/Effect';
 
 import { Operation, OperationHandlerSet } from '@dxos/compute';
-import { Obj, Query } from '@dxos/echo';
-import { Database } from '@dxos/echo';
+import { Database, Obj, Query } from '@dxos/echo';
 import { TestHelpers } from '@dxos/effect/testing';
 import { AssistantTestLayer } from '@dxos/functions-runtime/testing';
 import { Person, Pipeline, Task } from '@dxos/types';

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

@@ -9,8 +9,7 @@ import * as Effect from 'effect/Effect';
 import * as Function from 'effect/Function';
 
 import { Credential, Operation } from '@dxos/compute';
-import { Filter, Obj, Query, Ref, type Type } from '@dxos/echo';
-import { Database } from '@dxos/echo';
+import { Database, Filter, Obj, Query, Ref, type Type } from '@dxos/echo';
 import { withAuthorization } from '@dxos/functions';
 import { log } from '@dxos/log';
 import { Person, Pipeline, Task } from '@dxos/types';