@dxos/plugin-script 0.8.4-main.dedc0f3 → 0.8.4-main.dfabb4ec29

package/package.json

@@ -1,135 +1,220 @@
 {
   "name": "@dxos/plugin-script",
-  "version": "0.8.4-main.dedc0f3",
+  "version": "0.8.4-main.dfabb4ec29",
   "description": "Braneframe notebook plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#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": {
+      "source": {
+        "node": "./src/ScriptPlugin.node.ts",
+        "default": "./src/ScriptPlugin.tsx"
+      },
+      "types": "./dist/types/src/ScriptPlugin.d.ts",
+      "node": "./dist/lib/neutral/ScriptPlugin.node.mjs",
+      "default": "./dist/lib/neutral/ScriptPlugin.mjs"
+    },
+    "#testing": "./src/testing/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",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs"
+      "default": "./dist/lib/neutral/index.mjs"
     },
-    "./types": {
-      "source": "./src/types/index.ts",
-      "types": "./dist/types/src/types/index.d.ts",
-      "browser": "./dist/lib/browser/types/index.mjs",
-      "node": "./dist/lib/node-esm/types/index.mjs"
+    "./containers": {
+      "source": "./src/containers/index.ts",
+      "types": "./dist/types/src/containers/index.d.ts",
+      "default": "./dist/lib/neutral/containers/index.mjs"
+    },
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.mjs"
     },
     "./templates": {
       "source": "./src/templates/index.ts",
       "types": "./dist/types/src/templates/index.d.ts",
-      "browser": "./dist/lib/browser/templates/index.mjs",
-      "node": "./dist/lib/node-esm/templates/index.mjs"
+      "default": "./dist/lib/neutral/templates/index.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "types": [
-        "dist/types/src/types/index.d.ts"
-      ],
-      "templates": [
-        "dist/types/src/templates/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
-    "@codemirror/autocomplete": "^6.18.7",
+    "@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/lint": "6.8.5",
     "@codemirror/state": "^6.5.2",
     "@codemirror/theme-one-dark": "^6.1.3",
-    "@codemirror/view": "^6.38.2",
+    "@codemirror/view": "^6.38.5",
+    "@effect-atom/atom": "^0.5.1",
+    "@effect-atom/atom-react": "^0.5.0",
     "@lezer/common": "^1.2.2",
     "@lezer/highlight": "^1.2.1",
-    "@octokit/core": "^4.0.4",
-    "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
+    "@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.2.0",
+    "@valtown/codemirror-ts": "^2.3.1",
     "codemirror": "^6.0.1",
-    "date-fns": "^3.3.1",
+    "date-fns": "^3.6.0",
     "esbuild-wasm": "^0.16.14",
     "prettier": "^3.6.2",
     "react-syntax-highlighter": "^15.6.1",
-    "typescript": "^5.9.2",
-    "@dxos/ai": "0.8.4-main.dedc0f3",
-    "@dxos/assistant": "0.8.4-main.dedc0f3",
-    "@dxos/client": "0.8.4-main.dedc0f3",
-    "@dxos/client-protocol": "0.8.4-main.dedc0f3",
-    "@dxos/app-framework": "0.8.4-main.dedc0f3",
-    "@dxos/blueprints": "0.8.4-main.dedc0f3",
-    "@dxos/compute": "0.8.4-main.dedc0f3",
-    "@dxos/async": "0.8.4-main.dedc0f3",
-    "@dxos/debug": "0.8.4-main.dedc0f3",
-    "@dxos/devtools": "0.8.4-main.dedc0f3",
-    "@dxos/echo-protocol": "0.8.4-main.dedc0f3",
-    "@dxos/echo": "0.8.4-main.dedc0f3",
-    "@dxos/echo-schema": "0.8.4-main.dedc0f3",
-    "@dxos/functions": "0.8.4-main.dedc0f3",
-    "@dxos/invariant": "0.8.4-main.dedc0f3",
-    "@dxos/keys": "0.8.4-main.dedc0f3",
-    "@dxos/live-object": "0.8.4-main.dedc0f3",
-    "@dxos/local-storage": "0.8.4-main.dedc0f3",
-    "@dxos/log": "0.8.4-main.dedc0f3",
-    "@dxos/plugin-client": "0.8.4-main.dedc0f3",
-    "@dxos/plugin-deck": "0.8.4-main.dedc0f3",
-    "@dxos/plugin-explorer": "0.8.4-main.dedc0f3",
-    "@dxos/plugin-graph": "0.8.4-main.dedc0f3",
-    "@dxos/plugin-markdown": "0.8.4-main.dedc0f3",
-    "@dxos/plugin-space": "0.8.4-main.dedc0f3",
-    "@dxos/plugin-theme": "0.8.4-main.dedc0f3",
-    "@dxos/plugin-stack": "0.8.4-main.dedc0f3",
-    "@dxos/plugin-token-manager": "0.8.4-main.dedc0f3",
-    "@dxos/protocols": "0.8.4-main.dedc0f3",
-    "@dxos/react-client": "0.8.4-main.dedc0f3",
-    "@dxos/react-ui-attention": "0.8.4-main.dedc0f3",
-    "@dxos/react-ui-editor": "0.8.4-main.dedc0f3",
-    "@dxos/react-edge-client": "0.8.4-main.dedc0f3",
-    "@dxos/react-ui-form": "0.8.4-main.dedc0f3",
-    "@dxos/react-ui-menu": "0.8.4-main.dedc0f3",
-    "@dxos/react-ui-stack": "0.8.4-main.dedc0f3",
-    "@dxos/react-ui-list": "0.8.4-main.dedc0f3",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.dedc0f3",
-    "@dxos/rpc-tunnel": "0.8.4-main.dedc0f3",
-    "@dxos/schema": "0.8.4-main.dedc0f3",
-    "@dxos/rpc": "0.8.4-main.dedc0f3",
-    "@dxos/util": "0.8.4-main.dedc0f3"
+    "typescript": "^6.0.3",
+    "@dxos/ai": "0.8.4-main.dfabb4ec29",
+    "@dxos/app-framework": "0.8.4-main.dfabb4ec29",
+    "@dxos/assistant-toolkit": "0.8.4-main.dfabb4ec29",
+    "@dxos/assistant": "0.8.4-main.dfabb4ec29",
+    "@dxos/async": "0.8.4-main.dfabb4ec29",
+    "@dxos/app-toolkit": "0.8.4-main.dfabb4ec29",
+    "@dxos/client": "0.8.4-main.dfabb4ec29",
+    "@dxos/compute": "0.8.4-main.dfabb4ec29",
+    "@dxos/config": "0.8.4-main.dfabb4ec29",
+    "@dxos/context": "0.8.4-main.dfabb4ec29",
+    "@dxos/client-protocol": "0.8.4-main.dfabb4ec29",
+    "@dxos/debug": "0.8.4-main.dfabb4ec29",
+    "@dxos/devtools": "0.8.4-main.dfabb4ec29",
+    "@dxos/echo": "0.8.4-main.dfabb4ec29",
+    "@dxos/echo-db": "0.8.4-main.dfabb4ec29",
+    "@dxos/echo-query": "0.8.4-main.dfabb4ec29",
+    "@dxos/effect": "0.8.4-main.dfabb4ec29",
+    "@dxos/functions": "0.8.4-main.dfabb4ec29",
+    "@dxos/echo-protocol": "0.8.4-main.dfabb4ec29",
+    "@dxos/functions-runtime": "0.8.4-main.dfabb4ec29",
+    "@dxos/functions-simulator-cloudflare": "0.8.4-main.dfabb4ec29",
+    "@dxos/invariant": "0.8.4-main.dfabb4ec29",
+    "@dxos/keys": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-assistant": "0.8.4-main.dfabb4ec29",
+    "@dxos/log": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-automation": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-deck": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-explorer": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-client": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-graph": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-integration": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-game": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-markdown": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-space": "0.8.4-main.dfabb4ec29",
+    "@dxos/protocols": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-stack": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-theme": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-client": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-edge-client": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-editor": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-form": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-list": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-menu": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-components": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-stack": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-mosaic": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.dfabb4ec29",
+    "@dxos/rpc-tunnel": "0.8.4-main.dfabb4ec29",
+    "@dxos/rpc": "0.8.4-main.dfabb4ec29",
+    "@dxos/schema": "0.8.4-main.dfabb4ec29",
+    "@dxos/types": "0.8.4-main.dfabb4ec29",
+    "@dxos/ui": "0.8.4-main.dfabb4ec29",
+    "@dxos/ui-editor": "0.8.4-main.dfabb4ec29",
+    "@dxos/util": "0.8.4-main.dfabb4ec29",
+    "@dxos/vendor-quickjs": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-attention": "0.8.4-main.dfabb4ec29"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.90.2",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "effect": "3.17.7",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "7.1.1",
-    "@dxos/random": "0.8.4-main.dedc0f3",
-    "@dxos/react-ui": "0.8.4-main.dedc0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.dedc0f3",
-    "@dxos/storybook-utils": "0.8.4-main.dedc0f3"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/ai": "0.33.2",
+    "@effect/ai-anthropic": "0.23.0",
+    "@effect/platform": "0.94.4",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "chess.js": "^1.0.0",
+    "effect": "3.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^8.0.10",
+    "@dxos/config": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-automation": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-testing": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-chess": "0.8.4-main.dfabb4ec29",
+    "@dxos/random": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui": "0.8.4-main.dfabb4ec29",
+    "@dxos/ui-theme": "0.8.4-main.dfabb4ec29",
+    "@dxos/storybook-utils": "0.8.4-main.dfabb4ec29"
   },
   "peerDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
