@dxos/plugin-script 0.8.4-main.28f8d3d → 0.8.4-main.2c6827d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-script",
-  "version": "0.8.4-main.28f8d3d",
+  "version": "0.8.4-main.2c6827d",
   "description": "Braneframe notebook plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -44,18 +44,18 @@
     "src"
   ],
   "dependencies": {
-    "@codemirror/autocomplete": "^6.18.1",
-    "@codemirror/lang-javascript": "^6.2.2",
-    "@codemirror/language": "^6.10.3",
-    "@codemirror/lint": "^6.8.2",
-    "@codemirror/state": "^6.4.1",
-    "@codemirror/theme-one-dark": "^6.1.2",
-    "@codemirror/view": "^6.34.1",
+    "@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",
     "@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",
+    "@preact/signals-core": "^1.12.1",
     "@typescript/vfs": "^1.6.0",
     "@valtown/codemirror-continue": "^2.3.1",
     "@valtown/codemirror-ts": "^2.2.0",
@@ -64,72 +64,81 @@
     "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.28f8d3d",
-    "@dxos/app-framework": "0.8.4-main.28f8d3d",
-    "@dxos/assistant": "0.8.4-main.28f8d3d",
-    "@dxos/async": "0.8.4-main.28f8d3d",
-    "@dxos/blueprints": "0.8.4-main.28f8d3d",
-    "@dxos/client": "0.8.4-main.28f8d3d",
-    "@dxos/client-protocol": "0.8.4-main.28f8d3d",
-    "@dxos/compute": "0.8.4-main.28f8d3d",
-    "@dxos/debug": "0.8.4-main.28f8d3d",
-    "@dxos/devtools": "0.8.4-main.28f8d3d",
-    "@dxos/echo": "0.8.4-main.28f8d3d",
-    "@dxos/echo-protocol": "0.8.4-main.28f8d3d",
-    "@dxos/functions": "0.8.4-main.28f8d3d",
-    "@dxos/invariant": "0.8.4-main.28f8d3d",
-    "@dxos/keys": "0.8.4-main.28f8d3d",
-    "@dxos/live-object": "0.8.4-main.28f8d3d",
-    "@dxos/local-storage": "0.8.4-main.28f8d3d",
-    "@dxos/echo-schema": "0.8.4-main.28f8d3d",
-    "@dxos/log": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-client": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-deck": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-explorer": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-graph": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-markdown": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-space": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-stack": "0.8.4-main.28f8d3d",
-    "@dxos/protocols": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-theme": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-token-manager": "0.8.4-main.28f8d3d",
-    "@dxos/react-edge-client": "0.8.4-main.28f8d3d",
-    "@dxos/react-client": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui-attention": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui-editor": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui-form": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui-menu": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui-list": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui-stack": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.28f8d3d",
-    "@dxos/rpc": "0.8.4-main.28f8d3d",
-    "@dxos/rpc-tunnel": "0.8.4-main.28f8d3d",
-    "@dxos/schema": "0.8.4-main.28f8d3d",
-    "@dxos/util": "0.8.4-main.28f8d3d"
+    "typescript": "^5.9.3",
+    "@dxos/ai": "0.8.4-main.2c6827d",
+    "@dxos/assistant-toolkit": "0.8.4-main.2c6827d",
+    "@dxos/app-framework": "0.8.4-main.2c6827d",
+    "@dxos/assistant": "0.8.4-main.2c6827d",
+    "@dxos/async": "0.8.4-main.2c6827d",
+    "@dxos/blueprints": "0.8.4-main.2c6827d",
+    "@dxos/compute": "0.8.4-main.2c6827d",
+    "@dxos/debug": "0.8.4-main.2c6827d",
+    "@dxos/client-protocol": "0.8.4-main.2c6827d",
+    "@dxos/echo": "0.8.4-main.2c6827d",
+    "@dxos/devtools": "0.8.4-main.2c6827d",
+    "@dxos/client": "0.8.4-main.2c6827d",
+    "@dxos/echo-protocol": "0.8.4-main.2c6827d",
+    "@dxos/echo-query": "0.8.4-main.2c6827d",
+    "@dxos/functions-runtime": "0.8.4-main.2c6827d",
+    "@dxos/functions": "0.8.4-main.2c6827d",
+    "@dxos/invariant": "0.8.4-main.2c6827d",
+    "@dxos/live-object": "0.8.4-main.2c6827d",
+    "@dxos/local-storage": "0.8.4-main.2c6827d",
+    "@dxos/log": "0.8.4-main.2c6827d",
+    "@dxos/keys": "0.8.4-main.2c6827d",
+    "@dxos/plugin-assistant": "0.8.4-main.2c6827d",
+    "@dxos/plugin-automation": "0.8.4-main.2c6827d",
+    "@dxos/plugin-client": "0.8.4-main.2c6827d",
+    "@dxos/plugin-explorer": "0.8.4-main.2c6827d",
+    "@dxos/plugin-deck": "0.8.4-main.2c6827d",
+    "@dxos/plugin-graph": "0.8.4-main.2c6827d",
+    "@dxos/plugin-space": "0.8.4-main.2c6827d",
+    "@dxos/plugin-markdown": "0.8.4-main.2c6827d",
+    "@dxos/plugin-theme": "0.8.4-main.2c6827d",
+    "@dxos/plugin-stack": "0.8.4-main.2c6827d",
+    "@dxos/plugin-token-manager": "0.8.4-main.2c6827d",
+    "@dxos/protocols": "0.8.4-main.2c6827d",
+    "@dxos/react-edge-client": "0.8.4-main.2c6827d",
+    "@dxos/react-ui-components": "0.8.4-main.2c6827d",
+    "@dxos/react-ui-editor": "0.8.4-main.2c6827d",
+    "@dxos/react-ui-attention": "0.8.4-main.2c6827d",
+    "@dxos/react-ui-form": "0.8.4-main.2c6827d",
+    "@dxos/react-ui-list": "0.8.4-main.2c6827d",
+    "@dxos/react-ui-menu": "0.8.4-main.2c6827d",
+    "@dxos/react-ui-stack": "0.8.4-main.2c6827d",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.2c6827d",
+    "@dxos/rpc": "0.8.4-main.2c6827d",
+    "@dxos/rpc-tunnel": "0.8.4-main.2c6827d",
+    "@dxos/react-client": "0.8.4-main.2c6827d",
+    "@dxos/schema": "0.8.4-main.2c6827d",
+    "@dxos/types": "0.8.4-main.2c6827d",
+    "@dxos/vendor-quickjs": "0.8.4-main.2c6827d",
+    "@dxos/util": "0.8.4-main.2c6827d"
   },
   "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": "5.4.7",
