@dxos/plugin-script 0.11.1 → 0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d

package/dx.config.ts

@@ -21,6 +21,6 @@ export default Config2.make({
     source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-explorer',
     spec: 'PLUGIN.mdl',
     tags: ['labs'],
-    screenshots: [{ dark: 'https://dxos.network/plugin-details-scripts-dark.png' }],
+    screenshots: [{ dark: 'https://media.dxos.network/plugin-details-scripts-dark.png' }],
   },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-script",
-  "version": "0.11.1",
+  "version": "0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
   "description": "Braneframe notebook plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -68,11 +68,6 @@
       "source": "./src/translations.ts",
       "types": "./dist/types/src/translations.d.ts",
       "default": "./dist/lib/translations.mjs"
-    },
-    "#types": {
-      "source": "./src/types/index.ts",
-      "types": "./dist/types/src/types/index.d.ts",
-      "default": "./dist/lib/types.mjs"
     }
   },
   "exports": {
@@ -81,22 +76,53 @@
       "types": "./dist/types/src/index.d.ts",
       "import": "./dist/lib/index.mjs"
     },
-    "./assets/PLUGIN.mdl": "./PLUGIN.mdl",
-    "./skills": {
-      "source": "./src/skills/index.ts",
-      "types": "./dist/types/src/skills/index.d.ts",
-      "import": "./dist/lib/skills.mjs"
+    "./Notebook": {
+      "source": "./src/types/Notebook.ts",
+      "types": "./dist/types/src/types/Notebook.d.ts",
+      "import": "./dist/lib/Notebook.mjs"
+    },
+    "./ScriptCapabilities": {
+      "source": "./src/types/ScriptCapabilities.ts",
+      "types": "./dist/types/src/types/ScriptCapabilities.d.ts",
+      "import": "./dist/lib/ScriptCapabilities.mjs"
     },
+    "./ScriptEvents": {
+      "source": "./src/types/ScriptEvents.ts",
+      "types": "./dist/types/src/types/ScriptEvents.d.ts",
+      "import": "./dist/lib/ScriptEvents.mjs"
+    },
+    "./ScriptOperation": {
+      "source": "./src/types/ScriptOperation.ts",
+      "types": "./dist/types/src/types/ScriptOperation.d.ts",
+      "import": "./dist/lib/ScriptOperation.mjs"
+    },
+    "./Settings": {
+      "source": "./src/types/Settings.ts",
+      "types": "./dist/types/src/types/Settings.d.ts",
+      "import": "./dist/lib/Settings.mjs"
+    },
+    "./assets/PLUGIN.mdl": "./PLUGIN.mdl",
     "./containers": {
       "source": "./src/containers/index.ts",
       "types": "./dist/types/src/containers/index.d.ts",
       "import": "./dist/lib/containers.mjs"
     },
+    "./operations": {
+      "source": "./src/operations/index.ts",
+      "types": "./dist/types/src/operations/index.d.ts",
+      "import": "./dist/lib/operations.mjs"
+    },
+    "./package.json": "./package.json",
     "./plugin": {
       "source": "./src/plugin.ts",
       "types": "./dist/types/src/plugin.d.ts",
       "import": "./dist/lib/plugin.mjs"
     },
+    "./skills": {
+      "source": "./src/skills/index.ts",
+      "types": "./dist/types/src/skills/index.d.ts",
+      "import": "./dist/lib/skills.mjs"
+    },
     "./templates": {
       "source": "./src/templates/index.ts",
       "types": "./dist/types/src/templates/index.d.ts",
@@ -106,14 +132,28 @@
       "source": "./src/translations.ts",
       "types": "./dist/types/src/translations.d.ts",
       "import": "./dist/lib/translations.mjs"
-    },
-    "./types": {
-      "source": "./src/types/index.ts",
-      "types": "./dist/types/src/types/index.d.ts",
-      "import": "./dist/lib/types.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
+  "typesVersions": {
+    "*": {
+      "Notebook": [
+        "dist/types/src/types/Notebook.d.ts"
+      ],
+      "ScriptCapabilities": [
+        "dist/types/src/types/ScriptCapabilities.d.ts"
+      ],
+      "ScriptEvents": [
+        "dist/types/src/types/ScriptEvents.d.ts"
+      ],
+      "ScriptOperation": [
+        "dist/types/src/types/ScriptOperation.d.ts"
+      ],
+      "Settings": [
+        "dist/types/src/types/Settings.d.ts"
+      ]
+    }
+  },
   "files": [
     "dist",
     "dx.config.ts",
@@ -130,6 +170,7 @@
     "@codemirror/view": "^6.43.6",
     "@effect-atom/atom": "^0.5.3",
     "@effect-atom/atom-react": "^0.5.0",
+    "@effect/ai": "0.36.0",
     "@lezer/common": "^1.5.2",
     "@lezer/highlight": "^1.2.3",
     "@octokit/core": "^7.0.6",
@@ -137,83 +178,75 @@
     "@typescript/vfs": "^1.6.0",
     "@valtown/codemirror-continue": "^2.3.1",
     "@valtown/codemirror-ts": "^2.3.1",
-    "codemirror": "^6.0.2",
-    "date-fns": "^3.6.0",
+    "chess.js": "^1.0.0",
     "esbuild-wasm": "^0.28.0",
     "prettier": "^3.6.2",
     "typescript": "^6.0.3",
-    "@dxos/ai": "0.11.1",
-    "@dxos/app-framework": "0.11.1",
-    "@dxos/app-toolkit": "0.11.1",
-    "@dxos/assistant": "0.11.1",
-    "@dxos/assistant-toolkit": "0.11.1",
-    "@dxos/client": "0.11.1",
-    "@dxos/client-protocol": "0.11.1",
-    "@dxos/compute": "0.11.1",
-    "@dxos/compute-runtime": "0.11.1",
-    "@dxos/config": "0.11.1",
-    "@dxos/context": "0.11.1",
-    "@dxos/devtools": "0.11.1",
-    "@dxos/echo": "0.11.1",
-    "@dxos/echo-client": "0.11.1",
-    "@dxos/echo-doc": "0.11.1",
-    "@dxos/echo-query": "0.11.1",
-    "@dxos/echo-react": "0.11.1",
-    "@dxos/edge-compute": "0.11.1",
-    "@dxos/effect": "0.11.1",
-    "@dxos/halo": "0.11.1",
-    "@dxos/halo-react": "0.11.1",
-    "@dxos/invariant": "0.11.1",
-    "@dxos/link": "0.11.1",
-    "@dxos/keys": "0.11.1",
-    "@dxos/log": "0.11.1",
-    "@dxos/plugin-assistant": "0.11.1",
-    "@dxos/plugin-client": "0.11.1",
-    "@dxos/plugin-explorer": "0.11.1",
-    "@dxos/plugin-game": "0.11.1",
-    "@dxos/plugin-graph": "0.11.1",
-    "@dxos/plugin-markdown": "0.11.1",
-    "@dxos/plugin-space": "0.11.1",
-    "@dxos/protocols": "0.11.1",
-    "@dxos/react-client": "0.11.1",
-    "@dxos/react-ui-attention": "0.11.1",
-    "@dxos/react-ui-components": "0.11.1",
-    "@dxos/react-ui-dnd": "0.11.1",
-    "@dxos/react-ui-editor": "0.11.1",
-    "@dxos/react-ui-form": "0.11.1",
-    "@dxos/react-ui-menu": "0.11.1",
-    "@dxos/react-ui-mosaic": "0.11.1",
-    "@dxos/react-ui-syntax-highlighter": "0.11.1",
-    "@dxos/rpc": "0.11.1",
-    "@dxos/plugin-routine": "0.11.1",
-    "@dxos/rpc-tunnel": "0.11.1",
-    "@dxos/schema": "0.11.1",
-    "@dxos/ui-editor": "0.11.1",
-    "@dxos/types": "0.11.1",
-    "@dxos/util": "0.11.1",
-    "@dxos/ui": "0.11.1"
+    "@dxos/ai": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/app-framework": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/app-toolkit": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/assistant": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/assistant-toolkit": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/client": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/client-protocol": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/compute": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/compute-runtime": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/config": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/context": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/devtools": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/echo": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/echo-query": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/echo-doc": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/echo-react": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/edge-compute": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/halo-react": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/invariant": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/keys": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/link": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/plugin-chess": "0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/plugin-explorer": "0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/plugin-client": "0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/plugin-game": "0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/plugin-graph": "0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/effect": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/log": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/plugin-markdown": "0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/plugin-routine": "0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/plugin-space": "0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/protocols": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/react-client": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/react-ui-attention": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/react-ui-components": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/react-ui-dnd": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/react-ui-editor": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/react-ui-form": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/react-ui-mosaic": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/react-ui-menu": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/react-ui-syntax-highlighter": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/schema": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/types": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/ui": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/ui-editor": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/util": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
-    "@effect/ai": "0.36.0",
-    "@effect/ai-anthropic": "0.26.0",
     "@effect/platform": "0.96.2",
+    "@storybook/react-vite": "^10.4.2",
     "@types/react": "~19.2.17",
     "@types/react-dom": "~19.2.3",
-    "chess.js": "^1.0.0",
     "effect": "3.21.4",
     "react": "~19.2.7",
     "react-dom": "~19.2.7",
     "vite": "^8.1.4",
-    "@dxos/config": "0.11.1",
-    "@dxos/functions-simulator-cloudflare": "0.11.1",
-    "@dxos/plugin-chess": "0.11.1",
-    "@dxos/plugin-routine": "0.11.1",
-    "@dxos/plugin-testing": "0.11.1",
-    "@dxos/random": "0.11.1",
-    "@dxos/react-ui": "0.11.1",
-    "@dxos/storybook-utils": "0.11.1",
-    "@dxos/ui-theme": "0.11.1"
+    "@dxos/config": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/plugin-routine": "0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/plugin-testing": "0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/react-ui": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/ui-theme": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/plugin-assistant": "0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/echo-client": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/functions-simulator-cloudflare": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -221,8 +254,8 @@
     "effect": "3.21.4",
     "react": "~19.2.7",
     "react-dom": "~19.2.7",
-    "@dxos/react-ui": "^0.11.1",
-    "@dxos/ui-theme": "^0.11.1"
+    "@dxos/react-ui": "^1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/ui-theme": "^1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d"
   },
   "publishConfig": {
     "access": "public"

package/src/ScriptPlugin.node.ts

@@ -2,19 +2,19 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Plugin } from '@dxos/app-framework';
-import { AppPlugin } from '@dxos/app-toolkit';
-import { Script } from '@dxos/compute';
+import * as Plugin from '@dxos/app-framework/Plugin';
+import * as AppCapability from '@dxos/app-toolkit/AppCapability';
+import * as Script from '@dxos/compute/Script';
 
 import { AppGraphBuilder, CreateObject, OperationHandler, SkillDefinition } from '#capabilities';
 import { meta } from '#meta';
 
 export const ScriptPlugin = Plugin.define(meta).pipe(
-  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
-  AppPlugin.addSkillDefinitionModule({ activate: SkillDefinition }),
-  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
-  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
-  AppPlugin.addSchemaModule({ schema: [Script.Script] }),
+  Plugin.addModule(AppGraphBuilder),
+  Plugin.addModule(SkillDefinition),
+  Plugin.addModule(CreateObject),
+  Plugin.addModule(OperationHandler),
+  Plugin.addModule(AppCapability.schema([Script.Script])),
   Plugin.make,
 );
 

package/src/ScriptPlugin.test.ts

@@ -4,7 +4,6 @@
 
 import { describe, test } from 'vitest';
 
-import { AppActivationEvents } from '@dxos/app-toolkit';
 import { ClientPlugin } from '@dxos/plugin-client/plugin';
 import { createComposerTestApp } from '@dxos/plugin-testing/harness';
 
@@ -20,12 +19,10 @@ describe('ScriptPlugin', () => {
       plugins: [ClientPlugin({}), ScriptPlugin()],
     });
 
-    // After autoStart: AppGraphBuilder, CreateObject, schema all auto-cascade.
+    // After autoStart: AppGraphBuilder, CreateObject, schema all auto-cascade. SkillDefinition is a
+    // dependency-mode root, so it activates immediately too.
     expect(harness.manager.getActive()).toEqual(
-      expect.arrayContaining([moduleId('AppGraphBuilder'), moduleId('CreateObject'), moduleId('schema')]),
+      expect.arrayContaining([moduleId('AppGraphBuilder'), moduleId('schema')]),
     );
-
-    await harness.fire(AppActivationEvents.SetupArtifactDefinition);
-    expect(harness.manager.getActive()).toContain(moduleId('SkillDefinition'));
   });
 });