-    "@effect/platform": "^0.80.12",
-    "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.dedc0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.dedc0f3"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/ui-theme": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui": "0.8.4-main.dfabb4ec29"
   },
   "publishConfig": {
     "access": "public"

package/src/ScriptPlugin.node.ts

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

package/src/ScriptPlugin.test.ts

@@ -0,0 +1,31 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+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';
+
+import { ScriptPlugin } from '#plugin';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('ScriptPlugin', () => {
+  test('modules activate on the expected events', async ({ expect }) => {
+    await using harness = await createComposerTestApp({
+      plugins: [ClientPlugin({}), ScriptPlugin()],
+    });
+
+    // After autoStart: AppGraphBuilder, CreateObject, schema all auto-cascade.
+    expect(harness.manager.getActive()).toEqual(
+      expect.arrayContaining([moduleId('AppGraphBuilder'), moduleId('CreateObject'), moduleId('schema')]),
+    );
+
+    await harness.fire(AppActivationEvents.SetupArtifactDefinition);
+    expect(harness.manager.getActive()).toContain(moduleId('BlueprintDefinition'));
+  });
+});

package/src/ScriptPlugin.tsx

@@ -2,91 +2,40 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Schema } from 'effect';
-
-import { Capabilities, Events, contributes, createIntent, defineModule, definePlugin } from '@dxos/app-framework';
-import { Ref } from '@dxos/echo';
-import { ScriptType } from '@dxos/functions';
-import { ClientEvents } from '@dxos/plugin-client';
-import { SpaceCapabilities } from '@dxos/plugin-space';
-import { defineObjectForm } from '@dxos/plugin-space/types';
+import { Plugin } from '@dxos/app-framework';
+import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
+import { Script } from '@dxos/compute';
 
 import {
   AppGraphBuilder,
   BlueprintDefinition,
   Compiler,
-  IntentResolver,
+  CreateObject,
+  OperationHandler,
   ReactSurface,
   ScriptSettings,
-} from './capabilities';
-import { ScriptEvents } from './events';
-import { meta } from './meta';
-import { translations } from './translations';
-import { ScriptAction } from './types';
+} from '#capabilities';
+import { meta } from '#meta';
+import { translations } from '#translations';
+import { ScriptEvents } from '#types';
+
+export const ScriptPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+  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,
+  }),
+  Plugin.make,
+);
 
