@dxos/plugin-script 0.11.0 → 0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d

package/src/capabilities/node.ts

@@ -2,14 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capability } from '@dxos/app-framework';
-import type { OperationHandlerSet } from '@dxos/compute';
+import * as ActivationEvents from '@dxos/app-framework/ActivationEvents';
+import * as AppCapability from '@dxos/app-toolkit/AppCapability';
+import * as SpaceCapability from '@dxos/plugin-space/SpaceCapability';
 
-export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
-export const SkillDefinition = Capability.lazy('SkillDefinition', () => import('./skill-definition'));
-export const CreateObject = Capability.lazy('CreateObject', () => import('./create-object'));
-export const Compiler = Capability.lazy('Compiler', () => import('./compiler'));
-export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
-  'OperationHandler',
-  () => import('./operation-handler'),
-);
+export const AppGraphBuilder = AppCapability.appGraphBuilder(() => import('./app-graph-builder'));
+export const SkillDefinition = AppCapability.skillDefinition(() => import('./skill-definition'));
+export const CreateObject = SpaceCapability.createObject(() => import('./create-object'));
+export const OperationHandler = AppCapability.operationHandler(() => import('./operation-handler'), {
+  activatesOn: ActivationEvents.Idle,
+});

package/src/capabilities/operation-handler.ts

@@ -4,16 +4,17 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capabilities, Capability } from '@dxos/app-framework';
-import { OperationHandlerSet } from '@dxos/compute';
+import * as Capabilities from '@dxos/app-framework/Capabilities';
+import * as Capability from '@dxos/app-framework/Capability';
+import * as OperationHandlerSet from '@dxos/compute/OperationHandlerSet';
 
 import { ScriptOperationHandlerSet } from '#operations';
 
 import { ScriptHandlers } from '../skills/functions';
 
