@dxos/app-framework 0.8.4-main.d05673bc65 → 0.8.4-main.dfabb4ec29

package/moon.yml

@@ -20,3 +20,18 @@ tasks:
       - '--entryPoint=src/common/activation-events.ts'
       - '--entryPoint=src/ui/index.ts'
       - '--entryPoint=src/testing/index.ts'
+      - '--entryPoint=src/testing/react.tsx'
+      - '--entryPoint=src/core/url-loader.ts'
+    deps:
+      - compile-plugin
+  compile-plugin:
+    command: dx-compile
+    args:
+      - '--entryPoint=src/vite-plugin/index.ts'
+      - '--outputPath=dist/plugin'
+      - '--platform=node'
+    deps:
+      - ^:compile
+      - dx-compile:compile
+    outputs:
+      - dist/plugin

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/app-framework",
-  "version": "0.8.4-main.d05673bc65",
+  "version": "0.8.4-main.dfabb4ec29",
   "description": "A framework for building applications from composible plugins.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -55,6 +55,16 @@
       "node": "./dist/lib/node-esm/plugin-manager/index.mjs",
       "types": "./dist/types/src/plugin-manager/index.d.ts"
     },
+    "./UrlLoader": {
+      "source": "./src/core/url-loader.ts",
+      "browser": "./dist/lib/browser/url-loader/index.mjs",
+      "node": "./dist/lib/node-esm/url-loader/index.mjs",
+      "types": "./dist/types/src/url-loader/index.d.ts"
+    },
+    "./vite-plugin": {
+      "import": "./dist/plugin/node-esm/index.mjs",
+      "types": "./dist/types/src/vite-plugin/index.d.ts"
+    },
     "./cli": {
       "source": "./src/cli/index.ts",
       "browser": "./dist/lib/browser/cli/index.mjs",
@@ -67,6 +77,12 @@
       "node": "./dist/lib/node-esm/testing/index.mjs",
       "types": "./dist/types/src/testing/index.d.ts"
     },
+    "./testing-react": {
+      "source": "./src/testing/react.tsx",
+      "browser": "./dist/lib/browser/testing/react.mjs",
+      "node": "./dist/lib/node-esm/testing/react.mjs",
+      "types": "./dist/types/src/testing/react.d.ts"
+    },
     "./ui": {
       "source": "./src/ui/index.ts",
       "browser": "./dist/lib/browser/ui/index.mjs",
@@ -75,72 +91,51 @@
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "ActivationEvent": [
-        "dist/types/src/activation-event/index.d.ts"
-      ],
-      "ActivationEvents": [
-        "dist/types/src/common/activation-events.d.ts"
-      ],
-      "Capabilities": [
-        "dist/types/src/common/capabilities.d.ts"
-      ],
-      "Capability": [
-        "dist/types/src/capability/index.d.ts"
-      ],
-      "Plugin": [
-        "dist/types/src/plugin/index.d.ts"
-      ],
-      "PluginManager": [
-        "dist/types/src/plugin-manager/index.d.ts"
-      ],
-      "cli": [
-        "dist/types/src/cli/index.d.ts"
-      ],
-      "testing": [
-        "dist/types/src/testing/index.d.ts"
-      ],
-      "ui": [
-        "dist/types/src/ui/index.d.ts"
-      ]
-    }
-  },
   "dependencies": {
     "@effect/cli": "0.73.2",
-    "@dxos/async": "0.8.4-main.d05673bc65",
-    "@dxos/echo": "0.8.4-main.d05673bc65",
-    "@dxos/debug": "0.8.4-main.d05673bc65",
-    "@dxos/effect": "0.8.4-main.d05673bc65",
-    "@dxos/log": "0.8.4-main.d05673bc65",
-    "@dxos/invariant": "0.8.4-main.d05673bc65",
-    "@dxos/react-error-boundary": "0.8.4-main.d05673bc65",
-    "@dxos/operation": "0.8.4-main.d05673bc65",
-    "@dxos/react-hooks": "0.8.4-main.d05673bc65",
-    "@dxos/util": "0.8.4-main.d05673bc65",
-    "@dxos/web-context": "0.8.4-main.d05673bc65",
-    "@dxos/web-context-react": "0.8.4-main.d05673bc65"
+    "cjs-module-lexer": "^2.2.0",
+    "@dxos/context": "0.8.4-main.dfabb4ec29",
+    "@dxos/compute": "0.8.4-main.dfabb4ec29",
+    "@dxos/debug": "0.8.4-main.dfabb4ec29",
+    "@dxos/echo": "0.8.4-main.dfabb4ec29",
+    "@dxos/edge-client": "0.8.4-main.dfabb4ec29",
+    "@dxos/effect": "0.8.4-main.dfabb4ec29",
+    "@dxos/errors": "0.8.4-main.dfabb4ec29",
+    "@dxos/invariant": "0.8.4-main.dfabb4ec29",
+    "@dxos/log": "0.8.4-main.dfabb4ec29",
+    "@dxos/protocols": "0.8.4-main.dfabb4ec29",
+    "@dxos/operation": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-error-boundary": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-hooks": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui": "0.8.4-main.dfabb4ec29",
+    "@dxos/ui-theme": "0.8.4-main.dfabb4ec29",
+    "@dxos/util": "0.8.4-main.dfabb4ec29",
+    "@dxos/web-context": "0.8.4-main.dfabb4ec29",
+    "@dxos/web-context-react": "0.8.4-main.dfabb4ec29",
+    "@dxos/async": "0.8.4-main.dfabb4ec29"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
     "@effect/platform": "0.94.4",
-    "@effect/vitest": "0.27.0",
+    "@effect/vitest": "0.29.0",
+    "@testing-library/react": "^16.3.0",
     "@types/react": "~19.2.7",
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
     "typedoc": "0.28.1",
-    "@dxos/echo-db": "0.8.4-main.d05673bc65",
-    "@dxos/random": "0.8.4-main.d05673bc65",
-    "@dxos/react-ui": "0.8.4-main.d05673bc65",
-    "@dxos/test-utils": "0.8.4-main.d05673bc65",
-    "@dxos/ui-theme": "0.8.4-main.d05673bc65",
-    "@dxos/storybook-utils": "0.8.4-main.d05673bc65"
+    "vite": "^8.0.10",
+    "@dxos/brand": "0.8.4-main.dfabb4ec29",
+    "@dxos/echo-db": "0.8.4-main.dfabb4ec29",
+    "@dxos/storybook-utils": "0.8.4-main.dfabb4ec29",
+    "@dxos/random": "0.8.4-main.dfabb4ec29",
+    "@dxos/test-utils": "0.8.4-main.dfabb4ec29"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
     "@effect/platform": "0.94.4",
-    "effect": "3.19.16",
+    "@testing-library/react": "^16.3.0",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3"
   },

