@dxos/plugin-script 0.8.4-main.abd8ff62ef → 0.8.4-main.bc2380dfbc

package/src/blueprints/functions/query-deployed-functions.ts

@@ -7,6 +7,7 @@ import * as Effect from 'effect/Effect';
 import { ClientService } from '@dxos/client';
 import { Operation } from '@dxos/compute';
 import { Context } from '@dxos/context';
+import { Obj } from '@dxos/echo';
 import { FunctionsServiceClient } from '@dxos/functions-runtime/edge';
 
 import { QueryDeployedFunctions } from './definitions';
@@ -18,13 +19,16 @@ export default QueryDeployedFunctions.pipe(
       const functionsService = FunctionsServiceClient.fromClient(client);
       const deployed = yield* Effect.promise(() => functionsService.query(Context.default()));
       return {
-        functions: deployed.map((fn) => ({
-          key: fn.key,
-          name: fn.name ?? 'Unnamed function',
-          version: fn.version ?? '0.0.0',
-          description: fn.description,
-          updated: fn.updated,
-        })),
+        functions: deployed.map((fn) => {
+          const meta = Obj.getMeta(fn);
+          return {
+            key: meta.key,
+            name: fn.name ?? 'Unnamed function',
+            version: meta.version ?? '0.0.0',
+            description: fn.description,
+            updated: fn.updated,
+          };
+        }),
       };
     }),
   ),

package/src/capabilities/artifact-definition.ts

@@ -14,7 +14,7 @@ import { ArtifactId, createArtifactElement } from '@dxos/assistant';
 import { defineArtifact, ScriptType } from '@dxos/compute';
 import { Filter, Obj, Ref } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
-import { SpaceAction } from '@dxos/plugin-space/types';
+import { SpaceAction } from '@dxos/plugin-space';
 import { type Space } from '@dxos/react-client/echo';
 
 import { meta } from '#meta';
@@ -159,7 +159,7 @@ export default Capability.makeModule(() =>
           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(Text.make(code)) });
+            const script = Obj.make(ScriptType, { name, source: Ref.make(Text.make({ content: code })) });
             extensions.space.db.add(script);
             await extensions.space.db.flush();
 

package/src/capabilities/create-object.ts

@@ -0,0 +1,48 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { Operation, Script } from '@dxos/compute';
+import { SpaceOperation } from '@dxos/plugin-space';
+import { SpaceCapabilities } from '@dxos/plugin-space';
+
+import { ScriptOperation } from '#types';
+import { Notebook } from '#types';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    return [
+      Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
+        id: Script.Script.typename,
+        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,
+              hidden: true,
+              targetNodeId: options.targetNodeId,
+            });
+          }),
+      }),
+      Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
+        id: Notebook.Notebook.typename,
+        inputSchema: ScriptOperation.NotebookProps,
+        createObject: (props, options) =>
+          Effect.gen(function* () {
+            const object = Notebook.make(props);
+            return yield* Operation.invoke(SpaceOperation.AddObject, {
+              object,
+              target: options.target,
+              hidden: true,
+              targetNodeId: options.targetNodeId,
+            });
+          }),
+      }),
+    ];
+  }),
+);

package/src/capabilities/index.ts

