@dxos/plugin-wnfs 0.8.4-main.422d1c7879 → 0.8.4-main.4f23b4e393

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-wnfs",
-  "version": "0.8.4-main.422d1c7879",
+  "version": "0.8.4-main.4f23b4e393",
   "description": "WNFS file management plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -12,28 +12,71 @@
   "author": "DXOS.org",
   "type": "module",
   "imports": {
-    "#capabilities": "./src/capabilities/index.ts",
-    "#components": "./src/components/index.ts",
-    "#containers": "./src/containers/index.ts",
-    "#meta": "./src/meta.ts",
-    "#operations": "./src/operations/index.ts",
-    "#types": "./src/types/index.ts"
+    "#capabilities": {
+      "source": "./src/capabilities/index.ts",
+      "types": "./dist/types/src/capabilities/index.d.ts",
+      "default": "./dist/lib/neutral/capabilities/index.mjs"
+    },
+    "#components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "default": "./dist/lib/neutral/components/index.mjs"
+    },
+    "#containers": {
+      "source": "./src/containers/index.ts",
+      "types": "./dist/types/src/containers/index.d.ts",
+      "default": "./dist/lib/neutral/containers/index.mjs"
+    },
+    "#helpers": {
+      "source": "./src/helpers/index.ts",
+      "types": "./dist/types/src/helpers/index.d.ts",
+      "default": "./dist/lib/neutral/helpers/index.mjs"
+    },
+    "#meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "default": "./dist/lib/neutral/meta.mjs"
+    },
+    "#operations": {
+      "source": "./src/operations/index.ts",
+      "types": "./dist/types/src/operations/index.d.ts",
+      "default": "./dist/lib/neutral/operations/index.mjs"
+    },
+    "#plugin": {
+      "source": {
+        "node": "./src/WnfsPlugin.node.ts",
+        "default": "./src/WnfsPlugin.tsx"
+      },
+      "types": "./dist/types/src/WnfsPlugin.d.ts",
+      "node": "./dist/lib/neutral/WnfsPlugin.node.mjs",
+      "default": "./dist/lib/neutral/WnfsPlugin.mjs"
+    },
+    "#translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
+    },
+    "#types": {
+      "source": "./src/types/index.ts",
+      "types": "./dist/types/src/types/index.d.ts",
+      "default": "./dist/lib/neutral/types/index.mjs"
+    }
   },
   "exports": {
     ".": {
       "source": "./src/index.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "types": "./dist/types/src/index.d.ts"
+      "types": "./dist/types/src/index.d.ts",
+      "default": "./dist/lib/neutral/index.mjs"
     },
-    "./operations": {
-      "source": "./src/operations/index.ts",
-      "browser": "./dist/lib/browser/operations/index.mjs",
-      "types": "./dist/types/src/operations/index.d.ts"
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.mjs"
     },
-    "./types": {
-      "source": "./src/types/index.ts",
-      "browser": "./dist/lib/browser/types/index.mjs",
-      "types": "./dist/types/src/types/index.d.ts"
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -44,7 +87,7 @@
   "dependencies": {
     "@codemirror/language": "^6.11.3",
     "@codemirror/state": "^6.5.2",
-    "@codemirror/view": "^6.38.4",
+    "@codemirror/view": "^6.38.5",
     "@ipld/car": "^5.3.3",
     "blockstore-core": "^5.0.1",
     "blockstore-idb": "^2.0.0",
@@ -57,45 +100,44 @@
     "react-dropzone": "^14.2.3",
     "uint8arrays": "^5.1.0",
     "wnfs": "0.2.2",
-    "@dxos/app-toolkit": "0.8.4-main.422d1c7879",
-    "@dxos/echo": "0.8.4-main.422d1c7879",
-    "@dxos/effect": "0.8.4-main.422d1c7879",
-    "@dxos/crypto": "0.8.4-main.422d1c7879",
-    "@dxos/invariant": "0.8.4-main.422d1c7879",
-    "@dxos/log": "0.8.4-main.422d1c7879",
-    "@dxos/operation": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-client": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-markdown": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-space": "0.8.4-main.422d1c7879",
-    "@dxos/app-framework": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui": "0.8.4-main.422d1c7879",
-    "@dxos/react-client": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-editor": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-form": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-mosaic": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-stack": "0.8.4-main.422d1c7879",
-    "@dxos/schema": "0.8.4-main.422d1c7879",
-    "@dxos/util": "0.8.4-main.422d1c7879",
-    "@dxos/ui-editor": "0.8.4-main.422d1c7879"
+    "@dxos/app-framework": "0.8.4-main.4f23b4e393",
+    "@dxos/compute": "0.8.4-main.4f23b4e393",
+    "@dxos/app-toolkit": "0.8.4-main.4f23b4e393",
+    "@dxos/echo": "0.8.4-main.4f23b4e393",
+    "@dxos/crypto": "0.8.4-main.4f23b4e393",
+    "@dxos/log": "0.8.4-main.4f23b4e393",
+    "@dxos/effect": "0.8.4-main.4f23b4e393",
+    "@dxos/invariant": "0.8.4-main.4f23b4e393",
+    "@dxos/keys": "0.8.4-main.4f23b4e393",
+    "@dxos/plugin-client": "0.8.4-main.4f23b4e393",
+    "@dxos/plugin-markdown": "0.8.4-main.4f23b4e393",
+    "@dxos/react-client": "0.8.4-main.4f23b4e393",
+    "@dxos/react-ui": "0.8.4-main.4f23b4e393",
+    "@dxos/plugin-space": "0.8.4-main.4f23b4e393",
+    "@dxos/react-ui-editor": "0.8.4-main.4f23b4e393",
+    "@dxos/react-ui-mosaic": "0.8.4-main.4f23b4e393",
+    "@dxos/react-ui-form": "0.8.4-main.4f23b4e393",
+    "@dxos/react-ui-stack": "0.8.4-main.4f23b4e393",
+    "@dxos/schema": "0.8.4-main.4f23b4e393",
+    "@dxos/ui-editor": "0.8.4-main.4f23b4e393",
+    "@dxos/util": "0.8.4-main.4f23b4e393"
   },
   "devDependencies": {
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/random": "0.8.4-main.422d1c7879",
-    "@dxos/ui-theme": "0.8.4-main.422d1c7879",
-    "@dxos/storybook-utils": "0.8.4-main.422d1c7879"
+    "vite": "^8.0.10",
+    "@dxos/plugin-testing": "0.8.4-main.4f23b4e393",
+    "@dxos/random": "0.8.4-main.4f23b4e393",
+    "@dxos/ui-theme": "0.8.4-main.4f23b4e393",
+    "@dxos/storybook-utils": "0.8.4-main.4f23b4e393"
   },
   "peerDependencies": {
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.422d1c7879",
-    "@dxos/ui-theme": "0.8.4-main.422d1c7879"
-  },
-  "publishConfig": {
-    "access": "public"
+    "@dxos/react-ui": "0.8.4-main.4f23b4e393",
+    "@dxos/ui-theme": "0.8.4-main.4f23b4e393"
   }
 }

package/src/WnfsPlugin.node.ts

@@ -0,0 +1,19 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+
+import { CreateObject, OperationHandler } from '#capabilities';
+import { meta } from '#meta';
+import { WnfsFile } from '#types';
+
+export const WnfsPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addSchemaModule({ schema: [WnfsFile.WnfsFile] }),
+  Plugin.make,
+);
+
+export default WnfsPlugin;