package/src/cli/cli.ts

@@ -17,7 +17,7 @@ const defaultPluginLoader =
     Effect.sync(() => {
       const plugin = plugins.find((plugin) => plugin.meta.id === id);
       invariant(plugin, `Plugin not found: ${id}`);
-      return plugin;
+      return { plugin };
     });
 
 type SubCommands = [Command.Command<any, any, any, any>, ...Array<Command.Command<any, any, any, any>>];

package/src/common/activation-events.ts

@@ -21,7 +21,7 @@ export const SetupReactSurface = ActivationEvent$.make('org.dxos.app-framework.e
 /**
  * Fired before the operation invoker is activated.
  */
-export const SetupOperationResolver = ActivationEvent$.make('org.dxos.app-framework.event.setup-operation-resolver');
+export const SetupOperationHandler = ActivationEvent$.make('org.dxos.app-framework.event.setup-operation-handler');
 
 /**
  * Fired before the managed runtime is created.

package/src/common/annotations.ts

@@ -0,0 +1,3 @@
+//
+// Copyright 2025 DXOS.org
+//

package/src/common/capabilities.ts

@@ -2,14 +2,15 @@
 // Copyright 2025 DXOS.org
 //
 
-import type * as Command$ from '@effect/cli/Command';
 import { type Atom, type Registry } from '@effect-atom/atom-react';
+import type * as Command$ from '@effect/cli/Command';
 import * as Effect from 'effect/Effect';
 import type * as Layer$ from 'effect/Layer';
 import type * as ManagedRuntime$ from 'effect/ManagedRuntime';
 import type { FC, PropsWithChildren } from 'react';
 
-import type { OperationInvoker as OperationInvoker$, OperationResolver as OperationResolver$ } from '@dxos/operation';
+import type { OperationHandlerSet } from '@dxos/compute';
+import { OperationInvoker as OperationInvoker$ } from '@dxos/operation';
 
 import { Capability as Capability$, type PluginManager as PluginManager$ } from '../core';
 import type {
@@ -88,14 +89,8 @@ export const ManagedRuntime = Capability$.make<ManagedRuntime>('org.dxos.app-fra
 // Operation System Capabilities
 //
 
-export type OperationResolver = OperationResolver$.OperationResolver<any, any, any, any>;
-
-/**
- * Handler registration for operations - contributed by plugins.
- * @category Capability
- */
-export const OperationResolver = Capability$.make<OperationResolver[]>(
-  'org.dxos.app-framework.capability.operation-resolver',
+export const OperationHandler = Capability$.make<OperationHandlerSet.OperationHandlerSet>(
+  'org.dxos.app-framework.capability.operation-handler',
 );
 
 export type UndoMapping = UndoMapping$.UndoMapping;

package/src/common/operations.ts

@@ -4,10 +4,9 @@
 
 import * as Schema from 'effect/Schema';
 
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 
 import { Capability } from '../core';
-
 import { Label } from './translations';
 
 const UNDO_NAMESPACE = 'org.dxos.app-framework.undo';
@@ -28,11 +27,9 @@ export namespace UndoOperation {
     },
     executionMode: 'sync',
     services: [Capability.Service],
-    schema: {
-      input: Schema.Struct({
-        message: Schema.optional(Label.annotations({ description: 'The message to display in the undo toast.' })),
-      }),
-      output: Schema.Void,
-    },
+    input: Schema.Struct({
+      message: Schema.optional(Label.annotations({ description: 'The message to display in the undo toast.' })),
+    }),
+    output: Schema.Void,
   });
 }

