@dxos/plugin-script 0.8.4-main.7ace549 → 0.8.4-main.9735255

package/src/capabilities/settings/settings.ts

@@ -0,0 +1,32 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability, Common } from '@dxos/app-framework';
+import { createKvsStore } from '@dxos/effect';
+
+import { meta } from '../../meta';
+import { ScriptCapabilities, ScriptSettings } from '../../types';
+
+export default Capability.makeModule(() =>
+  Effect.sync(() => {
+    const settingsAtom = createKvsStore({
+      key: meta.id,
+      schema: ScriptSettings,
+      defaultValue: () => ({
+        editorInputMode: 'vscode' as const,
+      }),
+    });
+
+    return [
+      Capability.contributes(ScriptCapabilities.Settings, settingsAtom),
+      Capability.contributes(Common.Capability.Settings, {
+        prefix: meta.id,
+        schema: ScriptSettings,
+        atom: settingsAtom,
+      }),
+    ];
+  }),
+);

package/src/compiler/compiler.ts

@@ -12,6 +12,8 @@ import ts from 'typescript';
 
 import { invariant } from '@dxos/invariant';
 
+const GLOBALS = 'globals.d.ts';
+
 const defaultOptions: ts.CompilerOptions = {
   lib: ['DOM', 'es2022'],
   target: ts.ScriptTarget.ES2022,
@@ -23,16 +25,21 @@ export class Compiler {
 
   constructor(private readonly _options: ts.CompilerOptions = defaultOptions) {}
 
-  async initialize(): Promise<void> {
+  async initialize(globals?: string): Promise<void> {
     if (this._env) {
       return;
     }
 
     // TODO(wittjosiah): Figure out how to get workers working in plugin packages.
     //   https://github.com/val-town/codemirror-ts?tab=readme-ov-file#setup-worker
-    this._fsMap = await createDefaultMapFromCDN(this._options, '5.5.4', true, ts);
+    this._fsMap = await createDefaultMapFromCDN(this._options, '5.7.2', true, ts);
+    if (globals) {
+      this._fsMap.set(GLOBALS, globals);
+    }
+
+    const rootFiles = globals ? [GLOBALS] : [];
     const system = createSystem(this._fsMap);
-    this._env = createVirtualTypeScriptEnvironment(system, [], ts, this._options);
+    this._env = createVirtualTypeScriptEnvironment(system, rootFiles, ts, this._options);
   }
 
   get environment() {

package/src/components/DeploymentDialog/DeploymentDialog.stories.tsx

@@ -3,9 +3,9 @@
 //
 
 import { type Meta, type StoryObj } from '@storybook/react-vite';
-import React from 'react';
+import React, { useMemo } from 'react';
 
-import { IntentPlugin } from '@dxos/app-framework';
+import { OperationPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Obj } from '@dxos/echo';
 import { ClientPlugin } from '@dxos/plugin-client';
@@ -15,44 +15,48 @@ import { AccessToken } from '@dxos/types';
 
 import { translations } from '../../translations';
 
-import { DeploymentDialog, type DeploymentDialogProps } from './DeploymentDialog';
-
-const DefaultStory = (props: DeploymentDialogProps) => {
+import { DeploymentDialog } from './DeploymentDialog';
+
+// TODO(wittjosiah): ECHO objects don't work when passed via Storybook args.
+const DeploymentDialogStory = () => {
+  const accessToken = useMemo(
+    () =>
+      Obj.make(AccessToken.AccessToken, {
+        source: 'example.com',
+        token: 'example-token',
+      }),
+    [],
+  );
+  const scriptTemplates = useMemo(
+    () => [
+      { id: 't-1', name: 'Script 1', source: 'template1' },
+      { id: 't-2', name: 'Script 2', source: 'template2' },
+      { id: 't-3', name: 'Script 3', source: 'template3' },
+    ],
+    [],
+  );
   return (
     <Dialog.Root defaultOpen={true}>
-      <DeploymentDialog {...props} />
+      <DeploymentDialog accessToken={accessToken} scriptTemplates={scriptTemplates} />
     </Dialog.Root>
   );
 };
 
 const meta = {
   title: 'plugins/plugin-script/DeploymentDialog',
-  component: DeploymentDialog,
-  render: DefaultStory,
+  component: DeploymentDialogStory,
   parameters: { translations },
   // TODO(wittjosiah): Try to write story which does not depend on plugin manager.
   decorators: [
     withTheme,
     withPluginManager({
-      plugins: [IntentPlugin(), ClientPlugin({})],
+      plugins: [OperationPlugin(), ClientPlugin({})],
     }),
   ],
-} satisfies Meta<typeof DefaultStory>;
+} satisfies Meta<typeof DeploymentDialogStory>;
 
 export default meta;
 
 type Story = StoryObj<typeof meta>;
 
-export const Default: Story = {
-  args: {
-    accessToken: Obj.make(AccessToken.AccessToken, {
-      source: 'example.com',
-      token: 'example-token',
-    }),
-    scriptTemplates: [
-      { id: 't-1', name: 'Script 1', source: 'template1' },
-      { id: 't-2', name: 'Script 2', source: 'template2' },
-      { id: 't-3', name: 'Script 3', source: 'template3' },
-    ],
-  },
-};
+export const Default: Story = {};

package/src/components/DeploymentDialog/DeploymentDialog.tsx

@@ -4,8 +4,8 @@
 
 import React, { useEffect, useMemo } from 'react';
 
-import { LayoutAction, createIntent } from '@dxos/app-framework';
-import { useIntentDispatcher } from '@dxos/app-framework/react';
+import { Common } from '@dxos/app-framework';
+import { useOperationInvoker } from '@dxos/app-framework/react';
 import { getSpace } from '@dxos/react-client/echo';
 import { Button, Dialog, IconButton, useTranslation } from '@dxos/react-ui';
 import { type AccessToken } from '@dxos/types';
@@ -33,53 +33,33 @@ export const DeploymentDialog = ({ accessToken, scriptTemplates }: DeploymentDia
   // TODO(ZaymonFC): Thinking further. All of this should get moved to intents to run async in the background.
   //   Deployment shouldn't be tied to the lifecycle of the dialogue component.
   const { handleCreateAndDeployScripts, status } = useCreateAndDeployScriptTemplates(space, scriptTemplates);
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
+  const { invokePromise } = useOperationInvoker();
 
   useEffect(() => {
     if (status === 'success') {
       // TODO(ZaymonFC): We can probably re-use this toast for normal script deployment.
-      void dispatch(
-        createIntent(LayoutAction.AddToast, {
-          part: 'toast',
-          subject: {
-            id: `${meta.id}/deployment-success`,
-            icon: 'ph--check--regular',
-            duration: Infinity,
-            title: ['script deployment toast label', { ns: meta.id, count: scriptTemplates.length }],
-            description: ['script deployment toast description', { ns: meta.id, count: scriptTemplates.length }],
-            closeLabel: ['script deployment toast close label', { ns: meta.id, count: scriptTemplates.length }],
-          },
-        }),
-      );
-      void dispatch(
-        createIntent(LayoutAction.UpdateDialog, {
-          part: 'dialog',
-          options: { state: false },
-        }),
-      );
+      void invokePromise(Common.LayoutOperation.AddToast, {
+        id: `${meta.id}/deployment-success`,
+        icon: 'ph--check--regular',
+        duration: Infinity,
+        title: ['script deployment toast label', { ns: meta.id, count: scriptTemplates.length }],
+        description: ['script deployment toast description', { ns: meta.id, count: scriptTemplates.length }],
+        closeLabel: ['script deployment toast close label', { ns: meta.id, count: scriptTemplates.length }],
+      });
+      void invokePromise(Common.LayoutOperation.UpdateDialog, { state: false });
     }
     if (status === 'error') {
-      void dispatch(
-        createIntent(LayoutAction.UpdateDialog, {
-          part: 'dialog',
-          options: { state: false },
-        }),
-      );
-      void dispatch(
-        createIntent(LayoutAction.AddToast, {
-          part: 'toast',
-          subject: {
-            id: `${meta.id}/deployment-error`,
-            icon: 'ph--warning--regular',
-            duration: Infinity,
-            title: ['script deployment error toast label', { ns: meta.id, count: scriptTemplates.length }],
-            description: ['script deployment error toast description', { ns: meta.id, count: scriptTemplates.length }],
-            closeLabel: ['script deployment error toast close label', { ns: meta.id, count: scriptTemplates.length }],
-          },
-        }),
-      );
+      void invokePromise(Common.LayoutOperation.UpdateDialog, { state: false });
+      void invokePromise(Common.LayoutOperation.AddToast, {
+        id: `${meta.id}/deployment-error`,
+        icon: 'ph--warning--regular',
+        duration: Infinity,
+        title: ['script deployment error toast label', { ns: meta.id, count: scriptTemplates.length }],
+        description: ['script deployment error toast description', { ns: meta.id, count: scriptTemplates.length }],
+        closeLabel: ['script deployment error toast close label', { ns: meta.id, count: scriptTemplates.length }],
+      });
     }
-  }, [status, dispatch]);
+  }, [status, invokePromise]);
 
   return (
     <Dialog.Content>

package/src/components/FrameContainer/FrameContainer.tsx

@@ -9,9 +9,9 @@ import { type BundleResult } from '@dxos/functions-runtime/bundler';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { useClient } from '@dxos/react-client';
-import { baseSurface, mx } from '@dxos/react-ui-theme';
 import { createProtoRpcPeer } from '@dxos/rpc';
 import { createIFramePort } from '@dxos/rpc-tunnel';
+import { baseSurface, mx } from '@dxos/ui-theme';
 
 export type FrameContainerProps = {
   containerUrl: string;
@@ -49,7 +49,9 @@ export const FrameContainer = ({ containerUrl, result, debug = true }: FrameCont
   invariant(result.sourceHash, 'Source hash is required.');
   const sourceHash = Buffer.from(result.sourceHash).toString('hex');
   const src =
-    'bundle' in result ? `${containerUrl}?ts=${sourceHash}#code=${encodeURIComponent(result.bundle)}` : undefined;
+    'bundle' in result
+      ? `${containerUrl}?ts=${sourceHash}#code=${encodeURIComponent(new TextDecoder().decode(Object.values(result.bundle as any)[0] as Uint8Array))}`
+      : undefined;
 
   return (
     <>

package/src/components/NotebookContainer.stories.tsx

@@ -3,10 +3,10 @@
 //
 
 import { type Meta, type StoryObj } from '@storybook/react-vite';
+import * as Effect from 'effect/Effect';
 import React from 'react';
 
 import { SERVICES_CONFIG } from '@dxos/ai/testing';
-import { IntentPlugin, SettingsPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Agent } from '@dxos/assistant-toolkit';
 import { Filter } from '@dxos/echo';
@@ -16,7 +16,7 @@ import { AutomationPlugin } from '@dxos/plugin-automation';
 import { ClientPlugin } from '@dxos/plugin-client';
 import { ExplorerPlugin } from '@dxos/plugin-explorer';
 import { Markdown, MarkdownPlugin } from '@dxos/plugin-markdown';
-import { SpacePlugin } from '@dxos/plugin-space';
+import { corePlugins } from '@dxos/plugin-testing';
 import { Config, useClient } from '@dxos/react-client';
 import { useQuery } from '@dxos/react-client/echo';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
@@ -28,20 +28,21 @@ import { Notebook } from '../types';
 
 import { NotebookContainer } from './NotebookContainer';
 
-const meta = {
+const meta: Meta<typeof NotebookContainer> = {
   title: 'plugins/plugin-script/NotebookContainer',
   component: NotebookContainer,
   render: (args) => {
     const client = useClient();
     const space = client.spaces.default;
     const notebooks = useQuery(space?.db, Filter.type(Notebook.Notebook));
-    return <NotebookContainer {...args} notebook={notebooks[0]} />;
+    return <NotebookContainer {...args} subject={notebooks[0]} />;
   },
   decorators: [
     withTheme,
-    withLayout({ container: 'column', classNames: 'is-prose' }),
+    withLayout({ layout: 'column', classNames: 'is-proseMaxWidth' }),
     withPluginManager({
       plugins: [
+        ...corePlugins(),
         ClientPlugin({
           // TODO(wittjosiah): ComputeRuntime requires edge to be configured or it will throw.
           config: new Config({
@@ -50,20 +51,18 @@ const meta = {
             },
           }),
           types: [...DataTypes, Notebook.Notebook, Function.Function, Markdown.Document],
-          onClientInitialized: async ({ client }) => {
-            await client.halo.createIdentity();
-            await client.spaces.waitUntilReady();
-            const space = client.spaces.default;
-            await space.waitUntilReady();
+          onClientInitialized: ({ client }) =>
+            Effect.gen(function* () {
+              yield* Effect.promise(() => client.halo.createIdentity());
+              yield* Effect.promise(() => client.spaces.waitUntilReady());
+              const space = client.spaces.default;
+              yield* Effect.promise(() => space.waitUntilReady());
 
-            space.db.add(createNotebook());
-            space.db.add(Markdown.make({ content: '# Hello World' }));
-            space.db.add(serializeFunction(Agent.prompt));
-          },
+              space.db.add(createNotebook());
+              space.db.add(Markdown.make({ content: '# Hello World' }));
+              space.db.add(serializeFunction(Agent.prompt));
+            }),
         }),
-        SpacePlugin({}),
-        SettingsPlugin(),
-        IntentPlugin(),
         AssistantPlugin(),
         AutomationPlugin(),
         ExplorerPlugin(),
@@ -74,10 +73,15 @@ const meta = {
   parameters: {
     translations,
   },
-} satisfies Meta<typeof NotebookContainer>;
+};
 
 export default meta;
 
 type Story = StoryObj<typeof meta>;
 
-export const Default: Story = {};
+export const Default: Story = {
+  args: {
+    role: 'article',
+    subject: undefined as any,
+  },
+};

package/src/components/NotebookContainer.tsx

@@ -2,26 +2,26 @@
 // Copyright 2025 DXOS.org
 //
 
+import { RegistryContext } from '@effect-atom/atom-react';
 import * as Cause from 'effect/Cause';
 import * as Effect from 'effect/Effect';
 import * as Exit from 'effect/Exit';
-import React, { useCallback, useMemo, useState } from 'react';
+import type * as Types from 'effect/Types';
+import React, { useCallback, useContext, useMemo, useState } from 'react';
 
+import { type SurfaceComponentProps } from '@dxos/app-framework/react';
 import { Agent } from '@dxos/assistant-toolkit';
 import { Blueprint, Prompt } from '@dxos/blueprints';
 import { Filter, Obj, Query, Ref } from '@dxos/echo';
 import { QueryBuilder } from '@dxos/echo-query';
-import { type FunctionDefinition, FunctionInvocationService } from '@dxos/functions';
-import { InvocationTracer } from '@dxos/functions-runtime';
-import { TracingServiceExt } from '@dxos/functions-runtime';
+import { type FunctionDefinition, FunctionInvocationService, TracingService } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { useComputeRuntimeCallback } from '@dxos/plugin-automation';
 import { Graph } from '@dxos/plugin-explorer/types';
-import { getSpace } from '@dxos/react-client/echo';
 import { DropdownMenu, IconButton, Toolbar, useTranslation } from '@dxos/react-ui';
 import { useAttention } from '@dxos/react-ui-attention';
-import { StackItem } from '@dxos/react-ui-stack';
+import { Layout } from '@dxos/react-ui-mosaic';
 import { Text, View } from '@dxos/schema';
 import { isNonNullable } from '@dxos/util';
 
@@ -36,24 +36,22 @@ const INCLUDE_BLUEPRINTS = ['dxos.org/blueprint/assistant', 'dxos.org/blueprint/
 
 // TODO(burdon): Support calling named deployed functions (as with sheet).
 
-export type NotebookContainerProps = {
-  role?: string;
-  notebook?: Notebook.Notebook;
-} & Pick<TypescriptEditorProps, 'env'>;
+export type NotebookContainerProps = SurfaceComponentProps<Notebook.Notebook, Pick<TypescriptEditorProps, 'env'>>;
 
-export const NotebookContainer = ({ notebook, env }: NotebookContainerProps) => {
+export const NotebookContainer = ({ role, subject: notebook, env }: NotebookContainerProps) => {
   const { t } = useTranslation(meta.id);
-  const space = getSpace(notebook);
+  const registry = useContext(RegistryContext);
+  const db = notebook && Obj.getDatabase(notebook);
   const attendableId = notebook ? Obj.getDXN(notebook).toString() : '';
   const { hasAttention } = useAttention(attendableId);
 
   // TODO(burdon): Consolidate execution and state (with graph).
   //  Generalize ComputeGraph evaluation function (using effects).
-  const graph = useMemo(() => notebook && new ComputeGraph(notebook), [notebook]);
+  const graph = useMemo(() => notebook && new ComputeGraph(notebook, registry), [notebook, registry]);
 
   const [queryValues, setQueryValues] = useState<Record<string, any>>({});
   const handleExecQueries = useCallback(async () => {
-    invariant(space);
+    invariant(db);
 
     const builder = new QueryBuilder();
     for (const cell of notebook?.cells ?? []) {
@@ -65,12 +63,19 @@ export const NotebookContainer = ({ notebook, env }: NotebookContainerProps) =>
             const ast = Query.select(filter).ast;
             const graph = cell.graph?.target;
             if (!graph) {
-              const { view } = await View.makeFromSpace({ space });
-              const graph = Graph.make({ query: { ast }, view });
-              cell.graph = Ref.make(graph);
-              cell.name = name;
+              const { view } = await View.makeFromDatabase({ db });
+              const newGraph = Graph.make({ query: { ast }, view });
+              Obj.change(notebook!, (n) => {
+                const c = n.cells.find((c) => c.id === cell.id);
+                if (c) {
+                  c.graph = Ref.make(newGraph);
+                  c.name = name;
+                }
+              });
             } else {
-              graph.query.ast = ast;
+              Obj.change(graph, (g) => {
+                g.query.ast = ast as Obj.Mutable<typeof ast>;
+              });
             }
           }
         }
@@ -78,17 +83,17 @@ export const NotebookContainer = ({ notebook, env }: NotebookContainerProps) =>
         if (cell.name && cell.graph?.target) {
           const graph = Obj.getSnapshot(cell.graph?.target);
           const query = Query.fromAst(graph.query.ast);
-          const result = await space?.db.query(query).run();
-          const objectIds = result?.objects?.map((obj) => obj.id);
+          const objects = await db.query(query).run();
+          const objectIds = objects?.map((obj) => obj.id);
           setQueryValues((prev) => ({ ...prev, [cell.name!]: objectIds }));
         }
       }
     }
-  }, [space, notebook, graph]);
+  }, [db, notebook, graph]);
 
   const [promptResults, setPromptResults] = useState<Record<string, string>>({});
   const handleExecPrompts = useComputeRuntimeCallback(
-    space,
+    db?.spaceId,
     Effect.fnUntraced(function* () {
       invariant(graph);
 
@@ -101,7 +106,7 @@ export const NotebookContainer = ({ notebook, env }: NotebookContainerProps) =>
       for (const prompt of prompts) {
         yield* runPrompt({
           prompt,
-          input: { ...queryValues, ...graph.valuesByName.value },
+          input: { ...queryValues, ...graph.getValuesByName() },
           onResult: (result) =>
             setPromptResults((prev) => ({
               ...prev,
@@ -127,10 +132,12 @@ export const NotebookContainer = ({ notebook, env }: NotebookContainerProps) =>
       const from = notebook.cells.findIndex((cell) => cell.id === source.id);
       const to = notebook.cells.findIndex((cell) => cell.id === target.id);
       if (from != null && to != null) {
-        const cell = notebook.cells.splice(from, 1)[0];
-        if (cell) {
-          notebook.cells.splice(to, 0, cell);
-        }
+        Obj.change(notebook, (n) => {
+          const cell = n.cells.splice(from, 1)[0];
+          if (cell) {
+            n.cells.splice(to, 0, cell);
+          }
+        });
       }
     },
     [notebook],
@@ -139,7 +146,7 @@ export const NotebookContainer = ({ notebook, env }: NotebookContainerProps) =>
   const handleCellInsert = useCallback<NonNullable<NotebookStackProps['onCellInsert']>>(
     async (type, after) => {
       invariant(notebook);
-      const cell: Notebook.Cell = { id: crypto.randomUUID(), type };
+      const cell: Types.Mutable<Notebook.Cell> = { id: crypto.randomUUID(), type };
       switch (type) {
         case 'markdown':
         case 'script':
@@ -149,9 +156,9 @@ export const NotebookContainer = ({ notebook, env }: NotebookContainerProps) =>
         }
 
         case 'prompt': {
-          if (space) {
-            const result = await space.db.query(Query.select(Filter.type(Blueprint.Blueprint))).run();
-            const blueprints = result.objects
+          if (db) {
+            const objects = await db.query(Query.select(Filter.type(Blueprint.Blueprint))).run();
+            const blueprints = objects
               .filter((blueprint) => INCLUDE_BLUEPRINTS.includes(blueprint.key))
               .map((blueprint) => Ref.make(blueprint));
             cell.prompt = Ref.make(Prompt.make({ instructions: '', blueprints }));
@@ -161,9 +168,11 @@ export const NotebookContainer = ({ notebook, env }: NotebookContainerProps) =>
       }
 
       const idx = after ? notebook.cells.findIndex((cell) => cell.id === after) : notebook.cells.length;
-      notebook.cells.splice(idx, 0, cell);
+      Obj.change(notebook, (n) => {
+        n.cells.splice(idx, 0, cell);
+      });
     },
-    [space, notebook],
+    [db, notebook],
   );
 
   const handleCellDelete = useCallback<NonNullable<NotebookStackProps['onCellDelete']>>(
@@ -171,14 +180,16 @@ export const NotebookContainer = ({ notebook, env }: NotebookContainerProps) =>
       invariant(notebook);
       const idx = notebook.cells.findIndex((cell) => cell.id === id);
       if (idx !== -1) {
-        notebook.cells.splice(idx, 1);
+        Obj.change(notebook, (n) => {
+          n.cells.splice(idx, 1);
+        });
       }
     },
     [notebook],
   );
 
   return (
-    <StackItem.Content toolbar>
+    <Layout.Main role={role} toolbar>
       <Toolbar.Root disabled={!hasAttention} textBlockWidth>
         <DropdownMenu.Root>
           <DropdownMenu.Trigger asChild>
@@ -197,7 +208,7 @@ export const NotebookContainer = ({ notebook, env }: NotebookContainerProps) =>
       <div role='none' className='flex bs-full overflow-hidden -mis-[1px] -mie-[1px]'>
         <NotebookStack
           classNames='container-max-width border-l border-r border-subduedSeparator'
-          space={space}
+          db={db}
           notebook={notebook}
           graph={graph}
           env={env}
@@ -207,7 +218,7 @@ export const NotebookContainer = ({ notebook, env }: NotebookContainerProps) =>
           onCellDelete={handleCellDelete}
         />
       </div>
-    </StackItem.Content>
+    </Layout.Main>
   );
 };
 
@@ -227,7 +238,7 @@ const runPrompt = Effect.fn(function* ({
     prompt,
     input,
   };
-  const tracer = yield* InvocationTracer;
+  const tracer = yield* TracingService;
   const trace = yield* tracer.traceInvocationStart({
     target: undefined,
     payload: {
@@ -237,7 +248,7 @@ const runPrompt = Effect.fn(function* ({
 
   // Invoke the function.
   const result = yield* FunctionInvocationService.invokeFunction(Agent.prompt, inputData).pipe(
-    Effect.provide(TracingServiceExt.layerQueue(trace.invocationTraceQueue)),
+    Effect.provide(trace.invocationTraceQueue ? TracingService.layerInvocation(trace) : TracingService.layerNoop),
     Effect.exit,
   );