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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-script",
-  "version": "0.8.4-main.72ec0f3",
+  "version": "0.8.4-main.7ace549",
   "description": "Braneframe notebook plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -65,55 +65,56 @@
     "prettier": "^3.6.2",
     "react-syntax-highlighter": "^15.6.1",
     "typescript": "^5.9.3",
-    "@dxos/ai": "0.8.4-main.72ec0f3",
-    "@dxos/app-framework": "0.8.4-main.72ec0f3",
-    "@dxos/assistant": "0.8.4-main.72ec0f3",
-    "@dxos/assistant-toolkit": "0.8.4-main.72ec0f3",
-    "@dxos/async": "0.8.4-main.72ec0f3",
-    "@dxos/blueprints": "0.8.4-main.72ec0f3",
-    "@dxos/client-protocol": "0.8.4-main.72ec0f3",
-    "@dxos/client": "0.8.4-main.72ec0f3",
-    "@dxos/compute": "0.8.4-main.72ec0f3",
-    "@dxos/echo": "0.8.4-main.72ec0f3",
-    "@dxos/debug": "0.8.4-main.72ec0f3",
-    "@dxos/devtools": "0.8.4-main.72ec0f3",
-    "@dxos/echo-protocol": "0.8.4-main.72ec0f3",
-    "@dxos/functions-runtime": "0.8.4-main.72ec0f3",
-    "@dxos/keys": "0.8.4-main.72ec0f3",
-    "@dxos/functions": "0.8.4-main.72ec0f3",
-    "@dxos/invariant": "0.8.4-main.72ec0f3",
-    "@dxos/live-object": "0.8.4-main.72ec0f3",
-    "@dxos/log": "0.8.4-main.72ec0f3",
-    "@dxos/local-storage": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-assistant": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-automation": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-client": "0.8.4-main.72ec0f3",
-    "@dxos/echo-query": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-deck": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-markdown": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-space": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-graph": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-stack": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-theme": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-explorer": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-token-manager": "0.8.4-main.72ec0f3",
-    "@dxos/protocols": "0.8.4-main.72ec0f3",
-    "@dxos/react-client": "0.8.4-main.72ec0f3",
-    "@dxos/react-edge-client": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-attention": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-components": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-editor": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-form": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-menu": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-stack": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-list": "0.8.4-main.72ec0f3",
-    "@dxos/rpc-tunnel": "0.8.4-main.72ec0f3",
-    "@dxos/schema": "0.8.4-main.72ec0f3",
-    "@dxos/util": "0.8.4-main.72ec0f3",
-    "@dxos/vendor-quickjs": "0.8.4-main.72ec0f3",
-    "@dxos/types": "0.8.4-main.72ec0f3",
-    "@dxos/rpc": "0.8.4-main.72ec0f3"
+    "@dxos/ai": "0.8.4-main.7ace549",
+    "@dxos/assistant": "0.8.4-main.7ace549",
+    "@dxos/assistant-toolkit": "0.8.4-main.7ace549",
+    "@dxos/app-framework": "0.8.4-main.7ace549",
+    "@dxos/async": "0.8.4-main.7ace549",
+    "@dxos/client": "0.8.4-main.7ace549",
+    "@dxos/blueprints": "0.8.4-main.7ace549",
+    "@dxos/client-protocol": "0.8.4-main.7ace549",
+    "@dxos/debug": "0.8.4-main.7ace549",
+    "@dxos/devtools": "0.8.4-main.7ace549",
+    "@dxos/compute": "0.8.4-main.7ace549",
+    "@dxos/echo": "0.8.4-main.7ace549",
+    "@dxos/echo-db": "0.8.4-main.7ace549",
+    "@dxos/echo-protocol": "0.8.4-main.7ace549",
+    "@dxos/echo-query": "0.8.4-main.7ace549",
+    "@dxos/functions": "0.8.4-main.7ace549",
+    "@dxos/functions-runtime": "0.8.4-main.7ace549",
+    "@dxos/keys": "0.8.4-main.7ace549",
+    "@dxos/invariant": "0.8.4-main.7ace549",
+    "@dxos/live-object": "0.8.4-main.7ace549",
+    "@dxos/local-storage": "0.8.4-main.7ace549",
+    "@dxos/plugin-assistant": "0.8.4-main.7ace549",
+    "@dxos/plugin-automation": "0.8.4-main.7ace549",
+    "@dxos/plugin-client": "0.8.4-main.7ace549",
+    "@dxos/plugin-deck": "0.8.4-main.7ace549",
+    "@dxos/log": "0.8.4-main.7ace549",
+    "@dxos/plugin-explorer": "0.8.4-main.7ace549",
+    "@dxos/plugin-graph": "0.8.4-main.7ace549",
+    "@dxos/plugin-markdown": "0.8.4-main.7ace549",
+    "@dxos/plugin-stack": "0.8.4-main.7ace549",
+    "@dxos/plugin-theme": "0.8.4-main.7ace549",
+    "@dxos/plugin-token-manager": "0.8.4-main.7ace549",
+    "@dxos/plugin-space": "0.8.4-main.7ace549",
+    "@dxos/protocols": "0.8.4-main.7ace549",
+    "@dxos/react-edge-client": "0.8.4-main.7ace549",
+    "@dxos/react-ui-attention": "0.8.4-main.7ace549",
+    "@dxos/react-ui-components": "0.8.4-main.7ace549",
+    "@dxos/react-client": "0.8.4-main.7ace549",
+    "@dxos/react-ui-editor": "0.8.4-main.7ace549",
+    "@dxos/react-ui-form": "0.8.4-main.7ace549",
+    "@dxos/react-ui-menu": "0.8.4-main.7ace549",
+    "@dxos/react-ui-stack": "0.8.4-main.7ace549",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.7ace549",
+    "@dxos/rpc": "0.8.4-main.7ace549",
+    "@dxos/schema": "0.8.4-main.7ace549",
+    "@dxos/types": "0.8.4-main.7ace549",
+    "@dxos/util": "0.8.4-main.7ace549",
+    "@dxos/react-ui-list": "0.8.4-main.7ace549",
+    "@dxos/rpc-tunnel": "0.8.4-main.7ace549",
+    "@dxos/vendor-quickjs": "0.8.4-main.7ace549"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.3.4",
@@ -124,12 +125,12 @@
     "react": "~19.2.0",
     "react-dom": "~19.2.0",
     "vite": "7.1.9",
