@dxos/plugin-script 0.8.4-main.406dc2a → 0.8.4-main.4a85c3132b

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "@dxos/plugin-script",
-  "version": "0.8.4-main.406dc2a",
+  "version": "0.8.4-main.4a85c3132b",
   "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,
@@ -11,31 +15,40 @@
   "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"
+      "node": "./dist/lib/node-esm/index.mjs",
+      "types": "./dist/types/src/index.d.ts"
     },
-    "./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"
+    "./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"
     },
     "./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"
+      "node": "./dist/lib/node-esm/templates/index.mjs",
+      "types": "./dist/types/src/templates/index.d.ts"
+    },
+    "./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"
     }
   },
   "types": "dist/types/src/index.d.ts",
   "typesVersions": {
     "*": {
-      "types": [
-        "dist/types/src/types/index.d.ts"
+      "blueprints": [
+        "dist/types/src/blueprints/index.d.ts"
       ],
       "templates": [
         "dist/types/src/templates/index.d.ts"
+      ],
+      "types": [
+        "dist/types/src/types/index.d.ts"
       ]
     }
   },
@@ -47,93 +60,112 @@
     "@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.4",
+    "@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.12.1",
+    "@octokit/core": "^7.0.6",
     "@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",
     "esbuild-wasm": "^0.16.14",
     "prettier": "^3.6.2",
     "react-syntax-highlighter": "^15.6.1",
     "typescript": "^5.9.3",
-    "@dxos/ai": "0.8.4-main.406dc2a",
-    "@dxos/app-framework": "0.8.4-main.406dc2a",
-    "@dxos/async": "0.8.4-main.406dc2a",
-    "@dxos/assistant": "0.8.4-main.406dc2a",
-    "@dxos/client-protocol": "0.8.4-main.406dc2a",
-    "@dxos/compute": "0.8.4-main.406dc2a",
-    "@dxos/devtools": "0.8.4-main.406dc2a",
-    "@dxos/client": "0.8.4-main.406dc2a",
-    "@dxos/debug": "0.8.4-main.406dc2a",
-    "@dxos/echo": "0.8.4-main.406dc2a",
-    "@dxos/blueprints": "0.8.4-main.406dc2a",
-    "@dxos/echo-protocol": "0.8.4-main.406dc2a",
-    "@dxos/functions": "0.8.4-main.406dc2a",
-    "@dxos/invariant": "0.8.4-main.406dc2a",
-    "@dxos/echo-query": "0.8.4-main.406dc2a",
-    "@dxos/keys": "0.8.4-main.406dc2a",
-    "@dxos/live-object": "0.8.4-main.406dc2a",
-    "@dxos/local-storage": "0.8.4-main.406dc2a",
-    "@dxos/plugin-assistant": "0.8.4-main.406dc2a",
-    "@dxos/plugin-client": "0.8.4-main.406dc2a",
-    "@dxos/plugin-deck": "0.8.4-main.406dc2a",
-    "@dxos/plugin-explorer": "0.8.4-main.406dc2a",
-    "@dxos/plugin-graph": "0.8.4-main.406dc2a",
-    "@dxos/log": "0.8.4-main.406dc2a",
-    "@dxos/plugin-space": "0.8.4-main.406dc2a",
-    "@dxos/plugin-markdown": "0.8.4-main.406dc2a",
-    "@dxos/plugin-token-manager": "0.8.4-main.406dc2a",
-    "@dxos/protocols": "0.8.4-main.406dc2a",
-    "@dxos/plugin-theme": "0.8.4-main.406dc2a",
-    "@dxos/plugin-stack": "0.8.4-main.406dc2a",
-    "@dxos/react-client": "0.8.4-main.406dc2a",
-    "@dxos/react-edge-client": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-components": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-form": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-editor": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-menu": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-list": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-stack": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-attention": "0.8.4-main.406dc2a",
-    "@dxos/rpc": "0.8.4-main.406dc2a",
-    "@dxos/rpc-tunnel": "0.8.4-main.406dc2a",
-    "@dxos/schema": "0.8.4-main.406dc2a",
-    "@dxos/util": "0.8.4-main.406dc2a",
-    "@dxos/vendor-quickjs": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.406dc2a"
+    "@dxos/app-framework": "0.8.4-main.4a85c3132b",
+    "@dxos/app-toolkit": "0.8.4-main.4a85c3132b",
+    "@dxos/assistant-toolkit": "0.8.4-main.4a85c3132b",
+    "@dxos/blueprints": "0.8.4-main.4a85c3132b",
+    "@dxos/ai": "0.8.4-main.4a85c3132b",
+    "@dxos/async": "0.8.4-main.4a85c3132b",
+    "@dxos/client": "0.8.4-main.4a85c3132b",
+    "@dxos/assistant": "0.8.4-main.4a85c3132b",
+    "@dxos/client-protocol": "0.8.4-main.4a85c3132b",
+    "@dxos/compute": "0.8.4-main.4a85c3132b",
+    "@dxos/config": "0.8.4-main.4a85c3132b",
+    "@dxos/debug": "0.8.4-main.4a85c3132b",
+    "@dxos/devtools": "0.8.4-main.4a85c3132b",
+    "@dxos/echo-db": "0.8.4-main.4a85c3132b",
+    "@dxos/effect": "0.8.4-main.4a85c3132b",
+    "@dxos/echo": "0.8.4-main.4a85c3132b",
+    "@dxos/echo-protocol": "0.8.4-main.4a85c3132b",
+    "@dxos/functions-runtime": "0.8.4-main.4a85c3132b",
+    "@dxos/functions-simulator-cloudflare": "0.8.4-main.4a85c3132b",
+    "@dxos/invariant": "0.8.4-main.4a85c3132b",
+    "@dxos/functions": "0.8.4-main.4a85c3132b",
+    "@dxos/keys": "0.8.4-main.4a85c3132b",
+    "@dxos/operation": "0.8.4-main.4a85c3132b",
+    "@dxos/log": "0.8.4-main.4a85c3132b",
+    "@dxos/echo-query": "0.8.4-main.4a85c3132b",
+    "@dxos/plugin-automation": "0.8.4-main.4a85c3132b",
+    "@dxos/plugin-assistant": "0.8.4-main.4a85c3132b",
+    "@dxos/plugin-client": "0.8.4-main.4a85c3132b",
+    "@dxos/plugin-explorer": "0.8.4-main.4a85c3132b",
+    "@dxos/plugin-deck": "0.8.4-main.4a85c3132b",
+    "@dxos/plugin-stack": "0.8.4-main.4a85c3132b",
+    "@dxos/plugin-graph": "0.8.4-main.4a85c3132b",
+    "@dxos/plugin-markdown": "0.8.4-main.4a85c3132b",
+    "@dxos/plugin-space": "0.8.4-main.4a85c3132b",
+    "@dxos/plugin-theme": "0.8.4-main.4a85c3132b",
+    "@dxos/plugin-token-manager": "0.8.4-main.4a85c3132b",
+    "@dxos/protocols": "0.8.4-main.4a85c3132b",
+    "@dxos/react-edge-client": "0.8.4-main.4a85c3132b",
+    "@dxos/react-ui-components": "0.8.4-main.4a85c3132b",
+    "@dxos/react-client": "0.8.4-main.4a85c3132b",
+    "@dxos/react-ui-attention": "0.8.4-main.4a85c3132b",
+    "@dxos/react-ui-editor": "0.8.4-main.4a85c3132b",
+    "@dxos/react-ui-form": "0.8.4-main.4a85c3132b",
+    "@dxos/react-ui-list": "0.8.4-main.4a85c3132b",
+    "@dxos/react-ui-mosaic": "0.8.4-main.4a85c3132b",
+    "@dxos/react-ui-menu": "0.8.4-main.4a85c3132b",
+    "@dxos/react-ui-stack": "0.8.4-main.4a85c3132b",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.4a85c3132b",
+    "@dxos/rpc-tunnel": "0.8.4-main.4a85c3132b",
+    "@dxos/rpc": "0.8.4-main.4a85c3132b",
+    "@dxos/types": "0.8.4-main.4a85c3132b",
+    "@dxos/schema": "0.8.4-main.4a85c3132b",
+    "@dxos/ui": "0.8.4-main.4a85c3132b",
+    "@dxos/util": "0.8.4-main.4a85c3132b",
+    "@dxos/ui-editor": "0.8.4-main.4a85c3132b",
+    "@dxos/vendor-quickjs": "0.8.4-main.4a85c3132b"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.42.4",
-    "@effect/platform": "0.92.1",
-    "@types/react": "~19.2.2",
-    "@types/react-dom": "~19.2.1",
-    "effect": "3.18.3",
-    "react": "~19.2.0",
-    "react-dom": "~19.2.0",
-    "vite": "7.1.9",
-    "@dxos/echo-db": "0.8.4-main.406dc2a",
-    "@dxos/react-ui": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-theme": "0.8.4-main.406dc2a",
-    "@dxos/random": "0.8.4-main.406dc2a",
-    "@dxos/storybook-utils": "0.8.4-main.406dc2a"
+    "@automerge/automerge": "3.2.3",
+    "@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.19.16",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^7.1.11",
+    "@dxos/config": "0.8.4-main.4a85c3132b",
+    "@dxos/echo-db": "0.8.4-main.4a85c3132b",
+    "@dxos/plugin-automation": "0.8.4-main.4a85c3132b",
+    "@dxos/plugin-chess": "0.8.4-main.4a85c3132b",
+    "@dxos/plugin-testing": "0.8.4-main.4a85c3132b",
+    "@dxos/random": "0.8.4-main.4a85c3132b",
+    "@dxos/react-ui": "0.8.4-main.4a85c3132b",
+    "@dxos/ui-theme": "0.8.4-main.4a85c3132b",
+    "@dxos/storybook-utils": "0.8.4-main.4a85c3132b"
   },
   "peerDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
