@dxos/assistant-toolkit 0.8.4-main.9be5663bfe → 0.8.4-main.abd8ff62ef

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

@@ -6,12 +6,12 @@ import { describe, expect, it } from '@effect/vitest';
 import * as Effect from 'effect/Effect';
 import * as Layer from 'effect/Layer';
 
-import { GenericToolkit } from '@dxos/ai';
-import { AgentService } from '@dxos/assistant';
-import { AssistantTestLayer } from '@dxos/assistant/testing';
-import { Blueprint } from '@dxos/blueprints';
+import { OpaqueToolkit } from '@dxos/ai';
+import { Blueprint } from '@dxos/compute';
 import { Database, Feed, Filter, Obj, Query } from '@dxos/echo';
 import { TestHelpers } from '@dxos/effect/testing';
+import { AgentService } from '@dxos/functions-runtime';
+import { AssistantTestLayer } from '@dxos/functions-runtime/testing';
 import { ObjectId } from '@dxos/keys';
 
 import { Memory } from '../../types/Memory';
@@ -32,7 +32,7 @@ const TestLayer = AssistantTestLayer({
 const TestLayerWithWebSearch = AssistantTestLayer({
   aiServicePreset: 'edge-remote',
   operationHandlers: MemoryHandlers,
-  toolkits: [GenericToolkit.make(WebSearchToolkit, Layer.empty)],
+  toolkits: [OpaqueToolkit.make(WebSearchToolkit, Layer.empty)],
   types: [Memory, Blueprint.Blueprint, Feed.Feed],
   blueprints: [MemoryBlueprint.make(), WebSearchBlueprint.make()],
   tracing: 'pretty',

package/src/blueprints/memory/blueprint.ts

@@ -2,15 +2,14 @@
 // Copyright 2026 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';
 
 import { QueryMemories, SaveMemory, DeleteMemory } from './functions';
 
-const BLUEPRINT_KEY = 'dxos.org/blueprint/memory';
+const BLUEPRINT_KEY = 'org.dxos.blueprint.memory';
 
 const instructions = trim`
   You have the ability to save and recall memories.
@@ -34,7 +33,7 @@ const make = () =>
     tools: Blueprint.toolDefinitions({ operations: [SaveMemory, QueryMemories, DeleteMemory] }),
   });
 
-const blueprint: AppCapabilities.BlueprintDefinition = {
+const blueprint: Blueprint.Definition = {
   key: BLUEPRINT_KEY,
   make,
 };

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

@@ -4,8 +4,8 @@
 
 import * as Schema from 'effect/Schema';
 
+import { Operation } from '@dxos/compute';
 import { Database, Ref } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
 
 import { Memory } from '../../../types/Memory';
 

package/src/blueprints/memory/functions/delete.ts

@@ -4,8 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
+import { Operation } from '@dxos/compute';
 import { Database } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
 
 import { DeleteMemory } from './definitions';
 

package/src/blueprints/memory/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/memory/functions/query.ts

@@ -4,8 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
+import { Operation } from '@dxos/compute';
 import { Database, Entity, Filter, Query } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
 
 import { Memory } from '../../../types/Memory';
 import { QueryMemories } from './definitions';

package/src/blueprints/memory/functions/save.ts

@@ -4,8 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
+import { Operation } from '@dxos/compute';
 import { Database, Entity, Obj } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
 
 import { Memory } from '../../../types/Memory';
 import { SaveMemory } from './definitions';

package/src/blueprints/planning/blueprint.ts

@@ -2,8 +2,7 @@
 // Copyright 2026 DXOS.org
 //
 
-import { type AppCapabilities } from '@dxos/app-toolkit';
-import { Blueprint } from '@dxos/blueprints';
+import { Blueprint } from '@dxos/compute';
 
 import { UpdateTasks } from './functions';
 
@@ -17,7 +16,7 @@ const make = () =>
     tools: Blueprint.toolDefinitions({ operations: [UpdateTasks] }),
   });
 
-const blueprint: AppCapabilities.BlueprintDefinition = {
+const blueprint: Blueprint.Definition = {
   key: BLUEPRINT_KEY,
   make,
 };

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

@@ -5,8 +5,8 @@
 import * as Schema from 'effect/Schema';
 
 import { AiContextService } from '@dxos/assistant';
+import { Operation } from '@dxos/compute';
 import { Database } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
 import { trim } from '@dxos/util';
 
 import { Plan } from '../../../types';

package/src/blueprints/planning/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/planning/functions/update-tasks.ts

@@ -4,8 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
+import { Operation } from '@dxos/compute';
 import { Database, Obj } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
 import { trim } from '@dxos/util';
 
 import { Plan, Agent } from '../../../types';
@@ -17,7 +17,7 @@ export default UpdateTasks.pipe(
       const agent = yield* Agent.getFromChatContext;
       const plan = yield* Database.load(agent.plan);
 
-      Obj.change(plan, (plan) => {
+      Obj.update(plan, (plan) => {
         for (const task of newTasks) {
           const existingTask = plan.tasks.find((t) => t.id === task.id);
           if (existingTask) {