@dxos/assistant-toolkit 0.8.4-main.3fbcb4aa9b → 0.8.4-main.43cb759274

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/assistant-toolkit",
-  "version": "0.8.4-main.3fbcb4aa9b",
+  "version": "0.8.4-main.43cb759274",
   "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": {
@@ -28,45 +28,44 @@
     "src"
   ],
   "dependencies": {
-    "@effect/ai": "0.33.2",
-    "@effect/ai-anthropic": "0.23.0",
-    "@effect/platform": "0.94.4",
+    "@effect/ai": "0.35.0",
+    "@effect/ai-anthropic": "0.25.0",
+    "@effect/platform": "0.96.1",
     "dfx": "^0.127.0",
     "exa-js": "^1.5.12",
-    "@dxos/ai": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/app-framework": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/client-protocol": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/echo": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/compute": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/echo-db": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/echo-protocol": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/effect": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/assistant": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/errors": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/functions-runtime": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/functions": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/invariant": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/keys": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/log": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/schema": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/util": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/types": "0.8.4-main.3fbcb4aa9b"
+    "@dxos/app-framework": "0.8.4-main.43cb759274",
+    "@dxos/ai": "0.8.4-main.43cb759274",
+    "@dxos/assistant": "0.8.4-main.43cb759274",
+    "@dxos/compute": "0.8.4-main.43cb759274",
+    "@dxos/client-protocol": "0.8.4-main.43cb759274",
+    "@dxos/echo-protocol": "0.8.4-main.43cb759274",
+    "@dxos/echo": "0.8.4-main.43cb759274",
+    "@dxos/errors": "0.8.4-main.43cb759274",
+    "@dxos/effect": "0.8.4-main.43cb759274",
+    "@dxos/functions": "0.8.4-main.43cb759274",
+    "@dxos/invariant": "0.8.4-main.43cb759274",
+    "@dxos/functions-runtime": "0.8.4-main.43cb759274",
+    "@dxos/keys": "0.8.4-main.43cb759274",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.43cb759274",
+    "@dxos/log": "0.8.4-main.43cb759274",
+    "@dxos/react-ui": "0.8.4-main.43cb759274",
+    "@dxos/schema": "0.8.4-main.43cb759274",
+    "@dxos/types": "0.8.4-main.43cb759274",
+    "@dxos/util": "0.8.4-main.43cb759274"
   },
   "devDependencies": {
-    "effect": "3.20.0",
+    "effect": "3.21.2",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/client-protocol": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-markdown": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/ui-theme": "0.8.4-main.3fbcb4aa9b"
+    "@dxos/ui-theme": "0.8.4-main.43cb759274",
+    "@dxos/plugin-markdown": "0.8.4-main.43cb759274",
+    "@dxos/client-protocol": "0.8.4-main.43cb759274"
   },
   "peerDependencies": {
-    "effect": "3.20.0",
+    "effect": "3.21.2",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/ui-theme": "0.8.4-main.3fbcb4aa9b"
+    "@dxos/ui-theme": "0.8.4-main.43cb759274"
   },
   "publishConfig": {
     "access": "public"

package/src/blueprints/automation/blueprint.ts

@@ -3,7 +3,7 @@
 //
 
 import { Blueprint, Trigger, Operation } from '@dxos/compute';
-import { Ref } from '@dxos/echo';
+import { Ref, Type } from '@dxos/echo';
 import { Text } from '@dxos/schema';
 import { trim } from '@dxos/util';
 
@@ -19,7 +19,7 @@ const instructions = trim`
   Triggers are configured by the properties of the Trigger object.
   - enabled: Must be true for trigger to run.
   - spec: Events that the trigger matches.
-  - function: Ref to a ${Operation.PersistentOperation.typename} object that will be invoked. Query the functions present in the space first, and reference them in the trigger.
+  - function: Ref to a ${Type.getTypename(Operation.PersistentOperation)} object that will be invoked. Query the functions present in the space first, and reference them in the trigger.
   - input: The spec of the input data that will be passed to the function.
 
   ## Input patterns
@@ -46,7 +46,7 @@ const instructions = trim`
 
   ## Editing triggers
 
-  Triggers are represented as objects of type ${Trigger.Trigger.typename}.
+  Triggers are represented as objects of type ${Type.getTypename(Trigger.Trigger)}.
   You need access to the Database blueprint to manipulate triggers.
   Read trigger schema before manipulating triggers.
   Having a Trigger object in the database is enough to setup an automation. 

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_01F1hTKvaRr7oqBJuPmYiwp7","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":"EvIBClkIDRgCKkB80YOcko364VSaulfRzM8X76fyNXMnETkUUFoQcYpg3o7JCxnTb9ja4DC5rFEIzSicbmTYjXBq1JLzZZkSAcy9Mg9jbGF1ZGUtb3B1cy00LTY4ABIMPgirIyjFttZ9kEKSGgxThLWHTPUSS6roYs0iMETWNucMpdovP0USU5ydIBPXFtARY3p3dfCFFfn807ArBFxfFGUMTxBuMjKX7wwbkSpHJXH/zpbFDb9WtUkgRHbhUXRu8c5Y8STLJ/G0PZ4pAQggujiJOn4rueQH9VXQYrL2KjsPaMVtbsIq5sZmbsTB1KmH9nLnIrUYAQ=="}}},{"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_01FWSMwqrVJKXhSnEuR2Y2Jb","name":"refresh-blueprints","providerExecuted":false,"metadata":{}},{"type":"tool-params-delta","id":"toolu_01FWSMwqrVJKXhSnEuR2Y2Jb","delta":"","metadata":{}},{"type":"tool-params-end","id":"toolu_01FWSMwqrVJKXhSnEuR2Y2Jb","metadata":{}},{"type":"finish","reason":"tool-calls","usage":{"inputTokens":1110,"outputTokens":89,"totalTokens":1199},"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":1110,"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  - 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 now to sync the database copies with the latest built-in registry definitions.","options":{}},{"type":"tool-call","id":"toolu_01FWSMwqrVJKXhSnEuR2Y2Jb","name":"refresh-blueprints","params":{},"providerExecuted":false,"options":{}}],"options":{}},{"role":"tool","content":[{"type":"tool-result","id":"toolu_01FWSMwqrVJKXhSnEuR2Y2Jb","name":"refresh-blueprints","isFailure":false,"result":{},"providerExecuted":false,"options":{}}],"options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_01WCx3BGYXkH1XeqwfW467eb","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 have been refreshed. The database copies should now match the latest built-in registry definitions.","metadata":{}},{"type":"text-end","id":"0","metadata":{}},{"type":"finish","reason":"stop","usage":{"inputTokens":1183,"outputTokens":26,"totalTokens":1209},"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":1183,"output_tokens":1,"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":{"$id":"/schemas/%7B%7D","anyOf":[{"type":"object"},{"type":"array"}]}},{"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":{"$id":"/schemas/%7B%7D","anyOf":[{"type":"object"},{"type":"array"}]}}]},"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_01EnWRrZtYvker1hoFaUftiX","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 from the registry. I should call the refresh-blueprints tool.","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"","metadata":{"anthropic":{"type":"thinking","signature":"EqgCCmMIDhgCKkBdz2UkSiBc+mB42bn4XBMulDdlfY744r6A3/CtRIj5ka8kLuAbmGbpsDHh15YA4AXwrTKjmGFVws1/iQVVcX0NMg9jbGF1ZGUtb3B1cy00LTY4AEIIdGhpbmtpbmcSDC1IWXx2nxKJlumiFBoMODifRWw+vJr3M9oxIjCNeGHzgul3HZTZVS1Y1fq36Z6+uk9jVJtfR1kiZDmfUabkraoD+PzSoABC7+HQSl4qc4hegrTArcyY5OVZiDXjw5cbBhF72gChkZu+A5b/wqIxjxdVTqj5Mk3W9dVK7gF5K9ATIOu8KeHLwz9wFEZgmK9vBQhhWrX+X0SaZ7Tds2fllZyPf+1u7EbqQUDP0fp8mjeXRSKJLeTBGTw/d5Ul0Y3/DIgYAQ=="}}},{"type":"reasoning-end","id":"0","metadata":{}},{"type":"text-start","id":"1","metadata":{}},{"type":"text-delta","id":"1","delta":"I","metadata":{}},{"type":"text-delta","id":"1","delta":"'ll refresh the blueprints from the registry now.","metadata":{}},{"type":"text-end","id":"1","metadata":{}},{"type":"tool-params-start","id":"toolu_0191HNbgqXmmaNXfW6keirtd","name":"refresh-blueprints","providerExecuted":false,"metadata":{}},{"type":"tool-params-delta","id":"toolu_0191HNbgqXmmaNXfW6keirtd","delta":"","metadata":{}},{"type":"tool-params-end","id":"toolu_0191HNbgqXmmaNXfW6keirtd","metadata":{}},{"type":"finish","reason":"tool-calls","usage":{"inputTokens":1086,"outputTokens":90,"totalTokens":1176},"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":40,"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":{"$id":"/schemas/%7B%7D","anyOf":[{"type":"object"},{"type":"array"}]}},{"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":{"$id":"/schemas/%7B%7D","anyOf":[{"type":"object"},{"type":"array"}]}}]},"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. I should call the refresh-blueprints tool.","options":{}},{"type":"text","text":"I'll refresh the blueprints from the registry now.","options":{}},{"type":"tool-call","id":"toolu_0191HNbgqXmmaNXfW6keirtd","name":"refresh-blueprints","params":{},"providerExecuted":false,"options":{}}],"options":{}},{"role":"tool","content":[{"type":"tool-result","id":"toolu_0191HNbgqXmmaNXfW6keirtd","name":"refresh-blueprints","isFailure":false,"result":{},"providerExecuted":false,"options":{}}],"options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_01UYmSHxnE5L1YWqDDnmQtpE","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 definitions from the registry. Everything should","metadata":{}},{"type":"text-delta","id":"0","delta":" now be in sync.","metadata":{}},{"type":"text-end","id":"0","metadata":{}},{"type":"finish","reason":"stop","usage":{"inputTokens":1149,"outputTokens":33,"totalTokens":1182},"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":1149,"output_tokens":5,"server_tool_use":null,"service_tier":"standard"}}}}]}]}

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

