@dxos/plugin-script 0.8.4-main.abd8ff62ef → 0.8.4-main.bc2380dfbc

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-script",
-  "version": "0.8.4-main.abd8ff62ef",
+  "version": "0.8.4-main.bc2380dfbc",
   "description": "Braneframe notebook plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,69 +8,98 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
   "imports": {
-    "#blueprints": "./src/blueprints/index.ts",
-    "#capabilities": "./src/capabilities/index.ts",
-    "#components": "./src/components/index.ts",
-    "#containers": "./src/containers/index.ts",
-    "#hooks": "./src/hooks/index.ts",
-    "#meta": "./src/meta.ts",
-    "#operations": "./src/operations/index.ts",
+    "#blueprints": {
+      "source": "./src/blueprints/index.ts",
+      "types": "./dist/types/src/blueprints/index.d.ts",
+      "default": "./dist/lib/neutral/blueprints/index.mjs"
+    },
+    "#capabilities": {
+      "source": {
+        "node": "./src/capabilities/node.ts",
+        "default": "./src/capabilities/index.ts"
+      },
+      "types": "./dist/types/src/capabilities/index.d.ts",
+      "node": "./dist/lib/neutral/capabilities/node.mjs",
+      "default": "./dist/lib/neutral/capabilities/index.mjs"
+    },
+    "#components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "default": "./dist/lib/neutral/components/index.mjs"
+    },
+    "#containers": {
+      "source": "./src/containers/index.ts",
+      "types": "./dist/types/src/containers/index.d.ts",
+      "default": "./dist/lib/neutral/containers/index.mjs"
+    },
+    "#hooks": {
+      "source": "./src/hooks/index.ts",
+      "types": "./dist/types/src/hooks/index.d.ts",
+      "default": "./dist/lib/neutral/hooks/index.mjs"
+    },
+    "#meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "default": "./dist/lib/neutral/meta.mjs"
+    },
+    "#operations": {
+      "source": "./src/operations/index.ts",
+      "types": "./dist/types/src/operations/index.d.ts",
+      "default": "./dist/lib/neutral/operations/index.mjs"
+    },
     "#plugin": {
-      "browser": "./src/ScriptPlugin.tsx",
-      "node": "./src/ScriptPlugin.node.ts",
-      "default": "./src/ScriptPlugin.tsx"
+      "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"
     },
     "#testing": "./src/testing/index.ts",
