@dxos/plugin-script 0.10.0 → 0.11.0

package/src/components/TestPanel/TestPanel.tsx

@@ -146,7 +146,7 @@ const MessageThread = forwardRef<HTMLDivElement, MessageThreadProps>(
       <ScrollArea.Root orientation='vertical' classNames='h-full' ref={forwardedRef}>
         <ScrollArea.Viewport classNames='gap-6 p-2'>
           {history.map((message, i) => (
-            <div key={i} className='grid grid-cols-[2rem_1fr_2rem]'>
+            <div key={i} className='grid grid-cols-[var(--dx-rail-item)_1fr_var(--dx-rail-item)]'>
               <div className='p-1'>{message.type === 'response' && <RobotAvatar />}</div>
               <div className='overflow-auto'>
                 <MessageItem message={message} />
@@ -155,7 +155,7 @@ const MessageThread = forwardRef<HTMLDivElement, MessageThreadProps>(
           ))}
 
           {state === 'pending' && (
-            <div className='grid grid-cols-[2rem_1fr_2rem]'>
+            <div className='grid grid-cols-[var(--dx-rail-item)_1fr_var(--dx-rail-item)]'>
               <div className='p-1'>
                 <Icon icon='ph--spinner--regular' size={6} classNames='animate-spin' />
               </div>

package/src/components/TypescriptEditor/TypescriptEditor.tsx

@@ -136,7 +136,7 @@ const createTooltipRenderer = (themeMode: ThemeMode) => {
       ) ?? [];
     return {
       dom: Domino.of('div')
-        .classNames('xs:max-w-80 max-w-lg p-1 bg-base-surface rounded-sm border border-separator')
+        .classNames('xs:max-w-80 max-w-lg p-1 dx-base-surface rounded-sm border border-separator')
         .append(...children).root,
     };
   };

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

@@ -8,10 +8,10 @@ import React, { useMemo } from 'react';
 import { ProcessManagerPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Obj } from '@dxos/echo';
+import { AccessToken } from '@dxos/link';
 import { ClientPlugin } from '@dxos/plugin-client/testing';
 import { Dialog } from '@dxos/react-ui';
 import { withTheme } from '@dxos/react-ui/testing';
-import { AccessToken } from '@dxos/types';
 
 import { translations } from '#translations';
 

package/src/containers/DeploymentDialog/DeploymentDialog.tsx

@@ -6,9 +6,9 @@ import React, { useEffect, useMemo } from 'react';
 
 import { useOperationInvoker } from '@dxos/app-framework/ui';
 import { LayoutOperation } from '@dxos/app-toolkit';
+import { type AccessToken } from '@dxos/link';
 import { getSpace } from '@dxos/react-client/echo';
 import { Button, Dialog, useTranslation } from '@dxos/react-ui';
-import { type AccessToken } from '@dxos/types';
 
 import { useCreateAndDeployScriptTemplates } from '#hooks';
 import { meta } from '#meta';
@@ -103,3 +103,5 @@ export const DeploymentDialog = ({ accessToken, scriptTemplates }: DeploymentDia
     </Dialog.Content>
   );
 };
+
+DeploymentDialog.displayName = 'DeploymentDialog';

package/src/containers/NotebookArticle/NotebookArticle.stories.tsx

@@ -12,6 +12,7 @@ import { AppSurface } from '@dxos/app-toolkit/ui';
 import { RunInstructions } from '@dxos/assistant-toolkit';
 import { Operation } from '@dxos/compute';
 import { Filter } from '@dxos/echo';
+import { useQuery } from '@dxos/echo-react';
 import { AssistantPlugin } from '@dxos/plugin-assistant/testing';
 import { ClientPlugin } from '@dxos/plugin-client/testing';
 import { initializeIdentity } from '@dxos/plugin-client/testing';
@@ -21,7 +22,6 @@ import { MarkdownPlugin } from '@dxos/plugin-markdown/testing';
 import { RoutinePlugin } from '@dxos/plugin-routine/testing';
 import { corePlugins } from '@dxos/plugin-testing';
 import { Config, useClient } from '@dxos/react-client';
-import { useQuery } from '@dxos/react-client/echo';
 import { withLayout } from '@dxos/react-ui/testing';
 import { DataTypes } from '@dxos/schema';
 

package/src/containers/NotebookArticle/NotebookArticle.tsx

@@ -173,7 +173,7 @@ export const NotebookArticle = ({ role, subject: notebook, attendableId, env }:
   );
 
   return (
-    <Panel.Root role={role} className='dx-document'>
+    <Panel.Root role={role} classNames='dx-document'>
       <Panel.Toolbar asChild>
         <Toolbar.Root disabled={!hasAttention}>
           <DropdownMenu.Root>
@@ -191,7 +191,7 @@ export const NotebookArticle = ({ role, subject: notebook, attendableId, env }:
           />
         </Toolbar.Root>
       </Panel.Toolbar>
-      <Panel.Content>
+      <Panel.Content asChild>
         <NotebookStack
           db={db}
           notebook={notebook}
@@ -231,3 +231,5 @@ const runPrompt = Effect.fn(function* ({
     },
   });
 });
+
+NotebookArticle.displayName = 'NotebookArticle';

package/src/containers/ScriptArticle/ScriptArticle.stories.tsx

@@ -12,11 +12,12 @@ import { Skill } from '@dxos/compute';
 import { Script } from '@dxos/compute';
 import { Operation } from '@dxos/compute';
 import { Filter } from '@dxos/echo';
+import { useQuery } from '@dxos/echo-react';
 import { ClientPlugin } from '@dxos/plugin-client/testing';
 import { initializeIdentity } from '@dxos/plugin-client/testing';
 import { StorybookPlugin, corePlugins } from '@dxos/plugin-testing';
 import { Config } from '@dxos/react-client';
-import { useQuery, useSpaces } from '@dxos/react-client/echo';
+import { useSpaces } from '@dxos/react-client/echo';
 import { Loading, withLayout, withTheme } from '@dxos/react-ui/testing';
 import { Text } from '@dxos/schema';
 

package/src/containers/ScriptArticle/ScriptArticle.tsx

@@ -8,8 +8,8 @@ import { type AppSurface } from '@dxos/app-toolkit/ui';
 import { type Script } from '@dxos/compute';
 import { Obj } from '@dxos/echo';
 import { Doc } from '@dxos/echo-doc';
+import { useIdentity } from '@dxos/halo-react';
 import { getSpace } from '@dxos/react-client/echo';
-import { useIdentity } from '@dxos/react-client/halo';
 import { Panel } from '@dxos/react-ui';
 import { createDataExtensions, editorClassNames, listener } from '@dxos/ui-editor';
 
@@ -83,3 +83,5 @@ export const ScriptArticle = ({
     </Panel.Root>
   );
 };
+
+ScriptArticle.displayName = 'ScriptArticle';

package/src/containers/ScriptProperties/FunctionBinding.tsx

@@ -6,11 +6,11 @@ import React, { type ChangeEvent, useCallback } from 'react';
 
 import { type Script } from '@dxos/compute';
 import { Operation } from '@dxos/compute';
+import { getUserFunctionIdInMetadata } from '@dxos/compute-runtime';
+import { getInvocationUrl } from '@dxos/compute-runtime';
 import { Filter, Obj, Ref } from '@dxos/echo';
-import { getUserFunctionIdInMetadata } from '@dxos/functions';
-import { getInvocationUrl } from '@dxos/functions-runtime';
+import { useQuery } from '@dxos/echo-react';
 import { useClient } from '@dxos/react-client';
-import { useQuery } from '@dxos/react-client/echo';
 import { Clipboard, Input, useControlledState, useTranslation } from '@dxos/react-ui';
 import { Form } from '@dxos/react-ui-form';
 
@@ -81,3 +81,5 @@ export const FunctionBinding = ({ object }: FunctionBindingProps) => {
     </div>
   );
 };
+
+FunctionBinding.displayName = 'FunctionBinding';

package/src/containers/ScriptProperties/FunctionPublishing.tsx

@@ -9,11 +9,11 @@ import { useOperationInvoker } from '@dxos/app-framework/ui';
 import { SettingsOperation } from '@dxos/app-toolkit';
 import { type Script } from '@dxos/compute';
 import { Filter, Obj } from '@dxos/echo';
+import { useQuery } from '@dxos/echo-react';
+import { AccessToken } from '@dxos/link';
 import { log } from '@dxos/log';
-import { useQuery } from '@dxos/react-client/echo';
 import { Button, Clipboard, Message, useAsyncEffect, useTranslation } from '@dxos/react-ui';
 import { Form } from '@dxos/react-ui-form';
-import { AccessToken } from '@dxos/types';
 import { kebabize } from '@dxos/util';
 
 import { meta } from '#meta';
@@ -119,3 +119,5 @@ export const FunctionPublishing = ({ object }: FunctionPublishingProps) => {
     </div>
   );
 };