@@ -6,20 +6,17 @@ import { describe, expect, it } from '@effect/vitest';
 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 { Obj } from '@dxos/echo';
 import { TestHelpers } from '@dxos/effect/testing';
 import { AssistantTestLayer } from '@dxos/functions-runtime/testing';
-import { ObjectId } from '@dxos/keys';
-import { trim } from '@dxos/util';
+import { EntityId } from '@dxos/keys';
 
 import { DatabaseBlueprint, DiscordBlueprint, MemoryBlueprint } from '../index';
-import BlueprintManagerDefinition from './blueprint';
 import { BlueprintManagerHandlers, EnableBlueprints, QueryBlueprints } from './functions';
 
-ObjectId.dangerouslyDisableRandomness();
+EntityId.dangerouslyDisableRandomness();
 
 const TestLayer = AssistantTestLayer({
   aiServicePreset: 'edge-remote',
@@ -29,14 +26,14 @@ 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;
-  return Obj.getDXN(session.feed).toString() as DXN.String;
+const getConversationDXN = Effect.gen(function* () {
+  const session = yield* AiSession.Service;
+  return Obj.getURI(session.feed);
 });
 
 describe('Blueprint Manager', () => {
@@ -44,10 +41,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 +59,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 +85,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 +95,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 +111,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 +120,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 +136,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'] },
@@ -151,48 +152,4 @@ describe('Blueprint Manager', () => {
     ),
     { timeout: 30_000 },
   );
-
-  it.scoped(
-    'refresh-blueprints: agent syncs a mutated database blueprint from the registry',
-    Effect.fnUntraced(
-      function* (_) {
-        const registry = yield* Blueprint.RegistryService;
-        const canonical = registry.getByKey('org.dxos.blueprint.database');
-        expect(canonical).toBeDefined();
-
-        const stored = yield* Blueprint.upsert('org.dxos.blueprint.database');
-        const originalName = stored.name;
-        Obj.update(stored, (stored) => {
-          stored.name = '___TEST_MUTATED_BLUEPRINT_NAME___';
-        });
-        yield* Database.flush();
-        expect(stored.name).toBe('___TEST_MUTATED_BLUEPRINT_NAME___');
-
-        const session = yield* AiSessionService;
-        yield* Effect.promise(() => session.context.open());
-        yield* Effect.promise(() =>
-          session.context.bind({
-            blueprints: [Ref.make(BlueprintManagerDefinition.make())],
-          }),
-        );
-
-        yield* session
-          .createRequest({
-            system: trim`
-            You can call blueprint manager tools. When asked to refresh or sync blueprints from the registry,
-            call the refresh blueprints tool once and then stop.
-          `,
-            prompt: trim`
-            Refresh blueprints from the registry so database copies match the built-in definitions.
-          `,
-          })
-          .pipe(Effect.provide(session.makeToolExecutionServices()));
-
-        expect(stored.name).toBe(originalName);
-      },
-      provideTestLayers,
-      TestHelpers.provideTestContext,
-    ),
-    MemoizedAiService.isGenerationEnabled() ? 240_000 : 60_000,
-  );
 });

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

@@ -3,11 +3,12 @@
 //
 
 import { Blueprint, Template } from '@dxos/compute';
+import { DXN } from '@dxos/keys';
 import { trim } from '@dxos/util';
 
-import { EnableBlueprints, QueryBlueprints, UpdateBlueprints } from './functions';
+import { EnableBlueprints, QueryBlueprints } from './functions';
 
-const BLUEPRINT_KEY = 'org.dxos.blueprint.blueprint-manager';
+const BLUEPRINT_KEY = 'org.dxos.blueprint.blueprintManager';
 
 const make = () =>
   Blueprint.make({
@@ -18,7 +19,6 @@ const make = () =>
       source: trim`
         You can query available blueprints and enable them in the current conversation.
         Use [query-blueprints] to refresh the list of available blueprints.
-        Use [refresh-blueprints] to update blueprint objects stored in the database from the built-in registry when they have drifted.
         Use [enable-blueprints] to enable blueprints by their keys. Always call [query-blueprints] first.
         Only blueprints with agentCanEnable=true can be enabled by the agent.
 
@@ -34,11 +34,11 @@ const make = () =>
         {
           name: 'blueprints',
           kind: 'operation',
-          operation: QueryBlueprints.meta.key,
+          operation: DXN.getName(QueryBlueprints.meta.key),
         },
       ],
     }),
-    tools: Blueprint.toolDefinitions({ operations: [QueryBlueprints, EnableBlueprints, UpdateBlueprints] }),
+    tools: Blueprint.toolDefinitions({ operations: [QueryBlueprints, EnableBlueprints] }),
   });
 
 const blueprint: Blueprint.Definition = {

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

@@ -4,27 +4,30 @@
 
 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';
+import { Database, Registry, Type } from '@dxos/echo';
+import { DXN } from '@dxos/keys';
 
 export const QueryBlueprints = Operation.make({
   meta: {
-    key: 'org.dxos.function.blueprint-manager.query-blueprints',
+    key: DXN.make('org.dxos.function.blueprintManager.queryBlueprints'),
     name: 'Query blueprints',
     description: 'Queries available blueprints.',
+    icon: 'ph--blueprint--regular',
   },
   input: Schema.Struct({}),
-  output: Schema.Array(Blueprint.Blueprint),
-  services: [Blueprint.RegistryService],
+  output: Schema.Array(Type.getSchema(Blueprint.Blueprint)),
+  services: [Registry.Service],
 });
 
 export const EnableBlueprints = Operation.make({
   meta: {
-    key: 'org.dxos.function.blueprint-manager.enable-blueprints',
+    key: DXN.make('org.dxos.function.blueprintManager.enableBlueprints'),
     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.',
+    icon: 'ph--plugs-connected--regular',
   },
   input: Schema.Struct({
     keys: Schema.Array(Schema.String).annotations({
@@ -33,7 +36,7 @@ export const EnableBlueprints = Operation.make({
     }),
   }),
   output: Schema.Struct({
-    enabled: Schema.Array(Blueprint.Blueprint),
+    enabled: Schema.Array(Type.getSchema(Blueprint.Blueprint)),
     rejected: Schema.Array(
       Schema.Struct({
         key: Schema.String,
@@ -41,17 +44,5 @@ export const EnableBlueprints = Operation.make({
       }),
     ),
   }),
-  services: [Blueprint.RegistryService, Database.Service, AiContextService],
-});
-
-export const UpdateBlueprints = Operation.make({
-  meta: {
-    key: 'org.dxos.function.blueprint-manager.refresh-blueprints',
-    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.',
-  },
-  input: Schema.Struct({}),
-  output: Schema.Void,
-  services: [Blueprint.RegistryService, Database.Service],
+  services: [Registry.Service, Database.Service, AiContext.Service],
 });

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

@@ -3,8 +3,9 @@
 //
 
 import * as Effect from 'effect/Effect';
+import * as Either from 'effect/Either';
 
-import { AiContextService } from '@dxos/assistant';
+import { AiContext } from '@dxos/assistant';
 import { Blueprint, Operation } from '@dxos/compute';
 import { Ref } from '@dxos/echo';
 
@@ -13,17 +14,19 @@ import { EnableBlueprints } from './definitions';
 export default EnableBlueprints.pipe(
   Operation.withHandler(
     Effect.fnUntraced(function* ({ keys }) {
-      const registry = yield* Blueprint.RegistryService;
       const enabled: Blueprint.Blueprint[] = [];
       const rejected: { key: string; reason: string }[] = [];
 
       for (const key of keys) {
-        const blueprint = registry.getByKey(key);
-        if (!blueprint) {
-          rejected.push({ key, reason: 'Blueprint not found in registry.' });
+        const result = yield* Blueprint.resolve(key).pipe(
+          Effect.mapError(() => ({ key, reason: 'Blueprint not found in registry.' })),
+          Effect.either,
+        );
+        if (Either.isLeft(result)) {
+          rejected.push(result.left);
           continue;
         }
-        if (!blueprint.agentCanEnable) {
+        if (!result.right.agentCanEnable) {
           rejected.push({ key, reason: 'Blueprint does not allow agent auto-enable (agentCanEnable is not set).' });
           continue;
         }
@@ -32,7 +35,7 @@ export default EnableBlueprints.pipe(
       }
 
       if (enabled.length > 0) {
-        yield* AiContextService.bindContext({
+        yield* AiContext.Service.bindContext({
           blueprints: enabled.map(Ref.make),
         });
       }

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

@@ -9,5 +9,4 @@ export * from './definitions';
 export const BlueprintManagerHandlers = OperationHandlerSet.lazy(
   () => import('./query-blueprints'),
   () => import('./enable-blueprints'),
-  () => import('./update-blueprints'),
 );

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

@@ -5,14 +5,15 @@
 import * as Effect from 'effect/Effect';
 
 import { Blueprint, Operation } from '@dxos/compute';
+import { Filter, Registry } from '@dxos/echo';
 
 import { QueryBlueprints } from './definitions';
 
 export default QueryBlueprints.pipe(
   Operation.withHandler(
     Effect.fnUntraced(function* () {
-      const registry = yield* Blueprint.RegistryService;
-      return registry.query();
+      const blueprints = yield* Registry.runQuery(Filter.type(Blueprint.Blueprint));
+      return blueprints.slice().sort(({ name: a }, { name: b }) => a.localeCompare(b));
     }),
   ),
 );