@dxos/app-framework 0.10.0 → 0.11.0

package/moon.yml

@@ -2,27 +2,13 @@ layer: library
 language: typescript
 tags:
   - pack
-  - ts-build
+  - ts-vite-build
   - ts-test
   - ts-test-storybook
   - typedoc
   - storybook
 tasks:
-  compile:
-    args:
-      - '--entryPoint=src/index.ts'
-      - '--entryPoint=src/cli/index.ts'
-      - '--entryPoint=src/core/activation-event.ts'
-      - '--entryPoint=src/core/capability.ts'
-      - '--entryPoint=src/core/plugin.ts'
-      - '--entryPoint=src/core/plugin-manager.ts'
-      - '--entryPoint=src/common/capabilities.ts'
-      - '--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'
-      - '--entryPoint=src/config/index.ts'
+  build:
     deps:
       - compile-plugin
   compile-plugin:
@@ -32,7 +18,28 @@ tasks:
       - '--outputPath=dist/plugin'
       - '--platform=node'
     deps:
-      - ^:compile
-      - dx-compile:compile
+      - ^:build
+      - dx-compile:build
     outputs:
       - dist/plugin
+  check-module-structure:
+    # Verify headless entrypoints resolve under workerd conditions (post-build artifacts
+    # must exist — catches stale `./workerd` export paths like the removed browser bundle).
+    # Then fail when the root export pulls in React; React lives only behind `./ui`.
+    script: |
+      pnpm exec dx-trace-imports \
+        --export . \
+        --to "{react,react-dom}" \
+        --conditions workerd,worker,node \
+        --fail-on present
+    deps:
+      - dx-trace-imports:build
+      - build
+    inputs:
+      - tsconfig.json
+      - package.json
+      - '@group(production)'
+      - '^@group(production)'
+      - /pnpm-lock.yaml
+    options:
+      timeout: 60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/app-framework",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "A framework for building applications from composible plugins.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -15,89 +15,73 @@
   "exports": {
     ".": {
       "source": "./src/index.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs",
-      "workerd": "./dist/lib/browser/index.mjs",
-      "types": "./dist/types/src/index.d.ts"
-    },
-    "./workerd": {
       "types": "./dist/types/src/index.d.ts",
-      "default": "./dist/lib/browser/index.mjs"
+      "import": "./dist/lib/index.mjs"
     },
     "./ActivationEvent": {
       "source": "./src/core/activation-event.ts",
-      "browser": "./dist/lib/browser/activation-event/index.mjs",
-      "node": "./dist/lib/node-esm/activation-event/index.mjs",
-      "types": "./dist/types/src/activation-event/index.d.ts"
+      "types": "./dist/types/src/core/activation-event.d.ts",
+      "import": "./dist/lib/core/activation-event.mjs"
     },
     "./ActivationEvents": {
       "source": "./src/common/activation-events.ts",
-      "browser": "./dist/lib/browser/common/activation-events.mjs",
-      "node": "./dist/lib/node-esm/common/activation-events.mjs",
-      "types": "./dist/types/src/common/activation-events.d.ts"
+      "types": "./dist/types/src/common/activation-events.d.ts",
+      "import": "./dist/lib/common/activation-events.mjs"
     },
     "./Capabilities": {
       "source": "./src/common/capabilities.ts",
-      "browser": "./dist/lib/browser/common/capabilities.mjs",
-      "node": "./dist/lib/node-esm/common/capabilities.mjs",
-      "types": "./dist/types/src/common/capabilities.d.ts"
+      "types": "./dist/types/src/common/capabilities.d.ts",
+      "import": "./dist/lib/common/capabilities.mjs"
     },
     "./Capability": {
       "source": "./src/core/capability.ts",
-      "browser": "./dist/lib/browser/capability/index.mjs",
-      "node": "./dist/lib/node-esm/capability/index.mjs",
-      "types": "./dist/types/src/capability/index.d.ts"
+      "types": "./dist/types/src/core/capability.d.ts",
+      "import": "./dist/lib/core/capability.mjs"
     },
     "./Plugin": {
       "source": "./src/core/plugin.ts",
-      "browser": "./dist/lib/browser/plugin/index.mjs",
-      "node": "./dist/lib/node-esm/plugin/index.mjs",
-      "types": "./dist/types/src/plugin/index.d.ts"
+      "types": "./dist/types/src/core/plugin.d.ts",
+      "import": "./dist/lib/core/plugin.mjs"
     },
     "./PluginManager": {
       "source": "./src/core/plugin-manager.ts",
-      "browser": "./dist/lib/browser/plugin-manager/index.mjs",
-      "node": "./dist/lib/node-esm/plugin-manager/index.mjs",
-      "types": "./dist/types/src/plugin-manager/index.d.ts"
+      "types": "./dist/types/src/core/plugin-manager.d.ts",
+      "import": "./dist/lib/core/plugin-manager.mjs"
     },
     "./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"
+      "types": "./dist/types/src/core/url-loader.d.ts",
+      "import": "./dist/lib/core/url-loader.mjs"
     },
     "./config": {
-      "browser": "./dist/lib/browser/config/index.mjs",
-      "node": "./dist/lib/node-esm/config/index.mjs",
-      "types": "./dist/types/src/config/index.d.ts"
+      "source": "./src/config/index.ts",
+      "types": "./dist/types/src/config/index.d.ts",
+      "import": "./dist/lib/config.mjs"
     },
     "./vite-plugin": {
-      "import": "./dist/plugin/node-esm/index.mjs",
-      "types": "./dist/types/src/vite-plugin/index.d.ts"
+      "source": "./src/vite-plugin/index.ts",
+      "types": "./dist/types/src/vite-plugin/index.d.ts",
+      "import": "./dist/lib/vite-plugin.mjs"
     },
     "./cli": {
       "source": "./src/cli/index.ts",
-      "browser": "./dist/lib/browser/cli/index.mjs",
-      "node": "./dist/lib/node-esm/cli/index.mjs",
-      "types": "./dist/types/src/cli/index.d.ts"
+      "types": "./dist/types/src/cli/index.d.ts",
+      "import": "./dist/lib/cli.mjs"
     },
     "./testing": {
       "source": "./src/testing/index.ts",
-      "browser": "./dist/lib/browser/testing/index.mjs",
-      "node": "./dist/lib/node-esm/testing/index.mjs",
-      "types": "./dist/types/src/testing/index.d.ts"
+      "types": "./dist/types/src/testing/index.d.ts",
+      "import": "./dist/lib/testing.mjs"
     },
     "./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"
