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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-script",
-  "version": "0.8.4-main.2c6827d",
+  "version": "0.8.4-main.3c1ae3b",
   "description": "Braneframe notebook plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -58,62 +58,65 @@
     "@preact/signals-core": "^1.12.1",
     "@typescript/vfs": "^1.6.0",
     "@valtown/codemirror-continue": "^2.3.1",
-    "@valtown/codemirror-ts": "^2.2.0",
+    "@valtown/codemirror-ts": "^2.3.1",
     "codemirror": "^6.0.1",
     "date-fns": "^3.3.1",
     "esbuild-wasm": "^0.16.14",
     "prettier": "^3.6.2",
     "react-syntax-highlighter": "^15.6.1",
     "typescript": "^5.9.3",
-    "@dxos/ai": "0.8.4-main.2c6827d",
-    "@dxos/assistant-toolkit": "0.8.4-main.2c6827d",
-    "@dxos/app-framework": "0.8.4-main.2c6827d",
-    "@dxos/assistant": "0.8.4-main.2c6827d",
-    "@dxos/async": "0.8.4-main.2c6827d",
-    "@dxos/blueprints": "0.8.4-main.2c6827d",
-    "@dxos/compute": "0.8.4-main.2c6827d",
-    "@dxos/debug": "0.8.4-main.2c6827d",
-    "@dxos/client-protocol": "0.8.4-main.2c6827d",
-    "@dxos/echo": "0.8.4-main.2c6827d",
-    "@dxos/devtools": "0.8.4-main.2c6827d",
-    "@dxos/client": "0.8.4-main.2c6827d",
-    "@dxos/echo-protocol": "0.8.4-main.2c6827d",
-    "@dxos/echo-query": "0.8.4-main.2c6827d",
-    "@dxos/functions-runtime": "0.8.4-main.2c6827d",
-    "@dxos/functions": "0.8.4-main.2c6827d",
-    "@dxos/invariant": "0.8.4-main.2c6827d",
-    "@dxos/live-object": "0.8.4-main.2c6827d",
-    "@dxos/local-storage": "0.8.4-main.2c6827d",
-    "@dxos/log": "0.8.4-main.2c6827d",
-    "@dxos/keys": "0.8.4-main.2c6827d",
-    "@dxos/plugin-assistant": "0.8.4-main.2c6827d",
-    "@dxos/plugin-automation": "0.8.4-main.2c6827d",
-    "@dxos/plugin-client": "0.8.4-main.2c6827d",
-    "@dxos/plugin-explorer": "0.8.4-main.2c6827d",
-    "@dxos/plugin-deck": "0.8.4-main.2c6827d",
-    "@dxos/plugin-graph": "0.8.4-main.2c6827d",
-    "@dxos/plugin-space": "0.8.4-main.2c6827d",
-    "@dxos/plugin-markdown": "0.8.4-main.2c6827d",
-    "@dxos/plugin-theme": "0.8.4-main.2c6827d",
-    "@dxos/plugin-stack": "0.8.4-main.2c6827d",
-    "@dxos/plugin-token-manager": "0.8.4-main.2c6827d",
-    "@dxos/protocols": "0.8.4-main.2c6827d",
-    "@dxos/react-edge-client": "0.8.4-main.2c6827d",
-    "@dxos/react-ui-components": "0.8.4-main.2c6827d",
-    "@dxos/react-ui-editor": "0.8.4-main.2c6827d",
-    "@dxos/react-ui-attention": "0.8.4-main.2c6827d",
-    "@dxos/react-ui-form": "0.8.4-main.2c6827d",
-    "@dxos/react-ui-list": "0.8.4-main.2c6827d",
-    "@dxos/react-ui-menu": "0.8.4-main.2c6827d",
-    "@dxos/react-ui-stack": "0.8.4-main.2c6827d",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.2c6827d",
-    "@dxos/rpc": "0.8.4-main.2c6827d",
-    "@dxos/rpc-tunnel": "0.8.4-main.2c6827d",
-    "@dxos/react-client": "0.8.4-main.2c6827d",
-    "@dxos/schema": "0.8.4-main.2c6827d",
-    "@dxos/types": "0.8.4-main.2c6827d",
-    "@dxos/vendor-quickjs": "0.8.4-main.2c6827d",
-    "@dxos/util": "0.8.4-main.2c6827d"
+    "@dxos/app-framework": "0.8.4-main.3c1ae3b",
+    "@dxos/ai": "0.8.4-main.3c1ae3b",
+    "@dxos/async": "0.8.4-main.3c1ae3b",
+    "@dxos/assistant": "0.8.4-main.3c1ae3b",
+    "@dxos/blueprints": "0.8.4-main.3c1ae3b",
+    "@dxos/assistant-toolkit": "0.8.4-main.3c1ae3b",
+    "@dxos/client-protocol": "0.8.4-main.3c1ae3b",
+    "@dxos/client": "0.8.4-main.3c1ae3b",
+    "@dxos/compute": "0.8.4-main.3c1ae3b",
+    "@dxos/config": "0.8.4-main.3c1ae3b",
+    "@dxos/debug": "0.8.4-main.3c1ae3b",
+    "@dxos/echo": "0.8.4-main.3c1ae3b",
+    "@dxos/echo-db": "0.8.4-main.3c1ae3b",
+    "@dxos/devtools": "0.8.4-main.3c1ae3b",
+    "@dxos/echo-protocol": "0.8.4-main.3c1ae3b",
+    "@dxos/echo-query": "0.8.4-main.3c1ae3b",
+    "@dxos/functions": "0.8.4-main.3c1ae3b",
+    "@dxos/functions-simulator-cloudflare": "0.8.4-main.3c1ae3b",
+    "@dxos/invariant": "0.8.4-main.3c1ae3b",
+    "@dxos/functions-runtime": "0.8.4-main.3c1ae3b",
+    "@dxos/keys": "0.8.4-main.3c1ae3b",
+    "@dxos/live-object": "0.8.4-main.3c1ae3b",
+    "@dxos/local-storage": "0.8.4-main.3c1ae3b",
+    "@dxos/log": "0.8.4-main.3c1ae3b",
+    "@dxos/plugin-automation": "0.8.4-main.3c1ae3b",
+    "@dxos/plugin-assistant": "0.8.4-main.3c1ae3b",
+    "@dxos/plugin-deck": "0.8.4-main.3c1ae3b",
+    "@dxos/plugin-client": "0.8.4-main.3c1ae3b",
+    "@dxos/plugin-explorer": "0.8.4-main.3c1ae3b",
+    "@dxos/plugin-graph": "0.8.4-main.3c1ae3b",
+    "@dxos/plugin-markdown": "0.8.4-main.3c1ae3b",
+    "@dxos/plugin-space": "0.8.4-main.3c1ae3b",
+    "@dxos/plugin-theme": "0.8.4-main.3c1ae3b",
+    "@dxos/plugin-stack": "0.8.4-main.3c1ae3b",
+    "@dxos/plugin-token-manager": "0.8.4-main.3c1ae3b",
+    "@dxos/protocols": "0.8.4-main.3c1ae3b",
+    "@dxos/react-client": "0.8.4-main.3c1ae3b",
+    "@dxos/react-ui-components": "0.8.4-main.3c1ae3b",
+    "@dxos/react-ui-attention": "0.8.4-main.3c1ae3b",
+    "@dxos/react-ui-editor": "0.8.4-main.3c1ae3b",
+    "@dxos/react-ui-list": "0.8.4-main.3c1ae3b",
+    "@dxos/react-ui-menu": "0.8.4-main.3c1ae3b",
+    "@dxos/react-ui-form": "0.8.4-main.3c1ae3b",
+    "@dxos/react-ui-stack": "0.8.4-main.3c1ae3b",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.3c1ae3b",
+    "@dxos/rpc": "0.8.4-main.3c1ae3b",
+    "@dxos/react-edge-client": "0.8.4-main.3c1ae3b",
+    "@dxos/types": "0.8.4-main.3c1ae3b",
+    "@dxos/schema": "0.8.4-main.3c1ae3b",
+    "@dxos/rpc-tunnel": "0.8.4-main.3c1ae3b",
+    "@dxos/util": "0.8.4-main.3c1ae3b",
+    "@dxos/vendor-quickjs": "0.8.4-main.3c1ae3b"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.3.4",
@@ -124,12 +127,13 @@
     "react": "~19.2.0",
     "react-dom": "~19.2.0",
     "vite": "7.1.9",
