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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/assistant-toolkit",
-  "version": "0.8.4-main.abd8ff62ef",
+  "version": "0.8.4-main.bc2380dfbc",
   "description": "Assistant toolkit, definitions, and utilities.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "type": "module",
   "exports": {
@@ -33,40 +33,40 @@
     "@effect/platform": "0.94.4",
     "dfx": "^0.127.0",
     "exa-js": "^1.5.12",
-    "@dxos/assistant": "0.8.4-main.abd8ff62ef",
-    "@dxos/ai": "0.8.4-main.abd8ff62ef",
-    "@dxos/app-framework": "0.8.4-main.abd8ff62ef",
-    "@dxos/client-protocol": "0.8.4-main.abd8ff62ef",
-    "@dxos/compute": "0.8.4-main.abd8ff62ef",
-    "@dxos/echo": "0.8.4-main.abd8ff62ef",
-    "@dxos/echo-db": "0.8.4-main.abd8ff62ef",
-    "@dxos/echo-protocol": "0.8.4-main.abd8ff62ef",
-    "@dxos/effect": "0.8.4-main.abd8ff62ef",
-    "@dxos/errors": "0.8.4-main.abd8ff62ef",
-    "@dxos/functions": "0.8.4-main.abd8ff62ef",
-    "@dxos/invariant": "0.8.4-main.abd8ff62ef",
-    "@dxos/keys": "0.8.4-main.abd8ff62ef",
-    "@dxos/log": "0.8.4-main.abd8ff62ef",
-    "@dxos/functions-runtime": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui": "0.8.4-main.abd8ff62ef",
-    "@dxos/schema": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.abd8ff62ef",
-    "@dxos/types": "0.8.4-main.abd8ff62ef",
-    "@dxos/util": "0.8.4-main.abd8ff62ef"
+    "@dxos/app-framework": "0.8.4-main.bc2380dfbc",
+    "@dxos/assistant": "0.8.4-main.bc2380dfbc",
+    "@dxos/ai": "0.8.4-main.bc2380dfbc",
+    "@dxos/compute": "0.8.4-main.bc2380dfbc",
+    "@dxos/client-protocol": "0.8.4-main.bc2380dfbc",
+    "@dxos/echo": "0.8.4-main.bc2380dfbc",
+    "@dxos/effect": "0.8.4-main.bc2380dfbc",
+    "@dxos/echo-protocol": "0.8.4-main.bc2380dfbc",
+    "@dxos/errors": "0.8.4-main.bc2380dfbc",
+    "@dxos/functions": "0.8.4-main.bc2380dfbc",
+    "@dxos/echo-db": "0.8.4-main.bc2380dfbc",
+    "@dxos/functions-runtime": "0.8.4-main.bc2380dfbc",
+    "@dxos/keys": "0.8.4-main.bc2380dfbc",
+    "@dxos/invariant": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui": "0.8.4-main.bc2380dfbc",
+    "@dxos/log": "0.8.4-main.bc2380dfbc",
+    "@dxos/schema": "0.8.4-main.bc2380dfbc",
+    "@dxos/types": "0.8.4-main.bc2380dfbc",
+    "@dxos/util": "0.8.4-main.bc2380dfbc"
   },
   "devDependencies": {
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/client-protocol": "0.8.4-main.abd8ff62ef",
-    "@dxos/ui-theme": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-markdown": "0.8.4-main.abd8ff62ef"
+    "@dxos/client-protocol": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-markdown": "0.8.4-main.bc2380dfbc",
+    "@dxos/ui-theme": "0.8.4-main.bc2380dfbc"
   },
   "peerDependencies": {
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/ui-theme": "0.8.4-main.abd8ff62ef"
+    "@dxos/ui-theme": "0.8.4-main.bc2380dfbc"
   },
   "publishConfig": {
     "access": "public"

package/src/blueprints/automation/blueprint.ts

@@ -93,7 +93,7 @@ const make = () =>
     name: 'Triggers',
     description: 'Trigger management and automation.',
     instructions: {
-      source: Ref.make(Text.make(instructions)),
+      source: Ref.make(Text.make({ content: instructions })),
     },
   });
 

package/src/blueprints/blueprint-manager/blueprint.conversations.json