+      "types": "./dist/types/src/testing/react.d.ts",
+      "import": "./dist/lib/testing/react.mjs"
     },
     "./ui": {
       "source": "./src/ui/index.ts",
-      "browser": "./dist/lib/browser/ui/index.mjs",
-      "node": "./dist/lib/node-esm/ui/index.mjs",
-      "types": "./dist/types/src/ui/index.d.ts"
+      "types": "./dist/types/src/ui/index.d.ts",
+      "import": "./dist/lib/ui.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -112,27 +96,28 @@
     "esbuild": "0.28.1",
     "idb-keyval": "^6.2.1",
     "solid-js": "^1.9.11",
-    "@dxos/async": "0.10.0",
-    "@dxos/compute-runtime": "0.10.0",
-    "@dxos/debug": "0.10.0",
-    "@dxos/effect": "0.10.0",
-    "@dxos/edge-client": "0.10.0",
-    "@dxos/errors": "0.10.0",
-    "@dxos/keys": "0.10.0",
-    "@dxos/log": "0.10.0",
-    "@dxos/invariant": "0.10.0",
-    "@dxos/operation": "0.10.0",
-    "@dxos/protocols": "0.10.0",
-    "@dxos/react-error-boundary": "0.10.0",
-    "@dxos/react-hooks": "0.10.0",
-    "@dxos/react-ui": "0.10.0",
-    "@dxos/react-ui-list": "0.10.0",
-    "@dxos/ui-theme": "0.10.0",
-    "@dxos/util": "0.10.0",
-    "@dxos/web-context": "0.10.0",
-    "@dxos/web-context-react": "0.10.0",
-    "@dxos/compute": "0.10.0",
-    "@dxos/context": "0.10.0"
+    "@dxos/async": "0.11.0",
+    "@dxos/compute": "0.11.0",
+    "@dxos/compute-runtime": "0.11.0",
+    "@dxos/context": "0.11.0",
+    "@dxos/debug": "0.11.0",
+    "@dxos/edge-client": "0.11.0",
+    "@dxos/effect": "0.11.0",
+    "@dxos/errors": "0.11.0",
+    "@dxos/invariant": "0.11.0",
+    "@dxos/keys": "0.11.0",
+    "@dxos/log": "0.11.0",
+    "@dxos/operation": "0.11.0",
+    "@dxos/protocols": "0.11.0",
+    "@dxos/react-error-boundary": "0.11.0",
+    "@dxos/react-hooks": "0.11.0",
+    "@dxos/react-ui": "0.11.0",
+    "@dxos/react-ui-list": "0.11.0",
+    "@dxos/storybook-addon-logger": "0.11.0",
+    "@dxos/ui-theme": "0.11.0",
+    "@dxos/util": "0.11.0",
+    "@dxos/web-context": "0.11.0",
+    "@dxos/web-context-react": "0.11.0"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -144,13 +129,13 @@
     "react": "~19.2.7",
     "react-dom": "~19.2.7",
     "typedoc": "0.28.1",
-    "vite": "^8.0.16",
+    "vite": "^8.1.4",
     "vite-plugin-solid": "^2.11.12",
-    "@dxos/brand": "0.10.0",
-    "@dxos/echo-client": "0.10.0",
-    "@dxos/storybook-utils": "0.10.0",
-    "@dxos/test-utils": "0.10.0",
-    "@dxos/random": "0.10.0"
+    "@dxos/brand": "0.11.0",
+    "@dxos/echo-client": "0.11.0",
+    "@dxos/random": "0.11.0",
+    "@dxos/storybook-utils": "0.11.0",
+    "@dxos/test-utils": "0.11.0"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",

package/src/common/Role.test.ts

@@ -0,0 +1,41 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import * as Role from './Role';
+
+describe('Role.make', () => {
+  test('creates a role token with the given NSID', ({ expect }) => {
+    const token = Role.make<{ subject: string }>('org.dxos.test.role.testRole');
+    expect(token.role).toBe('org.dxos.test.role.testRole');
+  });
+
+  test('tokens with the same role are independent objects (identity-by-role)', ({ expect }) => {
+    const tokenOne = Role.make<{ x: number }>('org.dxos.test.role.shared');
+    const tokenTwo = Role.make<{ x: number }>('org.dxos.test.role.shared');
+    expect(tokenOne).not.toBe(tokenTwo);
+    expect(tokenOne.role).toBe(tokenTwo.role);
+  });
+
+  test('throws on invalid NSID at runtime (hyphenated final segment)', ({ expect }) => {
+    expect(() => Role.make('org.dxos.test.role.bad-name' as any)).toThrow();
+  });
+
+  test('throws on single-segment NSID', ({ expect }) => {
+    expect(() => Role.make('article' as any)).toThrow();
+  });
+
+  test('throws on two-segment NSID (below the three-segment minimum)', ({ expect }) => {
+    expect(() => Role.make('org.article' as any)).toThrow();
+  });
+});
+
+describe('role token typing', () => {
+  test('make preserves TData through token use-sites', ({ expect }) => {
+    // Type-level smoke test: if TS compiles, we're fine.
+    const token: Role.Role<{ subject: number }> = Role.make('org.dxos.test.role.numeric');
+    expect(token.role).toBe('org.dxos.test.role.numeric');
+  });
+});

package/src/common/Role.ts

@@ -0,0 +1,54 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+// @import-as-namespace
+
+import type { DXN } from '@dxos/keys';
+
+/**
+ * A typed role token. Carries a role NSID for runtime dispatch plus a phantom
+ * data type so consumers using `type={SomeToken}` and providers using
+ * `AppSurface.object(SomeToken, ...)` share a single type-level contract.
+ *
+ * Mint via {@link make}. The `role` field holds the bare NSID (e.g.
+ * `org.dxos.role.article`) — the dispatch key, `data-role` attribute value,
+ * and what `.role` comparisons inside matched components see.
+ */
+export type Role<TData> = {
+  readonly role: string;
+  /** Covariant phantom; never accessed at runtime. */
+  readonly _phantom?: TData;
+};
+
+/**
+ * Narrow data type carried by a role token.
+ */
+export type Data<T> = T extends Role<infer D> ? D : never;
+
+/**
+ * Mints a typed role token. The NSID is validated at compile time via
+ * {@link DXN.Name}: the final segment must be camelCase (no hyphens).
+ * Dynamic NSIDs (template-literal / runtime strings) are validated at runtime.
+ *
+ * Identity is structural; all tokens with the same `role` string are
+ * interchangeable at runtime.
+ */
+export const make: {
+  <TData = unknown, T extends string = string>(
+    nsid: [DXN.Name<T>] extends [never] ? `Invalid NSID "${T}": final segment must be camelCase (no hyphens)` : T,
+  ): Role<TData>;
+} = <TData>(nsid: string): Role<TData> => {
+  // Runtime guard for dynamic NSIDs that bypass the compile-time DXN.Name<T> check.
+  if (
+    typeof nsid !== 'string' ||
+    !/^[a-zA-Z]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(\.[a-zA-Z][a-zA-Z0-9]{0,62})$/.test(
+      nsid,
+    )
+  ) {
+    throw new Error(
+      `Invalid role NSID: "${nsid}". Must be a dotted name with a camelCase final segment (no hyphens in the last segment).`,
+    );
+  }
+  return { role: nsid };
+};

package/src/common/capabilities.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Atom, type Registry } from '@effect-atom/atom-react';
+import { type Atom, type Registry } from '@effect-atom/atom';
 import type * as Command$ from '@effect/cli/Command';
 import * as Effect from 'effect/Effect';
 import type * as Exit$ from 'effect/Exit';