package/src/ScriptPlugin.tsx

@@ -2,9 +2,9 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Plugin } from '@dxos/app-framework';
-import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
-import { Script } from '@dxos/compute';
+import * as Plugin from '@dxos/app-framework/Plugin';
+import * as AppCapability from '@dxos/app-toolkit/AppCapability';
+import * as Script from '@dxos/compute/Script';
 
 import {
   AppGraphBuilder,
@@ -17,30 +17,28 @@ import {
 } from '#capabilities';
 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.addSkillDefinitionModule({ activate: SkillDefinition }),
-  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
-  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
-  AppPlugin.addSchemaModule({ schema: [Script.Script] }),
-  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
-  AppPlugin.addTranslationsModule({ translations }),
-  Plugin.addModule({
-    activatesOn: AppActivationEvents.SetupSettings,
-    activate: ScriptSettings,
-  }),
-  Plugin.addModule({
-    activatesOn: ScriptEvents.SetupCompiler,
-    activate: Compiler,
-  }),
-  AppPlugin.addPluginAssetModule({
-    asset: { pluginId: meta.profile.key, path: 'PLUGIN.mdl', content: pluginSpec, mimeType: 'application/x-mdl' },
-  }),
+  Plugin.addModule(AppGraphBuilder),
+  Plugin.addModule(SkillDefinition),
+  Plugin.addModule(CreateObject),
+  Plugin.addModule(OperationHandler),
+  Plugin.addModule(AppCapability.schema([Script.Script])),
+  Plugin.addModule(ReactSurface),
+  Plugin.addModule(AppCapability.translations(translations)),
+  Plugin.addModule(ScriptSettings),
+  Plugin.addModule(Compiler),
+  Plugin.addModule(
+    AppCapability.pluginAsset({
+      pluginId: meta.profile.key,
+      path: 'PLUGIN.mdl',
+      content: pluginSpec,
+      mimeType: 'application/x-mdl',
+    }),
+  ),
   Plugin.make,
 );
 