@@ -1 +1 @@
-{"conversations":[{"parameters":{"model":"@anthropic/claude-opus-4-6","stream":true,"tools":[{"name":"query-blueprints","description":"Queries available blueprints.","inputSchema":{"type":"object","properties":{},"required":[],"additionalProperties":false}},{"name":"enable-blueprints","description":"Enables blueprints in the current conversation by their keys. Only blueprints with agentCanEnable=true can be enabled. Always call [query-blueprints] first to discover available blueprint keys.","inputSchema":{"type":"object","required":["keys"],"properties":{"keys":{"type":"array","items":{"type":"string"},"description":"The keys of the blueprints to enable.","examples":[["org.dxos.blueprint.memory","org.dxos.blueprint.database"]]}},"additionalProperties":false}},{"name":"refresh-blueprints","description":"Updates the blueprints saved to the database with the latest version from the registry. Sometimes blueprints in the database can become outdated. Use this function to pull in the latest versions.","inputSchema":{"type":"object","properties":{},"required":[],"additionalProperties":false}}]},"prompt":{"content":[{"role":"system","content":"You can call blueprint manager tools. When asked to refresh or sync blueprints from the registry,\ncall the refresh blueprints tool once and then stop.\n\n## Blueprints Definitions\n\n<blueprint>\n  You can query available blueprints and enable them in the current conversation.\n  Use [query-blueprints] to refresh the list of available blueprints.\n  Use [refresh-blueprints] to update blueprint objects stored in the database from the built-in registry when they have drifted.\n  Use [enable-blueprints] to enable blueprints by their keys. Always call [query-blueprints] first.\n  Only blueprints with agentCanEnable=true can be enabled by the agent.\n  \n  <available_blueprints>\n  - org.dxos.blueprint.database \"Database\" -- Query and manipulate objects in the ECHO database. [agent-can-enable]\n  - org.dxos.blueprint.discord \"Discord\" -- Discord integration.\n  - org.dxos.blueprint.memory \"Memory\" -- Persistent memory storage and retrieval. [agent-can-enable]\n  </available_blueprints>\n  \n  NOTE: You must enable the blueprint to use it, only then the tools from that blueprint will appear.\n</blueprint>","options":{}},{"role":"user","content":"Refresh blueprints from the registry so database copies match the built-in definitions.","options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_01TBTMGS3U1dSyujvADu5sV7","modelId":"claude-opus-4-6","timestamp":"1970-01-01T00:00:00.000Z","metadata":{}},{"type":"reasoning-start","id":"0","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"The user wants to refresh blueprints","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" from the registry.","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"","metadata":{"anthropic":{"type":"thinking","signature":"EvIBClkIDBgCKkB80YOcko364VSaulfRzM8X76fyNXMnETkUUFoQcYpg3o7JCxnTb9ja4DC5rFEIzSicbmTYjXBq1JLzZZkSAcy9Mg9jbGF1ZGUtb3B1cy00LTY4ABIMfcn16jEiZ4g9FNh8GgwaXU83DG0p7kZNgmoiMHkhZF/0sINKrWl2dk944tPJZcL7iozZSBbyoSljWkuwPm2wyoCoyEnQq8Fh/oTVKipHb5R/moX69znTniGyL9IWD/+E1gsQlBRU0HASMJDBrG0q1xUUV//caZbNPboZrFdCXnjSb7DZJMZRwLeqrS4mIIJlPs/SkKUYAQ=="}}},{"type":"reasoning-end","id":"0","metadata":{}},{"type":"text-start","id":"1","metadata":{}},{"type":"text-delta","id":"1","delta":"I'll refresh the blueprints from the registry now to ensure the database copies are up to date.","metadata":{}},{"type":"text-end","id":"1","metadata":{}},{"type":"tool-params-start","id":"toolu_015Euwfup8HAM1CjYav9Tubf","name":"refresh-blueprints","providerExecuted":false,"metadata":{}},{"type":"tool-params-delta","id":"toolu_015Euwfup8HAM1CjYav9Tubf","delta":"","metadata":{}},{"type":"tool-params-end","id":"toolu_015Euwfup8HAM1CjYav9Tubf","metadata":{}},{"type":"finish","reason":"tool-calls","usage":{"inputTokens":1144,"outputTokens":80,"totalTokens":1224},"metadata":{"anthropic":{"usage":{"cache_creation":{"ephemeral_1h_input_tokens":0,"ephemeral_5m_input_tokens":0},"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"input_tokens":1144,"output_tokens":8,"server_tool_use":null,"service_tier":"standard"}}}}]},{"parameters":{"model":"@anthropic/claude-opus-4-6","stream":true,"tools":[{"name":"query-blueprints","description":"Queries available blueprints.","inputSchema":{"type":"object","properties":{},"required":[],"additionalProperties":false}},{"name":"enable-blueprints","description":"Enables blueprints in the current conversation by their keys. Only blueprints with agentCanEnable=true can be enabled. Always call [query-blueprints] first to discover available blueprint keys.","inputSchema":{"type":"object","required":["keys"],"properties":{"keys":{"type":"array","items":{"type":"string"},"description":"The keys of the blueprints to enable.","examples":[["org.dxos.blueprint.memory","org.dxos.blueprint.database"]]}},"additionalProperties":false}},{"name":"refresh-blueprints","description":"Updates the blueprints saved to the database with the latest version from the registry. Sometimes blueprints in the database can become outdated. Use this function to pull in the latest versions.","inputSchema":{"type":"object","properties":{},"required":[],"additionalProperties":false}}]},"prompt":{"content":[{"role":"system","content":"You can call blueprint manager tools. When asked to refresh or sync blueprints from the registry,\ncall the refresh blueprints tool once and then stop.\n\n## Blueprints Definitions\n\n<blueprint>\n  You can query available blueprints and enable them in the current conversation.\n  Use [query-blueprints] to refresh the list of available blueprints.\n  Use [refresh-blueprints] to update blueprint objects stored in the database from the built-in registry when they have drifted.\n  Use [enable-blueprints] to enable blueprints by their keys. Always call [query-blueprints] first.\n  Only blueprints with agentCanEnable=true can be enabled by the agent.\n  \n  <available_blueprints>\n  - org.dxos.blueprint.database \"Database\" -- Query and manipulate objects in the ECHO database. [agent-can-enable]\n  - org.dxos.blueprint.discord \"Discord\" -- Discord integration.\n  - org.dxos.blueprint.memory \"Memory\" -- Persistent memory storage and retrieval. [agent-can-enable]\n  </available_blueprints>\n  \n  NOTE: You must enable the blueprint to use it, only then the tools from that blueprint will appear.\n</blueprint>","options":{}},{"role":"user","content":"Refresh blueprints from the registry so database copies match the built-in definitions.","options":{}},{"role":"assistant","content":[{"type":"reasoning","text":"The user wants to refresh blueprints from the registry.","options":{}},{"type":"text","text":"I'll refresh the blueprints from the registry now to ensure the database copies are up to date.","options":{}},{"type":"tool-call","id":"toolu_015Euwfup8HAM1CjYav9Tubf","name":"refresh-blueprints","params":{},"providerExecuted":false,"options":{}}],"options":{}},{"role":"tool","content":[{"type":"tool-result","id":"toolu_015Euwfup8HAM1CjYav9Tubf","name":"refresh-blueprints","isFailure":false,"result":{},"providerExecuted":false,"options":{}}],"options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_01SR6yhAEXWUYe4x4rQj1C7s","modelId":"claude-opus-4-6","timestamp":"1970-01-01T00:00:00.000Z","metadata":{}},{"type":"text-start","id":"0","metadata":{}},{"type":"text-delta","id":"0","delta":"The blueprints stored","metadata":{}},{"type":"text-delta","id":"0","delta":" in the database have been updated to match the latest built-in registry definitions. Everything should now be in sync.","metadata":{}},{"type":"text-end","id":"0","metadata":{}},{"type":"finish","reason":"stop","usage":{"inputTokens":1187,"outputTokens":31,"totalTokens":1218},"metadata":{"anthropic":{"usage":{"cache_creation":{"ephemeral_1h_input_tokens":0,"ephemeral_5m_input_tokens":0},"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"input_tokens":1187,"output_tokens":5,"server_tool_use":null,"service_tier":"standard"}}}}]}]}
+{"conversations":[{"parameters":{"model":"@anthropic/claude-opus-4-6","stream":true,"tools":[{"name":"query-blueprints","description":"Queries available blueprints.","inputSchema":{"type":"object","properties":{},"required":[],"additionalProperties":false}},{"name":"enable-blueprints","description":"Enables blueprints in the current conversation by their keys. Only blueprints with agentCanEnable=true can be enabled. Always call [query-blueprints] first to discover available blueprint keys.","inputSchema":{"type":"object","required":["keys"],"properties":{"keys":{"type":"array","items":{"type":"string"},"description":"The keys of the blueprints to enable.","examples":[["org.dxos.blueprint.memory","org.dxos.blueprint.database"]]}},"additionalProperties":false}},{"name":"refresh-blueprints","description":"Updates the blueprints saved to the database with the latest version from the registry. Sometimes blueprints in the database can become outdated. Use this function to pull in the latest versions.","inputSchema":{"type":"object","properties":{},"required":[],"additionalProperties":false}}]},"prompt":{"content":[{"role":"system","content":"You can call blueprint manager tools. When asked to refresh or sync blueprints from the registry,\ncall the refresh blueprints tool once and then stop.\n\n## Blueprints Definitions\n\n<blueprint>\n  You can query available blueprints and enable them in the current conversation.\n  Use [query-blueprints] to refresh the list of available blueprints.\n  Use [refresh-blueprints] to update blueprint objects stored in the database from the built-in registry when they have drifted.\n  Use [enable-blueprints] to enable blueprints by their keys. Always call [query-blueprints] first.\n  Only blueprints with agentCanEnable=true can be enabled by the agent.\n  \n  <available_blueprints>\n  -  \"Database\" -- Query and manipulate objects in the ECHO database. [agent-can-enable]\n  -  \"Discord\" -- Discord integration.\n  -  \"Memory\" -- Persistent memory storage and retrieval. [agent-can-enable]\n  </available_blueprints>\n  \n  NOTE: You must enable the blueprint to use it, only then the tools from that blueprint will appear.\n</blueprint>","options":{}},{"role":"user","content":"Refresh blueprints from the registry so database copies match the built-in definitions.","options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_01TbpyF4R2M2msQ3MmACemz3","modelId":"claude-opus-4-6","timestamp":"1970-01-01T00:00:00.000Z","metadata":{}},{"type":"reasoning-start","id":"0","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"The","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" user wants to refresh blueprints from the registry.","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"","metadata":{"anthropic":{"type":"thinking","signature":"EvIBClkIDRgCKkB80YOcko364VSaulfRzM8X76fyNXMnETkUUFoQcYpg3o7JCxnTb9ja4DC5rFEIzSicbmTYjXBq1JLzZZkSAcy9Mg9jbGF1ZGUtb3B1cy00LTY4ABIMzFmOkZyFq9wU7oUiGgyLEwTJ3+UjRD1VVdciMKcfb3Ya8LeMUyxEk3+yvWu67XchBVoYZT/RJm8r+e0issp2Mymv+acCtCPPgT/IPSpHqfQAVA6R6fxk9ZErdJy/cgwGwwlvj2LUipfSg/Hrj7R1WCQpjDrx4KmLzRv38LFIu+MZ8Sk6QYprjrGL7CEXOJnvmsfNDicYAQ=="}}},{"type":"reasoning-end","id":"0","metadata":{}},{"type":"text-start","id":"1","metadata":{}},{"type":"text-delta","id":"1","delta":"I'll refresh the blueprints now to sync the database copies","metadata":{}},{"type":"text-delta","id":"1","delta":" with the latest built-in registry definitions.","metadata":{}},{"type":"text-end","id":"1","metadata":{}},{"type":"tool-params-start","id":"toolu_01DgR2qAHmoFriPhAB9BfnVP","name":"refresh-blueprints","providerExecuted":false,"metadata":{}},{"type":"tool-params-delta","id":"toolu_01DgR2qAHmoFriPhAB9BfnVP","delta":"","metadata":{}},{"type":"tool-params-end","id":"toolu_01DgR2qAHmoFriPhAB9BfnVP","metadata":{}},{"type":"finish","reason":"tool-calls","usage":{"inputTokens":1086,"outputTokens":89,"totalTokens":1175},"metadata":{"anthropic":{"usage":{"cache_creation":{"ephemeral_1h_input_tokens":0,"ephemeral_5m_input_tokens":0},"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"input_tokens":1086,"output_tokens":9,"server_tool_use":null,"service_tier":"standard"}}}}]},{"parameters":{"model":"@anthropic/claude-opus-4-6","stream":true,"tools":[{"name":"query-blueprints","description":"Queries available blueprints.","inputSchema":{"type":"object","properties":{},"required":[],"additionalProperties":false}},{"name":"enable-blueprints","description":"Enables blueprints in the current conversation by their keys. Only blueprints with agentCanEnable=true can be enabled. Always call [query-blueprints] first to discover available blueprint keys.","inputSchema":{"type":"object","required":["keys"],"properties":{"keys":{"type":"array","items":{"type":"string"},"description":"The keys of the blueprints to enable.","examples":[["org.dxos.blueprint.memory","org.dxos.blueprint.database"]]}},"additionalProperties":false}},{"name":"refresh-blueprints","description":"Updates the blueprints saved to the database with the latest version from the registry. Sometimes blueprints in the database can become outdated. Use this function to pull in the latest versions.","inputSchema":{"type":"object","properties":{},"required":[],"additionalProperties":false}}]},"prompt":{"content":[{"role":"system","content":"You can call blueprint manager tools. When asked to refresh or sync blueprints from the registry,\ncall the refresh blueprints tool once and then stop.\n\n## Blueprints Definitions\n\n<blueprint>\n  You can query available blueprints and enable them in the current conversation.\n  Use [query-blueprints] to refresh the list of available blueprints.\n  Use [refresh-blueprints] to update blueprint objects stored in the database from the built-in registry when they have drifted.\n  Use [enable-blueprints] to enable blueprints by their keys. Always call [query-blueprints] first.\n  Only blueprints with agentCanEnable=true can be enabled by the agent.\n  \n  <available_blueprints>\n  -  \"Database\" -- Query and manipulate objects in the ECHO database. [agent-can-enable]\n  -  \"Discord\" -- Discord integration.\n  -  \"Memory\" -- Persistent memory storage and retrieval. [agent-can-enable]\n  </available_blueprints>\n  \n  NOTE: You must enable the blueprint to use it, only then the tools from that blueprint will appear.\n</blueprint>","options":{}},{"role":"user","content":"Refresh blueprints from the registry so database copies match the built-in definitions.","options":{}},{"role":"assistant","content":[{"type":"reasoning","text":"The user wants to refresh blueprints from the registry.","options":{}},{"type":"text","text":"I'll refresh the blueprints now to sync the database copies with the latest built-in registry definitions.","options":{}},{"type":"tool-call","id":"toolu_01DgR2qAHmoFriPhAB9BfnVP","name":"refresh-blueprints","params":{},"providerExecuted":false,"options":{}}],"options":{}},{"role":"tool","content":[{"type":"tool-result","id":"toolu_01DgR2qAHmoFriPhAB9BfnVP","name":"refresh-blueprints","isFailure":false,"result":{},"providerExecuted":false,"options":{}}],"options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_0164Sg9xGSkkBE9uwWN2KzLy","modelId":"claude-opus-4-6","timestamp":"1970-01-01T00:00:00.000Z","metadata":{}},{"type":"text-start","id":"0","metadata":{}},{"type":"text-delta","id":"0","delta":"The","metadata":{}},{"type":"text-delta","id":"0","delta":" blueprints in the database have been updated to match the latest versions from the built-in registry. Everything should now be in","metadata":{}},{"type":"text-delta","id":"0","delta":" sync!","metadata":{}},{"type":"text-end","id":"0","metadata":{}},{"type":"finish","reason":"stop","usage":{"inputTokens":1159,"outputTokens":32,"totalTokens":1191},"metadata":{"anthropic":{"usage":{"cache_creation":{"ephemeral_1h_input_tokens":0,"ephemeral_5m_input_tokens":0},"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"input_tokens":1159,"output_tokens":1,"server_tool_use":null,"service_tier":"standard"}}}}]}]}

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

@@ -7,7 +7,7 @@ import * as Effect from 'effect/Effect';
 import * as Layer from 'effect/Layer';
 
 import { MemoizedAiService } from '@dxos/ai/testing';
-import { AiContextService, AiSessionService } from '@dxos/assistant';
+import { AiContext, AiSession } from '@dxos/assistant';
 import { Blueprint, Operation } from '@dxos/compute';
 import { Database, DXN, Obj, Ref } from '@dxos/echo';
 import { TestHelpers } from '@dxos/effect/testing';
@@ -29,13 +29,13 @@ const TestLayer = AssistantTestLayer({
   tracing: 'pretty',
 });
 
-const provideTestLayers = Effect.provide(AiSessionService.layerNewFeed().pipe(Layer.provideMerge(TestLayer)));
+const provideTestLayers = Effect.provide(AiSession.Service.layerNewFeed().pipe(Layer.provideMerge(TestLayer)));
 
 /**
  * Gets the conversation DXN for passing to Operation.invoke options.
  */
-const getConversationDxn = Effect.gen(function* () {
-  const session = yield* AiSessionService;
+const getConversationDXN = Effect.gen(function* () {
+  const session = yield* AiSession.Service;
   return Obj.getDXN(session.feed).toString() as DXN.String;
 });
 
@@ -44,10 +44,10 @@ describe('Blueprint Manager', () => {
     'query-blueprints: returns all registered blueprints',
     Effect.fnUntraced(
       function* (_) {
-        const conversation = yield* getConversationDxn;
+        const conversation = yield* getConversationDXN;
         const result = yield* Operation.invoke(QueryBlueprints, {}, { conversation });
         expect(result).toHaveLength(3);
-        const keys = result.map((blueprint: Blueprint.Blueprint) => blueprint.key);
+        const keys = result.map((blueprint: Blueprint.Blueprint) => Obj.getMeta(blueprint).key);
         expect(keys).toContain('org.dxos.blueprint.database');
         expect(keys).toContain('org.dxos.blueprint.memory');
         expect(keys).toContain('org.dxos.blueprint.discord');
@@ -62,19 +62,21 @@ describe('Blueprint Manager', () => {
     'enable-blueprints: enables blueprints with agentCanEnable=true',
     Effect.fnUntraced(
       function* (_) {
-        const conversation = yield* getConversationDxn;
+        const conversation = yield* getConversationDXN;
         const { enabled, rejected } = yield* Operation.invoke(
           EnableBlueprints,
           { keys: ['org.dxos.blueprint.database'] },
           { conversation },
         );
         expect(enabled).toHaveLength(1);
-        expect(enabled[0].key).toBe('org.dxos.blueprint.database');
+        expect(Obj.getMeta(enabled[0]).key).toBe('org.dxos.blueprint.database');
         expect(rejected).toHaveLength(0);
 
-        const { binder } = yield* AiContextService;
+        const { binder } = yield* AiContext.Service;
         const bound = binder.getBlueprints();
-        expect(bound.some((bp: Blueprint.Blueprint) => bp.key === 'org.dxos.blueprint.database')).toBe(true);
+        expect(bound.some((bp: Blueprint.Blueprint) => Obj.getMeta(bp).key === 'org.dxos.blueprint.database')).toBe(
+          true,
+        );
       },
       provideTestLayers,
       TestHelpers.provideTestContext,
@@ -86,7 +88,7 @@ describe('Blueprint Manager', () => {
     'enable-blueprints: rejects blueprints without agentCanEnable',
     Effect.fnUntraced(
       function* (_) {
-        const conversation = yield* getConversationDxn;
+        const conversation = yield* getConversationDXN;
         const { enabled, rejected } = yield* Operation.invoke(
           EnableBlueprints,
           { keys: ['org.dxos.blueprint.discord'] },
@@ -96,9 +98,11 @@ describe('Blueprint Manager', () => {
         expect(rejected).toHaveLength(1);
         expect(rejected[0].key).toBe('org.dxos.blueprint.discord');
 
-        const { binder } = yield* AiContextService;
+        const { binder } = yield* AiContext.Service;
         const bound = binder.getBlueprints();
-        expect(bound.some((bp: Blueprint.Blueprint) => bp.key === 'org.dxos.blueprint.discord')).toBe(false);
+        expect(bound.some((bp: Blueprint.Blueprint) => Obj.getMeta(bp).key === 'org.dxos.blueprint.discord')).toBe(
+          false,
+        );
       },
       provideTestLayers,
       TestHelpers.provideTestContext,
@@ -110,7 +114,7 @@ describe('Blueprint Manager', () => {
     'enable-blueprints: mixed keys enables only allowed ones',
     Effect.fnUntraced(
       function* (_) {
-        const conversation = yield* getConversationDxn;
+        const conversation = yield* getConversationDXN;
         const { enabled, rejected } = yield* Operation.invoke(
           EnableBlueprints,
           {
@@ -119,7 +123,7 @@ describe('Blueprint Manager', () => {
           { conversation },
         );
         expect(enabled).toHaveLength(2);
-        const enabledKeys = enabled.map((bp: Blueprint.Blueprint) => bp.key);
+        const enabledKeys = enabled.map((bp: Blueprint.Blueprint) => Obj.getMeta(bp).key);
         expect(enabledKeys).toContain('org.dxos.blueprint.database');
         expect(enabledKeys).toContain('org.dxos.blueprint.memory');
         expect(rejected).toHaveLength(1);
@@ -135,7 +139,7 @@ describe('Blueprint Manager', () => {
     'enable-blueprints: unknown keys are rejected with reason',
     Effect.fnUntraced(
       function* (_) {
-        const conversation = yield* getConversationDxn;
+        const conversation = yield* getConversationDXN;
         const { enabled, rejected } = yield* Operation.invoke(
           EnableBlueprints,
           { keys: ['org.dxos.blueprint.nonexistent'] },
@@ -168,7 +172,7 @@ describe('Blueprint Manager', () => {
         yield* Database.flush();
         expect(stored.name).toBe('___TEST_MUTATED_BLUEPRINT_NAME___');
 
-        const session = yield* AiSessionService;
+        const session = yield* AiSession.Service;
         yield* Effect.promise(() => session.context.open());
         yield* Effect.promise(() =>
           session.context.bind({

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

@@ -33,8 +33,8 @@ const make = () =>
       inputs: [
         {
           name: 'blueprints',
-          kind: 'function',
-          function: QueryBlueprints.meta.key,
+          kind: 'operation',
+          operation: QueryBlueprints.meta.key,
         },
       ],
     }),

package/src/blueprints/blueprint-manager/functions/definitions.ts

@@ -4,7 +4,7 @@
 
 import * as Schema from 'effect/Schema';
 
-import { AiContextService } from '@dxos/assistant';
+import { AiContext } from '@dxos/assistant';
 import { Blueprint, Operation } from '@dxos/compute';
 import { Database } from '@dxos/echo';
 
@@ -41,7 +41,7 @@ export const EnableBlueprints = Operation.make({
       }),
     ),
   }),
-  services: [Blueprint.RegistryService, Database.Service, AiContextService],
+  services: [Blueprint.RegistryService, Database.Service, AiContext.Service],
 });
 
 export const UpdateBlueprints = Operation.make({

package/src/blueprints/blueprint-manager/functions/enable-blueprints.ts

@@ -4,7 +4,7 @@
 
 import * as Effect from 'effect/Effect';
 
-import { AiContextService } from '@dxos/assistant';
+import { AiContext } from '@dxos/assistant';
 import { Blueprint, Operation } from '@dxos/compute';
 import { Ref } from '@dxos/echo';
 
@@ -32,7 +32,7 @@ export default EnableBlueprints.pipe(
       }
 
       if (enabled.length > 0) {
-        yield* AiContextService.bindContext({
+        yield* AiContext.Service.bindContext({
           blueprints: enabled.map(Ref.make),
         });
       }

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

@@ -14,10 +14,10 @@ import { AgentService } from '@dxos/functions-runtime';
 import { AssistantTestLayerWithTriggers } from '@dxos/functions-runtime/testing';
 import { ObjectId } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { MarkdownBlueprint } from '@dxos/plugin-markdown/blueprints';
-import { MarkdownOperationHandlerSet } from '@dxos/plugin-markdown/operations';
+import { MarkdownBlueprint } from '@dxos/plugin-markdown';
+import { Markdown } from '@dxos/plugin-markdown';
+import { MarkdownOperationHandlerSet } from '@dxos/plugin-markdown/plugin';
 import { WithProperties } from '@dxos/plugin-markdown/testing';
-import { Markdown } from '@dxos/plugin-markdown/types';
 import { Person } from '@dxos/types';
 
 import { DatabaseBlueprint, DatabaseHandlers } from '../database';

package/src/blueprints/browser/blueprint.ts

@@ -21,7 +21,7 @@ const make = () =>
     description: 'Access to a real isolated browser.',
     agentCanEnable: true,
     instructions: {
-      source: Ref.make(Text.make(instructions)),
+      source: Ref.make(Text.make({ content: instructions })),
     },
     mcpServers: [
       {