@dxos/plugin-script 0.8.4-main.3fbcb4aa9b → 0.8.4-main.4668b7de9b

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-script",
-  "version": "0.8.4-main.3fbcb4aa9b",
+  "version": "0.8.4-main.4668b7de9b",
   "description": "Braneframe notebook plugin",
   "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",
   "sideEffects": true,
   "type": "module",
@@ -54,10 +54,12 @@
     },
     "#plugin": {
       "source": {
+        "workerd": "./src/ScriptPlugin.workerd.ts",
         "node": "./src/ScriptPlugin.node.ts",
         "default": "./src/ScriptPlugin.tsx"
       },
       "types": "./dist/types/src/ScriptPlugin.d.ts",
+      "workerd": "./dist/lib/neutral/ScriptPlugin.workerd.mjs",
       "node": "./dist/lib/neutral/ScriptPlugin.node.mjs",
       "default": "./dist/lib/neutral/ScriptPlugin.mjs"
     },
@@ -79,6 +81,12 @@
       "types": "./dist/types/src/index.d.ts",
       "default": "./dist/lib/neutral/index.mjs"
     },
+    "./assets/PLUGIN.mdl": "./PLUGIN.mdl",
+    "./blueprints": {
+      "source": "./src/blueprints/index.ts",
+      "types": "./dist/types/src/blueprints/index.d.ts",
+      "default": "./dist/lib/neutral/blueprints/index.mjs"
+    },
     "./containers": {
       "source": "./src/containers/index.ts",
       "types": "./dist/types/src/containers/index.d.ts",
@@ -98,93 +106,85 @@
       "source": "./src/translations.ts",
       "types": "./dist/types/src/translations.d.ts",
       "default": "./dist/lib/neutral/translations.mjs"
+    },
+    "./types": {
+      "source": "./src/types/index.ts",
+      "types": "./dist/types/src/types/index.d.ts",
+      "default": "./dist/lib/neutral/types/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
   "files": [
     "dist",
-    "src"
+    "src",
+    "PLUGIN.mdl"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.2.6",
-    "@codemirror/autocomplete": "^6.19.0",
-    "@codemirror/lang-javascript": "^6.2.4",
-    "@codemirror/language": "^6.11.3",
-    "@codemirror/lint": "6.8.5",
-    "@codemirror/state": "^6.5.2",
-    "@codemirror/theme-one-dark": "^6.1.3",
-    "@codemirror/view": "^6.38.5",
-    "@effect-atom/atom": "^0.5.1",
+    "@automerge/automerge": "3.3.0-fragments.1",
+    "@codemirror/autocomplete": "^6.20.2",
+    "@codemirror/lang-javascript": "^6.2.5",
+    "@codemirror/language": "^6.12.3",
+    "@codemirror/lint": "6.9.6",
+    "@codemirror/state": "^6.6.0",
+    "@codemirror/view": "^6.43.0",
     "@effect-atom/atom-react": "^0.5.0",
-    "@lezer/common": "^1.2.2",
-    "@lezer/highlight": "^1.2.1",
+    "@lezer/common": "^1.5.2",
+    "@lezer/highlight": "^1.2.3",
     "@octokit/core": "^7.0.6",
     "@radix-ui/react-compose-refs": "1.1.1",
     "@typescript/vfs": "^1.6.0",
     "@valtown/codemirror-continue": "^2.3.1",
     "@valtown/codemirror-ts": "^2.3.1",
-    "codemirror": "^6.0.1",
+    "codemirror": "^6.0.2",
     "date-fns": "^3.6.0",
-    "esbuild-wasm": "^0.16.14",
+    "esbuild-wasm": "^0.28.0",
     "prettier": "^3.6.2",
-    "react-syntax-highlighter": "^15.6.1",
     "typescript": "^6.0.3",
-    "@dxos/ai": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/app-framework": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/app-toolkit": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/assistant": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/assistant-toolkit": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/client": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/client-protocol": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/async": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/config": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/context": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/compute": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/debug": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/devtools": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/echo-db": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/echo": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/echo-protocol": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/effect": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/echo-query": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/functions": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/functions-runtime": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/functions-simulator-cloudflare": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/invariant": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/keys": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-assistant": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-automation": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/log": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-client": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-explorer": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-deck": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-graph": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-game": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-space": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-markdown": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-integration": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-stack": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-theme": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/protocols": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-client": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-edge-client": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-attention": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-components": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-form": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-list": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-menu": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-mosaic": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-stack": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/rpc": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/rpc-tunnel": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/schema": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/ui": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/util": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/types": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/vendor-quickjs": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-editor": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/ui-editor": "0.8.4-main.3fbcb4aa9b"
+    "@dxos/ai": "0.8.4-main.4668b7de9b",
+    "@dxos/app-framework": "0.8.4-main.4668b7de9b",
+    "@dxos/app-toolkit": "0.8.4-main.4668b7de9b",
+    "@dxos/assistant": "0.8.4-main.4668b7de9b",
+    "@dxos/assistant-toolkit": "0.8.4-main.4668b7de9b",
+    "@dxos/client": "0.8.4-main.4668b7de9b",
+    "@dxos/client-protocol": "0.8.4-main.4668b7de9b",
+    "@dxos/config": "0.8.4-main.4668b7de9b",
+    "@dxos/context": "0.8.4-main.4668b7de9b",
+    "@dxos/compute": "0.8.4-main.4668b7de9b",
+    "@dxos/devtools": "0.8.4-main.4668b7de9b",
+    "@dxos/echo-db": "0.8.4-main.4668b7de9b",
+    "@dxos/echo": "0.8.4-main.4668b7de9b",
+    "@dxos/echo-query": "0.8.4-main.4668b7de9b",
+    "@dxos/functions": "0.8.4-main.4668b7de9b",
+    "@dxos/invariant": "0.8.4-main.4668b7de9b",
+    "@dxos/functions-runtime": "0.8.4-main.4668b7de9b",
+    "@dxos/functions-simulator-cloudflare": "0.8.4-main.4668b7de9b",
+    "@dxos/keys": "0.8.4-main.4668b7de9b",
+    "@dxos/log": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-automation": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-assistant": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-client": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-explorer": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-game": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-graph": "0.8.4-main.4668b7de9b",
+    "@dxos/effect": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-markdown": "0.8.4-main.4668b7de9b",
+    "@dxos/protocols": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui-attention": "0.8.4-main.4668b7de9b",
+    "@dxos/react-client": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui-components": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui-form": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui-editor": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui-menu": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui-stack": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.4668b7de9b",
+    "@dxos/rpc": "0.8.4-main.4668b7de9b",
+    "@dxos/rpc-tunnel": "0.8.4-main.4668b7de9b",
+    "@dxos/schema": "0.8.4-main.4668b7de9b",
+    "@dxos/ui": "0.8.4-main.4668b7de9b",
+    "@dxos/util": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-space": "0.8.4-main.4668b7de9b",
+    "@dxos/ui-editor": "0.8.4-main.4668b7de9b",
+    "@dxos/types": "0.8.4-main.4668b7de9b"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -197,15 +197,15 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^8.0.10",
-    "@dxos/config": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-chess": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-testing": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/random": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-automation": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/storybook-utils": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/ui-theme": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui": "0.8.4-main.3fbcb4aa9b"
+    "vite": "^8.0.14",
+    "@dxos/config": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-automation": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-testing": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-chess": "0.8.4-main.4668b7de9b",
+    "@dxos/random": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui": "0.8.4-main.4668b7de9b",
+    "@dxos/storybook-utils": "0.8.4-main.4668b7de9b",
+    "@dxos/ui-theme": "0.8.4-main.4668b7de9b"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -213,8 +213,8 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/ui-theme": "0.8.4-main.3fbcb4aa9b"
+    "@dxos/react-ui": "0.8.4-main.4668b7de9b",
+    "@dxos/ui-theme": "0.8.4-main.4668b7de9b"
   },
   "publishConfig": {
     "access": "public"

package/src/ScriptPlugin.tsx

@@ -19,6 +19,9 @@ import { meta } from '#meta';
 import { translations } from '#translations';
 import { ScriptEvents } from '#types';
 
+// eslint-disable-next-line import/no-relative-packages
+import pluginSpec from '../PLUGIN.mdl?raw';
+
 export const ScriptPlugin = Plugin.define(meta).pipe(
   AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
   AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
@@ -35,6 +38,9 @@ export const ScriptPlugin = Plugin.define(meta).pipe(
     activatesOn: ScriptEvents.SetupCompiler,
     activate: Compiler,
   }),
+  AppPlugin.addPluginAssetModule({
+    asset: { pluginId: meta.id, path: 'PLUGIN.mdl', content: pluginSpec, mimeType: 'application/x-mdl' },
+  }),
   Plugin.make,
 );
 

package/src/ScriptPlugin.workerd.ts

@@ -0,0 +1,18 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { Script } from '@dxos/compute';
+
+import { OperationHandler } from '#capabilities';
+import { meta } from '#meta';
+
+export const ScriptPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addSchemaModule({ schema: [Script.Script] }),
+  Plugin.make,
+);
+
+export default ScriptPlugin;