-    "@effect/platform": "^0.80.12",
-    "effect": "^3.13.3",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "@dxos/react-ui-theme": "0.8.4-main.406dc2a",
-    "@dxos/react-ui": "0.8.4-main.406dc2a"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.19.16",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-main.4a85c3132b",
+    "@dxos/ui-theme": "0.8.4-main.4a85c3132b"
   },
   "publishConfig": {
     "access": "public"

package/src/ScriptPlugin.tsx

@@ -2,114 +2,72 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Capabilities, Events, contributes, createIntent, defineModule, definePlugin } from '@dxos/app-framework';
+import * as Effect from 'effect/Effect';
+
+import { Plugin } from '@dxos/app-framework';
+import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
 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 { isNonNullable } from '@dxos/util';
+import { Script } from '@dxos/functions';
+import { Operation } from '@dxos/operation';
+import { type CreateObject } from '@dxos/plugin-space/types';
 
 import {
   AppGraphBuilder,
   BlueprintDefinition,
   Compiler,
-  IntentResolver,
+  OperationResolver,
   ReactSurface,
   ScriptSettings,
 } from './capabilities';
-import { ScriptEvents } from './events';
 import { meta } from './meta';
 import { translations } from './translations';
-import { Notebook, ScriptAction } from './types';
+import { ScriptEvents } from './types';
+import { Notebook, ScriptOperation } from './types';
 