package/src/WnfsPlugin.test.ts

@@ -0,0 +1,27 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
+import { createComposerTestApp } from '@dxos/plugin-testing/harness';
+
+import { WnfsPlugin } from '#plugin';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('WnfsPlugin', () => {
+  test('modules activate on the expected events', async ({ expect }) => {
+    await using harness = await createComposerTestApp({
+      plugins: [ClientPlugin({}), WnfsPlugin()],
+    });
+
+    // After autoStart: CreateObject, schema, and OperationHandler all auto-cascade.
+    expect(harness.manager.getActive()).toEqual(
+      expect.arrayContaining([moduleId('CreateObject'), moduleId('schema'), moduleId('OperationHandler')]),
+    );
+  });
+});

package/src/WnfsPlugin.tsx

@@ -3,48 +3,21 @@
 //
 
 import * as Effect from 'effect/Effect';
-import * as Option from 'effect/Option';
 
 import { Capability, Plugin } from '@dxos/app-framework';
 import { AppPlugin } from '@dxos/app-toolkit';
-import { Annotation } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
-import { ClientEvents } from '@dxos/plugin-client/types';
+import { ClientEvents } from '@dxos/plugin-client';
 import { MarkdownEvents } from '@dxos/plugin-markdown';
-import { SpaceOperation } from '@dxos/plugin-space/operations';
-import { type CreateObject } from '@dxos/plugin-space/types';
 