+
+FunctionPublishing.displayName = 'FunctionPublishing';

package/src/containers/ScriptProperties/ScriptProperties.stories.tsx

@@ -11,10 +11,11 @@ import { Skill } from '@dxos/compute';
 import { Script } from '@dxos/compute';
 import { Operation } from '@dxos/compute';
 import { Filter } from '@dxos/echo';
+import { useQuery } from '@dxos/echo-react';
 import { ClientPlugin } from '@dxos/plugin-client/testing';
 import { initializeIdentity } from '@dxos/plugin-client/testing';
 import { StorybookPlugin, corePlugins } from '@dxos/plugin-testing';
-import { useQuery, useSpaces } from '@dxos/react-client/echo';
+import { useSpaces } from '@dxos/react-client/echo';
 import { ObjectProperties } from '@dxos/react-ui-form';
 import { Loading, withLayout, withTheme } from '@dxos/react-ui/testing';
 import { Text } from '@dxos/schema';

package/src/containers/ScriptProperties/ScriptProperties.tsx

@@ -29,3 +29,5 @@ export const ScriptProperties = ({ subject: object }: ScriptPropertiesProps) =>
     </>
   );
 };
+
+ScriptProperties.displayName = 'ScriptProperties';

package/src/containers/ScriptProperties/SkillEditor.tsx