-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,
+export const ScriptPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+  AppPlugin.addMetadataModule({
+    metadata: [
+      {
+        id: Script.Script.typename,
         metadata: {
           icon: 'ph--code--regular',
+          iconHue: 'sky',
           // TODO(wittjosiah): Move out of metadata.
-          loadReferences: async (script: ScriptType) => await Ref.Array.loadAll([script.source]),
+          loadReferences: async (script: Script.Script) => await Ref.Array.loadAll([script.source]),
+          inputSchema: ScriptOperation.ScriptProps,
+          createObject: ((props) =>
+            Effect.gen(function* () {
+              const { object } = yield* Operation.invoke(ScriptOperation.CreateScript, props);
+              return object;
+            })) satisfies CreateObject,
+          addToCollectionOnCreate: true,
         },
-      }),
-      contributes(Capabilities.Metadata, {
+      },
+      {
         id: Notebook.Notebook.typename,
         metadata: {
           icon: 'ph--notebook--regular',
-          // TODO(wittjosiah): Move out of metadata.
-          loadReferences: async (notebook: Notebook.Notebook) =>
-            await Ref.Array.loadAll(
-              notebook.cells.flatMap((cell) => [cell.script, cell.view, cell.chat].filter(isNonNullable)) as any,
-            ),
+          iconHue: 'sky',
+          inputSchema: ScriptOperation.NotebookProps,
+          createObject: ((props) => Effect.sync(() => Notebook.make(props))) satisfies CreateObject,
+          addToCollectionOnCreate: true,
         },
-      }),
+      },
     ],
   }),