-import { Blockstore, FileUploader, Markdown, OperationHandler, ReactSurface } from '#capabilities';
+import { Blockstore, CreateObject, FileUploader, Markdown, OperationHandler, ReactSurface } from '#capabilities';
 import { meta } from '#meta';
-import { WnfsOperation } from '#operations';
-import { WnfsAction, WnfsCapabilities, WnfsFile } from '#types';
-
-import { translations } from './translations';
+import { translations } from '#translations';
+import { WnfsCapabilities, WnfsFile } from '#types';
 
 export const WnfsPlugin = Plugin.define(meta).pipe(
-  AppPlugin.addMetadataModule({
-    metadata: {
-      id: WnfsFile.File.typename,
-      metadata: {
-        // TODO(wittjosiah): Would be nice if icon could change based on the type of the file.
-        icon: Annotation.IconAnnotation.get(WnfsFile.File).pipe(Option.getOrThrow).icon,
-        iconHue: Annotation.IconAnnotation.get(WnfsFile.File).pipe(Option.getOrThrow).hue ?? 'white',
-        inputSchema: WnfsAction.UploadFileSchema,
-        createObject: ((props, options) =>
-          Effect.gen(function* () {
-            const { object } = yield* Operation.invoke(WnfsOperation.CreateFile, { ...props, db: options.db });
-            return yield* Operation.invoke(SpaceOperation.AddObject, {
-              object,
-              target: options.target,
-              hidden: true,
-              targetNodeId: options.targetNodeId,
-            });
-          })) satisfies CreateObject,
-      },
-    },
-  }),
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
   AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
-  AppPlugin.addSchemaModule({ schema: [WnfsFile.File] }),
+  AppPlugin.addSchemaModule({ schema: [WnfsFile.WnfsFile] }),
   AppPlugin.addSurfaceModule({ activate: ReactSurface }),
   AppPlugin.addTranslationsModule({ translations }),
   Plugin.addModule({
@@ -73,3 +46,5 @@ export const WnfsPlugin = Plugin.define(meta).pipe(
   }),
   Plugin.make,
 );
+
+export default WnfsPlugin;

package/src/capabilities/blockstore.ts

@@ -5,7 +5,7 @@
 import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
-import { ClientCapabilities } from '@dxos/plugin-client/types';
+import { ClientCapabilities } from '@dxos/plugin-client';
 
 import { WnfsCapabilities } from '#types';
 

package/src/capabilities/create-object.ts

@@ -0,0 +1,33 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { Operation } from '@dxos/compute';
+import { SpaceOperation } from '@dxos/plugin-space';
+import { SpaceCapabilities } from '@dxos/plugin-space';
+
+import { WnfsOperation } from '#types';
+import { WnfsAction, WnfsFile } from '#types';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
+      id: WnfsFile.WnfsFile.typename,
+      inputSchema: WnfsAction.UploadFileSchema,
+      // TODO(wittjosiah): Would be nice if icon could change based on the type of the file.
+      createObject: (props, options) =>
+        Effect.gen(function* () {
+          const { object } = yield* Operation.invoke(WnfsOperation.CreateFile, { ...props, db: options.db });
+          return yield* Operation.invoke(SpaceOperation.AddObject, {
+            object,
+            target: options.target,
+            hidden: true,
+            targetNodeId: options.targetNodeId,
+          });
+        }),
+    });
+  }),
+);