package/src/ScriptPlugin.workerd.ts

@@ -2,16 +2,16 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Plugin } from '@dxos/app-framework';
-import { AppPlugin } from '@dxos/app-toolkit';
-import { Script } from '@dxos/compute';
+import * as Plugin from '@dxos/app-framework/Plugin';
+import * as AppCapability from '@dxos/app-toolkit/AppCapability';
+import * as Script from '@dxos/compute/Script';
 
 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.addModule(OperationHandler),
+  Plugin.addModule(AppCapability.schema([Script.Script])),
   Plugin.make,
 );
 

package/src/capabilities/ScriptSurfaces.tsx

@@ -7,8 +7,8 @@
 import React from 'react';
 
 import { useAtomCapability, useSettingsState } from '@dxos/app-framework/ui';
-import { type AppCapabilities } from '@dxos/app-toolkit';
-import { type Script } from '@dxos/compute';
+import type * as AppCapabilities from '@dxos/app-toolkit/AppCapabilities';
+import type * as Script from '@dxos/compute/Script';
 import { InvocationTraceContainer } from '@dxos/devtools';
 import { Feed } from '@dxos/echo';
 import { useClient } from '@dxos/react-client';
@@ -17,8 +17,10 @@ import { Panel } from '@dxos/react-ui';
 
 import { NotebookArticle, ScriptArticle, ScriptSettings } from '#containers';
 import { useCompiler } from '#hooks';
