@dxos/plugin-script 0.8.4-main.2e9d522 → 0.8.4-main.3c1ae3b

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-script",
-  "version": "0.8.4-main.2e9d522",
+  "version": "0.8.4-main.3c1ae3b",
   "description": "Braneframe notebook plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,16 +10,19 @@
   "type": "module",
   "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"
     },
     "./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"
     },
     "./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"
@@ -41,92 +44,105 @@
     "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",
+    "@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.5.0",
-    "typescript": "^5.8.3",
-    "@dxos/ai": "0.8.4-main.2e9d522",
-    "@dxos/app-framework": "0.8.4-main.2e9d522",
-    "@dxos/assistant": "0.8.4-main.2e9d522",
-    "@dxos/async": "0.8.4-main.2e9d522",
-    "@dxos/blueprints": "0.8.4-main.2e9d522",
-    "@dxos/client-protocol": "0.8.4-main.2e9d522",
-    "@dxos/compute": "0.8.4-main.2e9d522",
-    "@dxos/client": "0.8.4-main.2e9d522",
-    "@dxos/debug": "0.8.4-main.2e9d522",
-    "@dxos/devtools": "0.8.4-main.2e9d522",
-    "@dxos/echo": "0.8.4-main.2e9d522",
-    "@dxos/echo-schema": "0.8.4-main.2e9d522",
-    "@dxos/echo-protocol": "0.8.4-main.2e9d522",
-    "@dxos/functions": "0.8.4-main.2e9d522",
-    "@dxos/invariant": "0.8.4-main.2e9d522",
-    "@dxos/live-object": "0.8.4-main.2e9d522",
-    "@dxos/keys": "0.8.4-main.2e9d522",
-    "@dxos/log": "0.8.4-main.2e9d522",
-    "@dxos/local-storage": "0.8.4-main.2e9d522",
-    "@dxos/plugin-explorer": "0.8.4-main.2e9d522",
-    "@dxos/plugin-client": "0.8.4-main.2e9d522",
-    "@dxos/plugin-deck": "0.8.4-main.2e9d522",
-    "@dxos/plugin-markdown": "0.8.4-main.2e9d522",
-    "@dxos/plugin-space": "0.8.4-main.2e9d522",
-    "@dxos/plugin-stack": "0.8.4-main.2e9d522",
-    "@dxos/plugin-graph": "0.8.4-main.2e9d522",
-    "@dxos/plugin-theme": "0.8.4-main.2e9d522",
-    "@dxos/plugin-token-manager": "0.8.4-main.2e9d522",
-    "@dxos/protocols": "0.8.4-main.2e9d522",
-    "@dxos/react-client": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-attention": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-editor": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-form": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-list": "0.8.4-main.2e9d522",
-    "@dxos/react-edge-client": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-menu": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-stack": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.2e9d522",
-    "@dxos/rpc": "0.8.4-main.2e9d522",
-    "@dxos/util": "0.8.4-main.2e9d522",
-    "@dxos/rpc-tunnel": "0.8.4-main.2e9d522",
-    "@dxos/schema": "0.8.4-main.2e9d522"
+    "react-syntax-highlighter": "^15.6.1",
+    "typescript": "^5.9.3",
+    "@dxos/app-framework": "0.8.4-main.3c1ae3b",
+    "@dxos/ai": "0.8.4-main.3c1ae3b",
+    "@dxos/async": "0.8.4-main.3c1ae3b",
+    "@dxos/assistant": "0.8.4-main.3c1ae3b",
+    "@dxos/blueprints": "0.8.4-main.3c1ae3b",
+    "@dxos/assistant-toolkit": "0.8.4-main.3c1ae3b",
+    "@dxos/client-protocol": "0.8.4-main.3c1ae3b",
+    "@dxos/client": "0.8.4-main.3c1ae3b",
+    "@dxos/compute": "0.8.4-main.3c1ae3b",
+    "@dxos/config": "0.8.4-main.3c1ae3b",
+    "@dxos/debug": "0.8.4-main.3c1ae3b",
+    "@dxos/echo": "0.8.4-main.3c1ae3b",
+    "@dxos/echo-db": "0.8.4-main.3c1ae3b",
+    "@dxos/devtools": "0.8.4-main.3c1ae3b",
+    "@dxos/echo-protocol": "0.8.4-main.3c1ae3b",
+    "@dxos/echo-query": "0.8.4-main.3c1ae3b",
+    "@dxos/functions": "0.8.4-main.3c1ae3b",
+    "@dxos/functions-simulator-cloudflare": "0.8.4-main.3c1ae3b",
+    "@dxos/invariant": "0.8.4-main.3c1ae3b",
+    "@dxos/functions-runtime": "0.8.4-main.3c1ae3b",
+    "@dxos/keys": "0.8.4-main.3c1ae3b",
+    "@dxos/live-object": "0.8.4-main.3c1ae3b",
+    "@dxos/local-storage": "0.8.4-main.3c1ae3b",
+    "@dxos/log": "0.8.4-main.3c1ae3b",
+    "@dxos/plugin-automation": "0.8.4-main.3c1ae3b",
+    "@dxos/plugin-assistant": "0.8.4-main.3c1ae3b",
+    "@dxos/plugin-deck": "0.8.4-main.3c1ae3b",
+    "@dxos/plugin-client": "0.8.4-main.3c1ae3b",
+    "@dxos/plugin-explorer": "0.8.4-main.3c1ae3b",
+    "@dxos/plugin-graph": "0.8.4-main.3c1ae3b",
+    "@dxos/plugin-markdown": "0.8.4-main.3c1ae3b",
+    "@dxos/plugin-space": "0.8.4-main.3c1ae3b",
+    "@dxos/plugin-theme": "0.8.4-main.3c1ae3b",
+    "@dxos/plugin-stack": "0.8.4-main.3c1ae3b",
+    "@dxos/plugin-token-manager": "0.8.4-main.3c1ae3b",
+    "@dxos/protocols": "0.8.4-main.3c1ae3b",
+    "@dxos/react-client": "0.8.4-main.3c1ae3b",
+    "@dxos/react-ui-components": "0.8.4-main.3c1ae3b",
+    "@dxos/react-ui-attention": "0.8.4-main.3c1ae3b",
+    "@dxos/react-ui-editor": "0.8.4-main.3c1ae3b",
+    "@dxos/react-ui-list": "0.8.4-main.3c1ae3b",
+    "@dxos/react-ui-menu": "0.8.4-main.3c1ae3b",
+    "@dxos/react-ui-form": "0.8.4-main.3c1ae3b",
+    "@dxos/react-ui-stack": "0.8.4-main.3c1ae3b",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.3c1ae3b",
+    "@dxos/rpc": "0.8.4-main.3c1ae3b",
+    "@dxos/react-edge-client": "0.8.4-main.3c1ae3b",
+    "@dxos/types": "0.8.4-main.3c1ae3b",
+    "@dxos/schema": "0.8.4-main.3c1ae3b",
+    "@dxos/rpc-tunnel": "0.8.4-main.3c1ae3b",
+    "@dxos/util": "0.8.4-main.3c1ae3b",
+    "@dxos/vendor-quickjs": "0.8.4-main.3c1ae3b"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.89.0",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "effect": "3.17.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/random": "0.8.4-main.2e9d522",
-    "@dxos/react-ui": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-theme": "0.8.4-main.2e9d522",
-    "@dxos/storybook-utils": "0.8.4-main.2e9d522"
+    "@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/config": "0.8.4-main.3c1ae3b",
+    "@dxos/echo-db": "0.8.4-main.3c1ae3b",
+    "@dxos/plugin-automation": "0.8.4-main.3c1ae3b",
+    "@dxos/random": "0.8.4-main.3c1ae3b",
+    "@dxos/react-ui": "0.8.4-main.3c1ae3b",
+    "@dxos/react-ui-theme": "0.8.4-main.3c1ae3b",
+    "@dxos/storybook-utils": "0.8.4-main.3c1ae3b"
   },
   "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-theme": "0.8.4-main.2e9d522",