-  defineModule({
-    id: `${meta.id}/module/app-graph-builder`,
-    activatesOn: Events.SetupAppGraph,
-    activate: AppGraphBuilder,
-  }),
-  defineModule({
-    id: `${meta.id}/module/script/object-form`,
-    activatesOn: ClientEvents.SetupSchema,
-    activate: () =>
-      contributes(
-        SpaceCapabilities.ObjectForm,
-        defineObjectForm({
-          objectSchema: ScriptType,
-          formSchema: ScriptAction.ScriptProps,
-          getIntent: (props, options) => createIntent(ScriptAction.CreateScript, { ...props, space: options.space }),
-        }),
-      ),
-  }),
-  defineModule({
-    id: `${meta.id}/module/notebook/object-form`,
-    activatesOn: ClientEvents.SetupSchema,
-    activate: () =>
-      contributes(
-        SpaceCapabilities.ObjectForm,
-        defineObjectForm({
-          objectSchema: Notebook.Notebook,
-          formSchema: ScriptAction.NotebookProps,
-          getIntent: (props, options) => createIntent(ScriptAction.CreateNotebook, { ...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,
+  AppPlugin.addOperationResolverModule({ activate: OperationResolver }),
+  AppPlugin.addSchemaModule({ schema: [Script.Script] }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations }),
+  Plugin.addModule({
+    activatesOn: AppActivationEvents.SetupSettings,
+    activate: ScriptSettings,
   }),
-  defineModule({
-    id: `${meta.id}/module/blueprint`,
-    activatesOn: Events.SetupArtifactDefinition,
-    activate: BlueprintDefinition,
+  Plugin.addModule({
+    activatesOn: ScriptEvents.SetupCompiler,
+    activate: Compiler,
   }),
-]);
+  Plugin.make,
+);

package/src/blueprints/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { default as ScriptBlueprint } from './script-blueprint';

package/src/blueprints/script-blueprint.ts

@@ -0,0 +1,31 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type AppCapabilities } from '@dxos/app-toolkit';
+import { Blueprint, Template } from '@dxos/blueprints';
+import { trim } from '@dxos/util';
+
+const BLUEPRINT_KEY = 'dxos.org/blueprint/script';
+
+const functions: AppCapabilities.BlueprintDefinition['functions'] = [];
+
+const make = () =>
+  Blueprint.make({
+    key: BLUEPRINT_KEY,
+    name: 'Script',
+    tools: Blueprint.toolDefinitions({ functions, tools: [] }),
+    instructions: Template.make({
+      source: trim`
+        You can create and update scripts which contain Typescript code.
+      `,
+    }),
+  });
+
+const blueprint: AppCapabilities.BlueprintDefinition = {
+  key: BLUEPRINT_KEY,
+  functions,
+  make,
+};
+
+export default blueprint;

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

@@ -0,0 +1,56 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { Script } from '@dxos/functions';
+import { ATTENDABLE_PATH_SEPARATOR, PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
+import { GraphBuilder } from '@dxos/plugin-graph';
+
+import { meta } from '../../meta';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const extensions = yield* Effect.all([
+      GraphBuilder.createTypeExtension({
+        id: `${meta.id}/execute`,
+        type: Script.Script,
+        connector: (script) =>
+          Effect.succeed([
+            {
+              id: [script.id, 'execute'].join(ATTENDABLE_PATH_SEPARATOR),
+              type: PLANK_COMPANION_TYPE,
+              data: 'execute',
+              properties: {
+                label: ['script test label', { ns: meta.id }],
+                icon: 'ph--terminal--regular',
+                disposition: 'hidden',
+              },
+            },
+          ]),
+      }),
+      GraphBuilder.createTypeExtension({
+        id: `${meta.id}/logs`,
+        type: Script.Script,
+        connector: (script) =>
+          Effect.succeed([
+            {
+              id: [script.id, 'logs'].join(ATTENDABLE_PATH_SEPARATOR),
+              type: PLANK_COMPANION_TYPE,
+              data: 'logs',
+              properties: {
+                label: ['script logs label', { ns: meta.id }],
+                icon: 'ph--clock-countdown--regular',
+                disposition: 'hidden',
+              },
+            },
+          ]),
+      }),
+    ]);
+
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
+  }),
+);

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

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));