-import { type Notebook, ScriptCapabilities, type Settings } from '#types';
 
+import * as Notebook from '../types/Notebook';
+import * as ScriptCapabilities from '../types/ScriptCapabilities';
+import * as Settings from '../types/Settings';
 import { getAccessCredential } from '../util';
 
 export type ScriptSettingsSurfaceProps = {

package/src/capabilities/app-graph-builder.ts

@@ -4,9 +4,10 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability } from '@dxos/app-framework';
-import { AppCapabilities, AppNode } from '@dxos/app-toolkit';
-import { Script } from '@dxos/compute';
+import * as Capability from '@dxos/app-framework/Capability';
+import * as AppCapabilities from '@dxos/app-toolkit/AppCapabilities';
+import * as AppNode from '@dxos/app-toolkit/AppNode';
+import * as Script from '@dxos/compute/Script';
 import { GraphBuilder } from '@dxos/plugin-graph';
 
 import { meta } from '#meta';
@@ -42,6 +43,6 @@ export default Capability.makeModule(
       }),
     ]);
 
-    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
+    return Capability.contribute(AppCapabilities.AppGraphBuilder, extensions);
   }),
 );

package/src/capabilities/compiler.ts

@@ -10,14 +10,13 @@ import * as Schema from 'effect/Schema';
 import wasmUrl from 'esbuild-wasm/esbuild.wasm?url';
 import * as ts from 'typescript';
 
-import { Capability } from '@dxos/app-framework';
+import * as Capability from '@dxos/app-framework/Capability';
 import { initializeBundler } from '@dxos/edge-compute/bundler';
 import { log } from '@dxos/log';
 import { trim } from '@dxos/util';
 
-import { ScriptCapabilities } from '#types';
-
 import { Compiler } from '../compiler';
+import * as ScriptCapabilities from '../types/ScriptCapabilities';
 
 // TODO(burdon): Document.
 const SCRIPT_PACKAGES_BUCKET = 'https://pub-5745ae82e450484aa28f75fc6a175935.r2.dev/dev/';
@@ -59,7 +58,7 @@ export default Capability.makeModule(() =>
       }
     }
 