-export const ScriptPlugin = () =>
-  definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/settings`,
-      activatesOn: Events.SetupSettings,
-      activate: ScriptSettings,
-    }),
-    defineModule({
-      id: `${meta.id}/module/compiler`,
-      activatesOn: ScriptEvents.SetupCompiler,
-      activate: Compiler,
-    }),
-    defineModule({
-      id: `${meta.id}/module/translations`,
-      activatesOn: Events.SetupTranslations,
-      activate: () => contributes(Capabilities.Translations, translations),
-    }),
-    defineModule({
-      id: `${meta.id}/module/metadata`,
-      activatesOn: Events.SetupMetadata,
-      activate: () =>
-        contributes(Capabilities.Metadata, {
-          id: ScriptType.typename,
-          metadata: {
-            icon: 'ph--code--regular',
-            // TODO(wittjosiah): Move out of metadata.
-            loadReferences: async (script: ScriptType) => await Ref.Array.loadAll([script.source]),
-          },
-        }),
-    }),
-    defineModule({
-      id: `${meta.id}/module/app-graph-builder`,
-      activatesOn: Events.SetupAppGraph,
-      activate: AppGraphBuilder,
-    }),
-    defineModule({
-      id: `${meta.id}/module/object-form`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () =>
-        contributes(
-          SpaceCapabilities.ObjectForm,
-          defineObjectForm({
-            objectSchema: ScriptType,
-            formSchema: ScriptAction.CreateScriptSchema.pipe(Schema.omit('initialTemplateId')),
-            getIntent: (props, options) => createIntent(ScriptAction.Create, { ...props, space: options.space }),
-          }),
-        ),
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupReactSurface,
-      // TODO(wittjosiah): Should occur before the script editor is loaded when surfaces activation is more granular.
-      activatesBefore: [ScriptEvents.SetupCompiler],
-      activate: ReactSurface,
-    }),
-    defineModule({
-      id: `${meta.id}/module/intent-resolver`,
-      activatesOn: Events.SetupIntentResolver,
-      activate: IntentResolver,
-    }),
-    defineModule({
-      id: `${meta.id}/module/blueprint`,
-      activatesOn: Events.SetupArtifactDefinition,
-      activate: BlueprintDefinition,
-    }),
-  ]);
+export default ScriptPlugin;

package/src/blueprints/functions/create.ts

@@ -0,0 +1,47 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Script, Operation } from '@dxos/compute';
+import { Database, Obj, Ref } from '@dxos/echo';
+import { CollectionModel } from '@dxos/schema';
+
+import { Create } from './definitions';
+
+export default Create.pipe(
+  Operation.withHandler(
+    Effect.fn(function* ({ name, source, templateId }) {
+      let scriptSource = source ?? '';
+
+      if (templateId) {
+        const template = yield* findTemplate(templateId);
+        if (template) {
+          scriptSource = template.source;
+        }
+      }
+
+      const script = Script.make({ name, source: scriptSource });
+      const { db } = yield* Database.Service;
+      db.add(script);
+
+      const fn = Obj.make(Operation.PersistentOperation, {
+        name,
+        version: '0.0.0',
+        source: Ref.make(script),
+      });
+      yield* CollectionModel.add({ object: fn });
+
+      return {
+        function: Obj.getDXN(fn).toString(),
+      };
+    }),
+  ),
+);
+
+const findTemplate = (templateId: string) =>
+  Effect.promise(async () => {
+    const { templates } = await import('../../templates');
+    return templates.find((template) => template.id === templateId);
+  });