-    "@dxos/echo-db": "0.8.4-main.2c6827d",
-    "@dxos/plugin-automation": "0.8.4-main.2c6827d",
-    "@dxos/random": "0.8.4-main.2c6827d",
-    "@dxos/react-ui": "0.8.4-main.2c6827d",
-    "@dxos/react-ui-theme": "0.8.4-main.2c6827d",
-    "@dxos/storybook-utils": "0.8.4-main.2c6827d"
+    "@dxos/config": "0.8.4-main.3c1ae3b",
+    "@dxos/echo-db": "0.8.4-main.3c1ae3b",
+    "@dxos/plugin-automation": "0.8.4-main.3c1ae3b",
+    "@dxos/random": "0.8.4-main.3c1ae3b",
+    "@dxos/react-ui": "0.8.4-main.3c1ae3b",
+    "@dxos/react-ui-theme": "0.8.4-main.3c1ae3b",
+    "@dxos/storybook-utils": "0.8.4-main.3c1ae3b"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.3.4",
@@ -137,8 +141,8 @@
     "effect": "^3.13.3",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "@dxos/react-ui-theme": "0.8.4-main.2c6827d",
-    "@dxos/react-ui": "0.8.4-main.2c6827d"
+    "@dxos/react-ui-theme": "0.8.4-main.3c1ae3b",
+    "@dxos/react-ui": "0.8.4-main.3c1ae3b"
   },
   "publishConfig": {
     "access": "public"

package/src/ScriptPlugin.tsx

@@ -5,9 +5,8 @@
 import { Capabilities, Events, contributes, createIntent, defineModule, definePlugin } from '@dxos/app-framework';
 import { Ref } from '@dxos/echo';
 import { Script } from '@dxos/functions';
-import { ClientEvents } from '@dxos/plugin-client';
-import { SpaceCapabilities } from '@dxos/plugin-space';
-import { defineObjectForm } from '@dxos/plugin-space/types';
+import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
+import { type CreateObjectIntent } from '@dxos/plugin-space/types';
 
 import {
   AppGraphBuilder,
@@ -49,6 +48,10 @@ export const ScriptPlugin = definePlugin(meta, () => [
           iconHue: 'sky',
           // TODO(wittjosiah): Move out of metadata.
           loadReferences: async (script: Script.Script) => await Ref.Array.loadAll([script.source]),
+          inputSchema: ScriptAction.ScriptProps,
+          createObjectIntent: ((props, options) =>
+            createIntent(ScriptAction.CreateScript, { ...props, space: options.space })) satisfies CreateObjectIntent,
+          addToCollectionOnCreate: true,
         },
       }),
       contributes(Capabilities.Metadata, {
@@ -56,6 +59,10 @@ export const ScriptPlugin = definePlugin(meta, () => [
         metadata: {
           icon: 'ph--notebook--regular',
           iconHue: 'sky',
+          inputSchema: ScriptAction.NotebookProps,
+          createObjectIntent: ((props, options) =>
+            createIntent(ScriptAction.CreateNotebook, { ...props, space: options.space })) satisfies CreateObjectIntent,
+          addToCollectionOnCreate: true,
         },
       }),
     ],
@@ -66,36 +73,14 @@ export const ScriptPlugin = definePlugin(meta, () => [
     activate: AppGraphBuilder,
   }),
   defineModule({
-    id: `${meta.id}/module/script/object-form`,
+    id: `${meta.id}/module/schema`,
     activatesOn: ClientEvents.SetupSchema,
-    activate: () =>
-      contributes(
-        SpaceCapabilities.ObjectForm,
-        defineObjectForm({
-          objectSchema: Script.Script,
-          formSchema: ScriptAction.ScriptProps,
-          getIntent: (props, options) => createIntent(ScriptAction.CreateScript, { ...props, space: options.space }),
-        }),
-      ),
-  }),
-  defineModule({
-    id: `${meta.id}/module/notebook/object-form`,
-    activatesOn: ClientEvents.SetupSchema,
-    activate: () =>
-      contributes(
-        SpaceCapabilities.ObjectForm,
-        defineObjectForm({
-          objectSchema: Notebook.Notebook,
-          formSchema: ScriptAction.NotebookProps,
-          getIntent: (props, options) => createIntent(ScriptAction.CreateNotebook, { ...props, space: options.space }),
-        }),
-      ),
+    activate: () => contributes(ClientCapabilities.Schema, [Script.Script]),
   }),
+
   defineModule({
     id: `${meta.id}/module/react-surface`,
     activatesOn: Events.SetupReactSurface,
-    // TODO(wittjosiah): Should occur before the script editor is loaded when surfaces activation is more granular.
-    activatesBefore: [ScriptEvents.SetupCompiler],
     activate: ReactSurface,
   }),
   defineModule({

package/src/capabilities/artifact-definition.ts

@@ -54,7 +54,7 @@ export default () => {
         The description is used by AI to understand the script and its purpose.
         The description must provide cases on when the script should be used.
 
-      Schema: 
+      Schema:
         The schema is defined using a schema-DSL library called Effect Schema.
         The input schema describes the arguments that the script accepts.
         The output schema describes the result that the script produces.
@@ -75,18 +75,18 @@ export default () => {
         - Detailed output schema
 
       <apis>
-        export function defineFunction(params: { 
-          description: string, 
-          inputSchema: Schema.Schema, 
-          outputSchema: Schema.Schema, 
-          handler: (params: { event: { data: TInput } }) => Promise<TOutput> 
+        export function defineFunction(params: {
+          description: string,
+          inputSchema: Schema.Schema,
+          outputSchema: Schema.Schema,
+          handler: (params: { event: { data: TInput } }) => Promise<TOutput>
         }): FunctionDefinition
         /**
          * Effect Schema
          */
-        export const Schema; 
+        export const Schema;
 
-        // Examples: 
+        // Examples:
 
         Schema.String
         Schema.Number
@@ -112,7 +112,7 @@ export default () => {
 
         The function must return the result that matches the output schema.
       </handler_function>
-      
+
       <example>
         import { defineFunction, S } from 'dxos:functions';
 
@@ -181,7 +181,7 @@ export default () => {
         execute: async ({ id }, { extensions }) => {
           invariant(extensions?.space, 'No space');
 
-          const script = (await extensions.space.db.query(Filter.ids(id)).first()) as ScriptType;
+          const script = (await extensions.space.db.query(Filter.id(id)).first()) as ScriptType;
           const { content } = await script.source.load();
 
           return ToolResult.Success({
@@ -203,7 +203,7 @@ export default () => {
         execute: async ({ id, code }, { extensions }) => {
           invariant(extensions?.space, 'No space');
 
-          const script = (await extensions.space.db.query(Filter.ids(id)).first()) as ScriptType;
+          const script = (await extensions.space.db.query(Filter.id(id)).first()) as ScriptType;
           const source = await script.source.load();
           if (!source) {
             return ToolResult.Error('Script not found');

package/src/capabilities/compiler.ts

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

package/src/capabilities/react-surface.tsx

@@ -24,11 +24,10 @@ import {
   ScriptProperties,
   TestContainer,
 } from '../components';
+import { useCompiler } from '../hooks';
 import { meta } from '../meta';
 import { Notebook, type ScriptSettings } from '../types';
 
-import { ScriptCapabilities } from './capabilities';
-
 export default () =>
   contributes(Capabilities.ReactSurface, [
     createSurface({
@@ -43,10 +42,10 @@ export default () =>
       role: ['article', 'section'],
       filter: (data): data is { subject: Script.Script } => Obj.instanceOf(Script.Script, data.subject),
       component: ({ data, role }) => {
-        const compiler = useCapability(ScriptCapabilities.Compiler);
+        const compiler = useCompiler();
         // TODO(dmaretskyi): Since settings store is not reactive, this would break on the script plugin being enabled without a page reload.
         const settings = useCapability(Capabilities.SettingsStore).getStore<ScriptSettings>(meta.id)?.value;
-        return <ScriptContainer role={role} script={data.subject} settings={settings} env={compiler.environment} />;
+        return <ScriptContainer role={role} script={data.subject} settings={settings} env={compiler?.environment} />;
       },
     }),
     createSurface({
@@ -54,8 +53,8 @@ export default () =>
       role: 'article',
       filter: (data): data is { subject: Notebook.Notebook } => Obj.instanceOf(Notebook.Notebook, data.subject),
       component: ({ data, role }) => {
-        const compiler = useCapability(ScriptCapabilities.Compiler);
-        return <NotebookContainer role={role} notebook={data.subject} env={compiler.environment} />;
+        const compiler = useCompiler();
+        return <NotebookContainer role={role} notebook={data.subject} env={compiler?.environment} />;
       },
     }),
     // TODO(burdon): Standardize PluginSettings vs ObjectSettings.

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/FrameContainer/FrameContainer.tsx

@@ -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.tsx

@@ -22,7 +22,7 @@ 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 { Text } from '@dxos/schema';
+import { Text, View } from '@dxos/schema';
 import { isNonNullable } from '@dxos/util';
 
 import { meta } from '../meta';
@@ -63,26 +63,23 @@ export const NotebookContainer = ({ notebook, env }: NotebookContainerProps) =>
           const { name, filter } = builder.build(source);
           if (filter) {
             const ast = Query.select(filter).ast;
-            const view = cell.view?.target;
-            if (!view) {
-              const graph = Graph.make({ query: { ast } });
-              const { view } = await Graph.makeView({
-                space,
-                presentation: graph,
-              });
-              cell.view = Ref.make(view);
+            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;
             } else {
-              view.query.ast = ast;
+              graph.query.ast = ast;
             }
           }
         }
 
-        if (cell.name && cell.view?.target) {
-          const view = Obj.getSnapshot(cell.view?.target);
-          const query = Query.fromAst(view.query.ast);
-          const result = await space?.db.query(query).run();
-          const objectIds = result?.objects?.map((obj) => obj.id);
+        if (cell.name && cell.graph?.target) {
+          const graph = Obj.getSnapshot(cell.graph?.target);
+          const query = Query.fromAst(graph.query.ast);
+          const objects = await space?.db.query(query).run();
+          const objectIds = objects?.map((obj) => obj.id);
           setQueryValues((prev) => ({ ...prev, [cell.name!]: objectIds }));
         }
       }
@@ -153,8 +150,8 @@ 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
+            const objects = await space.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 }));

package/src/components/NotebookStack/NotebookCell.tsx

@@ -5,9 +5,9 @@
 import React, { useCallback, useMemo } from 'react';
 
 import { Surface } from '@dxos/app-framework/react';
+import { createDocAccessor } from '@dxos/echo-db';
 import { invariant } from '@dxos/invariant';
 import { TemplateEditor } from '@dxos/plugin-assistant';
-import { createDocAccessor } from '@dxos/react-client/echo';
 import { type Space } from '@dxos/react-client/echo';
 import { useThemeContext, useTranslation } from '@dxos/react-ui';
 import { QueryEditor, type QueryEditorProps } from '@dxos/react-ui-components';
@@ -57,7 +57,7 @@ export const NotebookCell = ({ space, graph, dragging, cell, promptResults, env
       : [];
   }, [cell.source?.target]);
 
-  const view = cell.view?.target;
+  const explorerGraph = cell.graph?.target;
 
   const handleQueryChange = useCallback<NonNullable<QueryEditorProps['onChange']>>(
     (value: string) => {
@@ -113,7 +113,9 @@ export const NotebookCell = ({ space, graph, dragging, cell, promptResults, env
 
       // TODO(burdon): Remove app-framework deps (via render prop).
       return (
-        <div className={mx('bs-full overflow-hidden grid', view && !dragging && 'grid-rows-[min-content_1fr]')}>
+        <div
+          className={mx('bs-full overflow-hidden grid', explorerGraph && !dragging && 'grid-rows-[min-content_1fr]')}
+        >
           <QueryEditor
             id={cell.id}
             classNames={[editorStyles, 'border-be border-subduedSeparator']}
@@ -121,7 +123,7 @@ export const NotebookCell = ({ space, graph, dragging, cell, promptResults, env
             value={cell.source.target.content}
             onChange={handleQueryChange}
           />
-          {view && !dragging && <Surface role='section' limit={1} data={{ subject: view }} />}
+          {explorerGraph && !dragging && <Surface role='section' limit={1} data={{ subject: explorerGraph }} />}
         </div>
       );