-    "@dxos/react-ui": "0.8.4-main.28f8d3d",
-    "@dxos/random": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui-theme": "0.8.4-main.28f8d3d",
-    "@dxos/storybook-utils": "0.8.4-main.28f8d3d"
+    "@effect-atom/atom-react": "^0.3.4",
+    "@effect/platform": "0.92.1",
+    "@types/react": "~19.2.2",
+    "@types/react-dom": "~19.2.2",
+    "effect": "3.18.3",
+    "react": "~19.2.0",
+    "react-dom": "~19.2.0",
+    "vite": "7.1.9",
+    "@dxos/echo-db": "0.8.4-main.2c6827d",
+    "@dxos/plugin-automation": "0.8.4-main.2c6827d",
+    "@dxos/random": "0.8.4-main.2c6827d",
+    "@dxos/react-ui": "0.8.4-main.2c6827d",
+    "@dxos/react-ui-theme": "0.8.4-main.2c6827d",
+    "@dxos/storybook-utils": "0.8.4-main.2c6827d"
   },
   "peerDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
+    "@effect-atom/atom-react": "^0.3.4",
     "@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.28f8d3d",
-    "@dxos/react-ui-theme": "0.8.4-main.28f8d3d"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui-theme": "0.8.4-main.2c6827d",
+    "@dxos/react-ui": "0.8.4-main.2c6827d"
   },
   "publishConfig": {
     "access": "public"

package/src/ScriptPlugin.tsx

@@ -2,79 +2,110 @@
 // 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 { Script } from '@dxos/functions';
 import { ClientEvents } from '@dxos/plugin-client';
 import { SpaceCapabilities } from '@dxos/plugin-space';
 import { defineObjectForm } from '@dxos/plugin-space/types';
 
-import { AppGraphBuilder, Compiler, IntentResolver, ReactSurface, ScriptSettings } from './capabilities';
+import {
+  AppGraphBuilder,
+  BlueprintDefinition,
+  Compiler,
+  IntentResolver,
+  ReactSurface,
+  ScriptSettings,
+} from './capabilities';
 import { ScriptEvents } from './events';
 import { meta } from './meta';
 import { translations } from './translations';
-import { ScriptAction } from './types';
+import { Notebook, ScriptAction } 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,
-          metadata: {
-            icon: 'ph--code--regular',
-            // TODO(wittjosiah): Move out of metadata.
-            loadReferences: async (script: ScriptType) => await Ref.Array.loadAll([script.source]),
-          },
+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: Script.Script.typename,
+        metadata: {
+          icon: 'ph--code--regular',
+          iconHue: 'sky',
+          // TODO(wittjosiah): Move out of metadata.
+          loadReferences: async (script: Script.Script) => await Ref.Array.loadAll([script.source]),
+        },
+      }),
+      contributes(Capabilities.Metadata, {
+        id: Notebook.Notebook.typename,
+        metadata: {
+          icon: 'ph--notebook--regular',
+          iconHue: 'sky',
+        },
+      }),
+    ],
+  }),
+  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: Script.Script,
+          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/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/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,
+  }),
+]);

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