-    "@dxos/echo-db": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-automation": "0.8.4-main.72ec0f3",
-    "@dxos/random": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3",
-    "@dxos/storybook-utils": "0.8.4-main.72ec0f3"
+    "@dxos/echo-db": "0.8.4-main.7ace549",
+    "@dxos/plugin-automation": "0.8.4-main.7ace549",
+    "@dxos/random": "0.8.4-main.7ace549",
+    "@dxos/react-ui": "0.8.4-main.7ace549",
+    "@dxos/react-ui-theme": "0.8.4-main.7ace549",
+    "@dxos/storybook-utils": "0.8.4-main.7ace549"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.3.4",
@@ -137,8 +138,8 @@
     "effect": "^3.13.3",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3"
+    "@dxos/react-ui": "0.8.4-main.7ace549",
+    "@dxos/react-ui-theme": "0.8.4-main.7ace549"
   },
   "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,31 +73,11 @@ 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,

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,24 +63,21 @@ 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);
+        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);
           setQueryValues((prev) => ({ ...prev, [cell.name!]: objectIds }));

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>
       );
 

package/src/components/ScriptContainer.tsx

@@ -4,8 +4,9 @@
 
 import React, { useMemo } from 'react';
 
+import { createDocAccessor } from '@dxos/echo-db';
 import { type Script } from '@dxos/functions';
-import { createDocAccessor, getSpace } from '@dxos/react-client/echo';
+import { getSpace } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { createDataExtensions, listener, stackItemContentEditorClassNames } from '@dxos/react-ui-editor';
 import { StackItem } from '@dxos/react-ui-stack';