@@ -20,7 +20,10 @@ import type {
   ServiceResolver as ServiceResolver$,
   Trace as Trace$,
 } from '@dxos/compute';
-import type { ProcessManager as ProcessManager$ } from '@dxos/compute-runtime';
+import type {
+  ProcessManager as ProcessManager$,
+  RemoteTraceMonitor as RemoteTraceMonitor$,
+} from '@dxos/compute-runtime';
 import { OperationInvoker as OperationInvoker$ } from '@dxos/operation';
 
 import { Capability as Capability$, Plugin as Plugin$, type PluginManager as PluginManager$ } from '../core';
@@ -135,6 +138,18 @@ export type TraceSinkFactory = (ctx: TraceSinkFactoryContext) => Trace$.Sink;
  */
 export const TraceSink = Capability$.make<TraceSinkFactory>('org.dxos.app-framework.capability.traceSink');
 
+/**
+ * Source of ephemeral trace messages broadcast by remote runtimes over the space swarm (DX-1125).
+ * Contributed by a client-aware plugin; the process-manager capability wires the first contribution
+ * (or a no-op) into the aggregate {@link ProcessMonitor} so its `subscribeToTraceMessages` surfaces
+ * remote progress alongside local.
+ *
+ * @category Capability
+ */
+export const RemoteTraceMonitor = Capability$.make<RemoteTraceMonitor$.Monitor>(
+  'org.dxos.app-framework.capability.remoteTraceMonitor',
+);
+
 /**
  * Service resolver backing the shared {@link ProcessManagerRuntime}.
  *

package/src/common/index.ts

@@ -4,4 +4,5 @@
 
 export * as Capabilities from './capabilities';
 export * as ActivationEvents from './activation-events';
+export * as Role from './Role';
 export { Label } from './translations';

package/src/core/capability-manager.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, it, onTestFinished } from '@effect/vitest';
 import * as Effect from 'effect/Effect';
 

package/src/core/capability-manager.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 * as Deferred from 'effect/Deferred';
 import * as Effect from 'effect/Effect';
 

package/src/core/capability.ts

@@ -2,10 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Atom } from '@effect-atom/atom-react';
+import { type Atom } from '@effect-atom/atom';
 import * as Context from 'effect/Context';
 import * as Effect from 'effect/Effect';
 import * as Layer from 'effect/Layer';
+import * as Option from 'effect/Option';
+import type * as Scope from 'effect/Scope';
 
 import type { DXN } from '@dxos/keys';
 
@@ -49,6 +51,16 @@ export const get = <T>(interfaceDef: InterfaceDef<T>): Effect.Effect<T, Error, S
 export const getAll = <T>(interfaceDef: InterfaceDef<T>): Effect.Effect<T[], never, Service> =>
   Effect.map(Service, (manager) => manager.getAll(interfaceDef));
 
+/**
+ * Get a single capability from the capability manager, if one is contributed.
+ * Never fails — use this over {@link get} when the capability's absence (e.g. an optional plugin
+ * isn't loaded) is a legitimate case to handle rather than an error.
+ * @param interfaceDef The interface definition of the capability.
+ * @returns The first capability implementation, or `Option.none()` if none is contributed.
+ */
+export const getOption = <T>(interfaceDef: InterfaceDef<T>): Effect.Effect<Option.Option<T>, never, Service> =>
+  Effect.map(getAll(interfaceDef), (all) => Option.fromNullable(all[0]));
+
 /**
  * Wait for a capability to be available.
  * @param interfaceDef The interface definition of the capability.
@@ -81,6 +93,24 @@ export const atomByModule = <T>(
 export const asLayer = <T, I>(interfaceDef: InterfaceDef<T>, tag: Context.Tag<I, T>): Layer.Layer<I, never, Service> =>
   Layer.effect(tag, get(interfaceDef).pipe(Effect.orDie));
 
+/**
+ * Constructs a layer from a capability by resolving it from the capability manager and passing the
+ * value to `build`. Lets a consumer depend on a canonical service (e.g. `Identity.Service`) and
+ * have it provided from a capability without the consumer referencing the capability system:
+ *
+ * ```ts
+ * effect.pipe(
+ *   Effect.provide(Capability.layerWith(ClientCapabilities.IdentityService, (service) =>
+ *     Layer.succeed(Identity.Service, service),
+ *   )),
+ * );
+ * ```
+ */
+export const layerWith = <T, A, E, R>(
+  interfaceDef: InterfaceDef<T>,
+  build: (value: T) => Layer.Layer<A, E, R>,
+): Layer.Layer<A, E, R | Service> => Layer.unwrapEffect(get(interfaceDef).pipe(Effect.orDie, Effect.map(build)));
+
 const InterfaceDefTypeId: unique symbol = Symbol.for('InterfaceDefTypeId');
 
 /**
@@ -159,10 +189,10 @@ export const contributes = <I extends InterfaceDef<any>>(
 };
 
 type LoadCapability<Props, Capabilities extends ModuleReturn = ModuleReturn> = () => Promise<{
-  default: (props: Props) => Effect.Effect<Capabilities, Error, Service | Plugin.Service | never>;
+  default: (props: Props) => Effect.Effect<Capabilities, Error, Service | Plugin.Service | Scope.Scope | never>;
 }>;
 type LoadCapabilities<Props, Capabilities extends ModuleReturn = ModuleReturn> = () => Promise<{
-  default: (props: Props) => Effect.Effect<Capabilities, Error, Service | Plugin.Service | never>;
+  default: (props: Props) => Effect.Effect<Capabilities, Error, Service | Plugin.Service | Scope.Scope | never>;
 }>;
 
 type NormalizeReturn<R> = R extends readonly (infer A)[]
@@ -175,7 +205,7 @@ type NormalizeReturn<R> = R extends readonly (infer A)[]
 
 export type LazyCapability<Props = void, Capabilities extends ModuleReturn = ModuleReturn, E extends Error = Error> = (
   props: Props,
-) => Effect.Effect<NormalizeReturn<Capabilities>, E, Service | Plugin.Service | never>;
+) => Effect.Effect<NormalizeReturn<Capabilities>, E, Service | Plugin.Service | Scope.Scope | never>;
 
 /**
  * Helper to define a lazily loaded implementation of a capability.
@@ -254,6 +284,15 @@ export const getModuleTag = (capability: unknown): string | undefined => {
  *     return contributes(Capabilities.OperationHandler, ...);
  *   })
  * );
+ *
+ * // Module with scoped resources (closed automatically on deactivation)
+ * export default Capability.makeModule(
+ *   Effect.fnUntraced(function* () {
+ *     const scope = yield* Scope.Scope;
+ *     yield* Scope.addFinalizer(scope, Effect.sync(() => cleanup()));
+ *     return contributes(Capabilities.MyCapability, implementation);
+ *   })
+ * );
  * ```
  */
 export const makeModule = <