package/src/core/activation-event.ts

@@ -2,6 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
+import { compositeKey } from '@dxos/util';
+
 /**
  * A unique string identifier representing an event.
  * This is expected to be a URI, where initial parts are often the id of the plugin whose package defines the event.
@@ -31,7 +33,8 @@ export const make = (id: string, specifier?: string) => {
 /**
  * Helper to create an activation event key.
  */
-export const eventKey = (event: ActivationEvent) => (event.specifier ? `${event.id}:${event.specifier}` : event.id);
+export const eventKey = (event: ActivationEvent) =>
+  event.specifier ? compositeKey(event.id, event.specifier) : event.id;
 
 /**
  * Helper to create an activation event that triggers when any of the given events are activated.

package/src/core/capability-manager.test.ts

@@ -2,8 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-import { describe, expect, it, onTestFinished } from '@effect/vitest';
 import { Registry } from '@effect-atom/atom-react';
+import { describe, expect, it, onTestFinished } from '@effect/vitest';
 import * as Effect from 'effect/Effect';
 
 import * as Capability from './capability';

package/src/core/capability-manager.ts

@@ -59,6 +59,12 @@ export interface CapabilityManager {
    * @returns The capability.
    */
   waitFor<T>(interfaceDef: Capability.InterfaceDef<T>): Effect.Effect<T, Error>;
+
+  /**
+   * Get capabilities grouped by the module that contributed them.
+   * @returns An atom containing a record from module ID to capability implementations.
+   */
+  atomByModule<T>(interfaceDef: Capability.InterfaceDef<T>): Atom.Atom<Record<string, T[]>>;
 }
 
 /**
@@ -75,7 +81,18 @@ class CapabilityManagerImpl implements CapabilityManager {
     return Atom.make((get) => {
       const current = get(this._capabilityEntries(id));
       return current.map((c) => c.implementation);
-    });
+    }).pipe(Atom.keepAlive);
+  });
+
+  readonly _capabilitiesByModule = Atom.family<string, Atom.Atom<Record<string, unknown[]>>>((id: string) => {
+    return Atom.make((get) => {
+      const entries = get(this._capabilityEntries(id));
+      const result: Record<string, unknown[]> = {};
+      for (const entry of entries) {
+        (result[entry.moduleId] ??= []).push(entry.implementation);
+      }
+      return result;
+    }).pipe(Atom.keepAlive);
   });
 
   readonly _capability = Atom.family<string, Atom.Atom<unknown>>((id: string) => {
@@ -163,6 +180,10 @@ class CapabilityManagerImpl implements CapabilityManager {
       return result;
     });
   }
+
+  atomByModule<T>(interfaceDef: Capability.InterfaceDef<T>): Atom.Atom<Record<string, T[]>> {
+    return this._capabilitiesByModule(interfaceDef.identifier) as Atom.Atom<Record<string, T[]>>;
+  }
 }
 
 /**

package/src/core/capability.ts

@@ -62,6 +62,16 @@ export const waitFor = <T>(interfaceDef: InterfaceDef<T>): Effect.Effect<T, Erro
 export const atom = <T>(interfaceDef: InterfaceDef<T>): Effect.Effect<Atom.Atom<T[]>, never, Service> =>
   Effect.map(Service, (manager) => manager.atom(interfaceDef));
 
+/**
+ * Get capabilities grouped by the module that contributed them.
+ * @param interfaceDef The interface definition of the capability.
+ * @returns An Atom containing a record from module ID to capability implementations.
+ */
+export const atomByModule = <T>(
+  interfaceDef: InterfaceDef<T>,
+): Effect.Effect<Atom.Atom<Record<string, T[]>>, never, Service> =>
+  Effect.map(Service, (manager) => manager.atomByModule(interfaceDef));
+
 const InterfaceDefTypeId: unique symbol = Symbol.for('InterfaceDefTypeId');
 
 /**
@@ -120,6 +130,7 @@ export type ModuleReturn = void | Any | Any[] | readonly Any[] | [Any, ...Any[]]
 /**
  * Helper to define the implementation of a capability.
  */