-    "@dxos/react-ui": "0.8.4-main.2e9d522"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui-theme": "0.8.4-main.3c1ae3b",
+    "@dxos/react-ui": "0.8.4-main.3c1ae3b"
   },
   "publishConfig": {
     "access": "public"

package/src/ScriptPlugin.tsx

@@ -2,18 +2,15 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Schema } from 'effect';
-
-import { Capabilities, contributes, createIntent, defineModule, definePlugin, Events } from '@dxos/app-framework';
+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 { Script } from '@dxos/functions';
+import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
+import { type CreateObjectIntent } from '@dxos/plugin-space/types';
 
 import {
   AppGraphBuilder,
-  ArtifactDefinition,
+  BlueprintDefinition,
   Compiler,
   IntentResolver,
   ReactSurface,
@@ -22,71 +19,78 @@ import {
 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: 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]),
+          inputSchema: ScriptAction.ScriptProps,
+          createObjectIntent: ((props, options) =>
+            createIntent(ScriptAction.CreateScript, { ...props, space: options.space })) satisfies CreateObjectIntent,
+          addToCollectionOnCreate: true,
+        },
+      }),
+      contributes(Capabilities.Metadata, {
+        id: Notebook.Notebook.typename,
+        metadata: {
+          icon: 'ph--notebook--regular',
+          iconHue: 'sky',
+          inputSchema: ScriptAction.NotebookProps,
+          createObjectIntent: ((props, options) =>
+            createIntent(ScriptAction.CreateNotebook, { ...props, space: options.space })) satisfies CreateObjectIntent,
+          addToCollectionOnCreate: true,
+        },
+      }),
+    ],
+  }),
+  defineModule({
+    id: `${meta.id}/module/app-graph-builder`,
+    activatesOn: Events.SetupAppGraph,
+    activate: AppGraphBuilder,
+  }),
+  defineModule({
+    id: `${meta.id}/module/schema`,
+    activatesOn: ClientEvents.SetupSchema,
+    activate: () => contributes(ClientCapabilities.Schema, [Script.Script]),
+  }),
 