@@ -2,12 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Rx } from '@effect-rx/rx-react';
-import { Option, pipe } from 'effect';
+import { Atom } from '@effect-atom/atom-react';
+import * as Function from 'effect/Function';
+import * as Option from 'effect/Option';
 
 import { Capabilities, type PluginContext, contributes } from '@dxos/app-framework';
 import { Obj } from '@dxos/echo';
-import { ScriptType } from '@dxos/functions';
+import { Script } from '@dxos/functions';
 import { ATTENDABLE_PATH_SEPARATOR, PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
 import { createExtension } from '@dxos/plugin-graph';
 
@@ -18,10 +19,10 @@ export default (context: PluginContext) =>
     createExtension({
       id: `${meta.id}/execute`,
       connector: (node) =>
-        Rx.make((get) =>
-          pipe(
+        Atom.make((get) =>
+          Function.pipe(
             get(node),
-            Option.flatMap((node) => (Obj.instanceOf(ScriptType, node.data) ? Option.some(node) : Option.none())),
+            Option.flatMap((node) => (Obj.instanceOf(Script.Script, node.data) ? Option.some(node) : Option.none())),
             Option.map((node) => [
               {
                 id: [node.id, 'execute'].join(ATTENDABLE_PATH_SEPARATOR),
@@ -41,10 +42,10 @@ export default (context: PluginContext) =>
     createExtension({
       id: `${meta.id}/logs`,
       connector: (node) =>
-        Rx.make((get) =>
-          pipe(
+        Atom.make((get) =>
+          Function.pipe(
             get(node),
-            Option.flatMap((node) => (Obj.instanceOf(ScriptType, node.data) ? Option.some(node) : Option.none())),
+            Option.flatMap((node) => (Obj.instanceOf(Script.Script, node.data) ? Option.some(node) : Option.none())),
             Option.map((node) => [
               {
                 id: [node.id, 'logs'].join(ATTENDABLE_PATH_SEPARATOR),

package/src/capabilities/artifact-definition.ts

@@ -5,7 +5,7 @@
 // ISSUE(burdon): defineArtifact
 // @ts-nocheck
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
 import { ToolResult, createTool } from '@dxos/ai';
 import { Capabilities, type PromiseIntentDispatcher, contributes, createIntent } from '@dxos/app-framework';
@@ -16,7 +16,6 @@ import { ScriptType } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 import { SpaceAction } from '@dxos/plugin-space/types';
 import { type Space } from '@dxos/react-client/echo';
-import { DataType } from '@dxos/schema';
 
 import { meta } from '../meta';
 
@@ -159,7 +158,7 @@ export default () => {
         execute: async ({ name, code }, { extensions }) => {
           invariant(extensions?.space, 'No space');
           invariant(extensions?.dispatch, 'No intent dispatcher');
-          const script = Obj.make(ScriptType, { name, source: Ref.make(DataType.makeText(code)) });
+          const script = Obj.make(ScriptType, { name, source: Ref.make(Text.make(code)) });
           extensions.space.db.add(script);
           await extensions.space.db.flush();
 

package/src/capabilities/blueprint-definition.ts

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

package/src/capabilities/compiler.ts

@@ -6,7 +6,7 @@
 import wasmUrl from 'esbuild-wasm/esbuild.wasm?url';
 
 import { contributes } from '@dxos/app-framework';
-import { initializeBundler } from '@dxos/functions/bundler';
+import { initializeBundler } from '@dxos/functions-runtime/bundler';
 
 import { Compiler } from '../compiler';
 

package/src/capabilities/index.ts

@@ -5,6 +5,7 @@
 import { lazy } from '@dxos/app-framework';
 
 export const AppGraphBuilder = lazy(() => import('./app-graph-builder'));
+export const BlueprintDefinition = lazy(() => import('./blueprint-definition'));
 export const Compiler = lazy(() => import('./compiler'));
 export const IntentResolver = lazy(() => import('./intent-resolver'));
 export const ReactSurface = lazy(() => import('./react-surface'));

package/src/capabilities/intent-resolver.ts

@@ -3,25 +3,24 @@
 //
 
 import { Octokit } from '@octokit/core';
-import { Predicate } from 'effect';
+import * as Predicate from 'effect/Predicate';
 
 import { Capabilities, LayoutAction, contributes, createIntent, createResolver } from '@dxos/app-framework';
-import { Obj, Ref } from '@dxos/echo';
-import { ScriptType } from '@dxos/functions';
+import { Obj } from '@dxos/echo';
+import { Script } from '@dxos/functions';
 import { TokenManagerAction } from '@dxos/plugin-token-manager/types';
-import { DataType } from '@dxos/schema';
 
 import { DEPLOYMENT_DIALOG } from '../components';
 import { defaultScriptsForIntegration } from '../meta';
 import { templates } from '../templates';
-import { ScriptAction } from '../types';
+import { Notebook, ScriptAction } from '../types';
 
 export default () =>
   contributes(Capabilities.IntentResolver, [
     createResolver({
-      intent: ScriptAction.Create,
+      intent: ScriptAction.CreateScript,
       resolve: async ({ name, gistUrl, initialTemplateId }) => {
-        let content = templates[0].source;
+        let source = templates[0].source;
 
         const gistId = gistUrl?.split('/').at(-1);
         if (gistId) {
@@ -33,21 +32,31 @@ export default () =>
           });
           const gistContent = Object.values(response.data.files ?? {})[0]?.content;
           if (gistContent) {
-            content = gistContent;
+            source = gistContent;
           }
         }
 
         if (initialTemplateId) {
           const template = templates.find((template) => template.id === initialTemplateId);
           if (template) {
-            content = template.source;
-            name = template.name;
+            source = template.source;
+            name = name || template.name;
           }
         }
 
         return {
           data: {
-            object: Obj.make(ScriptType, { name, source: Ref.make(DataType.makeText(content)) }),
+            object: Script.make({ name, source }),
+          },
+        };
+      },
+    }),
+    createResolver({
+      intent: ScriptAction.CreateNotebook,
+      resolve: async ({ name }) => {
+        return {
+          data: {
+            object: Obj.make(Notebook.Notebook, { name, cells: [] }),
           },
         };
       },