@@ -8,6 +8,7 @@ import type { Blueprint, OperationHandlerSet } from '@dxos/compute';
 
 export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
 export const BlueprintDefinition = Capability.lazy('BlueprintDefinition', () => import('./blueprint-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',

package/src/capabilities/node.ts

@@ -0,0 +1,16 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+// eslint-disable-next-line unused-imports/no-unused-imports
+import type { Blueprint, OperationHandlerSet } from '@dxos/compute';
+
+export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
+export const BlueprintDefinition = Capability.lazy('BlueprintDefinition', () => import('./blueprint-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'),
+);

package/src/capabilities/react-surface.tsx

@@ -16,7 +16,7 @@ import { getSpace } from '@dxos/react-client/echo';
 import { Panel } from '@dxos/react-ui';
 
 import { ScriptPluginSettings } from '#components';
-import { DeploymentDialog, NotebookContainer, ScriptContainer, ScriptProperties, TestContainer } from '#containers';
+import { DeploymentDialog, NotebookArticle, ScriptArticle, ScriptProperties, TestContainer } from '#containers';
 import { useCompiler } from '#hooks';
 import { meta } from '#meta';
 import { Notebook, ScriptCapabilities, type Settings } from '#types';
@@ -58,7 +58,7 @@ export default Capability.makeModule(() =>
           const compiler = useCompiler();
           const settings = useAtomCapability(ScriptCapabilities.Settings);
           return (
-            <ScriptContainer
+            <ScriptArticle
               role={role}
               subject={data.subject}
               attendableId={data.attendableId}
@@ -74,7 +74,7 @@ export default Capability.makeModule(() =>
         component: ({ data, role }) => {
           const compiler = useCompiler();
           return (
-            <NotebookContainer
+            <NotebookArticle
               role={role}
               subject={data.subject}
               attendableId={data.attendableId}
@@ -105,13 +105,13 @@ export default Capability.makeModule(() =>
         component: ({ data, role }) => {
           const space = getSpace(data.companionTo);
           const feed = space?.properties.invocationTraceFeed?.target;
-          const queueDxn = feed ? Feed.getQueueDxn(feed) : undefined;
+          const feedDXN = feed ? Feed.getQueueDxn(feed) : undefined;
           return (
             <Panel.Root role={role}>
               <Panel.Content>
                 <InvocationTraceContainer
                   db={space?.db}
-                  queueDxn={queueDxn}
+                  feedDXN={feedDXN}
                   target={data.companionTo}
                   detailAxis='block'
                 />

package/src/compiler/compiler.ts

@@ -24,6 +24,10 @@ const CDN_TS_VERSION = '5.6.3';
 const defaultOptions: ts.CompilerOptions = {
   lib: ['DOM', 'es2022'],
   target: ts.ScriptTarget.ES2022,
+  // Override `@typescript/vfs`'s default of `NodeJs` (== deprecated `node10`).
+  // TypeScript 6 throws on that as a `getCompilerOptionsDiagnostics()` error,
+  // which surfaces as an unhandled rejection inside the storybook task.
+  moduleResolution: ts.ModuleResolutionKind.Bundler,
 };
 
 export class Compiler {

package/src/components/NotebookStack/NotebookStack.stories.tsx

@@ -7,8 +7,8 @@ import * as Effect from 'effect/Effect';
 import React, { useMemo } from 'react';
 
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { AutomationPlugin } from '@dxos/plugin-automation';
-import { ClientPlugin } from '@dxos/plugin-client';
+import { AutomationPlugin } from '@dxos/plugin-automation/testing';
+import { ClientPlugin } from '@dxos/plugin-client/testing';
 import { initializeIdentity } from '@dxos/plugin-client/testing';
 import { corePlugins } from '@dxos/plugin-testing';
 import { withLayout } from '@dxos/react-ui/testing';

package/src/components/QueryEditor/QueryEditor.stories.tsx

@@ -69,7 +69,7 @@ const DefaultStory = (props: QueryEditorProps) => {
         </Toolbar.Root>
       </Panel.Toolbar>
       <Panel.Content>
-        <div role='none' className='grid grid-rows-[1fr_min-content] h-full overflow-hidden text-sm'>
+        <div className='grid grid-rows-[1fr_min-content] h-full overflow-hidden text-sm'>
           <QueryEditor {...props} initialValue={object.content} extensions={extensions} />
           <JsonHighlighter data={result} classNames='shrink-0 p-2 border-y border-subdued-separator' />
         </div>

package/src/components/QueryEditor/QueryEditor.tsx

@@ -3,7 +3,7 @@
 //
 
 import React, { useState } from 'react';
-import { ScriptTarget } from 'typescript';
+import { ModuleResolutionKind, ScriptTarget } from 'typescript';
 
 import queryApi from '@dxos/echo-query/api.d.ts?raw';
 import { useAsyncEffect } from '@dxos/react-ui';
@@ -34,6 +34,8 @@ export const QueryEditor = (props: QueryEditorProps) => {
     const compiler = new Compiler({
       lib: ['ES5'],
       target: ScriptTarget.ES2022,
+      // Avoid `@typescript/vfs`'s deprecated `node10` default (rejected by TS 6).
+      moduleResolution: ModuleResolutionKind.Bundler,
     });
     await compiler.initialize(GLOBALS);
     setCompiler(compiler);

package/src/components/ScriptToolbar/ScriptToolbar.stories.tsx

@@ -9,7 +9,7 @@ import React, { useMemo } from 'react';
 import { OperationPlugin, RuntimePlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Script } from '@dxos/compute';
-import { ClientPlugin } from '@dxos/plugin-client';
+import { ClientPlugin } from '@dxos/plugin-client/testing';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
 import { type ScriptToolbarState, type ScriptToolbarStateStore } from '#hooks';

package/src/components/TypescriptEditor/TypescriptEditor.stories.tsx

@@ -72,7 +72,7 @@ const DefaultStory = (props: TypescriptEditorProps) => {
         </Toolbar.Root>
       </Panel.Toolbar>
       <Panel.Content>
-        <div role='none' className='grid grid-rows-[1fr_min-content] h-full overflow-hidden text-sm'>
+        <div className='grid grid-rows-[1fr_min-content] h-full overflow-hidden text-sm'>
           <TypescriptEditor {...props} initialValue={object.content} extensions={extensions} />
           <JsonHighlighter data={result} classNames='shrink-0 p-2 border-y border-subdued-separator' />
         </div>

package/src/containers/DeploymentDialog/DeploymentDialog.stories.tsx

@@ -8,7 +8,7 @@ import React, { useMemo } from 'react';
 import { OperationPlugin, RuntimePlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Obj } from '@dxos/echo';
-import { ClientPlugin } from '@dxos/plugin-client';
+import { ClientPlugin } from '@dxos/plugin-client/testing';
 import { Dialog } from '@dxos/react-ui';
 import { withTheme } from '@dxos/react-ui/testing';
 import { AccessToken } from '@dxos/types';

package/src/containers/{NotebookContainer/NotebookContainer.stories.tsx → NotebookArticle/NotebookArticle.stories.tsx}

@@ -11,13 +11,13 @@ import { withPluginManager } from '@dxos/app-framework/testing';
 import { AgentPrompt } from '@dxos/assistant-toolkit';
 import { Operation } from '@dxos/compute';
 import { Filter } from '@dxos/echo';
-import { AssistantPlugin } from '@dxos/plugin-assistant';
-import { AutomationPlugin } from '@dxos/plugin-automation';
-import { ClientPlugin } from '@dxos/plugin-client';
+import { AssistantPlugin } from '@dxos/plugin-assistant/testing';
+import { AutomationPlugin } from '@dxos/plugin-automation/testing';
+import { ClientPlugin } from '@dxos/plugin-client/testing';
 import { initializeIdentity } from '@dxos/plugin-client/testing';
-import { ExplorerPlugin } from '@dxos/plugin-explorer';
-import { MarkdownPlugin } from '@dxos/plugin-markdown';
-import { Markdown } from '@dxos/plugin-markdown/types';
+import { ExplorerPlugin } from '@dxos/plugin-explorer/testing';
+import { Markdown } from '@dxos/plugin-markdown';
+import { MarkdownPlugin } from '@dxos/plugin-markdown/testing';
 import { corePlugins } from '@dxos/plugin-testing';
 import { Config, useClient } from '@dxos/react-client';
 import { useQuery } from '@dxos/react-client/echo';
@@ -28,16 +28,16 @@ import { createNotebook } from '#testing';
 import { translations } from '#translations';
 import { Notebook } from '#types';
 
-import { NotebookContainer } from './NotebookContainer';
+import { NotebookArticle } from './NotebookArticle';
 
-const meta: Meta<typeof NotebookContainer> = {
-  title: 'plugins/plugin-script/containers/NotebookContainer',
-  component: NotebookContainer,
+const meta: Meta<typeof NotebookArticle> = {
+  title: 'plugins/plugin-script/containers/NotebookArticle',
+  component: NotebookArticle,
   render: (args) => {
     const client = useClient();
     const space = client.spaces.get()[0];
     const notebooks = useQuery(space?.db, Filter.type(Notebook.Notebook));
-    return <NotebookContainer {...args} subject={notebooks[0]} attendableId='test' />;
+    return <NotebookArticle {...args} subject={notebooks[0]} attendableId='test' />;
   },
   decorators: [
     withLayout({ layout: 'column', classNames: 'w-document-max-width' }),

package/src/containers/{NotebookContainer/NotebookContainer.tsx → NotebookArticle/NotebookArticle.tsx}

@@ -18,7 +18,7 @@ import { QueryBuilder } from '@dxos/echo-query';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { useComputeRuntimeCallback } from '@dxos/plugin-automation/hooks';
-import { Graph } from '@dxos/plugin-explorer/types';
+import { Graph } from '@dxos/plugin-explorer';
 import { DropdownMenu, IconButton, Panel, Toolbar, useTranslation } from '@dxos/react-ui';
 import { useAttention } from '@dxos/react-ui-attention';
 import { Text, ViewModel } from '@dxos/schema';
@@ -38,12 +38,9 @@ const INCLUDE_BLUEPRINTS = [
 
 // TODO(burdon): Support calling named deployed functions (as with sheet).
 
-export type NotebookContainerProps = AppSurface.ObjectArticleProps<
-  Notebook.Notebook,
-  Pick<TypescriptEditorProps, 'env'>
->;
+export type NotebookArticleProps = AppSurface.ObjectArticleProps<Notebook.Notebook, Pick<TypescriptEditorProps, 'env'>>;
 
-export const NotebookContainer = ({ role, subject: notebook, attendableId, env }: NotebookContainerProps) => {
+export const NotebookArticle = ({ role, subject: notebook, attendableId, env }: NotebookArticleProps) => {
   const { t } = useTranslation(meta.id);
   const registry = useContext(RegistryContext);
   const db = Obj.getDatabase(notebook);
@@ -163,7 +160,10 @@ export const NotebookContainer = ({ role, subject: notebook, attendableId, env }
           if (db) {
             const objects = await db.query(Query.select(Filter.type(Blueprint.Blueprint))).run();
             const blueprints = objects
-              .filter((blueprint) => INCLUDE_BLUEPRINTS.includes(blueprint.key))
+              .filter((blueprint) => {
+                const key = Obj.getMeta(blueprint).key;
+                return key !== undefined && INCLUDE_BLUEPRINTS.includes(key);
+              })
               .map((blueprint) => Ref.make(blueprint));
             cell.prompt = Ref.make(Routine.make({ instructions: '', blueprints }));
           }

package/src/containers/NotebookArticle/index.ts

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

package/src/containers/{ScriptContainer/ScriptContainer.stories.tsx → ScriptArticle/ScriptArticle.stories.tsx}

@@ -11,18 +11,19 @@ import { withPluginManager } from '@dxos/app-framework/testing';
 import { Blueprint } from '@dxos/compute';
 import { Script } from '@dxos/compute';
 import { Operation } from '@dxos/compute';
-import { ClientPlugin } from '@dxos/plugin-client';
+import { Filter } from '@dxos/echo';
+import { ClientPlugin } from '@dxos/plugin-client/testing';
 import { initializeIdentity } from '@dxos/plugin-client/testing';
 import { StorybookPlugin, corePlugins } from '@dxos/plugin-testing';
 import { Config } from '@dxos/react-client';
-import { Filter, useQuery, useSpaces } from '@dxos/react-client/echo';
+import { useQuery, useSpaces } from '@dxos/react-client/echo';
 import { Loading, withLayout, withTheme } from '@dxos/react-ui/testing';
 import { Text } from '@dxos/schema';
 
 import { createScript } from '#testing';
 import { translations } from '#translations';
 
-import { ScriptContainer } from './ScriptContainer';
+import { ScriptArticle } from './ScriptArticle';
 
 type DefaultStoryProps = {};
 
@@ -58,14 +59,14 @@ const DefaultStory = (_: DefaultStoryProps) => {
   }
 
   return (
-    <div role='none' className='flex flex-col min-h-[80vh] w-document-max-width'>
-      <ScriptContainer role='article' subject={script} attendableId='story-script' />
+    <div className='flex flex-col min-h-[80vh] w-document-max-width'>
+      <ScriptArticle role='article' subject={script} attendableId='story-script' />
     </div>
   );
 };
 
 const meta = {
-  title: 'plugins/plugin-script/containers/ScriptContainer',
+  title: 'plugins/plugin-script/containers/ScriptArticle',
   render: DefaultStory,
   decorators: [
     withTheme(),

package/src/containers/{ScriptContainer/ScriptContainer.tsx → ScriptArticle/ScriptArticle.tsx}

@@ -24,7 +24,7 @@ export type ScriptEditorProps = AppSurface.ObjectArticleProps<
   } & Pick<TypescriptEditorProps, 'env'>
 >;
 
-export const ScriptContainer = ({
+export const ScriptArticle = ({
   role,
   attendableId,
   subject: script,

package/src/containers/ScriptArticle/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+export { ScriptArticle as default } from './ScriptArticle';

package/src/containers/ScriptProperties/BlueprintEditor.tsx

@@ -28,7 +28,8 @@ export const BlueprintEditor = ({ object }: BlueprintEditorProps) => {
   // TODO(burdon): Remove?
   const [instructions, setInstructions] = useState<string>(`You can run the script "${object.name ?? 'script'}".`);
   const blueprintKey = `org.dxos.blueprint.${kebabize(object.name ?? 'script')}`;
-  const existingBlueprint = blueprints.find((bp) => bp.key === blueprintKey);
+  const existingBlueprint = blueprints.find((bp) => Obj.getMeta(bp).key === blueprintKey);
+  const fnKey = fn ? Obj.getMeta(fn).key : undefined;
 
   useAsyncEffect(async () => {
     if (!existingBlueprint) {
@@ -52,21 +53,21 @@ export const BlueprintEditor = ({ object }: BlueprintEditorProps) => {
           text.content = instructions;
         });
 
-        if (fn?.key) {
-          const toolId = ToolId.make(fn.key);
+        if (fnKey) {
+          const toolId = ToolId.make(fnKey);
           if (!existingBlueprint.tools?.includes(toolId)) {
             Obj.update(existingBlueprint, (existingBlueprint) => {
               existingBlueprint.tools = [...(existingBlueprint.tools ?? []), toolId];
             });
           }
         }
-      } else if (fn?.key) {
+      } else if (fnKey) {
         db.add(
           Blueprint.make({
             key: blueprintKey,
             name: object.name ?? 'Script',
             instructions: Template.make({ source: instructions }),
-            tools: [ToolId.make(fn.key)],
+            tools: [ToolId.make(fnKey)],
           }),
         );
       }
@@ -74,10 +75,10 @@ export const BlueprintEditor = ({ object }: BlueprintEditorProps) => {
     } finally {
       setCreating(false);
     }
-  }, [db, existingBlueprint, fn, blueprintKey, object.name, instructions]);
+  }, [db, existingBlueprint, fnKey, blueprintKey, object.name, instructions]);
 
   return (
-    <div role='none' className='flex flex-col'>
+    <div className='flex flex-col'>
       <Form.Section label={t('blueprint-editor.label')} description={t('blueprint-editor.description')} />
 
       <Input.Root>
@@ -91,8 +92,8 @@ export const BlueprintEditor = ({ object }: BlueprintEditorProps) => {
         />
       </Input.Root>
 
-      <div role='none' className='pt-2'>
-        <Button disabled={(!existingBlueprint && !fn?.key) || creating} onClick={handleSave}>
+      <div className='pt-2'>
+        <Button disabled={(!existingBlueprint && !fnKey) || creating} onClick={handleSave}>
           {t(existingBlueprint ? 'update-blueprint.label' : 'create-blueprint.label')}
         </Button>
       </div>

package/src/containers/ScriptProperties/FunctionBinding.tsx

@@ -50,7 +50,7 @@ export const FunctionBinding = ({ object }: FunctionBindingProps) => {
   }
 
   return (
-    <div role='none' className='flex flex-col'>
+    <div className='flex flex-col'>
       <Form.Section label={t('remote-function-settings.heading')} />
 
       {functionUrl && (

package/src/containers/ScriptProperties/FunctionPublishing.tsx

@@ -94,22 +94,22 @@ export const FunctionPublishing = ({ object }: FunctionPublishingProps) => {
   }, [object, githubToken]);
 
   return (
-    <div role='none' className='flex flex-col'>
+    <div className='flex flex-col'>
       <Form.Section label={t('script-publish-settings.label')} description={t('script-publish-settings.description')} />
 
       {!githubToken && (
-        <div role='none' className='flex flex-col py-form-gap'>
+        <div className='flex flex-col py-form-gap'>
           <Message.Root valence='info'>
             <Message.Title>{t('no-github-token.label')}</Message.Title>
           </Message.Root>
-          <div role='none' className='flex pt-form-gap'>
+          <div className='flex pt-form-gap'>
             <Button onClick={handleOpenTokenManager}>{t('open-token-manager.label')}</Button>
           </div>
         </div>
       )}
 
       {githubToken && (
-        <div role='none' className='flex justify-end gap-2'>
+        <div className='flex justify-end gap-2'>
           {gistUrl && <Clipboard.IconButton value={gistUrl} />}
           <Button disabled={publishing} onClick={handlePublish}>
             {t('publish.label')}

package/src/containers/ScriptProperties/ScriptProperties.stories.tsx

@@ -10,10 +10,11 @@ import { withPluginManager } from '@dxos/app-framework/testing';
 import { Blueprint } from '@dxos/compute';
 import { Script } from '@dxos/compute';
 import { Operation } from '@dxos/compute';
-import { ClientPlugin } from '@dxos/plugin-client';
+import { Filter } from '@dxos/echo';
+import { ClientPlugin } from '@dxos/plugin-client/testing';
 import { initializeIdentity } from '@dxos/plugin-client/testing';
 import { StorybookPlugin, corePlugins } from '@dxos/plugin-testing';
-import { Filter, useQuery, useSpaces } from '@dxos/react-client/echo';
+import { useQuery, useSpaces } from '@dxos/react-client/echo';
 import { ObjectProperties } from '@dxos/react-ui-form';
 import { Loading, withLayout, withTheme } from '@dxos/react-ui/testing';
 import { Text } from '@dxos/schema';

package/src/containers/ScriptProperties/ScriptProperties.tsx

@@ -15,7 +15,7 @@ export type ScriptPropertiesProps = AppSurface.ObjectPropertiesProps<Script.Scri
 
 export const ScriptProperties = ({ subject: object }: ScriptPropertiesProps) => {
   return (
-    <div role='none' className='flex flex-col py-form-gap gap-form-section-gap'>
+    <div className='flex flex-col py-form-gap gap-form-section-gap'>
       <FunctionBinding object={object} />
       <BlueprintEditor object={object} />
       <FunctionPublishing object={object} />

package/src/containers/TestContainer/TestContainer.tsx

@@ -6,8 +6,8 @@ import React, { useCallback, useMemo } from 'react';
 
 import { type Script } from '@dxos/compute';
 import { Context } from '@dxos/context';
+import { Obj } from '@dxos/echo';
 import { FunctionsServiceClient } from '@dxos/functions-runtime/edge';
-import { getSpace } from '@dxos/react-client/echo';
 import { Panel } from '@dxos/react-ui';
 
 import { TestPanel } from '#components';
@@ -20,7 +20,7 @@ export type TestContainerProps = {
 
 export const TestContainer = ({ role, script }: TestContainerProps) => {
   const { client, fn, existingFunctionId } = useDeployDeps({ script });
-  const space = getSpace(script);
+  const spaceId = Obj.getDatabase(script)?.spaceId;
 
   const functionsClient = useMemo(() => FunctionsServiceClient.fromClient(client), [client]);
 
@@ -29,9 +29,9 @@ export const TestContainer = ({ role, script }: TestContainerProps) => {
       if (!fn) {
         throw new Error('Function not deployed');
       }
-      return functionsClient.invoke(Context.default(), fn, input, { spaceId: space?.id });
+      return functionsClient.invoke(Context.default(), fn, input, { spaceId });
     },
-    [fn, functionsClient, space?.id],
+    [fn, functionsClient, spaceId],
   );
 
   return (

package/src/containers/index.ts

@@ -5,7 +5,7 @@
 import { type ComponentType, lazy } from 'react';
 
 export const DeploymentDialog: ComponentType<any> = lazy(() => import('./DeploymentDialog'));
-export const NotebookContainer: ComponentType<any> = lazy(() => import('./NotebookContainer'));
-export const ScriptContainer: ComponentType<any> = lazy(() => import('./ScriptContainer'));
+export const NotebookArticle: ComponentType<any> = lazy(() => import('./NotebookArticle'));
+export const ScriptArticle: ComponentType<any> = lazy(() => import('./ScriptArticle'));
 export const ScriptProperties: ComponentType<any> = lazy(() => import('./ScriptProperties'));
 export const TestContainer: ComponentType<any> = lazy(() => import('./TestContainer'));

package/src/e2e/deploy.test.ts

@@ -14,7 +14,9 @@ import { FunctionsServiceClient } from '@dxos/functions-runtime/edge';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 
-describe('Functions deployment', { tags: ['functions-e2e'] }, () => {
+// TODO(wittjosiah): Re-enable once @dxos/compute.js is available at the R2 dev bucket
+// (https://pub-5745ae82e450484aa28f75fc6a175935.r2.dev/dev/@dxos/compute.js currently 404s).
+describe.skip('Functions deployment', { tags: ['functions-e2e'] }, () => {
   test('deploys FOREX (effect) function and invokes it via EDGE (main)', { timeout: 120_000 }, async () => {
     const config = configPreset({ edge: 'main' });
     await testDeploy(config);

package/src/hooks/useCreateAndDeployScriptTemplates.ts

@@ -8,11 +8,11 @@ import { useOperationInvoker } from '@dxos/app-framework/ui';
 import { Script } from '@dxos/compute';
 import { Obj } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
-import { SpaceOperation } from '@dxos/plugin-space/operations';
+import { SpaceOperation } from '@dxos/plugin-space';
 import { useClient } from '@dxos/react-client';
 import { type Space } from '@dxos/react-client/echo';
 
-import { ScriptOperation } from '#operations';
+import { ScriptOperation } from '#types';
 
 import { type Template } from '../templates';
 import { deployScript } from '../util';

package/src/index.ts

@@ -2,12 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Plugin } from '@dxos/app-framework';
-
-import { meta } from './meta';
-
-export const ScriptPlugin = Plugin.lazy(meta, () => import('#plugin'));
-
-export { ScriptCapabilities, ScriptEvents } from './types';
+export * from './blueprints';
 export * from './meta';
+export * from './types';
 export * from './util';

package/src/operations/access-token-created.ts

@@ -7,7 +7,7 @@ import * as Predicate from 'effect/Predicate';
 
 import { LayoutOperation } from '@dxos/app-toolkit';
 import { Operation } from '@dxos/compute';
-import { IntegrationOperation } from '@dxos/plugin-integration/operations';
+import { IntegrationOperation } from '@dxos/plugin-integration';
 
 import { defaultScriptsForIntegration } from '#meta';
 

package/src/operations/create-script.ts

@@ -8,9 +8,9 @@ import * as Effect from 'effect/Effect';
 import { Script, Operation } from '@dxos/compute';
 
 import { templates } from '../templates';
-import { CreateScript } from './definitions';
+import { ScriptOperation } from '../types';
 
-const handler: Operation.WithHandler<typeof CreateScript> = CreateScript.pipe(
+const handler: Operation.WithHandler<typeof ScriptOperation.CreateScript> = ScriptOperation.CreateScript.pipe(
   Operation.withHandler(
     Effect.fnUntraced(function* ({ name, gistUrl, initialTemplateId }) {
       let source = templates[0].source;