package/src/capabilities/file-uploader.ts

@@ -7,9 +7,9 @@ import * as Effect from 'effect/Effect';
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
 import { runAndForwardErrors } from '@dxos/effect';
-import { SpaceOperation } from '@dxos/plugin-space/operations';
+import { SpaceOperation } from '@dxos/plugin-space';
 
-import { WnfsOperation } from '#operations';
+import { WnfsOperation } from '#types';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {

package/src/capabilities/index.ts

@@ -3,9 +3,10 @@
 //
 
 import { Capability } from '@dxos/app-framework';
-import { OperationHandlerSet } from '@dxos/operation';
+import { OperationHandlerSet } from '@dxos/compute';
 
 export const Blockstore = Capability.lazy('Blockstore', () => import('./blockstore'));
+export const CreateObject = Capability.lazy('CreateObject', () => import('./create-object'));
 export const FileUploader = Capability.lazy('FileUploader', () => import('./file-uploader'));
 export const Markdown = Capability.lazy('Markdown', () => import('./markdown'));
 export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(

package/src/capabilities/markdown.ts

@@ -5,7 +5,7 @@
 import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
-import { MarkdownCapabilities } from '@dxos/plugin-markdown';
+import { type MarkdownExtensionProvider, MarkdownCapabilities } from '@dxos/plugin-markdown';
 import { getSpace } from '@dxos/react-client/echo';
 
 import { WnfsCapabilities } from '#types';
@@ -17,18 +17,22 @@ export default Capability.makeModule(
     // Get context for lazy capability access in callbacks.
     const capabilities = yield* Capability.Service;
 
-    return Capability.contributes(MarkdownCapabilities.Extensions, [
-      ({ document }: { document?: any }) => {
-        const blockstore = capabilities.get(WnfsCapabilities.Blockstore);
-        const instances = capabilities.get(WnfsCapabilities.Instances);
+    const provider: MarkdownExtensionProvider = ({ document, viewMode }) => {
+      if (viewMode === 'source') {
+        return undefined;
+      }
 
-        if (document) {
-          const space = getSpace(document);
-          return space ? [image({ blockstore, instances, space })] : [];
-        }
+      const blockstore = capabilities.get(WnfsCapabilities.Blockstore);
+      const instances = capabilities.get(WnfsCapabilities.Instances);
 
-        return [];
-      },
-    ]);
+      if (document) {
+        const space = getSpace(document);
+        return space ? [image({ blockstore, instances, space })] : undefined;
+      }
+
+      return undefined;
+    };
+
+    return Capability.contributes(MarkdownCapabilities.Extensions, [provider]);
   }),
 );

package/src/capabilities/operation-handler.ts

@@ -5,7 +5,7 @@
 import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import type { OperationHandlerSet } from '@dxos/operation';
+import type { OperationHandlerSet } from '@dxos/compute';
 
 import { WnfsOperationHandlerSet } from '#operations';
 

package/src/capabilities/react-surface.tsx

@@ -4,6 +4,7 @@
 
 import * as Effect from 'effect/Effect';
 import type * as Schema from 'effect/Schema';
+import * as SchemaAST from 'effect/SchemaAST';
 import React, { useCallback } from 'react';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