@@ -9,7 +9,7 @@ import { Skill, Template } from '@dxos/compute';
 import { type Script } from '@dxos/compute';
 import { Operation } from '@dxos/compute';
 import { Filter, Obj, Ref } from '@dxos/echo';
-import { useQuery } from '@dxos/react-client/echo';
+import { useQuery } from '@dxos/echo-react';
 import { Button, Input, useAsyncEffect, useTranslation } from '@dxos/react-ui';
 import { Form } from '@dxos/react-ui-form';
 import { kebabize } from '@dxos/util';
@@ -100,3 +100,5 @@ export const SkillEditor = ({ object }: SkillEditorProps) => {
     </div>
   );
 };
+
+SkillEditor.displayName = 'SkillEditor';

package/src/containers/ScriptSettings/ScriptSettings.tsx

@@ -45,3 +45,5 @@ export const ScriptSettings = ({ settings, onSettingsChange, onAuthenticate }: S
     </Form.Root>
   );
 };
+
+ScriptSettings.displayName = 'ScriptSettings';

package/src/containers/TestContainer/TestContainer.tsx

@@ -7,7 +7,7 @@ import React, { useCallback, useMemo } from 'react';
 import { type Script } from '@dxos/compute';
 import { Context } from '@dxos/context';
 import { Obj } from '@dxos/echo';
-import { FunctionsServiceClient } from '@dxos/functions-runtime/edge';
+import { FunctionsServiceClient } from '@dxos/edge-compute';
 import { Panel } from '@dxos/react-ui';
 
 import { TestPanel } from '#components';
@@ -35,10 +35,12 @@ export const TestContainer = ({ role, script }: TestContainerProps) => {
   );
 
   return (
-    <Panel.Root role={role} className='dx-document'>
+    <Panel.Root role={role} classNames='dx-document'>
       <Panel.Content asChild>
         <TestPanel onInvoke={existingFunctionId ? handleInvoke : undefined} />
       </Panel.Content>
     </Panel.Root>
   );
 };
+
+TestContainer.displayName = 'TestContainer';

package/src/e2e/ai.test.ts

@@ -10,8 +10,8 @@ import { type Space } from '@dxos/client-protocol';
 import { Operation } from '@dxos/compute';
 import { configPreset } from '@dxos/config';
 import { Context } from '@dxos/context';
-import { FunctionsServiceClient } from '@dxos/functions-runtime/edge';
-import { bundleFunction } from '@dxos/functions-runtime/native';
+import { FunctionsServiceClient } from '@dxos/edge-compute';
+import { bundleFunction } from '@dxos/edge-compute/native';
 import { failedInvariant } from '@dxos/invariant';
 import { FunctionRuntimeKind } from '@dxos/protocols';
 import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';