@@ -42,7 +43,7 @@ export const ScriptContainer = ({ role, script, settings = { editorInputMode: 'v
             createDataExtensions({
               id: script.id,
               text: createDocAccessor(script.source.target, ['content']),
-              space,
+              messenger: space,
               identity,
             }),
           ]

package/src/components/Settings/ScriptObjectSettings.tsx

@@ -9,11 +9,12 @@ import { ToolId } from '@dxos/ai';
 import { SettingsAction, createIntent } from '@dxos/app-framework';
 import { useIntentDispatcher } from '@dxos/app-framework/react';
 import { Blueprint, Template } from '@dxos/blueprints';
+import { Filter, Obj, Ref } from '@dxos/echo';
 import { Function, type Script, getUserFunctionIdInMetadata } from '@dxos/functions';
 import { getInvocationUrl } from '@dxos/functions-runtime';
 import { log } from '@dxos/log';
 import { useClient } from '@dxos/react-client';
-import { Filter, Ref, getMeta, getSpace, useQuery } from '@dxos/react-client/echo';
+import { getSpace, useQuery } from '@dxos/react-client/echo';
 import { Button, Clipboard, Input, useAsyncEffect, useControlledState, useTranslation } from '@dxos/react-ui';
 import { AccessToken } from '@dxos/types';
 import { kebabize } from '@dxos/util';
@@ -144,7 +145,7 @@ const Binding = ({ object }: ScriptObjectSettingsProps) => {
   const space = getSpace(object);
   const [fn] = useQuery(space, Filter.type(Function.Function, { source: Ref.make(object) }));
 
-  const functionId = fn && getUserFunctionIdInMetadata(getMeta(fn));
+  const functionId = fn && getUserFunctionIdInMetadata(Obj.getMeta(fn));
   const functionUrl =
     functionId &&
     getInvocationUrl(functionId, client.config.values.runtime?.services?.edge?.url ?? '', {
@@ -207,7 +208,7 @@ const Publishing = ({ object }: ScriptObjectSettingsProps) => {
   const { dispatchPromise: dispatch } = useIntentDispatcher();
   const space = getSpace(object);
   const [githubToken] = useQuery(space, Filter.type(AccessToken.AccessToken, { source: 'github.com' }));
-  const gistKey = getMeta(object).keys.find(({ source }) => source === 'github.com');
+  const gistKey = Obj.getMeta(object).keys.find(({ source }) => source === 'github.com');
   const [gistUrl, setGistUrl] = useState<string | undefined>();
 
   useAsyncEffect(async () => {
@@ -250,7 +251,7 @@ const Publishing = ({ object }: ScriptObjectSettingsProps) => {
 
     try {
       // TODO(wittjosiah): Factor out to intent.
-      const meta = getMeta(object);
+      const meta = Obj.getMeta(object);
       const githubKey = meta.keys.find(({ source }) => source === 'github.com');
       const gistId = githubKey?.id;
       if (gistId) {

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

@@ -5,7 +5,7 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useCallback, useMemo, useState } from 'react';
 
-import { createDocAccessor } from '@dxos/react-client/echo';
+import { createDocAccessor } from '@dxos/echo-db';
 import { createObject } from '@dxos/react-client/echo';
 import { Toolbar } from '@dxos/react-ui';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';

package/src/hooks/deploy.ts

@@ -4,10 +4,11 @@
 
 import { useEffect, useMemo } from 'react';
 
+import { Obj, Query, Ref } from '@dxos/echo';
 import { Function, type Script, getUserFunctionIdInMetadata } from '@dxos/functions';
 import { log } from '@dxos/log';
 import { type Client, useClient } from '@dxos/react-client';
-import { Query, Ref, type Space, getMeta, getSpace, useQuery } from '@dxos/react-client/echo';
+import { type Space, getSpace, useQuery } from '@dxos/react-client/echo';
 import { type TFunction } from '@dxos/react-ui';
 import { createMenuAction } from '@dxos/react-ui-menu';
 import { errorMessageColors } from '@dxos/react-ui-theme';
@@ -119,6 +120,6 @@ export const useDeployDeps = ({ script }: { script: Script.Script }) => {
   const client = useClient();
   const space = getSpace(script);
   const [fn] = useQuery(space, Query.type(Function.Function, { source: Ref.make(script) }));
-  const existingFunctionId = useMemo(() => fn && getUserFunctionIdInMetadata(getMeta(fn)), [fn]);
+  const existingFunctionId = useMemo(() => fn && getUserFunctionIdInMetadata(Obj.getMeta(fn)), [fn]);
   return { client, space, fn, existingFunctionId };
 };

package/src/translations.ts

@@ -19,6 +19,7 @@ export const translations = [
         'object name placeholder': 'New script',
         'rename object label': 'Rename script',
         'delete object label': 'Delete script',
+        'object deleted label': 'Script deleted',
       },
       [Notebook.Notebook.typename]: {
         'typename label': 'Notebook',
@@ -28,6 +29,7 @@ export const translations = [
         'object name placeholder': 'New notebook',
         'rename object label': 'Rename notebook',
         'delete object label': 'Delete notebook',
+        'object deleted label': 'Notebook deleted',
       },
       [meta.id]: {
         'plugin name': 'Scripts',

package/src/types/Notebook.ts

@@ -6,9 +6,10 @@ import * as Schema from 'effect/Schema';
 
 import { Prompt } from '@dxos/blueprints';
 import { Obj, Type } from '@dxos/echo';
-import { FormAnnotation } from '@dxos/echo/internal';
+import { FormInputAnnotation } from '@dxos/echo/internal';
 import { LabelAnnotation } from '@dxos/echo/internal';
-import { Text, View } from '@dxos/schema';
+import { Graph } from '@dxos/plugin-explorer/types';
+import { Text } from '@dxos/schema';
 
 export type CellType = 'markdown' | 'script' | 'query' | 'prompt' | 'view';
 
@@ -19,7 +20,7 @@ const Cell_ = Schema.Struct({
   // TODO(burdon): Union type.
   source: Schema.optional(Type.Ref(Text.Text)),
   prompt: Schema.optional(Type.Ref(Prompt.Prompt)),
-  view: Schema.optional(Type.Ref(View.View)),
+  graph: Schema.optional(Type.Ref(Graph.Graph)),
 }).pipe(Schema.mutable);
 export interface Cell extends Schema.Schema.Type<typeof Cell_> {}
 export interface Cell_Encoded extends Schema.Schema.Encoded<typeof Cell_> {}
@@ -27,7 +28,7 @@ export const Cell: Schema.Schema<Cell, Cell_Encoded> = Cell_;
 
 export const Notebook = Schema.Struct({
   name: Schema.String.pipe(Schema.optional),
-  cells: Cell.pipe(Schema.Array, Schema.mutable, FormAnnotation.set(false)),
+  cells: Cell.pipe(Schema.Array, Schema.mutable, FormInputAnnotation.set(false)),
 }).pipe(
   Type.Obj({
     typename: 'dxos.org/type/Notebook',

package/src/util/deploy.ts

@@ -5,11 +5,10 @@
 import { type Client } from '@dxos/client';
 import { Obj, Ref } from '@dxos/echo';
 import { Function, type Script, getUserFunctionIdInMetadata, setUserFunctionIdInMetadata } from '@dxos/functions';
-import { Bundler } from '@dxos/functions-runtime/bundler';
+import { bundleFunction } from '@dxos/functions-runtime/bundler';
 import { incrementSemverPatch, uploadWorkerFunction } from '@dxos/functions-runtime/edge';
 import { log } from '@dxos/log';
 import { type Space } from '@dxos/react-client/echo';
-import { isNode } from '@dxos/util';
 
 import { updateFunctionMetadata } from './functions';
 
@@ -44,8 +43,9 @@ export const deployScript = async ({
   }
 
   try {
-    const bundler = new Bundler({ platform: isNode() ? 'node' : 'browser', sandboxedModules: [], remoteModules: {} });
-    const buildResult = await bundler.bundle({ source: script.source!.target!.content });
+    const buildResult = await bundleFunction({
+      source: script.source!.target!.content,
+    });
     if ('error' in buildResult) {
       throw buildResult.error || new Error('Bundle creation failed');
     }

package/src/util/functions.ts

@@ -2,12 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
+import { Obj } from '@dxos/echo';
 import { type Function, type Script, getUserFunctionIdInMetadata } from '@dxos/functions';
 import { getInvocationUrl } from '@dxos/functions-runtime';
 import { type PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { type Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
-import { getMeta, getSpace } from '@dxos/react-client/echo';
+import { getSpace } from '@dxos/react-client/echo';
 /**
  * Get the function URL for a given script and client configuration
  */
@@ -21,7 +22,7 @@ export const getFunctionUrl = ({
   edgeUrl: string;
 }): string | undefined => {
   const space = getSpace(script);
-  const existingFunctionId = fn && getUserFunctionIdInMetadata(getMeta(fn));
+  const existingFunctionId = fn && getUserFunctionIdInMetadata(Obj.getMeta(fn));
 
   if (!existingFunctionId) {
     return undefined;