@@ -23,27 +24,32 @@ export default Capability.makeModule(() =>
         id: 'article',
         // TODO(wittjosiah): Split into multiple surfaces if this filter proves too strict for non-article roles.
         filter: AppSurface.oneOf(
-          AppSurface.object(AppSurface.Article, WnfsFile.File),
-          AppSurface.object(AppSurface.Section, WnfsFile.File),
-          AppSurface.object(AppSurface.Slide, WnfsFile.File),
+          AppSurface.object(AppSurface.Article, WnfsFile.WnfsFile),
+          AppSurface.object(AppSurface.Section, WnfsFile.WnfsFile),
+          AppSurface.object(AppSurface.Slide, WnfsFile.WnfsFile),
         ),
         component: ({ data, role }) => <FileContainer role={role} subject={data.subject} />,
       }),
       Surface.create({
         id: 'create-form',
         role: 'form-input',
-        filter: (data): data is { prop: string; schema: Schema.Schema.Any } => {
+        filter: (data): data is { prop: string; schema: Schema.Schema.Any; fieldPropertyAst?: SchemaAST.AST } => {
           const annotation = findAnnotation<boolean>(
             (data.schema as Schema.Schema.All).ast,
             WnfsAction.UploadAnnotationId,
           );
           return !!annotation;
         },
-        component: ({ data: { schema }, ...props }) => {
-          const inputProps = props as unknown as FormFieldComponentProps;
+        component: ({ data: { schema, fieldPropertyAst }, ...props }) => {
+          const ast = fieldPropertyAst;
+          if (!ast) {
+            return null;
+          }
+
+          const inputProps = { ...props, type: ast } as unknown as FormFieldComponentProps;
           const handleChange = useCallback(
-            (file: File) => inputProps.onValueChange?.(inputProps.type, file),
-            [inputProps.type, inputProps.onValueChange],
+            (file: File) => inputProps.onValueChange?.(ast, file),
+            [ast, inputProps.onValueChange],
           );
 
           return <FileInput schema={schema} onChange={handleChange} />;

package/src/containers/FileContainer/FileContainer.tsx

@@ -15,7 +15,7 @@ import { WnfsCapabilities, type WnfsFile } from '#types';
 
 import { filePath, getBlobUrl, loadWnfs, wnfsUrl } from '../../helpers';
 
-export type FileContainerProps = AppSurface.ObjectArticleProps<WnfsFile.File>;
+export type FileContainerProps = AppSurface.ObjectArticleProps<WnfsFile.WnfsFile>;
 
 export const FileContainer = ({ role, subject: file }: FileContainerProps) => {
   const blockstore = useCapability(WnfsCapabilities.Blockstore);

package/src/helpers/load.ts

@@ -30,7 +30,7 @@ export const loadWnfs = async ({
   // TODO(wittjosiah): Remove.
   // Delete old properties if they exist.
   if (space.properties.wnfs_access_key !== undefined && space.properties.wnfs_private_forest_cid !== undefined) {
-    Obj.change(space.properties, (obj) => {
+    Obj.update(space.properties, (obj) => {
       delete obj['wnfs_access_key'];
       delete obj['wnfs_private_forest_cid'];
     });
@@ -68,7 +68,7 @@ const createWnfsDir = async (blockstore: Blockstore, space: Space) => {
 
   const cidBytes = await newForest.store(wnfsStore);
 
-  Obj.change(space.properties, (obj) => {
+  Obj.update(space.properties, (obj) => {
     obj.wnfs = {
       accessKey: Uint8Arrays.toString(accessKeyRaw.toBytes(), 'base64'),
       privateForestCid: CID.decode(cidBytes).toString(),

package/src/helpers/upload.ts

@@ -47,7 +47,7 @@ export const upload = async ({
   const cidBytes = await updatedForest.store(wnfsStore);
 
   // Update the forest pointer on the associated space.
-  Obj.change(space.properties, (obj) => {
+  Obj.update(space.properties, (obj) => {
     obj.wnfs.privateForestCid = CID.decode(cidBytes).toString();
   });
 

package/src/index.ts

@@ -2,6 +2,6 @@
 // Copyright 2024 DXOS.org
 //
 
-export { WnfsCapabilities } from './types';
+export * from './helpers';
 export * from './meta';
-export * from './WnfsPlugin';
+export * from './types';

package/src/operations/create-file.ts

@@ -5,15 +5,14 @@
 import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
+import { Operation } from '@dxos/compute';
 import { invariant } from '@dxos/invariant';
-import { Operation } from '@dxos/operation';
-import { ClientCapabilities } from '@dxos/plugin-client/types';
+import { ClientCapabilities } from '@dxos/plugin-client';
 
 import { upload } from '../helpers';
-import { WnfsCapabilities, WnfsFile } from '../types';
-import { CreateFile } from './definitions';
+import { WnfsCapabilities, WnfsFile, WnfsOperation } from '../types';
 
-const handler: Operation.WithHandler<typeof CreateFile> = CreateFile.pipe(
+const handler: Operation.WithHandler<typeof WnfsOperation.CreateFile> = WnfsOperation.CreateFile.pipe(
   Operation.withHandler(
     Effect.fnUntraced(function* ({ file, db }) {
       const client = yield* Capability.get(ClientCapabilities.Client);

package/src/operations/create.ts

@@ -4,12 +4,11 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 
-import { WnfsFile } from '../types';
-import { Create } from './definitions';
+import { WnfsFile, WnfsOperation } from '../types';
 
-const handler: Operation.WithHandler<typeof Create> = Create.pipe(
+const handler: Operation.WithHandler<typeof WnfsOperation.Create> = WnfsOperation.Create.pipe(
   Operation.withHandler(
     Effect.fnUntraced(function* ({ name, type, cid }) {
       return {

package/src/operations/index.ts

@@ -2,9 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { OperationHandlerSet } from '@dxos/operation';
-
-export * as WnfsOperation from './definitions';
+import { OperationHandlerSet } from '@dxos/compute';
 
 export const WnfsOperationHandlerSet = OperationHandlerSet.lazy(
   () => import('./create'),

package/src/operations/upload.ts

@@ -5,15 +5,14 @@
 import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
+import { Operation } from '@dxos/compute';
 import { invariant } from '@dxos/invariant';
-import { Operation } from '@dxos/operation';
-import { ClientCapabilities } from '@dxos/plugin-client/types';
+import { ClientCapabilities } from '@dxos/plugin-client';
 
 import { upload } from '../helpers';
-import { WnfsCapabilities } from '../types';
-import { Upload } from './definitions';
+import { WnfsCapabilities, WnfsOperation } from '../types';
 
-const handler: Operation.WithHandler<typeof Upload> = Upload.pipe(
+const handler: Operation.WithHandler<typeof WnfsOperation.Upload> = WnfsOperation.Upload.pipe(
   Operation.withHandler(
     Effect.fnUntraced(function* ({ file, db }) {
       const client = yield* Capability.get(ClientCapabilities.Client);

package/src/plugin.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+
+import { meta } from './meta';
+
+export const WnfsPlugin = Plugin.lazy(meta, () => import('#plugin'));
+
+export { WnfsOperationHandlerSet } from './operations';

package/src/translations.ts

@@ -10,7 +10,7 @@ import { WnfsFile } from '#types';
 export const translations = [
   {
     'en-US': {
-      [WnfsFile.File.typename]: {
+      [WnfsFile.WnfsFile.typename]: {
         'typename.label': 'File',
         'typename.label_zero': 'Files',
         'typename.label_one': 'File',

package/src/types/WnfsCapabilities.ts

@@ -0,0 +1,18 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+// @import-as-namespace
+
+import { type Blockstore as BlockstoreInterface } from 'interface-blockstore';
+import { type PrivateDirectory, type PrivateForest } from 'wnfs';
+
+import { Capability } from '@dxos/app-framework';
+import { type SpaceId } from '@dxos/keys';
+
+import { meta } from '#meta';
+
+export const Blockstore = Capability.make<BlockstoreInterface>(`${meta.id}.capability.blockstore`);
+
+export type Instances = Record<SpaceId, { directory: PrivateDirectory; forest: PrivateForest }>;
+export const Instances = Capability.make<Instances>(`${meta.id}.capability.instances`);