package/src/blueprints/functions/create.ts

@@ -4,9 +4,9 @@
 
 import * as Effect from 'effect/Effect';
 
+import { CollectionModel } from '@dxos/app-toolkit';
 import { Script, Operation } from '@dxos/compute';
 import { Database, Obj, Ref } from '@dxos/echo';
-import { CollectionModel } from '@dxos/schema';
 
 import { Create } from './definitions';
 
@@ -27,14 +27,14 @@ export default Create.pipe(
       db.add(script);
 
       const fn = Obj.make(Operation.PersistentOperation, {
+        [Obj.Meta]: { version: '0.0.0' },
         name,
-        version: '0.0.0',
         source: Ref.make(script),
       });
       yield* CollectionModel.add({ object: fn });
 
       return {
-        function: Obj.getDXN(fn).toString(),
+        function: Obj.getURI(fn),
       };
     }),
   ),

package/src/blueprints/functions/definitions.ts

@@ -6,7 +6,7 @@ import * as Schema from 'effect/Schema';
 
 import { ClientService } from '@dxos/client';
 import { Operation } from '@dxos/compute';
-import { Database, Feed, Ref } from '@dxos/echo';
+import { Database, Feed, Ref, DXN } from '@dxos/echo';
 import { trim } from '@dxos/util';
 
 const FunctionRef = Ref.Ref(Operation.PersistentOperation).annotations({
@@ -28,7 +28,7 @@ const FUNCTION_FORMAT = trim`
 
   const MyFunction = Operation.make({
     meta: {
-      key: 'org.dxos.script.my-function',
+      key: DXN.make('org.dxos.script.myFunction'),
       name: 'My Function',
     },
     input: Schema.Struct({
@@ -96,9 +96,10 @@ const AVAILABLE_PACKAGES = trim`
 
 export const Create = Operation.make({
   meta: {
-    key: 'org.dxos.function.script.create',
+    key: DXN.make('org.dxos.function.script.create'),
     name: 'Create',
     description: `Creates a new function with TypeScript source code and adds it to the space. ${FUNCTION_FORMAT} ${AVAILABLE_PACKAGES}`,
+    icon: 'ph--code--regular',
   },
   input: Schema.Struct({
     name: Schema.String.annotations({
@@ -119,9 +120,10 @@ export const Create = Operation.make({
 
 export const Read = Operation.make({
   meta: {
-    key: 'org.dxos.function.script.read',
+    key: DXN.make('org.dxos.function.script.read'),
     name: 'Read',
     description: 'Reads the source code and metadata of a function.',
+    icon: 'ph--file-text--regular',
   },
   input: Schema.Struct({
     function: FunctionRef,
@@ -148,9 +150,10 @@ const Edit = Schema.Struct({
 
 export const Update = Operation.make({
   meta: {
-    key: 'org.dxos.function.script.update',
+    key: DXN.make('org.dxos.function.script.update'),
     name: 'Update',
     description: `Updates the source code or metadata of a function. ${FUNCTION_FORMAT}`,
+    icon: 'ph--pencil--regular',
   },
   input: Schema.Struct({
     function: FunctionRef,
@@ -172,9 +175,10 @@ export const Update = Operation.make({
 
 export const Delete = Operation.make({
   meta: {
-    key: 'org.dxos.function.script.delete',
+    key: DXN.make('org.dxos.function.script.delete'),
     name: 'Delete',
     description: 'Deletes a function and its source from the space.',
+    icon: 'ph--trash--regular',
   },
   input: Schema.Struct({
     function: FunctionRef,
@@ -185,9 +189,10 @@ export const Delete = Operation.make({
 
 export const Deploy = Operation.make({
   meta: {
-    key: 'org.dxos.function.script.deploy',
+    key: DXN.make('org.dxos.function.script.deploy'),
     name: 'Deploy',
     description: `Deploys a function to the Edge runtime. The function source must follow the required format: a single export default of Operation.pipe(Operation.withHandler(Effect.fn(function* (...) { ... }))). See the Create operation description for a full example.`,
+    icon: 'ph--rocket-launch--regular',
   },
   input: Schema.Struct({
     function: FunctionRef,
@@ -203,9 +208,10 @@ export const Deploy = Operation.make({
 
 export const Invoke = Operation.make({
   meta: {
-    key: 'org.dxos.function.script.invoke',
+    key: DXN.make('org.dxos.function.script.invoke'),
     name: 'Invoke',
     description: 'Invokes a deployed Edge function with the given payload.',
+    icon: 'ph--play--regular',
   },
   input: Schema.Struct({
     function: FunctionRef,
@@ -244,9 +250,10 @@ const InvocationSpanSchema = Schema.Struct({
 
 export const InspectInvocations = Operation.make({
   meta: {
-    key: 'org.dxos.function.script.inspect-invocations',
+    key: DXN.make('org.dxos.function.script.inspectInvocations'),
     name: 'InspectInvocations',
     description: 'Queries the invocation trace feed for a function, returning its invocation history.',
+    icon: 'ph--magnifying-glass--regular',
   },
   input: Schema.Struct({
     function: FunctionRef,
@@ -285,9 +292,10 @@ const DeployedFunctionSchema = Schema.Struct({
 
 export const QueryDeployedFunctions = Operation.make({
   meta: {
-    key: 'org.dxos.function.script.query-deployed',
+    key: DXN.make('org.dxos.function.script.queryDeployed'),
     name: 'QueryDeployedFunctions',
     description: 'Lists all functions deployed to the EDGE runtime. Use InstallFunction to add one to the space.',
+    icon: 'ph--list--regular',
   },
   input: Schema.Void,
   output: Schema.Struct({
@@ -300,10 +308,11 @@ export const QueryDeployedFunctions = Operation.make({
 
 export const InstallFunction = Operation.make({
   meta: {
-    key: 'org.dxos.function.script.install',
+    key: DXN.make('org.dxos.function.script.install'),
     name: 'InstallFunction',
     description:
       'Installs a deployed EDGE function into the current space by key. The returned function ID can be passed directly to Invoke.',
+    icon: 'ph--download--regular',
   },
   input: Schema.Struct({
     key: Schema.String.annotations({

package/src/blueprints/functions/deploy.ts

@@ -39,12 +39,13 @@ export default Deploy.pipe(
       }
 
       const existingFunctionId = getUserFunctionIdInMetadata(Obj.getMeta(loaded));
+      const currentVersion = Obj.getMeta(loaded).version;
 
       const functionsService = FunctionsServiceClient.fromClient(client);
       const newFunction = yield* Effect.promise(() =>
         functionsService.deploy(Context.default(), {
           ownerPublicKey: space.key,
-          version: loaded.version ? incrementSemverPatch(loaded.version) : '0.0.1',
+          version: currentVersion ? incrementSemverPatch(currentVersion) : '0.0.1',
           functionId: existingFunctionId,
           entryPoint: buildResult.entryPoint,
           assets: buildResult.assets,
@@ -60,7 +61,7 @@ export default Deploy.pipe(
 
       const edgeFunctionId = getUserFunctionIdInMetadata(Obj.getMeta(loaded));
       return {
-        function: Obj.getDXN(loaded).toString(),
+        function: Obj.getURI(loaded),
         functionUrl: edgeFunctionId
           ? `${client.config.values.runtime?.services?.edge?.url ?? ''}/functions/${edgeFunctionId}`
           : undefined,

package/src/blueprints/functions/inspect-invocations.ts

@@ -34,7 +34,7 @@ export default InspectInvocations.pipe(
         if (!span.invocationTarget || !functionId) {
           return false;
         }
-        const targetDxn = span.invocationTarget.dxn.toString();
+        const targetDxn = span.invocationTarget.uri;
         const uuidPart = targetDxn.split(':').pop();
         return uuidPart === functionId;
       });

package/src/blueprints/functions/install-function.ts

@@ -7,7 +7,7 @@ import * as Effect from 'effect/Effect';
 import { ClientService } from '@dxos/client';
 import { Operation } from '@dxos/compute';
 import { Context } from '@dxos/context';
-import { Obj, Query } from '@dxos/echo';
+import { Filter, Obj } from '@dxos/echo';
 import { FunctionsServiceClient } from '@dxos/functions-runtime/edge';
 
 import { InstallFunction } from './definitions';
@@ -19,7 +19,7 @@ export default InstallFunction.pipe(
       const functionsService = FunctionsServiceClient.fromClient(client);
       const deployed = yield* Effect.promise(() => functionsService.query(Context.default()));
 
-      const fn = deployed.findLast((entry) => entry.key === key);
+      const fn = deployed.findLast((entry) => Obj.getMeta(entry).key === key);
       if (!fn) {
         return yield* Effect.fail(new Error(`No deployed function found with key: ${key}`));
       }
@@ -32,7 +32,7 @@ export default InstallFunction.pipe(
       yield* Effect.promise(() => client.addTypes([Operation.PersistentOperation]));
 
       const existingFunctions = yield* Effect.promise(() =>
-        space.db.query(Query.type(Operation.PersistentOperation, { key })).run(),
+        space.db.query(Filter.and(Filter.type(Operation.PersistentOperation), Filter.key(key))).run(),
       );
 
       let installed: Operation.PersistentOperation;
@@ -47,9 +47,9 @@ export default InstallFunction.pipe(
       }
 
       return {
-        function: Obj.getDXN(installed).toString(),
+        function: Obj.getURI(installed),
         name: fn.name ?? 'Unnamed function',
-        version: fn.version ?? '0.0.0',
+        version: Obj.getMeta(fn).version ?? '0.0.0',
       };
     }),
   ),

package/src/blueprints/functions/invoke.ts

@@ -7,9 +7,8 @@ import * as Effect from 'effect/Effect';
 import { ClientService } from '@dxos/client';
 import { Operation } from '@dxos/compute';
 import { Context } from '@dxos/context';
-import { Database } from '@dxos/echo';
+import { Database, Obj } from '@dxos/echo';
 import { FunctionsServiceClient } from '@dxos/functions-runtime/edge';
-import { getSpace } from '@dxos/react-client/echo';
 
 import { Invoke } from './definitions';
 
@@ -19,14 +18,14 @@ export default Invoke.pipe(
       const loaded = yield* Database.load(fn);
       const client = yield* ClientService;
 
-      const space = getSpace(loaded);
-      if (!space) {
+      const spaceId = Obj.getDatabase(loaded)?.spaceId;
+      if (!spaceId) {
         return yield* Effect.fail(new Error('Function is not in a space.'));
       }
 
       const functionsService = FunctionsServiceClient.fromClient(client);
       const result = yield* Effect.promise(() =>
-        functionsService.invoke(Context.default(), loaded, payload ?? {}, { spaceId: space.id }),
+        functionsService.invoke(Context.default(), loaded, payload ?? {}, { spaceId }),
       );
 
       return { response: result };

package/src/blueprints/functions/query-deployed-functions.ts

@@ -7,6 +7,7 @@ import * as Effect from 'effect/Effect';
 import { ClientService } from '@dxos/client';
 import { Operation } from '@dxos/compute';
 import { Context } from '@dxos/context';
+import { Obj } from '@dxos/echo';
 import { FunctionsServiceClient } from '@dxos/functions-runtime/edge';
 
 import { QueryDeployedFunctions } from './definitions';
@@ -18,13 +19,16 @@ export default QueryDeployedFunctions.pipe(
       const functionsService = FunctionsServiceClient.fromClient(client);
       const deployed = yield* Effect.promise(() => functionsService.query(Context.default()));
       return {
-        functions: deployed.map((fn) => ({
-          key: fn.key,
-          name: fn.name ?? 'Unnamed function',
-          version: fn.version ?? '0.0.0',
-          description: fn.description,
-          updated: fn.updated,
-        })),
+        functions: deployed.map((fn) => {
+          const meta = Obj.getMeta(fn);
+          return {
+            key: meta.key,
+            name: fn.name ?? 'Unnamed function',
+            version: meta.version ?? '0.0.0',
+            description: fn.description,
+            updated: fn.updated,
+          };
+        }),
       };
     }),
   ),

package/src/blueprints/functions/update.ts

@@ -61,7 +61,7 @@ export default Update.pipe(
       }
 
       return {
-        function: Obj.getDXN(loaded).toString(),
+        function: Obj.getURI(loaded),
       };
     }),
   ),

package/src/capabilities/create-object.ts

@@ -6,6 +6,7 @@ import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
 import { Operation, Script } from '@dxos/compute';
+import { Type } from '@dxos/echo';
 import { SpaceOperation } from '@dxos/plugin-space';
 import { SpaceCapabilities } from '@dxos/plugin-space';
 
@@ -16,7 +17,7 @@ export default Capability.makeModule(
   Effect.fnUntraced(function* () {
     return [
       Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
-        id: Script.Script.typename,
+        id: Type.getTypename(Script.Script),
         inputSchema: ScriptOperation.ScriptProps,
         createObject: (props, options) =>
           Effect.gen(function* () {
@@ -30,7 +31,7 @@ export default Capability.makeModule(
           }),
       }),
       Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
-        id: Notebook.Notebook.typename,
+        id: Type.getTypename(Notebook.Notebook),
         inputSchema: ScriptOperation.NotebookProps,
         createObject: (props, options) =>
           Effect.gen(function* () {

package/src/capabilities/react-surface.tsx

@@ -16,7 +16,7 @@ import { getSpace } from '@dxos/react-client/echo';
 import { Panel } from '@dxos/react-ui';
 
 import { ScriptPluginSettings } from '#components';
-import { DeploymentDialog, NotebookContainer, ScriptContainer, ScriptProperties, TestContainer } from '#containers';
+import { DeploymentDialog, NotebookArticle, ScriptArticle, ScriptProperties, TestContainer } from '#containers';
 import { useCompiler } from '#hooks';
 import { meta } from '#meta';
 import { Notebook, ScriptCapabilities, type Settings } from '#types';
@@ -28,7 +28,7 @@ export default Capability.makeModule(() =>
   Effect.succeed(
     Capability.contributes(Capabilities.ReactSurface, [
       Surface.create({
-        id: 'plugin-settings',
+        id: 'pluginSettings',
         filter: AppSurface.settings(AppSurface.Article, meta.id),
         component: ({ data: { subject } }) => {
           const { settings, updateSettings } = useSettingsState<Settings.Settings>(subject.atom);
@@ -58,7 +58,7 @@ export default Capability.makeModule(() =>
           const compiler = useCompiler();
           const settings = useAtomCapability(ScriptCapabilities.Settings);
           return (
-            <ScriptContainer
+            <ScriptArticle
               role={role}
               subject={data.subject}
               attendableId={data.attendableId}
@@ -74,7 +74,7 @@ export default Capability.makeModule(() =>
         component: ({ data, role }) => {
           const compiler = useCompiler();
           return (
-            <NotebookContainer
+            <NotebookArticle
               role={role}
               subject={data.subject}
               attendableId={data.attendableId}
@@ -105,13 +105,13 @@ export default Capability.makeModule(() =>
         component: ({ data, role }) => {
           const space = getSpace(data.companionTo);
           const feed = space?.properties.invocationTraceFeed?.target;
-          const queueDxn = feed ? Feed.getQueueDxn(feed) : undefined;
+          const feedDXN = feed ? Feed.getQueueUri(feed) : undefined;
           return (
             <Panel.Root role={role}>
               <Panel.Content>
                 <InvocationTraceContainer
                   db={space?.db}
-                  queueDxn={queueDxn}
+                  feedDXN={feedDXN}
                   target={data.companionTo}
                   detailAxis='block'
                 />