package/src/e2e/deploy.test.ts

@@ -9,8 +9,8 @@ import { Client, type Config } from '@dxos/client';
 import { createEdgeIdentity } from '@dxos/client/edge';
 import { configPreset } from '@dxos/config';
 import { Context } from '@dxos/context';
-import { bundleFunction } from '@dxos/functions-runtime/bundler';
-import { FunctionsServiceClient } from '@dxos/functions-runtime/edge';
+import { FunctionsServiceClient } from '@dxos/edge-compute';
+import { bundleFunction } from '@dxos/edge-compute/bundler';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 

package/src/hooks/deploy.ts

@@ -5,13 +5,14 @@
 import { useEffect, useMemo } from 'react';
 
 import { Operation, Script } from '@dxos/compute';
+import { getUserFunctionIdInMetadata } from '@dxos/compute-runtime';
 import { Obj, Query, Ref } from '@dxos/echo';
-import { getUserFunctionIdInMetadata } from '@dxos/functions';
+import { useQuery } from '@dxos/echo-react';
 import { log } from '@dxos/log';
 import { type Client, useClient } from '@dxos/react-client';
-import { type Space, getSpace, useQuery } from '@dxos/react-client/echo';
+import { type Space, getSpace } from '@dxos/react-client/echo';
 import { type TFunction } from '@dxos/react-ui';
-import { createMenuAction } from '@dxos/react-ui-menu';
+import { type ActionGraphProps, createMenuAction } from '@dxos/react-ui-menu';
 import { messageValence } from '@dxos/ui-theme';
 
 import { meta } from '#meta';
@@ -39,7 +40,15 @@ export type CreateDeployOptions = {
   t: TFunction;
 };
 
