@dxos/plugin-script 0.8.4-main.3fbcb4aa9b → 0.8.4-main.43cb759274

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';
@@ -28,7 +28,7 @@ export default Capability.makeModule(() =>
   Effect.succeed(
     Capability.contributes(Capabilities.ReactSurface, [
       Surface.create({
-        id: 'plugin-settings',
+        id: 'pluginSettings',
         filter: AppSurface.settings(AppSurface.Article, meta.id),
         component: ({ data: { subject } }) => {
           const { settings, updateSettings } = useSettingsState<Settings.Settings>(subject.atom);
@@ -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.getQueueUri(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/NotebookCell.tsx

@@ -143,7 +143,7 @@ export const NotebookCell = ({ db, graph, dragging, cell, promptResults, env }:
         <>
           <TemplateEditor
             id={cell.id}
-            template={cell.prompt.target.instructions}
+            source={cell.prompt.target.instructions}
             lineNumbers={false}
             classNames={editorStyles}
           />
@@ -186,7 +186,7 @@ const NotebookPromptResult = ({ cell, promptResults }: NotebookCellProps) => {
     return null;
   }
 
-  const value = promptResults?.[cell.prompt.dxn.toString()];
+  const value = promptResults?.[cell.prompt.uri];
   if (value == null) {
     return null;
   }

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/plugin';
-import { ClientPlugin } from '@dxos/plugin-client/plugin';
+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/NotebookStack/NotebookStack.tsx

@@ -5,8 +5,8 @@
 import React from 'react';
 
 import { DropdownMenu, IconButton, type ThemedClassName, useTranslation } from '@dxos/react-ui';
+import { composable, composableProps } from '@dxos/react-ui';
 import { Stack, StackItem, type StackProps } from '@dxos/react-ui-stack';
-import { composable, composableProps } from '@dxos/ui-theme';
 
 import { meta } from '#meta';
 import { type Notebook } from '#types';

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

@@ -6,10 +6,10 @@ import { Atom, Registry } from '@effect-atom/atom-react';
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useMemo } from 'react';
 
-import { OperationPlugin, RuntimePlugin } from '@dxos/app-framework';
+import { ProcessManagerPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Script } from '@dxos/compute';
-import { ClientPlugin } from '@dxos/plugin-client/plugin';
+import { ClientPlugin } from '@dxos/plugin-client/testing';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
 import { type ScriptToolbarState, type ScriptToolbarStateStore } from '#hooks';
@@ -53,7 +53,7 @@ const meta = {
     withTheme(),
     withLayout({ classNames: 'w-document-max-width' }),
     withPluginManager({
-      plugins: [OperationPlugin(), RuntimePlugin(), ClientPlugin({})],
+      plugins: [ProcessManagerPlugin(), ClientPlugin({})],
     }),
   ],
   parameters: {

package/src/components/ScriptToolbar/ScriptToolbar.tsx

@@ -7,8 +7,8 @@ import React, { useMemo } from 'react';
 
 import { type Script } from '@dxos/compute';
 import { ElevationProvider, useTranslation } from '@dxos/react-ui';
+import { composable, composableProps } from '@dxos/react-ui';
 import { type ActionGraphProps, Menu, MenuRootProps, createGapSeparator, useMenuActions } from '@dxos/react-ui-menu';
-import { composable, composableProps } from '@dxos/ui-theme';
 
 import {
   type CreateDeployOptions,

package/src/components/TestPanel/TestPanel.tsx

@@ -6,8 +6,9 @@ import React, { forwardRef, useRef, useState } from 'react';
 
 import { log } from '@dxos/log';
 import { Avatar, Icon, Input, ScrollArea, type ThemedClassName, Toolbar, useTranslation } from '@dxos/react-ui';
+import { composable, composableProps } from '@dxos/react-ui';
 import { JsonHighlighter } from '@dxos/react-ui-syntax-highlighter';
-import { composable, composableProps, mx } from '@dxos/ui-theme';
+import { mx } from '@dxos/ui-theme';
 
 import { meta } from '#meta';
 

package/src/components/TypescriptEditor/TypescriptEditor.tsx

@@ -16,6 +16,7 @@ import { type HoverInfo, tsAutocomplete, tsFacet, tsHover, tsLinter, tsSync } fr
 import React from 'react';
 
 import { type ThemeMode, type ThemedClassName, useThemeContext } from '@dxos/react-ui';
+import { composable, composableProps } from '@dxos/react-ui';
 import { type UseTextEditorProps, useTextEditor } from '@dxos/react-ui-editor';
 import { Domino } from '@dxos/ui';
 import {
@@ -26,7 +27,6 @@ import {
   defaultStyles,
 } from '@dxos/ui-editor';
 import { type EditorInputMode } from '@dxos/ui-editor/types';
-import { composable, composableProps } from '@dxos/ui-theme';
 import { isNonNullable } from '@dxos/util';
 
 export type TypescriptEditorProps = ThemedClassName<

package/src/components/index.ts

@@ -4,7 +4,6 @@
 
 import { type ComponentType, lazy } from 'react';
 
-export * from './FramePanel';
 export * from './NotebookStack';
 export * from './QueryEditor';
 export * from './ScriptToolbar';

package/src/constants.ts

@@ -2,6 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
+import { DXN } from '@dxos/keys';
+
 import { meta } from '#meta';
 
-export const DEPLOYMENT_DIALOG = `${meta.id}.deployment.dialog`;
+export const DEPLOYMENT_DIALOG = DXN.make(`${meta.id}.deploymentDialog`);

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

@@ -5,10 +5,10 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useMemo } from 'react';
 
-import { OperationPlugin, RuntimePlugin } from '@dxos/app-framework';
+import { ProcessManagerPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Obj } from '@dxos/echo';
-import { ClientPlugin } from '@dxos/plugin-client/plugin';
+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';
@@ -51,7 +51,7 @@ const meta = {
   decorators: [
     withTheme(),
     withPluginManager({
-      plugins: [OperationPlugin(), RuntimePlugin(), ClientPlugin({})],
+      plugins: [ProcessManagerPlugin(), ClientPlugin({})],
     }),
   ],
 } satisfies Meta<typeof DeploymentDialogStory>;

package/src/containers/DeploymentDialog/DeploymentDialog.tsx

@@ -65,7 +65,7 @@ export const DeploymentDialog = ({ accessToken, scriptTemplates }: DeploymentDia
       <Dialog.Header>
         <Dialog.Title>{t('deployment-dialog.title')}</Dialog.Title>
         <Dialog.Close asChild>
-          <Dialog.CloseIconButton />
+          <Dialog.ActionIconButton action='close' />
         </Dialog.Close>
       </Dialog.Header>
       <Dialog.Body>

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/plugin';
-import { AutomationPlugin } from '@dxos/plugin-automation/plugin';
-import { ClientPlugin } from '@dxos/plugin-client/plugin';
+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/plugin';
+import { ExplorerPlugin } from '@dxos/plugin-explorer/testing';
 import { Markdown } from '@dxos/plugin-markdown';
-import { MarkdownPlugin } from '@dxos/plugin-markdown/plugin';
+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}

@@ -9,6 +9,7 @@ import * as Exit from 'effect/Exit';
 import type * as Types from 'effect/Types';
 import React, { useCallback, useContext, useMemo, useState } from 'react';
 
+import { useSpaceCallback } from '@dxos/app-framework/ui';
 import { type AppSurface } from '@dxos/app-toolkit/ui';
 import { AgentPrompt } from '@dxos/assistant-toolkit';
 import { Blueprint, Routine } from '@dxos/compute';
@@ -17,7 +18,6 @@ import { Filter, Obj, Query, Ref } from '@dxos/echo';
 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';
 import { DropdownMenu, IconButton, Panel, Toolbar, useTranslation } from '@dxos/react-ui';
 import { useAttention } from '@dxos/react-ui-attention';
@@ -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);
@@ -96,8 +93,9 @@ export const NotebookContainer = ({ role, subject: notebook, attendableId, env }
   }, [db, notebook, graph]);
 
   const [promptResults, setPromptResults] = useState<Record<string, string>>({});
-  const handleExecPrompts = useComputeRuntimeCallback(
+  const handleExecPrompts = useSpaceCallback(
     db?.spaceId,
+    [] as const,
     Effect.fnUntraced(function* () {
       invariant(graph);
 
@@ -114,7 +112,7 @@ export const NotebookContainer = ({ role, subject: notebook, attendableId, env }
           onResult: (result) =>
             setPromptResults((prev) => ({
               ...prev,
-              [prompt.dxn.toString()]: result,
+              [prompt.uri]: result,
             })),
         });
       }
@@ -163,7 +161,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/plugin';
+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 = {};
 
@@ -59,13 +60,13 @@ const DefaultStory = (_: DefaultStoryProps) => {
 
   return (
     <div className='flex flex-col min-h-[80vh] w-document-max-width'>
-      <ScriptContainer role='article' subject={script} attendableId='story-script' />
+      <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,7 +75,7 @@ export const BlueprintEditor = ({ object }: BlueprintEditorProps) => {
     } finally {
       setCreating(false);
     }
-  }, [db, existingBlueprint, fn, blueprintKey, object.name, instructions]);
+  }, [db, existingBlueprint, fnKey, blueprintKey, object.name, instructions]);
 
   return (
     <div className='flex flex-col'>
@@ -92,7 +93,7 @@ export const BlueprintEditor = ({ object }: BlueprintEditorProps) => {
       </Input.Root>
 
       <div className='pt-2'>
-        <Button disabled={(!existingBlueprint && !fn?.key) || creating} onClick={handleSave}>
+        <Button disabled={(!existingBlueprint && !fnKey) || creating} onClick={handleSave}>
           {t(existingBlueprint ? 'update-blueprint.label' : 'create-blueprint.label')}
         </Button>
       </div>

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/plugin';
+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/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/meta.ts

@@ -2,25 +2,31 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type Plugin } from '@dxos/app-framework';
+import { Plugin } from '@dxos/app-framework';
+import { DXN } from '@dxos/keys';
 import { trim } from '@dxos/util';
 
-export const meta: Plugin.Meta = {
-  id: 'org.dxos.plugin.script',
+export const meta = Plugin.makeMeta({
+  key: DXN.make('org.dxos.plugin.script'),
   name: 'Scripts',
+  author: 'DXOS',
+  spec: 'PLUGIN.mdl',
   description: trim`
-    Write and deploy custom JavaScript functions that extend your workspace capabilities.
-    Create AI agent tools, spreadsheet formulas, and automation scripts that integrate seamlessly with other plugins.
+    Write, deploy, and run custom TypeScript functions as ECHO objects directly inside your Composer spaces.
+    Scripts execute on the Cloudflare Workers-based EDGE runtime and have access to the full DXOS SDK,
+    Effect-TS, and a curated set of third-party libraries including HTTP, JSON, CSV, and date utilities.
+    An AI Script assistant wires CRUD, deploy, invoke, and invocation-inspection operations as tools
+    so an agent can scaffold, iterate, and test functions entirely within a chat session.
   `,
   icon: 'ph--code--regular',
   iconHue: 'sky',
   source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-explorer',
   tags: ['labs'],
   screenshots: ['https://dxos.network/plugin-details-scripts-dark.png'],
-};
+});
 
 // TODO(ZaymonFC): Configure by scopes?
 export const defaultScriptsForIntegration: Record<string, string[]> = {
   // TODO(wittjosiah): Also include content extraction scripts in the default set.
-  'gmail.com': ['org.dxos.script.gmail'],
+  'gmail.com': [DXN.make('org.dxos.script.gmail')],
 };

package/src/operations/index.ts

@@ -4,7 +4,4 @@
 
 import { OperationHandlerSet } from '@dxos/compute';
 
-export const ScriptOperationHandlerSet = OperationHandlerSet.lazy(
-  () => import('./access-token-created'),
-  () => import('./create-script'),
-);
+export const ScriptOperationHandlerSet = OperationHandlerSet.lazy(() => import('./create-script'));

package/src/templates/anthropic.ts

@@ -10,10 +10,11 @@ import * as Stream from 'effect/Stream';
 
 import { AiService } from '@dxos/ai';
 import { Operation } from '@dxos/compute';
+import { DXN } from '@dxos/keys';
 
 const Anthropic = Operation.make({
   meta: {
-    key: 'org.dxos.script.anthropic',
+    key: DXN.make('org.dxos.script.anthropic'),
     name: 'Anthropic Chat',
     description: 'Chat with Anthropic',
   },

package/src/templates/chess-bot.ts

@@ -7,13 +7,13 @@ import * as Effect from 'effect/Effect';
 import * as Schema from 'effect/Schema';
 
 import { Operation } from '@dxos/compute';
-import { Database, Obj } from '@dxos/echo';
+import { Database, Obj, DXN } from '@dxos/echo';
 import { Chess } from '@dxos/plugin-chess';
 import { GameRef, Game, loadGame } from '@dxos/plugin-game';
 
 const ChessBot = Operation.make({
   meta: {
-    key: 'org.dxos.script.chess-bot',
+    key: DXN.make('org.dxos.script.chessBot'),
     name: 'Chess Bot',
     description: 'Plays a random move in a chess game.',
   },