-    return Capability.contributes(ScriptCapabilities.Compiler, compiler);
+    return Capability.contribute(ScriptCapabilities.Compiler, compiler);
   }),
 );
 

package/src/capabilities/create-object.ts

@@ -4,44 +4,47 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability } from '@dxos/app-framework';
-import { Operation, Script } from '@dxos/compute';
+import * as Capability from '@dxos/app-framework/Capability';
+import * as Operation from '@dxos/compute/Operation';
+import * as Script from '@dxos/compute/Script';
 import { Type } from '@dxos/echo';
 import { SpaceOperation } from '@dxos/plugin-space';
-import { SpaceCapabilities } from '@dxos/plugin-space';
+import * as SpaceCapabilities from '@dxos/plugin-space/SpaceCapabilities';
 
-import { ScriptOperation } from '#types';
-import { Notebook } from '#types';
+import * as Notebook from '../types/Notebook';
+import * as ScriptOperation from '../types/ScriptOperation';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
     return [
-      Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
-        id: Type.getTypename(Script.Script),
-        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,
-              targetNodeId: options.targetNodeId,
-            });
-          }),
-      }),
-      Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
-        id: Type.getTypename(Notebook.Notebook),
-        inputSchema: ScriptOperation.NotebookProps,
-        createObject: (props, options) =>
-          Effect.gen(function* () {
-            const object = Notebook.make(props);
-            return yield* Operation.invoke(SpaceOperation.AddObject, {
-              object,
-              target: options.target,
-              targetNodeId: options.targetNodeId,
-            });
-          }),
-      }),
+      Capability.contributeAll(SpaceCapabilities.CreateObjectEntry, [
+        {
+          id: Type.getTypename(Script.Script),
+          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,
+                targetNodeId: options.targetNodeId,
+              });
+            }),
+        },
+        {
+          id: Type.getTypename(Notebook.Notebook),
+          inputSchema: ScriptOperation.NotebookProps,
+          createObject: (props, options) =>
+            Effect.gen(function* () {
+              const object = Notebook.make(props);
+              return yield* Operation.invoke(SpaceOperation.AddObject, {
+                object,
+                target: options.target,
+                targetNodeId: options.targetNodeId,
+              });
+            }),
+        },
+      ]),
     ];
   }),
 );

package/src/capabilities/index.ts

@@ -2,16 +2,33 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capability } from '@dxos/app-framework';
-import type { OperationHandlerSet } from '@dxos/compute';
+import * as ActivationEvents from '@dxos/app-framework/ActivationEvents';
+import * as Capability from '@dxos/app-framework/Capability';
+import * as AppCapability from '@dxos/app-toolkit/AppCapability';
+import * as SpaceCapability from '@dxos/plugin-space/SpaceCapability';
 
-export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
-export const SkillDefinition = Capability.lazy('SkillDefinition', () => import('./skill-definition'));
-export const CreateObject = Capability.lazy('CreateObject', () => import('./create-object'));
-export const Compiler = Capability.lazy('Compiler', () => import('./compiler'));
-export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
-  'OperationHandler',
-  () => import('./operation-handler'),
+import * as ScriptCapabilities from '../types/ScriptCapabilities';
+import * as ScriptEvents from '../types/ScriptEvents';
+
+export const AppGraphBuilder = AppCapability.appGraphBuilder(() => import('./app-graph-builder'));
+export const SkillDefinition = AppCapability.skillDefinition(() => import('./skill-definition'));
+export const CreateObject = SpaceCapability.createObject(() => import('./create-object'));
+export const Compiler = Capability.lazyModule(
+  'Compiler',
+  {
+    provides: [ScriptCapabilities.Compiler],
+    // Genuine runtime event: the compiler is only loaded on demand (`hooks/useCompiler.ts`), not at startup.
+    activatesOn: ScriptEvents.SetupCompiler,
+  },
+  () => import('./compiler'),
 );
-export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));
-export const ScriptSettings = Capability.lazy('ScriptSettings', () => import('./settings'));
+export const OperationHandler = AppCapability.operationHandler(() => import('./operation-handler'), {
+  activatesOn: ActivationEvents.Idle,
+});
+export const ReactSurface = AppCapability.surface(() => import('./react-surface'), {
+  roles: ['org.dxos.role.article', 'org.dxos.role.dialog', 'org.dxos.role.objectProperties', 'org.dxos.role.section'],
+});
+export const ScriptSettings = AppCapability.settings(() => import('./settings'), {
+  activatesOn: ActivationEvents.Idle,
+  provides: [ScriptCapabilities.Settings],
+});