-export const createDeploy = ({ state, script, space, fn, client, existingFunctionId, t }: CreateDeployOptions) => {
+export const createDeploy = ({
+  state,
+  script,
+  space,
+  fn,
+  client,
+  existingFunctionId,
+  t,
+}: CreateDeployOptions): ActionGraphProps => {
   const { value } = state;
 
   // TODO(wittjosiah): Should this be an action?

package/src/hooks/format.ts

@@ -9,13 +9,13 @@ import prettierPluginTypescript from 'prettier/plugins/typescript';
 import { type Script } from '@dxos/compute';
 import { Obj } from '@dxos/echo';
 import { log } from '@dxos/log';
-import { createMenuAction } from '@dxos/react-ui-menu';
+import { type ActionGraphProps, createMenuAction } from '@dxos/react-ui-menu';
 
 import { meta } from '#meta';
 
 export type FormatActionProperties = { type: 'format' };
 
-export const createFormat = (script: Script.Script) => {
+export const createFormat = (script: Script.Script): ActionGraphProps => {
   const formatAction = createMenuAction(
     'format',
     async () => {

package/src/hooks/template.ts

@@ -3,9 +3,9 @@
 //
 
 import { Script } from '@dxos/compute';
+import { FUNCTIONS_PRESET_META_KEY } from '@dxos/compute-runtime';
 import { Obj } from '@dxos/echo';
-import { FUNCTIONS_PRESET_META_KEY } from '@dxos/functions';
-import { createMenuAction } from '@dxos/react-ui-menu';
+import { type ActionGraphProps, createMenuAction } from '@dxos/react-ui-menu';
 
 import { templates } from '../templates';
 
@@ -42,7 +42,7 @@ const createTemplateSelectActions = (script: Script.Script) => {
   });
 };
 
-export const createTemplateSelect = (script: Script.Script) => {
+export const createTemplateSelect = (script: Script.Script): ActionGraphProps => {
   const templateSelectActions = createTemplateSelectActions(script);
   return {
     nodes: [...templateSelectActions],

package/src/hooks/useToolbarState.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Atom } from '@effect-atom/atom-react';
+import { Atom } from '@effect-atom/atom';
 import { useMemo } from 'react';
 
 import { Capabilities } from '@dxos/app-framework';

package/src/notebook/compute-graph.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Registry } from '@effect-atom/atom-react';
+import { Registry } from '@effect-atom/atom';
 import { describe, expect, test } from 'vitest';
 
 import { Obj } from '@dxos/echo';

package/src/notebook/compute-graph.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Atom, type Registry } from '@effect-atom/atom-react';
+import { Atom, type Registry } from '@effect-atom/atom';
 
 import { log } from '@dxos/log';
 

package/src/skills/functions/deploy.ts

@@ -7,13 +7,12 @@ import wasmUrl from 'esbuild-wasm/esbuild.wasm?url';
 
 import { ClientService } from '@dxos/client';
 import { Operation, Script } from '@dxos/compute';
+import { getUserFunctionIdInMetadata } from '@dxos/compute-runtime';
 import { Context } from '@dxos/context';
 import { Database, Obj } from '@dxos/echo';
-import { getUserFunctionIdInMetadata } from '@dxos/functions';
-import { bundleFunction, initializeBundler } from '@dxos/functions-runtime/bundler';
-import { FunctionsServiceClient, incrementSemverPatch } from '@dxos/functions-runtime/edge';
+import { FunctionsServiceClient, incrementSemverPatch } from '@dxos/edge-compute';
+import { bundleFunction, initializeBundler } from '@dxos/edge-compute/bundler';
 import { FunctionRuntimeKind } from '@dxos/protocols';
-import { getSpace } from '@dxos/react-client/echo';
 
 import { Deploy } from './definitions';
 
@@ -27,8 +26,8 @@ export default Deploy.pipe(
       }
       const script = (yield* Database.load(loaded.source)) as Script.Script;
 
-      const space = getSpace(loaded);
-      if (!space || !script.source?.target?.content) {
+      const db = Obj.getDatabase(loaded);
+      if (!db || !script.source?.target?.content) {
         return yield* Effect.fail(new Error('Script source or space not available'));
       }
 

package/src/skills/functions/inspect-invocations.ts

@@ -6,9 +6,9 @@ import * as Effect from 'effect/Effect';
 
 import { SpaceProperties } from '@dxos/client-protocol';
 import { Operation } from '@dxos/compute';
+import { getUserFunctionIdInMetadata } from '@dxos/compute-runtime';
+import { InvocationTraceEndEvent, InvocationTraceStartEvent, createInvocationSpans } from '@dxos/compute-runtime';
 import { Database, Feed, Filter, Obj, Query } from '@dxos/echo';
-import { getUserFunctionIdInMetadata } from '@dxos/functions';
-import { InvocationTraceEndEvent, InvocationTraceStartEvent, createInvocationSpans } from '@dxos/functions-runtime';
 
 import { InspectInvocations } from './definitions';
 

package/src/skills/functions/install-function.ts

@@ -8,7 +8,7 @@ import { ClientService } from '@dxos/client';
 import { Operation } from '@dxos/compute';
 import { Context } from '@dxos/context';
 import { Filter, Obj } from '@dxos/echo';
-import { FunctionsServiceClient } from '@dxos/functions-runtime/edge';
+import { FunctionsServiceClient } from '@dxos/edge-compute';
 
 import { InstallFunction } from './definitions';
 

package/src/skills/functions/invoke.ts

@@ -8,7 +8,7 @@ import { ClientService } from '@dxos/client';
 import { Operation } from '@dxos/compute';
 import { Context } from '@dxos/context';
 import { Database, Obj } from '@dxos/echo';
-import { FunctionsServiceClient } from '@dxos/functions-runtime/edge';
+import { FunctionsServiceClient } from '@dxos/edge-compute';
 
 import { Invoke } from './definitions';
 

package/src/skills/functions/query-deployed-functions.ts

@@ -8,7 +8,7 @@ import { ClientService } from '@dxos/client';
 import { Operation } from '@dxos/compute';
 import { Context } from '@dxos/context';
 import { Obj } from '@dxos/echo';
-import { FunctionsServiceClient } from '@dxos/functions-runtime/edge';
+import { FunctionsServiceClient } from '@dxos/edge-compute';
 
 import { QueryDeployedFunctions } from './definitions';
 

package/src/templates/chess-bot.ts

@@ -9,7 +9,7 @@ import * as Schema from 'effect/Schema';
 import { Operation } from '@dxos/compute';
 import { Database, DXN, Obj } from '@dxos/echo';
 import { Chess } from '@dxos/plugin-chess';
-import { Game, GameRef, loadGame } from '@dxos/plugin-game';
+import { Game, loadGame } from '@dxos/plugin-game';
 
 const ChessBot = Operation.make({
   meta: {
@@ -18,7 +18,7 @@ const ChessBot = Operation.make({
     description: 'Plays a random move in a chess game.',
   },
   input: Schema.Struct({
-    game: GameRef(Chess.State).annotations({
+    game: Game.GameRef(Chess.State).annotations({
       description: 'The chess game to comment on.',
     }),
     player: Schema.optional(Schema.Literal('white', 'black')).annotations({
@@ -30,7 +30,7 @@ const ChessBot = Operation.make({
       description: 'The state of the game as an ASCII art board.',
     }),
   }),
-  types: [Game, Chess.State],
+  types: [Game.Game, Chess.State],
   services: [Database.Service],
 });
 

package/src/templates/commentary.ts

@@ -20,7 +20,7 @@ import { Doc } from '@dxos/echo-doc';
 import { registryLayerNoop } from '@dxos/echo/testing';
 import { log } from '@dxos/log';
 import { Chess } from '@dxos/plugin-chess';
-import { Game, GameRef, loadGame } from '@dxos/plugin-game';
+import { Game, loadGame } from '@dxos/plugin-game';
 import { Markdown } from '@dxos/plugin-markdown';
 import { Text } from '@dxos/schema';
 import { HasSubject } from '@dxos/types';
@@ -33,7 +33,7 @@ const Commentary = Operation.make({
     description: 'Adds commentary about the most recent move to a markdown document associated with the chess game.',
   },
   input: Schema.Struct({
-    game: GameRef(Chess.State).annotations({
+    game: Game.GameRef(Chess.State).annotations({
       description: 'The chess game to comment on.',
     }),
   }),
@@ -50,7 +50,7 @@ const Commentary = Operation.make({
       description: 'Function did not find anything to comment on.',
     }),
   ),
-  types: [Game, Chess.State, Markdown.Document, Text.Text, HasSubject.HasSubject, Collection.Collection],
+  types: [Game.Game, Chess.State, Markdown.Document, Text.Text, HasSubject.HasSubject, Collection.Collection],
   services: [AiService.AiService, Database.Service],
 });
 

package/src/testing/simulator.test.ts

@@ -6,7 +6,7 @@ import * as Record from 'effect/Record';
 import { readFile } from 'node:fs/promises';
 import { describe, expect, test } from 'vitest';
 
-import { bundleFunction } from '@dxos/functions-runtime/bundler';
+import { bundleFunction } from '@dxos/edge-compute/bundler';
 import { FunctionWorker } from '@dxos/functions-simulator-cloudflare';
 import { ErrorCodec } from '@dxos/protocols';
 

package/src/types/ScriptCapabilities.ts

@@ -4,7 +4,7 @@
 
 // @import-as-namespace
 
-import { type Atom } from '@effect-atom/atom-react';
+import { type Atom } from '@effect-atom/atom';
 
 import { Capability } from '@dxos/app-framework';
 

package/src/util/deploy.ts

@@ -4,11 +4,11 @@
 
 import { type Client } from '@dxos/client';
 import { Operation, Script } from '@dxos/compute';
+import { getUserFunctionIdInMetadata } from '@dxos/compute-runtime';
 import { Context } from '@dxos/context';
 import { Obj, Ref } from '@dxos/echo';
-import { getUserFunctionIdInMetadata } from '@dxos/functions';
-import { bundleFunction } from '@dxos/functions-runtime/bundler';
-import { FunctionsServiceClient, incrementSemverPatch } from '@dxos/functions-runtime/edge';
+import { FunctionsServiceClient, incrementSemverPatch } from '@dxos/edge-compute';
+import { bundleFunction } from '@dxos/edge-compute/bundler';
 import { log } from '@dxos/log';
 import { FunctionRuntimeKind } from '@dxos/protocols';
 import { type Space } from '@dxos/react-client/echo';

package/src/util/functions.ts

@@ -3,9 +3,9 @@
 //
 
 import { type Operation, Script } from '@dxos/compute';
+import { getUserFunctionIdInMetadata } from '@dxos/compute-runtime';
+import { getInvocationUrl } from '@dxos/compute-runtime';
 import { Obj } from '@dxos/echo';
-import { 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';