-    "#translations": "./src/translations.ts",
-    "#types": "./src/types/index.ts"
+    "#translations": {
+      "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"
+    }
   },
   "exports": {
     ".": {
       "source": "./src/index.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs",
-      "types": "./dist/types/src/index.d.ts"
-    },
-    "./blueprints": {
-      "source": "./src/blueprints/index.ts",
-      "browser": "./dist/lib/browser/blueprints/index.mjs",
-      "node": "./dist/lib/node-esm/blueprints/index.mjs",
-      "types": "./dist/types/src/blueprints/index.d.ts"
+      "types": "./dist/types/src/index.d.ts",
+      "default": "./dist/lib/neutral/index.mjs"
     },
     "./containers": {
       "source": "./src/containers/index.ts",
-      "browser": "./dist/lib/browser/containers/index.mjs",
-      "node": "./dist/lib/node-esm/containers/index.mjs",
-      "types": "./dist/types/src/containers/index.d.ts"
+      "types": "./dist/types/src/containers/index.d.ts",
+      "default": "./dist/lib/neutral/containers/index.mjs"
     },
-    "./operations": {
-      "source": "./src/operations/index.ts",
-      "browser": "./dist/lib/browser/operations/index.mjs",
-      "node": "./dist/lib/node-esm/operations/index.mjs",
-      "types": "./dist/types/src/operations/index.d.ts"
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.mjs"
     },
     "./templates": {
       "source": "./src/templates/index.ts",
-      "browser": "./dist/lib/browser/templates/index.mjs",
-      "node": "./dist/lib/node-esm/templates/index.mjs",
-      "types": "./dist/types/src/templates/index.d.ts"
+      "types": "./dist/types/src/templates/index.d.ts",
+      "default": "./dist/lib/neutral/templates/index.mjs"
     },
     "./translations": {
       "source": "./src/translations.ts",
       "types": "./dist/types/src/translations.d.ts",
-      "browser": "./dist/lib/browser/translations.mjs",
-      "node": "./dist/lib/node-esm/translations.mjs"
-    },
-    "./types": {
-      "source": "./src/types/index.ts",
-      "browser": "./dist/lib/browser/types/index.mjs",
-      "node": "./dist/lib/node-esm/types/index.mjs",
-      "types": "./dist/types/src/types/index.d.ts"
+      "default": "./dist/lib/neutral/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -79,14 +108,14 @@
     "src"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.2.3",
+    "@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.4",
+    "@codemirror/view": "^6.38.5",
     "@effect-atom/atom": "^0.5.1",
     "@effect-atom/atom-react": "^0.5.0",
     "@lezer/common": "^1.2.2",
@@ -98,65 +127,66 @@
     "@valtown/codemirror-ts": "^2.3.1",
     "codemirror": "^6.0.1",
     "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.abd8ff62ef",
-    "@dxos/app-framework": "0.8.4-main.abd8ff62ef",
-    "@dxos/assistant": "0.8.4-main.abd8ff62ef",
-    "@dxos/client": "0.8.4-main.abd8ff62ef",
-    "@dxos/assistant-toolkit": "0.8.4-main.abd8ff62ef",
-    "@dxos/client-protocol": "0.8.4-main.abd8ff62ef",
-    "@dxos/app-toolkit": "0.8.4-main.abd8ff62ef",
-    "@dxos/compute": "0.8.4-main.abd8ff62ef",
-    "@dxos/config": "0.8.4-main.abd8ff62ef",
-    "@dxos/debug": "0.8.4-main.abd8ff62ef",
-    "@dxos/context": "0.8.4-main.abd8ff62ef",
-    "@dxos/devtools": "0.8.4-main.abd8ff62ef",
-    "@dxos/async": "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/echo-query": "0.8.4-main.abd8ff62ef",
-    "@dxos/effect": "0.8.4-main.abd8ff62ef",
-    "@dxos/functions": "0.8.4-main.abd8ff62ef",
-    "@dxos/functions-runtime": "0.8.4-main.abd8ff62ef",
-    "@dxos/functions-simulator-cloudflare": "0.8.4-main.abd8ff62ef",
-    "@dxos/log": "0.8.4-main.abd8ff62ef",
-    "@dxos/keys": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-assistant": "0.8.4-main.abd8ff62ef",
-    "@dxos/invariant": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-automation": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-client": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-deck": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-graph": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-explorer": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-integration": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-markdown": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-space": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-stack": "0.8.4-main.abd8ff62ef",
-    "@dxos/protocols": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-client": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-theme": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-edge-client": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui-attention": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui-components": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui-editor": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui-menu": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui-form": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui-mosaic": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui-list": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui-stack": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.abd8ff62ef",
-    "@dxos/rpc": "0.8.4-main.abd8ff62ef",
-    "@dxos/rpc-tunnel": "0.8.4-main.abd8ff62ef",
-    "@dxos/types": "0.8.4-main.abd8ff62ef",
-    "@dxos/schema": "0.8.4-main.abd8ff62ef",
-    "@dxos/ui": "0.8.4-main.abd8ff62ef",
-    "@dxos/util": "0.8.4-main.abd8ff62ef",
-    "@dxos/vendor-quickjs": "0.8.4-main.abd8ff62ef",
-    "@dxos/ui-editor": "0.8.4-main.abd8ff62ef"
+    "@dxos/app-toolkit": "0.8.4-main.bc2380dfbc",
+    "@dxos/assistant": "0.8.4-main.bc2380dfbc",
+    "@dxos/ai": "0.8.4-main.bc2380dfbc",
+    "@dxos/app-framework": "0.8.4-main.bc2380dfbc",
+    "@dxos/assistant-toolkit": "0.8.4-main.bc2380dfbc",
+    "@dxos/client-protocol": "0.8.4-main.bc2380dfbc",
+    "@dxos/client": "0.8.4-main.bc2380dfbc",
+    "@dxos/async": "0.8.4-main.bc2380dfbc",
+    "@dxos/context": "0.8.4-main.bc2380dfbc",
+    "@dxos/compute": "0.8.4-main.bc2380dfbc",
+    "@dxos/config": "0.8.4-main.bc2380dfbc",
+    "@dxos/debug": "0.8.4-main.bc2380dfbc",
+    "@dxos/devtools": "0.8.4-main.bc2380dfbc",
+    "@dxos/echo": "0.8.4-main.bc2380dfbc",
+    "@dxos/echo-protocol": "0.8.4-main.bc2380dfbc",
+    "@dxos/echo-db": "0.8.4-main.bc2380dfbc",
+    "@dxos/echo-query": "0.8.4-main.bc2380dfbc",
+    "@dxos/effect": "0.8.4-main.bc2380dfbc",
+    "@dxos/functions-runtime": "0.8.4-main.bc2380dfbc",
+    "@dxos/functions": "0.8.4-main.bc2380dfbc",
+    "@dxos/functions-simulator-cloudflare": "0.8.4-main.bc2380dfbc",
+    "@dxos/invariant": "0.8.4-main.bc2380dfbc",
+    "@dxos/log": "0.8.4-main.bc2380dfbc",
+    "@dxos/keys": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-assistant": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-client": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-automation": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-deck": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-explorer": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-graph": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-game": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-integration": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-markdown": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-space": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-stack": "0.8.4-main.bc2380dfbc",
+    "@dxos/protocols": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-theme": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-client": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-edge-client": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-attention": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-editor": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-list": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-menu": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-mosaic": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-form": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-stack": "0.8.4-main.bc2380dfbc",
+    "@dxos/rpc": "0.8.4-main.bc2380dfbc",
+    "@dxos/schema": "0.8.4-main.bc2380dfbc",
+    "@dxos/rpc-tunnel": "0.8.4-main.bc2380dfbc",
+    "@dxos/types": "0.8.4-main.bc2380dfbc",
+    "@dxos/ui-editor": "0.8.4-main.bc2380dfbc",
+    "@dxos/util": "0.8.4-main.bc2380dfbc",
+    "@dxos/ui": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-components": "0.8.4-main.bc2380dfbc",
+    "@dxos/vendor-quickjs": "0.8.4-main.bc2380dfbc"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -169,15 +199,15 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^8.0.10",
-    "@dxos/config": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-automation": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-chess": "0.8.4-main.abd8ff62ef",
-    "@dxos/random": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-testing": "0.8.4-main.abd8ff62ef",
-    "@dxos/storybook-utils": "0.8.4-main.abd8ff62ef",
-    "@dxos/ui-theme": "0.8.4-main.abd8ff62ef"
+    "vite": "^8.0.13",
+    "@dxos/plugin-chess": "0.8.4-main.bc2380dfbc",
+    "@dxos/config": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-testing": "0.8.4-main.bc2380dfbc",
+    "@dxos/random": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui": "0.8.4-main.bc2380dfbc",
+    "@dxos/storybook-utils": "0.8.4-main.bc2380dfbc",
+    "@dxos/ui-theme": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-automation": "0.8.4-main.bc2380dfbc"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -185,8 +215,8 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.abd8ff62ef",
-    "@dxos/ui-theme": "0.8.4-main.abd8ff62ef"
+    "@dxos/react-ui": "0.8.4-main.bc2380dfbc",
+    "@dxos/ui-theme": "0.8.4-main.bc2380dfbc"
   },
   "publishConfig": {
     "access": "public"

package/src/ScriptPlugin.node.ts

@@ -2,66 +2,17 @@
 // Copyright 2023 DXOS.org
 //
 
-import * as Effect from 'effect/Effect';
-import * as Option from 'effect/Option';
-
 import { Plugin } from '@dxos/app-framework';
 import { AppPlugin } from '@dxos/app-toolkit';
-import { Operation, Script } from '@dxos/compute';
-import { Annotation, Ref } from '@dxos/echo';
-import { SpaceOperation } from '@dxos/plugin-space/operations';
-import { type CreateObject } from '@dxos/plugin-space/types';
+import { Script } from '@dxos/compute';
 
-import { AppGraphBuilder, BlueprintDefinition, OperationHandler } from '#capabilities';
+import { AppGraphBuilder, BlueprintDefinition, CreateObject, OperationHandler } from '#capabilities';
 import { meta } from '#meta';
-import { ScriptOperation } from '#operations';
-import { Notebook } from '#types';
 
 export const ScriptPlugin = Plugin.define(meta).pipe(
   AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
   AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
-  AppPlugin.addMetadataModule({
-    metadata: [
-      {
-        id: Script.Script.typename,
-        metadata: {
-          icon: Annotation.IconAnnotation.get(Script.Script).pipe(Option.getOrThrow).icon,
-          iconHue: Annotation.IconAnnotation.get(Script.Script).pipe(Option.getOrThrow).hue ?? 'white',
-          // TODO(wittjosiah): Move out of metadata.
-          loadReferences: async (script: Script.Script) => await Ref.Array.loadAll([script.source]),
-          inputSchema: ScriptOperation.ScriptProps,
-          createObject: ((props, options) =>
-            Effect.gen(function* () {
-              const { object } = yield* Operation.invoke(ScriptOperation.CreateScript, props);
-              return yield* Operation.invoke(SpaceOperation.AddObject, {
-                object,
-                target: options.target,
-                hidden: true,
-                targetNodeId: options.targetNodeId,
-              });
-            })) satisfies CreateObject,
-        },
-      },
-      {
-        id: Notebook.Notebook.typename,
-        metadata: {
-          icon: Annotation.IconAnnotation.get(Notebook.Notebook).pipe(Option.getOrThrow).icon,
-          iconHue: Annotation.IconAnnotation.get(Notebook.Notebook).pipe(Option.getOrThrow).hue ?? 'white',
-          inputSchema: ScriptOperation.NotebookProps,
-          createObject: ((props, options) =>
-            Effect.gen(function* () {
-              const object = Notebook.make(props);
-              return yield* Operation.invoke(SpaceOperation.AddObject, {
-                object,
-                target: options.target,
-                hidden: true,
-                targetNodeId: options.targetNodeId,
-              });
-            })) satisfies CreateObject,
-        },
-      },
-    ],
-  }),
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
   AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
   AppPlugin.addSchemaModule({ schema: [Script.Script] }),
   Plugin.make,

package/src/ScriptPlugin.test.ts

@@ -5,7 +5,7 @@
 import { describe, test } from 'vitest';
 
 import { AppActivationEvents } from '@dxos/app-toolkit';
-import { ClientPlugin } from '@dxos/plugin-client';
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
 import { createComposerTestApp } from '@dxos/plugin-testing/harness';
 
 import { ScriptPlugin } from '#plugin';
@@ -20,9 +20,9 @@ describe('ScriptPlugin', () => {
       plugins: [ClientPlugin({}), ScriptPlugin()],
     });
 
-    // After autoStart: AppGraphBuilder, metadata, schema all auto-cascade.
+    // After autoStart: AppGraphBuilder, CreateObject, schema all auto-cascade.
     expect(harness.manager.getActive()).toEqual(
-      expect.arrayContaining([moduleId('AppGraphBuilder'), moduleId('metadata'), moduleId('schema')]),
+      expect.arrayContaining([moduleId('AppGraphBuilder'), moduleId('CreateObject'), moduleId('schema')]),
     );
 
     await harness.fire(AppActivationEvents.SetupArtifactDefinition);

package/src/ScriptPlugin.tsx

@@ -2,76 +2,27 @@
 // Copyright 2023 DXOS.org
 //
 
-import * as Effect from 'effect/Effect';
-import * as Option from 'effect/Option';
-
 import { Plugin } from '@dxos/app-framework';
 import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
 import { Script } from '@dxos/compute';
-import { Operation } from '@dxos/compute';
-import { Annotation, Ref } from '@dxos/echo';
-import { SpaceOperation } from '@dxos/plugin-space/operations';
-import { type CreateObject } from '@dxos/plugin-space/types';
 
 import {
   AppGraphBuilder,
   BlueprintDefinition,
   Compiler,
+  CreateObject,
   OperationHandler,
   ReactSurface,
   ScriptSettings,
 } from '#capabilities';
 import { meta } from '#meta';
-import { ScriptOperation } from '#operations';
 import { translations } from '#translations';
 import { ScriptEvents } from '#types';
-import { Notebook } from '#types';
 
 export const ScriptPlugin = Plugin.define(meta).pipe(
   AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
   AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
-  AppPlugin.addMetadataModule({
-    metadata: [
-      {
-        id: Script.Script.typename,
-        metadata: {
-          icon: Annotation.IconAnnotation.get(Script.Script).pipe(Option.getOrThrow).icon,
-          iconHue: Annotation.IconAnnotation.get(Script.Script).pipe(Option.getOrThrow).hue ?? 'white',
-          // TODO(wittjosiah): Move out of metadata.
-          loadReferences: async (script: Script.Script) => await Ref.Array.loadAll([script.source]),
-          inputSchema: ScriptOperation.ScriptProps,
-          createObject: ((props, options) =>
-            Effect.gen(function* () {
-              const { object } = yield* Operation.invoke(ScriptOperation.CreateScript, props);
-              return yield* Operation.invoke(SpaceOperation.AddObject, {
-                object,
-                target: options.target,
-                hidden: true,
-                targetNodeId: options.targetNodeId,
-              });
-            })) satisfies CreateObject,
-        },
-      },
-      {
-        id: Notebook.Notebook.typename,
-        metadata: {
-          icon: Annotation.IconAnnotation.get(Notebook.Notebook).pipe(Option.getOrThrow).icon,
-          iconHue: Annotation.IconAnnotation.get(Notebook.Notebook).pipe(Option.getOrThrow).hue ?? 'white',
-          inputSchema: ScriptOperation.NotebookProps,
-          createObject: ((props, options) =>
-            Effect.gen(function* () {
-              const object = Notebook.make(props);
-              return yield* Operation.invoke(SpaceOperation.AddObject, {
-                object,
-                target: options.target,
-                hidden: true,
-                targetNodeId: options.targetNodeId,
-              });
-            })) satisfies CreateObject,
-        },
-      },
-    ],
-  }),
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
   AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
   AppPlugin.addSchemaModule({ schema: [Script.Script] }),
   AppPlugin.addSurfaceModule({ activate: ReactSurface }),

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

@@ -27,8 +27,8 @@ 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 });

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,

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

@@ -34,8 +34,8 @@ export default InspectInvocations.pipe(
         if (!span.invocationTarget || !functionId) {
           return false;
         }
-        const targetDxn = span.invocationTarget.dxn.toString();
-        const uuidPart = targetDxn.split(':').pop();
+        const targetDXN = span.invocationTarget.dxn.toString();
+        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;
@@ -49,7 +49,7 @@ export default InstallFunction.pipe(
       return {
         function: Obj.getDXN(installed).toString(),
         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 };