+// TODO(dmaretskyi): Make the return type non-generic so capabilities are non-discernable.
 export const contributes = <I extends InterfaceDef<any>>(
   interfaceDef: I,
   implementation: Capability<InterfaceDef.Implementation<I>>['implementation'],
@@ -164,7 +175,7 @@ export const lazy = <T = void, R extends ModuleReturn = ModuleReturn>(
 ): LazyCapability<T, R> => {
   const lazyFn: LazyCapability<T, R> = (props: T) =>
     Effect.gen(function* () {
-      const { default: getCapability } = yield* Effect.tryPromise(() => c());
+      const { default: getCapability } = yield* Effect.promise(() => c());
       const result = yield* getCapability(props);
       const normalized = result == null ? [] : Array.isArray(result) ? Array.from(result) : [result];
       return normalized as NormalizeReturn<R>;
@@ -221,7 +232,7 @@ export const getModuleTag = (capability: unknown): string | undefined => {
  * export default Capability.makeModule(
  *   Effect.fnUntraced(function* (props: { observability: boolean }) {
  *     const invoker = yield* Capability.get(Capabilities.OperationInvoker);
- *     return contributes(Capabilities.IntentResolver, ...);
+ *     return contributes(Capabilities.OperationHandler, ...);
  *   })
  * );
  * ```

package/src/core/edge-registry-plugin-provider.ts

@@ -0,0 +1,92 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Context } from '@dxos/context';
+import { type EdgeHttpClient } from '@dxos/edge-client';
+import { type PluginEntry } from '@dxos/protocols';
+
+import * as Registry from './registry';
+
+/**
+ * Maps a wire-format `PluginEntry` (from `@dxos/protocols`) to a
+ * `Registry.Plugin` (the app-framework domain type).
+ *
+ * This is the only translation seam between the two independently-defined type
+ * hierarchies — fields are mapped explicitly, with no shared type between them.
+ */
+const toRegistryPlugin = (entry: PluginEntry): Registry.Plugin => ({
+  id: entry.meta.id,
+  name: entry.meta.name,
+  description: entry.meta.description,
+  homePage: entry.meta.homePage,
+  source: entry.meta.source,
+  screenshots: entry.meta.screenshots ? [...entry.meta.screenshots] : undefined,
+  tags: entry.meta.tags ? [...entry.meta.tags] : undefined,
+  icon: entry.meta.icon,
+  iconHue: entry.meta.iconHue,
+  moduleUrl: entry.moduleUrl,
+  repo: entry.repo,
+  version: entry.releaseTag,
+});
+
+/**
+ * Implements `Registry.PluginProvider` against the Edge `/registry` HTTP endpoints.
+ *
+ * Lives in app-framework (rather than the more obvious home of `@dxos/edge-client`)
+ * because edge-client doesn't depend on app-framework; siting the implementation
+ * here keeps the dependency arrow `app-framework → edge-client` and avoids a
+ * cycle. The class needs only the public `EdgeHttpClient` type, so a one-way
+ * type-import is enough.
+ *
+ * `listVersions` is currently a stub: it returns the single latest version derived
+ * from the cached plugin list, so the host's version picker has something to render.
+ * The wire contract for the real endpoint already exists — see
+ * `GetPluginVersionsResponseBodySchema` in `@dxos/protocols/edge/registry` and
+ * {@link EdgeHttpClient.getRegistryPluginVersions} — so once Edge ships
+ * `GET /registry/plugins/:repo/versions`, swap this stub for a call to
+ * `this._client.getRegistryPluginVersions(...)` and map each entry through a
+ * `toRegistryPluginVersion` helper (mirror of {@link toRegistryPlugin}).
+ */
+export class EdgeRegistryPluginProvider implements Registry.PluginProvider {
+  // Cached on first load so getPlugin/listVersions can resolve without re-fetching.
+  #cachedPlugins: readonly Registry.Plugin[] = [];
+
+  constructor(private readonly _client: EdgeHttpClient) {}
+
+  listPlugins(): Effect.Effect<readonly Registry.Plugin[], Error> {
+    return Effect.tryPromise({
+      try: () => this._client.getRegistryPlugins(Context.default()),
+      catch: (error) => (error instanceof Error ? error : new Error(String(error))),
+    }).pipe(
+      Effect.map((body) => {
+        const plugins = body.plugins.filter((entry) => entry.health === 'ok').map(toRegistryPlugin);
+        this.#cachedPlugins = plugins;
+        return plugins;
+      }),
+    );
+  }
+
+  listVersions(repo: string): Effect.Effect<readonly Registry.PluginVersion[], Error> {
+    // Stub: return only the currently-known version until Edge implements the versions endpoint.
+    const plugin = this.#cachedPlugins.find((candidate) => candidate.repo === repo);
+    if (!plugin) {
+      return Effect.fail(new Error(`Plugin not found in catalog: ${repo}`));
+    }
+    const version: Registry.PluginVersion = { tag: plugin.version, moduleUrl: plugin.moduleUrl };
+    return Effect.succeed([version]);
+  }
+
+  getPlugin(repo: string, version?: string): Effect.Effect<Registry.Plugin, Error> {
+    const plugin = this.#cachedPlugins.find((p) => p.repo === repo);
+    if (!plugin) {
+      return Effect.fail(new Error(`Plugin not found in catalog: ${repo}`));
+    }
+    if (version && version !== plugin.version) {
+      return Effect.fail(new Error(`Version ${version} not available for ${repo}; only ${plugin.version} is cached`));
+    }
+    return Effect.succeed(plugin);
+  }
+}

package/src/core/index.ts

@@ -6,4 +6,10 @@ export * as ActivationEvent from './activation-event';
 export * as Capability from './capability';
 export * as CapabilityManager from './capability-manager';
 export * as Plugin from './plugin';
+export * as PluginAssetCache from './plugin-asset-cache';
 export * as PluginManager from './plugin-manager';
+export * as PluginManifest from './plugin-manifest';
+export { PLUGIN_DEV_SERVER_PORT } from './plugin-manifest';
+export * as Registry from './registry';
+export { EdgeRegistryPluginProvider } from './edge-registry-plugin-provider';
+export * as UrlLoader from './url-loader';

package/src/core/plugin-asset-cache.ts

@@ -0,0 +1,60 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { BaseError } from '@dxos/errors';
+
+/**
+ * Tagged error for cache operations. Construction sites supply `context.operation`
+ * (one of `'cache' | 'evict' | 'resolve' | 'list'`) and `context.pluginId` so
+ * downstream handlers can route on the failed call without scanning the message.
+ */
+export class PluginAssetCacheError extends BaseError.extend(
+  'PluginAssetCacheError',
+  'Plugin asset cache operation failed',
+) {}
+
+/**
+ * Per-platform offline cache for third-party plugin assets.
+ *
+ * Implementations live alongside their platform glue (composer-app's
+ * `asset-cache/{tauri,service-worker}.ts`); the no-op default is for tests
+ * and unsupported environments.
+ */
+export interface Cache {
+  /**
+   * Persist all listed URLs under the namespace of `pluginId`. Idempotent.
+   * The order of `urls` is significant — the first entry is treated as the entry module.
+   */
+  cache(pluginId: string, urls: readonly string[]): Effect.Effect<void, PluginAssetCacheError>;
+
+  /**
+   * Drop all assets for a plugin (uninstall).
+   */
+  evict(pluginId: string): Effect.Effect<void, PluginAssetCacheError>;
+
+  /**
+   * Resolves a plugin asset URL to a platform-specific cached URL when one is available.
+   * Returns the original URL when no cached copy exists or the platform serves cached
+   * responses transparently (e.g. service worker fetch interception on web).
+   */
+  resolve(pluginId: string, url: string): Effect.Effect<string, PluginAssetCacheError>;
+
+  /**
+   * List currently cached plugin ids (diagnostic).
+   */
+  list(): Effect.Effect<readonly string[], PluginAssetCacheError>;
+}
+
+/**
+ * No-op implementation. Used when no platform cache is registered (tests, unsupported environments).
+ * Plugins still load — they just have no offline guarantee.
+ */
+export const noop = (): Cache => ({
+  cache: () => Effect.void,
+  evict: () => Effect.void,
+  resolve: (_pluginId, url) => Effect.succeed(url),
+  list: () => Effect.succeed([] as readonly string[]),
+});