@@ -262,5 +301,5 @@ export const makeModule = <
   E extends Error = Error,
   R extends Service | Plugin.Service | never = Service,
 >(
-  fn: (props: TProps) => Effect.Effect<TReturn, E, R>,
-): ((props: TProps) => Effect.Effect<TReturn, E, R>) => fn;
+  fn: (props: TProps) => Effect.Effect<TReturn, E, R | Scope.Scope>,
+): ((props: TProps) => Effect.Effect<TReturn, E, R | Scope.Scope>) => fn;

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

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Atom, Registry } from '@effect-atom/atom-react';
+import { type Atom, Registry } from '@effect-atom/atom';
 import { afterEach, assert, describe, it } from '@effect/vitest';
 import * as Cause from 'effect/Cause';
 import * as Duration from 'effect/Duration';
@@ -12,6 +12,7 @@ import * as Fiber from 'effect/Fiber';
 import * as Match from 'effect/Match';
 import * as PubSub from 'effect/PubSub';
 import * as Queue from 'effect/Queue';
+import * as Scope from 'effect/Scope';
 import * as TestClock from 'effect/TestClock';
 
 import { invariant } from '@dxos/invariant';
@@ -390,11 +391,10 @@ describe('PluginManager', () => {
           Plugin.addModule({
             activatesOn: DefectEvent,
             id: 'DefectImmediate',
-            activate: () => {
+            activate: (): Effect.Effect<void> => {
               // This throws immediately before even returning an Effect.
               // This is the most severe type of defect.
               throw new Error('immediate throw before Effect');
-              return Effect.succeed(undefined);
             },
           }),
           Plugin.make,
@@ -1033,6 +1033,41 @@ describe('PluginManager', () => {
     }),
   );
 
+  it.effect('should close module scope during deactivation', () =>
+    Effect.gen(function* () {
+      let scopeClosed = false;
+      const Test = Plugin.define(testMeta).pipe(
+        Plugin.addModule({
+          id: 'WithScope',
+          activatesOn: ActivationEvents.Startup,
+          activate: () =>
+            Effect.gen(function* () {
+              const scope = yield* Scope.Scope;
+              yield* Scope.addFinalizer(
+                scope,
+                Effect.sync(() => {
+                  scopeClosed = true;
+                }),
+              );
+              return Capability.contributes(String, { string: 'hello' });
+            }),
+        }),
+        Plugin.make,
+      );
+      const testPlugin = Test();
+      plugins = [testPlugin];
+
+      const manager = PluginManager.make({ pluginLoader });
+      yield* manager.add(testMeta.profile.key);
+      yield* manager.enable(testMeta.profile.key);
+      yield* manager.activate(ActivationEvents.Startup);
+      assert.isFalse(scopeClosed);
+
+      yield* manager.shutdown();
+      assert.isTrue(scopeClosed);
+    }),
+  );
+
   it.effect('should run capability deactivate hooks during shutdown', () =>
     Effect.gen(function* () {
       let deactivated = false;