@dxos/plugin-script 0.10.0 → 0.11.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-script",
-  "version": "0.10.0",
+  "version": "0.11.1",
   "description": "Braneframe notebook plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -16,7 +16,7 @@
     "#skills": {
       "source": "./src/skills/index.ts",
       "types": "./dist/types/src/skills/index.d.ts",
-      "default": "./dist/lib/neutral/skills/index.mjs"
+      "default": "./dist/lib/skills.mjs"
     },
     "#capabilities": {
       "source": {
@@ -24,33 +24,33 @@
         "default": "./src/capabilities/index.ts"
       },
       "types": "./dist/types/src/capabilities/index.d.ts",
-      "node": "./dist/lib/neutral/capabilities/node.mjs",
-      "default": "./dist/lib/neutral/capabilities/index.mjs"
+      "node": "./dist/lib/capabilities/node.mjs",
+      "default": "./dist/lib/capabilities.mjs"
     },
     "#components": {
       "source": "./src/components/index.ts",
       "types": "./dist/types/src/components/index.d.ts",
-      "default": "./dist/lib/neutral/components/index.mjs"
+      "default": "./dist/lib/components.mjs"
     },
     "#containers": {
       "source": "./src/containers/index.ts",
       "types": "./dist/types/src/containers/index.d.ts",
-      "default": "./dist/lib/neutral/containers/index.mjs"
+      "default": "./dist/lib/containers.mjs"
     },
     "#hooks": {
       "source": "./src/hooks/index.ts",
       "types": "./dist/types/src/hooks/index.d.ts",
-      "default": "./dist/lib/neutral/hooks/index.mjs"
+      "default": "./dist/lib/hooks.mjs"
     },
     "#meta": {
       "source": "./src/meta.ts",
       "types": "./dist/types/src/meta.d.ts",
-      "default": "./dist/lib/neutral/meta.mjs"
+      "default": "./dist/lib/meta.mjs"
     },
     "#operations": {
       "source": "./src/operations/index.ts",
       "types": "./dist/types/src/operations/index.d.ts",
-      "default": "./dist/lib/neutral/operations/index.mjs"
+      "default": "./dist/lib/operations.mjs"
     },
     "#plugin": {
       "source": {
@@ -59,58 +59,58 @@
         "default": "./src/ScriptPlugin.tsx"
       },
       "types": "./dist/types/src/ScriptPlugin.d.ts",
-      "workerd": "./dist/lib/neutral/ScriptPlugin.workerd.mjs",
-      "node": "./dist/lib/neutral/ScriptPlugin.node.mjs",
-      "default": "./dist/lib/neutral/ScriptPlugin.mjs"
+      "workerd": "./dist/lib/ScriptPlugin.workerd.mjs",
+      "node": "./dist/lib/ScriptPlugin.node.mjs",
+      "default": "./dist/lib/ScriptPlugin.mjs"
     },
     "#testing": "./src/testing/index.ts",
     "#translations": {
       "source": "./src/translations.ts",
       "types": "./dist/types/src/translations.d.ts",
-      "default": "./dist/lib/neutral/translations.mjs"
+      "default": "./dist/lib/translations.mjs"
     },
     "#types": {
       "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts",
-      "default": "./dist/lib/neutral/types/index.mjs"
+      "default": "./dist/lib/types.mjs"
     }
   },
   "exports": {
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "default": "./dist/lib/neutral/index.mjs"
+      "import": "./dist/lib/index.mjs"
     },
     "./assets/PLUGIN.mdl": "./PLUGIN.mdl",
     "./skills": {
       "source": "./src/skills/index.ts",
       "types": "./dist/types/src/skills/index.d.ts",
-      "default": "./dist/lib/neutral/skills/index.mjs"
+      "import": "./dist/lib/skills.mjs"
     },
     "./containers": {
       "source": "./src/containers/index.ts",
       "types": "./dist/types/src/containers/index.d.ts",
-      "default": "./dist/lib/neutral/containers/index.mjs"
+      "import": "./dist/lib/containers.mjs"
     },
     "./plugin": {
       "source": "./src/plugin.ts",
       "types": "./dist/types/src/plugin.d.ts",
-      "default": "./dist/lib/neutral/plugin.mjs"
+      "import": "./dist/lib/plugin.mjs"
     },
     "./templates": {
       "source": "./src/templates/index.ts",
       "types": "./dist/types/src/templates/index.d.ts",
-      "default": "./dist/lib/neutral/templates/index.mjs"
+      "import": "./dist/lib/templates.mjs"
     },
     "./translations": {
       "source": "./src/translations.ts",
       "types": "./dist/types/src/translations.d.ts",
-      "default": "./dist/lib/neutral/translations.mjs"
+      "import": "./dist/lib/translations.mjs"
     },
     "./types": {
       "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts",
-      "default": "./dist/lib/neutral/types/index.mjs"
+      "import": "./dist/lib/types.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -122,12 +122,13 @@
   ],
   "dependencies": {
     "@automerge/automerge": "3.3.0-fragments.2",
-    "@codemirror/autocomplete": "^6.20.2",
+    "@codemirror/autocomplete": "^6.20.3",
     "@codemirror/lang-javascript": "^6.2.5",
-    "@codemirror/language": "^6.12.3",
+    "@codemirror/language": "^6.12.4",
     "@codemirror/lint": "6.9.7",
-    "@codemirror/state": "^6.6.0",
-    "@codemirror/view": "^6.43.0",
+    "@codemirror/state": "^6.7.1",
+    "@codemirror/view": "^6.43.6",
+    "@effect-atom/atom": "^0.5.3",
     "@effect-atom/atom-react": "^0.5.0",
     "@lezer/common": "^1.5.2",
     "@lezer/highlight": "^1.2.3",
@@ -141,52 +142,56 @@
     "esbuild-wasm": "^0.28.0",
     "prettier": "^3.6.2",
     "typescript": "^6.0.3",
-    "@dxos/ai": "0.10.0",
-    "@dxos/app-toolkit": "0.10.0",
-    "@dxos/assistant": "0.10.0",
-    "@dxos/app-framework": "0.10.0",
-    "@dxos/client": "0.10.0",
-    "@dxos/client-protocol": "0.10.0",
-    "@dxos/context": "0.10.0",
-    "@dxos/compute": "0.10.0",
-    "@dxos/config": "0.10.0",
-    "@dxos/echo": "0.10.0",
-    "@dxos/echo-client": "0.10.0",
-    "@dxos/echo-doc": "0.10.0",
-    "@dxos/assistant-toolkit": "0.10.0",
-    "@dxos/effect": "0.10.0",
-    "@dxos/functions": "0.10.0",
-    "@dxos/echo-query": "0.10.0",
-    "@dxos/functions-runtime": "0.10.0",
-    "@dxos/functions-simulator-cloudflare": "0.10.0",
-    "@dxos/invariant": "0.10.0",
-    "@dxos/keys": "0.10.0",
-    "@dxos/devtools": "0.10.0",
-    "@dxos/log": "0.10.0",
-    "@dxos/plugin-client": "0.10.0",
-    "@dxos/plugin-assistant": "0.10.0",
-    "@dxos/plugin-explorer": "0.10.0",
-    "@dxos/plugin-graph": "0.10.0",
-    "@dxos/plugin-routine": "0.10.0",
-    "@dxos/plugin-space": "0.10.0",
-    "@dxos/plugin-markdown": "0.10.0",
-    "@dxos/protocols": "0.10.0",
-    "@dxos/react-client": "0.10.0",
-    "@dxos/react-ui-attention": "0.10.0",
-    "@dxos/react-ui-editor": "0.10.0",
-    "@dxos/react-ui-menu": "0.10.0",
-    "@dxos/react-ui-form": "0.10.0",
-    "@dxos/react-ui-components": "0.10.0",
-    "@dxos/react-ui-mosaic": "0.10.0",
-    "@dxos/react-ui-syntax-highlighter": "0.10.0",
-    "@dxos/rpc": "0.10.0",
-    "@dxos/rpc-tunnel": "0.10.0",
-    "@dxos/schema": "0.10.0",
-    "@dxos/plugin-game": "0.10.0",
-    "@dxos/ui": "0.10.0",
-    "@dxos/types": "0.10.0",
-    "@dxos/ui-editor": "0.10.0",
-    "@dxos/util": "0.10.0"
+    "@dxos/ai": "0.11.1",
+    "@dxos/app-framework": "0.11.1",
+    "@dxos/app-toolkit": "0.11.1",
+    "@dxos/assistant": "0.11.1",
+    "@dxos/assistant-toolkit": "0.11.1",
+    "@dxos/client": "0.11.1",
+    "@dxos/client-protocol": "0.11.1",
+    "@dxos/compute": "0.11.1",
+    "@dxos/compute-runtime": "0.11.1",
+    "@dxos/config": "0.11.1",
+    "@dxos/context": "0.11.1",
+    "@dxos/devtools": "0.11.1",
+    "@dxos/echo": "0.11.1",
+    "@dxos/echo-client": "0.11.1",
+    "@dxos/echo-doc": "0.11.1",
+    "@dxos/echo-query": "0.11.1",
+    "@dxos/echo-react": "0.11.1",
+    "@dxos/edge-compute": "0.11.1",
+    "@dxos/effect": "0.11.1",
+    "@dxos/halo": "0.11.1",
+    "@dxos/halo-react": "0.11.1",
+    "@dxos/invariant": "0.11.1",
+    "@dxos/link": "0.11.1",
+    "@dxos/keys": "0.11.1",
+    "@dxos/log": "0.11.1",
+    "@dxos/plugin-assistant": "0.11.1",
+    "@dxos/plugin-client": "0.11.1",
+    "@dxos/plugin-explorer": "0.11.1",
+    "@dxos/plugin-game": "0.11.1",
+    "@dxos/plugin-graph": "0.11.1",
+    "@dxos/plugin-markdown": "0.11.1",
+    "@dxos/plugin-space": "0.11.1",
+    "@dxos/protocols": "0.11.1",
+    "@dxos/react-client": "0.11.1",
+    "@dxos/react-ui-attention": "0.11.1",
+    "@dxos/react-ui-components": "0.11.1",
+    "@dxos/react-ui-dnd": "0.11.1",
+    "@dxos/react-ui-editor": "0.11.1",
+    "@dxos/react-ui-form": "0.11.1",
+    "@dxos/react-ui-menu": "0.11.1",
+    "@dxos/react-ui-mosaic": "0.11.1",
+    "@dxos/react-ui-syntax-highlighter": "0.11.1",
+    "@dxos/rpc": "0.11.1",
+    "@dxos/plugin-routine": "0.11.1",
+    "@dxos/rpc-tunnel": "0.11.1",
+    "@dxos/schema": "0.11.1",
+    "@dxos/ui-editor": "0.11.1",
+    "@dxos/types": "0.11.1",
+    "@dxos/util": "0.11.1",
+    "@dxos/ui": "0.11.1"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -199,15 +204,16 @@
     "effect": "3.21.4",
     "react": "~19.2.7",
     "react-dom": "~19.2.7",
-    "vite": "^8.0.16",
-    "@dxos/config": "0.10.0",
-    "@dxos/plugin-chess": "0.10.0",
-    "@dxos/plugin-routine": "0.10.0",
-    "@dxos/plugin-testing": "0.10.0",
-    "@dxos/random": "0.10.0",
-    "@dxos/storybook-utils": "0.10.0",
-    "@dxos/react-ui": "0.10.0",
-    "@dxos/ui-theme": "0.10.0"
+    "vite": "^8.1.4",
+    "@dxos/config": "0.11.1",
+    "@dxos/functions-simulator-cloudflare": "0.11.1",
+    "@dxos/plugin-chess": "0.11.1",
+    "@dxos/plugin-routine": "0.11.1",
+    "@dxos/plugin-testing": "0.11.1",
+    "@dxos/random": "0.11.1",
+    "@dxos/react-ui": "0.11.1",
+    "@dxos/storybook-utils": "0.11.1",
+    "@dxos/ui-theme": "0.11.1"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -215,8 +221,8 @@
     "effect": "3.21.4",
     "react": "~19.2.7",
     "react-dom": "~19.2.7",
-    "@dxos/react-ui": "0.10.0",
-    "@dxos/ui-theme": "0.10.0"
+    "@dxos/react-ui": "^0.11.1",
+    "@dxos/ui-theme": "^0.11.1"
   },
   "publishConfig": {
     "access": "public"

package/src/capabilities/ScriptSurfaces.tsx

@@ -0,0 +1,96 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+// Surface components that cannot be expressed as a `props` mapper, because they call hooks.
+
+import React from 'react';
+
+import { useAtomCapability, useSettingsState } from '@dxos/app-framework/ui';
+import { type AppCapabilities } from '@dxos/app-toolkit';
+import { type Script } from '@dxos/compute';
+import { InvocationTraceContainer } from '@dxos/devtools';
+import { Feed } from '@dxos/echo';
+import { useClient } from '@dxos/react-client';
+import { getSpace } from '@dxos/react-client/echo';
+import { Panel } from '@dxos/react-ui';
+
+import { NotebookArticle, ScriptArticle, ScriptSettings } from '#containers';
+import { useCompiler } from '#hooks';
+import { type Notebook, ScriptCapabilities, type Settings } from '#types';
+
+import { getAccessCredential } from '../util';
+
+export type ScriptSettingsSurfaceProps = {
+  subject: AppCapabilities.Settings;
+};
+
+export const ScriptSettingsSurface = ({ subject }: ScriptSettingsSurfaceProps) => {
+  const { settings, updateSettings } = useSettingsState<Settings.Settings>(subject.atom);
+  const client = useClient();
+  // TODO(burdon): Check token.
+  const handleAuthenticate = async () => {
+    const identity = client.halo.identity.get();
+    if (!identity) {
+      return;
+    }
+
+    await client.halo.writeCredentials([getAccessCredential(identity.identityKey)]);
+  };
+
+  return <ScriptSettings settings={settings} onSettingsChange={updateSettings} onAuthenticate={handleAuthenticate} />;
+};
+
+export type ScriptArticleSurfaceProps = {
+  role: string;
+  subject: Script.Script;
+  attendableId?: string;
+};
+
+/** The compiler environment and settings are ambient, so they are resolved here rather than mapped. */
+export const ScriptArticleSurface = ({ role, subject, attendableId }: ScriptArticleSurfaceProps) => {
+  const compiler = useCompiler();
+  const settings = useAtomCapability(ScriptCapabilities.Settings);
+
+  return (
+    <ScriptArticle
+      role={role}
+      subject={subject}
+      attendableId={attendableId}
+      settings={settings}
+      env={compiler?.environment}
+    />
+  );
+};
+
+export type NotebookArticleSurfaceProps = {
+  role: string;
+  subject: Notebook.Notebook;
+  attendableId?: string;
+};
+
+export const NotebookArticleSurface = ({ role, subject, attendableId }: NotebookArticleSurfaceProps) => {
+  const compiler = useCompiler();
+
+  return <NotebookArticle role={role} subject={subject} attendableId={attendableId} env={compiler?.environment} />;
+};
+
+export type ScriptLogsSurfaceProps = {
+  role: string;
+  script: Script.Script;
+};
+
+/** Resolves the space's invocation-trace feed for the selected script. */
+export const ScriptLogsSurface = ({ role, script }: ScriptLogsSurfaceProps) => {
+  const space = getSpace(script);
+  const feed = space?.properties.invocationTraceFeed?.target;
+  const feedDXN = feed ? Feed.getFeedUri(feed) : undefined;
+
+  return (
+    <Panel.Root role={role}>
+      <Panel.Content asChild>
+        <InvocationTraceContainer db={space?.db} feedDXN={feedDXN} target={script} detailAxis='block' />
+      </Panel.Content>
+    </Panel.Root>
+  );
+};

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

@@ -20,7 +20,7 @@ export default Capability.makeModule(
         connector: () =>
           Effect.succeed([
             AppNode.makeCompanion({
-              id: 'execute',
+              variant: 'execute',
               label: ['script-test.label', { ns: meta.profile.key }],
               icon: 'ph--terminal--regular',
               data: 'execute',
@@ -33,7 +33,7 @@ export default Capability.makeModule(
         connector: () =>
           Effect.succeed([
             AppNode.makeCompanion({
-              id: 'logs',
+              variant: 'logs',
               label: ['script-logs.label', { ns: meta.profile.key }],
               icon: 'ph--clock-countdown--regular',
               data: 'logs',

package/src/capabilities/compiler.ts

@@ -11,7 +11,7 @@ import wasmUrl from 'esbuild-wasm/esbuild.wasm?url';
 import * as ts from 'typescript';
 
 import { Capability } from '@dxos/app-framework';
-import { initializeBundler } from '@dxos/functions-runtime/bundler';
+import { initializeBundler } from '@dxos/edge-compute/bundler';
 import { log } from '@dxos/log';
 import { trim } from '@dxos/util';
 

package/src/capabilities/react-surface.ts

@@ -0,0 +1,82 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import { type ComponentProps } from 'react';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/ui';
+import { AppSurface } from '@dxos/app-toolkit/ui';
+import { Script } from '@dxos/compute';
+
+import { DeploymentDialog, ScriptProperties, TestContainer } from '#containers';
+import { meta } from '#meta';
+import { Notebook } from '#types';
+
+import { DEPLOYMENT_DIALOG } from '../constants';
+import {
+  NotebookArticleSurface,
+  ScriptArticleSurface,
+  ScriptLogsSurface,
+  ScriptSettingsSurface,
+} from './ScriptSurfaces';
+
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
+        id: 'pluginSettings',
+        filter: AppSurface.settings(AppSurface.Article, meta.profile.key),
+        component: ScriptSettingsSurface,
+        props: ({ data: { subject } }) => ({ subject }),
+      }),
+      Surface.create({
+        id: 'script.article',
+        // TODO(wittjosiah): Split into multiple surfaces if this filter proves too strict for non-article roles.
+        filter: AppSurface.oneOf(
+          AppSurface.object(AppSurface.Article, Script.Script),
+          AppSurface.object(AppSurface.Section, Script.Script),
+        ),
+        component: ScriptArticleSurface,
+        props: ({ role, data: { subject, attendableId } }) => ({ role, subject, attendableId }),
+      }),
+      Surface.create({
+        id: 'notebook.article',
+        filter: AppSurface.object(AppSurface.Article, Notebook.Notebook),
+        component: NotebookArticleSurface,
+        props: ({ role, data: { subject, attendableId } }) => ({ role, subject, attendableId }),
+      }),
+      Surface.create({
+        id: 'objectProperties',
+        filter: AppSurface.object(AppSurface.ObjectProperties, Script.Script),
+        component: ScriptProperties,
+        props: ({ role, data: { subject } }) => ({ role, subject }),
+      }),
+      Surface.create({
+        id: 'companion.execute',
+        filter: AppSurface.allOf(
+          AppSurface.literal(AppSurface.Article, 'execute'),
+          AppSurface.companion(AppSurface.Article, Script.Script),
+        ),
+        component: TestContainer,
+        props: ({ role, data: { companionTo } }) => ({ role, script: companionTo }),
+      }),
+      Surface.create({
+        id: 'companion.logs',
+        filter: AppSurface.allOf(
+          AppSurface.literal(AppSurface.Article, 'logs'),
+          AppSurface.companion(AppSurface.Article, Script.Script),
+        ),
+        component: ScriptLogsSurface,
+        props: ({ role, data: { companionTo } }) => ({ role, script: companionTo }),
+      }),
+      Surface.create({
+        id: DEPLOYMENT_DIALOG,
+        filter: AppSurface.component<ComponentProps<typeof DeploymentDialog>>(AppSurface.Dialog, DEPLOYMENT_DIALOG),
+        component: DeploymentDialog,
+        props: ({ data: { props } }) => ({ ...props }),
+      }),
+    ]),
+  ),
+);

package/src/components/NotebookStack/NotebookCell.tsx

@@ -177,13 +177,14 @@ const NotebookPromptResult = ({ cell, promptResults }: NotebookCellProps) => {
   }
 
   return (
-    <div className={mx('flex w-full bg-group-surface text-description border-y border-subdued-separator', valueStyles)}>
+    <div className={mx('flex w-full dx-group-surface text-description border-y border-subdued-separator', valueStyles)}>
       <NotebookTextEditor readOnly value={value} />
     </div>
   );
 };
 
 const NotebookTextEditor = ({
+  classNames,
   extensions: extensionsProp,
   readOnly,
   ...props
@@ -202,7 +203,13 @@ const NotebookTextEditor = ({
 
   return (
     <Editor.Root>
-      <Editor.View classNames='border' {...props} extensions={extensions} selectionEnd />
+      {/* Focused-cell affordance: Editor.View no longer applies a focus border by default. */}
+      <Editor.View
+        {...props}
+        classNames={mx('border focus-within:border-focus-ring-subtle', classNames)}
+        extensions={extensions}
+        selectionEnd
+      />
     </Editor.Root>
   );
 };

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

@@ -11,6 +11,7 @@ import { ClientPlugin } from '@dxos/plugin-client/testing';
 import { initializeIdentity } from '@dxos/plugin-client/testing';
 import { RoutinePlugin } from '@dxos/plugin-routine/testing';
 import { corePlugins } from '@dxos/plugin-testing';
+import { withMosaic } from '@dxos/react-ui-mosaic/testing';
 import { withLayout } from '@dxos/react-ui/testing';
 
 import { createNotebook } from '#testing';
@@ -27,6 +28,7 @@ const meta = {
   title: 'plugins/plugin-script/components/NotebookStack',
   component: NotebookStackStory,
   decorators: [
+    withMosaic(),
     withLayout({ layout: 'column', classNames: 'dx-document' }),
     withPluginManager({
       plugins: [

package/src/components/NotebookStack/NotebookStack.tsx

@@ -2,12 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { useCallback, useMemo, useState } from 'react';
+import React, { useCallback, useId, useMemo, useState } from 'react';
 
 import { Obj } from '@dxos/echo';
 import { DropdownMenu, IconButton, ScrollArea, type ThemedClassName, useTranslation } from '@dxos/react-ui';
 import { composable, composableProps } from '@dxos/react-ui';
-import { Mosaic, type MosaicEventHandler, type MosaicTileProps } from '@dxos/react-ui-mosaic';
+import { type DndContainerHandler } from '@dxos/react-ui-dnd';
+import { Mosaic, type MosaicTileProps } from '@dxos/react-ui-mosaic';
 import { mx } from '@dxos/ui-theme';
 import { arrayMove } from '@dxos/util';
 
@@ -50,11 +51,14 @@ export const NotebookStack = composable<HTMLDivElement, NotebookStackProps>(
       [db, graph, promptResults, onCellInsert, onCellDelete, env],
     );
 
+    // Per-instance discriminator so the same notebook opened twice doesn't collide in the Mosaic registry.
+    const instanceId = useId();
+
     // Reorder cells in place; placeholder/tile locations are 1-based with half-step placeholders between
     // tiles, so the floor of the drop location is the destination array index (see Mosaic.Stack).
-    const eventHandler = useMemo<MosaicEventHandler<Notebook.Cell>>(
+    const eventHandler = useMemo<DndContainerHandler<Notebook.Cell>>(
       () => ({
-        id: notebook?.id ?? 'notebook',
+        id: `notebook:${notebook?.id ?? 'anon'}:${instanceId}`,
         // Only the notebook's own cells are droppable; onDrop only reorders within this notebook.
         canDrop: ({ source }) => !!notebook && notebook.cells.some((cell) => cell.id === source.id),
         onDrop: ({ source, target }) => {
@@ -81,19 +85,23 @@ export const NotebookStack = composable<HTMLDivElement, NotebookStackProps>(
           });
         },
       }),
-      [notebook],
+      [notebook, instanceId],
     );
 
     return (
-      <Mosaic.Root ref={forwardedRef}>
-        <Mosaic.Container asChild orientation='vertical' autoScroll={viewport} eventHandler={eventHandler}>
-          <ScrollArea.Root orientation='vertical' padding {...composableProps(props)}>
-            <ScrollArea.Viewport ref={setViewport}>
-              <Mosaic.Stack orientation='vertical' items={notebook?.cells ?? []} getId={getCellId} Tile={Tile} />
-            </ScrollArea.Viewport>
-          </ScrollArea.Root>
-        </Mosaic.Container>
-      </Mosaic.Root>
+      <Mosaic.Container
+        asChild
+        orientation='vertical'
+        autoScroll={viewport}
+        eventHandler={eventHandler}
+        ref={forwardedRef}
+      >
+        <ScrollArea.Root orientation='vertical' padding {...composableProps(props)}>
+          <ScrollArea.Viewport ref={setViewport}>
+            <Mosaic.Stack orientation='vertical' items={notebook?.cells ?? []} getId={getCellId} Tile={Tile} />
+          </ScrollArea.Viewport>
+        </ScrollArea.Root>
+      </Mosaic.Container>
     );
   },
 );

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

@@ -6,7 +6,7 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useCallback, useMemo, useState } from 'react';
 
 import { Doc } from '@dxos/echo-doc';
-import { QuerySandbox } from '@dxos/echo-query';
+import { QuerySandbox } from '@dxos/echo-query/sandbox';
 import { createObject } from '@dxos/react-client/echo';
 import { Panel, Toolbar, useAsyncEffect } from '@dxos/react-ui';
 import { JsonHighlighter } from '@dxos/react-ui-syntax-highlighter';

package/src/components/QueryEditor/QueryEditor.tsx

@@ -5,6 +5,7 @@
 import React, { useState } from 'react';
 import { ModuleResolutionKind, ScriptTarget } from 'typescript';
 
+// TODO(burdon): Document.
 import queryApi from '@dxos/echo-query/api.d.ts?raw';
 import { useAsyncEffect } from '@dxos/react-ui';
 

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

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Atom, Registry } from '@effect-atom/atom-react';
+import { Atom, Registry } from '@effect-atom/atom';
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useMemo } from 'react';
 

package/src/components/ScriptToolbar/ScriptToolbar.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Atom } from '@effect-atom/atom-react';
+import { Atom } from '@effect-atom/atom';
 import React, { useMemo } from 'react';
 
 import { AppSurface } from '@dxos/app-toolkit/ui';