-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/artifact-definition`,
-      activatesOn: Events.SetupArtifactDefinition,
-      activate: ArtifactDefinition,
-    }),
-  ]);
+  defineModule({
+    id: `${meta.id}/module/react-surface`,
+    activatesOn: Events.SetupReactSurface,
+    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,13 +2,14 @@
 // 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, contributes, type PluginContext } from '@dxos/app-framework';
+import { Capabilities, type PluginContext, contributes } from '@dxos/app-framework';
 import { Obj } from '@dxos/echo';
-import { ScriptType } from '@dxos/functions';
-import { PLANK_COMPANION_TYPE, ATTENDABLE_PATH_SEPARATOR } from '@dxos/plugin-deck/types';
+import { Script } from '@dxos/functions';
+import { ATTENDABLE_PATH_SEPARATOR, PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
 import { createExtension } from '@dxos/plugin-graph';
 
 import { meta } from '../meta';
@@ -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

@@ -2,18 +2,20 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
+// ISSUE(burdon): defineArtifact
+// @ts-nocheck
 
-import { createTool, ToolResult } from '@dxos/ai';
-import { Capabilities, contributes, createIntent, type PromiseIntentDispatcher } from '@dxos/app-framework';
-import { createArtifactElement, ArtifactId } from '@dxos/assistant';
+import * as Schema from 'effect/Schema';
+
+import { ToolResult, createTool } from '@dxos/ai';
+import { Capabilities, type PromiseIntentDispatcher, contributes, createIntent } from '@dxos/app-framework';
+import { ArtifactId, createArtifactElement } from '@dxos/assistant';
 import { defineArtifact } from '@dxos/blueprints';
 import { Filter, Obj, Ref } from '@dxos/echo';
 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';
 
@@ -52,7 +54,7 @@ export default () => {
         The description is used by AI to understand the script and its purpose.
         The description must provide cases on when the script should be used.
 
-      Schema: 
+      Schema:
         The schema is defined using a schema-DSL library called Effect Schema.
         The input schema describes the arguments that the script accepts.
         The output schema describes the result that the script produces.
@@ -73,18 +75,18 @@ export default () => {
         - Detailed output schema
 
       <apis>
-        export function defineFunction(params: { 
-          description: string, 
-          inputSchema: Schema.Schema, 
-          outputSchema: Schema.Schema, 
-          handler: (params: { event: { data: TInput } }) => Promise<TOutput> 
+        export function defineFunction(params: {
+          description: string,
+          inputSchema: Schema.Schema,
+          outputSchema: Schema.Schema,
+          handler: (params: { event: { data: TInput } }) => Promise<TOutput>
         }): FunctionDefinition
         /**
          * Effect Schema
          */
-        export const Schema; 
+        export const Schema;
 
-        // Examples: 
+        // Examples:
 
         Schema.String
         Schema.Number
@@ -110,7 +112,7 @@ export default () => {
 
         The function must return the result that matches the output schema.
       </handler_function>
-      
+
       <example>
         import { defineFunction, S } from 'dxos:functions';
 
@@ -156,14 +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(
-              Obj.make(DataType.Text, {
-                content: code,
-              }),
-            ),
-          });
+          const script = Obj.make(ScriptType, { name, source: Ref.make(Text.make(code)) });
           extensions.space.db.add(script);
           await extensions.space.db.flush();
 
@@ -186,7 +181,7 @@ export default () => {
         execute: async ({ id }, { extensions }) => {
           invariant(extensions?.space, 'No space');
 
-          const script = (await extensions.space.db.query(Filter.ids(id)).first()) as ScriptType;
+          const script = (await extensions.space.db.query(Filter.id(id)).first()) as ScriptType;
           const { content } = await script.source.load();
 
           return ToolResult.Success({
@@ -208,7 +203,7 @@ export default () => {
         execute: async ({ id, code }, { extensions }) => {
           invariant(extensions?.space, 'No space');
 
-          const script = (await extensions.space.db.query(Filter.ids(id)).first()) as ScriptType;
+          const script = (await extensions.space.db.query(Filter.id(id)).first()) as ScriptType;
           const source = await script.source.load();
           if (!source) {
             return ToolResult.Error('Script not found');

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

@@ -2,32 +2,83 @@
 // Copyright 2025 DXOS.org
 //
 
-// @ts-ignore
+import * as FetchHttpClient from '@effect/platform/FetchHttpClient';
+import * as HttpClient from '@effect/platform/HttpClient';
+import * as Effect from 'effect/Effect';
+import * as Schedule from 'effect/Schedule';
+import * as Schema from 'effect/Schema';
 import wasmUrl from 'esbuild-wasm/esbuild.wasm?url';
+import * as ts from 'typescript';
 
 import { contributes } from '@dxos/app-framework';
-import { initializeBundler } from '@dxos/functions/bundler';
+import { initializeBundler } from '@dxos/functions-runtime/bundler';
+import { trim } from '@dxos/util';
 
-import { ScriptCapabilities } from './capabilities';
 import { Compiler } from '../compiler';
 
+import { ScriptCapabilities } from './capabilities';
+
+const SCRIPT_PACKAGES_BUCKET = 'https://pub-5745ae82e450484aa28f75fc6a175935.r2.dev/dev/';
+const DECLARATION_EXTS = ['.d.ts', '.d.mts'];
+const NO_TYPES = true; // Types temopararly disabled due to compiler erorrs.
+
 export default async () => {
-  const compiler = new Compiler();
-
-  await compiler.initialize();
-  // TODO(wittjosiah): Fetch types for https modules.
-  compiler.setFile('/src/typings.d.ts', "declare module 'https://*';");
-  // TODO(wittjosiah): Proper function handler types.
-  // TODO(wittjosiah): Remove.
-  compiler.setFile(
-    '/src/runtime.ts',
-    `
-        export const Filter: any = {};
-        export type FunctionHandler = ({ event, context }: { event: any; context: any }) => Promise<Response>;
-        export const functionHandler = (handler: FunctionHandler) => handler;
-      `,
-  );
   await initializeBundler({ wasmUrl });
 
+  const runtimeModules = await Effect.runPromise(fetchRuntimeModules().pipe(Effect.provide(FetchHttpClient.layer)));
+
+  const compiler = new Compiler({
+    skipLibCheck: true,
+    moduleResolution: ts.ModuleResolutionKind.Bundler,
+    allowImportingTsExtensions: true,
+    noEmit: true,
+    strict: true,
+    esModuleInterop: true,
+    paths: Object.fromEntries(runtimeModules.map((mod) => [mod.moduleName, [`./src/${mod.filename}`]])),
+  });
+
+  await compiler.initialize(trim`
+    declare module 'https://*';
+    ${NO_TYPES ? '' : 'declare module "*";'}
+  `);
+  if (!NO_TYPES) {
+    for (const mod of runtimeModules) {
+      compiler.setFile(`/src/${mod.filename}`, mod.content);
+    }
+  }
+
   return contributes(ScriptCapabilities.Compiler, compiler);
 };
+
+const fetchRuntimeModules = Effect.fnUntraced(function* () {
+  const manifest = yield* HttpClient.get(new URL('manifest.json', SCRIPT_PACKAGES_BUCKET)).pipe(
+    Effect.flatMap((_) => _.json),
+    Effect.flatMap(Schema.decodeUnknown(Schema.Struct({ files: Schema.Array(Schema.String) }))),
+  );
+
+  const declarationFiles = manifest.files.filter((file) => DECLARATION_EXTS.some((ext) => file.endsWith(ext)));
+
+  let fetched = 0;
+  const modules = yield* Effect.forEach(
+    declarationFiles,
+    Effect.fnUntraced(
+      function* (file) {
+        const response = yield* HttpClient.get(new URL(file, SCRIPT_PACKAGES_BUCKET)).pipe(
+          Effect.retry(Schedule.exponential(1_000).pipe(Schedule.compose(Schedule.recurs(3)))),
+        );
+        const content = yield* response.text;
+        fetched++;
+
+        const moduleName = file.replace(/\.d\.(ts|mts)$/, '');
+        return {
+          moduleName,
+          filename: file,
+          content,
+        };
+      },
+      Effect.retry(Schedule.exponential(1_000).pipe(Schedule.compose(Schedule.recurs(3)))),
+    ),
+    { concurrency: 20 },
+  );
+  return modules;
+});