-export default Capability.makeModule<OperationHandlerSet.OperationHandlerSet>(
+export default Capability.makeModule(
   Effect.fnUntraced(function* () {
-    return Capability.contributes(
+    return Capability.contribute(
       Capabilities.OperationHandler,
       OperationHandlerSet.merge(ScriptOperationHandlerSet, ScriptHandlers),
     );

package/src/capabilities/react-surface.ts

@@ -5,16 +5,17 @@
 import * as Effect from 'effect/Effect';
 import { type ComponentProps } from 'react';
 
-import { Capabilities, Capability } from '@dxos/app-framework';
+import * as Capabilities from '@dxos/app-framework/Capabilities';
+import * as Capability from '@dxos/app-framework/Capability';
 import { Surface } from '@dxos/app-framework/ui';
 import { AppSurface } from '@dxos/app-toolkit/ui';
-import { Script } from '@dxos/compute';
+import * as Script from '@dxos/compute/Script';
 
 import { DeploymentDialog, ScriptProperties, TestContainer } from '#containers';
 import { meta } from '#meta';
-import { Notebook } from '#types';
 
 import { DEPLOYMENT_DIALOG } from '../constants';
+import * as Notebook from '../types/Notebook';
 import {
   NotebookArticleSurface,
   ScriptArticleSurface,
@@ -24,7 +25,7 @@ import {
 
 export default Capability.makeModule(() =>
   Effect.succeed(
-    Capability.contributes(Capabilities.ReactSurface, [
+    Capability.contribute(Capabilities.ReactSurface, [
       Surface.create({
         id: 'pluginSettings',
         filter: AppSurface.settings(AppSurface.Article, meta.profile.key),

package/src/capabilities/settings.ts

@@ -4,12 +4,14 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability } from '@dxos/app-framework';
-import { AppCapabilities } from '@dxos/app-toolkit';
+import * as Capability from '@dxos/app-framework/Capability';
+import * as AppCapabilities from '@dxos/app-toolkit/AppCapabilities';
 import { createKvsStore } from '@dxos/effect';
 
 import { meta } from '#meta';
-import { ScriptCapabilities, Settings } from '#types';
+
+import * as ScriptCapabilities from '../types/ScriptCapabilities';
+import * as Settings from '../types/Settings';
 
 export default Capability.makeModule(() =>
   Effect.sync(() => {
@@ -22,8 +24,8 @@ export default Capability.makeModule(() =>
     });
 
     return [
-      Capability.contributes(ScriptCapabilities.Settings, settingsAtom),
-      Capability.contributes(AppCapabilities.Settings, {
+      Capability.contribute(ScriptCapabilities.Settings, settingsAtom),
+      Capability.contribute(AppCapabilities.Settings, {
         prefix: meta.profile.key,
         schema: Settings.Settings,
         atom: settingsAtom,

package/src/capabilities/skill-definition.ts

@@ -4,11 +4,11 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability } from '@dxos/app-framework';
-import { AppCapabilities } from '@dxos/app-toolkit';
+import * as Capability from '@dxos/app-framework/Capability';
+import * as AppCapabilities from '@dxos/app-toolkit/AppCapabilities';
 
 import { ScriptSkill } from '#skills';
 
-const skillDefinition = () => Effect.succeed([Capability.contributes(AppCapabilities.SkillDefinition, ScriptSkill)]);
+const skillDefinition = () => Effect.succeed([Capability.contribute(AppCapabilities.SkillDefinition, ScriptSkill)]);
 
 export default skillDefinition;

package/src/components/NotebookStack/NotebookCell.tsx

@@ -25,9 +25,9 @@ import { mx } from '@dxos/ui-theme';
 import { isNonNullable } from '@dxos/util';
 
 import { meta } from '#meta';
-import { type Notebook } from '#types';
 
 import { type ComputeGraph } from '../../notebook';
+import type * as Notebook from '../../types/Notebook';
 import { TypescriptEditor, type TypescriptEditorProps } from '../TypescriptEditor';
 import { type NotebookMenuProps } from './NotebookMenu';
 

package/src/components/NotebookStack/NotebookMenu.tsx

@@ -7,7 +7,8 @@ import React from 'react';
 import { DropdownMenu, useTranslation } from '@dxos/react-ui';
 
 import { meta } from '#meta';
-import { type Notebook } from '#types';
+
+import type * as Notebook from '../../types/Notebook';
 
 export type NotebookMenuProps = {
   cell?: Notebook.Cell;

package/src/components/NotebookStack/NotebookStack.tsx

@@ -13,8 +13,8 @@ import { mx } from '@dxos/ui-theme';
 import { arrayMove } from '@dxos/util';
 
 import { meta } from '#meta';
-import { type Notebook } from '#types';
 
+import type * as Notebook from '../../types/Notebook';
 import { type TypescriptEditorProps } from '../TypescriptEditor';
 import { NotebookCell, type NotebookCellProps } from './NotebookCell';
 import { NotebookMenu } from './NotebookMenu';

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

@@ -8,7 +8,7 @@ import React, { useMemo } from 'react';
 
 import { ProcessManagerPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { Script } from '@dxos/compute';
+import * as Script from '@dxos/compute/Script';
 import { ClientPlugin } from '@dxos/plugin-client/testing';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 

package/src/components/ScriptToolbar/ScriptToolbar.tsx

@@ -6,7 +6,7 @@ import { Atom } from '@effect-atom/atom';
 import React, { useMemo } from 'react';
 
 import { AppSurface } from '@dxos/app-toolkit/ui';
-import { type Script } from '@dxos/compute';
+import type * as Script from '@dxos/compute/Script';
 import { ElevationProvider, useTranslation } from '@dxos/react-ui';
 import { composable, composableProps } from '@dxos/react-ui';
 import { type ActionGraphProps, Menu, MenuRootProps, createGapSeparator, useMenuActions } from '@dxos/react-ui-menu';
@@ -39,7 +39,9 @@ export const ScriptToolbar = composable<HTMLDivElement, ScriptToolbarProps>(
     return (
       <ElevationProvider elevation={role === AppSurface.Section.role ? 'positioned' : 'base'}>
         <Menu.Root {...menuActions} attendableId={attendableId}>
-          <Menu.Toolbar {...composableProps(props)} ref={forwardedRef} />
+          <Menu.Toolbar {...composableProps(props)} ref={forwardedRef}>
+            <Menu.Items />
+          </Menu.Toolbar>
         </Menu.Root>
       </ElevationProvider>
     );

package/src/containers/DeploymentDialog/DeploymentDialog.tsx

@@ -5,7 +5,7 @@
 import React, { useEffect, useMemo } from 'react';
 
 import { useOperationInvoker } from '@dxos/app-framework/ui';
-import { LayoutOperation } from '@dxos/app-toolkit';
+import * as LayoutOperation from '@dxos/app-toolkit/LayoutOperation';
 import { type AccessToken } from '@dxos/link';
 import { getSpace } from '@dxos/react-client/echo';
 import { Button, Dialog, useTranslation } from '@dxos/react-ui';

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

@@ -10,14 +10,14 @@ import { SERVICES_CONFIG } from '@dxos/ai/testing';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { AppSurface } from '@dxos/app-toolkit/ui';
 import { RunInstructions } from '@dxos/assistant-toolkit';
-import { Operation } from '@dxos/compute';
+import * as Operation from '@dxos/compute/Operation';
 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';
 import { ExplorerPlugin } from '@dxos/plugin-explorer/testing';
-import { Markdown } from '@dxos/plugin-markdown';
+import * as Markdown from '@dxos/plugin-markdown/Markdown';
 import { MarkdownPlugin } from '@dxos/plugin-markdown/testing';
 import { RoutinePlugin } from '@dxos/plugin-routine/testing';
 import { corePlugins } from '@dxos/plugin-testing';
@@ -27,8 +27,8 @@ import { DataTypes } from '@dxos/schema';
 
 import { createNotebook } from '#testing';
 import { translations } from '#translations';
-import { Notebook } from '#types';
 
+import * as Notebook from '../../types/Notebook';
 import { NotebookArticle } from './NotebookArticle';
 
 const meta: Meta<typeof NotebookArticle> = {
@@ -55,11 +55,11 @@ const meta: Meta<typeof NotebookArticle> = {
           types: [...DataTypes, Notebook.Notebook, Operation.PersistentOperation, Markdown.Document],
           onClientInitialized: ({ client }) =>
             Effect.gen(function* () {
-              const { personalSpace } = yield* initializeIdentity(client);
+              const { defaultSpace } = yield* initializeIdentity(client);
 
-              personalSpace.db.add(createNotebook());
-              personalSpace.db.add(Markdown.make({ content: '# Hello World' }));
-              personalSpace.db.add(Operation.serialize(RunInstructions));
+              defaultSpace.db.add(createNotebook());
+              defaultSpace.db.add(Markdown.make({ content: '# Hello World' }));
+              defaultSpace.db.add(Operation.serialize(RunInstructions));
             }),
         }),
         AssistantPlugin(),

package/src/containers/NotebookArticle/NotebookArticle.tsx

@@ -12,13 +12,14 @@ import React, { useCallback, useContext, useMemo, useState } from 'react';
 import { useSpaceCallback } from '@dxos/app-framework/ui';
 import { type AppSurface } from '@dxos/app-toolkit/ui';
 import { RunInstructions } from '@dxos/assistant-toolkit';
-import { Instructions, Skill } from '@dxos/compute';
-import { Operation } from '@dxos/compute';
+import * as Instructions from '@dxos/compute/Instructions';
+import * as Operation from '@dxos/compute/Operation';
+import * as Skill from '@dxos/compute/Skill';
 import { Filter, Obj, Query, Ref } from '@dxos/echo';
 import { QueryBuilder } from '@dxos/echo-query';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
-import { Graph } from '@dxos/plugin-explorer';
+import * as Graph from '@dxos/plugin-explorer/Graph';
 import { DropdownMenu, IconButton, Panel, Toolbar, useTranslation } from '@dxos/react-ui';
 import { useAttention } from '@dxos/react-ui-attention';
 import { Text, ViewModel } from '@dxos/schema';
@@ -26,9 +27,9 @@ import { isNonNullable } from '@dxos/util';
 
 import { NotebookMenu, NotebookStack, type NotebookStackProps, type TypescriptEditorProps } from '#components';
 import { meta } from '#meta';
-import { type Notebook } from '#types';
 
 import { ComputeGraph } from '../../notebook';
+import type * as Notebook from '../../types/Notebook';
 
 const INCLUDE_SKILLS = ['org.dxos.skill.assistant', 'org.dxos.skill.database', 'org.dxos.skill.markdown'];
 

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

@@ -8,9 +8,9 @@ import React, { useEffect, useState } from 'react';
 
 import { SERVICES_CONFIG } from '@dxos/ai/testing';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { Skill } from '@dxos/compute';
-import { Script } from '@dxos/compute';
-import { Operation } from '@dxos/compute';
+import * as Operation from '@dxos/compute/Operation';
+import * as Script from '@dxos/compute/Script';
+import * as Skill from '@dxos/compute/Skill';
 import { Filter } from '@dxos/echo';
 import { useQuery } from '@dxos/echo-react';
 import { ClientPlugin } from '@dxos/plugin-client/testing';

package/src/containers/ScriptArticle/ScriptArticle.tsx

@@ -5,7 +5,7 @@
 import React, { useMemo } from 'react';
 
 import { type AppSurface } from '@dxos/app-toolkit/ui';
-import { type Script } from '@dxos/compute';
+import type * as Script from '@dxos/compute/Script';
 import { Obj } from '@dxos/echo';
 import { Doc } from '@dxos/echo-doc';
 import { useIdentity } from '@dxos/halo-react';
@@ -15,7 +15,8 @@ import { createDataExtensions, editorClassNames, listener } from '@dxos/ui-edito
 
 import { ScriptToolbar, TypescriptEditor, type TypescriptEditorProps } from '#components';
 import { useDeployState, useToolbarState } from '#hooks';
-import { type Settings } from '#types';
+
+import type * as Settings from '../../types/Settings';
 
 export type ScriptEditorProps = AppSurface.ObjectArticleProps<
   Script.Script,

package/src/containers/ScriptProperties/FunctionBinding.tsx

@@ -4,10 +4,10 @@
 
 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 * as Operation from '@dxos/compute/Operation';
+import type * as Script from '@dxos/compute/Script';
 import { Filter, Obj, Ref } from '@dxos/echo';
 import { useQuery } from '@dxos/echo-react';
 import { useClient } from '@dxos/react-client';

package/src/containers/ScriptProperties/FunctionPublishing.tsx

@@ -6,8 +6,8 @@ import { Octokit } from '@octokit/core';
 import React, { useCallback, useState } from 'react';
 
 import { useOperationInvoker } from '@dxos/app-framework/ui';
-import { SettingsOperation } from '@dxos/app-toolkit';
-import { type Script } from '@dxos/compute';
+import * as SettingsOperation from '@dxos/app-toolkit/SettingsOperation';
+import type * as Script from '@dxos/compute/Script';
 import { Filter, Obj } from '@dxos/echo';
 import { useQuery } from '@dxos/echo-react';
 import { AccessToken } from '@dxos/link';
@@ -100,7 +100,9 @@ export const FunctionPublishing = ({ object }: FunctionPublishingProps) => {
       {!githubToken && (
         <div className='flex flex-col py-form-gap'>
           <Message.Root valence='info'>
-            <Message.Title>{t('no-github-token.label')}</Message.Title>
+            <Message.Content>
+              <Message.Title>{t('no-github-token.label')}</Message.Title>
+            </Message.Content>
           </Message.Root>
           <div className='flex pt-form-gap'>
             <Button onClick={handleOpenTokenManager}>{t('open-token-manager.label')}</Button>

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

@@ -7,9 +7,9 @@ import * as Effect from 'effect/Effect';
 import React from 'react';
 
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { Skill } from '@dxos/compute';
-import { Script } from '@dxos/compute';
-import { Operation } from '@dxos/compute';
+import * as Operation from '@dxos/compute/Operation';
+import * as Script from '@dxos/compute/Script';
+import * as Skill from '@dxos/compute/Skill';
 import { Filter } from '@dxos/echo';
 import { useQuery } from '@dxos/echo-react';
 import { ClientPlugin } from '@dxos/plugin-client/testing';

package/src/containers/ScriptProperties/ScriptProperties.tsx

@@ -5,7 +5,7 @@
 import React from 'react';
 
 import { type AppSurface } from '@dxos/app-toolkit/ui';
-import { type Script } from '@dxos/compute';
+import type * as Script from '@dxos/compute/Script';
 import { Form } from '@dxos/react-ui-form';
 
 import { FunctionBinding } from './FunctionBinding';

package/src/containers/ScriptProperties/SkillEditor.tsx

@@ -5,9 +5,10 @@
 import React, { useCallback, useState } from 'react';
 
 import { ToolId } from '@dxos/ai';
-import { Skill, Template } from '@dxos/compute';
-import { type Script } from '@dxos/compute';
-import { Operation } from '@dxos/compute';
+import * as Operation from '@dxos/compute/Operation';
+import type * as Script from '@dxos/compute/Script';
+import * as Skill from '@dxos/compute/Skill';
+import * as Template from '@dxos/compute/Template';
 import { Filter, Obj, Ref } from '@dxos/echo';
 import { useQuery } from '@dxos/echo-react';
 import { Button, Input, useAsyncEffect, useTranslation } from '@dxos/react-ui';

package/src/containers/ScriptSettings/ScriptSettings.tsx

@@ -9,7 +9,8 @@ import { Button, useTranslation } from '@dxos/react-ui';
 import { Form } from '@dxos/react-ui-form';
 
 import { meta } from '#meta';
-import { Settings } from '#types';
+
+import * as Settings from '../../types/Settings';
 
 export type ScriptSettingsProps = AppSurface.SettingsProps<
   Settings.Settings,

package/src/containers/TestContainer/TestContainer.tsx

@@ -4,7 +4,7 @@
 
 import React, { useCallback, useMemo } from 'react';
 
-import { type Script } from '@dxos/compute';
+import type * as Script from '@dxos/compute/Script';
 import { Context } from '@dxos/context';
 import { Obj } from '@dxos/echo';
 import { FunctionsServiceClient } from '@dxos/edge-compute';

package/src/e2e/ai.test.ts

@@ -7,7 +7,7 @@ import { test } from 'vitest';
 
 import { Client } from '@dxos/client';
 import { type Space } from '@dxos/client-protocol';
-import { Operation } from '@dxos/compute';
+import * as Operation from '@dxos/compute/Operation';
 import { configPreset } from '@dxos/config';
 import { Context } from '@dxos/context';
 import { FunctionsServiceClient } from '@dxos/edge-compute';

package/src/hooks/deploy.ts

@@ -4,8 +4,9 @@
 
 import { useEffect, useMemo } from 'react';
 
-import { Operation, Script } from '@dxos/compute';
 import { getUserFunctionIdInMetadata } from '@dxos/compute-runtime';
+import * as Operation from '@dxos/compute/Operation';
+import * as Script from '@dxos/compute/Script';
 import { Obj, Query, Ref } from '@dxos/echo';
 import { useQuery } from '@dxos/echo-react';
 import { log } from '@dxos/log';

package/src/hooks/format.ts

@@ -6,7 +6,7 @@ import { format } from 'prettier';
 import prettierPluginEstree from 'prettier/plugins/estree';
 import prettierPluginTypescript from 'prettier/plugins/typescript';
 
-import { type Script } from '@dxos/compute';
+import type * as Script from '@dxos/compute/Script';
 import { Obj } from '@dxos/echo';
 import { log } from '@dxos/log';
 import { type ActionGraphProps, createMenuAction } from '@dxos/react-ui-menu';

package/src/hooks/template.ts

@@ -2,8 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Script } from '@dxos/compute';
 import { FUNCTIONS_PRESET_META_KEY } from '@dxos/compute-runtime';
+import * as Script from '@dxos/compute/Script';
 import { Obj } from '@dxos/echo';
 import { type ActionGraphProps, createMenuAction } from '@dxos/react-ui-menu';
 

package/src/hooks/useCompiler.ts

@@ -6,10 +6,9 @@ import { useCapabilities, usePluginManager } from '@dxos/app-framework/ui';
 import { EffectEx } from '@dxos/effect';
 import { useAsyncEffect } from '@dxos/react-ui';
 
-import { ScriptEvents } from '#types';
-import { ScriptCapabilities } from '#types';
-
 import type { Compiler } from '../compiler';
+import * as ScriptCapabilities from '../types/ScriptCapabilities';
+import * as ScriptEvents from '../types/ScriptEvents';
 
 /**
  * Asynchronously sets up the compiler and returns it.

package/src/hooks/useCreateAndDeployScriptTemplates.ts

@@ -5,16 +5,15 @@
 import { useCallback, useState } from 'react';
 
 import { useOperationInvoker } from '@dxos/app-framework/ui';
-import { Script } from '@dxos/compute';
+import * as Script from '@dxos/compute/Script';
 import { Obj } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
 import { SpaceOperation } from '@dxos/plugin-space';
 import { useClient } from '@dxos/react-client';
 import { type Space } from '@dxos/react-client/echo';
 
-import { ScriptOperation } from '#types';
-
 import { type Template } from '../templates';
+import * as ScriptOperation from '../types/ScriptOperation';
 import { deployScript } from '../util';
 
 type DeploymentStatus = 'idle' | 'pending' | 'success' | 'error';

package/src/hooks/useToolbarState.ts

@@ -5,7 +5,7 @@
 import { Atom } from '@effect-atom/atom';
 import { useMemo } from 'react';
 
-import { Capabilities } from '@dxos/app-framework';
+import * as Capabilities from '@dxos/app-framework/Capabilities';
 import { useCapability } from '@dxos/app-framework/ui';
 
 import { type DeployState } from './deploy';

package/src/index.ts

@@ -2,7 +2,11 @@
 // Copyright 2023 DXOS.org
 //
 
-export * from './skills';
+export * as Notebook from './types/Notebook';
+export * as ScriptCapabilities from './types/ScriptCapabilities';
+export * as ScriptEvents from './types/ScriptEvents';
+export * as ScriptOperation from './types/ScriptOperation';
+export * as Settings from './types/Settings';
 export * from './meta';
-export * from './types';
+export * from './skills';
 export * from './util';

package/src/meta.ts

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Plugin } from '@dxos/app-framework';
+import * as Plugin from '@dxos/app-framework/Plugin';
 import { DXN } from '@dxos/keys';
 
 import config from '../dx.config';

package/src/notebook/compute-graph.ts

@@ -6,8 +6,7 @@ import { Atom, type Registry } from '@effect-atom/atom';
 
 import { log } from '@dxos/log';
 
-import { type Notebook } from '#types';
-
+import type * as Notebook from '../types/Notebook';
 import { evalScript } from './eval';
 import { type ParsedExpression, VirtualTypeScriptParser } from './vfs-parser';
 

package/src/operations/create-script.ts

@@ -5,10 +5,11 @@
 import { Octokit } from '@octokit/core';
 import * as Effect from 'effect/Effect';
 
-import { Operation, Script } from '@dxos/compute';
+import * as Operation from '@dxos/compute/Operation';
+import * as Script from '@dxos/compute/Script';
 
 import { templates } from '../templates';
-import { ScriptOperation } from '../types';
+import * as ScriptOperation from '../types/ScriptOperation';
 
 const handler: Operation.WithHandler<typeof ScriptOperation.CreateScript> = ScriptOperation.CreateScript.pipe(
   Operation.withHandler(

package/src/operations/index.ts

@@ -2,6 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
-import { OperationHandlerSet } from '@dxos/compute';
+import * as Operation from '@dxos/compute/Operation';
+import * as OperationHandlerSet from '@dxos/compute/OperationHandlerSet';
 
-export const ScriptOperationHandlerSet = OperationHandlerSet.lazy(() => import('./create-script'));
+import * as ScriptOperation from '../types/ScriptOperation';
+
+export const ScriptOperationHandlerSet = OperationHandlerSet.lazy([
+  ScriptOperation.CreateScript.pipe(Operation.lazyHandler(() => import('./create-script'))),
+]);

package/src/plugin.ts

@@ -2,10 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Plugin } from '@dxos/app-framework';
+import * as Plugin from '@dxos/app-framework/Plugin';
 
 import { meta } from './meta';
 
 export const ScriptPlugin = Plugin.lazy(meta, () => import('#plugin'));
-
-export { ScriptOperationHandlerSet } from './operations';

package/src/skills/functions/create.ts

@@ -4,8 +4,9 @@
 
 import * as Effect from 'effect/Effect';
 
-import { CollectionModel } from '@dxos/app-toolkit';
-import { Operation, Script } from '@dxos/compute';
+import * as CollectionModel from '@dxos/app-toolkit/CollectionModel';
+import * as Operation from '@dxos/compute/Operation';
+import * as Script from '@dxos/compute/Script';
 import { Database, Obj, Ref } from '@dxos/echo';
 
 import { Create } from './definitions';

package/src/skills/functions/definitions.ts

@@ -5,7 +5,7 @@
 import * as Schema from 'effect/Schema';
 
 import { ClientService } from '@dxos/client';
-import { Operation } from '@dxos/compute';
+import * as Operation from '@dxos/compute/Operation';
 import { Database, DXN, Ref } from '@dxos/echo';
 import { trim } from '@dxos/util';
 

package/src/skills/functions/delete.ts

@@ -4,7 +4,7 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Operation } from '@dxos/compute';
+import * as Operation from '@dxos/compute/Operation';
 import { Database } from '@dxos/echo';
 
 import { Delete } from './definitions';

package/src/skills/functions/deploy.ts

@@ -6,8 +6,9 @@ import * as Effect from 'effect/Effect';
 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 * as Operation from '@dxos/compute/Operation';
+import * as Script from '@dxos/compute/Script';
 import { Context } from '@dxos/context';
 import { Database, Obj } from '@dxos/echo';
 import { FunctionsServiceClient, incrementSemverPatch } from '@dxos/edge-compute';